diff --git a/.gitattributes b/.gitattributes index 3cb68a29e..4c0a6c312 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,6 @@ tools/mangoapp/** text=auto eol=lf tools/comet/LICENSE whitespace=-blank-at-eof tools/comet/droiddeck.patch whitespace=-blank-at-eol,-blank-at-eof -# These helpers are packaged verbatim and executed inside the Linux runtime. tools/linuxfs/overlay/** text eol=lf tools/linuxfs/desktop/** text eol=lf tools/mangoapp/mangoapp text eol=lf diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt new file mode 100644 index 000000000..f91528f39 --- /dev/null +++ b/.github/trusted-test-builds.txt @@ -0,0 +1,4 @@ +FX192 +K11MCH1 +kingokksa +ovurrsl diff --git a/.github/workflows/authorship.yml b/.github/workflows/authorship.yml index 97c6637a8..ebbcae644 100644 --- a/.github/workflows/authorship.yml +++ b/.github/workflows/authorship.yml @@ -23,7 +23,7 @@ permissions: jobs: validate: - name: Build APK + name: Validate source and build result runs-on: ubuntu-24.04 timeout-minutes: 5 steps: diff --git a/.github/workflows/build-desktop-kde.yml b/.github/workflows/build-desktop-kde.yml index 365e3d4f8..3d720dcb9 100644 --- a/.github/workflows/build-desktop-kde.yml +++ b/.github/workflows/build-desktop-kde.yml @@ -60,11 +60,12 @@ jobs: - name: Build run: | set -euo pipefail - sudo apt-get update -qq && sudo apt-get install -y -qq zstd xz-utils gpgv >/dev/null - KDE_KWIN_OVERRIDE="$PWD/out/kwin" tools/desktop-kde/build.sh out + sudo apt-get update -qq && sudo apt-get install -y -qq zstd xz-utils gpgv gcc-aarch64-linux-gnu >/dev/null + KDE_KWIN_OVERRIDE="$PWD/out/kwin" DESKTOP_KDE_RELEASE_TAG='${{ inputs.tag }}' tools/desktop-kde/build.sh out cp out/kwin/desktop-kde.kwin.txt out/ echo "size $(stat -c %s out/desktop-kde.tar.zst) sha256 $(cat out/desktop-kde.sha256)" echo "language packs $(ls out/desktop-kde-i18n-*.tar.zst | wc -l)" + echo "pacman repository $(ls out/repo | wc -l) files, $(du -sm out/repo | cut -f1) MiB" - uses: actions/upload-artifact@v4 with: name: desktop-kde @@ -77,6 +78,7 @@ jobs: out/desktop-kde.sha256 out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst + out/repo/ - name: Publish if: github.event_name == 'workflow_dispatch' && inputs.tag != '' env: @@ -89,8 +91,10 @@ jobs: echo "::error::$TAG is already published in DroidDeck-Components, and published tags are never replaced: use a new tag" exit 1 fi - gh release create "$TAG" --latest=false --prerelease=false --title "$TAG" \ + prerelease=false + case $TAG in *-rc*) prerelease=true ;; esac + gh release create "$TAG" --latest=false --prerelease="$prerelease" --title "$TAG" \ --notes "KDE Plasma desktop package for DroidDeck's Linux runtime ($GITHUB_REPOSITORY tools/desktop-kde, $GITHUB_SHA). size $(stat -c %s out/desktop-kde.tar.zst), sha256 $(cat out/desktop-kde.sha256). desktop-kde.packages.txt lists the signature-checked Arch Linux ARM packages it was built from." \ out/desktop-kde.tar.zst out/desktop-kde.sha256 out/desktop-kde.packages.txt out/desktop-kde.kwin.txt \ - out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst - gh release edit "$TAG" --latest=false --prerelease=false + out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst out/repo/* + gh release edit "$TAG" --latest=false --prerelease="$prerelease" diff --git a/.github/workflows/build-fex.yml b/.github/workflows/build-fex.yml index 8ec3369a1..deb099100 100644 --- a/.github/workflows/build-fex.yml +++ b/.github/workflows/build-fex.yml @@ -1,8 +1,5 @@ name: Build FEX (x86-64 Steam client) -# Checks tools/fex: the same build DroidDeck-Components' build-fex.yml runs from this repository to publish FEX -# (its single `fex` release and fex.json, which the app follows). Nothing is published from here. - on: push: paths: @@ -31,7 +28,6 @@ jobs: with: persist-credentials: false - name: Build in Arch Linux ARM - # Inputs reach the shell as environment variables, never pasted into the script. env: FEX_EXTRA_CXXFLAGS: ${{ inputs.cxxflags }} FEX_THUNKS: ${{ inputs.thunks == 'true' && '1' || '0' }} diff --git a/.github/workflows/build-ubuntu-runtime.yml b/.github/workflows/build-ubuntu-runtime.yml new file mode 100644 index 000000000..f104e9cd7 --- /dev/null +++ b/.github/workflows/build-ubuntu-runtime.yml @@ -0,0 +1,95 @@ +name: Build Linux runtime (Ubuntu) + +on: + push: + paths: + - 'tools/ubuntu/**' + - '.github/workflows/build-ubuntu-runtime.yml' + workflow_dispatch: + inputs: + tag: + description: 'Release tag to publish as (e.g. ubuntu-r1); empty = artifact only' + required: false + default: '' + +permissions: + contents: read + +jobs: + debs: + runs-on: ubuntu-24.04-arm + timeout-minutes: 240 + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Build Mesa with KGSL and the patched KWin + run: | + set -euo pipefail + docker run --rm -v "$PWD:/work" -w /work ubuntu:26.04 bash tools/ubuntu/build-debs.sh /work/out/debs + sudo chown -R "$(id -u):$(id -g)" out + - uses: actions/upload-artifact@v4 + with: + name: ubuntu-runtime-debs + retention-days: 7 + compression-level: 0 + path: out/debs/ + rootfs: + needs: debs + runs-on: ubuntu-24.04-arm + timeout-minutes: 120 + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - uses: actions/download-artifact@v4 + with: + name: ubuntu-runtime-debs + path: out/debs + - uses: actions/create-github-app-token@v2 + id: components-token + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + with: + app-id: ${{ vars.DROIDDECK_CI_APP_ID }} + private-key: ${{ secrets.DROIDDECK_CI_APP_KEY }} + owner: Droid-Deck + repositories: DroidDeck-Components + - name: Refuse a published tag + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + env: + GH_TOKEN: ${{ steps.components-token.outputs.token }} + run: | + if gh release view '${{ inputs.tag }}' -R Droid-Deck/DroidDeck-Components >/dev/null 2>&1; then + echo "::error::${{ inputs.tag }} is already published, and published tags are never replaced: use a new tag" + exit 1 + fi + - name: Build + run: | + set -euo pipefail + sudo apt-get update -qq && sudo apt-get install -y -qq zstd gpgv ubuntu-keyring >/dev/null + tag='${{ inputs.tag }}' + tools/ubuntu/build.sh out/debs out "${tag:-ubuntu-dev}" + - uses: actions/upload-artifact@v4 + with: + name: ubuntu-runtime + retention-days: 7 + compression-level: 0 + path: | + out/*.tar.zst + out/*.sha256 + out/*.packages.txt + - name: Publish + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + env: + GH_TOKEN: ${{ steps.components-token.outputs.token }} + GH_REPO: Droid-Deck/DroidDeck-Components + run: | + set -euo pipefail + TAG='${{ inputs.tag }}' + prerelease=false + case $TAG in *-rc*) prerelease=true ;; esac + gh release create "$TAG" --latest=false --prerelease="$prerelease" --title "$TAG" \ + --notes "Ubuntu 26.04 LTS arm64 runtime for DroidDeck ($GITHUB_REPOSITORY tools/ubuntu, $GITHUB_SHA): size $(stat -c %s "out/$TAG.tar.zst"), sha256 $(cat "out/$TAG.sha256"). $TAG-desktop.tar.zst is the Kubuntu Plasma desktop built on top of it, holding only what the runtime does not already have: size $(stat -c %s "out/$TAG-desktop.tar.zst"), sha256 $(cat "out/$TAG-desktop.sha256"). The .packages.txt files list every installed package and version." \ + "out/$TAG.tar.zst" "out/$TAG.sha256" "out/$TAG.packages.txt" \ + "out/$TAG-desktop.tar.zst" "out/$TAG-desktop.sha256" "out/$TAG-desktop.packages.txt" out/debs/*.deb + gh release edit "$TAG" --latest=false --prerelease="$prerelease" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebfd545ca..1a1d97cf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ on: - '**/*.md' - 'LICENSE' - '.gitignore' + - 'docs/**' + - '.github/ISSUE_TEMPLATE/**' pull_request: branches: [ main ] types: [ opened, synchronize, reopened, ready_for_review ] @@ -15,33 +17,42 @@ on: - '**/*.md' - 'LICENSE' - '.gitignore' + - 'docs/**' + - '.github/ISSUE_TEMPLATE/**' workflow_dispatch: + inputs: + rebuild_preloads: + description: Rebuild preloads instead of reusing the approved binary snapshot + type: boolean + default: false permissions: contents: read + actions: read pull-requests: write concurrency: - group: build-${{ github.event.pull_request.number || github.run_id }} - cancel-in-progress: ${{ github.event_name == 'pull_request' }} - -env: - PRELOAD_CACHE_VERSION: v6 + group: build-${{ github.event.pull_request.number || (github.event_name == 'push' && 'main') || github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }} jobs: - xbox: - name: Xbox ARM64 backend + source: + name: Pin source tree if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} - runs-on: ubuntu-24.04-arm - timeout-minutes: 30 + runs-on: ubuntu-24.04 + timeout-minutes: 5 outputs: - base-sha: ${{ steps.merge.outputs.base-sha }} + base-sha: ${{ steps.merge.outputs.base-sha || steps.trusted.outputs.base-sha }} tree-sha: ${{ steps.source.outputs.tree-sha }} steps: - uses: actions/checkout@v4 with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false persist-credentials: false - name: Pin and merge the APK source id: merge @@ -52,10 +63,54 @@ jobs: echo "base-sha=$(git rev-parse origin/main)" >> "$GITHUB_OUTPUT" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + # Partial clone: a merged blob that only exists in a fork's history can't be lazily fetched (GitHub: "not our ref"); merge-tree writes it locally first. + git merge-tree --write-tree HEAD origin/main >/dev/null || true git merge --no-ff --no-edit origin/main - - name: Record backend source tree + - name: Resolve trusted manifest base + id: trusted + if: github.event_name != 'pull_request' + run: | + set -euo pipefail + git fetch --no-tags origin main + echo "base-sha=$(git rev-parse origin/main)" >> "$GITHUB_OUTPUT" + - name: Record pinned source tree id: source run: echo "tree-sha=$(git rev-parse 'HEAD^{tree}')" >> "$GITHUB_OUTPUT" + + xbox: + name: Xbox ARM64 backend + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04-arm + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify pinned source tree + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" + - name: Plan component identities + id: plan + run: python3 tools/components/prepare.py plan - uses: actions/cache@v4 id: xbox-cache with: @@ -63,14 +118,10 @@ jobs: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox app/build/xbox/xodus-droiddeck-source.tar.xz app/build/xbox/runtime/*-source.tar.xz - key: xbox-arm64-${{ hashFiles('tools/xbox/**') }} + key: xbox-v2-${{ steps.plan.outputs.xbox }} - name: Build Xbox backend if: steps.xbox-cache.outputs.cache-hit != 'true' - run: | - rustup toolchain install 1.99.0 --profile minimal - sudo apt-get update -qq - sudo apt-get install -y build-essential pkg-config libssl-dev protobuf-compiler cmake xz-utils - bash tools/xbox/build.sh + run: python3 tools/components/prepare.py xbox - uses: actions/upload-artifact@v4 with: name: xbox-arm64 @@ -85,9 +136,166 @@ jobs: if-no-files-found: error retention-days: 14 + components: + name: Prepare verified components + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04 + timeout-minutes: 40 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify pinned source tree + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh + + - name: Plan component identities + id: plan + run: python3 tools/components/prepare.py plan + - name: Cache remaining Linux runtime assets + id: preloads + uses: actions/cache@v4 + with: + path: | + app/src/main/assets/linuxfs + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + !app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox + !app/src/main/assets/linuxfs/i386/libblsession.so + !app/src/main/assets/linuxfs/i386/libfakeinput.so + !app/src/main/assets/linuxfs/i386/libfaultreport.so + !app/src/main/assets/linuxfs/libblaudit.so + !app/src/main/assets/linuxfs/libblfastpath.so + !app/src/main/assets/linuxfs/libblsession.so + !app/src/main/assets/linuxfs/libfakeinput.so + !app/src/main/assets/linuxfs/libssbs.so + !app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard + !app/src/main/assets/linuxfs/x86_64/libblsession.so + !app/src/main/assets/linuxfs/x86_64/libfakeinput.so + !app/src/main/assets/linuxfs/x86_64/libfaultreport.so + !app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so + !app/src/main/assets/linuxfs/x86_64/libwebkitinput.so + key: runtime-v9-${{ steps.plan.outputs.runtime }} + + - name: Cache PulseAudio 13.0 source + id: pa-src + uses: actions/cache@v4 + with: + path: pa13 + key: pulseaudio-src-${{ steps.plan.outputs.pulseaudio-source }} + - name: Cache proot + id: proot + uses: actions/cache@v4 + with: + path: | + app/src/main/jniLibs/arm64-v8a/libproot.so + app/src/main/jniLibs/arm64-v8a/libproot-loader.so + key: proot-v2-${{ steps.plan.outputs.proot }} + - name: Cache GOG Galaxy companion + id: comet + uses: actions/cache@v4 + with: + path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet + key: comet-v2-${{ steps.plan.outputs.comet }} + + - name: Restore verified preload snapshots + id: component-preloads + env: + GH_TOKEN: ${{ github.token }} + FORCE_PRELOAD_REBUILD: ${{ inputs.rebuild_preloads || 'false' }} + COMPONENT_TRUSTED_BASE: ${{ needs.source.outputs.base-sha }} + run: python3 tools/components/prepare.py preload-snapshot + + - name: Prepare required Linux build tools once + env: + COMPONENTS_TO_BUILD: >- + ${{ steps.preloads.outputs.cache-hit != 'true' && 'runtime' || '' }} + ${{ steps.component-preloads.outputs.arm64 != 'true' && 'arm64-preloads' || '' }} + ${{ steps.comet.outputs.cache-hit != 'true' && 'comet' || '' }} + run: python3 tools/components/prepare.py tools + + - name: Build changed ARM64 preloads + if: steps.component-preloads.outputs.arm64 != 'true' + run: python3 tools/components/prepare.py arm64-preloads + + - name: Prepare remaining Linux runtime assets + if: steps.preloads.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py runtime + + - name: Fetch the Debian image the preloads build in + if: steps.component-preloads.outputs.x86 != 'true' + env: + GH_TOKEN: ${{ github.token }} + run: python3 tools/components/prepare.py debian-image + + - name: Build the x86 preloads FEX guests load (glibc 2.31) + if: steps.component-preloads.outputs.x86 != 'true' + run: python3 tools/components/prepare.py x86-preloads + + - name: Bundle the droiddeck-esync packs + run: python3 tools/components/prepare.py esync + + - name: Fetch PulseAudio 13.0 source + if: steps.pa-src.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py pulseaudio-source + + - name: Fetch DirectAudio (tools/directaudio/release.env) + run: python3 tools/components/prepare.py directaudio + + - name: Build the AAudio sink into the audio bundle + run: python3 tools/components/prepare.py audio + + - name: Build proot + if: steps.proot.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py proot + + - name: Check the preloads + run: | + set -euo pipefail + bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs + + - name: Build GOG Galaxy companion + if: steps.comet.outputs.cache-hit != 'true' + run: python3 tools/components/prepare.py comet + + - name: Build the DiRT 3 / DiRT Showdown ws2_32 stand-in + run: python3 tools/components/prepare.py dirt-ws2 + + - name: Prepare graphics driver variants + run: python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" + - name: Record and pack prepared components + run: python3 tools/components/prepare.py pack + - uses: actions/upload-artifact@v4 + with: + name: prepared-components + path: app/build/prepared-components.tar.gz + if-no-files-found: error + compression-level: 0 + retention-days: 14 + build: - needs: xbox - name: Compile and test APK + needs: [source, components, xbox] + name: Compile APK and Android tests if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 45 @@ -98,7 +306,12 @@ jobs: with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false persist-credentials: false + submodules: recursive - name: Check human authorship env: @@ -150,7 +363,7 @@ jobs: - name: Merge onto main, or say what conflicts if: github.event_name == 'pull_request' env: - BUILD_BASE_SHA: ${{ needs.xbox.outputs.base-sha }} + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} run: | set -uo pipefail git config user.name "ci" @@ -159,6 +372,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" BASE=$(git rev-parse --short FETCH_HEAD) HEAD=$(git rev-parse --short HEAD) + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true if git merge --no-ff --no-edit FETCH_HEAD >/tmp/merge.out 2>&1; then { echo "### Mergeable" @@ -208,28 +422,27 @@ jobs: - name: Verify backend and APK source match env: - XBOX_SOURCE_TREE: ${{ needs.xbox.outputs.tree-sha }} + XBOX_SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" - uses: actions/setup-java@v4 with: distribution: temurin - java-version: '17' + java-version: '21' - uses: gradle/actions/setup-gradle@v4 with: - cache-cleanup: on-success + cache-read-only: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }} + cache-cleanup: ${{ github.event_name == 'pull_request' && 'never' || 'on-success' }} - - name: Resolve the runner's NDK - run: | - NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - VERSION=$(sed -n 's/^Pkg.Revision *= *//p' "$NDK/source.properties") - echo "NDK_VERSION=$VERSION" >> "$GITHUB_ENV" + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh - name: Set the APK build label id: build-label env: PR_NUMBER: ${{ github.event.pull_request.number }} + PR_TITLE: ${{ github.event.pull_request.title }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} BUILD_REF: ${{ github.ref_name }} BUILD_SHA: ${{ github.sha }} @@ -248,266 +461,9 @@ jobs: echo "label=$label" >> "$GITHUB_OUTPUT" echo "DROIDDECK_SOURCE_COMMIT=${PR_HEAD_SHA:-$BUILD_SHA}" >> "$GITHUB_ENV" echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$GITHUB_ENV" + echo "DROIDDECK_PR_TITLE=${PR_TITLE//$'\n'/ }" >> "$GITHUB_ENV" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - - name: Cache the preloads - id: preloads - uses: actions/cache@v4 - with: - path: app/src/main/assets/linuxfs - key: preloads-${{ env.PRELOAD_CACHE_VERSION }}-${{ hashFiles('app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h', 'tools/quest/*', 'tools/linuxfs/preload/*.c', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/fex/*', 'tools/linuxfs/clipboard/*.c', 'tools/linuxfs/ssbs/*.c', 'tools/proot/fastpath/*.c', 'tools/linuxfs/overlay/usr/local/bin/*', 'tools/linuxfs/overlay/usr/bin/**', 'tools/linuxfs/desktop/*', 'tools/gamescope/release.env', 'tools/wlroots/release.env', 'tools/linuxfs/uruntime.env', 'tools/linuxfs/licenses/*', 'tools/mangoapp/*', 'tools/msitools/**', 'tools/comet/**', 'tools/xbox/**', 'tools/linuxfs/debian-image.env', 'tools/vr/**') }} - - - name: Build libfakeinput.so and libblsession.so (glibc aarch64) - if: steps.preloads.outputs.cache-hit != 'true' - run: | - set -euo pipefail - sudo apt-get -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources \ - -o Dir::Etc::sourceparts=- -o Acquire::Retries=3 update -qq - sudo apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers >/dev/null - D=app/src/main/assets/linuxfs - mkdir -p "$D" - aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ - -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ - -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libfakeinput.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ - -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c - aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/libssbs.so" - mkdir -p "$D/usr/local/bin" - aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$D/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl - aarch64-linux-gnu-strip --strip-unneeded "$D/usr/local/bin/droiddeck-clipboard" - VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ - tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" - for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do - install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" - done - for f in tools/linuxfs/overlay/usr/bin/* tools/linuxfs/overlay/usr/bin/steamos-polkit-helpers/*; do - [ -f "$f" ] && install -Dm644 "$f" "$D/${f#tools/linuxfs/overlay/}" - done - if [ -f tools/gamescope/release.env ]; then - . tools/gamescope/release.env - curl -fsSL --retry 3 -o gamescope.tzst "https://github.com/${GAMESCOPE_REPO:-${GITHUB_REPOSITORY}}/releases/download/${GAMESCOPE_TAG}/gamescope.tzst" - echo "${GAMESCOPE_SHA256} gamescope.tzst" | sha256sum -c - - tar --use-compress-program=unzstd -xf gamescope.tzst -C "$D" - test -f "$D/usr/local/bin/gamescope" - rm gamescope.tzst - fi - . tools/linuxfs/uruntime.env - curl -fsSL --retry 3 -o uruntime "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}" - echo "${URUNTIME_SHA256} uruntime" | sha256sum -c - - install -Dm644 uruntime "$D/usr/local/lib/droiddeck/uruntime" - install -Dm644 tools/linuxfs/licenses/uruntime-LICENSE "$D/usr/local/share/licenses/uruntime/LICENSE" - rm uruntime - M="$D/usr/local/lib/mangoapp" - mkdir -p "$M" mango-pkgs - grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o mango-pkgs/pkg.tar.zst "$url" - echo "$sum mango-pkgs/pkg.tar.zst" | sha256sum -c - - tar --use-compress-program=unzstd -xf mango-pkgs/pkg.tar.zst -C mango-pkgs - rm mango-pkgs/pkg.tar.zst - done - install -m644 mango-pkgs/usr/bin/mangoapp "$M/mangoapp" - for so in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1; do - cp -L "mango-pkgs/usr/lib/$so" "$M/$so" - done - aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wl,-soname,libtracefs.so.1 \ - -o "$M/libtracefs.so.1" tools/mangoapp/libtracefs-shim.c - aarch64-linux-gnu-strip --strip-unneeded "$M/libtracefs.so.1" - install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" - rm -rf mango-pkgs - ls -l "$M" - mkdir -p pw-pkgs - grep -v '^#' tools/pipewire/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o pw-pkgs/pkg.tar.zst "$url" - echo "$sum pw-pkgs/pkg.tar.zst" | sha256sum -c - - tar --use-compress-program=unzstd -xf pw-pkgs/pkg.tar.zst -C pw-pkgs - rm pw-pkgs/pkg.tar.zst - done - tools/pipewire/assemble.sh pw-pkgs "$D/usr/local/lib/droiddeck-pipewire.tzst" - rm -rf pw-pkgs - ls -l "$D/usr/local/lib/droiddeck-pipewire.tzst" - T="$D/usr/local/lib/droiddeck-msitools" - mkdir -p "$T" msi-pkgs - grep -v '^#' tools/msitools/packages.txt | while read -r sum url; do - [ -n "$url" ] || continue - curl -fsSL --retry 3 -o msi-pkgs/pkg.tar.xz "$url" - echo "$sum msi-pkgs/pkg.tar.xz" | sha256sum -c - - tar -xJf msi-pkgs/pkg.tar.xz -C msi-pkgs - rm msi-pkgs/pkg.tar.xz - done - install -m644 msi-pkgs/usr/bin/msiinfo "$T/msiinfo" - install -m644 msi-pkgs/usr/bin/cabextract "$T/cabextract" - install -m644 msi-pkgs/usr/lib/7zip/7z "$T/7z" - install -m644 msi-pkgs/usr/lib/7zip/7z.so "$T/7z.so" - for so in libmsi-1.0.so.0 libgsf-1.so.114 libgcab-1.0.so.0; do - cp -L "msi-pkgs/usr/lib/$so" "$T/$so" - done - for f in NOTICE GPL-2 GPL-3 LGPL-2.1 7zip-License 7zip-unRarLicense; do - install -Dm644 "tools/msitools/licenses/$f" "$D/usr/local/share/licenses/droiddeck-msitools/$f" - done - rm -rf msi-pkgs - ls -l "$T" - install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" - install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" - install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" - install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$D/usr/local/bin/kwin_wayland_wrapper" - install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" - ls -lR "$D" - - - name: Fetch the Debian image the preloads build in - if: steps.preloads.outputs.cache-hit != 'true' - env: - GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - . tools/linuxfs/debian-image.env - image=public.ecr.aws/docker/library/debian:bullseye - if gh release download "$DEBIAN_IMAGE_TAG" -R "$GITHUB_REPOSITORY" -p "$DEBIAN_IMAGE_ASSET" -O /tmp/debian-image.tar.zst \ - && { [ -z "$DEBIAN_IMAGE_SHA256" ] || echo "$DEBIAN_IMAGE_SHA256 /tmp/debian-image.tar.zst" | sha256sum -c -; }; then - zstd -dc /tmp/debian-image.tar.zst | docker load - rm -f /tmp/debian-image.tar.zst - else - echo "::warning::the hosted Debian image could not be fetched; pulling from the registry instead" - for attempt in 1 2 3 4 5; do - docker pull "$image" && break - [ "$attempt" -lt 5 ] || { echo "::error::could not pull $image after $attempt attempts"; exit 1; } - echo "pull attempt $attempt failed (registry busy?); retrying in $((attempt * 30)) s" - sleep $((attempt * 30)) - done - fi - docker image ls "$image" - - - name: Build the x86 preloads FEX guests load (glibc 2.31) - if: steps.preloads.outputs.cache-hit != 'true' - run: | - set -euo pipefail - docker run --rm -v "$PWD:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' - set -euo pipefail - install_compilers() { - apt-get -o Acquire::Check-Valid-Until=false update -qq && - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends gcc g++ gcc-multilib g++-multilib binutils >/dev/null - } - printf "deb http://deb.debian.org/debian bullseye main\ndeb http://security.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list - if ! install_compilers; then - printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list - install_compilers - fi - tools/linuxfs/build-x86-preloads.sh app/src/main/assets/linuxfs - ' - sudo chown -R "$(id -u):$(id -g)" app/src/main/assets/linuxfs - ls -l app/src/main/assets/linuxfs/x86_64 app/src/main/assets/linuxfs/i386 - - - name: Bundle the droiddeck-esync packs - run: | - set -euo pipefail - if [ -f tools/droiddeck-esync/release.env ]; then - . tools/droiddeck-esync/release.env - release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}" - curl -fsSL --retry 3 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET" - echo "$SYNC_BUNDLE_SHA256 sync-bundle.tzst" | sha256sum -c - - mkdir -p app/src/main/assets/droiddeck-esync - tar --use-compress-program=unzstd -xf sync-bundle.tzst -C app/src/main/assets/droiddeck-esync - rm sync-bundle.tzst - curl -fsSL --retry 3 -o sync-index.json "$release_url/index.json" - revoked=$(python3 -c 'import json, sys; print(" ".join(p["id"] for p in json.load(open(sys.argv[1]))["packs"] if p.get("revoked") is True))' sync-index.json) - for id in $revoked; do - if [ -e "app/src/main/assets/droiddeck-esync/packs/$id.tzst" ]; then - echo "::warning::$SYNC_BUNDLE_ASSET carries revoked pack $id; it is left out of the APK (point tools/droiddeck-esync/release.env at a newer bundle)" - rm -f "app/src/main/assets/droiddeck-esync/packs/$id.tzst" - fi - done - rm sync-index.json - test -f app/src/main/assets/droiddeck-esync/index.json - test -f app/src/main/assets/droiddeck-esync/index.json.sig - ls -lR app/src/main/assets/droiddeck-esync - fi - - - name: Cache PulseAudio 13.0 source - id: pa-src - uses: actions/cache@v4 - with: - path: pa13 - key: pulseaudio-src-13.0 - - name: Fetch PulseAudio 13.0 source - if: steps.pa-src.outputs.cache-hit != 'true' - run: | - set -euo pipefail - curl -fsSL -o pa.tar.gz https://github.com/pulseaudio/pulseaudio/archive/refs/tags/v13.0.tar.gz - mkdir -p pa13 && tar -xzf pa.tar.gz -C pa13 --strip-components=1 && rm pa.tar.gz - - name: Fetch DirectAudio (tools/directaudio/release.env) - run: tools/directaudio/fetch.sh "$PWD" "$PWD/sink-out" - - name: Build the AAudio sink into the audio bundle - run: | - set -euo pipefail - export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - tools/aaudio-sink/build.sh "$PWD/pa13" "$PWD/sink-out" - rm -rf pa-bundle && mkdir -p pa-bundle - tar --use-compress-program=unzstd -xf app/src/main/assets/pulseaudio.tzst -C pa-bundle - test ! -f pa-bundle/modules/arm64/module-aaudio-sink.so - install -m755 sink-out/module-aaudio-sink.so pa-bundle/modules/arm64/module-aaudio-sink.so - install -m755 sink-out/module-directaudio-native-sink.so pa-bundle/modules/arm64/module-directaudio-native-sink.so - (cd pa-bundle && tar --use-compress-program='zstd -19' -cf ../pulseaudio.tzst .) - mkdir -p app/build/prepared-assets - mv pulseaudio.tzst app/build/prepared-assets/pulseaudio.tzst - tar --use-compress-program=unzstd -tf app/build/prepared-assets/pulseaudio.tzst | grep -c '\.so$' - rm -rf pa-bundle sink-out - - name: Cache proot - id: proot - uses: actions/cache@v4 - with: - path: | - app/src/main/jniLibs/arm64-v8a/libproot.so - app/src/main/jniLibs/arm64-v8a/libproot-loader.so - key: proot-${{ env.NDK_VERSION }}-${{ hashFiles('tools/proot/**') }} - - name: Build proot - if: steps.proot.outputs.cache-hit != 'true' - run: | - set -euo pipefail - export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - tools/proot/build.sh app/src/main/jniLibs/arm64-v8a - - - name: Check the preloads - run: | - set -euo pipefail - bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs - - - name: Check Quest tracking IPC - run: | - set -euo pipefail - NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" - VK_INCLUDE=$(ls -d "$NDK"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) - mkdir -p build/vr/include - cp -R "$VK_INCLUDE/vulkan" build/vr/include/ - if [ -d "$VK_INCLUDE/vk_video" ]; then cp -R "$VK_INCLUDE/vk_video" build/vr/include/; fi - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_tracking.cpp -o /tmp/test-xr-tracking - /tmp/test-xr-tracking - g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_xr_touch.cpp -o /tmp/test-xr-touch - /tmp/test-xr-touch - g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_pad_controller_config.cpp -o /tmp/test-pad-controller-config - /tmp/test-pad-controller-config - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_vsync.cpp -o /tmp/test-xr-vsync - /tmp/test-xr-vsync - g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_frames.cpp -o /tmp/test-xr-frames - /tmp/test-xr-frames - cc -Itools/vr/third_party/wayland -c tools/vr/src/wayland_client_stub.c -o /tmp/test-wayland-stub.o - cc -Itools/vr/third_party/wayland -c app/src/main/cpp/waylandcomp/generated/xdg-shell-protocol.c -o /tmp/test-xdg-shell.o - g++ -std=c++17 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers -pthread -Ibuild/vr/include \ - -Itools/vr/third_party/wayland -Iapp/src/main/cpp/waylandcomp/generated \ - tools/vr/tests/test_presenter_shutdown.cpp tools/vr/src/presenter.cpp /tmp/test-wayland-stub.o /tmp/test-xdg-shell.o \ - -ldl -o /tmp/test-presenter-shutdown - timeout 10 /tmp/test-presenter-shutdown - - name: Rust toolchain for the store engines (aarch64-linux-android) id: rust run: | @@ -525,9 +481,10 @@ jobs: ~/.cargo/git/db ~/.cargo/bin/cargo-ndk app/src/main/rust/stores/target - key: stores-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }} + key: stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}-${{ hashFiles('app/src/main/rust/stores/src/**', 'app/src/main/rust/stores/Cargo.toml', 'app/src/main/rust/stores/build.rs', 'app/src/main/rust/stores/.cargo/**', 'app/build.gradle') }} restore-keys: | - stores-${{ steps.rust.outputs.rustc }}- + stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}- + stores-v2-${{ runner.os }}-${{ runner.arch }}-${{ env.NDK_VERSION }}-${{ steps.rust.outputs.rustc }}- - name: cargo-ndk run: | @@ -545,21 +502,63 @@ jobs: restore-keys: | cxx-${{ env.NDK_VERSION }}- + - uses: actions/download-artifact@v4 + with: + name: prepared-components + path: app/build + - name: Verify and unpack prepared components + env: + SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: python3 tools/components/prepare.py unpack --tree "$SOURCE_TREE" + - uses: actions/download-artifact@v4 with: name: xbox-arm64 path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox - - name: Build GOG Galaxy companion - if: steps.preloads.outputs.cache-hit != 'true' - run: | - rustup toolchain install 1.90.0 --profile minimal - rustup target add --toolchain 1.90.0 aarch64-unknown-linux-gnu - RUSTUP_TOOLCHAIN=1.90.0 bash tools/comet/build.sh - + - name: Cache checksum-pinned pack inputs + uses: actions/cache@v4 + with: + path: ~/.cache/droiddeck-pack-inputs + key: pack-inputs-v1-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env') }} + restore-keys: pack-inputs-v1- - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs + - name: Pin the Syncthing source + id: syncthing-src + run: | + set -euo pipefail + git submodule update --init --recursive tools/syncthing/syncthing-android + echo "commit=$(git -C tools/syncthing/syncthing-android/syncthing/src/github.com/syncthing/syncthing rev-parse HEAD)" >> "$GITHUB_OUTPUT" + - name: Cache Syncthing + id: syncthing + uses: actions/cache@v4 + with: + path: app/src/main/jniLibs/arm64-v8a/libsyncthingnative.so + key: syncthing-${{ env.NDK_VERSION }}-${{ hashFiles('tools/syncthing/build.sh', 'tools/syncthing/syncthing-android/gradle/libs.versions.toml') }}-${{ steps.syncthing-src.outputs.commit }} + - uses: actions/setup-go@v5 + if: steps.syncthing.outputs.cache-hit != 'true' + with: + go-version: stable + cache: false + - name: Build Syncthing + if: steps.syncthing.outputs.cache-hit != 'true' + run: | + set -euo pipefail + export NDK="$ANDROID_HOME/ndk/$NDK_VERSION" + tools/syncthing/build.sh app/src/main/jniLibs/arm64-v8a + + - 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: @@ -567,7 +566,6 @@ jobs: SGDB_API_KEY: ${{ secrets.SGDB_API_KEY }} run: | set -o pipefail - python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" python3 tools/release/runtime_inputs.py record ./gradlew assembleRelease --console=plain -PndkVersion="$NDK_VERSION" 2>&1 | tee /tmp/build.log python3 tools/release/check_session_assets.py app/build/outputs/apk/release/app-release.apk @@ -583,13 +581,6 @@ jobs: git diff --exit-code -- app/src/main/rust/stores/Cargo.lock \ || { echo "::error::Cargo.lock changed during the build; commit the regenerated lockfile (uploaded as stores-cargo-lock)"; exit 1; } - - name: Store engines host unit tests - timeout-minutes: 10 - continue-on-error: true - run: | - cd app/src/main/rust/stores - cargo test --locked 2>&1 | tail -60 - - name: Upload the regenerated Cargo.lock if: failure() uses: actions/upload-artifact@v4 @@ -598,16 +589,11 @@ jobs: path: app/src/main/rust/stores/Cargo.lock if-no-files-found: ignore - - name: Install Python test dependencies - run: | - sudo apt-get update -qq - sudo apt-get install -y -qq python3-yaml gcc-aarch64-linux-gnu qemu-user - - - name: Steam import and game environment tests - run: python3 -m unittest discover -s tools/tests -p 'test_*.py' - - name: Unit tests id: unit-tests + env: + DROIDDECK_BUILD_LABEL: ${{ steps.build-label.outputs.label }} + SGDB_API_KEY: ${{ secrets.SGDB_API_KEY }} run: | set -o pipefail mkdir -p app/build @@ -682,87 +668,147 @@ 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 + + store-tests: + name: Store engines host tests + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04 + timeout-minutes: 15 + continue-on-error: true + permissions: + contents: read + actions: read + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} run: | - set -uo pipefail - MARK="" - { - echo "$MARK" - echo "## Build of this pull request" - echo - [ -f /tmp/pr-merge.md ] && cat /tmp/pr-merge.md - echo - case "$BUILD_OUTCOME:$UNIT_TEST_OUTCOME:$APK_OUTCOME" in - success:success:success) - echo "### Build passed" - 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 "A release-signed tester build that installs over Stable or Preview is being published now 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 - echo "Fallback: [open **PR Release Publish**]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/workflows/pr-release-publish.yml) on \`main\` and enter PR \`$PR\`." - ;; - success:success:*) - echo "### APK publication incomplete" - echo - echo "Compilation and unit tests passed, but APK publication did not complete. See [the run]($RUN_URL)." - ;; - success:failure:*) - echo "### ERROR: Unit tests failed" - echo - echo "The APK compiled, but unit tests failed. No installable artifact was published." - echo - if [ -n "$TEST_DIAGNOSTICS_URL" ]; then - echo "The [unit-test-results]($TEST_DIAGNOSTICS_URL) artifact contains the test log and any generated reports." - else - echo "The test diagnostics upload did not complete. See [the test log]($RUN_URL)." - fi - ;; - success:*) - echo "### Build incomplete" - echo - echo "The APK compiled, but unit tests did not complete successfully. See [the run]($RUN_URL)." - ;; - failure:*) - echo "### ERROR: Build failed" - echo - echo "The compiler's errors ([full log]($RUN_URL)):" - echo - echo '```' - { grep -E '^e: |^w: .*error|error:|CMake Error|fatal error|ninja: error|FAILED|What went wrong|Execution failed for task|Unresolved reference|Type mismatch|Unresolved' /tmp/build.log 2>/dev/null \ - | sed -e 's#file:///home/runner/work/[^/]*/[^/]*/##' -e 's#/home/runner/work/[^/]*/[^/]*/##' \ - | grep -v '^w: ' | awk '!seen[$0]++' | head -80; } || true - echo '```' - echo - echo "
What went wrong (Gradle)" - echo - echo '```' - awk '/^\* What went wrong/{p=1} /^\* Try:/{p=0} p{print}' /tmp/build.log 2>/dev/null | head -60 - echo '```' - echo "
" - ;; - skipped:*|cancelled:*) - echo "### Not built" - echo - echo "The build did not run (see above, or [the run]($RUN_URL))." - ;; - esac - echo - } > /tmp/pr-report.md - cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" - ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.body | startswith(\"$MARK\")) | .id" | head -1 || true) - if [ -n "$ID" ]; then - gh api -X PATCH "repos/${GITHUB_REPOSITORY}/issues/comments/${ID}" -F body=@/tmp/pr-report.md >/dev/null - else - gh api -X POST "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" -F body=@/tmp/pr-report.md >/dev/null - fi + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify backend and test source match + env: + XBOX_SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" + - name: Rust toolchain + id: rust + run: echo "rustc=$(rustc -V | awk '{print $2}')" >> "$GITHUB_OUTPUT" + - name: Cache cargo registry and the host test target + uses: actions/cache@v4 + with: + path: | + ~/.cargo/registry/index + ~/.cargo/registry/cache + ~/.cargo/git/db + app/src/main/rust/stores/target + key: stores-host-v1-${{ runner.os }}-${{ runner.arch }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}-${{ hashFiles('app/src/main/rust/stores/src/**', 'app/src/main/rust/stores/Cargo.toml', 'app/src/main/rust/stores/build.rs') }} + restore-keys: | + stores-host-v1-${{ runner.os }}-${{ runner.arch }}-${{ steps.rust.outputs.rustc }}-${{ hashFiles('app/src/main/rust/stores/Cargo.lock') }}- + stores-host-v1-${{ runner.os }}-${{ runner.arch }}-${{ steps.rust.outputs.rustc }}- + - name: Store engines host unit tests + timeout-minutes: 10 + continue-on-error: true + run: | + set -o pipefail + cd app/src/main/rust/stores + cargo test --locked 2>&1 | tail -60 + + python-tests: + name: Python and native regression tests + needs: source + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} + runs-on: ubuntu-24.04 + timeout-minutes: 15 + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + sparse-checkout: | + /* + !/docs/releases/media/ + sparse-checkout-cone-mode: false + persist-credentials: false + - name: Merge the pinned APK base + if: github.event_name == 'pull_request' + env: + BUILD_BASE_SHA: ${{ needs.source.outputs.base-sha }} + run: | + set -euo pipefail + git fetch --no-tags origin "$BUILD_BASE_SHA" + git config user.name "ci" + git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true + git merge --no-ff --no-edit FETCH_HEAD + - name: Verify backend and test source match + env: + XBOX_SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} + run: test "$(git rev-parse 'HEAD^{tree}')" = "$XBOX_SOURCE_TREE" + - name: Install Python test dependencies + timeout-minutes: 7 + run: bash tools/ci/install-ubuntu-packages.sh python3-yaml gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user libvulkan-dev mesa-vulkan-drivers + - name: Resolve the pinned Android NDK + run: bash tools/ci/resolve-ndk.sh + + - name: Check Quest tracking IPC + run: | + set -euo pipefail + NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" + VK_INCLUDE=$(ls -d "$NDK"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) + mkdir -p build/vr/include + cp -R "$VK_INCLUDE/vulkan" build/vr/include/ + if [ -d "$VK_INCLUDE/vk_video" ]; then cp -R "$VK_INCLUDE/vk_video" build/vr/include/; fi + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_tracking.cpp -o /tmp/test-xr-tracking + /tmp/test-xr-tracking + g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_xr_touch.cpp -o /tmp/test-xr-touch + /tmp/test-xr-touch + g++ -std=c++17 -Wall -Wextra -Werror tools/vr/tests/test_pad_controller_config.cpp -o /tmp/test-pad-controller-config + /tmp/test-pad-controller-config + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_vsync.cpp -o /tmp/test-xr-vsync + /tmp/test-xr-vsync + g++ -std=c++17 -Wall -Wextra -Werror -pthread tools/vr/tests/test_xr_frames.cpp -o /tmp/test-xr-frames + /tmp/test-xr-frames + cc -Itools/vr/third_party/wayland -c tools/vr/src/wayland_client_stub.c -o /tmp/test-wayland-stub.o + cc -Itools/vr/third_party/wayland -c app/src/main/cpp/waylandcomp/generated/xdg-shell-protocol.c -o /tmp/test-xdg-shell.o + g++ -std=c++17 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers -pthread -Ibuild/vr/include \ + -Itools/vr/third_party/wayland -Iapp/src/main/cpp/waylandcomp/generated \ + tools/vr/tests/test_presenter_shutdown.cpp tools/vr/src/presenter.cpp /tmp/test-wayland-stub.o /tmp/test-xdg-shell.o \ + -ldl -o /tmp/test-presenter-shutdown + timeout 10 /tmp/test-presenter-shutdown + + - name: Steam import and game environment tests + run: bash tools/ci/run-python-tests.sh + + checks: + name: Compile and test APK + needs: [build, python-tests] + if: ${{ !cancelled() && (github.event_name != 'pull_request' || !github.event.pull_request.draft) }} + runs-on: ubuntu-24.04 + timeout-minutes: 5 + steps: + - name: Require compilation and every test job + env: + BUILD_RESULT: ${{ needs.build.result }} + PYTHON_RESULT: ${{ needs.python-tests.result }} + run: test "$BUILD_RESULT" = success && test "$PYTHON_RESULT" = success sign: - needs: build + needs: [build, checks] if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' permissions: contents: read @@ -774,7 +820,7 @@ jobs: secrets: inherit packs: - needs: build + needs: [build, checks] if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' permissions: contents: read @@ -794,6 +840,10 @@ jobs: CI_REPO: Droid-Deck/DroidDeck-CI KEEP: 10 steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + persist-credentials: false - uses: actions/download-artifact@v4 with: pattern: droiddeck-signed-* @@ -811,72 +861,13 @@ jobs: - name: Describe the change env: GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - pr=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/pulls" \ - --jq '[.[] | select(.merged_at != null and .base.ref == "main")] | first // empty') - if [ -n "$pr" ]; then - number=$(jq -r .number <<<"$pr") - title=$(jq -r .title <<<"$pr") - merged=$(jq -r '.merged_at[:10]' <<<"$pr") - summary=$(jq -r '.body // ""' <<<"$pr" | tr -d '\r' | { grep -v '^🤖' || true; } | - awk '!p && /^#/ { next } NF { p = 1; print; next } p { exit }' | head -n 6 | cut -c1-400) - { - echo "**Merged to main** - [PR #$number]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$number): $title (merged $merged)" - if [ -n "$summary" ]; then - echo - echo "$summary" - fi - } > notes-head.md - else - subject=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA" --jq '.commit.message | split("\n")[0]') - echo "**Pushed to main** without a PR - $subject" > notes-head.md - fi - cat notes-head.md + run: bash tools/release/describe-build.sh - name: Publish to DroidDeck-CI id: publish env: GH_TOKEN: ${{ steps.ci-token.outputs.token }} - run: | - set -euo pipefail - tag=main-${GITHUB_SHA::7} - cat signed/SHA256SUMS-*.txt > signed/SHA256SUMS.txt - rm signed/SHA256SUMS-*.txt - notes="$(cat notes-head.md) - - Signed build of $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA - in main, not yet in a DroidDeck release; for testing. - Commit: $GITHUB_SHA - VersionCode: $(sed -n 's/^ *versionCode \([0-9][0-9]*\)$/\1/p' app/build.gradle) - Each apk installs over a DroidDeck release and keeps its data. \`standard\` is the normal app; the others are the same app under another package name, installed beside it. - - SHA-256: - \`\`\` - $(cat signed/SHA256SUMS.txt) - \`\`\`" - gh release delete "$tag" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null || true - gh release create "$tag" -R "$CI_REPO" --target main --prerelease \ - --title "main ${GITHUB_SHA::7}" --notes "$notes" signed/* - gh release list -R "$CI_REPO" -L 200 --json tagName,publishedAt \ - --jq '[.[] | select(.tagName | startswith("main-"))] | sort_by(.publishedAt) | reverse | .['"$KEEP"':][] | .tagName' | - while IFS= read -r old; do - if [ "$old" = "$tag" ]; then - continue - fi - if ! gh release delete "$old" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null; then - if gh release view "$old" -R "$CI_REPO" >/dev/null 2>&1; then - echo "::error::Could not delete old release $old" - exit 1 - fi - fi - done - published=$(gh release view "$tag" -R "$CI_REPO" --json tagName,assets) - jq -e --arg tag "$tag" '.tagName == $tag and (.assets | length) > 0' <<< "$published" >/dev/null - url="$GITHUB_SERVER_URL/$CI_REPO/releases/tag/$tag" - apk=$(cd signed && ls DroidDeck-*.apk | awk 'length(a) == 0 || length($0) < length(a) { a = $0 } END { print a }') - echo "release=$url" >> "$GITHUB_OUTPUT" - echo "apk=$GITHUB_SERVER_URL/$CI_REPO/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" - echo "Published $url" + run: bash tools/release/publish-ci.sh - name: Post the Preview build to Discord env: @@ -884,26 +875,8 @@ jobs: GH_TOKEN: ${{ github.token }} RELEASE: ${{ steps.publish.outputs.release }} APK: ${{ steps.publish.outputs.apk }} - run: | - set -euo pipefail - if [ -z "$WEBHOOK" ]; then - echo "::notice::No DISCORD_BUILDS_WEBHOOK secret; nothing posted" - exit 0 - fi - commit=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA") - subject=$(jq -r '.commit.message | split("\n")[0]' <<<"$commit") - title=$(jq -r '.commit.message | split("\n") | map(select(length > 0)) | .[1] // ""' <<<"$commit") - pr=$(sed -n 's/^Merge pull request #\([0-9]*\).*/\1/p' <<<"$subject") - if [ -n "$pr" ]; then - what="[#$pr]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$pr): ${title:-$subject}" - else - what="[\`${GITHUB_SHA::7}\`]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA): $subject" - fi - get=$(printf 'Download: [standard APK](<%s>) · [all variants](<%s>)' "$APK" "$RELEASE") - content=$(printf '**New signed Preview build** `main-%s`\n%s\nIn the app: **Updates → Preview**\n%s' "${GITHUB_SHA::7}" "$what" "$get") - jq -n --arg content "$content" '{content: $content, allowed_mentions: {parse: []}}' | - curl -fsS -H 'Content-Type: application/json' -d @- "$WEBHOOK" -o /dev/null - echo "Posted: $content" + run: bash tools/release/announce-preview.sh + catalog: needs: announce diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index dab96e015..85f972a1b 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/.github/workflows/publish-packs.yml b/.github/workflows/publish-packs.yml index 580b1c818..de4adb3b2 100644 --- a/.github/workflows/publish-packs.yml +++ b/.github/workflows/publish-packs.yml @@ -1,11 +1,5 @@ name: Publish add-on packs -# The add-on packs (tools/packs/build.sh) a Build APK run made, published to DroidDeck-Components under -# content-addressed tags (pack--). The APK from that run pins each pack's -# SHA-256 and downloads it from that tag. A tag is created once and never replaced. -# Only main and release builds publish here; a PR test build attaches the packs main has not published -# to its pr-N release on DroidDeck-CI (pr-release-publish.yml), which is deleted when the PR closes. - on: workflow_call: inputs: @@ -61,7 +55,7 @@ jobs: jq -r --arg n "$2" '.assets // [] | .[] | select(.name == $n) | .digest // empty' } commit=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$BUILD_RUN" --jq .head_sha 2>/dev/null || echo "$GITHUB_SHA") - for name in proot directaudio tracking xbox comet; do + for name in proot directaudio tracking xbox comet butler; do file="packs/$name.tar.zst" [ -f "$file" ] || { echo "::error::$name.tar.zst is missing from Build APK run $BUILD_RUN"; exit 1; } sha=$(sha256sum "$file" | cut -d' ' -f1) diff --git a/.gitignore b/.gitignore index e5bdbfffc..bfeee7641 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ app/src/main/jniLibs/arm64-v8a/libproot.so app/src/main/jniLibs/arm64-v8a/.proot-inputs app/src/main/jniLibs/arm64-v8a/.proot-outputs app/src/main/jniLibs/arm64-v8a/libproot-loader.so +app/src/main/jniLibs/arm64-v8a/libsyncthingnative.so +app/src/main/jniLibs/arm64-v8a/.syncthing-inputs app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so app/src/main/rust/stores/target/ app/src/main/assets/droiddeck-esync/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..50f7a038b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tools/syncthing/syncthing-android"] + path = tools/syncthing/syncthing-android + url = https://github.com/researchxxl/syncthing-android diff --git a/LICENSE b/LICENSE index 5ae980bfc..3ffac1c5e 100644 --- a/LICENSE +++ b/LICENSE @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Pluvia is an unofficial Steam client app for Android - Copyright (C) 2024 Oxters Wyzgowski + DroidDeck brings the SteamOS experience to Android + Copyright (C) 2026 DroidDeck contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Pluvia Copyright (C) 2024 Oxters Wyzgowski + DroidDeck Copyright (C) 2026 DroidDeck contributors This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/README.md b/README.md index fb86fa653..12494cad1 100644 --- a/README.md +++ b/README.md @@ -5,54 +5,155 @@

-DroidDeck brings the SteamOS experience to Android: Valve's Steam client in Big Picture on your Adreno handheld, with Windows games through Valve's ARM64 Proton. +DroidDeck brings the SteamOS experience to Android: Steam Gaming Mode, full Linux desktop, integration with GOG, Epic Games, Xbox, and other storefronts, Steam VR, and more! -

Join the DroidDeck Discord

+

100% open source. No ads. No telemetry. No source withheld.

-

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

+

+ Download DroidDeck 0.6.7 + Join the DroidDeck Discord +

-> Note: DroidDeck does not have a stand-alone website. Do not click on any download links from websites claiming to be the DroidDeck team. +

+ Star History Rank +

-## Requirements and install +

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

-Use Android 9 or newer on a supported Adreno device (730 or newer, or 8xx). Adreno 6xx is experimental: DirectX 11 uses DXVK 2 and may run, and DirectX 12 games can still crash. Mali, Xclipse, PowerVR, and Adreno 710 are unsupported. No root is required. Allow about 3 GB for the runtime and 1.1 GB more for the desktop and emulators. Install the APK from [Releases](https://github.com/Droid-Deck/DroidDeck/releases), install the Linux runtime, then press **Play** and sign in. Steam downloads on first launch. Install **Desktop & apps** to use the desktop and emulators. The **Store** installs Linux apps and games from Flathub (ARM64 builds) with Flatpak; with additional options to install Appimages and set up scripts. **Stores** (Setup › Stores › "Show Stores in the rail") signs in to GOG, Epic Games and Amazon Games and downloads games into the Games storage. Epic keeps its direct API install path. Opening Epic Stores prepares Epic’s official Linux launcher preview. When installed, Epic games launched from DroidDeck use that client, and games installed in the client are imported into DroidDeck’s library and shortcuts. The x86-64 client runs through FEX on ARM and DroidDeck retains its Proton hooks; this preview and ARM setup are outside Epic’s listed Linux support. The cog on a store’s chip row sets its opening tab and download speed tier. +

On a Retroid Pocket Duo: Play Steam from the DroidDeck launcher, open Pac-Man in Steam Big Picture and play it, exit the game, then Switch to Desktop from the Power menu

-On Android 14 and newer, before Steam launches, you must turn on **Disable child process restrictions** in Developer options. If this option is not available in developer settings (Android 12 and 13 devices), first launch of Steam will present a "Fix it for me" button, which will help automate the setup process. +> DroidDeck has no website. Only download it from this repository's [Releases](https://github.com/Droid-Deck/DroidDeck/releases). -## Smart glasses +

+ The Library switching source chips, changing the card size and opening the Filter menu + A Windows game running through Proton with the on-screen controls + Two controllers playing split screen on one handheld + The Kubuntu desktop with Discover open +

-Use **Setup → Smart glasses** for app-wide virtual-screen settings across DroidDeck menus, launchers, desktop sessions, and games. Supported VITURE, RayNeo, XREAL, and Rokid connections provide 3DoF; Luma Ultra adds optional experimental 6DoF and stereo-assisted hand/Joy-Con tracking. Model support and SDK requirements differ: see the [smart-glasses support matrix](docs/smart-glasses-support.md) for supported devices, controls, setup, and limitations. +## Install -## Community +1. Android 9 or newer on Adreno 730 or newer, or any 8xx. Adreno 6xx is experimental. Mali, Xclipse, PowerVR and Adreno 710 are unsupported. No root needed. +2. About 3 GB free for the runtime, plus 1.1 GB for the desktop and emulators. +3. Install the [APK](https://github.com/Droid-Deck/DroidDeck/releases/download/0.6.7/DroidDeck-0.6.7.apk), install the Linux runtime, press **Play** and sign in to Steam. +4. On Android 14 and newer, turn on **Disable child process restrictions** in Developer options. On Android 12 and 13, Steam's first launch shows a **Fix it for me** button that walks you through it. -Join the [DroidDeck Discord](https://discord.gg/JRGAvawjsm) for help, Preview builds, and device reports. Bug reports go in its **#bug-reports** forum; attach the zip from **Share logs** (Setup, or the session drawer) so the logs come with it. +Smart glasses setup is in the [support matrix](docs/smart-glasses-support.md). Release notes are in [docs/releases](docs/releases). + +Help, Preview builds and device reports are on [Discord](https://discord.gg/JRGAvawjsm). For bugs, post in **#bug-reports** with the zip from **Share logs**. ## Build -Run `tools/build_local.sh` with Docker, Java 17, the Android SDK/NDK, Rust through rustup, GitHub CLI, Python 3, and `zstd` installed. It prepares the same native libraries, pinned components and audio sinks as CI, then checks the APK's assets, JNI exports and dependencies. The APK is at `app/build/outputs/apk/release/app-release.apk`. Set `DROIDDECK_PA13_SOURCE_DIR` to an existing PulseAudio 13.0 source directory to skip downloading it. Set `DROIDDECK_SIGNING_ENV` to a signing environment file to install over a release build; relative keystore paths resolve beside that file. To install on an attached device, run `tools/deploy_local.sh`. +Needs Docker, Java 21, the Android SDK and NDK, Rust via rustup, GitHub CLI, Python 3 and `zstd`. -After preparation, ordinary `./gradlew :app:assembleRelease` builds can reuse the verified inputs. If native sources, component pins or staged files change, packaging stops with instructions to rerun the helper. Generated audio stays under `app/build/`; the tracked base bundle is never modified. `./gradlew -PskipRust=true :app:testDebugUnitTest` needs no native preparation. For an APK without store engines, use `DROIDDECK_SKIP_RUST=1 tools/build_local.sh`; it omits cached engine libraries too. +```bash +tools/build_local.sh +``` -For the prepared Windows checkout, run `./tools/run_windows.ps1` (optionally with `-Serial `), or select **DroidDeck XR** in Android Studio and run the **app** module on the connected phone. Machine-specific options live in the ignored `local.properties`: `droiddeck.python` selects a Python executable, `droiddeck.skipRust=true` omits the optional store download engines, and `droiddeck.debugApplicationIdSuffix=.xr` installs **DroidDeck XR Dev** alongside the signed release. The development app has its own runtime and Steam login. The local Java selection is in `.gradle/config.properties`. +The APK lands in `app/build/outputs/apk/release/`. Install it with `tools/deploy_local.sh`. After the first run, `./gradlew :app:assembleRelease` reuses the prepared inputs. Unit tests run with `./gradlew -PskipRust=true :app:testDebugUnitTest`, and the helper and preload suite with `bash tools/test_local.sh`. -`python tools/prepare_windows_runtime.py` restores this checkout's audited runtime inputs from the pinned CI APK, three locally rebuilt preload libraries, and the checksum-pinned Gamescope archive in `build/windows-setup/`. Start Docker Desktop's Linux engine first: preparation now rebuilds DroidDeck's ARM64 VR driver and Vulkan layer from current source and runs their native regression tests. The compiler image is built automatically on first use. Vulkan headers come from the NDK beside `--llvm-strip`, or from an explicit `--vk-include ` directory. - -To reuse that build, pass `--rebuilt-vr build/windows-setup/vr`. Preparation verifies its `vr-build.json` against the current Git revision, source files, Vulkan headers, output checksums, and ARM64 architecture; missing or stale builds fail instead of falling back to the donor's VR libraries. The script checks the actual donor CI merge tree, still rejects unrelated unaudited runtime changes, and records component provenance in `app/build/windows-runtime-provenance.json`. Preserve these ignored preparation files when rebuilding locally; `clean` removes the prepared assets and their verification manifest. - -Run the helper and preload regression suite with `bash tools/test_local.sh`. On macOS it runs in Linux through Docker, matching the helpers' runtime and CI instead of compiling Linux preloads against macOS headers. +On Windows, see `tools/run_windows.ps1` and `tools/prepare_windows_runtime.py`. ## Limits -Compatibility and performance vary by device; hardware validation is limited. Desktop compositing uses software rendering. Firefox sandboxing is reduced under proot. Logs are kept app-private (`files/logs/`, the last 30 sessions); **Share logs** packs the newest session, with the stores and tool logs, into one scrubbed zip. +Compatibility and performance vary by device. Desktop compositing is software rendered, and Firefox sandboxing is reduced under proot. ## 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. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. VITURE, RayNeo, XREAL, Rokid, REDMAGIC, Nintendo Switch and Joy-Con are trademarks of their owners. This project is not affiliated with any of them. -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. +
+Runtime, Wine and Proton -Joy-Con VR controllers port the arm model of Google's [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk) (Apache-2.0), adapt the hand skeleton of Valve's [OpenVR](https://github.com/ValveSoftware/openvr) `handskeletonsimulation` sample (BSD-3-Clause), which follows Moshi Turner's hand simulation in [Monado](https://gitlab.freedesktop.org/monado/monado), and use the Index controller offsets from Monado's `vive_poses.c` (BSL-1.0). Joy-Con behaviour was researched in Linux's [hid-nintendo](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-nintendo.c) driver by Daniel J. Ogorchock, [@dekuNukem](https://github.com/dekuNukem)'s [Nintendo_Switch_Reverse_Engineering](https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering), [SDL](https://github.com/libsdl-org/SDL) and the Android Open Source Project, and checked against [ALVR](https://github.com/alvr-org/ALVR), [OpenComposite](https://gitlab.com/znixian/OpenOVR), [PSMoveSteamVRBridge](https://github.com/HipsterSloth/PSMoveSteamVRBridge), [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr), [@krnelpan1c](https://github.com/krnelpan1c)'s [Daydream-Controller-SteamVR](https://github.com/krnelpan1c/Daydream-Controller-SteamVR), [@yoyobuae](https://github.com/yoyobuae)'s [joyconvr](https://github.com/yoyobuae/joyconvr), [Moonlight](https://github.com/moonlight-stream/moonlight-android) and [Dolphin](https://github.com/dolphin-emu/dolphin); see [docs/third-party/joycon](docs/third-party/joycon/README.md). Nintendo Switch and Joy-Con are trademarks of Nintendo; this project is not affiliated with Nintendo. +- Runtime, shim, input and controller work build on WinNative and Bannerlator by maxjivi05. +- mmap ring buffer controller input by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). +- [FEX](https://github.com/FEX-Emu/FEX) (MIT) runs x86 code. DroidDeck's build puts the platform name under `AT_PLATFORM` so [sharun](https://github.com/VHSgunzo/sharun) AppImages by VHSgunzo (MIT) start through its [userland-execve](https://crates.io/crates/userland-execve) loader (MIT). FEX's code disk cache was checked in its source. +- x86 AppImages, and arm64 ones whose runtime can't unpack on Android, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence. +- x86 programs linking OpenSSL 3 use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt). x86 Linux games get the `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes. +- `WriteProcessMemory` hooks fall back to `/proc//mem` the way [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` did before Wine 11. +- Wine write watches use userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later). libblsession supplies the arm64 syscall number and answers `PAGEMAP_SCAN` from `/proc/self/pagemap`. +- libblsession runs Wine's arm64 `SIGUSR2` context handler (`dlls/ntdll/unix/signal_arm64.c`, LGPL-2.1-or-later) in place on a frame laid out like [Linux](https://github.com/torvalds/linux)'s `arch/arm64/kernel/signal.c`, and serves `fill_vm_counters` in `dlls/ntdll/unix/process.c` the kernel's own `/proc//status`. +- droiddeck-ntsync follows the [Linux](https://github.com/torvalds/linux) ntsync semantics in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). +- The proot fast path orders bindings like [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later). +- DiRT 3 and DiRT Showdown keep their telemetry socket the way RoccoC's DiRTTelemetryErrorFix (MIT) does, based on the fix by Carsten Gottschling. +- Games use [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's per render pass memory choice. The Steam client keeps `TU_DEBUG=sysmem`. +- Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose `311210.py` and `570940.py` fail under ARM64 Proton. +- [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans uses the launch option from its README and D3D12 feature level 12_1. +- 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). -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. +
+Stores + +- Epic Games and GOG build on [Phobos](https://github.com/phobos665)'s adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl). GOG install script registry entries are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher) (GPL-3.0) reads them. +- Epic's official Linux launcher preview runs through FEX. That setup is outside Epic's listed Linux support. +- Battle.net is by [@kayakyakr](https://github.com/kayakyakr). It runs Blizzard's own client in Proton (downloaded from Blizzard, not included) and shows key art from the [Battle.net Shop](https://shop.battle.net). Without Steam, its games see the pad as an Xbox 360 controller via `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. +- Battle.net installs drive Blizzard's Agent the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) does, with requests from [wowdev.wiki](https://wowdev.wiki/Agent). Read without taking code: [@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. +- Xbox games load [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) modules (LGPL-2.1-or-later), including `wintypes.dll`. Minecraft's GameInput setup was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). +- The Xbox Cloud Gaming player uses the WebRTC client of [@unknownskl](https://github.com/unknownskl)'s [Greenlight](https://github.com/unknownskl/greenlight) (MIT), and its offer tweaks and sharpening follow [@redphx](https://github.com/redphx)'s [Better xCloud](https://github.com/redphx/better-xcloud) (MIT). See `tools/xcloud-player/NOTICE.md`. +- The itch.io butler pack ships butler's `7z.so`, itch.io's build of [7-Zip](https://www.7-zip.org) by Igor Pavlov (LGPL-2.1, unRAR restriction on RAR code), unmodified. Other archives use Apache Commons Compress and the runtime's bsdtar (libarchive). +- The Store uses [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1) through DroidDeck's own bubblewrap shim. Chromium and Electron apps start directly, since [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause) always uses Flatpak's spawn portal. +- Folder sync runs [Syncthing](https://github.com/syncthing/syncthing) (MPL-2.0), built from [@researchxxl](https://github.com/researchxxl)'s [syncthing-android](https://github.com/researchxxl/syncthing-android) fork (MPL-2.0). + +
+ +
+Audio, video and HUD + +- Steam 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`. +- The DroidDeck HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term). Its readings match Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT), with frame times from gamescope patch 0125. +- The HUD's CPU, GPU load, thermal and battery readers come from [@xXJSONDeruloXx](https://github.com/xXJSONDeruloXx)'s work. +- LSFG frame generation comes from Camille LaVey and the [Eden](https://eden-emu.dev) project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported 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. +- Remote Play decodes through Android's MediaCodec or the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) in Steam's runtime. Qualcomm low latency settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0). +- [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) sockets use the settings in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions. + +
+ +
+Desktop + +- The KDE pacman repository snapshots [Arch Linux ARM](https://archlinuxarm.org) and installs with [pacman](https://gitlab.archlinux.org/pacman/pacman) (GPL-2.0-or-later). +- [KWin](https://invent.kde.org/plasma/kwin) (GPL-2.0-or-later) is patched to pass on the scroll data its `wayland_backend.cpp` leaves as a TODO. +- Read without taking code: [Qt](https://code.qt.io/cgit/qt/qtbase.git)'s `qwaylandinputdevice.cpp` and `qguiapplication.cpp`, [Konsole](https://invent.kde.org/utilities/konsole)'s `TerminalDisplay.cpp`, and [Mesa](https://gitlab.freedesktop.org/mesa/mesa)'s `u_threaded_context.c` and `zink_resource.c`. +- The Steam Keyboard window rule follows Valve's `steamdeck-kde-presets` with [Bazzite](https://github.com/ublue-os/bazzite)'s `0001-steam-virtual-keyboard.patch`. +- Steam's Browse buttons open a GTK 3 file chooser via PyGObject (LGPL-2.1-or-later), shown over Steam by [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) through `GetAppIdFromReaper`. +- The AYN Odin 2 phantom second display was confirmed by [@SapphireRhodonite](https://github.com/SapphireRhodonite)'s [WatermelonDS 0.0.5](https://github.com/SapphireRhodonite/WatermelonDS/releases/tag/0.0.5) notes and [iiSU #363](https://github.com/iisu-network/iiSU/issues/363), without taking their code. + +
+ +
+Smart glasses + +- Builds on WinNative's VITURE work. Protocol checked against [@wheaney](https://github.com/wheaney)'s [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver), [@badicsalex](https://github.com/badicsalex)'s [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and [go-macos/iokit](https://pkg.go.dev/github.com/go-macos/iokit/viture). The optional VITURE SDK is not included. +- The VITURE protocol V2 frames adapt [@elasticjava](https://github.com/elasticjava)'s [viture-v2](https://github.com/elasticjava/viture-v2) (MIT) by Holger Bartnick. See `docs/third-party/viture-v2`. +- RayNeo 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 references XRLinuxDriver and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [@rohitsangwan01](https://github.com/rohitsangwan01)'s [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) (MIT) and [@0xcaff](https://github.com/0xcaff)'s [xr-tools](https://github.com/0xcaff/xr-tools). +- Rokid follows ar-drivers-rs, @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/) and Monado's Rokid driver. +- REDMAGIC 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). + +
+ +
+VR, Joy-Con and hand tracking + +- Joy-Con VR ports the arm model from Google's [GVR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk) (Apache-2.0) and adapts the hand skeleton from Valve's [OpenVR](https://github.com/ValveSoftware/openvr) `handskeletonsimulation` sample (BSD-3-Clause), which follows Moshi Turner's work in Monado. Index offsets come from Monado's `vive_poses.c` (BSL-1.0). +- Joy-Con research: Linux's [hid-nintendo](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-nintendo.c) by Daniel J. Ogorchock, [@dekuNukem](https://github.com/dekuNukem)'s [Nintendo_Switch_Reverse_Engineering](https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering), [SDL](https://github.com/libsdl-org/SDL) and AOSP. Checked against [ALVR](https://github.com/alvr-org/ALVR), [OpenComposite](https://gitlab.com/znixian/OpenOVR), [PSMoveSteamVRBridge](https://github.com/HipsterSloth/PSMoveSteamVRBridge), [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr), [@krnelpan1c](https://github.com/krnelpan1c)'s [Daydream-Controller-SteamVR](https://github.com/krnelpan1c/Daydream-Controller-SteamVR), [@yoyobuae](https://github.com/yoyobuae)'s [joyconvr](https://github.com/yoyobuae/joyconvr), [Moonlight](https://github.com/moonlight-stream/moonlight-android) and [Dolphin](https://github.com/dolphin-emu/dolphin). See [docs/third-party/joycon](docs/third-party/joycon/README.md). +- Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Pose Landmarker (Lite), BlazePose GHUM 3D and Hand Landmarker (Apache-2.0) on [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) frames (Apache-2.0), with usage reports off. Checked against JoyConVr's camera app (MIT). +- Tracking math: the GVR arm model's accelerometer mode, Eric Foxlin's zero velocity updates, Frosio, Pedersini and Borghese's accelerometer autocalibration, a Kalman filter (Kalman, 1960), Horn's quaternion method (1987) and the 1€ filter (Casiez, Roussel and Vogel, 2012). +- Gestures follow [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, tuned on [HaGRID](https://github.com/hukenovs/hagrid) photos (CC BY-SA 4.0, not included). +- The glove model follows OpenVR's render model reference, is meshed with surface nets (Gibson, 1998; Mikola Lysenko), and uses Inigo Quilez's smooth minimum, distance field ambient occlusion and polygon distance (MIT). See [docs/third-party/handtracking](docs/third-party/handtracking/README.md). + +
+ +## Star history + + + + + Star history chart + + diff --git a/app/build.gradle b/app/build.gradle index 4bc1806c2..0d94314d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,8 @@ plugins { id 'com.android.application' } -apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.kotlin.plugin.compose' -// Machine-specific tooling and optional CI-prepared inputs stay out of version control. def localBuildOptions = new Properties() def localBuildOptionsFile = rootProject.layout.projectDirectory.file('local.properties') if (localBuildOptionsFile.asFile.exists()) { @@ -78,19 +76,29 @@ def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getOrNull() ?: providers.environmentVariable('GITHUB_SHA').getOrNull() ?: gitValue(['rev-parse', 'HEAD']) ?: '' def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } +def prTitle = providers.environmentVariable('DROIDDECK_PR_TITLE').getOrNull() ?: '' +def buildBranch = providers.environmentVariable('GITHUB_HEAD_REF').getOrNull()?.trim() + ?: gitValue(['branch', '--show-current']) ?: '' +def escapeJava = { String value -> value.replace('\\', '\\\\').replace('"', '\\"').replace('\n', ' ').replace('\r', ' ') } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() -def commitTime = (gitValue(['show', '-s', '--format=%ct', 'HEAD']) ?: '0').with { it.isLong() ? it : '0' } +def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() .findAll { it.contains('=') && !it.startsWith('#') } .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } 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 addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'].collectEntries { name -> +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', 'butler'].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") + 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') @@ -115,18 +123,20 @@ def variantSuffixes = rootProject.file('tools/release/variants.txt').readLines() android { namespace 'com.droiddeck.launcher' - compileSdk 36 + compileSdk 37 ndkVersion project.findProperty('ndkVersion') ?: '27.3.13750724' defaultConfig { applicationId "com.droiddeck.launcher" minSdkVersion 26 - targetSdkVersion 36 - versionCode 15 - versionName "0.6.0" + targetSdkVersion 37 + versionCode 17 + versionName "0.6.9" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\"" buildConfigField "int", "PR_NUMBER", "${prNumber}" + buildConfigField "String", "PR_TITLE", "\"${escapeJava(prTitle)}\"" + buildConfigField "String", "BUILD_BRANCH", "\"${escapeJava(buildBranch)}\"" buildConfigField "boolean", "CI_BUILD", "${ciBuild}" buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" @@ -194,7 +204,6 @@ android { } androidResources { - // aapt's default ignore list, plus the trees shipped as add-on packs (tools/packs). ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:directaudio' } @@ -205,8 +214,7 @@ android { jniLibs { useLegacyPackaging = true pickFirsts += ['**/libtermux.so'] - // Shipped in the proot and tracking packs (tools/packs) and run or loaded from there. - excludes += ['**/libproot.so', '**/libproot-loader.so', '**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] + excludes += ['**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] } } @@ -220,8 +228,21 @@ android { unitTests.returnDefaultValues = true unitTests.includeAndroidResources = true unitTests.all { - // Robolectric keeps a sandbox per SDK level the tests ask for; seven no longer fit in Gradle's default 512 MB. + if (ciBuild) { + outputs.upToDateWhen { false } + outputs.doNotCacheIf('CI executes the test suite on every run') { true } + } + jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/java.io=ALL-UNNAMED', + '--add-opens=java.base/java.net=ALL-UNNAMED', + '--add-opens=java.base/java.security=ALL-UNNAMED', + '--add-opens=java.base/java.text=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.access=ALL-UNNAMED', + '--add-opens=java.desktop/java.awt.font=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED' maxHeapSize = '2g' + maxParallelForks = 2 def logTarget = providers.systemProperty('robolectric.logging').orNull if (logTarget != null) systemProperty 'robolectric.logging', logTarget } @@ -231,12 +252,8 @@ android { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = '17' - } } -// Vendor binaries remain in the user's SDK directory; never vendor them into Git. if (vitureSdkDir) { android.sourceSets.main.jniLibs.srcDir(new File(vitureSdkDir, 'android')) def stageVitureNotices = tasks.register('stageVitureNotices', Copy) { @@ -258,25 +275,44 @@ 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) } android.sourceSets.main.assets.setSrcDirs([runtimeAssetsDir]) -if (vitureSdkDir) android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('vitureAssets')) +if (vitureSdkDir) android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('vitureAssets').get().asFile) if (uvcDir) { def stageUvcNotices = tasks.register('stageUvcNotices', Copy) { from(new File(uvcDir, 'licenses')) into(layout.buildDirectory.dir('uvcAssets/licenses/uvc')) } tasks.named('preBuild').configure { dependsOn(stageUvcNotices) } - android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('uvcAssets')) + android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('uvcAssets').get().asFile) } tasks.named('preBuild').configure { dependsOn(stageRuntimeAssets) } +def stageGogNotices = tasks.register('stageGogNotices', Copy) { + from(layout.projectDirectory.dir('src/main/rust/stores/vendor/xdelta3')) { include 'LICENSE', 'README.droiddeck.md' } + into(layout.buildDirectory.dir('gogNotices/licenses/xdelta3')) +} +android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('gogNotices').get().asFile) +tasks.named('preBuild').configure { dependsOn(stageGogNotices) } + +if (!ciBuild) { + def stageLocalPacks = tasks.register('stageLocalPacks', Sync) { + from(layout.buildDirectory.dir('packs')) { include '*.tar.zst' } + into(layout.buildDirectory.dir('localPackAssets/packs')) + } + android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('localPackAssets').get().asFile) + tasks.named('preBuild').configure { dependsOn(stageLocalPacks) } +} + def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { mustRunAfter(stageSessionScripts, stageRuntimeAssets) workingDir rootProject.projectDir - commandLine pythonExecutable, 'tools/release/runtime_inputs.py', 'verify' + def allowStale = (project.findProperty('allowStaleRuntime') + ?: localBuildOptions.getProperty('droiddeck.allowStaleRuntime', 'false')).toString().toBoolean() + commandLine([pythonExecutable, 'tools/release/runtime_inputs.py', 'verify'] + (allowStale ? ['--allow-stale-sources'] : [])) } tasks.configureEach { task -> if (task.name in ['packageDebug', 'packageRelease']) task.dependsOn(verifyRuntimeInputs) @@ -290,6 +326,8 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { description = 'Cross-compiles the store download engines (libdroiddeckstores.so) with cargo-ndk.' onlyIf { !skipRust } inputs.dir(rustCrateDir.dir('src')) + inputs.dir(rustCrateDir.dir('vendor')) + inputs.file(rustCrateDir.file('build.rs')) inputs.files(rustCrateDir.file('Cargo.toml'), rustCrateDir.file('Cargo.lock')) inputs.property('ndkVersion', android.ndkVersion) if (!skipRust) inputs.property('rustToolchain', providers.exec { @@ -300,7 +338,7 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { workingDir rustCrateDir def cargoBin = "${System.getProperty('user.home')}/.cargo/bin" environment 'PATH', "${cargoBin}${File.pathSeparator}${System.getenv('PATH')}" - environment 'ANDROID_NDK_HOME', android.ndkDirectory.absolutePath + environment 'ANDROID_NDK_HOME', androidComponents.sdkComponents.ndkDirectory.get().asFile.absolutePath environment 'CARGO_TERM_COLOR', 'never' if (!skipRust) environment 'RUSTC', providers.exec { commandLine 'rustup', 'which', '--toolchain', 'stable', 'rustc' @@ -309,7 +347,7 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { '--output-dir', rustJniLibsDir.get().asFile.absolutePath, 'build', '--release', '--locked' } -if (!skipRust) android.sourceSets.main.jniLibs.srcDir(rustJniLibsDir) +if (!skipRust) android.sourceSets.main.jniLibs.srcDir(rustJniLibsDir.get().asFile) tasks.named('preBuild').configure { dependsOn(buildRustStores) } dependencies { @@ -318,9 +356,16 @@ dependencies { implementation 'com.github.luben:zstd-jni:1.5.7-4@aar' implementation 'org.apache.commons:commons-compress:1.27.1' implementation 'org.tukaani:xz:1.10' - implementation platform('androidx.compose:compose-bom:2024.02.00') + implementation platform('androidx.compose:compose-bom:2025.02.00') implementation 'androidx.compose.ui:ui' - implementation 'androidx.compose.material3:material3' + implementation('androidx.compose.material3:material3') { + version { strictly '1.2.0' } + } + constraints { + implementation('androidx.compose.material3:material3-android') { + version { strictly '1.2.0' } + } + } implementation 'androidx.compose.ui:ui-tooling-preview' debugImplementation 'androidx.compose.ui:ui-tooling' implementation 'androidx.activity:activity-compose:1.8.2' @@ -333,12 +378,34 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' + 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' } + implementation 'com.google.zxing:core:3.5.3' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.16.1' + testImplementation 'org.robolectric:robolectric:4.17' testImplementation 'androidx.compose.ui:ui-test-junit4' - testRuntimeOnly 'com.github.luben:zstd-jni:1.5.7-4@jar' + +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +androidComponents { + beforeVariants(selector().all()) { variant -> + variant.enableUnitTest = true + } +} + +configurations { hostZstd } +dependencies { hostZstd 'com.github.luben:zstd-jni:1.5.7-4@jar' } +androidComponents.onVariants(androidComponents.selector().all()) { variant -> + variant.unitTest?.configureTestTask { test -> + test.classpath = files(configurations.hostZstd) + test.classpath.filter { !it.name.contains("zstd-jni") } + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 002bcfe7d..401f50fce 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,27 @@ + + + + + + + + + + + + + + + + + + + + @@ -12,6 +32,8 @@ + + @@ -20,7 +42,10 @@ + + + @@ -37,19 +62,45 @@ android:localeConfig="@xml/locales_config" android:networkSecurityConfig="@xml/network_security_config" android:allowBackup="false" + android:allowAudioPlaybackCapture="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme" android:hardwareAccelerated="true" android:largeHeap="true" android:extractNativeLibs="true" + android:pageSizeCompat="enabled" android:requestLegacyExternalStorage="true" + android:enableOnBackInvokedCallback="false" android:appCategory="game" android:isGame="true"> + + + + + + + + + + + + + + + + + + + @@ -119,7 +182,7 @@ android:excludeFromRecents="true" android:noHistory="true" android:taskAffinity="${applicationId}.home" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:theme="@android:style/Theme.Translucent.NoTitleBar"> @@ -129,6 +192,18 @@ + + + + + + + + + @@ -155,10 +237,31 @@ android:process=":xboxlogin" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> + + + + + + + + + + @@ -181,6 +284,26 @@ android:resizeableActivity="true" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" /> + + + + + + + + + + + + + + +
+
+ + + diff --git a/app/src/main/assets/xcloud/player.js b/app/src/main/assets/xcloud/player.js new file mode 100644 index 000000000..3d3762149 --- /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/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index ab06f6a56..16c751605 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -8,7 +8,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=16384 add_subdirectory(adrenotools) -# DXVK's DXBC->SPIR-V translator is zlib licensed (vendored under thirdparty/dxbc). add_subdirectory(thirdparty/dxbc) set(DDFG_UPSTREAM "v0.3.0") @@ -37,13 +36,14 @@ target_link_libraries(sdnative log) add_library(deviceinfo SHARED deviceinfo/vkinfo.c) target_link_libraries(deviceinfo dl) +add_library(gpuclock SHARED gpuclock/kgsl_clock.c gpuclock/kgsl_busy.c) + add_library(termux SHARED termux/termux.c) add_library(ddvenc SHARED venc/venc_server.cpp) target_compile_features(ddvenc PRIVATE cxx_std_17) target_link_libraries(ddvenc mediandk log) -# The optional proprietary SDK is supplied locally; its headers/libraries are not vendored. if(DROIDDECK_VITURE_SDK_DIR) add_library(droiddeck_viture SHARED viture/sdk_bridge.cpp) target_compile_features(droiddeck_viture PRIVATE cxx_std_17) diff --git a/app/src/main/cpp/fakeinput_steam.cpp b/app/src/main/cpp/fakeinput_steam.cpp index c446170fe..8906b01f7 100644 --- a/app/src/main/cpp/fakeinput_steam.cpp +++ b/app/src/main/cpp/fakeinput_steam.cpp @@ -78,7 +78,6 @@ static constexpr uint8_t GAMEPAD_AXIS_COUNT = 8; static constexpr uint8_t GAMEPAD_BUTTON_COUNT = 11; static constexpr uint32_t FAKE_INPUT_RING_MAGIC = 0x46494252; static constexpr uint32_t FAKE_INPUT_RING_VERSION = 2; -// Rings hold the 64-bit input_event layout that the arm64 writers use; 32-bit guests convert on read. struct RingEvent { int64_t sec; int64_t usec; @@ -93,6 +92,7 @@ static constexpr unsigned int FAKE_INPUT_MAJOR = 13; static constexpr unsigned int FAKE_INPUT_EVENT_MINOR_BASE = 64; static constexpr unsigned int FAKE_INPUT_JS_MINOR_BASE = 0; static constexpr int UINPUT_EVENT_BASE = 16; +static constexpr int MOUSE_EVENT_SLOT = 4; static constexpr int UINPUT_EVENT_LIMIT = 64; static constexpr uint32_t UINPUT_DESCRIPTION_MAGIC = 0x46495544; @@ -121,6 +121,12 @@ static constexpr size_t FAKE_INPUT_RING_HEADER_SIZE = static constexpr size_t FAKE_INPUT_RING_SIZE = FAKE_INPUT_RING_HEADER_SIZE + (FAKE_INPUT_RING_CAPACITY * FAKE_INPUT_EVENT_SIZE); +static constexpr size_t DECK_IMU_BLOCK_SIZE = 64; +static constexpr size_t FAKE_INPUT_RING_PAD_TYPE_OFFSET = 44; +static constexpr uint32_t PAD_TYPE_DECK = 0, PAD_TYPE_STEAM = 1, PAD_TYPE_XBOX = 2, PAD_TYPE_DS4 = 3, + PAD_TYPE_DUALSENSE = 4, PAD_TYPE_LAST = PAD_TYPE_DUALSENSE, + PAD_TYPE_MOUSE = 5; +static constexpr uint32_t PAD_TYPE_SET = 0x80000000u; struct UinputDescription { uint32_t magic; @@ -149,6 +155,7 @@ struct FakeController { size_t mapping_size = 0; bool closed = false; bool needs_keyframe = true; + bool mouse = false; ~FakeController() { if (ring) munmap(ring, mapping_size); @@ -383,7 +390,6 @@ send_vibration(int strong, int weak, uint16_t duration_ms, uint16_t slot) { syscall(SYS_close, sock); } -// Must match RumbleComponent.HOLD_MS: play until the slot's next effect or stop. static constexpr uint16_t RUMBLE_HOLD_MS = 0xffff; __attribute__((visibility("hidden"))) static void send_ff_effect(const struct ff_effect &effect, uint16_t slot) { @@ -607,7 +613,7 @@ open_fake_input_ring(const char *event, int flags) { int slot = get_event_number(event); bool virtual_pad = slot >= UINPUT_EVENT_BASE; std::string ring_path = virtual_pad ? uinput_ring_path(slot) : get_ring_path_for_slot(slot); - size_t mapping_size = virtual_pad ? UINPUT_FILE_SIZE : FAKE_INPUT_RING_SIZE; + size_t mapping_size = virtual_pad ? UINPUT_FILE_SIZE : FAKE_INPUT_RING_SIZE + DECK_IMU_BLOCK_SIZE; if (ring_path.empty()) { Logger::log("No input ring is configured for %s (slot %d)\n", event, slot); errno = ENODEV; @@ -651,9 +657,22 @@ open_fake_input_ring(const char *event, int flags) { controller->uinput = description; controller->mapping_size = mapping_size; controller->generation = ring_generation(ring); + if (!virtual_pad) { + uint32_t pad_type = __atomic_load_n( + reinterpret_cast(static_cast(mapping) + FAKE_INPUT_RING_SIZE + + FAKE_INPUT_RING_PAD_TYPE_OFFSET), + __ATOMIC_ACQUIRE); + controller->mouse = (pad_type & PAD_TYPE_SET) && (pad_type & ~PAD_TYPE_SET) == PAD_TYPE_MOUSE; + } SnapshotState snap; - if (read_snapshot(ring, snap) && snap.generation == controller->generation) - capture_keyframe(*controller, snap); + if (read_snapshot(ring, snap) && snap.generation == controller->generation) { + if (controller->mouse) { + controller->read_seq = snap.write_seq; + controller->needs_keyframe = false; + } else { + capture_keyframe(*controller, snap); + } + } { std::lock_guard guard(controller_mutex()); controller_map()[fd] = controller; @@ -1156,7 +1175,8 @@ struct DeckImu { uint32_t pad_type; uint32_t latency; }; -static_assert(offsetof(DeckImu, pad_type) == 44, "DeckImu::pad_type matches FakeInputWriter"); +static_assert(offsetof(DeckImu, pad_type) == FAKE_INPUT_RING_PAD_TYPE_OFFSET, + "DeckImu::pad_type matches FakeInputWriter and the ring reader"); static_assert(offsetof(DeckImu, latency) == 48, "DeckImu::latency matches FakeInputWriter"); static constexpr uint32_t LATENCY_CONTROLLER = 1, LATENCY_TOUCH = 2; static constexpr int LOW_LATENCY_REPORT_INTERVAL_US = 1000; @@ -1173,7 +1193,6 @@ struct DeckExtras { uint32_t controls = 0; }; static constexpr uint32_t DECK_IMU_MAGIC = 0x31554D49; -static constexpr size_t DECK_IMU_BLOCK_SIZE = 64; static_assert(sizeof(DeckImu) <= DECK_IMU_BLOCK_SIZE, "the IMU block is 64 bytes in the ring file"); struct TritonSharedData { @@ -1222,7 +1241,6 @@ static constexpr int TRITON_REPORT_ID_BYTES = 1; static constexpr int TRITON_STATE_BYTES = 45; static constexpr int TRITON_REPORT_INTERVAL_US = 4000; static constexpr int TRITON_FEATURE_TIMEOUT_MS = 500; -// The app clears output_length once it has taken a report; a writer waits this long for that before overwriting. static constexpr int TRITON_OUTPUT_TIMEOUT_MS = 50; static constexpr const char *TRITON_NAME = "Steam Controller"; static constexpr const char *TRITON_SERIAL = "DROIDDECKSC01"; @@ -1270,10 +1288,6 @@ static bool fake_deck_enabled() { return enabled == 1; } -static constexpr uint32_t PAD_TYPE_DECK = 0, PAD_TYPE_STEAM = 1, PAD_TYPE_XBOX = 2, PAD_TYPE_DS4 = 3, - PAD_TYPE_DUALSENSE = 4, PAD_TYPE_LAST = PAD_TYPE_DUALSENSE; -static constexpr uint32_t PAD_TYPE_SET = 0x80000000u; - __attribute__((visibility("hidden"))) static uint32_t session_pad_type() { static int type = -1; if (type < 0) { @@ -1408,6 +1422,12 @@ __attribute__((visibility("hidden"))) static bool is_withdrawn_pad_path(const ch if (strncmp(event, "event", 5) && strncmp(event, "js", 2)) return false; int number = get_event_number(event); if (number < 0 || number >= UINPUT_EVENT_BASE) return false; + if (number == MOUSE_EVENT_SLOT && !strncmp(event, "event", 5)) { + char *fake = from_real_to_fake_path(pathname); + bool exposed = fake && path_exists(fake); + free(fake); + return !exposed; + } return number == 0 || !process_is_steam_client(); } @@ -2650,9 +2670,6 @@ __attribute__((visibility("hidden"))) static int triton_get_feature(DeckHidraw & static constexpr uint32_t TRITON_HWID = 72; static constexpr uint32_t TRITON_FW_TIMESTAMP = 0x6AC686B3; -// Steam compares the controller's firmware with TRITON_FW_TS in its bundled hardwareupdater.cfg (and blocks -// with a required update below MUST_UPDATE_TRITON_FW_TS), so the emulated pad reports at least the build -// Steam ships. static uint32_t triton_fw_timestamp() { static const uint32_t timestamp = [] { std::vector roots; @@ -3351,6 +3368,85 @@ static int copy_ioctl_bits(int op, void *destination, const unsigned char (&bits return static_cast(size); } +static constexpr uint16_t MOUSE_VENDOR_ID = 0x1dd1; +static constexpr uint16_t MOUSE_PRODUCT_ID = 0x0004; + +static int ioctl_mouse(int op, void *argp) { + int type = (op >> 8 & 0xFF); + int number = (op >> 0 & 0xFF); + if (type != 0x45) { + errno = EINVAL; + return -1; + } + switch (number) { + case 0x01: { + int version = 65536; + memcpy(argp, &version, sizeof(int)); + return 0; + } + case 0x02: { + struct input_id id; + memset(&id, 0, sizeof(id)); + id.bustype = 0x03; + id.vendor = MOUSE_VENDOR_ID; + id.product = MOUSE_PRODUCT_ID; + id.version = 1; + memcpy(argp, &id, sizeof(id)); + return 0; + } + case 0x06: + if (argp && _IOC_SIZE(op)) snprintf(static_cast(argp), _IOC_SIZE(op), "DroidDeck Mouse"); + return 0; + case 0x07: + if (argp && _IOC_SIZE(op)) snprintf(static_cast(argp), _IOC_SIZE(op), "usb-droiddeck/mouse"); + return 0; + case 0x08: + if (argp && _IOC_SIZE(op)) static_cast(argp)[0] = '\0'; + return 0; + case 0x09: { + unsigned char bitmask[(INPUT_PROP_MAX + 8) / 8] = {}; + bitmask[INPUT_PROP_POINTER / 8] |= 1 << (INPUT_PROP_POINTER % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x18: { + unsigned char bitmask[(KEY_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x20: { + unsigned char bitmask[(EV_MAX + 8) / 8] = {}; + bitmask[EV_SYN / 8] |= 1 << (EV_SYN % 8); + bitmask[EV_KEY / 8] |= 1 << (EV_KEY % 8); + bitmask[EV_REL / 8] |= 1 << (EV_REL % 8); + bitmask[EV_MSC / 8] |= 1 << (EV_MSC % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x21: { + unsigned char bitmask[(KEY_MAX + 8) / 8] = {}; + for (int button = BTN_LEFT; button <= BTN_TASK; button++) + if (button <= BTN_MIDDLE || button == BTN_SIDE || button == BTN_EXTRA) + bitmask[button / 8] |= 1 << (button % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x22: { + unsigned char bitmask[(REL_MAX + 8) / 8] = {}; + for (uint16_t code : {REL_X, REL_Y, REL_WHEEL, REL_HWHEEL, REL_WHEEL_HI_RES, REL_HWHEEL_HI_RES}) + bitmask[code / 8] |= 1 << (code % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x23: { + unsigned char bitmask[(ABS_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x35: { + unsigned char bitmask[(FF_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + default: + errno = EINVAL; + return -1; + } +} + static bool wait_snapshot(std::shared_ptr fake, std::unique_lock &guard, SnapshotState &snap) { @@ -3417,6 +3513,13 @@ EXPORT int ioctl(int fd, ioctl_request_t op, ...) { int event_number = controller->second->slot; const UinputDescription *made = controller->second->uinput; + if (controller->second->mouse) { + int result = ioctl_mouse(op, argp); + if (result >= 0) return result; + guard.unlock(); + return forward_ioctl(fd, op, argp); + } + if (type == 0x45 && number == 0x1) { Logger::log("Hooking ioctl EVIOCGVERSION for event %s\n", event); int version = 65536; @@ -3570,7 +3673,6 @@ EXPORT int ioctl(int fd, ioctl_request_t op, ...) { Logger::log("Hooking ioctl EVIOCGRAB for event %s\n", event); return 0; } else if (type == 0x6A && !strncmp(event, "event", 5)) { - // Older SDL2 builds treat any JSIOCGNAME answer as a joydev node and skip EVIOCGID, then drop the pad as 0000:0000. Logger::log("Rejecting joydev ioctl %d for event %s\n", number, event); guard.unlock(); errno = EINVAL; @@ -3680,6 +3782,12 @@ static ssize_t read_input(int fd, void *buf, size_t count) { if (fake.needs_keyframe || snap.resync_seq != fake.resync_seq || snap.write_seq < fake.read_seq || snap.write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY) { + if (fake.mouse) { + fake.read_seq = snap.write_seq; + fake.resync_seq = snap.resync_seq; + fake.needs_keyframe = false; + continue; + } capture_keyframe(fake, snap); } else { size_t events = std::min(requested, snap.write_seq - fake.read_seq); diff --git a/app/src/main/cpp/framegen/ddfg/framegen.cpp b/app/src/main/cpp/framegen/ddfg/framegen.cpp index 82d0a764b..5200f6b09 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 554c05c7f..f366d9a9c 100644 --- a/app/src/main/cpp/framegen/ddfg/record_impl.inc +++ b/app/src/main/cpp/framegen/ddfg/record_impl.inc @@ -267,8 +267,6 @@ void FrameGen::record(VkCommandBuffer cmd, VkImageView prevView, VkImageView cur pFlowReg_, flowRegA_, flowRegB_, gmSsbo_, kLevels, cfg_); } - // Every generation of one real frame is recorded into the same command buffer, so the flow - // between prev and curr is computed once and each generation gets its own synth UBO and set. if (reuseFlow && !g_scratch.flowReady) return; if (!reuseFlow) { bool gmEngaged = updateGlobalMotion(gmSlot, extent_); @@ -439,7 +437,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 +462,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/framegen/lsfg/lsfg_dll.cpp b/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp index 3a37f032a..f9ee32463 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp @@ -1,5 +1,4 @@ -// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). -// Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. +// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. #include "lsfg_dll.h" #include "lsfg_dxbc.h" diff --git a/app/src/main/cpp/framegen/lsfg/lsfg_dll.h b/app/src/main/cpp/framegen/lsfg/lsfg_dll.h index a20a6c631..81bf6781d 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dll.h +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dll.h @@ -1,5 +1,4 @@ -// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). -// Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. +// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. #pragma once diff --git a/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h b/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h index 17ba1876d..2f5286b26 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h @@ -1,5 +1,4 @@ #pragma once -// DXVK's dxbc subset is zlib licensed; vendored under cpp/thirdparty/dxbc. #include #include diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.c b/app/src/main/cpp/gpuclock/kgsl_busy.c new file mode 100644 index 000000000..a61114793 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_busy.c @@ -0,0 +1,121 @@ +// Whole-GPU busy share without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps: a thread +// samples the memstore ringbuffer timestamps (kgsl_busy.h) once a millisecond while running. +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../adrenotools/src/hook/kgsl.h" +#include "kgsl_busy.h" + +#define SAMPLE_NS 1000000L + +struct reader { + int fd; + void *map; + size_t bytes; + int first; + uint32_t last[KGSL_BUSY_SLOTS]; + pthread_mutex_t lock; + pthread_t thread; + int thread_on; + atomic_int run; + atomic_uint_fast64_t busy, samples, moves; +}; + +static void *sample_loop(void *arg) { + struct reader *r = arg; + const struct timespec gap = {0, SAMPLE_NS}; + while (atomic_load(&r->run)) { + int moved = 0; + int busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + if (busy) atomic_fetch_add(&r->busy, 1); + if (moved) atomic_fetch_add(&r->moves, 1); + atomic_fetch_add(&r->samples, 1); + nanosleep(&gap, NULL); + } + return NULL; +} + +static void reader_run(struct reader *r, int on) { + pthread_mutex_lock(&r->lock); + if (on && !r->thread_on) { + atomic_store(&r->run, 1); + if (pthread_create(&r->thread, NULL, sample_loop, r) == 0) r->thread_on = 1; + else atomic_store(&r->run, 0); + } else if (!on && r->thread_on) { + atomic_store(&r->run, 0); + pthread_join(r->thread, NULL); + r->thread_on = 0; + } + pthread_mutex_unlock(&r->lock); +} + +static void reader_close(struct reader *r) { + if (!r) return; + reader_run(r, 0); + if (r->map && r->map != MAP_FAILED) munmap(r->map, r->bytes); + if (r->fd >= 0) close(r->fd); + pthread_mutex_destroy(&r->lock); + free(r); +} + +// Returns 0 or a negative errno; *out is set on success. +static int reader_open(struct reader **out) { + struct reader *r = calloc(1, sizeof(*r)); + if (!r) return -ENOMEM; + pthread_mutex_init(&r->lock, NULL); + r->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (r->fd < 0) { int e = -errno; reader_close(r); return e; } + struct kgsl_shadowprop shadow; + memset(&shadow, 0, sizeof(shadow)); + struct kgsl_device_getproperty prop = {.type = KGSL_PROP_DEVICE_SHADOW, .value = &shadow, .sizebytes = sizeof(shadow)}; + if (ioctl(r->fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &prop)) { int e = -errno; reader_close(r); return e; } + r->bytes = shadow.size; + r->first = kgsl_busy_first_slot(shadow.size); + if (r->first < 0) { reader_close(r); return -ERANGE; } + r->map = mmap(NULL, r->bytes, PROT_READ, MAP_SHARED, r->fd, (off_t)shadow.gpuaddr); + if (r->map == MAP_FAILED) { int e = -errno; reader_close(r); return e; } + int moved = 0, started = 0; + kgsl_busy_sample(r->map, r->first, r->last, &moved); + for (int i = 0; i < KGSL_BUSY_SLOTS; i++) started |= r->last[i] != 0; + if (!started) { reader_close(r); return -ENODATA; } + *out = r; + return 0; +} + +#ifndef KGSL_BUSY_NO_JNI +#include + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeOpen(JNIEnv *env, jclass cls, jintArray error) { + struct reader *r = NULL; + int e = reader_open(&r); + if (e && error && (*env)->GetArrayLength(env, error) > 0) { + jint v = e; + (*env)->SetIntArrayRegion(env, error, 0, 1, &v); + } + return e ? 0 : (jlong)(intptr_t)r; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRun(JNIEnv *env, jclass cls, jlong handle, jboolean on) { + if (handle) reader_run((struct reader *)(intptr_t)handle, on ? 1 : 0); +} + +JNIEXPORT jboolean JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRead(JNIEnv *env, jclass cls, jlong handle, jlongArray out) { + if (!handle || !out || (*env)->GetArrayLength(env, out) < 3) return JNI_FALSE; + struct reader *r = (struct reader *)(intptr_t)handle; + jlong v[3] = {(jlong)atomic_load(&r->busy), (jlong)atomic_load(&r->samples), (jlong)atomic_load(&r->moves)}; + (*env)->SetLongArrayRegion(env, out, 0, 3, v); + return JNI_TRUE; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeClose(JNIEnv *env, jclass cls, jlong handle) { + reader_close((struct reader *)(intptr_t)handle); +} +#endif diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.h b/app/src/main/cpp/gpuclock/kgsl_busy.h new file mode 100644 index 000000000..2179cf533 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_busy.h @@ -0,0 +1,37 @@ +#ifndef DROIDDECK_KGSL_BUSY_H +#define DROIDDECK_KGSL_BUSY_H +// kgsl lets any client map its memstore read-only (KGSL_PROP_DEVICE_SHADOW). The CP writes a ringbuffer's +// start-of-pipe timestamp there before each submission's command buffers and its end-of-pipe timestamp after them +// (adreno_gen7_ringbuffer.c gen7_ringbuffer_addcmds), so start != end means that ringbuffer has work on the GPU. +// Ringbuffer entries start at KGSL_MEMSTORE_MAX: entries - 2 - 4 levels, or entries - 1 - 4 on kernels without the +// LPAC slot. Entries - 6 .. entries - 2 cover both; a context entry in that range follows the same start/end rule. +#include +#include + +#define KGSL_BUSY_ENTRY_WORDS 10 +#define KGSL_BUSY_SOP 0 +#define KGSL_BUSY_EOP 2 +#define KGSL_BUSY_SLOTS 5 + +static inline int kgsl_busy_first_slot(size_t bytes) { + size_t entries = bytes / (KGSL_BUSY_ENTRY_WORDS * sizeof(uint32_t)); + return entries < 8 ? -1 : (int)(entries - 6); +} + +// 1 when a watched slot has a submission between its start and end timestamps. *moved is set when a start +// timestamp differs from last[], which then holds the new ones. +static inline int kgsl_busy_sample(const volatile uint32_t *memstore, int first, uint32_t last[KGSL_BUSY_SLOTS], int *moved) { + int busy = 0; + for (int i = 0; i < KGSL_BUSY_SLOTS; i++) { + const volatile uint32_t *entry = memstore + (size_t)(first + i) * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + if (sop != eop) busy = 1; + if (sop != last[i]) { + *moved = 1; + last[i] = sop; + } + } + return busy; +} + +#endif diff --git a/app/src/main/cpp/gpuclock/kgsl_clock.c b/app/src/main/cpp/gpuclock/kgsl_clock.c new file mode 100644 index 000000000..b021208b4 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_clock.c @@ -0,0 +1,156 @@ +// GPU clock without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps. +// +// kgsl lets any app reserve a performance counter (IOCTL_KGSL_PERFCOUNTER_GET) but refuses to read it back while +// /sys/class/kgsl/kgsl-3d0/perfcounter is 0, and clears the counters whenever the GPU switches to another process. +// So the counter is read by the GPU itself: a small command buffer copies CP_ALWAYS_ON_COUNTER (19.2 MHz) and the +// RBBM ALWAYS_COUNT counter (GPU core cycles) to memory, runs a block of NOP packets, and copies both again. +// clock = cycles / always-on ticks * 19.2 MHz. Both reads sit in one command buffer, so a counter clear between +// them only happens if the buffer is preempted; such samples fail the range checks and are dropped. +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../adrenotools/src/hook/kgsl.h" + +#define CP_TYPE7_PKT 0x70000000u +#define CP_NOP 0x10u +#define CP_REG_TO_MEM 0x3eu +#define CP_ALWAYS_ON_COUNTER 0x980u +#define RBBM_ALWAYS_COUNT 0u +// gen7 CP protection marks registers 0x000-0x4ff readable by command buffers (adreno-gpulist.h); a counter +// kgsl places anywhere else is not read. +#define READABLE_LAST 0x4ffu +#define XO_HZ 19200000.0 +#define NOP_DWORDS 0x3fffu +#define NOP_BLOCKS 4 + +struct sampler { + int fd; + unsigned context; + unsigned counter_reg; + struct kgsl_gpumem_alloc_id ib, out; + uint32_t *ib_map; + volatile uint64_t *out_map; + size_t ib_bytes; +}; + +static unsigned odd_parity(unsigned v) { + v ^= v >> 16; + v ^= v >> 8; + v ^= v >> 4; + v &= 0xf; + return (~0x6996u >> v) & 1u; +} + +static uint32_t pkt7(unsigned op, unsigned count) { + return CP_TYPE7_PKT | count | odd_parity(count) << 15 | (op & 0x7f) << 16 | odd_parity(op) << 23; +} + +static void sampler_close(struct sampler *s) { + if (!s) return; + if (s->fd >= 0) { + if (s->ib_map && s->ib_map != MAP_FAILED) munmap(s->ib_map, s->ib.mmapsize); + if (s->out_map && s->out_map != MAP_FAILED) munmap((void *)s->out_map, s->out.mmapsize); + if (s->ib.id) { struct kgsl_gpumem_free_id f = {.id = s->ib.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } + if (s->out.id) { struct kgsl_gpumem_free_id f = {.id = s->out.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } + if (s->context) { struct kgsl_drawctxt_destroy d = {.drawctxt_id = s->context}; ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &d); } + if (s->counter_reg) { + struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_PUT, &p); + } + close(s->fd); + } + free(s); +} + +static void emit_reads(struct sampler *s, size_t *n, unsigned pass) { + const unsigned regs[2] = {CP_ALWAYS_ON_COUNTER, s->counter_reg}; + for (unsigned k = 0; k < 2; k++) { + uint64_t dst = s->out.gpuaddr + (uint64_t)(pass * 2 + k) * sizeof(uint64_t); + s->ib_map[(*n)++] = pkt7(CP_REG_TO_MEM, 3); + s->ib_map[(*n)++] = regs[k] | (2u << 18) | (1u << 30); // two dwords, 64-bit read + s->ib_map[(*n)++] = (uint32_t)dst; + s->ib_map[(*n)++] = (uint32_t)(dst >> 32); + } +} + +// Returns 0 or a negative errno; *out is set on success. +static int sampler_open(struct sampler **out) { + struct sampler *s = calloc(1, sizeof(*s)); + if (!s) return -ENOMEM; + s->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (s->fd < 0) { int e = -errno; s->fd = -1; sampler_close(s); return e; } + struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = RBBM_ALWAYS_COUNT}; + if (ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_GET, &get)) { int e = -errno; sampler_close(s); return e; } + s->counter_reg = get.offset; + if (!get.offset || get.offset > READABLE_LAST) { sampler_close(s); return -ERANGE; } + struct kgsl_drawctxt_create ctx = {.flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE}; + if (ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_CREATE, &ctx)) { int e = -errno; sampler_close(s); return e; } + s->context = ctx.drawctxt_id; + s->ib_bytes = (16 + NOP_BLOCKS * (NOP_DWORDS + 1)) * sizeof(uint32_t); + s->ib.size = (s->ib_bytes + 4095) & ~(size_t)4095; + s->out.size = 4096; + if (ioctl(s->fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &s->ib)) { int e = -errno; s->ib.id = 0; sampler_close(s); return e; } + if (ioctl(s->fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &s->out)) { int e = -errno; s->out.id = 0; sampler_close(s); return e; } + s->ib_map = mmap(NULL, s->ib.mmapsize, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, (off_t)s->ib.id << 12); + s->out_map = mmap(NULL, s->out.mmapsize, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, (off_t)s->out.id << 12); + if (s->ib_map == MAP_FAILED || s->out_map == MAP_FAILED) { int e = -errno; sampler_close(s); return e; } + size_t n = 0; + emit_reads(s, &n, 0); + for (unsigned b = 0; b < NOP_BLOCKS; b++) { + s->ib_map[n++] = pkt7(CP_NOP, NOP_DWORDS); + memset(&s->ib_map[n], 0, NOP_DWORDS * sizeof(uint32_t)); + n += NOP_DWORDS; + } + emit_reads(s, &n, 1); + s->ib_bytes = n * sizeof(uint32_t); + *out = s; + return 0; +} + +// MHz, or a negative value: -errno from kgsl, or -1000 for a sample that failed the range checks. +static int sampler_mhz(struct sampler *s) { + for (int i = 0; i < 4; i++) s->out_map[i] = 0; + struct kgsl_command_object cmd = {.gpuaddr = s->ib.gpuaddr, .size = s->ib_bytes, .flags = KGSL_CMDLIST_IB}; + struct kgsl_gpu_command submit = { + .cmdlist = (uint64_t)(uintptr_t)&cmd, .cmdsize = sizeof(cmd), .numcmds = 1, .context_id = s->context, + }; + if (ioctl(s->fd, IOCTL_KGSL_GPU_COMMAND, &submit)) return -errno; + struct kgsl_device_waittimestamp_ctxtid wait = {.context_id = s->context, .timestamp = submit.timestamp, .timeout = 250}; + if (ioctl(s->fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait)) return -errno; + uint64_t xo0 = s->out_map[0], cyc0 = s->out_map[1], xo1 = s->out_map[2], cyc1 = s->out_map[3]; + if (xo1 <= xo0 || cyc1 <= cyc0) return -1000; + uint64_t xo = xo1 - xo0, cycles = cyc1 - cyc0; + // 5 us .. 50 ms of always-on time, and a clock between 50 MHz and 2 GHz. + if (xo < 96 || xo > 960000) return -1000; + double mhz = (double)cycles / (double)xo * XO_HZ / 1e6; + if (mhz < 50 || mhz > 2000) return -1000; + return (int)(mhz + 0.5); +} + +#ifndef KGSL_CLOCK_NO_JNI +#include + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeOpen(JNIEnv *env, jclass cls, jintArray error) { + struct sampler *s = NULL; + int r = sampler_open(&s); + if (r && error && (*env)->GetArrayLength(env, error) > 0) { + jint e = r; + (*env)->SetIntArrayRegion(env, error, 0, 1, &e); + } + return r ? 0 : (jlong)(intptr_t)s; +} + +JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeSample(JNIEnv *env, jclass cls, jlong handle) { + return handle ? sampler_mhz((struct sampler *)(intptr_t)handle) : -EBADF; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeClose(JNIEnv *env, jclass cls, jlong handle) { + sampler_close((struct sampler *)(intptr_t)handle); +} +#endif diff --git a/app/src/main/cpp/questxr/gpu_frames.h b/app/src/main/cpp/questxr/gpu_frames.h index dc69dbbfb..77d7a6db6 100644 --- a/app/src/main/cpp/questxr/gpu_frames.h +++ b/app/src/main/cpp/questxr/gpu_frames.h @@ -76,7 +76,6 @@ public: } lastFrame_ = frame.header.frame_id; if (state == XrGpuFrameState::Stale) { - // No GPU read was submitted, so the producer can safely reclaim a dropped frame. dropped_++; if (!xr_gpu_send(peer_, &frame.header.frame_id, sizeof(frame.header.frame_id))) Disconnect(); return false; @@ -88,7 +87,6 @@ public: glBindImageTexture(0, raw_, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8); glDispatchCompute((width_ + 7) / 8, (height_ + 7) / 8, 1); glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); - // The producer may overwrite this slot only after the native GPU has finished reading it. glFinish(); if (glGetError() != GL_NO_ERROR) { rejected_++; Disconnect(); return false; } if (!xr_gpu_send(peer_, &frame.header.frame_id, sizeof(frame.header.frame_id))) Disconnect(); diff --git a/app/src/main/cpp/venc/venc_proto.h b/app/src/main/cpp/venc/venc_proto.h index 962257711..e69bbd822 100644 --- a/app/src/main/cpp/venc/venc_proto.h +++ b/app/src/main/cpp/venc/venc_proto.h @@ -3,13 +3,9 @@ #include -/* SOCK_SEQPACKET between the guest's Remote Play hooks and the app: the emulated /dev/video-enc0 and - * MediaCodec encoder, and remote touches. A config carries the buffer memfds (inputs first) as SCM_RIGHTS; - * every frame gets one reply, touches get none. */ - #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 }; @@ -45,11 +41,36 @@ struct venc_bitrate { uint32_t bitrate; }; -/* Remote Play's touch-as-mouse turned back into a touch; x and y are fractions of the screen in 1/65535. */ struct venc_touch { uint32_t type; uint32_t action; 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 be484c898..fd3a9ad13 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 @@ -31,8 +33,8 @@ struct Mapping { constexpr int32_t kColorFormatYuv420SemiPlanar = 21; constexpr uint32_t kBufferFlagKeyFrame = 1; constexpr uint32_t kBufferFlagCodecConfig = 2; -constexpr int kTouchWidth = 1920, kTouchHeight = 1080; // InputSpace.kt -constexpr int kRemoteTouchId = 31; // the compositor's last touch slot (MAX_TOUCH_POINTS 32) +constexpr int kTouchWidth = 1920, kTouchHeight = 1080; +constexpr int kRemoteTouchId = 31; int32_t avc_profile(int32_t v4l2) { switch (v4l2) { @@ -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}; @@ -310,7 +549,7 @@ void serve(int listener) { } } -} // namespace +} extern "C" JNIEXPORT jboolean JNICALL Java_com_droiddeck_launcher_session_VideoEncodeBridge_nativeStart(JNIEnv *env, jobject, jstring jpath) { diff --git a/app/src/main/cpp/viture/display_modes.h b/app/src/main/cpp/viture/display_modes.h index 3a78e03ae..b6b2288e2 100644 --- a/app/src/main/cpp/viture/display_modes.h +++ b/app/src/main/cpp/viture/display_modes.h @@ -1,20 +1,18 @@ #pragma once -// Our controller uses the standard display-mode vocabulary, even for Beast. -// Native mode reuses some numbers with different meanings; never pass them through. namespace droiddeck::viture { constexpr int to_native_mode(int standard) { switch (standard) { - case 0x31: return 0x31; // 1080p 60 - case 0x33: return 0x32; // 1080p 90 - case 0x34: return 0x33; // 1080p 120 - case 0x32: return 0x37; // 1080p SBS 60 - case 0x35: return 0x38; // 1080p SBS 90 - case 0x41: return 0x34; // 1200p 60 - case 0x43: return 0x35; // 1200p 90 - case 0x44: return 0x36; // 1200p 120 - case 0x42: return 0x3a; // 1200p SBS 60 - case 0x45: return 0x3b; // 1200p SBS 90 + case 0x31: return 0x31; + case 0x33: return 0x32; + case 0x34: return 0x33; + case 0x32: return 0x37; + case 0x35: return 0x38; + case 0x41: return 0x34; + case 0x43: return 0x35; + case 0x44: return 0x36; + case 0x42: return 0x3a; + case 0x45: return 0x3b; default: return -4; } } @@ -30,7 +28,7 @@ constexpr int from_native_mode(int native) { case 0x36: return 0x44; case 0x3a: return 0x42; case 0x3b: return 0x45; - default: return -4; // Ultrawide is not stereo. + default: return -4; } } } diff --git a/app/src/main/cpp/viture/mjpeg_payload.h b/app/src/main/cpp/viture/mjpeg_payload.h index a451a4eee..470ecf550 100644 --- a/app/src/main/cpp/viture/mjpeg_payload.h +++ b/app/src/main/cpp/viture/mjpeg_payload.h @@ -5,7 +5,6 @@ inline std::size_t mjpeg_payload_size(const uint8_t* bytes, std::size_t size) { if (!bytes || size < 4 || size > 4*1024*1024 || bytes[0] != 0xff || bytes[1] != 0xd8) return 0; std::size_t end = size; - // Luma Ultra UVC frames can pad the JPEG to an eight-byte boundary with zeros. while (end > 4 && size-end < 7 && bytes[end-1] == 0) --end; return bytes[end-2] == 0xff && bytes[end-1] == 0xd9 ? end : 0; } diff --git a/app/src/main/cpp/viture/sdk_bridge.cpp b/app/src/main/cpp/viture/sdk_bridge.cpp index 053c28335..04ee47a35 100644 --- a/app/src/main/cpp/viture/sdk_bridge.cpp +++ b/app/src/main/cpp/viture/sdk_bridge.cpp @@ -30,7 +30,6 @@ #include "stereo_frame_gate.h" namespace { -// SDK callbacks have no user-data parameter. Only one provider may exist at a time. std::mutex api_mutex; std::mutex pose_mutex; std::array latest_pose{}; @@ -64,7 +63,6 @@ void on_pose(float* data, uint64_t) { std::lock_guard lock(pose_mutex); if (!accepting_pose) return; std::copy_n(data + 3, 4, latest_pose.begin()); - // SDK device ticks are not Android's elapsed-realtime clock. latest_time = now_ns(); } @@ -234,8 +232,6 @@ int set_display(Session& s, int standard) { if (mode == 0) { int rc = xr_device_provider_set_display_mode(s.device, standard); if (rc != VITURE_GLASSES_ERROR_NOT_SUPPORTED) return rc; - // Older Beast firmware exposes fewer bypass modes. Fall back to its - // separate native table only when the SDK explicitly rejects the mode. } const int native = droiddeck::viture::to_native_mode(standard); if (native < 0) return native; diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index 33585818b..fd0b2f20a 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -8,6 +8,7 @@ add_library(droiddeckwayland SHARED src/sc_layer.c src/ahb_swapchain.c src/waylandcomp_jni.c + src/gpu_clock_pin.c src/droiddeck_ext.c src/wl_dmabuf.c src/wl_clipboard.c @@ -17,6 +18,7 @@ add_library(droiddeckwayland SHARED src/wl_color_mgmt.c src/hdr_compose.c src/blend_pass.c + src/gpu_busy.c generated/color-management-v1-protocol.c generated/xdg-shell-protocol.c generated/linux-dmabuf-v1-protocol.c @@ -32,6 +34,8 @@ add_library(droiddeckwayland SHARED generated/banner-ahb-v1-protocol.c src/framegen_bridge.c src/framegen_jni.c + src/hudframes.c + src/hudframes_jni.c ) target_compile_options(droiddeckwayland PRIVATE $<$:-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers>) @@ -40,6 +44,7 @@ target_include_directories(droiddeckwayland PRIVATE prebuilt/include src ${CMAKE_CURRENT_SOURCE_DIR}/../shaders + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../tools/gpuload/src ) set(DROIDDECK_FRAMEGEN_LSFG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../framegen/lsfg) @@ -94,4 +99,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 6cf0c8037..cb4447835 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/cardboard.c b/app/src/main/cpp/waylandcomp/src/cardboard.c index fc09d2f03..982c3bc47 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.c +++ b/app/src/main/cpp/waylandcomp/src/cardboard.c @@ -34,7 +34,6 @@ void cardboard_clamp(struct cardboard_params *p) { p->screen_width_m = clampf(p->screen_width_m, 0.2f, 60.0f); p->k1 = clampf(p->k1, -1.0f, 2.0f); p->k2 = clampf(p->k2, -1.0f, 2.0f); - // Optical vertical FOV on supported glasses can be as low as ~22 degrees. p->fov_deg = clampf(p->fov_deg, 20.0f, 140.0f); p->lens_inset = clampf(p->lens_inset, -0.25f, 0.25f); p->chroma = clampf(p->chroma, 0.0f, 0.05f); @@ -186,6 +185,13 @@ int vkp_cardboard_active(void) { return on; } +int vkp_cardboard_source(void) { + pthread_mutex_lock(&g_lock); + const int source = g_set.enabled ? g_set.source : CARDBOARD_SOURCE_SCREEN; + pthread_mutex_unlock(&g_lock); + return source; +} + int vkp_cardboard_pose_changed(void) { if (!g_changed) return 0; g_changed = 0; diff --git a/app/src/main/cpp/waylandcomp/src/cardboard.h b/app/src/main/cpp/waylandcomp/src/cardboard.h index 88d5ea3ff..2950faec2 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.h +++ b/app/src/main/cpp/waylandcomp/src/cardboard.h @@ -27,6 +27,7 @@ void vkp_cardboard_set_render_height(int height); void vkp_cardboard_bind_device(VkDevice dev, const VkPhysicalDeviceMemoryProperties *memprops); int vkp_cardboard_active(void); +int vkp_cardboard_source(void); int vkp_cardboard_pose_changed(void); void vkp_cardboard_begin_frame(void); VkImage vkp_cardboard_run(VkCommandBuffer cmd, VkImage src, int src_w, int src_h, int out_w, int out_h); diff --git a/app/src/main/cpp/waylandcomp/src/cardboard_frag.h b/app/src/main/cpp/waylandcomp/src/cardboard_frag.h index f74676d6a..fb098c4a3 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard_frag.h +++ b/app/src/main/cpp/waylandcomp/src/cardboard_frag.h @@ -1,4 +1,3 @@ - // 1115.1.0 #pragma once const uint32_t cardboard_frag_code[] = { 0x07230203,0x00010000,0x0008000b,0x000001ba,0x00000000,0x00020011,0x00000001,0x0006000b, diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 95a8bf83a..471748a6d 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; @@ -203,9 +207,11 @@ struct surface { struct wl_resource *dmabuf; struct dmabuf_buffer *dmabuf_buf; struct wl_listener dmabuf_destroy; + const void *last_dmabuf; 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]; @@ -256,6 +262,26 @@ static struct wl_event_source *g_render_idle, *g_frame_timer; static int g_dirty; +static int64_t g_dirty_since_ns; +volatile int g_render_on_commit = 1; +static int64_t g_rendered_tick_ns; +static int g_tick_held; +static int64_t g_hold_missed_ns; +#define HOLD_RETRY_NS 1000000000LL +#define PACE_BUFFERS 32 +static struct { + unsigned ticks, ticks_late_2ms, renders, commit_renders, null_attaches, reattaches, presented, replaced, undrawn, distinct; + int64_t tick_late_ns, tick_late_max_ns, wait_ns, wait_max_ns; + const void *buffers[PACE_BUFFERS]; + uint64_t game_frames_seen; +} g_pace; + +static void pace_note_buffer(const void *buffer) { + for (unsigned i = 0; i < g_pace.distinct && i < PACE_BUFFERS; i++) + if (g_pace.buffers[i] == buffer) return; + if (g_pace.distinct < PACE_BUFFERS) g_pace.buffers[g_pace.distinct] = buffer; + g_pace.distinct++; +} static int64_t g_last_vsync_ns; static int64_t g_tick_vsync_ns; static int64_t g_refresh_ns = 16666667; @@ -263,6 +289,7 @@ static struct wl_event_source *g_fallback_timer; static int g_fallback_armed; volatile int g_fps_limit; +volatile int g_release_unpaced; volatile int g_hide_shell; @@ -304,6 +331,7 @@ static struct { } g_perf; static void schedule_render(void); +static void on_commit_idle(void *data); static int64_t now_ns(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -370,7 +398,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); @@ -417,6 +445,12 @@ static int g_cursor_w, g_cursor_h; static int g_cursor_hidden = 1; static int g_cursor_serial; +#define CURSOR_MAX_DRAWS 2 +static struct vkp_image *g_cursor_img; +static int g_cursor_img_w, g_cursor_img_h, g_cursor_img_serial = -1; +static atomic_int g_cursor_composite; +static atomic_int g_cursor_composite_want; + static void cursor_publish_shown(void) { pthread_mutex_lock(&g_cursor_lock); if (g_cursor_w > 0) { g_cursor_hidden = 0; g_cursor_serial++; } @@ -474,6 +508,7 @@ struct active_touch { struct surface *surface; int pointer_fallback; }; static struct active_touch g_touch_points[MAX_TOUCH_POINTS]; static void touch_cancel_surface(struct surface *surface); static struct surface *g_grab; +static void publish_query_state(void); static struct surface *g_key_target; static struct surface *g_ime_click; static int g_input_pipe[2] = {-1, -1}; @@ -567,6 +602,7 @@ static void map_toplevel(struct surface *s) { raise_kept_on_top(); if (!g_desktop) g_key_target = s; apply_zorder(); + publish_query_state(); } static void unmap_toplevel(struct surface *s) { @@ -621,6 +657,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 +741,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,17 +784,12 @@ 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) { + if (!s->dmabuf && s->last_dmabuf == buffer) g_pace.reattaches++; + s->last_dmabuf = buffer; + pace_note_buffer(buffer); drop_dmabuf(s, 1); s->dmabuf = buffer; s->dmabuf_buf = b; @@ -721,8 +841,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 +867,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 +904,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)); } @@ -793,12 +951,15 @@ static void feedback_resource_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); } -static void feedback_discard_all(struct wl_list *list) { +static unsigned feedback_discard_all(struct wl_list *list) { struct wl_resource *fb, *tmp; + unsigned n = 0; wl_resource_for_each_safe(fb, tmp, list) { wp_presentation_feedback_send_discarded(fb); wl_resource_destroy(fb); + n++; } + return n; } static uint32_t nominal_refresh_ns(void) { @@ -808,10 +969,14 @@ static uint32_t nominal_refresh_ns(void) { } static int64_t presented_ns(int64_t render_ns) { - if (!g_tick_vsync_ns || render_ns - g_last_vsync_ns > (int64_t)nominal_refresh_ns() || - render_ns < g_tick_vsync_ns) + int64_t tick = g_tick_vsync_ns; + int64_t refresh = (int64_t)nominal_refresh_ns(); + if (!tick || render_ns - g_last_vsync_ns > refresh) return render_ns; - return g_tick_vsync_ns; + int64_t delta = render_ns - tick; + if (delta > refresh || -delta > refresh) + return render_ns; + return tick; } static void feedback_present_all(struct wl_list *list, int64_t t) { @@ -823,6 +988,7 @@ static void feedback_present_all(struct wl_list *list, int64_t t) { nominal_refresh_ns(), 0, 0, WP_PRESENTATION_FEEDBACK_KIND_VSYNC); wl_resource_destroy(fb); + g_pace.presented++; } } @@ -980,13 +1146,18 @@ 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); struct wl_shm_buffer *shm = buffer && !db ? wl_shm_buffer_get(buffer) : NULL; uint8_t pixel[4]; - feedback_discard_all(&s->feedback); + g_pace.replaced += feedback_discard_all(&s->feedback); + if (!buffer) g_pace.null_attaches++; + else if (!db) s->last_dmabuf = NULL; if (buffer) { wl_list_remove(&s->pending_buffer_destroy.link); @@ -1044,7 +1215,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 = { @@ -1087,6 +1261,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); @@ -1566,6 +1741,8 @@ static void bind_output(struct wl_client *c, void *data, uint32_t ver, uint32_t struct draw_list { struct vkp_draw *d; int n, cap; }; +static int add_cursor(struct draw_list *dl, int scene_w); + static struct vkp_image *surface_image(struct surface *s) { if (!s->has_content) return NULL; if (s->shm_img) return s->shm_img; @@ -1739,7 +1916,7 @@ static int hdr_plan(const struct draw_list *dl, int w, int h, int fx_on, int fra } if (un && g_zero_copy) { hs->color = droiddeck_color_of(un->resource); hs->who = un; return 3; } hs->hf.tonemap = !droiddeck_color_output(); - if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n, 1))) return 0; + if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n + CURSOR_MAX_DRAWS, 1))) return 0; for (int i = 0; i < dl->n; i++) { struct surface *s = surface_for_image(dl->d[i].img); if (!is_hdr_surface(s)) continue; @@ -1841,14 +2018,143 @@ static void hdr_count_copied(const struct draw_list *dl, const char *reason) { } } +#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; +} + +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); + } 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(); + 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; +} + +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; } + 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 int64_t g_scene_due_ns; + +static int scene_held_for_limit(int64_t now, int64_t due, int limit, int unpaced) { + if (limit <= 0 || unpaced || due <= 0) return 0; + return now < due - 1000000LL; +} + +static int64_t scene_next_due(int64_t now, int64_t due, int limit) { + if (limit <= 0) return 0; + const int64_t interval = 1000000000LL / limit; + return due > 0 && now - due < interval ? due + interval : now + interval; +} + static void render_scene(void) { + g_scene_due_ns = scene_next_due(now_ns(), g_scene_due_ns, g_fps_limit); + if (atomic_load(&g_stream_on)) { g_dirty_since_ns = 0; render_stream(); return; } struct draw_list dl = {0}; struct surface *s; int w, h; const int64_t t_scene = now_ns(); int copy = 0; + if (g_dirty_since_ns) { + const int64_t wait = t_scene - g_dirty_since_ns; + g_pace.wait_ns += wait; + if (wait > g_pace.wait_max_ns) g_pace.wait_max_ns = wait; + g_pace.renders++; + g_dirty_since_ns = 0; + } g_dirty = 0; + g_rendered_tick_ns = g_tick_vsync_ns; + g_tick_held = 0; g_hud_fresh = 0; g_hdr_unimported = NULL; wl_list_for_each(s, &g_surfaces, link) s->drawn = 0; @@ -1878,6 +2184,28 @@ static void render_scene(void) { hdr_note_precedence(hdr_route == 3 ? hs.who : NULL, fx_on, framegen); } if (hdr_route == 3) { fx_on = 0; framegen = 0; } + struct surface *ahb_only = ahb_layer_only_candidate(w, h); + struct surface *layer_only = ahb_only ? ahb_only : hdr_unimported_fullscreen(&dl, w, h); + const int cursor_on = hdr_route == 3 || layer_only ? 0 : add_cursor(&dl, w); + static int cursor_layer_said; + if (layer_only && atomic_load(&g_cursor_composite) && !cursor_layer_said) { + cursor_layer_said = 1; + droiddeck_log("cursor", "the pointer stays out of the picture: the game's frames cannot be imported, " + "so the game is shown on its own display layer"); + } else if (!layer_only) { + cursor_layer_said = 0; + } + static int cursor_hdr_said; + if (cursor_on && hdr_route == 0 && hs.n_hdr > 0 && !cardboard) { + hdr_route = 2; + if (!cursor_hdr_said) { + cursor_hdr_said = 1; + droiddeck_log("cursor", "the pointer needs a composed scene: the HDR picture goes through the screen " + "swapchain instead of the game's own display layer"); + } + } else { + cursor_hdr_said = 0; + } if (hdr_route == 1) { static int fell_back; vkp_apply_window_request(); @@ -1903,21 +2231,19 @@ static void render_scene(void) { else if (rendered && how == 2) droiddeck_color_frame_shown(hs.color, DROIDDECK_HDR_TONEMAPPED, 0); else if (rendered) hdr_copy = "the HDR composition pass is unavailable on this driver"; } - if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && - !ahb_layer_only_candidate(w, h)) { - /* The complete SDR scene stays on one display layer. Do not hide/re-show GAME - * on each desktop frame just because it is not a single fullscreen window. */ + if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && !cursor_on && + !ahb_only) { rendered = vkp_render(w, h, dl.d, dl.n) == 0; } else if (hdr_route == 0 || hdr_route == 3) { const int pass_on = fx_on || framegen; - int li = (g_zero_copy && !framegen && !cardboard) ? layer_candidate(&dl, w, h) : -1; + int li = (g_zero_copy && !framegen && !cardboard && !cursor_on) ? layer_candidate(&dl, w, h) : -1; int over = li >= 0 ? dl.n - 1 - li : 0; const int fx_blocks = (li >= 0 && fx_on && over > 0); if (fx_blocks) { li = -1; over = 0; } const int ov_blocks = (li >= 0 && over > 0 && !fx_blocks && !sc_layer_overlay_affordable()); if (ov_blocks) { li = -1; over = 0; } const int blocked = framegen ? 1 : (fx_blocks ? 2 : (ov_blocks ? 3 : 0)); - if (g_zero_copy && blocked != g_zero_copy_paused) { + if (g_zero_copy && !cursor_on && blocked != g_zero_copy_paused) { g_zero_copy_paused = blocked; if (blocked == 1) droiddeck_log("framegen", "zero-copy paused: frame generation needs the compositor pass"); @@ -1930,9 +2256,9 @@ static void render_scene(void) { droiddeck_log("effects", "zero-copy resumed: the game is back on its own display layer"); } struct surface *ls = li >= 0 ? surface_for_image(dl.d[li].img) : NULL; - if (li < 0) ls = ahb_layer_only_candidate(w, h); - if (li < 0 && !ls) ls = hdr_unimported_fullscreen(&dl, w, h); + if (li < 0) ls = layer_only; if (cardboard) ls = NULL; + if (cursor_on) ls = NULL; if (ls && pass_on && li < 0 && !g_zero_copy_fx_skip_said) { g_zero_copy_fx_skip_said = 1; droiddeck_log(framegen ? "framegen" : "effects", @@ -1982,9 +2308,13 @@ 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); + else g_pace.undrawn += feedback_discard_all(&s->feedback); } fire_all_frames(); } else { @@ -2005,14 +2335,29 @@ static void render_scene(void) { static int on_fallback_timer(void *data) { g_fallback_armed = 0; - if (g_dirty) render_scene(); + if (!g_dirty) return 0; + if (scene_held_for_limit(now_ns(), g_scene_due_ns, g_fps_limit, g_release_unpaced)) schedule_render(); + else render_scene(); return 0; } +static int commit_renders_on(void) { + return g_render_on_commit && g_release_unpaced && !atomic_load(&g_stream_on) && !vkp_framegen_active(); +} + +static int render_on_commit(void) { + return commit_renders_on() && !g_render_idle && g_rendered_tick_ns != g_tick_vsync_ns; +} + static void schedule_render(void) { + if (!g_dirty && !g_dirty_since_ns) g_dirty_since_ns = now_ns(); g_dirty = 1; if (!g_display) return; - if (g_last_vsync_ns && now_ns() - g_last_vsync_ns < 100000000LL) return; + if (g_last_vsync_ns && now_ns() - g_last_vsync_ns < 100000000LL) { + if (render_on_commit()) + g_render_idle = wl_event_loop_add_idle(wl_display_get_event_loop(g_display), on_commit_idle, NULL); + return; + } if (g_fallback_armed) return; if (!g_fallback_timer) g_fallback_timer = wl_event_loop_add_timer(wl_display_get_event_loop(g_display), @@ -2026,18 +2371,42 @@ static int scene_waits_for_game(int64_t now) { return g_hud_surface && !g_hud_fresh && now - g_hud_last_ns < 100000000LL && vkp_framegen_active(); } +static void on_commit_idle(void *data) { + g_render_idle = NULL; + if (!g_dirty || !commit_renders_on() || g_rendered_tick_ns == g_tick_vsync_ns || scene_waits_for_game(now_ns())) return; + g_pace.commit_renders++; + render_scene(); +} + static void on_vsync(int64_t frame_time_ns) { int64_t now = now_ns(); g_perf.ticks++; + if (frame_time_ns > 0 && now >= frame_time_ns) { + const int64_t late = now - frame_time_ns; + g_pace.ticks++; + g_pace.tick_late_ns += late; + if (late > g_pace.tick_late_max_ns) g_pace.tick_late_max_ns = late; + if (late > 2000000LL) g_pace.ticks_late_2ms++; + } if (g_last_vsync_ns) { int64_t d = now - g_last_vsync_ns; if (d > 3000000LL && d < 40000000LL) g_refresh_ns = (g_refresh_ns * 7 + d) / 8; } g_last_vsync_ns = now; g_tick_vsync_ns = frame_time_ns; - if (vkp_apply_window_request()) g_dirty = 1; - if (vkp_effects_sync()) g_dirty = 1; - if (vkp_cardboard_pose_changed()) g_dirty = 1; + int tick_change = 0; + if (vkp_apply_window_request()) tick_change = 1; + if (vkp_effects_sync()) tick_change = 1; + if (vkp_cardboard_pose_changed()) tick_change = 1; + if (tick_change) g_dirty = 1; + if (g_tick_held && g_dirty) g_hold_missed_ns = now; + g_tick_held = 0; + if (!tick_change && commit_renders_on() && g_dirty_since_ns && now - g_dirty_since_ns < g_refresh_ns && + now - g_hold_missed_ns >= HOLD_RETRY_NS) { + g_tick_held = 1; + return; + } + if (g_dirty && scene_held_for_limit(now, g_scene_due_ns, g_fps_limit, g_release_unpaced)) return; if (g_dirty && !scene_waits_for_game(now)) render_scene(); } @@ -2053,6 +2422,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (g_cursor_surface) g_cursor_surface->role = ROLE_NONE; g_cursor_surface = NULL; cursor_publish_hidden(); + if (atomic_load(&g_cursor_composite)) schedule_render(); return; } struct surface *s = wl_resource_get_user_data(surface); @@ -2060,8 +2430,10 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (s->role != ROLE_NONE && s->role != ROLE_CURSOR) return; s->role = ROLE_CURSOR; g_cursor_surface = s; + pthread_mutex_lock(&g_cursor_lock); g_cursor_hx = hx; g_cursor_hy = hy; + pthread_mutex_unlock(&g_cursor_lock); struct wl_resource *buffer = surface_take_idle(s); if (buffer) { cursor_publish_buffer(s, buffer); @@ -2072,6 +2444,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 cursor_publish_pixels((const uint8_t *)s->idle_px, s->idle_w, s->idle_h, (size_t)s->idle_w * 4, hx, hy); g_cursor_shown = s; } + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void pointer_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_pointer_interface pointer_impl = { @@ -2095,6 +2468,7 @@ static const struct wl_touch_interface touch_impl = { .release = touch_release } static void touch_res_destroy(struct wl_resource *r) { for (int i = 0; i < g_ntouches; i++) if (g_touches[i].touch == r) { g_touches[i] = g_touches[--g_ntouches]; break; } + publish_query_state(); } static void seat_get_pointer(struct wl_client *c, struct wl_resource *r, uint32_t id) { @@ -2132,6 +2506,7 @@ static void seat_get_touch(struct wl_client *c, struct wl_resource *r, uint32_t g_touches[g_ntouches].focus = NULL; g_ntouches++; } + publish_query_state(); } static void seat_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_seat_interface seat_impl = { @@ -2247,9 +2622,101 @@ struct relative_pointer { static struct wl_list g_relative_pointers; static double g_ptr_x, g_ptr_y; +static int g_ptr_known; static double g_raw_x, g_raw_y; static int g_raw_valid; +static int pointer_locked_for_cursor(void) { + return g_active_constraint && g_active_constraint->is_lock; +} + +static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) { + out[0] = ptr_x - hx; out[1] = -1; + if (source != CARDBOARD_SOURCE_SBS || scene_w <= 1) return 1; + const int half = scene_w / 2; + out[1] = (ptr_x < half ? ptr_x + half : ptr_x - half) - hx; + return 2; +} + +static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) { + int left = x0, right = x0 + w; + if (eye >= 0 && scene_w > 1) { + const int half = scene_w / 2; + const int band = eye ? half : 0; + if (left < band) left = band; + if (right > band + half) right = band + half; + } + if (right <= left) return 0; + *dx = left; + *sx = left - x0; + *dw = right - left; + return 1; +} + +static int add_cursor(struct draw_list *dl, int scene_w) { + if (!atomic_load(&g_cursor_composite) || !g_ptr_known || pointer_locked_for_cursor()) return 0; + + int hidden, w, h, hx, hy, serial; + uint32_t *copy = NULL; + pthread_mutex_lock(&g_cursor_lock); + hidden = g_cursor_hidden; + w = g_cursor_w; h = g_cursor_h; + hx = g_cursor_hx; hy = g_cursor_hy; + serial = g_cursor_serial; + if (!hidden && w > 0 && h > 0 && serial != g_cursor_img_serial) { + copy = malloc((size_t)w * (size_t)h * 4); + if (copy) memcpy(copy, g_cursor_px, (size_t)w * (size_t)h * 4); + } + pthread_mutex_unlock(&g_cursor_lock); + if (hidden || w <= 0 || h <= 0) return 0; + + if (copy) { + if (g_cursor_img && (g_cursor_img_w != w || g_cursor_img_h != h)) { + vkp_wait_idle(); + vkp_image_destroy(g_cursor_img); + g_cursor_img = NULL; + } + if (!g_cursor_img) g_cursor_img = vkp_image_create_shm(w, h); + if (g_cursor_img) { + g_cursor_img_w = w; g_cursor_img_h = h; + vkp_image_upload_shm(g_cursor_img, copy, w * 4); + g_cursor_img_serial = serial; + } + free(copy); + } + if (!g_cursor_img || g_cursor_img_serial != serial) return 0; + + int xs[CURSOR_MAX_DRAWS]; + const int source = vkp_cardboard_source(); + const int ptr_x = (int)(g_ptr_x + 0.5); + const int count = cursor_scene_positions(scene_w, source, ptr_x, hx, xs); + static int said_w = -1, said_source = -1, said_count = -1; + if (scene_w != said_w || source != said_source || count != said_count) { + said_w = scene_w; said_source = source; said_count = count; + droiddeck_log("cursor", "pointer drawn %d time(s) in a %d wide scene (%s picture)", count, scene_w, + source == CARDBOARD_SOURCE_SBS ? "side-by-side" : "single"); + } + if (dl->n + count > dl->cap) { + int cap = dl->cap ? dl->cap : 32; + while (cap < dl->n + count) cap *= 2; + struct vkp_draw *d = realloc(dl->d, (size_t)cap * sizeof(*d)); + if (!d) return 0; + dl->d = d; dl->cap = cap; + } + const int sbs = source == CARDBOARD_SOURCE_SBS && scene_w > 1; + const int pointer_eye = ptr_x < scene_w / 2 ? 0 : 1; + int appended = 0; + for (int i = 0; i < count; i++) { + int dx, sx, cw; + const int eye = sbs ? (i ? 1 - pointer_eye : pointer_eye) : -1; + if (!cursor_clip_to_eye(scene_w, eye, xs[i], w, &dx, &sx, &cw)) continue; + dl->d[dl->n++] = (struct vkp_draw){g_cursor_img, (float)sx, 0, (float)cw, (float)h, + dx, (int)(g_ptr_y + 0.5) - hy, cw, h, 1}; + appended++; + } + return appended ? 1 : 0; +} + extern void droiddeck_on_pointer_lock(int locked, int x, int y); static void sync_lock_notify(void) { @@ -2258,6 +2725,7 @@ static void sync_lock_notify(void) { if (locked == last) return; last = locked; droiddeck_on_pointer_lock(locked, (int)g_ptr_x, (int)g_ptr_y); + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void constraint_describe(const struct constraint *k, char *out, size_t size) { @@ -2311,6 +2779,7 @@ static void constraint_end(struct constraint *k, int tell_client, const char *wh constraint_origin(k, &ox, &oy); g_ptr_x = ox + k->hint_x; g_ptr_y = oy + k->hint_y; + g_ptr_known = 1; } g_raw_valid = 0; if (k->gave_keys) { @@ -2336,7 +2805,10 @@ static void constraint_activate(struct constraint *k) { constraint_end(g_active_constraint, 1, "replaced by a newer request"); k->active = 1; g_active_constraint = k; + const double was_x = g_ptr_x, was_y = g_ptr_y; if (!k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); constraint_origin(k, &ox, &oy); pointer_focus(k->surface->resource, wl_fixed_from_double(g_ptr_x - ox), wl_fixed_from_double(g_ptr_y - oy)); int focused = 0; @@ -2395,6 +2867,7 @@ static void constraints_pointer_gone(struct wl_resource *pointer) { static void constraints_surface_commit(struct surface *s) { struct constraint *k; + const double was_x = g_ptr_x, was_y = g_ptr_y; wl_list_for_each(k, &g_constraints, link) { if (k->surface != s) continue; if (k->pending_hint_set) { @@ -2407,6 +2880,7 @@ static void constraints_surface_commit(struct surface *s) { constraint_origin(k, &ox, &oy); g_ptr_x = ox + k->hint_x; g_ptr_y = oy + k->hint_y; + g_ptr_known = 1; if (log_budget()) droiddeck_log("pointer", "position hint: pointer moved to %d,%d", (int)g_ptr_x, (int)g_ptr_y); } @@ -2417,6 +2891,8 @@ static void constraints_surface_commit(struct surface *s) { if (k->active && !k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); } } + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); } static void constraint_resource_destroy(struct wl_resource *r) { @@ -2601,6 +3077,8 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int } if (k) confine_clamp(k, &x, &y); g_ptr_x = x; g_ptr_y = y; + g_ptr_known = 1; + if (atomic_load(&g_cursor_composite)) schedule_render(); if (k) { target = k->surface; } else if (g_desktop) { @@ -2611,6 +3089,7 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int if (button && !pressed) g_grab = NULL; } } + publish_query_state(); if (!target) return; struct wl_client *client = wl_resource_get_client(target->resource); @@ -2622,13 +3101,9 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int uint32_t t = now_ms(); pointer_focus(target->resource, fx, fy); - // A button-only input must not replay a cached absolute position. A game - // may have warped its cursor since the last motion (before taking lock, - // or while releasing it), so that replay can become an unintended pan. - // Absolute touch events still carry their position, including on clicks. - if (!(k && k->is_lock) && (!relative || dx != 0 || dy != 0)) + int rel_consumed = send_relative_motion(client, dx, dy); + if (!(k && k->is_lock) && !(relative && rel_consumed) && (!relative || dx != 0 || dy != 0)) for_each_pointer_of(client, sp) wl_pointer_send_motion(sp->ptr, t, fx, fy); - send_relative_motion(client, dx, dy); for_each_pointer_of(client, sp) { if (button) wl_pointer_send_button(sp->ptr, wl_display_next_serial(g_display), t, button, @@ -2657,9 +3132,6 @@ static void pointer_button(uint32_t button, int pressed) { pointer_input(0, 0, 1, button, pressed); return; } - // Releases also clean up interrupted gestures. Deliver them to the existing - // pointer focus without motion or hit-testing: native touch has independent - // coordinates, so replaying g_ptr_x/y here can warp the game cursor. uint32_t t = now_ms(); for (int i = 0; i < g_nptrs; i++) { struct seat_pointer *sp = &g_ptrs[i]; @@ -2767,6 +3239,63 @@ static struct surface *touch_target_at(double x, double y) { return g_grab ? g_grab : g_key_target; } +static pthread_mutex_t g_query_lock = PTHREAD_MUTEX_INITIALIZER; +struct query_snapshot { + int has_position; + int input_x, input_y; + int focus_takes_touch; +}; +static struct query_snapshot g_query = { 0, 0, 0, 1 }; + +static void publish_query_state(void) { + struct surface *target = g_key_target ? g_key_target : (g_grab ? g_grab : toplevel_at(g_ptr_x, g_ptr_y)); + int takes_touch = 1; + if (target) { + struct wl_client *client = wl_resource_get_client(target->resource); + struct seat_touch *st; + takes_touch = 0; + for_each_touch_of(client, st) takes_touch = 1; + } + int w = 0, h = 0, ow = 0, oh = 0, input_x = 0, input_y = 0, has_position = 0; + scene_size(&w, &h); + vkp_output_size(&ow, &oh); + if (g_ptr_known && w > 0 && h > 0) { + double ox, oy; + if (ow > 0 && oh > 0 && vkp_scene_to_output(g_ptr_x, g_ptr_y, &ox, &oy)) { + input_x = (int)(ox * INPUT_SPACE_W / ow); + input_y = (int)(oy * INPUT_SPACE_H / oh); + } else { + input_x = (int)(g_ptr_x * INPUT_SPACE_W / w); + input_y = (int)(g_ptr_y * INPUT_SPACE_H / h); + } + has_position = 1; + } + pthread_mutex_lock(&g_query_lock); + g_query.focus_takes_touch = takes_touch; + g_query.has_position = has_position; + g_query.input_x = input_x; + g_query.input_y = input_y; + pthread_mutex_unlock(&g_query_lock); +} + +int droiddeck_focus_takes_touch(void) { + pthread_mutex_lock(&g_query_lock); + int takes_touch = g_query.focus_takes_touch; + pthread_mutex_unlock(&g_query_lock); + return takes_touch; +} + +int droiddeck_cursor_input_pos(int *x, int *y) { + pthread_mutex_lock(&g_query_lock); + int has_position = g_query.has_position; + int input_x = g_query.input_x, input_y = g_query.input_y; + pthread_mutex_unlock(&g_query_lock); + if (!has_position) return 0; + *x = input_x; + *y = input_y; + return 1; +} + static void touch_down(int id, double x, double y) { if (id < 0 || id >= MAX_TOUCH_POINTS) return; struct surface *target = touch_target_at(x, y); @@ -2866,6 +3395,7 @@ static void deliver_touch(const struct input_msg *m) { else if (m->p1 == 1) touch_motion(m->p2, x, y); else if (m->p1 == 2) touch_up(m->p2, x, y); else if (m->p1 == 3) touch_cancel_all(); + publish_query_state(); } static void key_event(uint32_t evdev, int pressed); @@ -2883,10 +3413,10 @@ static void send_axis(struct seat_pointer *sp, uint32_t t, uint32_t axis, int va wl_pointer_send_axis(sp->ptr, t, axis, wl_fixed_from_double(value120 / 12.0)); } -static void axis_event(int vertical120, int horizontal120) { +static void axis_event(int vertical120, int horizontal120, int finger) { struct surface *target = g_active_constraint ? g_active_constraint->surface : g_desktop ? g_desktop : (g_grab ? g_grab : toplevel_at(g_ptr_x, g_ptr_y)); - if (!target || (!vertical120 && !horizontal120)) return; + if (!target || (!finger && !vertical120 && !horizontal120)) return; struct wl_client *client = wl_resource_get_client(target->resource); struct seat_pointer *sp; if (!pointer_for(client)) return; @@ -2895,16 +3425,33 @@ static void axis_event(int vertical120, int horizontal120) { uint32_t t = now_ms(); pointer_focus(target->resource, wl_fixed_from_double(g_ptr_x - tx), wl_fixed_from_double(g_ptr_y - ty)); for_each_pointer_of(client, sp) { - send_axis(sp, t, WL_POINTER_AXIS_VERTICAL_SCROLL, vertical120); - send_axis(sp, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, horizontal120); - if (wl_resource_get_version(sp->ptr) >= WL_POINTER_FRAME_SINCE_VERSION) + int version = wl_resource_get_version(sp->ptr); + if (!finger) { + send_axis(sp, t, WL_POINTER_AXIS_VERTICAL_SCROLL, vertical120); + send_axis(sp, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, horizontal120); + } else { + if (version >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION) + wl_pointer_send_axis_source(sp->ptr, WL_POINTER_AXIS_SOURCE_FINGER); + if (!vertical120 && !horizontal120) { + if (version >= WL_POINTER_AXIS_STOP_SINCE_VERSION) { + wl_pointer_send_axis_stop(sp->ptr, t, WL_POINTER_AXIS_VERTICAL_SCROLL); + wl_pointer_send_axis_stop(sp->ptr, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL); + } + } else { + if (vertical120) + wl_pointer_send_axis(sp->ptr, t, WL_POINTER_AXIS_VERTICAL_SCROLL, wl_fixed_from_double(vertical120 / 12.0)); + if (horizontal120) + wl_pointer_send_axis(sp->ptr, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, wl_fixed_from_double(horizontal120 / 12.0)); + } + } + if (version >= WL_POINTER_FRAME_SINCE_VERSION) wl_pointer_send_frame(sp->ptr); } wl_display_flush_clients(g_display); } static void scroll_event(int steps) { - axis_event(steps * 120, 0); + axis_event(steps * 120, 0, 0); } static int update_modifiers(uint32_t evdev, int pressed) { @@ -3000,7 +3547,11 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { schedule_render(); break; case 10: break; - case 11: axis_event(m.p1, m.p2); break; + case 11: axis_event(m.p1, m.p2, 0); break; + case 12: axis_event(m.p1, m.p2, 1); break; + case 20: stream_take(); break; + case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; + case 22: schedule_render(); break; default: deliver_pointer(&m); break; } } @@ -3075,6 +3626,17 @@ void droiddeck_wayland_send_scene_input(int type, int a, int b) { (void)n; } +void droiddeck_wayland_set_cursor_composite(int on) { + const int want = on ? 1 : 0; + if (atomic_exchange(&g_cursor_composite_want, want) == want) return; + atomic_store(&g_cursor_composite, want); + droiddeck_log("cursor", "compositing the pointer into the output: %s", on ? "on" : "off"); + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 22, on ? 1 : 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + const char *droiddeck_client_name(struct wl_client *client) { return client_name(client); } struct wl_display *droiddeck_get_display(void) { return g_display; } @@ -3139,6 +3701,24 @@ static int on_stats_timer(void *data) { #undef PERF_MS memset(&g_perf, 0, sizeof(g_perf)); } + const uint64_t game = g_game_frames - g_pace.game_frames_seen; + if (g_pace.ticks || g_pace.renders || game || g_pace.reattaches || g_pace.null_attaches || g_pace.distinct || + g_pace.presented || g_pace.replaced || g_pace.undrawn) { + droiddeck_log("pacing", "last 10 s: tick reaches compositor %.2f/%.2f ms late (%u ticks, %u over 2 ms) | " + "new frame waits %.2f/%.2f ms to be drawn (%u scenes, %u on arrival) | %llu game frames, %u re-attached after an " + "empty attach, %u empty attaches, %u distinct buffers | feedback %u shown, %u replaced before drawing, " + "%u not drawn", + g_pace.ticks ? (double)g_pace.tick_late_ns / 1e6 / g_pace.ticks : 0.0, (double)g_pace.tick_late_max_ns / 1e6, + g_pace.ticks, g_pace.ticks_late_2ms, + g_pace.renders ? (double)g_pace.wait_ns / 1e6 / g_pace.renders : 0.0, (double)g_pace.wait_max_ns / 1e6, + g_pace.renders, g_pace.commit_renders, (unsigned long long)game, g_pace.reattaches, g_pace.null_attaches, g_pace.distinct, + g_pace.presented, g_pace.replaced, g_pace.undrawn); + } + { + const uint64_t seen = g_game_frames; + memset(&g_pace, 0, sizeof(g_pace)); + g_pace.game_frames_seen = seen; + } g_stat_frames = g_stat_dmabuf = g_stat_shm = 0; droiddeck_color_stats_tick(); @@ -3236,8 +3816,6 @@ int droiddeck_wayland_run(void) { open_session_log(); if (vkp_ready() != 0) WLOGE("renderer unavailable; clients will connect but nothing is drawn"); - /* Presentation compatibility is not HDR capability. Set the initial layer mode before - * clients bind, including when Desktop is the first session in this app process. */ if (vkp_quest_layer_presentation() && sc_layer_available()) g_zero_copy = 1; struct wl_display *display = wl_display_create(); diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c index 94bb581a0..eceb79639 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c @@ -238,7 +238,7 @@ static int ensure_ring(uint32_t w, uint32_t h, VkFormat fmt, uint32_t n) { } g_ring_w = w; g_ring_h = h; g_ring_fmt = fmt; LOGD("framegen: generation ring %ux%u x%u", w, h, n); - return 1; + return 2; } @@ -350,6 +350,7 @@ int vkp_framegen_run(VkCommandBuffer cmd, VkImage scene, VkImageView scene_view, fge_configure((uint32_t)mult, (uint32_t)atomic_load(&g_target), flow, hz, atomic_load(&g_model), atomic_load(&g_preset)); } + const int size_changed = g_built_w != (uint32_t)w || g_built_h != (uint32_t)h || g_built_fmt != fmt; if (!fge_prepare((uint32_t)w, (uint32_t)h, fmt)) { if (fmt != VK_FORMAT_R8G8B8A8_UNORM && fge_unavailable()) { refuse_format(fmt, kind, w, h, "build its chain"); @@ -361,20 +362,23 @@ int vkp_framegen_run(VkCommandBuffer cmd, VkImage scene, VkImageView scene_view, } return 0; } - if (g_built_w != (uint32_t)w || g_built_h != (uint32_t)h || g_built_fmt != fmt) { + if (size_changed) { g_built_w = (uint32_t)w; g_built_h = (uint32_t)h; g_built_fmt = fmt; g_generating_logged = 0; } uint32_t want = (uint32_t)(mult - 1); - if (!ensure_ring((uint32_t)w, (uint32_t)h, fmt, want)) { + const int ring = ensure_ring((uint32_t)w, (uint32_t)h, fmt, want); + if (!ring) { if (fmt != VK_FORMAT_R8G8B8A8_UNORM) { refuse_format(fmt, kind, w, h, "make its generation ring"); return 0; } FGLOG("no memory for the generation ring (%dx%d x%u); frame generation stays off", w, h, want); mark_failed(kind); return 0; } + if (size_changed || ring == 2) { + FGLOG("frame generation catches up at %dx%d; this frame is shown as it is", w, h); + return 0; + } - /* The pacer's source rate must be the game's, not this loop's: a loop slowed by its own - * generations would otherwise read as a slower game and justify even more generations. */ ++g_source_frames; const uint64_t game_frames = droiddeck_game_frames(); uint32_t n_gen = fge_plan(g_ring_n, game_frames ? game_frames : g_source_frames, g_presented_rate); diff --git a/app/src/main/cpp/waylandcomp/src/gpu_busy.c b/app/src/main/cpp/waylandcomp/src/gpu_busy.c new file mode 100644 index 000000000..48d565c20 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_busy.c @@ -0,0 +1,89 @@ +#include "gpu_busy.h" + +#include +#include +#include + +#include "gpuload_ring.h" + +static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; +static struct gpuload_vk g_v; +static struct gpuload_ring g_ring; +static uint32_t g_family, g_bits; +static PFN_vkQueueSubmit g_submit; +static int g_was_on; +static _Atomic int g_on, g_lost, g_timing; +static _Atomic uint64_t g_busy_ns; + +static VkResult VKAPI_CALL timed_submit(VkQueue queue, uint32_t count, const VkSubmitInfo *infos, VkFence fence) { + if (!count || !atomic_load(&g_on) || atomic_load(&g_lost)) return g_submit(queue, count, infos, fence); + pthread_mutex_lock(&g_lock); + if (!atomic_load(&g_on) || atomic_load(&g_lost)) { + pthread_mutex_unlock(&g_lock); + return g_submit(queue, count, infos, fence); + } + if (g_ring.state == 0 && gpuload_ring_setup(&g_ring, &g_v, g_family, g_bits)) atomic_store(&g_timing, 1); + VkSubmitInfo *mine = NULL; + uint32_t used = 0; + if (g_ring.state == 1) { + uint64_t ns = gpuload_ring_harvest(&g_ring, &g_v); + if (g_was_on) atomic_fetch_add(&g_busy_ns, ns); // the first harvest after a pause holds work timed before it + g_was_on = 1; + mine = gpuload_ring_wrap(&g_ring, count, infos, &used); + } + VkResult r = g_submit(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&g_ring, used); + pthread_mutex_unlock(&g_lock); + free(mine); + return r; +} + +void vkp_gpu_busy_device(VkPhysicalDevice pd, VkDevice dev, uint32_t family) { + pthread_mutex_lock(&g_lock); + memset(&g_ring, 0, sizeof(g_ring)); + g_was_on = 0; + atomic_store(&g_timing, 0); + atomic_store(&g_lost, 0); + PFN_vkGetDeviceProcAddr gdpa = g_vk.GetDeviceProcAddr; + g_v = (struct gpuload_vk){ + .device = dev, + .create_pool = g_vk.CreateCommandPool, + .destroy_pool = (PFN_vkDestroyCommandPool)gdpa(dev, "vkDestroyCommandPool"), + .alloc_cmds = g_vk.AllocateCommandBuffers, + .begin = g_vk.BeginCommandBuffer, + .end = g_vk.EndCommandBuffer, + .cmd_reset = (PFN_vkCmdResetQueryPool)gdpa(dev, "vkCmdResetQueryPool"), + .cmd_timestamp = (PFN_vkCmdWriteTimestamp)gdpa(dev, "vkCmdWriteTimestamp"), + .create_queries = (PFN_vkCreateQueryPool)gdpa(dev, "vkCreateQueryPool"), + .destroy_queries = (PFN_vkDestroyQueryPool)gdpa(dev, "vkDestroyQueryPool"), + .results = (PFN_vkGetQueryPoolResults)gdpa(dev, "vkGetQueryPoolResults"), + }; + VkPhysicalDeviceProperties props; + g_vk.GetPhysicalDeviceProperties(pd, &props); + gpuload_vk_period(&g_v, props.limits.timestampPeriod); + VkQueueFamilyProperties families[16]; + uint32_t n = 16; + g_vk.GetPhysicalDeviceQueueFamilyProperties(pd, &n, families); + g_family = family; + g_bits = family < n ? families[family].timestampValidBits : 0; + // vk_loader_load_device has just put the driver's function back. + if (g_vk.QueueSubmit != timed_submit) g_submit = g_vk.QueueSubmit; + if (g_submit) g_vk.QueueSubmit = timed_submit; + pthread_mutex_unlock(&g_lock); +} + +void vkp_gpu_busy_device_lost(void) { + atomic_store(&g_lost, 1); + atomic_store(&g_timing, 0); +} + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeGpuBusyNs(JNIEnv *env, jclass cls) { + return atomic_load(&g_timing) ? (jlong)atomic_load(&g_busy_ns) : -1; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetGpuTiming(JNIEnv *env, jclass cls, jboolean on) { + pthread_mutex_lock(&g_lock); + if (!on) g_was_on = 0; + atomic_store(&g_on, on ? 1 : 0); + pthread_mutex_unlock(&g_lock); +} diff --git a/app/src/main/cpp/waylandcomp/src/gpu_busy.h b/app/src/main/cpp/waylandcomp/src/gpu_busy.h new file mode 100644 index 000000000..a477d5236 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_busy.h @@ -0,0 +1,9 @@ +#ifndef GPU_BUSY_H +#define GPU_BUSY_H +#include "vk_loader.h" + +// Times the compositor's own GPU work for the HUD (tools/gpuload/src/gpuload_ring.h); call after the device and its +// functions are loaded. Off until WaylandCompositor.nativeSetGpuTiming(true). +void vkp_gpu_busy_device(VkPhysicalDevice pd, VkDevice dev, uint32_t family); +void vkp_gpu_busy_device_lost(void); +#endif diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c new file mode 100644 index 000000000..8ce226922 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c @@ -0,0 +1,168 @@ +#include "gpu_clock_pin.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../adrenotools/src/hook/kgsl.h" + +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_t worker; +static bool joinable; +static atomic_bool running; + +struct pin { + int fd; + unsigned int context; + unsigned int memory; + unsigned int timestamp; + unsigned long gpuaddr; + uint32_t nop; + void *commands; + size_t size; +}; + +static struct pin pin = { .fd = -1 }; + +static void release_pin(void) { + if (pin.context) { + struct kgsl_drawctxt_destroy destroy = { .drawctxt_id = pin.context }; + ioctl(pin.fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &destroy); + } + if (pin.commands) munmap(pin.commands, pin.size); + if (pin.memory) { + struct kgsl_gpumem_free_id free_memory = { .id = pin.memory }; + ioctl(pin.fd, IOCTL_KGSL_GPUMEM_FREE_ID, &free_memory); + } + if (pin.fd >= 0) close(pin.fd); + pin = (struct pin) { .fd = -1 }; +} + +static bool submit_pin(void) { + struct kgsl_command_object object = { + .gpuaddr = pin.gpuaddr, + .size = 2 * sizeof(uint32_t), + .flags = KGSL_CMDLIST_IB, + .id = pin.memory, + }; + struct kgsl_gpu_command command = { + .flags = KGSL_CMDBATCH_PWR_CONSTRAINT, + .cmdlist = (uintptr_t)&object, + .cmdsize = sizeof(object), + .numcmds = 1, + .context_id = pin.context, + }; + if (ioctl(pin.fd, IOCTL_KGSL_GPU_COMMAND, &command) < 0) return false; + pin.timestamp = command.timestamp; + return true; +} + +static bool prepare_pin(void) { + pin.fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (pin.fd < 0) return false; + struct kgsl_devinfo info = {0}; + struct kgsl_device_getproperty device_info = { + .type = KGSL_PROP_DEVICE_INFO, .value = &info, .sizebytes = sizeof(info), + }; + if (ioctl(pin.fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &device_info) < 0) return false; + unsigned int core = info.chip_id >> 24; + if (!core) core = info.gpu_id / 100; + if (core < 3) { errno = ENODEV; return false; } + pin.nop = core >= 5 ? 0x70100001 : 0xc0001000; + struct kgsl_drawctxt_create context = { + .flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_PWR_CONSTRAINT, + }; + if (ioctl(pin.fd, IOCTL_KGSL_DRAWCTXT_CREATE, &context) < 0) return false; + pin.context = context.drawctxt_id; + struct kgsl_device_constraint_pwrlevel level = { .level = KGSL_CONSTRAINT_PWR_MAX }; + struct kgsl_device_constraint constraint = { + .type = KGSL_CONSTRAINT_PWRLEVEL, + .context_id = pin.context, + .data = &level, + .size = sizeof(level), + }; + struct kgsl_device_getproperty property = { + .type = KGSL_PROP_PWR_CONSTRAINT, + .value = &constraint, + .sizebytes = sizeof(constraint), + }; + if (ioctl(pin.fd, IOCTL_KGSL_SETPROPERTY, &property) < 0) return false; + struct kgsl_gpumem_alloc_id memory = { .size = 4096 }; + if (ioctl(pin.fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &memory) < 0) return false; + pin.memory = memory.id; + pin.gpuaddr = memory.gpuaddr; + pin.size = memory.mmapsize; + void *commands = mmap(NULL, pin.size, PROT_READ | PROT_WRITE, MAP_SHARED, pin.fd, + (off_t)pin.memory << 12); + if (commands == MAP_FAILED) return false; + pin.commands = commands; + uint32_t *words = commands; + words[0] = pin.nop; + words[1] = 0; + struct kgsl_gpumem_sync_cache sync = { .id = pin.memory, .op = KGSL_GPUMEM_CACHE_CLEAN }; + if (ioctl(pin.fd, IOCTL_KGSL_GPUMEM_SYNC_CACHE, &sync) < 0) return false; + return submit_pin(); +} + +static void *hold_pin(void *unused) { + (void)unused; + while (atomic_load(&running)) { + struct kgsl_device_waittimestamp_ctxtid wait = { + .context_id = pin.context, + .timestamp = pin.timestamp, + .timeout = 100, + }; + if (ioctl(pin.fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait) < 0) { + if (errno == EINTR || errno == ETIMEDOUT) continue; + break; + } + usleep(25000); + if (atomic_load(&running) && !submit_pin()) break; + } + if (atomic_exchange(&running, false)) + __android_log_print(ANDROID_LOG_WARN, "GpuClockPin", "constraint stopped: %s", strerror(errno)); + release_pin(); + return NULL; +} + +bool gpu_clock_pin_set(bool on) { + pthread_mutex_lock(&lock); + if (joinable) { + if (on && atomic_load(&running)) { + pthread_mutex_unlock(&lock); + return true; + } + atomic_store(&running, false); + pthread_join(worker, NULL); + joinable = false; + } + bool ok = true; + if (on) { + ok = prepare_pin(); + if (ok) { + atomic_store(&running, true); + int error = pthread_create(&worker, NULL, hold_pin, NULL); + if (error) { + atomic_store(&running, false); + errno = error; + ok = false; + } else { + joinable = true; + } + } + if (!ok) { + int error = errno; + release_pin(); + errno = error; + } + } + pthread_mutex_unlock(&lock); + return ok; +} diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h new file mode 100644 index 000000000..5fe17d102 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +bool gpu_clock_pin_set(bool on); diff --git a/app/src/main/cpp/waylandcomp/src/headpose_shm.h b/app/src/main/cpp/waylandcomp/src/headpose_shm.h index 824232b43..22088dc6b 100644 --- a/app/src/main/cpp/waylandcomp/src/headpose_shm.h +++ b/app/src/main/cpp/waylandcomp/src/headpose_shm.h @@ -24,7 +24,6 @@ struct droiddeck_headpose { float eye_aspect; uint32_t eye_w, eye_h; float display_hz; - // Uses a formerly reserved word; older publishers leave this zero. uint32_t render_height; uint32_t reserved[10]; }; diff --git a/app/src/main/cpp/waylandcomp/src/hudframes.c b/app/src/main/cpp/waylandcomp/src/hudframes.c new file mode 100644 index 000000000..ffbb657a5 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/hudframes.c @@ -0,0 +1,97 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "hudframes.h" + +#define HUD_FRAMES_MAGIC 0x46484444u +#define HUD_FRAMES_HEADER 128u +#define HUD_FRAMES_ENTRY 16u + +struct hud_frames { + const uint8_t *map; + size_t size; + uint64_t seen; +}; + +static uint32_t load32(const uint8_t *p) { return __atomic_load_n((const uint32_t *)p, __ATOMIC_ACQUIRE); } +static uint64_t load64(const uint8_t *p) { return __atomic_load_n((const uint64_t *)p, __ATOMIC_ACQUIRE); } + +struct hud_frames *hud_frames_open(const char *path) { + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return NULL; + struct stat st; + void *map = MAP_FAILED; + if (fstat(fd, &st) == 0 && st.st_size >= (off_t)HUD_FRAMES_HEADER) + map = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (map == MAP_FAILED) return NULL; + struct hud_frames *h = calloc(1, sizeof(*h)); + if (!h) { + munmap(map, (size_t)st.st_size); + return NULL; + } + h->map = map; + h->size = (size_t)st.st_size; + return h; +} + +void hud_frames_close(struct hud_frames *h) { + if (!h) return; + munmap((void *)h->map, h->size); + free(h); +} + +static uint32_t capacity(const struct hud_frames *h) { + if (load32(h->map) != HUD_FRAMES_MAGIC) return 0; + uint32_t cap; + memcpy(&cap, h->map + 8, 4); + if (cap == 0 || HUD_FRAMES_HEADER + (size_t)cap * HUD_FRAMES_ENTRY > h->size) return 0; + return cap; +} + +int hud_frames_poll(struct hud_frames *h, int64_t *frametimes, int64_t *times, int max) { + uint32_t cap = capacity(h); + if (!cap || max <= 0) return -1; + uint64_t count = load64(h->map + 16); + if (count < h->seen) h->seen = 0; + uint64_t from = h->seen; + if (count - from > cap) from = count - cap; + if (count - from > (uint64_t)max) from = count - (uint64_t)max; + int n = 0; + for (uint64_t i = from; i < count; i++, n++) { + const uint8_t *e = h->map + HUD_FRAMES_HEADER + (i % cap) * HUD_FRAMES_ENTRY; + memcpy(&frametimes[n], e, 8); + memcpy(×[n], e + 8, 8); + } + uint64_t after = load64(h->map + 16); + uint64_t valid = after > cap ? after - cap : 0; + if (from < valid) { + int skip = (int)(valid - from < (uint64_t)n ? valid - from : (uint64_t)n); + memmove(frametimes, frametimes + skip, (size_t)(n - skip) * sizeof(int64_t)); + memmove(times, times + skip, (size_t)(n - skip) * sizeof(int64_t)); + n -= skip; + } + h->seen = count; + return n; +} + +int hud_frames_info(const struct hud_frames *h, int32_t *info, char *engine, size_t engine_len) { + if (!capacity(h) || engine_len == 0) return 0; + for (int tries = 0; tries < 8; tries++) { + uint32_t seq = load32(h->map + 24); + if (seq & 1u) continue; + memcpy(&info[0], h->map + 12, 4); + memcpy(&info[1], h->map + 28, 16); + size_t n = engine_len - 1 < 40 ? engine_len - 1 : 40; + memcpy(engine, h->map + 44, n); + engine[n] = '\0'; + __atomic_thread_fence(__ATOMIC_ACQUIRE); + if (__atomic_load_n((const uint32_t *)(h->map + 24), __ATOMIC_RELAXED) == seq) return 1; + } + return 0; +} diff --git a/app/src/main/cpp/waylandcomp/src/hudframes.h b/app/src/main/cpp/waylandcomp/src/hudframes.h new file mode 100644 index 000000000..518f7be52 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/hudframes.h @@ -0,0 +1,14 @@ +#ifndef DROIDDECK_HUDFRAMES_H +#define DROIDDECK_HUDFRAMES_H + +#include +#include + +struct hud_frames; + +struct hud_frames *hud_frames_open(const char *path); +void hud_frames_close(struct hud_frames *h); +int hud_frames_poll(struct hud_frames *h, int64_t *frametimes, int64_t *times, int max); +int hud_frames_info(const struct hud_frames *h, int32_t *info, char *engine, size_t engine_len); + +#endif diff --git a/app/src/main/cpp/waylandcomp/src/hudframes_jni.c b/app/src/main/cpp/waylandcomp/src/hudframes_jni.c new file mode 100644 index 000000000..7bd9149d9 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/hudframes_jni.c @@ -0,0 +1,55 @@ +#include +#include +#include + +#include "hudframes.h" + +JNIEXPORT jlong JNICALL +Java_com_droiddeck_launcher_hud_HudFrames_nativeOpen(JNIEnv *env, jclass clazz, jstring path) { + (void)clazz; + const char *p = path ? (*env)->GetStringUTFChars(env, path, NULL) : NULL; + if (!p) return 0; + struct hud_frames *h = hud_frames_open(p); + (*env)->ReleaseStringUTFChars(env, path, p); + return (jlong)(intptr_t)h; +} + +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_hud_HudFrames_nativeClose(JNIEnv *env, jclass clazz, jlong handle) { + (void)env; (void)clazz; + hud_frames_close((struct hud_frames *)(intptr_t)handle); +} + +JNIEXPORT jint JNICALL +Java_com_droiddeck_launcher_hud_HudFrames_nativePoll(JNIEnv *env, jclass clazz, jlong handle, + jlongArray frametimes, jlongArray times) { + (void)clazz; + struct hud_frames *h = (struct hud_frames *)(intptr_t)handle; + if (!h || !frametimes || !times) return -1; + jsize max = (*env)->GetArrayLength(env, frametimes); + jsize max2 = (*env)->GetArrayLength(env, times); + if (max2 < max) max = max2; + if (max <= 0) return -1; + int64_t *ft = malloc(sizeof(int64_t) * (size_t)max); + int64_t *tm = malloc(sizeof(int64_t) * (size_t)max); + int n = ft && tm ? hud_frames_poll(h, ft, tm, max) : -1; + if (n > 0) { + (*env)->SetLongArrayRegion(env, frametimes, 0, n, (const jlong *)ft); + (*env)->SetLongArrayRegion(env, times, 0, n, (const jlong *)tm); + } + free(ft); + free(tm); + return n; +} + +JNIEXPORT jstring JNICALL +Java_com_droiddeck_launcher_hud_HudFrames_nativeInfo(JNIEnv *env, jclass clazz, jlong handle, jintArray info) { + (void)clazz; + const struct hud_frames *h = (const struct hud_frames *)(intptr_t)handle; + if (!h || !info || (*env)->GetArrayLength(env, info) < 5) return NULL; + int32_t values[5]; + char engine[41]; + if (!hud_frames_info(h, values, engine, sizeof(engine))) return NULL; + (*env)->SetIntArrayRegion(env, info, 0, 5, (const jint *)values); + return (*env)->NewStringUTF(env, engine); +} diff --git a/app/src/main/cpp/waylandcomp/src/quest_device.h b/app/src/main/cpp/waylandcomp/src/quest_device.h index ee9c37b10..bcdcee239 100644 --- a/app/src/main/cpp/waylandcomp/src/quest_device.h +++ b/app/src/main/cpp/waylandcomp/src/quest_device.h @@ -3,7 +3,6 @@ #include #include -/* Presentation only; this does not select a GPU driver or expand driver support. */ static inline int quest_device_matches(const char *model, const char *device, const char *maker) { return !strcasecmp(model, "Quest 2") || !strcasecmp(model, "Quest 3") || !strcasecmp(model, "Quest 3S") || diff --git a/app/src/main/cpp/waylandcomp/src/sc_layer.c b/app/src/main/cpp/waylandcomp/src/sc_layer.c index f9d203ba1..ff90d37dc 100644 --- a/app/src/main/cpp/waylandcomp/src/sc_layer.c +++ b/app/src/main/cpp/waylandcomp/src/sc_layer.c @@ -291,7 +291,7 @@ int sc_layer_base_black(int width, int height) { ARect src = {0, 0, 16, 16}, dst = {0, 0, width, height}; api.setBuffer(tx, g_base_sc, black, -1); api.setBufferTransparency(tx, g_base_sc, ASC_TRANSPARENCY_OPAQUE); - api.setZOrder(tx, g_base_sc, 0); /* GAME = 1, OVERLAY = 2 */ + api.setZOrder(tx, g_base_sc, 0); api.setGeometry(tx, g_base_sc, &src, &dst, 0); api.setVisibility(tx, g_base_sc, ASC_VISIBILITY_SHOW); api.txApply(tx); api.txDelete(tx); @@ -973,7 +973,7 @@ void sc_layer_hide_overlay(void) { } void sc_layer_window_gone(void) { - base_hide(1); /* the backdrop belongs to the old window, just like GAME and OVERLAY */ + base_hide(1); if (api.state != 1) return; layers_init(); for (int i = SC_LAYER_COUNT - 1; i >= 0; i--) retire_sc(&g_layers[i]); diff --git a/app/src/main/cpp/waylandcomp/src/vk_loader.h b/app/src/main/cpp/waylandcomp/src/vk_loader.h index e10950d0d..54cb88881 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 96d0b415d..df1c0d817 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -7,6 +7,7 @@ #include "framegen_bridge.h" #include "hdr_compose.h" #include "blend_pass.h" +#include "gpu_busy.h" #include "droiddeck_color.h" #include "quest_device.h" #include @@ -19,6 +20,7 @@ #include #include #include +#include #define TAG "DroidDeckWayland" #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__) @@ -39,6 +41,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; @@ -68,8 +71,6 @@ static int g_first_frame_done; static int g_base_black; int vkp_quest_layer_presentation(void) { - /* Compositor thread only; this is a process-wide device property, not a session setting. - * Quest 2 still needs its separate A6xx driver: this gate only chooses presentation. */ static int enabled = -1; if (enabled < 0) { char model[PROP_VALUE_MAX] = {0}, device[PROP_VALUE_MAX] = {0}, maker[PROP_VALUE_MAX] = {0}; @@ -382,6 +383,13 @@ int vkp_output_to_scene(double ox, double oy, double *sx, double *sy) { return 1; } +int vkp_scene_to_output(double sx, double sy, double *ox, double *oy) { + if (!g_map.valid || g_map.kx <= 0 || g_map.ky <= 0) return 0; + *ox = sx * g_map.kx + g_map.off_x; + *oy = sy * g_map.ky + g_map.off_y; + return 1; +} + void vkp_output_size(int *w, int *h) { *w = (int)g_extent.width; *h = (int)g_extent.height; @@ -459,17 +467,18 @@ 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]); + 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 +486,12 @@ 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; + 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; @@ -499,6 +514,7 @@ static int dev_init(void) { } vk_loader_load_device(g_dev); g_vk.GetDeviceQueue(g_dev, g_qfam, 0, &g_queue); + vkp_gpu_busy_device(g_pd, g_dev, g_qfam); if (want_sem_fd) { g_import_sem_fd = (PFN_vkImportSemaphoreFdKHR)g_vk.GetDeviceProcAddr(g_dev, "vkImportSemaphoreFdKHR"); VkSemaphoreCreateInfo wsci = {.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO}; @@ -987,6 +1003,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) { @@ -1239,6 +1309,7 @@ static void device_lost(const char *where) { g_dev_state = -2; g_base_black = 0; vkp_framegen_device_lost(); + vkp_gpu_busy_device_lost(); droiddeck_log("error", "GPU device lost (VK_ERROR_DEVICE_LOST in %s): the compositor has stopped presenting; " "restart the session", where); for (uint32_t i = 0; i < g_nimg; i++) blendp_forget_image(g_images[i]); @@ -1626,6 +1697,7 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i VkImageLayout result_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; if (fx) { int mapped_w = (int)(scene_w * g_map.kx + 0.5f), mapped_h = (int)(scene_h * g_map.ky + 0.5f); + if (fg) { mapped_w = scene_w; mapped_h = scene_h; } vkp_effects_set_formats(scene_fmt, scene_fmt); result = vkp_effects_run(cmd, scene_img, scene_w, scene_h, mapped_w, mapped_h, &rw, &rh); result_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; @@ -1724,9 +1796,6 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i int vkp_render(int scene_w, int scene_h, const struct vkp_draw *draws, int n) { if (vkp_quest_layer_presentation() && !vkp_framegen_active() && !vkp_cardboard_active()) { - /* The desktop (multiple windows), overlays and an empty scene must also avoid WSI. - * Merely enabling zero-copy handles only a single fullscreen window and leaves both - * the letterbox and every fallback frame going through the corrupted swapchain. */ vkp_apply_window_request(); sc_layer_hide_overlay(); if (n > 0) { @@ -1738,9 +1807,6 @@ int vkp_render(int scene_w, int scene_h, const struct vkp_draw *draws, int n) { } else { sc_layer_hide(); } - /* sc_layer_present_pass signals only after submitting client content. - * A backdrop alone, or a successful no-op while a layer slot is unavailable, - * must not dismiss the app's loading UI or mark Steam's window as shown. */ return vkp_base_black(scene_w, scene_h); } return render_impl(scene_w, scene_h, draws, n, NULL, NULL); @@ -1777,8 +1843,6 @@ void vkp_signal_first_frame(void) { int vkp_update_map(int scene_w, int scene_h) { if (g_dev_state == -2 || dev_init() != 0 || !g_window || scene_w <= 0 || scene_h <= 0) return -1; if (vkp_quest_layer_presentation()) { - /* Layer geometry needs the window size, not a Vulkan swapchain. In particular, do - * not create/present a swapchain just to paint black under an otherwise clean layer. */ int w = ANativeWindow_getWidth(g_window), h = ANativeWindow_getHeight(g_window); if (w <= 0 || h <= 0) return -1; g_extent = (VkExtent2D){(uint32_t)w, (uint32_t)h}; diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 48d32ab4d..5cc06ddb3 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -16,6 +16,7 @@ enum vkp_align { VKP_ALIGN_CENTER = 0, VKP_ALIGN_TOP = 1, VKP_ALIGN_BOTTOM = 2, void vk_present_set_scale_mode(int mode, int alignment); int vkp_game_picture_rect(float rect[4]); int vkp_output_to_scene(double ox, double oy, double *sx, double *sy); +int vkp_scene_to_output(double sx, double sy, double *ox, double *oy); void vkp_output_size(int *w, int *h); struct vkp_image; @@ -34,6 +35,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 6a407088b..5d69098a6 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" @@ -16,6 +17,7 @@ #include "effects_chain.h" #include "cardboard.h" #include "droiddeck_color.h" +#include "gpu_clock_pin.h" extern int droiddeck_wayland_run(void); extern void droiddeck_wayland_set_scale_mode(int mode, int alignment); @@ -23,12 +25,21 @@ 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 int droiddeck_focus_takes_touch(void); +extern int droiddeck_cursor_input_pos(int *x, int *y); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); +extern void droiddeck_wayland_set_cursor_composite(int on); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); +extern void droiddeck_stream_set(int on); +extern void droiddeck_stream_frame(AHardwareBuffer *ahb); +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_render_on_commit; extern volatile int g_hide_shell; extern volatile int g_zero_copy; extern volatile unsigned g_zero_copy_last; @@ -262,18 +273,58 @@ 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; return droiddeck_cursor_serial(); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCursorComposite( + JNIEnv *env, jclass clazz, jboolean on) { + (void)env; (void)clazz; + droiddeck_wayland_set_cursor_composite(on ? 1 : 0); +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendKey( JNIEnv *env, jclass clazz, jint evdev, jint state) { droiddeck_wayland_send_key(evdev, state); } +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFocusTakesTouch( + JNIEnv *env, jclass clazz) { + (void)env; (void)clazz; + return droiddeck_focus_takes_touch() ? JNI_TRUE : JNI_FALSE; +} + +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorInputPos( + JNIEnv *env, jclass clazz, jintArray out) { + (void)clazz; + if (!out || (*env)->GetArrayLength(env, out) < 2) return JNI_FALSE; + int pos[2]; + if (!droiddeck_cursor_input_pos(&pos[0], &pos[1])) return JNI_FALSE; + jint jpos[2] = {pos[0], pos[1]}; + (*env)->SetIntArrayRegion(env, out, 0, 2, jpos); + return JNI_TRUE; +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendSceneInput( JNIEnv *env, jclass clazz, jint type, jint a, jint b) { @@ -566,9 +617,16 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetLookName(JNIEnv * free(s); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetRenderOnCommit(JNIEnv *env, jclass clazz, jboolean on) { + g_render_on_commit = on ? 1 : 0; + __android_log_print(ANDROID_LOG_INFO, TAG, "render on commit %s", on ? "on" : "off"); +} + 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); } @@ -634,8 +692,13 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeTextInputDelete(JNIE extern void adrenotools_set_turbo(bool turbo); JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetGpuTurbo(JNIEnv *env, jclass clazz, jboolean on) { - (void)env; (void)clazz; - adrenotools_set_turbo(on == JNI_TRUE); + (void)clazz; + if (!gpu_clock_pin_set(on == JNI_TRUE)) { + int saved_errno = errno; + jclass error = (*env)->FindClass(env, "java/lang/IllegalStateException"); + if (error) (*env)->ThrowNew(env, error, strerror(saved_errno)); + } + if (on != JNI_TRUE) adrenotools_set_turbo(false); } JNIEXPORT jint JNICALL @@ -660,3 +723,20 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCardboardSpatialP (*env)->GetFloatArrayRegion(env, pos, 0, 3, p); vkp_cardboard_set_spatial_pose(m, p, live ? 1 : 0); } + +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 3fc438377..0cfb32fe7 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -17,7 +17,8 @@ class App : Application() { override fun onCreate() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) - // Helper processes must not initialize the main USB provider or guest graphics context. + com.droiddeck.launcher.ui.BuildWatermark.install(this) + HomeApp.trackRecents(this) val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) .runningAppProcesses?.firstOrNull { it.pid == android.os.Process.myPid() }?.processName @@ -25,9 +26,20 @@ class App : Application() { if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xbox") return } - if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return + if (process == "$packageName:xboxcloud") { + if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xboxcloud") + return + } + if (process == "$packageName:xcloudnative") { + com.droiddeck.launcher.stores.StoresState.init(this) + return + } + if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic" || + process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) + com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) + com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) com.droiddeck.launcher.session.SessionPrefs.settleGpuDriverMode(this) com.droiddeck.launcher.update.AppUpdates.init(this) com.droiddeck.launcher.core.DownloadSource.init(this) @@ -36,6 +48,7 @@ class App : Application() { com.droiddeck.launcher.glasses.Glasses.init(this) com.droiddeck.launcher.glasses.GlassesMenuMirror.initialize(this) BwrapSpawner.start(this) + com.droiddeck.launcher.runtime.RootSpawner.start(this) com.droiddeck.launcher.frontend.GameFileSync.start(this) com.droiddeck.launcher.stores.StoresState.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.gog.GogBackend) @@ -43,15 +56,16 @@ 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.sync.Syncthing.init(this) + 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. */ private fun prefetchAddonPacks() { val app = this Thread({ runCatching { if (com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app).isDirectory) { - com.droiddeck.launcher.core.AddonPack.PROOT.ensure(app) + if (!com.droiddeck.launcher.runtime.LinuxRuntime.patchedProot(app)) com.droiddeck.launcher.core.AddonPack.PROOT.ensure(app) com.droiddeck.launcher.core.AddonPack.DIRECTAUDIO.ensure(app) } if (com.droiddeck.launcher.stores.gog.GogComet.enabled(app)) com.droiddeck.launcher.core.AddonPack.COMET.ensure(app) diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 7ccbba7f5..344aa7452 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -55,6 +55,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl private set private var runtimePending by mutableStateOf(false) private var sessionRunning by mutableStateOf(false) + var tpUbwcMode: String by mutableStateOf(SessionPrefs.TP_UBWC_AUTO) + private set val uiMode: String get() = when (mode) { SessionPrefs.GPU_DRIVERS_AUTO -> GPU_MODE_AUTO @@ -73,8 +75,16 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl mode = uiMode, display = displaySlot(), runtime = runtimeSlot(), canRestart = !sessionRunning, checkedAt = TurnipReleases.cached(activity)?.checkedAt ?: 0L, + tpUbwcMode = tpUbwcMode.takeIf { gpu.model == 740 }, + tpUbwcRestartRequired = com.droiddeck.launcher.gpu.TpUbwcHint.restartRequired(activity), ) + fun chooseTpUbwcMode(mode: String) { + if (gpu.model != 740) return + SessionPrefs.setTpUbwcMode(activity, mode) + tpUbwcMode = mode + } + private fun slotSource(chosenDefault: Boolean, defaultLabel: Int): String = activity.getString(when { uiMode == GPU_MODE_AUTO -> R.string.gpu_src_auto uiMode == GPU_MODE_PAIR && pairRows.any { it.active } -> R.string.gpu_src_pair @@ -124,6 +134,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl var androidSelected by mutableStateOf("") fun refreshDrivers() { + tpUbwcMode = SessionPrefs.tpUbwcMode(activity) val lm = LinuxVulkanDriverManager(activity) fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED val bundles = DriverBundle.all(activity) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c27fc3d32..1d9e32577 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -44,6 +44,7 @@ import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.ui.ComponentsPage import com.droiddeck.launcher.session.GameSaves import com.droiddeck.launcher.session.SessionLogShare +import com.droiddeck.launcher.session.SessionPaths import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SteamRepair import com.droiddeck.launcher.core.CpuCores @@ -52,6 +53,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 @@ -77,6 +79,7 @@ import com.droiddeck.launcher.session.SessionArtifacts import com.droiddeck.launcher.session.SessionPhase import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays @@ -91,17 +94,24 @@ 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 compatFlood 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) private var removalPending by mutableStateOf(false) private var available by mutableStateOf(null) + private var catalogFresh = false + private var componentsQueueBusy by mutableStateOf(false) private var busy by mutableStateOf(false) private var stage by mutableStateOf("") private var percent by mutableIntStateOf(-1) @@ -120,6 +130,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(null) private var steamRepairQueued by mutableStateOf(false) private var mangoapp by mutableStateOf(true) private var steamController by mutableStateOf(SessionPrefs.CONTROLLER_DECK) @@ -133,11 +144,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,9 +168,13 @@ 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) + private var cursorComposite by mutableStateOf(false) private var guestHostname by mutableStateOf(SessionPrefs.DEFAULT_GUEST_HOSTNAME) private var phantomWarning by mutableStateOf(null) private var phantomProcessStatus by mutableStateOf(PhantomProcessStatus.NOT_APPLICABLE) @@ -161,26 +182,29 @@ class FrontEndActivity : ComponentActivity() { private var directAudio by mutableStateOf(false) private var picturePosition by mutableStateOf("center") private var stretch16x9 by mutableStateOf(false) - private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + 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()) - private var storesView by mutableStateOf(SessionPrefs.STORES_VIEWS.first()) + private var storesView by mutableStateOf(SessionPrefs.DEFAULT_STORES_VIEW) private var mic by mutableStateOf(false) private var wifiDiscovery by mutableStateOf(false) private var wifiDiscoveryPermission by mutableStateOf(false) 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() @@ -192,6 +216,7 @@ class FrontEndActivity : ComponentActivity() { } private val mediaReceiver = object : android.content.BroadcastReceiver() { override fun onReceive(context: android.content.Context?, intent: Intent?) { + usbScan++ ui.removeCallbacks(mediaRefresh) ui.postDelayed(mediaRefresh, MEDIA_SETTLE_MS) } @@ -249,8 +274,68 @@ 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 { + SteamIntegration.setShortcutsListed(this, true) + 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, @@ -385,7 +470,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) @@ -393,13 +477,38 @@ class FrontEndActivity : ComponentActivity() { private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) + private var backHold by mutableStateOf(true) private var backActionsInverted by mutableStateOf(false) private var gameStorage by mutableStateOf("") + private var slowUsb by mutableStateOf(null) + private var usbScan = 0 + private var slowUsbNever by mutableStateOf(false) + + private fun showSlowUsb(drive: com.droiddeck.launcher.session.UsbLink.SlowDrive?) { + val off = slowUsbNever + if (off) SessionPrefs.setSlowUsbWarningOff(this) + slowUsbNever = false + slowUsb = drive.takeUnless { off } + } private var storageDiagnostics by mutableStateOf(false) private var storageOptions by mutableStateOf>(emptyList()) private val pickGameStorage = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } + private var steamLibraries by mutableStateOf>(emptyList()) + private val pickSteamLibrary = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> + val path = if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data) else null + if (path != null) Thread({ + val result = SteamLibraries.add(this, path) + ui.post { + steamLibraries = SteamLibraries.list(this) + refresh() + if (result is SteamLibraries.AddResult.Refused) { + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + } + } + }, "steam-library-add").start() + } private var romsDir by mutableStateOf(null) private var steamGames by mutableStateOf>(emptyList()) private var steamGamesX64 by mutableStateOf(false) @@ -408,38 +517,74 @@ class FrontEndActivity : ComponentActivity() { private var emulatorList by mutableStateOf>(emptyList()) private var runningLabel by mutableStateOf(null) private var logsEnabled by mutableStateOf(true) + private var gameDebugLogsEnabled by mutableStateOf(false) + private var gameDebugLogsNeedsRestart by mutableStateOf(false) private var vacDiagnostics by mutableStateOf(false) private var agentCommands by mutableStateOf(false) private var bluetoothAllowed by mutableStateOf(null) private var allFilesAllowed by mutableStateOf(null) + private var localNetworkAllowed by mutableStateOf(null) + 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) private var defaultHomeLabel by mutableStateOf(null) private var androidApps by mutableStateOf>(emptyList()) + private var androidAppsListing = 0 + private val packageCallback = object : android.content.pm.LauncherApps.Callback() { + private fun changed() { + refreshAndroidApps() + if (HomeWidgets.providers != null) HomeWidgets.refreshProviders(this@FrontEndActivity) + } + override fun onPackageRemoved(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackageAdded(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackageChanged(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackagesAvailable(packageNames: Array, user: android.os.UserHandle, replacing: Boolean) = changed() + override fun onPackagesUnavailable(packageNames: Array, user: android.os.UserHandle, replacing: Boolean) = changed() + override fun onShortcutsChanged(packageName: String, shortcuts: MutableList, user: android.os.UserHandle) { + if (homeAppSelected) HomePins.refresh(this@FrontEndActivity) + } + } private var secondScreenDisplays by mutableStateOf>(emptyList()) + private var dualDisplayId by mutableStateOf(-1) + private var dualScreenDevice by mutableStateOf(false) + private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) + private var dualScreenLauncher by mutableStateOf(true) + private var dualScreenControls by mutableStateOf(true) + private var launcherStarted = false private lateinit var displayManager: DisplayManager private val secondScreenDisplayListener = object : DisplayManager.DisplayListener { override fun onDisplayAdded(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() } + private val secondScreenTouchListener = object : android.hardware.input.InputManager.InputDeviceListener { + override fun onInputDeviceAdded(deviceId: Int) = refreshSecondScreenDisplays() + override fun onInputDeviceRemoved(deviceId: Int) = refreshSecondScreenDisplays() + override fun onInputDeviceChanged(deviceId: Int) = refreshSecondScreenDisplays() + } private val homeRoleRequest = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { refreshHomeAppState() } override fun startActivity(intent: Intent?) { + val compat = protons.protonBusyId != null || ProtonExtras.installInProgress 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() + SessionState.installing != null && !SessionState.running -> { + android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() return } + compat -> Unit pkgStage != null -> { android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() return @@ -454,22 +599,119 @@ class FrontEndActivity : ComponentActivity() { return } com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + if (compat) { + waitForCompat(intent) + return + } } super.startActivity(intent) if (intent?.component?.className == SessionActivity::class.java.name) overridePendingTransition(R.anim.session_rise, R.anim.session_hold) } private fun launchFlooded(f: PendingFlood) { - if (busy || LinuxRuntimeInstaller.isBusy()) { flood = null; floodProgress = 0f; return } + if (busy || LinuxRuntimeInstaller.isBusy() || (SessionState.installing != null && !SessionState.running) || + protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + flood = null + floodProgress = 0f + com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + if (!busy && !LinuxRuntimeInstaller.isBusy() && !(SessionState.installing != null && !SessionState.running) && + (protons.protonBusyId != null || ProtonExtras.installInProgress)) { + compatFlood = com.droiddeck.launcher.ui.Themes.byId(theme).signal + 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() || (SessionState.installing != null && !SessionState.running) || 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 + compatFlood = 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 + @Volatile private var lastComponentRestore = 0L + @Volatile private var componentRestoreRetry = false + private val componentRestoreLock = Any() + + private fun retryComponentRestore() { + val run = synchronized(componentRestoreLock) { + componentRestoreRetry = false + val now = android.os.SystemClock.elapsedRealtime() + (!isDestroyed && now - lastComponentRestore >= COMPONENT_RESTORE_MS).also { if (it) lastComponentRestore = now } + } + if (run) Thread({ + runCatching { com.droiddeck.launcher.frontend.AutoComponents.restoreMissing(this) }.onFailure { Log.w(TAG, "components: restore failed", it) } + }, "components-restore").start() + } private var pendingGameLink: String? = null + private var gameLinkReading = false + private var gameLinkTried = false private var gameSyncFolder by mutableStateOf(null) private fun pickGameExport(game: Library.SteamGame?) { onSavePicked = { folder -> @@ -493,7 +735,6 @@ class FrontEndActivity : ComponentActivity() { LauncherIcon.set(this, style) launcherIcon = LauncherIcon.current(this) if (launcherIcon == before) return false - // Android finishes activities started through the alias that was just disabled. startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) .setComponent(LauncherIcon.activity(this)) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK) @@ -510,16 +751,25 @@ class FrontEndActivity : ComponentActivity() { shortcutLibraryScanning = true } else shortcutLibraryScanning = false pendingGameLink = null + gameLinkReading = false + gameLinkTried = false if (GameLaunchIntent.accepts(request.action)) { + gameLinkReading = true + com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) val copy = Intent(request) Thread({ val id = GameLaunchIntent.read(this, copy) ui.post { if (intent === request && !isDestroyed) { + gameLinkReading = false pendingGameLink = id if (id == null) { + syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_invalid, android.widget.Toast.LENGTH_LONG).show() - } else refresh() + } else { + handleGameLink(steamGames, scanned = false) + refresh() + } } } }, "game-launch-file").start() @@ -527,7 +777,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 } @@ -544,12 +794,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) @@ -560,6 +810,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({ @@ -573,16 +829,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 } @@ -631,7 +889,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 } @@ -677,7 +935,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 } @@ -713,15 +972,21 @@ class FrontEndActivity : ComponentActivity() { ui.postDelayed(poll, SESSION_SWITCH_POLL_MS) } - private fun handleGameLink(games: List) { + private fun handleGameLink(games: List, scanned: Boolean = true) { if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) return val id = pendingGameLink ?: return + if (!scanned && games.none { it.gameIdString == id }) return + gameLinkTried = true + ui.postDelayed({ + if (!isDestroyed && lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) syncDualPanel() + }, LINK_PANEL_MS) val game = games.firstOrNull { it.gameIdString == id } if (game == null) { pendingGameLink = null intent.data = null intent.action = Intent.ACTION_MAIN intent.removeExtra(GameLaunchIntent.EXTRA_APP_ID) + syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_missing, android.widget.Toast.LENGTH_LONG).show() } else if (launchGame(game, returnHome = true)) { pendingGameLink = null @@ -738,10 +1003,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) @@ -750,18 +1017,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) @@ -773,6 +1041,13 @@ class FrontEndActivity : ComponentActivity() { if (decky.deckyPendingZip != null) com.droiddeck.launcher.ui.DeckyZipWarningDialog( onConfirm = { decky.confirmPluginZip() }, onCancel = { decky.cancelPluginZip() }, ) + slowUsb?.let { drive -> + com.droiddeck.launcher.ui.SlowUsbDialog(drive, slowUsbNever, { slowUsbNever = it }) { + com.droiddeck.launcher.session.UsbLink.markShown(this, drive) + showSlowUsb(null) + checkUsbLink() + } + } val page: (@Composable () -> Unit)? = when { showPerformance -> { { PerformanceHost() } } showComponents -> { { ComponentsHost() } } @@ -790,8 +1065,10 @@ class FrontEndActivity : ComponentActivity() { desktopInstalled = desktopInstalled, desktopPresent = desktopPresent, offlineAccount = offlineAccount, offline = offline, frameGenLabel = frameGenLabel, romsDir = romsDir, logsEnabled = logsEnabled, + gameDebugLogsEnabled = gameDebugLogsEnabled, gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart, vacDiagnostics = vacDiagnostics, agentCommands = agentCommands, - bluetoothAllowed = bluetoothAllowed, allFilesAllowed = allFilesAllowed, + bluetoothAllowed = bluetoothAllowed, allFilesAllowed = allFilesAllowed, localNetworkAllowed = localNetworkAllowed, + clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit, steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel, frameGen = FrameGen.mode(this), lossless = lossless, @@ -802,14 +1079,22 @@ class FrontEndActivity : ComponentActivity() { isHomeApp = homeAppSelected, homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, + integration = integrationState, + integrationFocus = integrationFocus, androidApps = androidApps, secondScreenDisplays = secondScreenDisplays, + dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available, + dualScreenDevice = dualScreenDevice, + dualScreenMode = dualScreenMode, + dualScreenLauncher = dualScreenLauncher, + dualScreenControls = dualScreenControls, packages = packageRows, packageCatalogLoading = catalogLoading, packageBusyId = pkgId, packageStage = pkgStage, packagePercent = pkgPercent, sessionRunning = SessionState.running, + battleNetInstalled = battleNetInstalled, backActionsInverted = backActionsInverted, buildLabel = BuildConfig.BUILD_LABEL, oscMode = oscMode, @@ -818,15 +1103,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, @@ -898,6 +1184,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) @@ -941,8 +1228,21 @@ class FrontEndActivity : ComponentActivity() { .putExtra(com.droiddeck.launcher.files.FileManagerActivity.EXTRA_START_DIR, dir.absolutePath)) }, onLogs = { - SessionPrefs.setLogsEnabled(this, !SessionPrefs.logsEnabled(this)) + val changed = SessionPrefs.setLogsEnabled(this, !SessionPrefs.logsEnabled(this)) + if (!changed) android.widget.Toast.makeText( + this, R.string.setup_logging_update_failed, android.widget.Toast.LENGTH_LONG, + ).show() logsEnabled = SessionPrefs.logsEnabled(this) + gameDebugLogsEnabled = SessionPrefs.gameDebugLogsEnabled(this) + gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart() + }, + onGameDebugLogs = { + val changed = SessionPrefs.setGameDebugLogsEnabled(this, !SessionPrefs.gameDebugLogsEnabled(this)) + if (!changed) android.widget.Toast.makeText( + this, R.string.setup_logging_update_failed, android.widget.Toast.LENGTH_LONG, + ).show() + gameDebugLogsEnabled = SessionPrefs.gameDebugLogsEnabled(this) + gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart() }, onVacDiagnostics = { SessionPrefs.setVacDiagnostics(this, !SessionPrefs.vacDiagnostics(this)) @@ -953,7 +1253,14 @@ class FrontEndActivity : ComponentActivity() { agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) }, onBluetoothAllowed = { askBluetooth() }, - onAllFilesAllowed = { com.droiddeck.launcher.core.AllFilesAccess.openSettings(this) }, + onLocalNetworkAllowed = { com.droiddeck.launcher.core.AppPermissions.requestLocalNetwork(this, 4) }, + onAllFilesAllowed = { com.droiddeck.launcher.files.AllFilesAccess.openSettings(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() @@ -995,6 +1302,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 -> @@ -1003,12 +1314,23 @@ 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 }, onStoresView = { view -> SessionPrefs.setStoresView(this, view); storesView = view }, onLibraryChanged = { refreshAddedGames(); refresh() }, + onDualScreenMode = { mode -> + SessionPrefs.setDualScreenMode(this, mode) + refreshSecondScreenDisplays() + }, + onDualScreenLauncher = { on -> + SessionPrefs.setDualScreenLauncher(this, on) + refreshSecondScreenDisplays() + }, + onDualScreenControls = { on -> + SessionPrefs.setDualScreenSessionControls(this, on) + dualScreenControls = on + }, onAnimationsEnabled = { on -> SessionPrefs.setAnimationsEnabled(this, on) animationsEnabled = on @@ -1026,7 +1348,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() @@ -1080,7 +1414,15 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, R.string.main_adb_copied, android.widget.Toast.LENGTH_SHORT).show() }, onDismissPhantomGate = { showPhantomGate = false }, - onStartWirelessAdbPairing = { WirelessAdbPairingService.start(this) }, + onShowPhantomGate = { + refreshPhantomStatus() + showPhantomGate = true + }, + onStartWirelessAdbPairing = { + if (com.droiddeck.launcher.core.AppPermissions.localNetwork(this)) WirelessAdbPairingService.start(this) + else com.droiddeck.launcher.core.AppPermissions.requestLocalNetwork(this, 5) + }, + onStartPairingGuide = { displayId, toggleOnly -> PairingGuideActivity.start(this, displayId, toggleOnly) }, onOpenNotificationSettings = { startActivity(Intent(android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS) .putExtra(android.provider.Settings.EXTRA_APP_PACKAGE, packageName) @@ -1176,20 +1518,32 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.ui.LaunchOrigin.flooding = null } } + androidx.activity.compose.BackHandler(compatLaunch != null) { cancelCompatLaunch() } + compatLaunch?.loading?.let { loading -> + if (!loading.ended) com.droiddeck.launcher.ui.VeilRing() + 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, + flood = compatFlood, onFlooded = { compatFlood = null }, + ) + } } } } 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)) } } val wanted = ArrayList() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q - && checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - wanted.add(Manifest.permission.WRITE_EXTERNAL_STORAGE) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { + for (permission in arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) wanted.add(permission) + } } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !SessionPrefs.bluetoothAsked(this) && checkSelfPermission(Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) { @@ -1201,14 +1555,9 @@ class FrontEndActivity : ComponentActivity() { wanted.add(Manifest.permission.RECORD_AUDIO) SessionPrefs.setMicAsked(this) } + wanted.addAll(com.droiddeck.launcher.core.AppPermissions.startup(this)) if (wanted.isNotEmpty()) requestPermissions(wanted.toTypedArray(), 1) - else if (!com.droiddeck.launcher.core.AllFilesAccess.granted() && !SessionPrefs.allFilesAsked(this)) { - Thread({ - if (com.droiddeck.launcher.core.AllFilesAccess.usesSharedStorage(this)) runOnUiThread { - if (com.droiddeck.launcher.core.AllFilesAccess.ask(this)) SessionPrefs.setAllFilesAsked(this) - } - }, "all-files-access").start() - } + else askSharedStorage() Thread({ com.droiddeck.launcher.stores.StoreAccounts.encryptAll(this) }, "store-credentials").start() if (!SessionState.running) Thread({ com.droiddeck.launcher.session.LogMigration.run(this) @@ -1220,9 +1569,33 @@ class FrontEndActivity : ComponentActivity() { }, "finish-abandoned").start() } + private fun askSharedStorage() { + if (!com.droiddeck.launcher.files.AllFilesAccess.granted() && !SessionPrefs.allFilesAsked(this)) { + Thread({ + if (com.droiddeck.launcher.files.AllFilesAccess.usesSharedStorage(this)) runOnUiThread { + if (!SessionPrefs.allFilesAsked(this) && com.droiddeck.launcher.files.AllFilesAccess.ask(this)) SessionPrefs.setAllFilesAsked(this) + } + }, "all-files-access").start() + } + } + + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + refreshPermissionRows() + if (requestCode == 5 && com.droiddeck.launcher.core.AppPermissions.localNetwork(this)) WirelessAdbPairingService.start(this) + askSharedStorage() + } + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) + if (intent.action == SteamIntegration.ACTION_SETUP) { + gameLinkReading = false + pendingGameLink = null + syncDualPanel() + readIntegrationIntent(intent) + return + } readGameIntent(intent) refresh() startSteamAtStartupIfEnabled() @@ -1252,9 +1625,28 @@ class FrontEndActivity : ComponentActivity() { startSession(Intent(this, SessionActivity::class.java).putExtra(SessionActivity.EXTRA_STEAMVR, steamVr), steamSession = true) } + @Suppress("OVERRIDE_DEPRECATION") + override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { + val outside = com.droiddeck.launcher.ui.DualScreenPanel.shownOn >= 0 && + com.droiddeck.launcher.ui.DualScreenPanel.opensOutside(packageName, intent.component?.packageName ?: intent.`package` ?: intent.resolveActivity(packageManager)?.packageName) + if (outside) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) + window.decorView.postDelayed({ if (hasWindowFocus()) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) }, 1500) + } + try { + super.startActivityForResult(intent, requestCode, options) + } catch (e: RuntimeException) { + if (outside) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + throw e + } + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) - if (hasFocus) applyLauncherFullscreen() + if (hasFocus) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + applyLauncherFullscreen() + } } private fun applyLauncherFullscreen() { @@ -1280,7 +1672,16 @@ class FrontEndActivity : ComponentActivity() { } } + @android.annotation.SuppressLint("RestrictedApi") 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) { @@ -1298,9 +1699,10 @@ class FrontEndActivity : ComponentActivity() { } private fun refreshPermissionRows() { + localNetworkAllowed = if (Build.VERSION.SDK_INT >= 37) com.droiddeck.launcher.core.AppPermissions.localNetwork(this) else null bluetoothAllowed = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) checkSelfPermission(Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED else null - allFilesAllowed = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) com.droiddeck.launcher.core.AllFilesAccess.granted() else null + allFilesAllowed = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) com.droiddeck.launcher.files.AllFilesAccess.granted() else null } private fun askBluetooth() { @@ -1317,14 +1719,32 @@ 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 + if (android.os.Build.VERSION.SDK_INT >= 29) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, true) + super.onPause() + } + override fun onResume() { super.onResume() + compatLaunchVisible = true + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) orientation = SessionPrefs.orientation(this) - requestedOrientation = orientation + launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) + requestedOrientation = launcherOrientation + SteamIntegration.syncShortcutsListing(this) refreshWifiDiscovery() refreshPermissionRows() 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()) @@ -1335,14 +1755,21 @@ class FrontEndActivity : ComponentActivity() { drivers.checkOnOpen() resumeInterruptedPackages() protons.checkUpdates() - if (!SessionState.running) Thread({ - val applied = runCatching { ComponentsManager.applyQueued(this) }.getOrDefault(emptyList()) - if (applied.isNotEmpty()) ui.post { - android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() - } - ui.post { if (showComponents) components.refreshComponents() } - }, "components-queue").start() - else if (showComponents) components.refreshComponents() + catalogFresh = false + if (!SessionState.running && !componentsQueueBusy && !LinuxRuntimeInstaller.isBusy()) { + componentsQueueBusy = true + Thread({ + val applied = runCatching { ComponentsManager.applyQueued(this) }.getOrDefault(emptyList()) + if (applied.isNotEmpty()) ui.post { + android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() + } + ui.post { + componentsQueueBusy = false + if (showComponents) components.refreshComponents() + autoUpdateRuntime() + } + }, "components-queue").start() + } else if (showComponents) components.refreshComponents() oscMode = SessionPrefs.oscMode(this) refreshController() refreshHomeAppState() @@ -1365,11 +1792,24 @@ class FrontEndActivity : ComponentActivity() { addDataScheme("file") }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + getSystemService(android.hardware.input.InputManager::class.java)?.registerInputDeviceListener(secondScreenTouchListener, ui) + launcherStarted = true refreshSecondScreenDisplays() + getSystemService(android.content.pm.LauncherApps::class.java).registerCallback(packageCallback, ui) + HomeWidgets.startListening(this) + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) return + @Suppress("DEPRECATION") + super.onActivityResult(requestCode, resultCode, data) } override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) + if (slowUsbNever) SessionPrefs.setSlowUsbWarningOff(this) + saveCompatLaunch(outState) pendingSwitch?.let { outState.putParcelable(KEY_PENDING_SWITCH, it) } switchingTo?.let { outState.putParcelable(KEY_SWITCHING_TO, it) @@ -1382,6 +1822,7 @@ class FrontEndActivity : ComponentActivity() { else @Suppress("DEPRECATION") state.getParcelable(key) override fun onDestroy() { + cancelCompatLaunch() updates.unregister() super.onDestroy() } @@ -1389,9 +1830,15 @@ class FrontEndActivity : ComponentActivity() { override fun onStop() { unregisterReceiver(wifiLocationReceiver) unregisterReceiver(mediaReceiver) + getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback) + HomeWidgets.stopListening(this) ui.removeCallbacks(mediaRefresh) com.droiddeck.launcher.stores.StoresState.libraryListener = null + com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) + getSystemService(android.hardware.input.InputManager::class.java)?.unregisterInputDeviceListener(secondScreenTouchListener) + launcherStarted = false + com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) flood = null returning = null floodProgress = 0f @@ -1403,20 +1850,52 @@ class FrontEndActivity : ComponentActivity() { homeScreenEnabled = HomeApp.isHomeScreenEnabled(this) homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) - androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() + refreshAndroidApps() + integrationState = readIntegration() + } + + private fun refreshAndroidApps() { + if (!homeAppSelected) { + ++androidAppsListing + androidApps = emptyList() + return + } + val seq = ++androidAppsListing + HomePins.refresh(this) + Thread({ + val apps = runCatching { HomeApp.launchableApps(this) }.getOrDefault(emptyList()) + ui.post { if (seq == androidAppsListing) androidApps = apps } + }, "home-apps").start() } private fun refreshSecondScreenDisplays() { if (!::displayManager.isInitialized) return - // The launcher can itself be shown on a non-default display (DeX, an external monitor); that one is not a "second screen". val ownDisplayId = if (android.os.Build.VERSION.SDK_INT >= 30) display?.displayId ?: android.view.Display.DEFAULT_DISPLAY else @Suppress("DEPRECATION") windowManager.defaultDisplay.displayId + dualScreenMode = SessionPrefs.dualScreenMode(this) secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId) + dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null + dualScreenLauncher = SessionPrefs.dualScreenLauncher(this) + dualScreenControls = SessionPrefs.dualScreenSessionControls(this) + val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) + dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1 + syncDualPanel() } + private fun syncDualPanel() { + if (launchPending()) return + if (launcherStarted && dualDisplayId >= 0) com.droiddeck.launcher.ui.DualScreenPanel.show(this, dualDisplayId, taskId) + else com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) + } + + private fun launchPending(): Boolean = gameLinkReading || (pendingGameLink != null && !gameLinkTried) + private fun launchAndroidApp(app: HomeApp.LaunchableApp, displayId: Int?) { + val onOwnScreen = displayId == null || displayId == ((if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay)?.displayId ?: Display.DEFAULT_DISPLAY) + if (onOwnScreen) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) try { HomeApp.launch(this, app, displayId) } catch (_: Exception) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label val message = when { displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label) @@ -1548,6 +2027,7 @@ class FrontEndActivity : ComponentActivity() { onRestoreBundled = { TurnipDriver(this).restoreBundled(); drivers.refreshDrivers() }, onMode = { m -> drivers.chooseMode(m) }, onRestart = { drivers.restartApp() }, + onTpUbwcMode = { drivers.chooseTpUbwcMode(it) }, ), protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, @@ -1583,6 +2063,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) @@ -1648,7 +2172,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, @@ -1656,10 +2180,10 @@ 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, + backHold = backHold, backActionsInverted = backActionsInverted, directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, picturePosition = if (mode == SessionService.MODE_STEAM) picturePosition else null, @@ -1667,12 +2191,14 @@ class FrontEndActivity : ComponentActivity() { mic = if (mode == SessionService.MODE_STEAM) mic else null, gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, + steamLibraries = steamLibraries, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, forceSsbs = forceSsbs, syncBackend = if (mode == SessionService.MODE_STEAM) SessionPrefs.syncBackendOf(fastSync, fsyncFirst, syncFallback) else null, steamClientArch = if (mode == SessionService.MODE_STEAM) steamClientArch else null, returnAfterGame = if (mode == SessionService.MODE_STEAM) returnAfterGame else null, + shaderPrecache = if (mode == SessionService.MODE_STEAM) shaderPrecache else null, steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, @@ -1682,11 +2208,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, @@ -1695,25 +2217,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 }, @@ -1728,6 +2237,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setUnfoldedControlsWithController(this, on); unfoldedControlsWithController = on }, onOsc = { o -> SessionPrefs.setOscMode(this, o); oscMode = o }, + onBackHold = { on -> SessionPrefs.setBackHold(this, on); backHold = on }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) backActionsInverted = inverted @@ -1746,6 +2256,19 @@ class FrontEndActivity : ComponentActivity() { onPickGameStorageFolder = { pickGameStorage.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_game_storage), gameStorage.ifEmpty { null })) }, + onAddSteamLibrary = { + pickSteamLibrary.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.libraries_pick), null)) + }, + onRenameSteamLibrary = { id, label -> + SteamLibraries.rename(this, id, label) + steamLibraries = SteamLibraries.list(this) + refresh() + }, + onRemoveSteamLibrary = { id -> + SteamLibraries.remove(this, id) + steamLibraries = SteamLibraries.list(this) + refresh() + }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) storageDiagnostics = on @@ -1759,9 +2282,15 @@ class FrontEndActivity : ComponentActivity() { syncFallback = SessionPrefs.syncFallback(this) }, onSteamRepair = { steamRepairQueued = SteamRepair.queue(this) }, - onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id; refresh() }, + onSteamClientArch = { id -> + SessionPrefs.setSteamClientArch(this, id) + steamClientArch = id + loadShaderPrecache(mode) + refresh() + }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, + onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, onRunSteamAtStartup = { on -> SessionPrefs.setRunSteamAtStartup(this, on) @@ -1802,7 +2331,12 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, guestHostname = guestHostname, phantomWarning = phantomWarning, + 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 }, onTuSysmem = { on -> SessionPrefs.setTuSysmem(this, on); tuSysmem = on }, onZinkLazy = { on -> SessionPrefs.setZinkLazy(this, on); zinkLazy = on }, @@ -1814,8 +2348,12 @@ 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 }, onGuestHostname = { name -> SessionPrefs.setGuestHostname(this, name) }, onClientCore = { core, on -> clientCores = if (on) clientCores + core else clientCores - core @@ -1888,6 +2426,7 @@ class FrontEndActivity : ComponentActivity() { } private fun refreshAddedGames() { + checkUsbLink() sgdbKeyKnown() fetchAddedGameArt() } @@ -1916,6 +2455,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) @@ -1931,11 +2483,11 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = SteamRepair.queued(this) mangoapp = SessionPrefs.mangoapp(this) returnAfterGame = SessionPrefs.returnAfterGame(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 @@ -1943,6 +2495,7 @@ class FrontEndActivity : ComponentActivity() { suspendPolicy = SessionPrefs.suspendPolicy(this, mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) + backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) directAudio = SessionPrefs.directAudio(this) picturePosition = SessionPrefs.picturePosition(this) @@ -1950,6 +2503,7 @@ class FrontEndActivity : ComponentActivity() { mic = SessionPrefs.micEnabled(this) refreshWifiDiscovery() gameStorage = SessionPrefs.gameStorage(this) + steamLibraries = SteamLibraries.list(this) storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode Thread({ @@ -1979,6 +2533,20 @@ class FrontEndActivity : ComponentActivity() { } SessionPrefs.setGameStorage(this, path, label) gameStorage = path + checkUsbLink() + } + + private fun checkUsbLink() { + if (android.os.Looper.myLooper() != android.os.Looper.getMainLooper()) { ui.post { checkUsbLink() }; return } + val scan = ++usbScan + Thread({ + val drive = runCatching { com.droiddeck.launcher.session.UsbLink.slowLibrary(this) }.getOrNull() + ui.post { + if (scan != usbScan || isFinishing) return@post + val due = drive?.takeIf { com.droiddeck.launcher.session.UsbLink.stillDue(this, it) } + if (due == null) { if (slowUsb != null) showSlowUsb(null) } else if (slowUsb?.key != due.key) showSlowUsb(due) + } + }, "usb-link").start() } private fun refreshCores() { @@ -1994,15 +2562,22 @@ 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) + cursorComposite = SessionPrefs.cursorComposite(this) guestHostname = SessionPrefs.guestHostname(this) refreshPhantomStatus() } + private fun gameDebugLogsNeedsRestart(): Boolean = + SessionPrefs.logsEnabled(this) && SessionPrefs.gameDebugLogsEnabled(this) && + !SessionPaths.currentSessionLogsRetained(this) + private fun refresh() { - // Until the scan finishes, the other client's games would launch in this one. val listX64 = SessionPrefs.activeSteamClientArch(this) == "x86_64" if (listX64 != steamGamesX64) { steamGamesX64 = listX64 @@ -2013,16 +2588,24 @@ 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) ready = LinuxRuntime.isInstalled(this) removalPending = LinuxRuntimeInstaller.hasRemovalPending(this) + ui.post { autoUpdateRuntime() } frameGenLabel = FrameGen.label(this) romsDir = SessionPrefs.romsDir(this).takeIf { it.isNotEmpty() } logsEnabled = SessionPrefs.logsEnabled(this) + gameDebugLogsEnabled = SessionPrefs.gameDebugLogsEnabled(this) + gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart() 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) @@ -2032,7 +2615,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({ @@ -2054,15 +2637,32 @@ class FrontEndActivity : ComponentActivity() { } val scannedArch = SessionPrefs.activeSteamClientArch(this) val scannedX64 = scannedArch == "x86_64" - val games = if (ready) Library.launchableGames(this, arch = scannedArch) else emptyList() + val games = if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.launchableGames(this, arch = scannedArch) else emptyList() val all = games.distinctBy { it.gameId } if (ready && scanGeneration == libraryScanGeneration) com.droiddeck.launcher.frontend.LibraryCache.save(this, all, scannedX64) val endedSession = SessionState.sessionId.takeIf { !SessionState.running && it != null && it != componentSweepSession } - if (ready && (!componentSweepDone || endedSession != null)) { + val sweepDue = ready && (!componentSweepDone || endedSession != null) + if (sweepDue) { componentSweepDone = true endedSession?.let { componentSweepSession = it } - ui.postDelayed({ Thread({ com.droiddeck.launcher.frontend.AutoComponents.sweep(this, all) }, "components-sweep").start() }, 10_000) } + val restoreDue = synchronized(componentRestoreLock) { + val now = android.os.SystemClock.elapsedRealtime() + val due = ready && (lastComponentRestore == 0L || now - lastComponentRestore >= COMPONENT_RESTORE_MS) + if (due) { + lastComponentRestore = now + } else if (ready && !componentRestoreRetry) { + componentRestoreRetry = true + ui.postDelayed({ retryComponentRestore() }, (COMPONENT_RESTORE_MS - (now - lastComponentRestore)).coerceAtLeast(0L)) + } + due + } + if (restoreDue || sweepDue) ui.postDelayed({ + Thread({ + if (restoreDue) runCatching { com.droiddeck.launcher.frontend.AutoComponents.restoreMissing(this) }.onFailure { Log.w(TAG, "components: restore failed", it) } + if (sweepDue) com.droiddeck.launcher.frontend.AutoComponents.sweep(this, all) + }, "components-restore").start() + }, 10_000) ui.post { if (scanGeneration == libraryScanGeneration) { val current = steamGames.filter { it.library != Library.ADDED }.associateBy { it.appId } @@ -2103,6 +2703,10 @@ class FrontEndActivity : ComponentActivity() { private fun startSession(intent: Intent, steamSession: Boolean = false): Boolean { if (busy || LinuxRuntimeInstaller.isBusy()) return false + if (SessionState.installing != null && !SessionState.running) { + android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() + return false + } if (com.droiddeck.launcher.storage.StorageState.cleaning) { android.widget.Toast.makeText(this, R.string.storage_cleanup_busy, android.widget.Toast.LENGTH_SHORT).show() return false @@ -2120,6 +2724,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), @@ -2151,7 +2756,7 @@ class FrontEndActivity : ComponentActivity() { private fun runtimeChangesBlocked(): Boolean = busy || LinuxRuntimeInstaller.isBusy() || SessionState.running || SessionState.phase !in setOf(SessionPhase.IDLE, SessionPhase.FAILED) || - protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null || + protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null || componentsQueueBusy || components.compBusy != null || saveBusy != null || com.droiddeck.launcher.store.UserAppsState.working != null private fun removeDesktop() { @@ -2211,18 +2816,38 @@ class FrontEndActivity : ComponentActivity() { }, "runtime-operation").start() } + private fun autoUpdateRuntime() { + val release = available?.takeIf { catalogFresh } ?: return + if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED) || runtimeChangesBlocked() || removalPending) return + if (release.version == installed || installed == null) return + if (com.droiddeck.launcher.runtime.RuntimeAutoUpdate.claim(this, installed, release.version)) { + Log.i(TAG, "runtime: updating $installed to ${release.version} by itself") + install(release) + } + } + private fun checkCatalog() { val release = LinuxRuntimeInstaller.fetchRelease() Log.i(TAG, "catalog: " + (release?.version ?: "unreachable")) - ui.post { if (release != null) available = release } + ui.post { + if (release == null) return@post + available = release + catalogFresh = true + autoUpdateRuntime() + } } companion object { private const val TAG = "MainActivity" private const val MEDIA_SETTLE_MS = 1500L + private const val COMPONENT_RESTORE_MS = 60_000L + private const val LINK_PANEL_MS = 1500L 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 71304e883..59e10c48e 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/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 74b49821c..4d5b87aa7 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -6,20 +6,41 @@ import android.graphics.Bitmap import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.pm.ApplicationInfo +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.graphics.Rect +import android.os.Process +import android.os.UserHandle +import android.os.UserManager import android.content.pm.PackageManager +import android.net.Uri import android.os.Build import android.provider.Settings import androidx.core.graphics.drawable.toBitmap import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState +import kotlin.math.roundToInt object HomeApp { + private const val ICON_DP = 72 + data class LaunchableApp( val label: String, val packageName: String, val className: String, val icon: Bitmap?, - ) + val system: Boolean = false, + val game: Boolean = false, + val installedAt: Long = 0L, + val updatedAt: Long = 0L, + val user: UserHandle? = null, + val userSerial: Long = 0L, + ) { + val component get() = ComponentName(packageName, className) + val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + val work get() = userSerial != 0L + } fun isHomeScreenEnabled(context: Context): Boolean = context.packageManager.getComponentEnabledSetting(ComponentName(context, HomeActivity::class.java)) == @@ -69,33 +90,134 @@ object HomeApp { fun settingsIntent(): Intent = Intent(Settings.ACTION_HOME_SETTINGS) fun launchableApps(context: Context): List { + val launcher = context.getSystemService(LauncherApps::class.java) + val users = context.getSystemService(UserManager::class.java) val pm = context.packageManager - val launch = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) - val apps = pm.queryIntentActivities(launch, 0) - .asSequence() - .mapNotNull { result -> - val activity = result.activityInfo ?: return@mapNotNull null - if (!activity.exported || activity.packageName == context.packageName) return@mapNotNull null - val label = result.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { activity.packageName } - val icon = runCatching { result.loadIcon(pm).toBitmap(48, 48) }.getOrNull() - LaunchableApp(label, activity.packageName, activity.name, icon) + val own = Process.myUserHandle() + val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() + val apps = users.userProfiles.flatMap { user -> + val serial = if (user == own) 0L else users.getSerialNumberForUser(user) + runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info -> + val component = info.componentName + if (component.packageName == context.packageName && user == own) return@mapNotNull null + val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName } + val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() + val app = info.applicationInfo + val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null + @Suppress("DEPRECATION") + val game = app.category == ApplicationInfo.CATEGORY_GAME || app.flags and ApplicationInfo.FLAG_IS_GAME != 0 + LaunchableApp( + label, component.packageName, component.className, icon, + system = app.flags and (ApplicationInfo.FLAG_SYSTEM or ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0, + game = game, + installedAt = info.firstInstallTime, + updatedAt = updated ?: info.firstInstallTime, + user = user, + userSerial = serial, + ) } - .distinctBy { it.packageName } - .toList() - return apps.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + } + return apps.distinctBy { it.key }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) } - fun launch(context: Context, app: LaunchableApp, displayId: Int? = null) { - val intent = Intent(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_LAUNCHER) - .setComponent(ComponentName(app.packageName, app.className)) - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - if (displayId == null) { - context.startActivity(intent) - return + fun launch(context: Context, app: LaunchableApp, displayId: Int? = null, bounds: Rect? = null) { + val options = displayId?.let { ActivityOptions.makeBasic().setLaunchDisplayId(it).toBundle() } + val launcher = context.getSystemService(LauncherApps::class.java) + launcher.startMainActivity(app.component, app.user ?: Process.myUserHandle(), bounds, options) + } + + fun canUseShortcuts(context: Context): Boolean = + runCatching { context.getSystemService(LauncherApps::class.java).hasShortcutHostPermission() }.getOrDefault(false) + + fun shortcuts(context: Context, app: LaunchableApp): List { + if (!canUseShortcuts(context)) return emptyList() + val query = LauncherApps.ShortcutQuery() + .setPackage(app.packageName) + .setActivity(app.component) + .setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC or LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST) + return runCatching { context.getSystemService(LauncherApps::class.java).getShortcuts(query, app.user ?: Process.myUserHandle()) } + .getOrNull().orEmpty() + .filter { it.isEnabled } + .sortedWith(compareBy { if (it.isDeclaredInManifest) 0 else 1 }.thenBy { it.rank }) + .take(5) + } + + fun shortcutIcon(context: Context, info: ShortcutInfo, px: Int = (ICON_DP * context.resources.displayMetrics.density).roundToInt()): Bitmap? = runCatching { + context.getSystemService(LauncherApps::class.java) + .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px) + }.getOrNull() + + fun trackRecents(app: android.app.Application) { + app.registerActivityLifecycleCallbacks(object : android.app.Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: android.app.Activity, savedInstanceState: android.os.Bundle?) = Unit + override fun onActivityStarted(activity: android.app.Activity) = Unit + override fun onActivityResumed(activity: android.app.Activity) = syncRecents(activity) + override fun onActivityPaused(activity: android.app.Activity) { if (activity is FrontEndActivity) syncRecents(activity) } + override fun onActivityStopped(activity: android.app.Activity) = Unit + override fun onActivitySaveInstanceState(activity: android.app.Activity, outState: android.os.Bundle) = Unit + override fun onActivityDestroyed(activity: android.app.Activity) = Unit + }) + } + + private fun syncRecents(activity: android.app.Activity) = + keepOutOfRecents(activity, activity is FrontEndActivity && !SessionState.running && isDefault(activity)) + + internal enum class RecentsStep { HIDE, SHOW, FORGET, NONE } + + internal fun recentsStep(hidden: Boolean, owned: Boolean, excluded: Boolean): RecentsStep = when { + hidden && !excluded -> RecentsStep.HIDE + !hidden && owned && excluded -> RecentsStep.SHOW + !hidden && owned -> RecentsStep.FORGET + else -> RecentsStep.NONE + } + + fun keepOutOfRecents(activity: android.app.Activity, hidden: Boolean) { + val prefs = activity.getSharedPreferences("home-recents", Context.MODE_PRIVATE) + val owned = prefs.getStringSet("tasks", null).orEmpty() + val id = activity.taskId.toString() + if (!hidden && id !in owned) return + runCatching { + @Suppress("DEPRECATION") + fun idOf(task: android.app.ActivityManager.AppTask) = + task.taskInfo?.let { if (Build.VERSION.SDK_INT >= 29) it.taskId else it.persistentId } ?: -1 + val tasks = activity.getSystemService(android.app.ActivityManager::class.java).appTasks + val task = tasks.firstOrNull { idOf(it) == activity.taskId } ?: return + val baseIntent = task.taskInfo?.baseIntent ?: return@runCatching + val excluded = baseIntent.flags and Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS != 0 + val step = recentsStep(hidden, id in owned, excluded) + if (step == RecentsStep.NONE) return + if (step != RecentsStep.FORGET) task.setExcludeFromRecents(step == RecentsStep.HIDE) + val live = tasks.map { idOf(it).toString() }.toSet() + val next = owned.filter { it in live && it != id }.toMutableSet() + if (step == RecentsStep.HIDE) next += id + prefs.edit().putStringSet("tasks", next).apply() } - val options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId) - context.startActivity(intent, options.toBundle()) + } + + fun startShortcut(context: Context, info: ShortcutInfo) { + val task = generateSequence(context) { (it as? android.content.ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.taskId + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, true) } + try { + context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + } catch (e: Exception) { + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, false) } + throw e + } + } + + fun openAppInfo(context: Context, app: LaunchableApp) { + context.getSystemService(LauncherApps::class.java) + .startAppDetailsActivity(app.component, app.user ?: Process.myUserHandle(), null, null) + } + + fun canUninstall(app: LaunchableApp): Boolean = !app.system && !app.work + + fun uninstall(context: Context, app: LaunchableApp) { + context.startActivity( + Intent(Intent.ACTION_DELETE, Uri.fromParts("package", app.packageName, null)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) } fun isActiveSteamSession(): Boolean = diff --git a/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt new file mode 100644 index 000000000..dc1f0bca4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt @@ -0,0 +1,65 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import org.json.JSONArray +import org.json.JSONObject +import java.util.UUID + +object HomeFolders { + data class Folder(val id: String, val name: String, val apps: List) + + private const val PREFS = "home_launcher" + private const val KEY = "folders" + + var folders by mutableStateOf>(emptyList()) + private set + private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return + folders = runCatching { + val array = JSONArray(raw) + (0 until array.length()).map { i -> + val o = array.getJSONObject(i) + val apps = o.getJSONArray("apps") + Folder(o.getString("id"), o.getString("name"), (0 until apps.length()).map { apps.getString(it) }) + } + }.getOrDefault(emptyList()) + } + + fun create(context: Context, name: String, appKey: String): Folder { + val folder = Folder(UUID.randomUUID().toString(), name, listOf(appKey)) + update(context, without(appKey) + folder) + return folder + } + + fun add(context: Context, folderId: String, appKey: String) = + update(context, without(appKey).map { if (it.id == folderId) it.copy(apps = it.apps + appKey) else it }) + + fun remove(context: Context, appKey: String) = update(context, without(appKey)) + + fun rename(context: Context, folderId: String, name: String) = + update(context, folders.map { if (it.id == folderId) it.copy(name = name) else it }) + + fun delete(context: Context, folderId: String) = update(context, folders.filterNot { it.id == folderId }) + + fun migrateMembers(context: Context, keyFor: (String) -> String?) { + if (folders.none { f -> f.apps.any { '/' !in it } }) return + update(context, folders.map { f -> f.copy(apps = f.apps.map { if ('/' in it) it else keyFor(it) ?: it }.distinct()) }) + } + + private fun without(appKey: String): List = + folders.map { it.copy(apps = it.apps - appKey) }.filter { it.apps.isNotEmpty() } + + private fun update(context: Context, next: List) { + folders = next + val array = JSONArray() + for (f in next) array.put(JSONObject().put("id", f.id).put("name", f.name).put("apps", JSONArray(f.apps))) + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt new file mode 100644 index 000000000..70f98f484 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object HomeHidden { + private const val PREFS = "home_launcher" + private const val KEY = "hidden" + + var keys by mutableStateOf>(emptySet()) + private set + private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + keys = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getStringSet(KEY, emptySet()).orEmpty().toSet() + } + + fun set(context: Context, key: String, hidden: Boolean) { + keys = if (hidden) keys + key else keys - key + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putStringSet(KEY, keys).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomePins.kt b/app/src/main/java/com/droiddeck/launcher/HomePins.kt new file mode 100644 index 000000000..38acb1813 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomePins.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher + +import android.content.Context +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.graphics.Bitmap +import android.os.Handler +import android.os.Looper +import android.os.Process +import android.os.UserManager +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object HomePins { + class Pinned(val info: ShortcutInfo, val icon: Bitmap?, val appLabel: String, val userSerial: Long) { + val key get() = "pin:${info.`package`}/${info.id}" + if (userSerial != 0L) "#$userSerial" else "" + val label get() = info.shortLabel?.toString()?.trim().orEmpty().ifEmpty { appLabel } + val work get() = userSerial != 0L + } + + var pinned by mutableStateOf>(emptyList()) + private set + private val main = Handler(Looper.getMainLooper()) + private var listing = 0 + + fun refresh(context: Context) { + val app = context.applicationContext + val seq = ++listing + Thread({ + val list = runCatching { load(app) }.getOrDefault(emptyList()) + main.post { if (seq == listing) pinned = list } + }, "home-pins").start() + } + + private fun load(context: Context): List { + if (!HomeApp.canUseShortcuts(context)) return emptyList() + val launcher = context.getSystemService(LauncherApps::class.java) + val users = context.getSystemService(UserManager::class.java) + val pm = context.packageManager + val own = Process.myUserHandle() + val query = LauncherApps.ShortcutQuery().setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED) + return users.userProfiles.flatMap { user -> + val serial = if (user == own) 0L else users.getSerialNumberForUser(user) + runCatching { launcher.getShortcuts(query, user) }.getOrNull().orEmpty() + .filter { it.isEnabled && it.isPinned } + .map { info -> + val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.`package`, 0)).toString() } + .getOrDefault(info.`package`) + Pinned(info, HomeApp.shortcutIcon(context, info), appLabel, serial) + } + } + } + + fun accept(context: Context, request: LauncherApps.PinItemRequest): Boolean { + val ok = runCatching { request.isValid && request.accept() }.getOrDefault(false) + if (ok) refresh(context) + return ok + } + + fun unpin(context: Context, pinned: Pinned) { + val info = pinned.info + val launcher = context.getSystemService(LauncherApps::class.java) + val query = LauncherApps.ShortcutQuery().setPackage(info.`package`).setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED) + val unpinned = runCatching { + val current = checkNotNull(launcher.getShortcuts(query, info.userHandle)) + val keep = current.map { it.id } - info.id + launcher.pinShortcuts(info.`package`, keep, info.userHandle) + }.isSuccess + if (!unpinned) return + listing++ + this.pinned = this.pinned.filterNot { it.key == pinned.key } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt new file mode 100644 index 000000000..886f5f0e8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt @@ -0,0 +1,316 @@ +package com.droiddeck.launcher + +import android.app.Activity +import android.appwidget.AppWidgetHost +import android.appwidget.AppWidgetHostView +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProviderInfo +import android.content.Context +import android.content.Intent +import android.content.pm.LauncherApps +import android.graphics.Bitmap +import android.os.Build +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.SizeF +import android.view.HapticFeedbackConstants +import android.view.MotionEvent +import android.view.ViewConfiguration +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.core.graphics.drawable.toBitmap +import org.json.JSONArray +import org.json.JSONObject +import kotlin.math.hypot +import kotlin.math.roundToInt + +object HomeWidgets { + data class Placed(val id: Int, val widthDp: Int, val heightDp: Int) + + data class Provider( + val info: AppWidgetProviderInfo, + val label: String, + val appLabel: String, + val preview: Bitmap?, + val widthDp: Int, + val heightDp: Int, + ) + + private const val HOST_ID = 0x0DDE + private const val PREFS = "home_launcher" + private const val KEY = "widgets" + private const val REQUEST_BIND = 0x0DD1 + private const val REQUEST_CONFIGURE = 0x0DD2 + private const val REQUEST_RECONFIGURE = 0x0DD3 + const val MIN_WIDTH_DP = 96 + const val MIN_HEIGHT_DP = 56 + + var widgets by mutableStateOf>(emptyList()) + private set + var providers by mutableStateOf?>(null) + private set + private var loaded = false + private var host: Host? = null + private var pending: AppWidgetProviderInfo? = null + private var pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + private var pinRequest: LauncherApps.PinItemRequest? = null + private val main = Handler(Looper.getMainLooper()) + + private class Host(context: Context) : AppWidgetHost(context, HOST_ID) { + override fun onCreateView(context: Context, appWidgetId: Int, appWidget: AppWidgetProviderInfo?): AppWidgetHostView = + HomeWidgetView(context) + } + + class HomeWidgetView(context: Context) : AppWidgetHostView(context) { + var onLongPress: (() -> Unit)? = null + private var fired = false + private var downX = 0f + private var downY = 0f + private val slop = ViewConfiguration.get(context).scaledTouchSlop + private val longPress = Runnable { + fired = true + performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) + onLongPress?.invoke() + } + + override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { + when (ev.actionMasked) { + MotionEvent.ACTION_DOWN -> { + fired = false + downX = ev.x + downY = ev.y + postDelayed(longPress, ViewConfiguration.getLongPressTimeout().toLong()) + } + MotionEvent.ACTION_MOVE -> if (hypot(ev.x - downX, ev.y - downY) > slop) removeCallbacks(longPress) + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_DOWN -> removeCallbacks(longPress) + } + return fired + } + + override fun onTouchEvent(event: MotionEvent): Boolean { + if (fired) { + if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) fired = false + return true + } + return super.onTouchEvent(event) + } + } + + private fun host(context: Context): Host = host ?: Host(context.applicationContext).also { host = it } + + fun load(context: Context) { + if (loaded) return + loaded = true + val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return + val manager = AppWidgetManager.getInstance(context) + val parsed = runCatching { + val array = JSONArray(raw) + (0 until array.length()).map { i -> + val o = array.getJSONObject(i) + Placed(o.getInt("id"), o.getInt("w"), o.getInt("h")) + } + }.getOrDefault(emptyList()) + val live = parsed.filter { manager.getAppWidgetInfo(it.id) != null } + parsed.filterNot { it in live }.forEach { host(context).deleteAppWidgetId(it.id) } + widgets = live + if (live.size != parsed.size) save(context) + } + + fun startListening(context: Context) { + load(context) + runCatching { host(context).startListening() } + } + + fun stopListening(context: Context) { + runCatching { host(context).stopListening() } + } + + fun info(context: Context, id: Int): AppWidgetProviderInfo? = AppWidgetManager.getInstance(context).getAppWidgetInfo(id) + + fun createView(context: Context, id: Int): HomeWidgetView? { + val info = info(context, id) ?: return null + return host(context).createView(context, id, info) as? HomeWidgetView + } + + fun applySize(view: AppWidgetHostView, widthDp: Int, heightDp: Int) { + if (Build.VERSION.SDK_INT >= 31) { + view.updateAppWidgetSize(Bundle(), listOf(SizeF(widthDp.toFloat(), heightDp.toFloat()))) + } else { + @Suppress("DEPRECATION") + view.updateAppWidgetSize(null, widthDp, heightDp, widthDp, heightDp) + } + } + + fun loadProviders(context: Context) { + if (providers != null) return + val app = context.applicationContext + Thread({ + val pm = app.packageManager + val manager = AppWidgetManager.getInstance(app) + val dpi = app.resources.displayMetrics.densityDpi + val list = manager.installedProviders.mapNotNull { info -> + runCatching { + val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.provider.packageName, 0)).toString() } + .getOrDefault(info.provider.packageName) + val drawable = info.loadPreviewImage(app, dpi) ?: info.loadIcon(app, dpi) + val preview = drawable?.let { d -> + val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192 + val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192 + val scale = minOf(1f, 360f / maxOf(w, h)) + d.toBitmap((w * scale).roundToInt().coerceAtLeast(1), (h * scale).roundToInt().coerceAtLeast(1)) + } + val (w, h) = defaultSize(app, info) + Provider(info, info.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { appLabel }, appLabel, preview, w, h) + }.getOrNull() + }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, Provider::appLabel).thenBy(String.CASE_INSENSITIVE_ORDER, Provider::label)) + main.post { providers = list } + }, "widget-providers").start() + } + + fun refreshProviders(context: Context) { + providers = null + loadProviders(context) + } + + private fun defaultSize(context: Context, info: AppWidgetProviderInfo): Pair { + val density = context.resources.displayMetrics.density + var w = (info.minWidth / density).roundToInt() + var h = (info.minHeight / density).roundToInt() + if (Build.VERSION.SDK_INT >= 31) { + if (info.targetCellWidth > 0) w = maxOf(w, info.targetCellWidth * 80) + if (info.targetCellHeight > 0) h = maxOf(h, info.targetCellHeight * 80) + } + return w.coerceIn(160, 560) to h.coerceIn(MIN_HEIGHT_DP, 360) + } + + fun minSize(context: Context, id: Int): Pair { + val info = info(context, id) ?: return MIN_WIDTH_DP to MIN_HEIGHT_DP + val density = context.resources.displayMetrics.density + val w = (if (info.minResizeWidth > 0) info.minResizeWidth else info.minWidth) / density + val h = (if (info.minResizeHeight > 0) info.minResizeHeight else info.minHeight) / density + return w.roundToInt().coerceAtLeast(MIN_WIDTH_DP) to h.roundToInt().coerceAtLeast(MIN_HEIGHT_DP) + } + + fun add(activity: Activity, provider: Provider) { + if (pendingId == AppWidgetManager.INVALID_APPWIDGET_ID) add(activity, provider.info, null) + } + + fun addPinned(activity: Activity, request: LauncherApps.PinItemRequest): Boolean { + if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) return false + val info = request.getAppWidgetProviderInfo(activity) ?: return false + load(activity) + add(activity, info, request) + return pending != null + } + + private fun add(activity: Activity, info: AppWidgetProviderInfo, request: LauncherApps.PinItemRequest?) { + val h = host(activity) + val id = h.allocateAppWidgetId() + pending = info + pendingId = id + pinRequest = request + val manager = AppWidgetManager.getInstance(activity) + val bound = runCatching { manager.bindAppWidgetIdIfAllowed(id, info.profile, info.provider, null) }.getOrDefault(false) + if (bound) { + bound(activity, id, info) + return + } + val bind = Intent(AppWidgetManager.ACTION_APPWIDGET_BIND) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, info.provider) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE, info.profile) + @Suppress("DEPRECATION") + runCatching { activity.startActivityForResult(bind, REQUEST_BIND) }.onFailure { abandon(activity) } + } + + private fun bound(activity: Activity, id: Int, info: AppWidgetProviderInfo) { + val request = pinRequest + if (request == null) { + configure(activity, id, info) + return + } + val accepted = runCatching { request.isValid && request.accept(Bundle().apply { putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, id) }) } + .getOrDefault(false) + if (accepted) place(activity, id, info) else abandon(activity) + } + + private fun configure(activity: Activity, id: Int, info: AppWidgetProviderInfo) { + val optional = Build.VERSION.SDK_INT >= 31 && + info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_CONFIGURATION_OPTIONAL != 0 + if (info.configure == null || optional) { + place(activity, id, info) + return + } + runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_CONFIGURE, null) } + .onFailure { place(activity, id, info) } + } + + fun canReconfigure(context: Context, id: Int): Boolean { + val info = info(context, id) ?: return false + if (info.configure == null) return false + return Build.VERSION.SDK_INT < 28 || info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE != 0 + } + + fun reconfigure(activity: Activity, id: Int) { + runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_RECONFIGURE, null) } + } + + fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int): Boolean { + when (requestCode) { + REQUEST_BIND -> { + val info = pending + if (resultCode == Activity.RESULT_OK && info != null) bound(activity, pendingId, info) else abandon(activity) + } + REQUEST_CONFIGURE -> { + val info = pending + if (resultCode == Activity.RESULT_OK && info != null) place(activity, pendingId, info) else abandon(activity) + } + REQUEST_RECONFIGURE -> Unit + else -> return false + } + return true + } + + private fun abandon(context: Context) { + if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) host(context).deleteAppWidgetId(pendingId) + pending = null + pinRequest = null + pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + } + + private fun place(context: Context, id: Int, info: AppWidgetProviderInfo) { + val (w, h) = defaultSize(context, info) + pending = null + pinRequest = null + pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + widgets = widgets + Placed(id, w, h) + save(context) + } + + fun resize(context: Context, id: Int, widthDp: Int, heightDp: Int) { + widgets = widgets.map { if (it.id == id) it.copy(widthDp = widthDp, heightDp = heightDp) else it } + save(context) + } + + fun move(context: Context, id: Int, by: Int) { + val i = widgets.indexOfFirst { it.id == id } + val j = i + by + if (i < 0 || j !in widgets.indices) return + widgets = widgets.toMutableList().apply { add(j, removeAt(i)) } + save(context) + } + + fun remove(context: Context, id: Int) { + host(context).deleteAppWidgetId(id) + widgets = widgets.filterNot { it.id == id } + save(context) + } + + private fun save(context: Context) { + val array = JSONArray() + for (w in widgets) array.put(JSONObject().put("id", w.id).put("w", w.widthDp).put("h", w.heightDp)) + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt new file mode 100644 index 000000000..5632c0854 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt @@ -0,0 +1,346 @@ +package com.droiddeck.launcher + +import android.app.ActivityOptions +import android.app.AppOpsManager +import android.app.PictureInPictureParams +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.content.res.Configuration +import android.os.Build +import android.os.Bundle +import android.os.Process +import android.provider.Settings +import android.util.Rational +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.border +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.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +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.alpha +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +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 com.droiddeck.launcher.core.AppLanguage +import com.droiddeck.launcher.core.GlobalSettings +import com.droiddeck.launcher.core.PhantomProcessLimit +import com.droiddeck.launcher.core.WirelessAdbPairingService +import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.PrimaryButton +import com.droiddeck.launcher.ui.SecondaryButton +import kotlinx.coroutines.delay + +class PairingGuideActivity : ComponentActivity() { + enum class Step { BUILD_NUMBER, CHILD_PROCESS, WIRELESS_DEBUGGING, PAIR, CODE, WORKING, DONE, FAILED } + + private var settingsDisplay: Int? = null + private var toggleOnly = false + private var inPip by mutableStateOf(false) + private var launchPending = false + + override fun attachBaseContext(newBase: Context) = super.attachBaseContext(AppLanguage.wrap(newBase)) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 } + toggleOnly = intent.getBooleanExtra(EXTRA_TOGGLE_ONLY, false) + setContent { DroidDeckTheme { Guide() } } + launchPending = savedInstanceState == null + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 } + toggleOnly = intent.getBooleanExtra(EXTRA_TOGGLE_ONLY, false) + launchPending = true + } + + override fun onResume() { + super.onResume() + if (!launchPending) return + if (inPip || settingsDisplay != null) { + launchSettings() + return + } + enterPip() + if (!inPip) launchSettings() + } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) + inPip = isInPictureInPictureMode + if (isInPictureInPictureMode && launchPending) launchSettings() + } + + private fun launchSettings() { + launchPending = false + openSettings(stepFor(SettingsState.read(this), WirelessAdbPairingService.stage.value, toggleOnly)) + } + + private fun enterPip() { + inPip = runCatching { + enterPictureInPictureMode(PictureInPictureParams.Builder().setAspectRatio(Rational(4, 3)).build()) + }.getOrDefault(false) + } + + private fun openSettings(step: Step) { + val intent = if (step == Step.BUILD_NUMBER) { + Intent(Settings.ACTION_DEVICE_INFO_SETTINGS).putExtra(HIGHLIGHT_KEY, "build_number") + } else { + Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS).apply { + if (step != Step.CHILD_PROCESS) putExtra(HIGHLIGHT_KEY, "toggle_adb_wireless") + } + }.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val display = settingsDisplay + runCatching { + if (display == null) startActivity(intent) + else startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle()) + }.onFailure { + runCatching { startActivity(Intent(Settings.ACTION_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + + private fun returnToApp() { + startActivity(Intent(this, FrontEndActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)) + finish() + } + + @Composable + private fun Guide() { + val stage by WirelessAdbPairingService.stage.collectAsState() + val settingsState by produceState(SettingsState.read(this)) { + while (true) { + value = SettingsState.read(this@PairingGuideActivity) + delay(500) + } + } + val step = stepFor(settingsState, stage, toggleOnly) + var previous by remember { mutableStateOf(step) } + LaunchedEffect(step) { + if (previous == Step.BUILD_NUMBER && (step == Step.WIRELESS_DEBUGGING || step == Step.CHILD_PROCESS)) openSettings(step) + previous = step + when (step) { + Step.DONE -> { delay(1_500); returnToApp() } + Step.FAILED -> { delay(3_000); returnToApp() } + else -> Unit + } + } + LaunchedEffect(stage) { if (stage == Stage.Idle && !toggleOnly) finish() } + BackHandler(enabled = !inPip && settingsDisplay == null) { enterPip() } + + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background), contentAlignment = Alignment.Center) { + if (inPip) CompactStep(step, stage) + else FullGuide(step, stage) + } + } + + @Composable + private fun CompactStep(step: Step, stage: Stage) { + Column(Modifier.fillMaxSize().padding(10.dp), verticalArrangement = Arrangement.SpaceBetween) { + Text( + instruction(step, stage), style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onBackground, maxLines = 3, overflow = TextOverflow.Ellipsis, + ) + StepVisual(step, compact = true) + StepDots(step) + } + } + + @Composable + private fun FullGuide(step: Step, stage: Stage) { + Column( + Modifier.widthIn(max = 520.dp).fillMaxWidth().padding(24.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text(stringResource(R.string.gate_title), style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground) + Text(instruction(step, stage), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onBackground) + StepVisual(step, compact = false) + StepDots(step) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + if (step == Step.DONE || step == Step.FAILED) { + PrimaryButton(stringResource(R.string.common_back), onClick = ::returnToApp) + } else { + PrimaryButton(stringResource(R.string.gate_open_dev), onClick = { + if (settingsDisplay == null) enterPip() + openSettings(step) + }) + SecondaryButton(stringResource(R.string.common_cancel), onClick = { + if (!toggleOnly) WirelessAdbPairingService.cancel(this@PairingGuideActivity) + returnToApp() + }) + } + } + } + } + + @Composable + private fun instruction(step: Step, stage: Stage): String = when (step) { + Step.BUILD_NUMBER -> stringResource(R.string.pairguide_build_number) + Step.CHILD_PROCESS -> stringResource(R.string.pairguide_child_process) + Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_wireless) + Step.PAIR -> stringResource(R.string.pairguide_pair) + Step.CODE -> (stage as? Stage.CodeNeeded)?.error ?: stringResource(R.string.gate_step3) + Step.WORKING -> (stage as? Stage.Working)?.step ?: stringResource(R.string.adbpair_title_working) + Step.DONE -> stringResource(R.string.adbpair_title_done) + Step.FAILED -> (stage as? Stage.Failed)?.error ?: stringResource(R.string.adbpair_title_failed) + } + + @Composable + private fun StepVisual(step: Step, compact: Boolean) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.signal + val pulse = rememberInfiniteTransition(label = "guidePulse") + val beat by pulse.animateFloat(0f, 1f, infiniteRepeatable(tween(900, easing = LinearEasing), RepeatMode.Restart), label = "beat") + val label = when (step) { + Step.BUILD_NUMBER -> stringResource(R.string.pairguide_row_build_number) + Step.CHILD_PROCESS -> stringResource(R.string.pairguide_row_child_process) + Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_row_wireless) + Step.PAIR -> stringResource(R.string.pairguide_row_pair) + Step.CODE -> stringResource(R.string.adbpair_enter_code) + Step.WORKING, Step.DONE, Step.FAILED -> return + } + val rowHeight = if (compact) 34.dp else 56.dp + Row( + Modifier.fillMaxWidth().height(rowHeight).background(colors.surfaceVariant, RoundedCornerShape(10.dp)) + .border(1.dp, accent.copy(alpha = 0.35f), RoundedCornerShape(10.dp)).padding(horizontal = 10.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text(label, style = if (compact) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodyLarge, + color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + when (step) { + Step.WIRELESS_DEBUGGING, Step.CHILD_PROCESS -> Toggle(on = beat > 0.5f, accent = accent, compact = compact) + else -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + if (step == Step.BUILD_NUMBER) Text("×7", style = MaterialTheme.typography.labelLarge, color = accent) + Box(contentAlignment = Alignment.Center) { + Box(Modifier.size(if (compact) 18.dp else 26.dp).scale(0.6f + beat * 0.8f).alpha(1f - beat) + .background(accent, CircleShape)) + Box(Modifier.size(if (compact) 8.dp else 12.dp).background(accent, CircleShape)) + } + } + } + } + } + + @Composable + private fun Toggle(on: Boolean, accent: Color, compact: Boolean) { + val width = if (compact) 26.dp else 40.dp + val knob = if (compact) 12.dp else 18.dp + Box( + Modifier.width(width).height(knob + 4.dp) + .background(if (on) accent.copy(alpha = 0.6f) else MaterialTheme.colorScheme.outline, CircleShape).padding(2.dp), + contentAlignment = if (on) Alignment.CenterEnd else Alignment.CenterStart, + ) { Box(Modifier.size(knob).background(Color.White, CircleShape)) } + } + + @Composable + private fun StepDots(step: Step) { + val accent = LocalPalette.current.signal + val shown = if (toggleOnly) listOf(Step.BUILD_NUMBER, Step.CHILD_PROCESS) + else listOf(Step.BUILD_NUMBER, Step.WIRELESS_DEBUGGING, Step.PAIR, Step.CODE) + val at = shown.indexOf(step).takeIf { it >= 0 } ?: shown.size + Row(horizontalArrangement = Arrangement.spacedBy(5.dp), verticalAlignment = Alignment.CenterVertically) { + shown.forEachIndexed { index, _ -> + Box(Modifier.size(if (index == at) 8.dp else 6.dp) + .background(if (index <= at) accent else MaterialTheme.colorScheme.outline, CircleShape)) + } + Spacer(Modifier.width(2.dp)) + } + } + + private data class SettingsState( + val developerOptions: Boolean, + val wirelessDebugging: Boolean, + val childProcessBlocked: Boolean, + ) { + companion object { + fun read(context: Context) = SettingsState( + GlobalSettings.developerOptionsOn(context), + GlobalSettings.wirelessDebuggingOn(context), + PhantomProcessLimit.blocksSteam(PhantomProcessLimit.read(context)), + ) + } + } + + companion object { + private const val EXTRA_DISPLAY = "settingsDisplay" + private const val EXTRA_TOGGLE_ONLY = "toggleOnly" + private const val HIGHLIGHT_KEY = ":settings:fragment_args_key" + + private fun stepFor(settings: SettingsState, stage: Stage, toggleOnly: Boolean): Step = if (toggleOnly) when { + !settings.developerOptions -> Step.BUILD_NUMBER + settings.childProcessBlocked -> Step.CHILD_PROCESS + else -> Step.DONE + } else when (stage) { + is Stage.Working -> Step.WORKING + Stage.Done -> Step.DONE + is Stage.Failed -> Step.FAILED + is Stage.CodeNeeded -> Step.CODE + else -> when { + !settings.developerOptions -> Step.BUILD_NUMBER + !settings.wirelessDebugging -> Step.WIRELESS_DEBUGGING + else -> Step.PAIR + } + } + + fun canFloat(context: Context): Boolean { + if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) return false + val ops = context.getSystemService(AppOpsManager::class.java) ?: return true + val mode = if (Build.VERSION.SDK_INT >= 29) { + ops.unsafeCheckOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName) + } else { + @Suppress("DEPRECATION") + ops.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName) + } + return mode == AppOpsManager.MODE_ALLOWED + } + + fun start(context: Context, settingsDisplay: Int?, toggleOnly: Boolean = false): Boolean { + if (settingsDisplay == null && !canFloat(context)) return false + context.startActivity(Intent(context, PairingGuideActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .putExtra(EXTRA_TOGGLE_ONLY, toggleOnly) + .apply { if (settingsDisplay != null) putExtra(EXTRA_DISPLAY, settingsDisplay) }) + return true + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt new file mode 100644 index 000000000..ca8d382fe --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt @@ -0,0 +1,82 @@ +package com.droiddeck.launcher + +import android.content.Intent +import android.content.pm.LauncherApps +import android.graphics.Bitmap +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.core.graphics.drawable.toBitmap +import com.droiddeck.launcher.core.AppUiPrefs +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.PinRequestPrompt + +class PinRequestActivity : ComponentActivity() { + override fun attachBaseContext(newBase: android.content.Context) { + super.attachBaseContext(newBase) + com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val request = runCatching { getSystemService(LauncherApps::class.java).getPinItemRequest(intent) }.getOrNull() + if (request == null || !request.isValid) { + finish() + return + } + val prompt = when (request.requestType) { + LauncherApps.PinItemRequest.REQUEST_TYPE_SHORTCUT -> request.shortcutInfo?.let { info -> + val appLabel = appLabel(info.`package`) + Triple(info.shortLabel?.toString().orEmpty().ifEmpty { appLabel }, appLabel, HomeApp.shortcutIcon(this, info)) + } + LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET -> request.getAppWidgetProviderInfo(this)?.let { info -> + val appLabel = appLabel(info.provider.packageName) + val dpi = resources.displayMetrics.densityDpi + val icon = runCatching { (info.loadPreviewImage(this, dpi) ?: info.loadIcon(this, dpi))?.let(::scaled) }.getOrNull() + Triple(info.loadLabel(packageManager)?.toString().orEmpty().ifEmpty { appLabel }, appLabel, icon) + } + else -> null + } + if (prompt == null) { + finish() + return + } + val (label, appLabel, icon) = prompt + val widget = request.requestType == LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET + setContent { + DroidDeckTheme(appScale = AppUiPrefs.scale(this)) { + PinRequestPrompt( + label = label, appLabel = appLabel, icon = icon, wide = widget, + onAdd = { + if (!widget) { + HomePins.accept(this, request) + finish() + } else if (!HomeWidgets.addPinned(this, request)) finish() + }, + onCancel = { finish() }, + ) + } + } + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) { + finish() + return + } + @Suppress("DEPRECATION") + super.onActivityResult(requestCode, resultCode, data) + } + + private fun appLabel(packageName: String): String = + runCatching { packageManager.getApplicationLabel(packageManager.getApplicationInfo(packageName, 0)).toString() } + .getOrDefault(packageName) + + private fun scaled(d: android.graphics.drawable.Drawable): Bitmap { + val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192 + val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192 + val k = minOf(1f, 480f / maxOf(w, h)) + return d.toBitmap((w * k).toInt().coerceAtLeast(1), (h * k).toInt().coerceAtLeast(1)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5bd651cf5..5251b50da 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,58 @@ 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 }, +) { + 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 +70,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 +95,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/QuestXrActivity.kt b/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt index 28270e195..98e5a0b22 100644 --- a/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt @@ -71,7 +71,6 @@ class QuestXrActivity : NativeActivity() { } } finally { synchronized(steamVrLock) { - // A retiring activity must not stop a replacement's SteamVR session. if (steamVrOwner === this) { if (sessionAlive()) SteamVr.run(this, "stop") steamVrOwner = null diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6de07a00d..d282681e2 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 @@ -66,17 +67,21 @@ import com.droiddeck.launcher.gpu.ScreenEffectLooks import com.droiddeck.launcher.gpu.ScreenEffects import com.droiddeck.launcher.gpu.Lossless import com.droiddeck.launcher.gpu.TurnipDriver -import com.droiddeck.launcher.input.EvdevKeys +import com.droiddeck.launcher.input.HomeGuideInput import com.droiddeck.launcher.input.InputSpace import com.droiddeck.launcher.input.KeyboardHost import com.droiddeck.launcher.input.ControllerPrefs import com.droiddeck.launcher.input.SessionClipboard import com.droiddeck.launcher.input.OnScreenControls import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.input.PhysicalShortcuts +import com.droiddeck.launcher.input.PhysicalShortcutRouter 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 @@ -86,7 +91,8 @@ import com.droiddeck.launcher.input.TouchscreenGestures import com.droiddeck.launcher.input.ScrollTouchGestures import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.LoadingState -import com.droiddeck.launcher.session.PerfHud +import com.droiddeck.launcher.hud.DroidDeckHudConfig +import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.session.PerfMode import com.droiddeck.launcher.session.SteamRepair import com.droiddeck.launcher.session.GameEnvironmentStore @@ -113,6 +119,10 @@ import com.droiddeck.launcher.ui.LoadingOverlay import com.droiddeck.launcher.ui.SessionDrawer import com.droiddeck.launcher.ui.SessionPausedOverlay import com.droiddeck.launcher.ui.SecondScreenPresentation +import com.droiddeck.launcher.ui.BottomDashboard +import com.droiddeck.launcher.ui.BottomPage +import com.droiddeck.launcher.ui.sessionBottomPages +import com.droiddeck.launcher.ui.BottomPageActions import com.droiddeck.launcher.ui.DroidDeckTheme import com.droiddeck.launcher.wayland.CompositorHost import com.droiddeck.launcher.wayland.WaylandCompositor @@ -154,8 +164,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private lateinit var sessionOverlay: ComposeView private lateinit var loading: LoadingState - private lateinit var hud: PerfHud + private lateinit var hud: DroidDeckHudHost + private lateinit var memoryHud: com.droiddeck.launcher.session.MemoryHud private var padBridge: PadBridge? = null + private val physicalShortcuts = PhysicalShortcutRouter() private var joyConVr: com.droiddeck.launcher.input.JoyConVr? = null private var handCamera: com.droiddeck.launcher.handtracking.HandCamera? = null private var padMotion: com.droiddeck.launcher.input.PadMotion? = null @@ -183,7 +195,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val steamTouchRetry = Runnable { updateOnScreenControls() } private var steamTouchOptions: com.droiddeck.launcher.input.SteamTouchConfig.Options? = null private var routedTouchMode = SessionPrefs.TOUCH_AUTO + private var touchRoute: com.droiddeck.launcher.input.TouchRouter.Route? = null private var keyboard: KeyboardHost? = null + private var desktopKeyboardButton: com.droiddeck.launcher.input.DesktopKeyboardButton? = null + private var lastUserPressMs = 0L + private var pressDownX = 0f + private var pressDownY = 0f + private var pressTravel = 0f + private var pressMoved = false private var controllerSettings by mutableStateOf(null) private val sessionClipboard by lazy { SessionClipboard(this) { @@ -193,15 +212,30 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var watching = true private lateinit var touchpad: TouchpadGestures private lateinit var directTouchHold: DirectTouchHold + private lateinit var twoFingerGestures: com.droiddeck.launcher.input.TwoFingerGestures private lateinit var threeFingerTap: com.droiddeck.launcher.input.ThreeFingerTap private lateinit var touchscreenGestures: TouchscreenGestures private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null + private var gameStarts by mutableIntStateOf(0) private var gestureSettingsOpen by mutableStateOf(false) + private var steamImportAsk by mutableStateOf(null) + private var steamImportAnswered: String? = null + private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK) + 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 @@ -218,6 +252,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorHide = Runnable { cursorVisible = false } private var lastPadInputMs = 0L private val cursorBuf = IntArray(WaylandCompositor.CURSOR_BUF_INTS) + private val cursorPosBuf = IntArray(2) private var cursorSerial = 0 private var clientHidesCursor = false private var pointerLocked = false @@ -227,9 +262,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gesturePointerReady = false pointerLocked = locked Log.i(TAG, "pointer lock " + if (locked) "taken by a program" else "released") + if (locked) openEvdevMouse() else closeEvdevMouse() padMouseCheckedAt = 0L if (::padMouse.isInitialized) padMouseMode() - // Touchpad deltas are measured from the middle while locked (moveLockedPointer). if (locked && ::touchpad.isInitialized) { drawnRect()?.let { touchpad.place(it.centerX(), it.centerY()) } cursorVisible = false @@ -241,9 +276,40 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var cursorHotX by mutableStateOf(0) private var cursorHotY by mutableStateOf(0) private var cursorImageScale by mutableStateOf(1f) - private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false } + private var cursorResyncIdle = 0 + private val cursorResync = object : Runnable { + override fun run() { + if (syncClientCursor() && clientHidesCursor) { + cursorVisible = false + return + } + if (touchDrivesPointer()) return + cursorResyncIdle = if (alignCursorToGuest()) 0 else cursorResyncIdle + 1 + if (!cursorVisible || pointerLocked) return + if (cursorResyncIdle > CURSOR_RESYNC_IDLE_TICKS) return + uiHandler.postDelayed(this, 60) + } + } + + private fun alignCursorToGuest(): Boolean { + if (pointerLocked || !CompositorHost.isStarted) return false + if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false + if (surfaceView.width <= 0 || surfaceView.height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false + cursorPos = androidx.compose.ui.geometry.Offset(x, y) + return true + } 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() }, + holds = { backHold }, + ) private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionDeviceId = -1 @@ -270,8 +336,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } private val resumeKeysDown = mutableSetOf>() + private val drawerShortcutKeysDown = mutableSetOf>() - private var drawerOpen by mutableStateOf(false) + private var drawerOpenState by mutableStateOf(false) + private var typingReturnMode: SecondScreenMode? = null + private var drawerDocked by mutableStateOf(false) + private var drawerLayerOpen = false + private var drawerBackRequests by mutableIntStateOf(0) + private var drawerOpen: Boolean + get() = drawerOpenState + set(value) { + if (value == drawerOpenState) return + drawerLayerOpen = false + if (value) drawerDocked = dockDrawer() && openDockedMenu() + drawerOpenState = value + if (!value && drawerDocked) closeDockedMenu() + } private var quitFrom by mutableStateOf(null) private var quitFlooded = false private var leaving by mutableStateOf(false) @@ -280,6 +360,13 @@ 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 var fpsLimit by mutableStateOf(SessionState.fpsLimit) + + private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && + SessionState.program in setOf( + com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.EPIC, + com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET, + )) || SessionState.mode == SessionService.MODE_DESKTOP private val drawerGameInventory = GameProfileInventoryCache() private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) @@ -300,17 +387,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val drawerGameProfileRefreshes = LatestRequestCoordinator() private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER) private var drawerControllerActive by mutableStateOf(false) + private var backHold by mutableStateOf(true) 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 evdevMouseOn by mutableStateOf(false) + private var directCursorOn by mutableStateOf(false) + private var mouseWriter: com.droiddeck.launcher.input.FakeInputWriter? = null + private var evdevMouseActive = false + private var lastMouseX = Float.NaN + private var lastMouseY = Float.NaN private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) private var achievementsInFront by mutableStateOf(null) private var achievementsOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) - private var hudFps by mutableStateOf(true) - private var hudBattery by mutableStateOf(true) - private var hudGraph by mutableStateOf(true) + private var hudConfig by mutableStateOf>(emptyMap()) private var hudColor by mutableStateOf(SessionPrefs.HUD_COLOR_MINT) private var hudOpacity by mutableStateOf(SessionPrefs.HUD_OPACITY_DEFAULT) private var upscaler by mutableStateOf(0) @@ -329,6 +421,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var pausedFrame by mutableStateOf(null) + private var pausedFrameWanted = false + private var pauseAnimated by mutableStateOf(false) private var trackingRecovery by mutableStateOf(null) private var glasses3dForVr = false private var ended = false @@ -349,6 +444,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cardboardPrefListener = android.content.SharedPreferences.OnSharedPreferenceChangeListener { _, key -> if (key == SessionPrefs.CARDBOARD_KEY) uiHandler.post { applyCardboard(SessionPrefs.cardboard(this)) } } + private val shortcutPrefListener = android.content.SharedPreferences.OnSharedPreferenceChangeListener { _, key -> + if (key == null || key == PhysicalShortcuts.KEY) { + physicalShortcuts.bindings = PhysicalShortcuts.read(this) + } + } private var textureAnisotropy by mutableStateOf(0) private var textureLodBias by mutableStateOf(TextureFiltering.LOD_BIAS_OFF) private var drawerTextureAnisotropy by mutableStateOf(null) @@ -358,6 +458,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } private var frameGen by mutableStateOf(FrameGen.Mode.OFF) + private var frameGenPip = false + private val frameGenRequests = java.util.concurrent.atomic.AtomicInteger() private var fexPreset by mutableStateOf("") private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) @@ -367,6 +469,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var secondScreenDisplays by mutableStateOf>(emptyList()) private var selectedSecondScreenDisplay by mutableStateOf(SessionState.secondScreenDisplay) private var started = false + private var dualControlsProvisional: Boolean + get() = SessionState.secondScreenProvisional + set(value) { SessionState.secondScreenProvisional = value } private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY private lateinit var displayManager: DisplayManager private var secondScreenPresentation: SecondScreenPresentation? = null @@ -407,6 +512,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } + 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 @@ -420,24 +531,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val deviceListener = object : InputManager.InputDeviceListener { override fun onInputDeviceAdded(deviceId: Int) { logInputDevice("connected", deviceId) - joyConVr?.refresh() + if (Build.VERSION.SDK_INT >= 31) joyConVr?.refresh() padBridge?.syncConnectedControllers() refreshControls() updatePointerCapture() updateHandCamera() + refreshSecondScreenDisplays() } override fun onInputDeviceRemoved(deviceId: Int) { + physicalShortcuts.onDeviceRemoved(deviceId) Log.i(TAG, "input device $deviceId disconnected") - joyConVr?.refresh() + backQamInput.onDeviceRemoved(deviceId) + if (Build.VERSION.SDK_INT >= 31) joyConVr?.refresh() padBridge?.onDeviceRemoved(deviceId) if (::padMouse.isInitialized) padMouse.reset() refreshControls() updatePointerCapture() updateHandCamera() + refreshSecondScreenDisplays() } override fun onInputDeviceChanged(deviceId: Int) { - joyConVr?.refresh() + if (Build.VERSION.SDK_INT >= 31) joyConVr?.refresh() refreshControls() + refreshSecondScreenDisplays() } } @@ -452,10 +568,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { finish() return } + if (savedInstanceState == null && SessionState.installing != null && !SessionState.running) { + runtimeRemovalBlocked = true + android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() + finish() + return + } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM SessionState.programArgs = intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS)?.toList().orEmpty() SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) + SessionState.secondScreenAutoOpened = false + SessionState.secondScreenProvisional = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -473,12 +597,14 @@ 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), - ) + SessionState.fpsLimit = 0 + fpsLimit = 0 } applyOutputPacing() - if (!SessionState.running) SessionState.followScreen = followChoice() + if (!SessionState.running) { + SessionState.followScreen = followChoice() + SessionState.followScale = followScale() + } applyFollowOrientation(resources.configuration) goFullscreen() volumeControlStream = android.media.AudioManager.STREAM_MUSIC @@ -507,6 +633,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { bridge.setSelectSteam(ControllerPrefs.read(this).selectSteam) bridge.setBuiltinPad(SessionState.mode != SessionService.MODE_STEAM || SessionPrefs.builtinPad(this)) padBridge = bridge + 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 -> @@ -531,22 +658,68 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { uiHandler.removeCallbacks(cursorHide) cursorVisible = false } - onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) } - keyboard = KeyboardHost(this).also { root.addView(it) } - touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) - directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) { - WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + 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) }.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 { host -> + host.onImeChanged = { updateDesktopKeyboardButton() } + root.addView(host) + } + desktopKeyboardButton = com.droiddeck.launcher.input.DesktopKeyboardButton(this) { keyboard?.show() } + .also { root.addView(it) } + touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) + directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener, directTouchSink) threeFingerTap = com.droiddeck.launcher.input.ThreeFingerTap(PointerGestures.slop(this) * 2) + twoFingerGestures = com.droiddeck.launcher.input.TwoFingerGestures(PointerGestures.slop(this) * 2, + object : com.droiddeck.launcher.input.TwoFingerGestures.Listener { + override fun cancelTouch() { + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + directTouchHold.cancel() + scrollRestX = 0f + scrollRestY = 0f + } + override fun replay(event: MotionEvent) { + drawnRect()?.let { forwardTouch(event, it) } + } + override fun rightClick(x: Float, y: Float) { + pointerListener.onLongPress() + pointerListener.onButton(PointerGestures.BTN_RIGHT, true, x, y) + surfaceView.postDelayed({ pointerListener.onButton(PointerGestures.BTN_RIGHT, false, x, y) }, 50L) + } + override fun scrollStart(x: Float, y: Float) = scrollListener.onMove(x, y) + override fun scroll(dx: Float, dy: Float) = fingerScroll(dx, dy) + override fun scrollEnd() = fingerScrollEnd() + }) touchscreenGestures = TouchscreenGestures( ViewConfiguration.get(this).scaledTouchSlop.toFloat(), gestureOutput, ) refreshGestureConfig() - // A real touch target lets FrameLayout split fingers between the - // 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 { @@ -558,9 +731,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }) scrollTouch = ScrollTouchGestures(PointerGestures.slop(this), android.view.ViewConfiguration.get(this).scaledMinimumFlingVelocity.toFloat(), scrollListener) - val noCursor = android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) - root.pointerIcon = noCursor - surfaceView.pointerIcon = noCursor + applyPlatformPointer(appUiOwnsPointer()) loading = LoadingState(this, steam = loadingMode() == SessionService.MODE_STEAM) if (!SessionState.running) { @@ -570,17 +741,24 @@ 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) + hud = DroidDeckHudHost(this) + hud.onConfigChanged = { hudConfig = DroidDeckHudConfig.load(this) } + hud.passesTouchAt = ::controlTakesTouchAt + hud.attach(root, root.childCount) + 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() @@ -652,15 +830,41 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { isFocusableInTouchMode = true defaultFocusHighlightEnabled = false setContent { + val uiPointer = appUiOwnsPointer() androidx.compose.runtime.SideEffect { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, (drawerOpen || achievementsOpen || pcKeyboardOpen) && !pipUi && steamVrStatus != SteamVr.Status.RUNNING) } + androidx.compose.runtime.SideEffect { applyPlatformPointer(uiPointer) } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(pipUi) { + hud.setHidden(pipUi) + applyOutputPacing() + if (pipUi != frameGenPip) { + frameGenPip = pipUi + if (FrameGen.engine(this@SessionActivity) != FrameGen.ENGINE_OFF && ::surfaceView.isInitialized) applyFrameGen() + } + } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } + androidx.compose.runtime.LaunchedEffect(AgentGuest.desktopTextField) { onDesktopTextField(AgentGuest.desktopTextField) } + androidx.compose.runtime.LaunchedEffect(pipUi, pcKeyboardOpen) { updateDesktopKeyboardButton() } + val keyboardRequestsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardRequests) } + androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardRequests) { + if (AgentGuest.keyboardRequests != keyboardRequestsSeen[0]) { + keyboardRequestsSeen[0] = AgentGuest.keyboardRequests + openBottomKeyboard() + } + } + val keyboardDismissalsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardDismissals) } + androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardDismissals) { + if (AgentGuest.keyboardDismissals != keyboardDismissalsSeen[0]) { + keyboardDismissalsSeen[0] = AgentGuest.keyboardDismissals + secondScreenPresentation?.closeFieldKeyboard() + } + } androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } DroidDeckTheme { if (pipUi) { @@ -673,9 +877,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer, + resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) - if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity) + if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, 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) { @@ -688,7 +893,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!phonePanel && GlassesRendering.usesGlasses(glasses, glassesOutputActive, steamVrStatus == SteamVr.Status.RUNNING) && headTracking && !drawerOpen && !pcKeyboardOpen && !loading.visible) com.droiddeck.launcher.ui.GlassesRecenterButton( controllerSettings?.tint ?: android.graphics.Color.rgb(90, 160, 255), controllerSettings?.opacity ?: 100, - onRecenterJoyCons = if (steamVrStatus == SteamVr.Status.RUNNING && + onRecenterJoyCons = if (Build.VERSION.SDK_INT >= 31 && steamVrStatus == SteamVr.Status.RUNNING && glasses.usesSpatialControllers(glassesSettings) && glassesSettings.joyConTracking) joyConVr?.let { { it.recenter() } } else null, ) { headTracker?.recenter() } @@ -713,7 +918,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK)) }, ) - LaunchedEffect(AgentGuest.focusRevision) { + LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty()) { val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" } else { @@ -726,26 +931,137 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } - if (nextGame != gestureGame) { gestureGame = nextGame; refreshGestureConfig() } + if (nextGame != gestureGame) { + if (nextGame != null) gameStarts++ + gestureGame = nextGame + refreshGestureConfig() + } + if (secondScreenDisplays.isNotEmpty()) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + runCatching { com.droiddeck.launcher.session.TelemetryOutput.applyAutomatic(this@SessionActivity, nextGame) } + } } LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) { if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) { + backQamInput.cancel() + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this@SessionActivity) cancelTouchGestures() + screenKeys?.stopEditing() } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) + LaunchedEffect(Unit) { + val root = LinuxRuntime.rootDir(this@SessionActivity) + while (true) { + val ask = if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) { + kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.session.SteamImportPrompt.read(root) } + } else null + steamImportAsk = ask?.takeIf { it.token != steamImportAnswered } + kotlinx.coroutines.delay(1500) + } + } + steamImportAsk?.takeIf { !loading.visible }?.let { ask -> + androidx.compose.runtime.key(ask.token) { + com.droiddeck.launcher.ui.SteamImportDialog(ask.games) { now -> + val root = LinuxRuntime.rootDir(this@SessionActivity) + Thread({ + if (com.droiddeck.launcher.session.SteamImportPrompt.answer(root, ask.token, now)) runOnUiThread { + steamImportAnswered = ask.token + if (steamImportAsk?.token == ask.token) steamImportAsk = null + } + }, "steam-import-answer").start() + } + } + } if (gestureSettingsOpen) com.droiddeck.launcher.ui.TouchGestureDialog( game = gestureGame, 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() releasePads() androidx.compose.runtime.withFrameNanos { } - val requested = sessionOverlay.requestFocus() - Log.i(TAG, "drawer root focus requested=$requested focused=${sessionOverlay.hasFocus()}") + val requested = focusDrawer() + Log.i(TAG, "drawer root focus requested=$requested docked=$drawerDocked") } else { releaseDrawerDirection() } @@ -783,225 +1099,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onAndroidKeyboard = { pcKeyboardOpen = false; keyboard?.toggle() }, onClose = { pcKeyboardOpen = false }, ) - SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions( - steam = SessionState.mode == SessionService.MODE_STEAM, - 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, - androidApps = androidApps, - hudOn = hudOn, - hudFps = hudFps, - hudBattery = hudBattery, - hudGraph = hudGraph, - hudColor = hudColor, - hudOpacity = hudOpacity, - upscaler = upscaler, upscaleSharpness = upscaleSharpness, - effects = effects, - cardboard = cardboard, - cardboardSensor = hasRotationSensor, - onCardboard = { c -> SessionPrefs.setCardboard(this@SessionActivity, c); applyCardboard(c) }, - onCardboardRecenter = { headTracker?.recenter() }, - glassesPresent = glasses.present, - glassesOutput = glassesOutputActive, - onGlassesRecenter = { - headTracker?.recenter() - com.droiddeck.launcher.glasses.GlassesMenuMirror.recenter() - }, - steamVr = steamVrStatus, - immersiveSteamVr = com.droiddeck.launcher.session.QuestExperimental.isSupported(), - onSteamVr = { action -> steamVrAction(action) }, - textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy, - textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, - frameGen = frameGen, - lossless = lossless, - oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy, - steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode, - touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), - fexPreset = fexPreset, - secondScreenMode = secondScreenMode, - secondScreenDisplays = secondScreenDisplays, - selectedSecondScreenDisplay = selectedSecondScreenDisplay, - onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, - onHudFps = { on -> SessionPrefs.setHudShowFps(this@SessionActivity, on); hudFps = on; hud.refresh() }, - onHudBattery = { on -> SessionPrefs.setHudShowBattery(this@SessionActivity, on); hudBattery = on; hud.refresh() }, - onHudGraph = { on -> SessionPrefs.setHudShowGraph(this@SessionActivity, on); hudGraph = on; hud.refresh() }, - onHudColor = { color -> SessionPrefs.setHudColor(this@SessionActivity, color); hudColor = color }, - onHudOpacity = { percent -> SessionPrefs.setHudOpacity(this@SessionActivity, percent); hudOpacity = percent }, - onUpscaler = { m -> - SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m - WaylandCompositor.nativeSetUpscaler(m) - WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name) - }, - onUpscaleSharpness = { pct -> - SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct - WaylandCompositor.nativeSetUpscaleSharpness(pct) - }, - onEffects = { e -> - SessionPrefs.setScreenEffects(this@SessionActivity, e); effects = e - e.push(upscaler) - }, - onTextureAnisotropy = { value -> - drawerGameProfileId?.let { appId -> - SessionPrefs.setGameTextureAnisotropy(this@SessionActivity, appId.toString(), value) - drawerTextureAnisotropy = value - } ?: value?.let { - SessionPrefs.setTextureAnisotropy(this@SessionActivity, it) - textureAnisotropy = it - } - }, - onTextureLodBias = { value -> - drawerGameProfileId?.let { appId -> - SessionPrefs.setGameTextureLodBias(this@SessionActivity, appId.toString(), value) - drawerTextureLodBias = value - } ?: value?.let { - SessionPrefs.setTextureLodBias(this@SessionActivity, it) - textureLodBias = it - } - }, - onFrameGenPick = { mode -> - FrameGen.set(this@SessionActivity, mode) - readPrefs() - applyFrameGen() - }, - onImportLossless = { - pickLossless.launch(InAppFilePicker.buildIntent( - this@SessionActivity, listOf("dll"), getString(R.string.lsfg_pick_title))) - }, - onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() }, - onHardwareKeyboard = ::togglePcKeyboard, - controller = controllerSettings, - onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } }, - onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } }, - onQamButton = { on -> updateControllerPrefs { ControllerPrefs.setQamButton(this@SessionActivity, on) } }, - onKeyboardButton = { on -> updateControllerPrefs { ControllerPrefs.setKeyboardButton(this@SessionActivity, on) } }, - onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null, - onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null, - onAchievements = achievementsInFront?.let { { drawerOpen = false; achievementsOpen = true } }, - achievementsProgress = achievementsInFront?.progress, - padType = if (SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad) padType else null, - onPadType = { id -> - SessionPrefs.setSteamController(this@SessionActivity, id) - com.droiddeck.launcher.session.SteamDeckPad.showPad(SessionPrefs.padType(id)) - com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id)) - com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) - padType = id - }, - backActionsInverted = backActionsInverted, - 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 - applyLowLatency() - }, - onOsc = { v -> - SessionPrefs.setOscMode(this@SessionActivity, v) - readPrefs() - updateOnScreenControls() - if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null) - Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show() - }, - onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({ - drawerOpen = false - steamTouchControls?.startEditing() - }) else null, - onSuspendPolicy = { policy -> - SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy) - suspendPolicy = policy - SessionService.suspendPolicyChanged(this@SessionActivity) - }, - onSteamDownloadsInBackground = { enabled -> - SessionPrefs.setSteamDownloadsInBackground(this@SessionActivity, enabled) - steamDownloadsInBackground = enabled - SessionService.suspendPolicyChanged(this@SessionActivity) - }, - onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, - onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true }, - onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, - onSecondScreenMode = ::selectSecondScreenMode, - onSecondScreenDisplay = ::selectSecondScreenDisplay, - onLaunchAndroidApp = { app, displayId -> - drawerOpen = false - try { - HomeApp.launch(this@SessionActivity, app, displayId) - } catch (_: Exception) { - val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label - val message = when { - displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label) - label != null -> getString(R.string.android_app_open_failed_on, app.label, label) - else -> getString(R.string.android_app_open_failed_display, app.label, displayId) - } - Toast.makeText(this@SessionActivity, message, Toast.LENGTH_SHORT).show() - } - }, - pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this@SessionActivity), - pipAutoEnter = pipAutoEnter, - onPip = { pip.enter() }, - onPipAutoEnter = { on -> - SessionPrefs.setPipAutoEnter(this@SessionActivity, on) - pipAutoEnter = on - pip.refresh(true) - }, - unfoldedControls = if (com.droiddeck.launcher.session.SessionDisplay.foldable(this@SessionActivity)) unfoldedControls else null, - onUnfoldedControls = ::chooseUnfoldedControls, - unfoldedControlsWithController = unfoldedControlsWithController, - onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, - onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) }, - onShareLogs = { drawerOpen = false; shareCurrentSessionLogs() }, - onStop = { drawerOpen = false; SessionService.stop(this@SessionActivity); finish() }, - onStopFrom = { onScreen -> - drawerOpen = false - if (onScreen == null || com.droiddeck.launcher.ui.Motion.scale == 0f || quitFrom != null) { - if (quitFrom == null) { SessionService.stop(this@SessionActivity); finish() } - } else { - val at = IntArray(2).also { sessionOverlay.getLocationOnScreen(it) } - quitFrom = onScreen.translate(-at[0].toFloat(), -at[1].toFloat()) - } - }, - onClose = { drawerOpen = false }, - components = drawerComponents, - onComponentsRefresh = { - refreshDrawerComponents() - drawerComponentMenu.refreshComponentCatalog(force = false) - }, - componentCatalog = drawerComponentMenu.compCatalog, - componentCatalogAt = drawerComponentMenu.compCatalogAt, - componentCatalogChecking = drawerComponentMenu.compChecking, - componentDownloads = drawerComponentMenu.compDownloads, - componentDownloadRevision = drawerComponentMenu.compDownloadRevision, - onComponentCatalogRefresh = { drawerComponentMenu.refreshComponentCatalog() }, - onComponentDownload = drawerComponentMenu::downloadComponent, - gameProfiles = drawerGameProfileRefresh.data?.profiles.orEmpty(), - selectedGameProfileId = drawerGameProfileId, - selectedGameProfile = drawerGameProfileRefresh.data - ?.takeIf { it.selectedAppId == drawerGameProfileId }?.profile, - gameProfilesLoaded = drawerGameProfileRefresh.loaded, - gameProfileRefreshFailed = drawerGameProfileRefresh.failed, - onSelectedGameProfile = ::selectDrawerGameProfile, - onGameProfilesPageOpened = { - drawerGameProfileFollowState.resumeFollowingSteam() - drawerGameInventoryRevision++ - }, - onSelectedGameProfileRefresh = ::refreshDrawerGameProfile, - gameFexPresetSaving = drawerGameFexPresetSaving, - onGameFexPreset = ::setDrawerGameFexPreset, - gameNoSteamSaving = drawerGameNoSteamSaving, - onGameNoSteam = ::setDrawerGameNoSteam, - onComponentSwap = { pid, comp, value -> swapDrawerComponent(pid, comp, value) }, - onGameComponent = ::setDrawerGameComponent, - defaultProtonId = drawerDefaultProton, - onDefaultProton = ::chooseDrawerDefaultProton, - onGameProton = ::setDrawerGameProton, - )) + if (!drawerDocked) SessionMenu(docked = false) LaunchedEffect(achievementsOpen) { if (achievementsOpen) { releasePads() @@ -1013,9 +1111,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionAchievements(inFront.game, inFront.title, onClose = ::closeAchievements) } com.droiddeck.launcher.ui.AchievementNotificationOverlay() - if (SessionState.suspended) SessionPausedOverlay( + val autoResume = suspendPolicy == SessionPrefs.SUSPEND_AUTO || suspendPolicy == SessionPrefs.SUSPEND_NATIVE + LaunchedEffect(SessionState.manualPause, SessionState.suspended) { + if (!SessionState.manualPause && !SessionState.suspended) pauseAnimated = false + } + SessionPausedOverlay( + suspended = SessionState.suspended && (!autoResume || SessionState.resumeFailed || SessionState.manualPause), + engaged = SessionState.resumeRequested || SessionState.resuming, + failures = SessionState.resumeFailures, + frame = pausedFrame, + animateIn = pauseAnimated, title = pausedTitle(), onResume = { SessionService.resume(this@SessionActivity) }, + onFrameNeeded = ::requestPausedFrame, + onHidden = { + pausedFrame = null + pausedFrameWanted = false + pauseAnimated = false + }, ) if (leaving) com.droiddeck.launcher.ui.FloodSpread( com.droiddeck.launcher.ui.LocalPalette.current.signal, @@ -1035,6 +1148,278 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } + @androidx.compose.runtime.Composable + private fun SessionMenu(docked: Boolean) { + SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, docked = docked, + backRequest = drawerBackRequests, onLayerChange = { drawerLayerOpen = 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, + androidApps = androidApps, + hudOn = hudOn, + hudConfig = hudConfig, + upscaler = upscaler, upscaleSharpness = upscaleSharpness, + effects = effects, + cardboard = cardboard, + cardboardSensor = hasRotationSensor, + onCardboard = { c -> SessionPrefs.setCardboard(this@SessionActivity, c); applyCardboard(c) }, + onCardboardRecenter = { headTracker?.recenter() }, + glassesPresent = glasses.present, + glassesOutput = glassesOutputActive, + onGlassesRecenter = { + headTracker?.recenter() + com.droiddeck.launcher.glasses.GlassesMenuMirror.recenter() + }, + steamVr = steamVrStatus, + immersiveSteamVr = com.droiddeck.launcher.session.QuestExperimental.isSupported(), + onSteamVr = { action -> steamVrAction(action) }, + textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy, + textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, + frameGen = frameGen, + 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, + dashboardAvailable = bottomPages().isNotEmpty(), + desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), + secondScreenDisplays = secondScreenDisplays, + selectedSecondScreenDisplay = selectedSecondScreenDisplay, + onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, + onHudSetting = { key, value -> hudConfig = DroidDeckHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, + onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, + onHudExport = { exportHudDiagnostics() }, + onUpscaler = { m -> + SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m + WaylandCompositor.nativeSetUpscaler(m) + WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name) + }, + onUpscaleSharpness = { pct -> + SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct + WaylandCompositor.nativeSetUpscaleSharpness(pct) + }, + onEffects = { e -> + SessionPrefs.setScreenEffects(this@SessionActivity, e); effects = e + e.push(upscaler) + }, + onTextureAnisotropy = { value -> + drawerGameProfileId?.let { appId -> + SessionPrefs.setGameTextureAnisotropy(this@SessionActivity, appId.toString(), value) + drawerTextureAnisotropy = value + } ?: value?.let { + SessionPrefs.setTextureAnisotropy(this@SessionActivity, it) + textureAnisotropy = it + } + }, + onTextureLodBias = { value -> + drawerGameProfileId?.let { appId -> + SessionPrefs.setGameTextureLodBias(this@SessionActivity, appId.toString(), value) + drawerTextureLodBias = value + } ?: value?.let { + SessionPrefs.setTextureLodBias(this@SessionActivity, it) + textureLodBias = it + } + }, + fpsLimit = fpsLimit, + onFpsLimit = { fps -> + SessionState.fpsLimit = fps + fpsLimit = fps + applyOutputPacing() + }, + onFrameGenPick = { mode -> + FrameGen.set(this@SessionActivity, mode) + readPrefs() + applyFrameGen() + }, + onImportLossless = { + pickLossless.launch(InAppFilePicker.buildIntent( + this@SessionActivity, listOf("dll"), getString(R.string.lsfg_pick_title))) + }, + onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() }, + onHardwareKeyboard = ::togglePcKeyboard, + controller = controllerSettings, + onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } }, + onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } }, + onQamButton = { on -> updateControllerPrefs { ControllerPrefs.setQamButton(this@SessionActivity, on) } }, + onKeyboardButton = { on -> updateControllerPrefs { ControllerPrefs.setKeyboardButton(this@SessionActivity, on) } }, + onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null, + onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null, + onAchievements = achievementsInFront?.let { { drawerOpen = false; achievementsOpen = true } }, + achievementsProgress = achievementsInFront?.progress, + padType = if (SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad) padType else null, + onPadType = { id -> + SessionPrefs.setSteamController(this@SessionActivity, id) + com.droiddeck.launcher.session.SteamDeckPad.showPad(SessionPrefs.padType(id)) + com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id)) + com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) + padType = id + }, + backHold = backHold, + onBackHold = { on -> + SessionPrefs.setBackHold(this@SessionActivity, on) + backHold = on + }, + backActionsInverted = backActionsInverted, + backDoubleTapMs = backDoubleTapMs, + onBackDoubleTapMs = { ms -> + SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms) + backDoubleTapMs = ms + }, + onBackActionsInverted = { inverted -> + SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted) + backActionsInverted = inverted + }, + lowLatency = lowLatency, + onLowLatency = { on -> + SessionPrefs.setLowLatency(this@SessionActivity, on) + lowLatency = on + applyLowLatency() + }, + evdevMouse = evdevMouseOn, + onEvdevMouse = { on -> + SessionPrefs.setEvdevMouse(this@SessionActivity, on) + evdevMouseOn = on + if (on) { if (pointerLocked) openEvdevMouse() } else releaseEvdevMouse() + }, + directCursor = directCursorOn, + onDirectCursor = { on -> + SessionPrefs.setDirectCursor(this@SessionActivity, on) + directCursorOn = on + if (!on && directTouchCursorHidden()) cursorVisible = false + }, + onOsc = { v -> + SessionPrefs.setOscMode(this@SessionActivity, v) + readPrefs() + updateOnScreenControls() + if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null) + Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show() + }, + onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({ + drawerOpen = false + steamTouchControls?.startEditing() + }) else null, + onSuspendPolicy = { policy -> + SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy) + suspendPolicy = policy + SessionService.suspendPolicyChanged(this@SessionActivity) + }, + onSteamDownloadsInBackground = { enabled -> + SessionPrefs.setSteamDownloadsInBackground(this@SessionActivity, enabled) + steamDownloadsInBackground = enabled + SessionService.suspendPolicyChanged(this@SessionActivity) + }, + onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, + onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true }, + touchActive = drawerTouchMode(), + directHoldBehavior = directHoldBehavior, + onDirectHoldBehavior = { value -> + val base = com.droiddeck.launcher.input.GesturePrefs.read(this@SessionActivity, gestureGame) + com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(directHoldBehavior = value)) + refreshGestureConfig() + }, + 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 = { mode -> + if (docked) drawerOpen = false + typingReturnMode = null + if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, mode.id) + selectSecondScreenMode(mode) + }, + onSecondScreenDisplay = ::selectSecondScreenDisplay, + onLaunchAndroidApp = { app, displayId -> + drawerOpen = false + try { + HomeApp.launch(this@SessionActivity, app, displayId) + } catch (_: Exception) { + val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label + val message = when { + displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label) + label != null -> getString(R.string.android_app_open_failed_on, app.label, label) + else -> getString(R.string.android_app_open_failed_display, app.label, displayId) + } + Toast.makeText(this@SessionActivity, message, Toast.LENGTH_SHORT).show() + } + }, + pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this@SessionActivity), + pipAutoEnter = pipAutoEnter, + onPip = { pip.enter() }, + onPause = ::pauseNow, + onPipAutoEnter = { on -> + SessionPrefs.setPipAutoEnter(this@SessionActivity, on) + pipAutoEnter = on + pip.refresh(true) + }, + unfoldedControls = unfoldedControls, + onUnfoldedControls = ::chooseUnfoldedControls, + unfoldedControlsWithController = unfoldedControlsWithController, + onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, + onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) }, + onShareLogs = { drawerOpen = false; shareCurrentSessionLogs() }, + onStop = { drawerOpen = false; SessionService.stop(this@SessionActivity); finish() }, + onStopFrom = { onScreen -> + drawerOpen = false + if (onScreen == null || com.droiddeck.launcher.ui.Motion.scale == 0f || quitFrom != null) { + if (quitFrom == null) { SessionService.stop(this@SessionActivity); finish() } + } else { + val at = IntArray(2).also { sessionOverlay.getLocationOnScreen(it) } + quitFrom = onScreen.translate(-at[0].toFloat(), -at[1].toFloat()) + } + }, + onClose = { drawerOpen = false }, + components = drawerComponents, + onComponentsRefresh = { + refreshDrawerComponents() + drawerComponentMenu.refreshComponentCatalog(force = false) + }, + componentCatalog = drawerComponentMenu.compCatalog, + componentCatalogAt = drawerComponentMenu.compCatalogAt, + componentCatalogChecking = drawerComponentMenu.compChecking, + componentDownloads = drawerComponentMenu.compDownloads, + componentDownloadRevision = drawerComponentMenu.compDownloadRevision, + onComponentCatalogRefresh = { drawerComponentMenu.refreshComponentCatalog() }, + onComponentDownload = drawerComponentMenu::downloadComponent, + gameProfiles = drawerGameProfileRefresh.data?.profiles.orEmpty(), + selectedGameProfileId = drawerGameProfileId, + selectedGameProfile = drawerGameProfileRefresh.data + ?.takeIf { it.selectedAppId == drawerGameProfileId }?.profile, + gameProfilesLoaded = drawerGameProfileRefresh.loaded, + gameProfileRefreshFailed = drawerGameProfileRefresh.failed, + onSelectedGameProfile = ::selectDrawerGameProfile, + onGameProfilesPageOpened = { + drawerGameProfileFollowState.resumeFollowingSteam() + drawerGameInventoryRevision++ + }, + onSelectedGameProfileRefresh = ::refreshDrawerGameProfile, + gameFexPresetSaving = drawerGameFexPresetSaving, + onGameFexPreset = ::setDrawerGameFexPreset, + gameNoSteamSaving = drawerGameNoSteamSaving, + onGameNoSteam = ::setDrawerGameNoSteam, + onComponentSwap = { pid, comp, value -> swapDrawerComponent(pid, comp, value) }, + onGameComponent = ::setDrawerGameComponent, + defaultProtonId = drawerDefaultProton, + onDefaultProton = ::chooseDrawerDefaultProton, + onGameProton = ::setDrawerGameProton, + )) + } + private fun refreshHomeApp() { isHomeApp = HomeApp.isDefault(this) androidApps = if (isHomeApp) HomeApp.launchableApps(this) else emptyList() @@ -1063,7 +1448,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val pads = com.droiddeck.launcher.input.VrControllers.settings.collectAsState().value com.droiddeck.launcher.ui.GlassesPhonePanel(glasses.model, battery, com.droiddeck.launcher.ui.GlassesPhoneActions( onRecenter = if (headTracking) ({ headTracker?.recenter() }) else null, - onRecenterJoyCons = if (vr && glasses.usesSpatialControllers(glassesSettings) && glassesSettings.joyConTracking) + onRecenterJoyCons = if (Build.VERSION.SDK_INT >= 31 && vr && glasses.usesSpatialControllers(glassesSettings) && glassesSettings.joyConTracking) joyConVr?.let { { it.recenter() } } else null, onSteamVrMenu = if (vr && SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null, onSwitchSticks = if (vr && pads.emulate != com.droiddeck.launcher.input.VrControllers.Emulate.OFF) ({ switchVrSticks() }) else null, @@ -1086,7 +1471,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { )) } - /** The SteamVR driver switches pad sticks between hands and game on both stick clicks together. */ private fun switchVrSticks() { val chord = { down: Boolean -> padBridge?.applyTouch { state -> state.press(com.droiddeck.launcher.input.PadState.L3, down) @@ -1147,7 +1531,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) { @@ -1160,7 +1544,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (incoming?.action != SessionService.ACTION_HOME_GUIDE) return incoming.action = null setIntent(incoming) - if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide() + if (SessionState.suspended) SessionService.resume(this) + else if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide() } @@ -1225,6 +1610,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 @@ -1417,6 +1803,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { else getString(R.string.load_starting_steam) } + private fun exportHudDiagnostics() { + glassesScope.launch { + val file = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { hud.exportDiagnostics() } + android.widget.Toast.makeText(this@SessionActivity, + if (file != null) getString(R.string.hud_export_done, file.path) else getString(R.string.hud_export_failed), + android.widget.Toast.LENGTH_LONG).show() + } + } + private fun shareCurrentSessionLogs() { val folder = SessionPaths.current() ?: SessionPaths.lastEnded() if (folder == null || !folder.isDirectory) { @@ -1442,9 +1837,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { unfoldedControlsWithController = SessionPrefs.unfoldedControlsWithController(this) picturePosition = SessionPrefs.picturePosition(this) hudOn = SessionPrefs.hudEnabled(this) - hudFps = SessionPrefs.hudShowFps(this) - hudBattery = SessionPrefs.hudShowBattery(this) - hudGraph = SessionPrefs.hudShowGraph(this) + hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) hudOpacity = SessionPrefs.hudOpacity(this) upscaler = SessionPrefs.upscaler(this) @@ -1461,6 +1854,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (touchMode != nextTouchMode) { if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) { WaylandCompositor.nativeSendTouch(3, -1, 0, 0) @@ -1471,25 +1865,35 @@ 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) + backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) - lowLatencyController = SessionPrefs.lowLatencyController(this) - lowLatencyTouch = SessionPrefs.lowLatencyTouch(this) + physicalShortcuts.bindings = PhysicalShortcuts.read(this) + backDoubleTapMs = SessionPrefs.backDoubleTapMs(this) + lowLatency = SessionPrefs.lowLatency(this) + evdevMouseOn = SessionPrefs.evdevMouse(this) + if (!evdevMouseOn) releaseEvdevMouse() + directCursorOn = SessionPrefs.directCursor(this) padType = SessionPrefs.steamController(this) } - @Volatile private var installingRuntime = false + private var localInstalling = false + private val installingRuntime get() = localInstalling || SessionState.installing != null private var repairOffered by mutableStateOf(false) private fun installThenStart(runtime: Boolean, desktop: Boolean, proton: Boolean = false, resume: Boolean = false) { if (SessionState.stopRequested) return - installingRuntime = true + val worker = Any() + activeInstallWorker = worker + localInstalling = true SessionState.installing = if (runtime) "runtime" else if (resume) "package" else if (desktop) "desktop" else "proton" SessionEvents.transition( SessionPhase.INSTALLING_RUNTIME, @@ -1507,30 +1911,39 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (problem == null) SessionEvents.record("runtime.ready") else failedComponent = "runtime" } if (problem == null && resume && !SessionState.stopRequested) { - SessionState.installing = "package" + if (activeInstallWorker === worker) SessionState.installing = "package" SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "package.resuming", mapOf("component" to "package")) - problem = com.droiddeck.launcher.runtime.DesktopCatalog.resumeInterrupted(this, progressAsIs()) - ?.let { getString(R.string.session_package_resume_failed, it) } + val cancellation = com.droiddeck.launcher.core.Downloader.Cancellation { SessionState.stopRequested } + SessionState.installCancellation = cancellation + problem = try { + com.droiddeck.launcher.runtime.DesktopCatalog.resumeInterrupted(this, cancellation, progressAsIs()) + ?.let { getString(R.string.session_package_resume_failed, it) } + } finally { + if (SessionState.installCancellation === cancellation) SessionState.installCancellation = null + } if (problem == null) SessionEvents.record("package.ready") else failedComponent = "package" } if (problem == null && desktop && !SessionState.stopRequested) { - SessionState.installing = "desktop" + if (activeInstallWorker === worker) SessionState.installing = "desktop" SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "desktop.installing", mapOf("component" to "desktop")) problem = installDesktop() if (problem == null) SessionEvents.record("desktop.ready") else failedComponent = "desktop" } if (problem == null && proton && !SessionState.stopRequested) { - SessionState.installing = "proton" + if (activeInstallWorker === worker) SessionState.installing = "proton" SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "proton.installing", mapOf("component" to "proton")) val protonProblem = installProton() if (protonProblem == null) SessionEvents.record("proton.ready") else SessionEvents.record("proton.skipped", mapOf("reason" to protonProblem)) } uiHandler.post { - installingRuntime = false - SessionState.installing = null + localInstalling = false + if (activeInstallWorker === worker) { + activeInstallWorker = null + SessionState.installing = null + } if (SessionState.stopRequested) { - SessionState.stopRequested = false + if (activeInstallWorker == null) SessionState.stopRequested = false SessionEvents.transition(SessionPhase.IDLE, "session.cancelled") collectStartArtifacts("session start cancelled") finish() @@ -1608,17 +2021,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun installDesktop(): String? { uiHandler.post { loading.percent = -1; loading.say(getString(DESKTOP_LINES.downloading), DESKTOP_LINES.topic, readable = true) } val entry = com.droiddeck.launcher.runtime.DesktopCatalog.desktopEntry(this) - val problem = com.droiddeck.launcher.runtime.DesktopCatalog.install(this, entry, - progressFor(DESKTOP_LINES, entry.size / 1_000_000)) - return problem?.let { getString(R.string.session_desktop_install_failed, it) } + val cancellation = com.droiddeck.launcher.core.Downloader.Cancellation { SessionState.stopRequested } + SessionState.installCancellation = cancellation + return try { + val problem = com.droiddeck.launcher.runtime.DesktopCatalog.install(this, entry, cancellation, + progressFor(DESKTOP_LINES, entry.size / 1_000_000)) + problem?.let { getString(R.string.session_desktop_install_failed, it) } + } finally { + if (SessionState.installCancellation === cancellation) SessionState.installCancellation = null + } } private fun installProton(): String? { uiHandler.post { loading.percent = -1; loading.say(getString(PROTON_LINES.downloading), PROTON_LINES.topic, readable = true) } val catalog = com.droiddeck.launcher.runtime.DesktopCatalog - val entry = catalog.fetch(catalog.STEAM_SEED_URL)?.firstOrNull { it.id == catalog.PROTON_SEED_ID } - ?: return "catalog unreachable" - return catalog.install(this, entry, progressFor(PROTON_LINES, entry.size / 1_000_000)) + val cancellation = com.droiddeck.launcher.core.Downloader.Cancellation { SessionState.stopRequested } + SessionState.installCancellation = cancellation + return try { + val entry = catalog.fetch(catalog.STEAM_SEED_URL, cancellation)?.firstOrNull { it.id == catalog.PROTON_SEED_ID } + ?: return if (cancellation.asBoolean) "cancelled" else "catalog unreachable" + catalog.install(this, entry, cancellation, progressFor(PROTON_LINES, entry.size / 1_000_000)) + } finally { + if (SessionState.installCancellation === cancellation) SessionState.installCancellation = null + } } override fun surfaceCreated(holder: SurfaceHolder) { @@ -1640,9 +2065,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() @@ -1693,13 +2116,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "compositor.start driver=$driverId") CompositorHost.startOrAttach( - holder.surface, runtimeDir.path, + this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), ) 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") @@ -1711,6 +2134,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, ) } @@ -1730,33 +2154,42 @@ 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(), SessionState.followScale) + 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) WaylandCompositor.nativeResizeOutput(size.first, size.second) } + private fun followScale(): Float { + val mode = displayMode() + val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f + } + private fun followChoice(): Boolean { val mode = displayMode() - return SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) == - com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN + return com.droiddeck.launcher.session.SessionDisplay.isFollow( + SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this))) } 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 } @@ -1768,16 +2201,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cancelTouchGestures() applyFollowOrientation(newConfig) applyUnfoldedControls() + resizeOutputForWindow(surfaceW, surfaceH) } override fun surfaceDestroyed(holder: SurfaceHolder) { - // Hiding the phone surface after a handoff delivers a late destruction - // callback. It must not reset the new output's size or attachment. if (holder !== outputHolder()) return cancelTouchGestures() surfaceW = 0 surfaceH = 0 glassesOutputActive = false + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) } @@ -1809,7 +2242,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 { @@ -1827,10 +2261,13 @@ 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 = outputFpsLimit(pipUi) + + private fun outputFpsLimit(pip: Boolean): Int = + SessionPrefs.compositorFpsLimit(mirrorRefreshLimit(), if (noSteamSession()) SessionState.fpsLimit else 0, pip) private fun applyOutputPacing() { - Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) + Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(false), mirrorRefreshLimit())) if (CompositorHost.isStarted) { val hz = refreshHz() val changed = kotlin.math.abs(SessionState.refreshHz - hz) > 0.1f @@ -1842,8 +2279,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun applyFrameGen() { val hz = refreshHz() + val pip = pipUi && mirrorRefreshLimit() <= 0 + val request = frameGenRequests.incrementAndGet() Thread({ - val problem = FrameGen.apply(this, hz) + val problem = synchronized(frameGenRequests) { + if (request != frameGenRequests.get()) return@Thread + if (pip) FrameGen.apply(this, FrameGen.Mode.OFF, hz) else FrameGen.apply(this, hz) + } val state = Lossless.state(this) runOnUiThread { lossless = state @@ -1880,7 +2322,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") @@ -1913,6 +2356,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 @@ -1922,7 +2366,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) @@ -1944,14 +2388,18 @@ 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() } private fun releasePads() { + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) + backQamInput.cancel() padBridge?.releaseAll() - joyConVr?.releaseButtons() + if (Build.VERSION.SDK_INT >= 31) joyConVr?.releaseButtons() } private fun focusEndedScreen() { @@ -1983,6 +2431,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 { @@ -2001,9 +2455,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (line.contains(FEX_MISSING)) fexMissing = true } val steamSetup = com.droiddeck.launcher.session.SteamClientSetupFailure.find(text.lineSequence()) + val launchFailure = com.droiddeck.launcher.session.SessionLaunchFailure.find(text.lineSequence()) if (steamSetup != null) { val message = getString(if (steamSetup.download) R.string.session_end_steam_download else R.string.session_end_steam_setup) EndHint(listOfNotNull(message, steamSetup.curlError).joinToString("\n")) + } else if (launchFailure == com.droiddeck.launcher.session.SessionLaunchFailure.STEAM_ILLEGAL_INSTRUCTION) { + val message = getString(R.string.session_end_steam_sigill) + val fallback = if (SessionState.steamClientArch == "arm64") getString(R.string.session_end_steam_try_x64) else null + EndHint(listOfNotNull(message, fallback).joinToString("\n")) + } else if (launchFailure == com.droiddeck.launcher.session.SessionLaunchFailure.VULKAN_DEVICE_MISSING) { + val adreno = com.droiddeck.launcher.gpu.GpuInfo.detect().family != com.droiddeck.launcher.gpu.GpuInfo.Family.NOT_ADRENO + EndHint(getString(if (adreno) R.string.session_end_vulkan_device else R.string.session_end_gpu_unsupported)) } else if (fexMissing) { val what = com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_end_program) EndHint(getString(R.string.session_end_fex_missing, what), evenOnSuccess = true) @@ -2017,17 +2479,59 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } + @android.annotation.SuppressLint("RestrictedApi") override fun dispatchKeyEvent(event: KeyEvent): Boolean { when (event.keyCode) { - KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> { + val steamVolume = + SessionState.mode == SessionService.MODE_STEAM && SessionState.running && + SessionState.firstFrameSeen && !SessionState.suspended && !ended && + !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + !gestureSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus() + if (steamVolume) { + val audio = getSystemService(android.media.AudioManager::class.java) + if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction -> + audio.adjustStreamVolume(android.media.AudioManager.STREAM_MUSIC, direction, 0) + }) return true + } return super.dispatchKeyEvent(event) + } + } + val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + 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 + if (screenKeyTextFocus) return super.dispatchKeyEvent(event) + if (physicalShortcuts.onKey( + event, + enabled = SessionState.running && !SessionState.suspended && + !(drawerOpen && event.keyCode == KeyEvent.KEYCODE_BUTTON_A) && + !(drawerOpen && PhysicalShortcuts.isDrawerNavigationKey(event)) && + (event.deviceId to event.keyCode) !in resumeKeysDown && + !(::loading.isInitialized && (loading.visible || loading.ended)) && + !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen, + steam = SessionState.mode == SessionService.MODE_STEAM, + ) { action -> + pendingBackAction?.let(uiHandler::removeCallbacks) + pendingBackAction = null + drawerControllerActive = true + Log.i(TAG, "physical shortcut ${action.name} device=${event.deviceId} key=${event.keyCode} scan=${event.scanCode}") + when (action) { + PhysicalShortcuts.Action.STEAM -> sendSteamGuide() + PhysicalShortcuts.Action.QAM -> triggerSteamQam() + PhysicalShortcuts.Action.DROIDDECK -> drawerOpen = !drawerOpen + } + }) return true val pad = com.droiddeck.launcher.input.JoyCon.normalize(event) if (pad !== event) return dispatchKeyEvent(pad) val fromController = PadBridge.isControllerKeyEvent(event) if (fromController && event.action == KeyEvent.ACTION_DOWN) { - if (drawerOpen && !drawerControllerActive) sessionOverlay.requestFocus() + if (drawerOpen && !drawerControllerActive) focusDrawer() drawerControllerActive = true } if (fromController && event.keyCode == KeyEvent.KEYCODE_BUTTON_B && ::loading.isInitialized && loading.visible && !loading.ended && !drawerOpen) { @@ -2044,6 +2548,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) { @@ -2053,18 +2571,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return true } - val handled = super.dispatchKeyEvent(event) + val handled = dispatchToDrawer(event) if (event.action == KeyEvent.ACTION_DOWN) { Log.i(TAG, "drawer key=${KeyEvent.keyCodeToString(event.keyCode)} handled=$handled viewFocused=${sessionOverlay.hasFocus()}") } if (event.keyCode == KeyEvent.KEYCODE_BUTTON_B || event.keyCode == KeyEvent.KEYCODE_BACK) { - if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false + if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + if (drawerLayerOpen) drawerBackRequests++ else drawerOpen = false + } releaseDrawerDirection() } return true } val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START || - event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || event.keyCode == KeyEvent.KEYCODE_HOME + event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || HomeGuideInput.isHome(event.keyCode) val resumeKeyId = event.deviceId to event.keyCode if (fromController && resumeKey && (SessionState.suspended || resumeKeyId in resumeKeysDown)) { if (event.action == KeyEvent.ACTION_DOWN) { @@ -2076,41 +2596,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if ((pcKeyboardOpen || achievementsOpen) && fromController) return super.dispatchKeyEvent(event) - if (joyConVr?.onKeyEvent(event) == true) return true + if (Build.VERSION.SDK_INT >= 31 && joyConVr?.onKeyEvent(event) == true) return true if (fromController && event.keyCode != KeyEvent.KEYCODE_BACK && padMouseMode() && padMouse.onKey(event)) return true if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true if (CompositorHost.isStarted && event.keyCode != KeyEvent.KEYCODE_BACK && !fromController) { val down = event.action == KeyEvent.ACTION_DOWN if (down && event.repeatCount > 0) return true - if (down || event.action == KeyEvent.ACTION_UP) { - var evdev = EvdevKeys.fromKeyCode(event.keyCode) - val ch = event.unicodeChar - val plain = if (ch > 0) EvdevKeys.unshiftedChar(ch) else 0 - if (evdev <= 0 && ch > 0) { - val code = EvdevKeys.fromKeyCode(EvdevKeys.keycodeForChar(if (plain != 0) plain else ch)) - if (code > 0) evdev = code - } - val shiftEvdev = if (evdev > 0 && plain != 0 && event.deviceId <= 0) 42 else 0 - if (evdev <= 0 && event.scanCode > 0) evdev = event.scanCode - if (evdev > 0) { - if (down) { - if (shiftEvdev != 0) sendGuestKey(shiftEvdev, true) - sendGuestKey(evdev, true) - } else { - sendGuestKey(evdev, false) - if (shiftEvdev != 0) sendGuestKey(shiftEvdev, false) - } - return true - } - } + if (com.droiddeck.launcher.input.GuestKeys.send(event, ::sendGuestKey)) return true } return super.dispatchKeyEvent(event) } override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true + notePress(event) if (drawerOpen && PadBridge.isControllerMotionEvent(event)) { - if (!drawerControllerActive) sessionOverlay.requestFocus() + if (!drawerControllerActive) focusDrawer() drawerControllerActive = true if (event.actionMasked == MotionEvent.ACTION_MOVE && event.isFromSource(InputDevice.SOURCE_JOYSTICK) @@ -2121,20 +2622,44 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (drawerDirectionKey != KeyEvent.KEYCODE_UNKNOWN) releaseDrawerDirection() if ((pcKeyboardOpen || achievementsOpen) && PadBridge.isControllerMotionEvent(event)) return super.dispatchGenericMotionEvent(event) - if (joyConVr?.onMotionEvent(event) == true) return true + if (Build.VERSION.SDK_INT >= 31 && joyConVr?.onMotionEvent(event) == true) return true if (PadBridge.isControllerMotionEvent(event) && padMouseMode() && padMouse.onMotion(event)) return true if (padBridge?.onMotionEvent(event) == true) return true - if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen && onMouse(event)) return true + if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen) { + if (appUiOwnsPointer()) { + if (super.dispatchGenericMotionEvent(event)) return true + if (onMouse(event)) return true + return false + } + if (onMouse(event)) return true + } return super.dispatchGenericMotionEvent(event) } override fun dispatchTrackballEvent(event: MotionEvent): Boolean = onCapturedPointer(event) || super.dispatchTrackballEvent(event) + private fun controlTakesTouchAt(rawX: Float, rawY: Float): Boolean { + val at = IntArray(2) + fun takes(view: View, hit: (Float, Float) -> Boolean): Boolean { + if (!view.isShown) return false + view.getLocationOnScreen(at) + val x = rawX - at[0] + val y = rawY - at[1] + return x >= 0f && y >= 0f && x < view.width && y < view.height && hit(x, y) + } + return onScreenControls?.let { takes(it, it::takesTouchAt) } == true || + steamTouchControls?.let { takes(it, it::takesTouchAt) } == true || + screenKeys?.let { takes(it, it::takesTouchAt) } == true || + unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true + } + override fun dispatchTouchEvent(event: MotionEvent): Boolean { if (pipUi) return true + notePress(event) if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { drawerControllerActive = false + gestureTouchStreamGate.reset() } return super.dispatchTouchEvent(event) } @@ -2207,12 +2732,63 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (action == KeyEvent.ACTION_DOWN && repeatCount == 0) { Log.i(TAG, "drawer synthetic key=${KeyEvent.keyCodeToString(drawerDirectionKey)} viewFocused=${sessionOverlay.hasFocus()}") } - super.dispatchKeyEvent(event) + dispatchToDrawer(event) } + private fun dockedMenu(): SecondScreenPresentation? = secondScreenPresentation?.takeIf { drawerDocked && it.menuShown } + + @android.annotation.SuppressLint("RestrictedApi") + private fun dispatchToDrawer(event: KeyEvent): Boolean { + val bottom = dockedMenu() + if (bottom != null && event.keyCode != KeyEvent.KEYCODE_BACK) return bottom.dispatchMenuKey(event) + return super.dispatchKeyEvent(event) + } + + private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus() + + private fun dockDrawer(): Boolean { + if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false + if (!SessionPrefs.dualScreenLauncher(this)) return false + val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + if (secondScreenDisplays.none { it.id == target.displayId }) return false + val shown = secondScreenPresentation?.display?.displayId + return shown == null || shown == target.displayId + } + + private fun openDockedMenu(): Boolean { + val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + return try { + val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { + selectedSecondScreenDisplay = target.displayId + secondScreenPresentation = it + } + if (!presentation.isShowing) presentation.show() + presentation.showMenu(true) + updateKeyboardRoute() + presentation.menuShown + } catch (e: Exception) { + Log.w(TAG, "could not open the menu on ${target.name}", e) + if (secondScreenMode == SecondScreenMode.NONE) closeSecondScreen(reset = false) + false + } + } + + private fun closeDockedMenu() { + drawerDocked = false + val presentation = secondScreenPresentation ?: return + presentation.showMenu(false) + if (secondScreenMode == SecondScreenMode.NONE) closeSecondScreen(reset = false) else updateKeyboardRoute() + } + + 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) + directHoldBehavior = gestureConfig.directHoldBehavior + gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) + if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) gesturePointerReady = false recognizedGesture = null } @@ -2231,26 +2807,23 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun moveBy(dx: Float, dy: Float, relative: Boolean) { val rect = drawnRect() ?: return if (relative || pointerLocked) { - val scale = SessionState.outputSize.first / rect.width() - WaylandCompositor.sendPointerDelta(dx * scale, dy * scale) + val scale = sceneScale(rect) + sendSceneDelta(dx * scale, dy * scale) } else moveTo(gesturePointerX + dx, gesturePointerY + dy) } override fun button(code: Int, down: Boolean) { - WaylandCompositor.nativeSendSceneInput(3, code, if (down) 1 else 0) + sendSceneButton(code, down) } override fun prepareRelativePan() { if (pointerLocked) return val rect = drawnRect() ?: return - // Gamescope retains the last absolute position while a game can warp - // its own cursor to the center. Its first unlocked motion must start - // from that same origin, before the game switches to pointer lock. moveTo(rect.centerX(), rect.centerY()) } override fun key(code: Int, down: Boolean) { if (down) gestureKeysDown.add(code) else gestureKeysDown.remove(code) if (code !in guestKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } - override fun wheel(steps: Int) { WaylandCompositor.nativeSendSceneInput(4, steps, 0) } + override fun wheel(steps: Int) { sendSceneWheel(steps) } override fun showKeyboard() { uiHandler.post { touchscreenGestures.cancel(); togglePcKeyboard() } } override fun gesture(gesture: TouchscreenGestures.Gesture) { recognizedGesture = gesture @@ -2265,9 +2838,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { if (!pointerLocked) movePointer(x, y) - WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0) + sendSceneButton(button, pressed) + } + override fun onWheel(steps: Int) { sendSceneWheel(steps) } + override fun onScroll(dx: Float, dy: Float) = fingerScroll(dx, dy) + override fun onScrollEnd() = fingerScrollEnd() + override fun onThreeFingerTap(): Boolean { + uiHandler.post { togglePcKeyboard() } + return true + } + override fun onZoom(steps: Int) { + WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 1) + sendSceneWheel(steps) + WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 0) } - override fun onWheel(steps: Int) { WaylandCompositor.nativeSendSceneInput(4, steps, 0) } override fun onLongPress() { @Suppress("DEPRECATION") (getSystemService(VIBRATOR_SERVICE) as? android.os.Vibrator)?.vibrate(15) @@ -2335,10 +2919,37 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun scrollTouchMode(): Boolean = (routedTouchMode == SessionPrefs.TOUCH_AUTO || routedTouchMode == SessionPrefs.TOUCH_DIRECT) && padMouseMode() + private fun fingerScroll(dx: Float, dy: Float) { + val rect = drawnRect() ?: return + val out = SessionState.outputSize + scrollRestX += dx * out.first / rect.width() * AXIS_UNITS_PER_PIXEL + scrollRestY += dy * out.second / rect.height() * AXIS_UNITS_PER_PIXEL + val h = scrollRestX.toInt() + val v = scrollRestY.toInt() + if (h == 0 && v == 0) return + scrollRestX -= h + scrollRestY -= v + WaylandCompositor.nativeSendSceneInput(12, v, h) + } + + private fun fingerScrollEnd() { + scrollRestX = 0f + scrollRestY = 0f + WaylandCompositor.nativeSendSceneInput(12, 0, 0) + } + + private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { + if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (rect.contains(x, y)) touchpad.place(x, y) + } + private fun moveLockedPointer(x: Float, y: Float) { val rect = drawnRect() ?: return - val scale = SessionState.outputSize.first / rect.width() - WaylandCompositor.sendPointerDelta((x - rect.centerX()) * scale, (y - rect.centerY()) * scale) + val scale = sceneScale(rect) + sendSceneDelta((x - rect.centerX()) * scale, (y - rect.centerY()) * scale) touchpad.place(rect.centerX(), rect.centerY()) cursorVisible = false } @@ -2355,14 +2966,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cursorPos = androidx.compose.ui.geometry.Offset(x, y) syncClientCursor() uiHandler.removeCallbacks(cursorResync) - uiHandler.postDelayed(cursorResync, 60) + cursorResyncIdle = 0 + if (!touchDrivesPointer()) uiHandler.postDelayed(cursorResync, 60) if (clientHidesCursor) { cursorVisible = false; return } + if (directTouchCursorHidden()) { cursorVisible = false; return } if (android.os.SystemClock.uptimeMillis() - lastPadInputMs < CURSOR_PAD_HOLD_MS) return cursorVisible = true uiHandler.removeCallbacks(cursorHide) if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") uiHandler.postDelayed(cursorHide, 2500) } + private fun touchDrivesPointer(): Boolean = + routedTouchMode == SessionPrefs.TOUCH_DIRECT || + (routedTouchMode == SessionPrefs.TOUCH_AUTO && !usingTouchpad()) + + private fun directTouchCursorHidden(): Boolean = !directCursorOn && touchDrivesPointer() + private fun syncClientCursor(): Boolean { if (!CompositorHost.isStarted) return false if (WaylandCompositor.nativeCursorSerial() == cursorSerial) return false @@ -2407,11 +3026,37 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { closeSecondScreen(reset = true) + SessionState.secondScreenAutoOpened = false return } if (selectedSecondScreenDisplay !in newIds) selectedSecondScreenDisplay = candidates.firstOrNull()?.id ?: -1 - if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) closeSecondScreen(reset = true) - else if (started && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) + if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) { + closeSecondScreen(reset = true) + SessionState.secondScreenAutoOpened = false + } else if (started && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) + else if (started && !ended && ::loading.isInitialized && !loading.visible) openDualScreenControls() + updateKeyboardRoute() + } + + private fun openDualScreenControls() { + if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return + if (!SessionPrefs.dualScreenSessionControls(this)) return + val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + if (secondScreenDisplays.none { it.id == target.displayId }) return + SessionState.secondScreenAutoOpened = true + selectedSecondScreenDisplay = target.displayId + selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), + com.droiddeck.launcher.session.BottomDesktop.available())) + dualControlsProvisional = ::loading.isInitialized && loading.visible + } + + private fun settleDualScreenControls() { + if (!dualControlsProvisional || pipUi || !started || (::loading.isInitialized && loading.visible)) return + dualControlsProvisional = false + if (secondScreenMode == SecondScreenMode.NONE) return + val wanted = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), + com.droiddeck.launcher.session.BottomDesktop.available()) + if (wanted != secondScreenMode) selectSecondScreenMode(wanted) else secondScreenPresentation?.retryTerminal() } private fun selectSecondScreenDisplay(displayId: Int) { @@ -2422,6 +3067,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun selectSecondScreenMode(mode: SecondScreenMode) { + dualControlsProvisional = false if (mode == SecondScreenMode.NONE) { closeSecondScreen(reset = true) return @@ -2445,19 +3091,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } var presentation = secondScreenPresentation if (presentation?.display?.displayId != target.displayId) { + dropDockedDrawer() presentation?.closeControls() - presentation = SecondScreenPresentation( - this, target, - sendPointer = ::moveSecondScreenPointer, - sendButton = { button, pressed -> - WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0) - }, - sendWheel = { steps -> WaylandCompositor.nativeSendSceneInput(4, steps, 0) }, - onSteamMenu = ::tapSteamButton, - onQam = ::tapQam, - onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, - pad = padBridge, - ) + presentation = secondScreenPresentation(target) secondScreenPresentation = presentation } try { @@ -2466,12 +3102,113 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { secondScreenMode = mode SessionState.secondScreenMode = mode SessionState.secondScreenDisplay = selectedSecondScreenDisplay + updateKeyboardRoute() } catch (e: Exception) { Log.w(TAG, "could not show second-screen controls on ${target.name}", e) closeSecondScreen(reset = true) } } + private fun secondScreenPresentation(target: Display) = SecondScreenPresentation( + this, target, + sendPointer = ::moveSecondScreenPointer, + sendButton = { button, pressed -> + WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0) + }, + sendWheel = { steps -> WaylandCompositor.nativeSendSceneInput(4, steps, 0) }, + onSteamMenu = ::tapSteamButton, + onQam = ::tapQam, + onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, + pad = padBridge, + onKeyboardClosed = ::bottomKeyboardClosed, + onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + menu = { + DroidDeckTheme { SessionMenu(docked = true) } + }, + dashboard = if (bottomPages().isEmpty()) null else ({ + DroidDeckTheme { + BottomDashboard( + bottomPages(), com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, + onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + ) + } + }), + ) + + private fun bottomPages(): List = sessionBottomPages(BottomPageActions( + takeScreenshot = ::captureScreenshot, + fps = { if (::hud.isInitialized) hud.liveFps else null }, + openSettings = ::openSettingsBelow, + runningGame = { gestureGame }, + )) + + private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { + val presentation = secondScreenPresentation ?: return + val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) + val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action} on display ${presentation.display.displayId}", e) } + .isSuccess + } + if (!opened) return + presentation.hide() + var checks = 0 + fun showAgain() { + try { + presentation.show() + } catch (e: Exception) { + Log.w(TAG, "could not show the dashboard again", e) + if (secondScreenPresentation === presentation) closeSecondScreen(reset = true) + } + } + uiHandler.postDelayed(object : Runnable { + override fun run() { + if (secondScreenPresentation !== presentation || presentation.isShowing) return + if (done()) { + showAgain() + return + } + if (++checks < SETTINGS_WATCH_CHECKS) uiHandler.postDelayed(this, SETTINGS_WATCH_MS) else showAgain() + } + }, SETTINGS_WATCH_MS) + } + + private fun captureScreenshot(onDone: (Boolean) -> Unit) { + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null + val width = source?.width ?: 0 + val height = source?.height ?: 0 + if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { + onDone(false) + return + } + val bitmap = try { + android.graphics.Bitmap.createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888) + } catch (_: OutOfMemoryError) { + onDone(false) + return + } + try { + android.view.PixelCopy.request(source, bitmap, { result -> + if (result != android.view.PixelCopy.SUCCESS) { + bitmap.recycle() + onDone(false) + return@request + } + Thread { + val saved = com.droiddeck.launcher.session.BottomScreenshots.save(applicationContext, bitmap) + bitmap.recycle() + runOnUiThread { onDone(saved) } + }.start() + }, uiHandler) + } catch (_: IllegalArgumentException) { + bitmap.recycle() + onDone(false) + } + } + private fun tapSteamButton() { if (SessionState.mode == SessionService.MODE_STEAM) { padBridge?.applyTouch { st -> st.press(com.droiddeck.launcher.input.PadState.GUIDE, true) } @@ -2500,23 +3237,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 @@ -2526,13 +3260,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) + onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, + portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this)) sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedPanel = panel updateOnScreenControls() @@ -2551,9 +3291,49 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { showCursor(px, py) } + private fun openBottomKeyboard() { + if (!started) return + if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { + val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + if (drawerOpen) drawerOpen = false + typingReturnMode = secondScreenMode + selectedSecondScreenDisplay = target.displayId + selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD) + } + val presentation = secondScreenPresentation ?: return + if (!presentation.showsKeyboard) return + val display = presentation.display?.displayId ?: return + presentation.requestKeyboard(forField = true) + com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, display) + } + + private fun bottomKeyboardClosed() { + com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId) + val mode = typingReturnMode ?: return + typingReturnMode = null + uiHandler.post { if (secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD) selectSecondScreenMode(mode) } + } + + private fun updateKeyboardRoute() { + AgentGuest.routeKeyboard(this, SessionState.mode == SessionService.MODE_STEAM && + (secondScreenPresentation?.showsKeyboard == true || dockDrawer())) + } + + private fun dropDockedDrawer() { + if (!drawerDocked) return + drawerDocked = false + drawerLayerOpen = false + drawerOpenState = false + } + private fun closeSecondScreen(reset: Boolean) { + dropDockedDrawer() + val focused = secondScreenPresentation?.window?.decorView?.hasWindowFocus() == true secondScreenPresentation?.closeControls() secondScreenPresentation = null + if (focused && started) com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId) + else com.droiddeck.launcher.ui.SessionTyping.close() + updateKeyboardRoute() if (reset) { secondScreenMode = SecondScreenMode.NONE SessionState.secondScreenMode = SecondScreenMode.NONE @@ -2582,21 +3362,95 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gesturePointerReady = false if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() - if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + if (CompositorHost.isStarted && + (deliversTouches(routedTouchMode) || deliversTouches(next))) + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false + gestureTouchStreamGate.reset() routedTouchMode = next + if (directTouchCursorHidden()) cursorVisible = false } + private fun deliversTouches(mode: String) = + mode == SessionPrefs.TOUCH_DIRECT || mode == SessionPrefs.TOUCH_AUTO + private fun usingTouchpad(): Boolean = when (routedTouchMode) { SessionPrefs.TOUCH_PAD -> true SessionPrefs.TOUCH_DIRECT -> false else -> SessionState.mode != SessionService.MODE_STEAM || SessionState.steamUi == "desktop" } + private fun drawerTouchMode(): String = when (routedTouchMode) { + SessionPrefs.TOUCH_GESTURES, SessionPrefs.TOUCH_DIRECT, + SessionPrefs.TOUCH_OFF, SessionPrefs.TOUCH_PAD -> routedTouchMode + else -> if (usingTouchpad()) SessionPrefs.TOUCH_PAD else SessionPrefs.TOUCH_DIRECT + } + private val gamePictureBounds = FloatArray(4) private var topPictureMapped = false + private fun sceneScale(rect: android.graphics.RectF): Float = + SessionState.outputSize.first / rect.width() + + private fun openEvdevMouse() { + if (evdevMouseActive || !evdevMouseOn) return + val writer = mouseWriter ?: com.droiddeck.launcher.input.FakeInputWriter( + File(LinuxRuntime.sessionRoot(this), "dev/input").absolutePath, + com.droiddeck.launcher.input.FakeInputWriter.MOUSE_SLOT, + ).also { mouseWriter = it } + if (!writer.open()) return + evdevMouseActive = true + lastMouseX = Float.NaN + lastMouseY = Float.NaN + Log.i(TAG, "raw mouse channel active (pointer locked)") + } + + private fun closeEvdevMouse() { + if (!evdevMouseActive) return + mouseWriter?.softRelease() + evdevMouseActive = false + Log.i(TAG, "raw mouse channel idle") + } + + private fun releaseEvdevMouse() { + evdevMouseActive = false + mouseWriter?.destroy() + mouseWriter = null + Log.i(TAG, "raw mouse channel removed") + } + + private fun sendSceneDelta(dx: Float, dy: Float) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseDelta(dx, dy) + else WaylandCompositor.sendPointerDelta(dx, dy) + } + + private fun sendSceneButton(code: Int, down: Boolean) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseButton(code.toShort(), down) + else WaylandCompositor.nativeSendSceneInput(3, code, if (down) 1 else 0) + } + + private fun sendSceneWheel(steps: Int) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseWheel(-steps, 0, 120) + else WaylandCompositor.nativeSendSceneInput(4, steps, 0) + } + + private fun sendMouseDelta(x: Float, y: Float) { + cursorVisible = false + val previousX = lastMouseX + val previousY = lastMouseY + lastMouseX = x + lastMouseY = y + val rect = drawnRect() ?: return + if (previousX.isNaN() || previousY.isNaN()) return + val scale = sceneScale(rect) + sendSceneDelta((x - previousX) * scale, (y - previousY) * scale) + } + private fun drawnRect(): android.graphics.RectF? { val width = surfaceView.width.takeIf { it > 0 } ?: return null val height = surfaceView.height.takeIf { it > 0 } ?: return null @@ -2613,87 +3467,137 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private var ignoreGameTouch = false + private var dismissTouch = false override fun onTouchEvent(event: MotionEvent): Boolean { if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event) - if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) return true - if (routedTouchMode == SessionPrefs.TOUCH_GESTURES) { - if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false - return touchscreenGestures.onTouch(event) + if (drawerOpen && drawerDocked && event.actionMasked == MotionEvent.ACTION_DOWN) { + drawerOpen = false + dismissTouch = true } - if (event.actionMasked == MotionEvent.ACTION_DOWN) { + if (dismissTouch) { + if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) dismissTouch = false + return true + } + val uiBlocking = drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended + if (event.actionMasked == MotionEvent.ACTION_DOWN && !uiBlocking && routedTouchMode != SessionPrefs.TOUCH_GESTURES) { scrollTouchGesture = scrollTouchMode() scrollRestX = 0f scrollRestY = 0f } - if (scrollTouchGesture) return scrollTouch.onTouch(event) - if (routedTouchMode == SessionPrefs.TOUCH_OFF) return true - if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") { - val wasActive = threeFingerTap.active - if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() - if (threeFingerTap.active && !wasActive) { - if (usingTouchpad()) touchpad.cancel() else WaylandCompositor.nativeSendTouch(3, -1, 0, 0) - } - if (threeFingerTap.active || wasActive) return true + val snapshot = com.droiddeck.launcher.input.TouchRouter.Snapshot( + uiBlocking = uiBlocking, + mode = routedTouchMode, + scrollLayer = scrollTouchGesture, + steamSession = SessionState.mode == SessionService.MODE_STEAM, + steamDesktopUi = SessionState.steamUi == "desktop", + ) + val route = com.droiddeck.launcher.input.TouchRouter.decide(snapshot) + if (route != touchRoute) { + Log.i(TAG, "touch route $touchRoute -> $route (mode=$routedTouchMode steamUi=${SessionState.steamUi} scrollLayer=$scrollTouchGesture)") + touchRoute = route } - if (usingTouchpad()) { - val rect = drawnRect() ?: return false - if (touchpad.bounds != rect) { - val fresh = touchpad.bounds.width() <= 1f - touchpad.bounds = rect - if (fresh) touchpad.place(rect.centerX(), rect.centerY()) + return when (route) { + com.droiddeck.launcher.input.TouchRouter.Route.BLOCKED, + com.droiddeck.launcher.input.TouchRouter.Route.OFF -> true + com.droiddeck.launcher.input.TouchRouter.Route.GESTURES -> { + if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false + touchscreenGestures.onTouch(event) + } + com.droiddeck.launcher.input.TouchRouter.Route.SCROLL -> scrollTouch.onTouch(event) + else -> { + if (com.droiddeck.launcher.input.TouchRouter.steamKeyboardZone(snapshot)) { + val wasActive = threeFingerTap.active + if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() + if (threeFingerTap.active && !wasActive) { + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) touchpad.cancel() + else { + directTouchHold.cancel() + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + } + if (threeFingerTap.active || wasActive) return true + } + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) { + val rect = drawnRect() ?: return false + if (touchpad.bounds != rect) { + val fresh = touchpad.bounds.width() <= 1f + touchpad.bounds = rect + if (fresh) touchpad.place(rect.centerX(), rect.centerY()) + } + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + touchpad.desktop = SessionState.mode == SessionService.MODE_DESKTOP + placeTouchpadAtGuest(rect) + } + touchpad.onTouch(event) + } else { + dispatchDirectTouch(event) + } } - return touchpad.onTouch(event) } + } + + private val directTouchSink = object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) = sendDirectTouch(0, pointerId, x, y) + override fun move(pointerId: Int, x: Float, y: Float) = sendDirectTouch(1, pointerId, x, y) + override fun up(pointerId: Int, x: Float, y: Float) = sendDirectTouch(2, pointerId, x, y) + override fun cancel() = WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun sendDirectTouch(action: Int, pointerId: Int, x: Float, y: Float) { + val rect = drawnRect() ?: return + val cx = x.coerceIn(rect.left, rect.right) + val cy = y.coerceIn(rect.top, rect.bottom) + WaylandCompositor.nativeSendTouch(action, pointerId, + InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + showCursor(cx, cy) + } + + private fun dispatchDirectTouch(event: MotionEvent): Boolean { val rect = drawnRect() ?: return false if (event.actionMasked == MotionEvent.ACTION_DOWN) ignoreGameTouch = topPictureMapped && !rect.contains(event.x, event.y) if (ignoreGameTouch) { - if (event.actionMasked == MotionEvent.ACTION_DOWN) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + directTouchHold.cancel() WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) ignoreGameTouch = false return true } - if (directTouchHold.onTouch(event)) return true - fun sendTouch(action: Int, index: Int) { - val x = event.getX(index).coerceIn(rect.left, rect.right) - val y = event.getY(index).coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendTouch(action, event.getPointerId(index), - InputSpace.x(x, surfaceView.width), InputSpace.y(y, surfaceView.height)) - } - when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + if (SessionState.mode == SessionService.MODE_DESKTOP && twoFingerGestures.onTouch(event)) return true + return forwardTouch(event, rect) + } + + private fun forwardTouch(event: MotionEvent, rect: android.graphics.RectF): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + showCursor(event.x.coerceIn(rect.left, rect.right), event.y.coerceIn(rect.top, rect.bottom)) + if (WaylandCompositor.nativeFocusTakesTouch()) { listOf(PointerGestures.BTN_LEFT, PointerGestures.BTN_RIGHT, PointerGestures.BTN_MIDDLE).forEach { WaylandCompositor.nativeSendSceneInput(3, it, 0) } - sendTouch(0, event.actionIndex) } - MotionEvent.ACTION_POINTER_DOWN -> sendTouch(0, event.actionIndex) - MotionEvent.ACTION_MOVE -> for (index in 0 until event.pointerCount) sendTouch(1, index) - MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> sendTouch(2, event.actionIndex) - MotionEvent.ACTION_CANCEL -> WaylandCompositor.nativeSendTouch(3, -1, 0, 0) - else -> return false } + directTouchHold.onTouch(event) return true } private fun onMouse(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_HOVER_MOVE, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_HOVER_ENTER -> - movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { - movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) val button = when (event.actionButton) { MotionEvent.BUTTON_SECONDARY -> PointerGestures.BTN_RIGHT MotionEvent.BUTTON_TERTIARY -> PointerGestures.BTN_MIDDLE else -> PointerGestures.BTN_LEFT } - WaylandCompositor.nativeSendSceneInput(3, button, if (event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) 1 else 0) + sendSceneButton(button, event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) } MotionEvent.ACTION_SCROLL -> { val v = event.getAxisValue(MotionEvent.AXIS_VSCROLL) - if (v != 0f) WaylandCompositor.nativeSendSceneInput(4, -Math.round(v), 0) + if (v != 0f) sendSceneWheel(-Math.round(v)) } MotionEvent.ACTION_DOWN, MotionEvent.ACTION_UP -> {} else -> return false @@ -2714,8 +3618,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (want) view.requestPointerCapture() else view.releasePointerCapture() } + private var platformPointerShown: Boolean? = null + + private fun appUiOwnsPointer(): Boolean = + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive + + private fun applyPlatformPointer(shown: Boolean) { + if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return + if (shown == platformPointerShown) return + platformPointerShown = shown + val icon = if (shown) null + else android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) + sessionRoot.pointerIcon = icon + surfaceView.pointerIcon = icon + } + private fun onCapturedPointer(event: MotionEvent): Boolean { if (!pointerLocked || !event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) return false + notePress(event) when (event.actionMasked) { MotionEvent.ACTION_MOVE -> { var dx = event.x @@ -2724,7 +3644,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { dx += event.getHistoricalX(i) dy += event.getHistoricalY(i) } - WaylandCompositor.sendPointerDelta(dx, dy) + sendSceneDelta(dx, dy) } MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { val button = when (event.actionButton) { @@ -2732,11 +3652,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { MotionEvent.BUTTON_TERTIARY -> PointerGestures.BTN_MIDDLE else -> PointerGestures.BTN_LEFT } - WaylandCompositor.nativeSendSceneInput(3, button, if (event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) 1 else 0) + sendSceneButton(button, event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) } MotionEvent.ACTION_SCROLL -> { val v = event.getAxisValue(MotionEvent.AXIS_VSCROLL) - if (v != 0f) WaylandCompositor.nativeSendSceneInput(4, -Math.round(v), 0) + if (v != 0f) sendSceneWheel(-Math.round(v)) } MotionEvent.ACTION_DOWN, MotionEvent.ACTION_UP -> {} else -> return false @@ -2775,6 +3695,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 @@ -2805,6 +3731,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 } @@ -2833,6 +3760,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 @@ -2841,6 +3769,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 @@ -2851,6 +3780,60 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }) } + private fun desktopTextInput() = + SessionState.mode == SessionService.MODE_DESKTOP && SessionState.running && !pipUi + + private fun notePress(event: MotionEvent) { + val touch = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) + when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_BUTTON_PRESS -> { + pressDownX = event.x + pressDownY = event.y + pressTravel = 0f + pressMoved = false + if (!touch) lastUserPressMs = android.os.SystemClock.uptimeMillis() + } + MotionEvent.ACTION_POINTER_DOWN -> pressMoved = true + MotionEvent.ACTION_MOVE -> if (touch || event.buttonState != 0) { + val moved = if (event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) { + pressTravel += kotlin.math.hypot(event.x, event.y) + pressTravel + } else { + kotlin.math.hypot(event.x - pressDownX, event.y - pressDownY) + } + if (moved >= android.view.ViewConfiguration.get(this).scaledTouchSlop * 2f) { + pressMoved = true + if (!touch) lastUserPressMs = 0L + } + } + MotionEvent.ACTION_UP, MotionEvent.ACTION_BUTTON_RELEASE -> { + val quick = !touch || event.eventTime - event.downTime < android.view.ViewConfiguration.getLongPressTimeout() + if (!pressMoved && quick) lastUserPressMs = android.os.SystemClock.uptimeMillis() + } + } + } + + private fun onDesktopTextField(focused: Boolean) { + val host = keyboard + if (host != null && desktopTextInput()) { + val tapped = android.os.SystemClock.uptimeMillis() - lastUserPressMs < TEXT_FIELD_TAP_MS + if (focused && tapped && resumed && !pcKeyboardOpen && + resources.configuration.hardKeyboardHidden != android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO) host.show() + else if (!focused && host.shown) host.hide() + } + updateDesktopKeyboardButton() + } + + private fun updateDesktopKeyboardButton() { + val button = desktopKeyboardButton ?: return + val show = desktopTextInput() && AgentGuest.desktopTextField && !pcKeyboardOpen && + !(keyboard?.let { it.shown && (Build.VERSION.SDK_INT < 30 || it.imeShowing) } ?: false) + val visibility = if (show) View.VISIBLE else View.GONE + if (button.visibility == visibility) return + if (show) button.applyColors() + button.visibility = visibility + } + private fun keyboardCoversPad() = SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard @@ -2860,6 +3843,56 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (down || code !in gestureKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } + private fun capturePausedFrame(manual: Boolean = false) { + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (SessionState.suspended && pausedFrame != null) return + if ((suspendPolicy == SessionPrefs.SUSPEND_NEVER && !manual && !SessionState.manualPause) || !::surfaceView.isInitialized) return + if (surfaceView.holder.surface?.isValid != true) return + val width = surfaceView.width + val height = surfaceView.height + if (width <= 0 || height <= 0) return + val scale = minOf(1f, PAUSED_FRAME_MAX_EDGE / maxOf(width, height).toFloat()) + val bitmap = try { + android.graphics.Bitmap.createBitmap( + maxOf(1, (width * scale).toInt()), maxOf(1, (height * scale).toInt()), android.graphics.Bitmap.Config.ARGB_8888, + ) + } catch (_: OutOfMemoryError) { + return + } + val surfaceAt = IntArray(2).also { surfaceView.getLocationInWindow(it) } + val overlayAt = IntArray(2).also { sessionOverlay.getLocationInWindow(it) } + val left = surfaceAt[0] - overlayAt[0] + val top = surfaceAt[1] - overlayAt[1] + val bounds = android.graphics.Rect(left, top, left + width, top + height) + try { + android.view.PixelCopy.request(surfaceView, bitmap, { result -> + if (result == android.view.PixelCopy.SUCCESS && !isDestroyed) { + pausedFrame = com.droiddeck.launcher.ui.PausedFrame(bitmap.asImageBitmap(), bounds) + pausedFrameWanted = false + } else { + bitmap.recycle() + } + }, uiHandler) + } catch (_: IllegalArgumentException) { + bitmap.recycle() + } + } + + private fun pauseNow() { + if (!SessionState.running || SessionState.suspended) return + pauseAnimated = true + drawerOpen = false + pausedFrame = null + capturePausedFrame(manual = true) + SessionService.pause(this) + } + + private fun requestPausedFrame() { + if (pausedFrame != null) return + pausedFrameWanted = true + if (resumed && surfaceW > 0) capturePausedFrame() + } + private fun pipBounds(): android.graphics.Rect { val rect = android.graphics.Rect() if (!::surfaceView.isInitialized || !surfaceView.getGlobalVisibleRect(rect)) return rect @@ -2882,10 +3915,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { pendingBackAction = null releaseDrawerDirection() onScreenControls?.releaseAll() + screenKeys?.releaseAll() releasePads() touchpad.cancel() scrollTouch.cancel() directTouchHold.cancel() + twoFingerGestures.cancel() guestKeysDown.toList().forEach { sendGuestKey(it, false) } keyboard?.hide() sessionClipboard.stop() @@ -2905,7 +3940,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) updateOnScreenControls() if (resumed) { sessionClipboard.start(); updatePadMotion() } - if (started) refreshSecondScreenDisplays() + if (started) { + settleDualScreenControls() + refreshSecondScreenDisplays() + } if (CompositorHost.isStarted) applyFrameGen() } } @@ -2918,7 +3956,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() } @@ -2935,10 +3973,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.onStart() if (runtimeRemovalBlocked) return started = true + if (::hud.isInitialized) hud.setBackgrounded(false) 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) + } + settleDualScreenControls() refreshSecondScreenDisplays() if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) + else openDualScreenControls() startedScreens++ SessionService.setActivityVisible(this, true, sessionActivityDisplayId) Glasses.rescan() @@ -2949,8 +3993,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onStop() { if (runtimeRemovalBlocked) { super.onStop(); return } started = false + if (::hud.isInitialized) hud.setBackgrounded(true) updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() @@ -2970,6 +4016,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 @@ -2990,22 +4037,36 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } applyFollowOrientation(resources.configuration) if (runtimeRemovalBlocked) return + 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) } (getSystemService(INPUT_SERVICE) as? InputManager) ?.registerInputDeviceListener(deviceListener, Handler(Looper.getMainLooper())) + refreshSecondScreenDisplays() if (SessionState.guestPid > 1) padBridge?.syncConnectedControllers() - joyConVr?.refresh() + if (Build.VERSION.SDK_INT >= 31) joyConVr?.refresh() onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) resumed = true + updateDesktopKeyboardButton() + com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this, + enabled = { + resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen && + !achievementsOpen && !gestureSettingsOpen && !pipUi && SessionState.running && !SessionState.suspended && + SessionState.mode == SessionService.MODE_STEAM && padBridge != null + }, + setPressed = { padBridge?.setHomeGuidePressed(it) }, + onCancel = { padBridge?.cancelHomeGuide() }, + ) updatePointerCapture() if (!pipUi) sessionClipboard.start() updatePadMotion() + ControllerPrefs.prefs(this).registerOnSharedPreferenceChangeListener(shortcutPrefListener) readPrefs() refreshControls() if (::pip.isInitialized) pip.resumed() @@ -3014,12 +4075,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onPause() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) if (runtimeRemovalBlocked) { super.onPause(); return } + physicalShortcuts.clear() + backQamInput.cancel() + capturePausedFrame() sessionClipboard.stop() if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() uiHandler.removeCallbacks(clearRecognizedGesture) + uiHandler.removeCallbacks(cursorResync) gestureSettingsOpen = false drawerOpen = false pcKeyboardOpen = false @@ -3034,6 +4101,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { updatePadMotion() keyboard?.takeIf { it.shown }?.hide() SessionPrefs.sessionPrefs(this).unregisterOnSharedPreferenceChangeListener(cardboardPrefListener) + ControllerPrefs.prefs(this).unregisterOnSharedPreferenceChangeListener(shortcutPrefListener) updateHeadTracker() super.onPause() } @@ -3055,8 +4123,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Glasses.cancelSteamVrStart() } if (glasses.present) { - // Optional stereo starts only after RUNNING is observed. READY can - // arrive repeatedly while the launch worker is still starting VR. if (action == "install") steamVrStatus = SteamVr.Status.INSTALLING runSteamVrAction(action, ::currentRequest) { val ok = SteamVr.run(this, action) @@ -3118,13 +4184,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glasses.usesSpatialControllers(glassesSettings) private fun updateJoyConTracking() { - joyConVr?.setActive(steamVrStatus == SteamVr.Status.RUNNING && + if (Build.VERSION.SDK_INT >= 31) joyConVr?.setActive(steamVrStatus == SteamVr.Status.RUNNING && (ControllerPrefs.joyConVr(this) || (usesSpatialControllers() && glassesSettings.joyConTracking))) } private fun updateHandCamera() { - val joyCons = joyConVr?.holding == true + val joyCons = Build.VERSION.SDK_INT >= 31 && joyConVr?.holding == true val bare = !joyCons && !controllerConnected() val want = started && steamVrStatus == SteamVr.Status.RUNNING && (joyCons || bare) && !usesSpatialControllers() && @@ -3145,7 +4211,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun controllerConnected(): Boolean = InputDevice.getDeviceIds().any { id -> - joyConVr?.owns(id) != true && com.droiddeck.launcher.input.PadBridge.isFromController(InputDevice.getDevice(id)) + (Build.VERSION.SDK_INT < 31 || joyConVr?.owns(id) != true) && com.droiddeck.launcher.input.PadBridge.isFromController(InputDevice.getDevice(id)) } private fun onSteamVrStatus(now: SteamVr.Status) { @@ -3248,11 +4314,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder - // Keep the phone's layout for touch/controller coordinates, but remove - // its SurfaceView so it cannot retain the last game frame under the hint. + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive) surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (pausedFrameWanted) uiHandler.postDelayed({ + if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() + }, PAUSED_FRAME_REDRAW_MS) } private fun restorePhoneOutput(screen: GlassesScreen) { @@ -3274,7 +4342,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val display = com.droiddeck.launcher.session.SessionDisplay val choice = SessionPrefs.resolutionChoice(this, mode, panel) val size = display.resolveChoice(panel, choice) - val fixed = choice != display.MATCH_SCREEN && choice != display.FOLLOW_SCREEN && display.presetHeight(choice) == null + val fixed = choice != display.MATCH_SCREEN && !display.isFollow(choice) && display.presetHeight(choice) == null return if (fixed) display.resolve(panel, minOf(size.first, size.second), SessionPrefs.SHAPE_AUTO) else size } @@ -3325,8 +4393,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (target != null) { val screen = GlassesScreen(this, target, Glasses.outputHz(), this, Glasses.outputResolution()) - // show() can create the surface synchronously. Select its holder - // first, otherwise surfaceCreated() rejects the glasses callback. glassesScreen = screen applyOutputPacing() surfaceW = 0 @@ -3385,15 +4451,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) { @@ -3433,14 +4501,24 @@ 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() + if (started) { + settleDualScreenControls() + openDualScreenControls() + } } } override fun onDestroy() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) + backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) + uiHandler.removeCallbacks(cursorResync) + releaseEvdevMouse() if (runtimeRemovalBlocked) { super.onDestroy(); return } watching = false releaseDrawerDirection() @@ -3452,7 +4530,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() - joyConVr?.close() + if (::memoryHud.isInitialized) memoryHud.stop() + if (Build.VERSION.SDK_INT >= 31) joyConVr?.close() joyConVr = null handCamera?.stop() handCamera = null @@ -3487,17 +4566,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 ?: return@runCatching + @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 @@ -3509,17 +4604,27 @@ 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 + private const val TEXT_FIELD_TAP_MS = 1_000L + private const val PAUSED_FRAME_MAX_EDGE = 1920f + private const val PAUSED_FRAME_REDRAW_MS = 150L + private const val SETTINGS_WATCH_MS = 1_000L + private const val SETTINGS_WATCH_CHECKS = 600 private const val TAG = "SessionActivity" private var startedScreens = 0 + @Volatile private var activeInstallWorker: Any? = null private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" private const val UNBUFFERED_SOURCES = InputDevice.SOURCE_CLASS_JOYSTICK or InputDevice.SOURCE_CLASS_TRACKBALL or InputDevice.SOURCE_CLASS_POSITION private const val CURSOR_PAD_HOLD_MS = 1200L + private const val CURSOR_RESYNC_IDLE_TICKS = 33 private const val PAD_MOUSE_CHECK_MS = 500L private const val PAD_SCROLL_POINTER_X = 0.985f private const val PAD_SCROLL_HEIGHTS_PER_S = 3f + private const val AXIS_UNITS_PER_PIXEL = 3f + private const val KEY_LEFTCTRL = 29 private const val DRAWER_HAT_THRESHOLD = 0.5f private const val DRAWER_STICK_ENTER_THRESHOLD = 0.55f private const val DRAWER_STICK_EXIT_THRESHOLD = 0.35f diff --git a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt index 8459bc7d9..6b59112d1 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 -> { @@ -118,6 +122,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl } } + @android.annotation.SuppressLint("UnspecifiedRegisterReceiverFlag") fun start() { catalog = AppUpdates.cached(activity) follow = AppUpdates.follow(activity, catalog) 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 5f7f09262..0842f6b5a 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/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt index 82572ab19..a89c14c66 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt @@ -22,6 +22,14 @@ object AgentGuest { private set var steamKeyboard by mutableStateOf(false) private set + var desktopTextField by mutableStateOf(false) + private set + var keyboardRequests by mutableIntStateOf(0) + private set + var keyboardDismissals by mutableIntStateOf(0) + private set + @Volatile private var keyboardRoute = false + @Volatile private var routeDir: File? = null private const val TAG = "AgentGuest" private const val POLL_MS = 50L private val lock = Any() @@ -35,10 +43,12 @@ object AgentGuest { observer?.stopWatching() observer = null lastFocusKey = null - main.post { steamKeyboard = false } + main.post { steamKeyboard = false; desktopTextField = false } val dir = dir(context) dir.deleteRecursively() dir.mkdirs() + routeDir = dir + writeKeyboardRoute(dir, keyboardRoute) @Suppress("DEPRECATION") observer = object : FileObserver(dir.path, MOVED_TO or CLOSE_WRITE) { override fun onEvent(event: Int, path: String?) { @@ -48,6 +58,9 @@ object AgentGuest { } "focus.json" -> readJson(File(dir, path))?.let(::recordFocus) "keyboard.json" -> readJson(File(dir, path))?.let { recordKeyboard(this, it) } + "ime.json" -> readJson(File(dir, path))?.let { recordTextField(this, it) } + "keyboard-request.json" -> readJson(File(dir, path))?.let { recordKeyboardRequest(this) } + "keyboard-dismiss.json" -> readJson(File(dir, path))?.let { recordKeyboardDismiss(this) } } } }.also { it.startWatching() } @@ -58,10 +71,46 @@ object AgentGuest { synchronized(lock) { observer?.stopWatching() observer = null - main.post { steamKeyboard = false } + main.post { steamKeyboard = false; desktopTextField = false } } } + fun routeKeyboard(context: Context, bottom: Boolean) { + synchronized(lock) { + if (keyboardRoute == bottom) return + keyboardRoute = bottom + writeKeyboardRoute(routeDir ?: dir(context), bottom) + } + } + + private fun writeKeyboardRoute(dir: File, bottom: Boolean) { + val file = File(dir, "keyboard-route") + runCatching { + if (!bottom) file.delete() + else if (dir.isDirectory) { + val temp = File(dir, "keyboard-route.tmp") + temp.writeText("bottom") + if (!temp.renameTo(file)) temp.delete() + } + }.onFailure { Log.w(TAG, "keyboard route not written", it) } + } + + private fun recordKeyboardRequest(source: FileObserver) { + synchronized(lock) { + if (source !== observer) return + main.post { keyboardRequests++ } + } + SessionEvents.record("keyboard.requested", emptyMap()) + } + + private fun recordKeyboardDismiss(source: FileObserver) { + synchronized(lock) { + if (source !== observer) return + main.post { keyboardDismissals++ } + } + SessionEvents.record("keyboard.dismissed", emptyMap()) + } + private fun recordKeyboard(source: FileObserver, snapshot: JSONObject) { val showing = snapshot.optBoolean("steamKeyboard") synchronized(lock) { @@ -71,6 +120,15 @@ object AgentGuest { SessionEvents.record("keyboard.changed", mapOf("steamKeyboard" to showing, "seq" to snapshot.optInt("seq"))) } + private fun recordTextField(source: FileObserver, snapshot: JSONObject) { + val focused = snapshot.optBoolean("textField") + synchronized(lock) { + if (source !== observer) return + main.post { desktopTextField = focused } + } + SessionEvents.record("ime.changed", mapOf("textField" to focused, "seq" to snapshot.optInt("seq"))) + } + private fun recordFocus(snapshot: JSONObject) { val fields = linkedMapOf( "focusedApp" to snapshot.opt("focusedApp"), diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentStartActivity.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentStartActivity.kt index f052df93c..ce8cca924 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentStartActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentStartActivity.kt @@ -23,6 +23,9 @@ class AgentStartActivity : Activity() { Thread({ try { AgentBridgeProvider.awaitRecovery() + val until = android.os.SystemClock.elapsedRealtime() + RUNTIME_WAIT_MS + while (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isBusy() && !isFinishing && + android.os.SystemClock.elapsedRealtime() < until) Thread.sleep(RUNTIME_POLL_MS) runOnUiThread { if (!isFinishing) startSession(request) } @@ -51,6 +54,11 @@ class AgentStartActivity : Activity() { } private fun startSession(request: JSONObject) { + if (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isBusy()) { + Log.w(TAG, "the Linux runtime is being installed or changed") + finish() + return + } try { AgentAccess.requireStart(this, request) } catch (e: AgentException) { @@ -107,5 +115,7 @@ class AgentStartActivity : Activity() { companion object { const val EXTRA_REQUEST = "request" private const val TAG = "AgentStartActivity" + private const val RUNTIME_WAIT_MS = 15 * 60_000L + private const val RUNTIME_POLL_MS = 500L } } 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 f1fa53492..8d9ddcb1f 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) { @@ -100,7 +118,6 @@ public class DirectAudioRelayComponent extends SessionPart { } } - // Android keeps the input stream's wake lock while a frozen helper still has it started. public boolean awaitMicReleased(long timeoutMs) { long deadline = System.currentTimeMillis() + timeoutMs; synchronized (micLock) { diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt new file mode 100644 index 000000000..56fbedbe6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.audio + +import android.media.AudioAttributes +import android.media.AudioFormat +import android.media.AudioTrack +import android.util.Log + +object DirectAudioTiming { + private const val TAG = "DirectAudioTiming" + const val PERIOD_ENV = "AUDIO_DIRECT_PERIOD_MS" + const val BUFFER_ENV = "AUDIO_DIRECT_MS" + const val SLOW_OUTPUT_PERIOD_MS = 20 + const val SLOW_OUTPUT_BUFFER_MS = 60 + + fun environment(lowLatencyOutput: Boolean): List = + if (lowLatencyOutput) emptyList() + else listOf("$PERIOD_ENV=$SLOW_OUTPUT_PERIOD_MS", "$BUFFER_ENV=$SLOW_OUTPUT_BUFFER_MS") + + fun lowLatencyOutput(): Boolean = try { + val track = AudioTrack.Builder() + .setAudioAttributes(AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_GAME) + .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) + .build()) + .setAudioFormat(AudioFormat.Builder() + .setEncoding(AudioFormat.ENCODING_PCM_FLOAT) + .setSampleRate(48000) + .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) + .build()) + .setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY) + .setTransferMode(AudioTrack.MODE_STREAM) + .build() + try { + track.performanceMode == AudioTrack.PERFORMANCE_MODE_LOW_LATENCY + } finally { + track.release() + } + } catch (e: Exception) { + Log.w(TAG, "audio: could not check for low-latency output; DirectAudio keeps its defaults", e) + true + } +} 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 79389daff..a42a43e07 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/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index d54a5fff5..383dd98bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -13,15 +13,10 @@ import kotlinx.coroutines.launch import java.io.File import java.io.FileInputStream -/** - * A pack built by CI alongside this APK (tools/packs). Main and release builds publish it to - * DroidDeck-Components under a content-addressed tag; a PR test build attaches packs that are not there - * yet to its pr-N release on DroidDeck-CI. The APK pins the pack's SHA-256, so only the bytes this build - * was made with install, whichever host serves them. - */ internal class AddonPack( val name: String, private val sha256: String, val size: Long, private val required: List, private val reuseDeviceCopy: Boolean = sha256.isEmpty() && !BuildConfig.CI_BUILD, + private val bundle: (Context) -> java.io.InputStream = { it.assets.open("packs/$name.tar.zst") }, ) { sealed interface State { data object Missing : State @@ -42,13 +37,11 @@ internal class AddonPack( ) private fun root(context: Context) = File(context.filesDir, "addons/$name") - /** App-private and written only after the archive matched the pinned digest. */ fun dir(context: Context) = File(root(context), version(context)) fun file(context: Context, relative: String) = File(dir(context), relative) fun installed(context: Context): Boolean = version(context).isNotEmpty() && File(dir(context), COMPLETE).isFile - // A build made outside CI pins no packs, so it runs the newest one a CI build already verified and installed. private fun version(context: Context): String = if (!reuseDeviceCopy) sha256 else deviceCopy(context).orEmpty() private fun deviceCopy(context: Context): String? = root(context).listFiles().orEmpty() @@ -65,7 +58,6 @@ internal class AddonPack( .also { mutableState.value = it } } - /** Starts the download in the background unless the pack is already present or on its way. */ fun ensure(context: Context, onReady: (Context) -> Unit = {}) { val app = context.applicationContext synchronized(lock) { @@ -80,7 +72,6 @@ internal class AddonPack( } } - /** Blocks a worker thread until the pack is installed, starting the download if needed. */ @JvmOverloads fun await(context: Context, running: () -> Boolean = { true }, onState: (State) -> Unit = {}): Boolean { if (installed(context)) return true @@ -104,7 +95,7 @@ internal class AddonPack( } val root = root(context).apply { mkdirs() } val archive = File(root, "$sha256.tar.zst") - val downloaded = urls.any { url -> + val downloaded = bundled(context, archive) || urls.any { url -> Downloader.downloadFile(url, archive, true, sha256) { p -> mutableState.value = State.Downloading(p.coerceIn(0f, 1f)) } .also { if (!it) archive.delete() } } @@ -126,6 +117,16 @@ internal class AddonPack( return true } + internal fun bundled(context: Context, archive: File): Boolean { + val copied = runCatching { + bundle(context).use { input -> archive.outputStream().use { input.copyTo(it) } } + }.isSuccess + if (copied && Hashes.sha256(archive).equals(sha256, ignoreCase = true)) return true + if (copied) Log.w(TAG, "$name: the bundled pack does not match the pinned digest") + archive.delete() + return false + } + companion object { private const val TAG = "AddonPack" private const val REPO = "Droid-Deck/DroidDeck-Components" @@ -146,5 +147,7 @@ internal class AddonPack( listOf("version", "xodus-cli", "xodus-service")) val COMET = AddonPack("comet", BuildConfig.PACK_COMET_SHA256, BuildConfig.PACK_COMET_SIZE, listOf("version", "comet")) + val BUTLER = AddonPack("butler", BuildConfig.PACK_BUTLER_SHA256, BuildConfig.PACK_BUTLER_SIZE, + listOf("version", "butler", "7z.so", "libc7zip.so")) } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppPermissions.kt b/app/src/main/java/com/droiddeck/launcher/core/AppPermissions.kt new file mode 100644 index 000000000..5afa57200 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/AppPermissions.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.core + +import android.Manifest +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Build +import android.provider.Settings + +object AppPermissions { + fun granted(context: Context, permission: String): Boolean = + context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED + + fun localNetwork(context: Context): Boolean = Build.VERSION.SDK_INT < 37 || + granted(context, Manifest.permission.ACCESS_LOCAL_NETWORK) + + fun startup(activity: Activity): List = buildList { + if (Build.VERSION.SDK_INT >= 37 && !localNetwork(activity) && + !activity.getSharedPreferences("runtime-permissions", Context.MODE_PRIVATE).getBoolean("local-network", false)) { + add(Manifest.permission.ACCESS_LOCAL_NETWORK) + activity.getSharedPreferences("runtime-permissions", Context.MODE_PRIVATE).edit().putBoolean("local-network", true).apply() + } + if (Build.VERSION.SDK_INT >= 33 && !granted(activity, Manifest.permission.POST_NOTIFICATIONS) && + !activity.getSharedPreferences("stores", Context.MODE_PRIVATE).getBoolean("asked_notifications", false)) { + add(Manifest.permission.POST_NOTIFICATIONS) + activity.getSharedPreferences("stores", Context.MODE_PRIVATE).edit().putBoolean("asked_notifications", true).apply() + } + } + + fun requestLocalNetwork(activity: Activity, requestCode: Int) { + if (Build.VERSION.SDK_INT < 37) return + val prefs = activity.getSharedPreferences("runtime-permissions", Context.MODE_PRIVATE) + if (localNetwork(activity) || prefs.getBoolean("local-network", false) && + !activity.shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_LOCAL_NETWORK)) { + openSettings(activity) + } else { + prefs.edit().putBoolean("local-network", true).apply() + activity.requestPermissions(arrayOf(Manifest.permission.ACCESS_LOCAL_NETWORK), requestCode) + } + } + + fun openSettings(context: Context) { + runCatching { + context.startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:${context.packageName}")) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } + } +} 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 3021b7196..7b8536202 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 000000000..02447f360 --- /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 adaa106a0..000000000 --- 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 903851a5a..7b4eb8117 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -29,6 +29,11 @@ import java.util.Locale object DeviceReport { private const val TAG = "DeviceReport" + internal fun cpuFeaturesSummary(cpuInfo: String): String = cpuInfo.lineSequence() + .filter { it.substringBefore(':').trim() == "Features" } + .map { it.substringAfter(':').trim().split(Regex("\\s+")).filter(String::isNotEmpty).joinToString(" ") } + .filter(String::isNotEmpty).distinct().joinToString(" | ").ifEmpty { "not reported" } + fun write(context: Context, target: File, mode: String) { try { target.writeText(build(context, mode)) @@ -37,7 +42,6 @@ object DeviceReport { } } - /** Name of an ApplicationExitInfo reason code, so a report says "LOW_MEMORY" instead of "3". */ internal fun exitReasonName(reason: Int): String = when (reason) { 0 -> "UNKNOWN" 1 -> "EXIT_SELF" @@ -105,7 +109,7 @@ object DeviceReport { h("App") runCatching { val info = context.packageManager.getPackageInfo(context.packageName, 0) - k("Version", "${info.versionName} (${info.longVersionCode})") + k("Version", "${info.versionName} (${androidx.core.content.pm.PackageInfoCompat.getLongVersionCode(info)})") } k("Package", context.packageName) k("targetSdk", context.applicationInfo.targetSdkVersion) @@ -141,6 +145,7 @@ object DeviceReport { h("CPU and memory") k("Cores", CpuCores.all.size) + k("CPU features", cpuFeaturesSummary(FileUtils.readString(File("/proc/cpuinfo")).orEmpty())) b.append("Core ceilings ") b.append(CpuCores.all.joinToString(", ") { c -> "cpu$c " + (CpuCores.maxGhz(c)?.let { String.format(Locale.US, "%.2f GHz", it) } ?: "?") @@ -152,13 +157,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() @@ -200,7 +209,12 @@ object DeviceReport { h("Drivers") val gpu = com.droiddeck.launcher.gpu.GpuInfo.detect() k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") - if (gpu.model == 740) k("TP UBWC hint", com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() ?: "driver default") + if (gpu.model == 740) { + val hint = com.droiddeck.launcher.gpu.TpUbwcHint + k("TP UBWC hint", hint.forThisDevice(context) ?: "driver default") + k("TP UBWC mode", hint.activeMode ?: SessionPrefs.TP_UBWC_AUTO) + if (hint.restartRequired(context)) k("TP UBWC pending", "${SessionPrefs.tpUbwcMode(context)} (restart required)") + } k("Driver mode", SessionPrefs.gpuDriverMode(context) + (com.droiddeck.launcher.gpu.DriverPairs.recommendedKey(gpu, com.droiddeck.launcher.gpu.DriverPairs.from( com.droiddeck.launcher.gpu.TurnipReleases.cached(context)), com.droiddeck.launcher.gpu.TurnipReleases.autoPicks(context), @@ -247,8 +261,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 870e8ed42..d71f45120 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" @@ -123,11 +126,9 @@ object DownloadSource { fun isGithub(url: String): Boolean = GITHUB_HOSTS.any { url.startsWith("https://$it/") } - /** Catalogs carry the digests everything else is checked against, so a mirror must never supply one. */ fun isCatalog(url: String): Boolean = CATALOGS.any { url.startsWith(it) } fun candidates(target: String): List { - // GitHub API metadata carries executable URLs and digests; never proxy it. if (isCatalog(target) || target.startsWith("https://api.github.com/")) return listOf(target) val prefs = prefs() ?: return listOf(target) if (!isGithub(target)) return listOf(target) @@ -175,6 +176,21 @@ 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() + } + + 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 +221,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 35e62be1a..eb8898e92 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -11,24 +11,87 @@ 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; import java.util.Properties; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; public final class Downloader { private static final String TAG = "Downloader"; private static final int CONNECT_TIMEOUT_MS = 10_000; private static final int STALL_TIMEOUT_MS = 15_000; private static final int HTTP_RANGE_NOT_SATISFIABLE = 416; + private static final java.util.concurrent.ExecutorService CANCEL_EXECUTOR = + java.util.concurrent.Executors.newCachedThreadPool(r -> { + Thread thread = new Thread(r, "download-cancel"); + thread.setDaemon(true); + return thread; + }); private Downloader() {} + public static final class Cancellation implements java.util.function.BooleanSupplier { + private final AtomicBoolean cancelled = new AtomicBoolean(); + private final AtomicReference connection = new AtomicReference<>(); + private final AtomicReference input = new AtomicReference<>(); + private final java.util.function.BooleanSupplier external; + + public Cancellation() { this(null); } + public Cancellation(java.util.function.BooleanSupplier external) { this.external = external; } + + public void cancel() { + cancelled.set(true); + HttpURLConnection active = connection.get(); + if (active != null) disconnectAsync(active); + InputStream activeInput = input.get(); + if (activeInput != null) closeAsync(activeInput); + } + + private static void disconnectAsync(HttpURLConnection active) { + CANCEL_EXECUTOR.execute(() -> { + try { active.disconnect(); } catch (RuntimeException ignored) { } + }); + } + + private static void closeAsync(InputStream active) { + CANCEL_EXECUTOR.execute(() -> { + try { active.close(); } catch (IOException ignored) { } + }); + } + + @Override public boolean getAsBoolean() { + return cancelled.get() || (external != null && external.getAsBoolean()); + } + + private void attach(HttpURLConnection active) { + connection.set(active); + if (getAsBoolean()) disconnectAsync(active); + } + + private void detach(HttpURLConnection active) { connection.compareAndSet(active, null); } + + private void attach(InputStream active) { + input.set(active); + if (getAsBoolean()) closeAsync(active); + } + + private void detach(InputStream active) { input.compareAndSet(active, null); } + } + public static String downloadString(String url) { + return downloadString(url, null); + } + + public static String downloadString(String url, java.util.function.BooleanSupplier cancelled) { List sources = DownloadSource.INSTANCE.candidates(url); for (int i = 0; i < sources.size(); i++) { + if (isCancelled(cancelled)) return null; if (i > 0) Log.i(TAG, "retrying " + url + " via " + sources.get(i)); - Fetch fetch = fetch(sources.get(i)); + Fetch fetch = fetch(sources.get(i), cancelled); + if (isCancelled(cancelled)) return null; if (fetch.body != null) { DownloadSource.INSTANCE.succeeded(sources.get(i)); return fetch.body; @@ -39,7 +102,6 @@ public final class Downloader { return null; } - /** Fetches without the mirror list, for a URL whose body is a digest the payload is checked against. */ public static String downloadDirect(String url) { return fetch(url).body; } @@ -49,35 +111,52 @@ public final class Downloader { return downloadFile(url, destination, resume, null, progress); } - /** Verify each candidate before accepting it, so a bad mirror can fall back. */ public static boolean downloadFile(String url, File destination, boolean resume, String expectedSha256, java.util.function.Consumer progress) { + return downloadFile(url, destination, resume, expectedSha256, null, progress); + } + + public static boolean downloadFile(String url, File destination, boolean resume, String expectedSha256, + java.util.function.BooleanSupplier cancelled, + java.util.function.Consumer progress) { if (expectedSha256 != null && !expectedSha256.matches("(?i)[0-9a-f]{64}")) throw new IllegalArgumentException("Expected SHA-256 must be 64 hex characters"); - return downloadCandidates(url, sources(url, expectedSha256), destination, resume, expectedSha256, progress); + return downloadCandidates(url, sources(url, expectedSha256), destination, resume, expectedSha256, cancelled, progress); } - /** A third-party mirror may only serve bytes that can be checked against a digest from a direct source. */ static List sources(String url, String expectedSha256) { return expectedSha256 == null ? java.util.Collections.singletonList(url) : DownloadSource.INSTANCE.candidates(url); + } - // Package-private for the local multi-source HTTP test. static boolean downloadCandidates(String original, List sources, File destination, boolean resume, String expectedSha256, java.util.function.Consumer progress) { + return downloadCandidates(original, sources, destination, resume, expectedSha256, null, progress); + } + + static boolean downloadCandidates(String original, List sources, File destination, boolean resume, + String expectedSha256, java.util.function.BooleanSupplier cancelled, + java.util.function.Consumer progress) { Identity identity = loadIdentity(destination, resume, expectedSha256); for (int i = 0; i < sources.size(); i++) { if (Thread.currentThread().isInterrupted()) return false; String source = sources.get(i); + if (isCancelled(cancelled)) return false; if (i > 0) Log.i(TAG, "retrying " + original + " via " + source); - Outcome outcome = attempt(source, destination, resume, identity, expectedSha256, progress); + Outcome outcome = attempt(source, destination, resume, identity, expectedSha256, cancelled, progress); + if (outcome == Outcome.CANCELLED) return false; if (Thread.currentThread().isInterrupted()) return false; if (outcome == Outcome.DONE) { - if (expectedSha256 != null && !expectedSha256.equalsIgnoreCase(Hashes.sha256(destination))) { - Log.w(TAG, "checksum mismatch from " + source + "; trying another source"); - if (!discardPartial(destination, identity)) return false; - continue; + if (expectedSha256 != null) { + String actualSha256 = Hashes.sha256(destination); + if (isCancelled(cancelled)) return false; + if (!expectedSha256.equalsIgnoreCase(actualSha256)) { + Log.w(TAG, "checksum mismatch from " + source + "; trying another source"); + if (!discardPartial(destination, identity)) return false; + continue; + } } + if (isCancelled(cancelled)) return false; resumeFile(destination).delete(); DownloadSource.INSTANCE.succeeded(source); if (progress != null) progress.accept(1f); @@ -89,7 +168,11 @@ public final class Downloader { return false; } - private enum Outcome { DONE, RETRY, FATAL } + private enum Outcome { DONE, RETRY, FATAL, CANCELLED } + + private static boolean isCancelled(java.util.function.BooleanSupplier cancelled) { + return cancelled != null && cancelled.getAsBoolean(); + } private static final class Identity { private String source; @@ -104,7 +187,6 @@ public final class Downloader { return value != null && !value.isEmpty() && !value.startsWith("W/"); } - /** Only reuse saved bytes when we persisted a strong validator and their source. */ private static Identity loadIdentity(File dest, boolean resume, String expectedSha256) { Identity identity = new Identity(); File marker = resumeFile(dest); @@ -125,7 +207,6 @@ public final class Downloader { return identity; } } catch (IOException e) { - // Legacy partials or interrupted metadata writes have no trustworthy identity. } if (!discardPartial(dest, identity)) Log.w(TAG, "could not discard unidentified partial " + dest); return identity; @@ -151,22 +232,24 @@ public final class Downloader { try (FileOutputStream out = new FileOutputStream(marker)) { p.store(out, "DroidDeck partial download validator"); } catch (IOException e) { - marker.delete(); // No valid metadata means no future resume. + marker.delete(); Log.w(TAG, "cannot persist download validator", e); } } private static Outcome attempt(String url, File destination, boolean resume, Identity identity, - String expectedSha256, java.util.function.Consumer progress) { + String expectedSha256, java.util.function.BooleanSupplier cancelled, + java.util.function.Consumer progress) { + if (isCancelled(cancelled)) return Outcome.CANCELLED; HttpURLConnection connection = null; long have = resume && destination.isFile() ? destination.length() : 0; try { if (have > 0 && (!url.equals(identity.source) || !strongETag(identity.etag))) { - // A new source or unvalidated bytes must restart from byte zero. if (!discardPartial(destination, identity)) return Outcome.RETRY; have = 0; } connection = open(url, STALL_TIMEOUT_MS); + if (cancelled instanceof Cancellation) ((Cancellation) cancelled).attach(connection); if (have > 0) { connection.setRequestProperty("Range", "bytes=" + have + "-"); connection.setRequestProperty("If-Range", identity.etag); @@ -175,7 +258,7 @@ public final class Downloader { if (have > 0 && code == HTTP_RANGE_NOT_SATISFIABLE) { connection.disconnect(); if (!discardPartial(destination, identity)) return Outcome.RETRY; - return attempt(url, destination, false, identity, expectedSha256, progress); + return attempt(url, destination, false, identity, expectedSha256, cancelled, progress); } if (code / 100 != 2) { Log.w(TAG, url + " -> HTTP " + code); @@ -186,16 +269,15 @@ public final class Downloader { if (appending && !rangeStartsAt(connection.getHeaderField("Content-Range"), have)) { connection.disconnect(); if (!discardPartial(destination, identity)) return Outcome.RETRY; - return attempt(url, destination, false, identity, expectedSha256, progress); + return attempt(url, destination, false, identity, expectedSha256, cancelled, progress); } String etag = connection.getHeaderField("ETag"); if (have > 0 && appending && (!strongETag(etag) || !etag.equals(identity.etag))) { connection.disconnect(); if (!discardPartial(destination, identity)) return Outcome.RETRY; - return attempt(url, destination, false, identity, expectedSha256, progress); + return attempt(url, destination, false, identity, expectedSha256, cancelled, progress); } if (!appending && have > 0) { - // If-Range may legitimately return full 200 when representation changed. if (!discardPartial(destination, identity)) return Outcome.RETRY; have = 0; } @@ -209,7 +291,9 @@ public final class Downloader { identity.etag = strongETag(etag) ? etag : null; saveIdentity(destination, identity, expectedSha256); long written = have; - try (InputStream in = new BufferedInputStream(connection.getInputStream(), 1 << 16); + InputStream input = connection.getInputStream(); + if (cancelled instanceof Cancellation) ((Cancellation) cancelled).attach(input); + try (InputStream in = new BufferedInputStream(input, 1 << 16); OutputStream out = new FileOutputStream(destination, appending)) { byte[] buffer = new byte[1 << 16]; long lastReport = 0; @@ -217,30 +301,36 @@ public final class Downloader { if (Thread.currentThread().isInterrupted()) return Outcome.RETRY; out.write(buffer, 0, read); written += read; + if (isCancelled(cancelled)) return Outcome.CANCELLED; if (progress != null && written - lastReport > (1 << 20)) { lastReport = written; progress.accept(total > 0 ? written / (float) total : -1f); } } + } finally { + if (cancelled instanceof Cancellation) ((Cancellation) cancelled).detach(input); } + if (isCancelled(cancelled)) return Outcome.CANCELLED; if (total > 0 && written < total) return Outcome.RETRY; return Outcome.DONE; } catch (Exception e) { + if (isCancelled(cancelled)) return Outcome.CANCELLED; Log.w(TAG, "download " + url, e); return Outcome.RETRY; } finally { - if (connection != null) connection.disconnect(); + if (connection != null) { + if (cancelled instanceof Cancellation) ((Cancellation) cancelled).detach(connection); + connection.disconnect(); + } } } - /** True when a `Content-Range: bytes START-END/TOTAL` header starts exactly at {@code start}. */ static boolean rangeStartsAt(String contentRange, long start) { if (contentRange == null) return false; java.util.regex.Matcher m = java.util.regex.Pattern.compile("^\\s*bytes\\s+(\\d+)-\\d+/(?:\\d+|\\*)\\s*$").matcher(contentRange); return m.matches() && Long.parseLong(m.group(1)) == start; } - /** The complete length in a `Content-Range` header, or -1 when the header leaves it unknown. */ static long rangeTotal(String contentRange) { if (contentRange == null) return -1; java.util.regex.Matcher m = java.util.regex.Pattern.compile("^\\s*bytes\\s+\\d+-\\d+/(\\d+)\\s*$").matcher(contentRange); @@ -258,9 +348,15 @@ public final class Downloader { } private static Fetch fetch(String url) { + return fetch(url, null); + } + + private static Fetch fetch(String url, java.util.function.BooleanSupplier cancelled) { HttpURLConnection connection = null; + Cancellation token = cancelled instanceof Cancellation ? (Cancellation) cancelled : null; try { connection = open(url, STALL_TIMEOUT_MS); + if (token != null) token.attach(connection); int code = connection.getResponseCode(); if (code / 100 != 2) { Log.w(TAG, url + " -> HTTP " + code); @@ -272,15 +368,21 @@ public final class Downloader { return new Fetch(new String(out.toByteArray(), StandardCharsets.UTF_8), false); } } catch (Exception e) { + if (isCancelled(cancelled)) return new Fetch(null, false); Log.w(TAG, "GET " + url, e); return new Fetch(null, false); } finally { - if (connection != null) connection.disconnect(); + if (connection != null) { + if (token != null) token.detach(connection); + connection.disconnect(); + } } } private static HttpURLConnection open(String url, int readTimeoutMs) throws java.io.IOException { - HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + 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/ForegroundServices.kt b/app/src/main/java/com/droiddeck/launcher/core/ForegroundServices.kt new file mode 100644 index 000000000..67d757224 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/ForegroundServices.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.core + +import android.app.Notification +import android.app.Service +import android.os.Build +import android.util.Log + +object ForegroundServices { + fun start(service: Service, id: Int, notification: Notification, types: Int = 0): Boolean = try { + if (Build.VERSION.SDK_INT >= 29 && types != 0) service.startForeground(id, notification, types) + else service.startForeground(id, notification) + true + } catch (error: RuntimeException) { + if (Build.VERSION.SDK_INT < 31 || error !is android.app.ForegroundServiceStartNotAllowedException) throw error + Log.w("ForegroundServices", "Foreground work cannot start in the current lifecycle", error) + false + } +} 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 3ad45c1fa..5958c5e99 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,9 @@ 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("AUDIO_DIRECT_MS", "", 0, Type.NUMBER), + Option("AUDIO_DIRECT_PERIOD_MS", "", 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/GlobalSettings.kt b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt new file mode 100644 index 000000000..3e4bb5305 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.core + +import android.content.Context +import android.net.Uri +import android.provider.Settings + +object GlobalSettings { + fun read(context: Context, name: String): String? { + val uri = Uri.withAppendedPath(Settings.Global.CONTENT_URI, name) + context.contentResolver.query(uri, arrayOf(Settings.NameValueTable.VALUE), null, null, null)?.use { cursor -> + return if (cursor.moveToFirst()) cursor.getString(0) else null + } + return Settings.Global.getString(context.contentResolver, name) + } + + fun isOn(context: Context, name: String): Boolean = + runCatching { read(context, name)?.trim() == "1" }.getOrDefault(false) + + fun developerOptionsOn(context: Context): Boolean = isOn(context, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED) + + fun wirelessDebuggingOn(context: Context): Boolean = isOn(context, "adb_wifi_enabled") +} 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 d629395cb..4d305a12a 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -10,7 +10,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 { @@ -21,7 +25,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)") @@ -48,14 +55,17 @@ object HostProcess { } @JvmStatic - fun pidOf(process: Process): Int = try { - val field = process.javaClass.getDeclaredField("pid") - field.isAccessible = true - val pid = field.getInt(process) - field.isAccessible = false - pid - } catch (e: Exception) { - -1 + fun pidOf(process: Process): Int { + Regex("""\bpid=(\d+)\b""").find(process.toString())?.groupValues?.get(1)?.toIntOrNull()?.let { return it } + return try { + val field = process.javaClass.getDeclaredField("pid") + field.isAccessible = true + val pid = field.getInt(process) + field.isAccessible = false + pid + } catch (e: Exception) { + -1 + } } @JvmStatic 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 491101dba..3230e8ea4 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -1,21 +1,58 @@ package com.droiddeck.launcher.core object LogRedactor { - private val EMAIL = Regex("[A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z]{2,}") - private val HIDL_SHARED_LIBRARY = Regex( - "(?:android\\.(?:hardware|frameworks|hidl|system)|vendor\\.[A-Za-z0-9_]+\\.hardware)" + - "(?:\\.[A-Za-z0-9_]+)+@[0-9]+\\.[0-9]+(?:-[A-Za-z0-9_]+)*\\.so" - ) - private val hidlMatcher = object : ThreadLocal() { - override fun initialValue(): java.util.regex.Matcher = HIDL_SHARED_LIBRARY.toPattern().matcher("") + internal const val MAX_LINE_LENGTH = 64 * 1024 + internal const val OVERSIZED_LINE = "" + + private data class MatcherKey(val pattern: String, val options: Set) + + private class MatcherCache : LinkedHashMap(32, 0.75f, true) { + override fun removeEldestEntry(eldest: MutableMap.MutableEntry?): Boolean = + size > 32 } - private fun isHidlLoaderDiagnostic(input: String, match: MatchResult): Boolean { - val matcher = hidlMatcher.get()!! - val isLibrary = try { matcher.reset(match.value).matches() } finally { matcher.reset("") } - if (!isLibrary) return false - val start = match.range.first - val end = match.range.last + 1 + private val matchers = object : ThreadLocal() { + override fun initialValue(): MatcherCache = MatcherCache() + } + + private fun withMatcher( + regex: Regex, + input: CharSequence, + action: (java.util.regex.Matcher) -> T, + ): T { + val key = MatcherKey(regex.pattern, regex.options) + val matcher = matchers.get()!!.getOrPut(key) { regex.toPattern().matcher("") } + return try { + action(matcher.reset(input)) + } finally { + matcher.reset("") + } + } + + private fun replaceMatches(input: String, regex: Regex, replacement: String): String = + replaceMatches(input, regex) { replacement } + + private fun replaceMatches( + input: String, + regex: Regex, + replacement: (java.util.regex.Matcher) -> String, + ): String = withMatcher(regex, input) { matcher -> + if (!matcher.find()) return@withMatcher input + val out = StringBuffer(input.length) + do { + matcher.appendReplacement(out, java.util.regex.Matcher.quoteReplacement(replacement(matcher))) + } while (matcher.find()) + matcher.appendTail(out) + out.toString() + } + + private fun matchesEntire(input: String, regex: Regex): Boolean = + withMatcher(regex, input) { it.matches() } + + private fun isHidlLoaderDiagnostic(input: String, match: java.util.regex.Matcher): Boolean { + if (!matchesEntire(match.group(), HIDL_SHARED_LIBRARY)) return false + val start = match.start() + val end = match.end() val prefix = "library \"" val suffix = "\" not found" val earliestQuote = (start - 4096).coerceAtLeast(0) @@ -39,6 +76,12 @@ object LogRedactor { (suffixEnd == input.length || !(input[suffixEnd].isLetterOrDigit() || input[suffixEnd] == '_')) } + private val EMAIL = Regex("[A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z]{2,}") + private val HIDL_SHARED_LIBRARY = Regex( + "(?:android\\.(?:hardware|frameworks|hidl|system)|vendor\\.[A-Za-z0-9_]+\\.hardware)" + + "(?:\\.[A-Za-z0-9_]+)+@[0-9]+\\.[0-9]+(?:-[A-Za-z0-9_]+)*\\.so" + ) + private val JWT_LABELLED = Regex("(?i)(\\bJWT[\\s=:]+)(\\d{8,})") private val JWT_BASE64 = Regex("ey[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}") private val GUID = Regex("\\b[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\b") @@ -76,7 +119,7 @@ object LogRedactor { private const val ACCOUNT_VALUE = "(\"[^\"<\\r\\n]+\"|'[^'<\\r\\n]+'|[^\\s\"'<>&;,}]+)" private val ACCOUNT_KV = Regex( - "(?i)(? kind(m.value)?.let { "<$it>" } ?: m.value } - out = IPV4.replace(out) { m -> kind(m.value)?.let { "<$it>" } ?: m.value } + var out = replaceMatches(text, IPV6) { m -> kind(m.group())?.let { "<$it>" } ?: m.group() } + out = replaceMatches(out, IPV4) { m -> kind(m.group())?.let { "<$it>" } ?: m.group() } return out } - /** The at-rest rewrite reads a file into memory twice; larger logs are only scrubbed on the way out. */ const val IN_MEMORY_SCRUB_MAX = 64L * 1024 * 1024 fun isBinary(file: java.io.File): Boolean = try { @@ -196,31 +238,34 @@ object LogRedactor { true } - fun isText(file: java.io.File): Boolean = file.isFile && file.length() < IN_MEMORY_SCRUB_MAX && !isBinary(file) - const val RULES_VERSION = 3 private val LAN_IPV4 = Regex( "(? out.write(redact(line)); out.write("\n") } - } + fun scrubTo( + src: java.io.File, + out: java.io.Writer, + shouldStop: () -> Boolean = { false }, + ): Boolean = scrubLines(src, out, ::redact, shouldStop) fun redactForShare(line: String): String { if (line.isEmpty()) return line + if (line.length > MAX_LINE_LENGTH) return OVERSIZED_LINE return try { val out = SecretScrub.scrub(redact(line), SecretScrub.Urls.KEEP_PATH, "") - LAN_IPV4.replace(out, "") + replaceMatches(out, LAN_IPV4, "") } catch (t: Throwable) { "" } } - private const val SHARE_LINE_MAX = 64 * 1024 - - fun scrubForShare(src: java.io.File, out: java.io.Writer) { + fun scrubForShare( + src: java.io.File, + out: java.io.Writer, + shouldStop: () -> Boolean = { false }, + ): Boolean { src.inputStream().buffered().use { input -> input.mark(2) val first = input.read() @@ -228,27 +273,30 @@ object LogRedactor { input.reset() if ((first == 0xff && second == 0xfe) || (first == 0xfe && second == 0xff)) { out.write("\n") - return + return true } val decoder = Charsets.UTF_8.newDecoder() .onMalformedInput(java.nio.charset.CodingErrorAction.REPORT) .onUnmappableCharacter(java.nio.charset.CodingErrorAction.REPORT) java.io.InputStreamReader(input, decoder).use { reader -> val buffer = CharArray(8192) - val line = StringBuilder() - var withheld = false + val line = StringBuilder(4096) + var withheld: String? = null var afterCr = false fun emit() { - out.write(if (withheld) "" else redactForShare(line.toString())) + out.write(withheld ?: redactForShare(line.toString())) out.write("\n") line.setLength(0) - withheld = false + withheld = null } try { while (true) { + if (shouldStop()) return false val size = reader.read(buffer) if (size < 0) break + if (shouldStop()) return false for (i in 0 until size) { + if (shouldStop()) return false val ch = buffer[i] if (afterCr) { afterCr = false @@ -257,23 +305,79 @@ object LogRedactor { if (ch == '\r' || ch == '\n') { emit() afterCr = ch == '\r' - } else if (!withheld) { - // Splitting a line can separate a credential from its label. - if (ch == '\u0000' || line.length == SHARE_LINE_MAX) { - withheld = true + } else if (withheld == null) { + if (ch == '\u0000' || line.length == MAX_LINE_LENGTH) { + withheld = if (ch == '\u0000') "" else OVERSIZED_LINE line.setLength(0) - } else { - line.append(ch) - } + } else line.append(ch) } } } - if (withheld || line.isNotEmpty()) emit() + if (withheld != null || line.isNotEmpty()) emit() } catch (_: java.nio.charset.CharacterCodingException) { out.write("\n") } } } + return true + } + + + private fun scrubLines( + src: java.io.File, + out: java.io.Writer, + scrub: (String) -> String, + shouldStop: () -> Boolean, + ): Boolean { + src.bufferedReader().use { input -> + val chunk = CharArray(8192) + val line = StringBuilder(4096) + var oversized = false + var pendingContent = false + var pendingCarriageReturn = false + + fun emit() { + out.write(if (oversized) OVERSIZED_LINE else scrub(line.toString())) + out.write("\n") + line.setLength(0) + oversized = false + pendingContent = false + } + + while (true) { + if (shouldStop()) return false + val count = input.read(chunk) + if (count < 0) break + if (shouldStop()) return false + for (i in 0 until count) { + val char = chunk[i] + if (pendingCarriageReturn) { + emit() + pendingCarriageReturn = false + if (char == '\n') continue + } + when (char) { + '\r' -> pendingCarriageReturn = true + '\n' -> emit() + else -> { + pendingContent = true + if (!oversized) { + if (line.length < MAX_LINE_LENGTH) line.append(char) + else { + line.setLength(0) + oversized = true + } + } + } + } + } + } + if (pendingCarriageReturn || pendingContent) { + if (shouldStop()) return false + emit() + } + } + return true } private fun quoted(value: String): String { @@ -315,45 +419,51 @@ object LogRedactor { fun redact(line: String): String { if (line.isEmpty()) return line + if (line.length > MAX_LINE_LENGTH) return OVERSIZED_LINE return try { val out = Line(line) - if (out.has("mac")) out.set(MAC_FIELD.replace(out.text) { "${it.groupValues[1]}" }) - if (out.holds(':', 5) || out.holds('-', 5)) out.set(MAC.replace(out.text, "")) - if (out.has("serial", "android")) out.set(DEVICE_IDENTIFIER.replace(out.text) { - val value = it.groupValues[2] + if (out.has("mac")) out.set(replaceMatches(out.text, MAC_FIELD) { "${it.group(1)}" }) + if (out.holds(':', 5) || out.holds('-', 5)) out.set(replaceMatches(out.text, MAC, "")) + if (out.has("serial", "android")) out.set(replaceMatches(out.text, DEVICE_IDENTIFIER) { + val value = it.group(2) val quote = value.first().takeIf { char -> char == '\"' || char == '\'' }?.toString().orEmpty() - "${it.groupValues[1]}${quote}${quote}" + "${it.group(1)}${quote}${quote}" }) - if (out.holds('-', 4)) out.set(GUID.replace(out.text, "")) - if (out.has("jwt")) out.set(JWT_LABELLED.replace(out.text) { "${it.groupValues[1]}" }) - if ("ey" in out.text) out.set(JWT_BASE64.replace(out.text, "")) + if (out.holds('-', 4)) out.set(replaceMatches(out.text, GUID, "")) + if (out.has("jwt")) out.set(replaceMatches(out.text, JWT_LABELLED) { "${it.group(1)}" }) + if ("ey" in out.text) out.set(replaceMatches(out.text, JWT_BASE64, "")) if (out.has("token", "auth", "ticket", "sessionid", "steamloginsecure", "api", "machine", "pass", "pwd", "secret")) { - out.set(SECRET_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${it.groupValues[2]}" }) + out.set(replaceMatches(out.text, SECRET_KV) { + val quote = it.group(2).orEmpty() + "${it.group(1)}${quote}${quote}" + }) + } - if (out.has("guard", "factor", "2fa")) out.set(GUARD_CODE.replace(out.text) { "${it.groupValues[1]}" }) - if (out.hasRun(32, ::isHex)) out.set(WEBAPI_KEY.replace(out.text, "")) - if ("76561" in out.text) out.set(STEAMID64.replace(out.text) { "${it.groupValues[1]}********${it.groupValues[3]}" }) - if ("[U:1:" in out.text) out.set(STEAMID3.replace(out.text) { m -> - val id = m.groupValues[1] + if (out.has("guard", "factor", "2fa")) out.set(replaceMatches(out.text, GUARD_CODE) { "${it.group(1)}" }) + if (out.hasRun(32, ::isHex)) out.set(replaceMatches(out.text, WEBAPI_KEY, "")) + if ("76561" in out.text) out.set(replaceMatches(out.text, STEAMID64) { "${it.group(1)}********${it.group(3)}" }) + if ("[U:1:" in out.text) out.set(replaceMatches(out.text, STEAMID3) { m -> + val id = m.group(1) "[U:1:${if (id.length > 4) "*".repeat(id.length - 4) + id.takeLast(4) else id}]" }) - if (out.has("external")) out.set(EXTERNAL_ADDR.replace(out.text) { "${it.groupValues[1]}" }) - for (r in own) if (r.needs == null || out.has(r.needs)) out.set(r.regex.replace(out.text, "")) - if (out.has("onloginstatechange")) out.set(LOGIN_STATE.replace(out.text) { "${it.groupValues[1]}" }) - if ("OnLoginUsersChanged " in out.text) out.set(LOGIN_USERS.replace(out.text) { "${it.groupValues[1]}" }) + if (out.has("external")) out.set(replaceMatches(out.text, EXTERNAL_ADDR) { "${it.group(1)}" }) + for (r in own) if (r.needs == null || out.has(r.needs)) out.set(replaceMatches(out.text, r.regex, "")) + if (out.has("onloginstatechange")) out.set(replaceMatches(out.text, LOGIN_STATE) { "${it.group(1)}" }) + if ("OnLoginUsersChanged " in out.text) out.set(replaceMatches(out.text, LOGIN_USERS) { "${it.group(1)}" }) if (out.has("account", "user")) { - out.set(ACCOUNT_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${quoted(it.groupValues[3])}" }) + out.set(replaceMatches(out.text, ACCOUNT_KV) { "${it.group(1)}${it.group(2)}${quoted(it.group(3))}" }) } - if (out.has("login")) out.set(LOGIN_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${quoted(it.groupValues[3])}" }) - for (r in accounts) if (r.needs == null || out.has(r.needs)) out.set(r.regex.replace(out.text, "")) - if ('@' in out.text) out.set(EMAIL.replace(out.text) { m -> - m.value.takeIf { isHidlLoaderDiagnostic(out.text, m) } ?: "" + if (out.has("login")) out.set(replaceMatches(out.text, LOGIN_KV) { "${it.group(1)}${it.group(2)}${quoted(it.group(3))}" }) + for (r in accounts) if (r.needs == null || out.has(r.needs)) out.set(replaceMatches(out.text, r.regex, "")) + if ('@' in out.text) out.set(replaceMatches(out.text, EMAIL) { m -> + m.group().takeIf { isHidlLoaderDiagnostic(out.text, m) } ?: "" + }) if (out.has("jwt", "token", "ticket", "sessionid", "steamloginsecure", "machineauth")) { - out.set(RESIDUAL.replace(out.text) { "${it.groupValues[1]}=" }) + out.set(replaceMatches(out.text, RESIDUAL) { "${it.group(1)}=" }) } if (out.hasRun(88) { it in 'a'..'z' || it in 'A'..'Z' || it in '0'..'9' || it == '_' || it == '-' }) { - out.set(LONG_TOKEN.replace(out.text, "")) + out.set(replaceMatches(out.text, LONG_TOKEN, "")) } out.text } catch (t: Throwable) { diff --git a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt index 6ad5f89b6..6e67ff495 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt @@ -60,14 +60,14 @@ object PhantomProcessLimit { if (usesDeviceConfig(sdk)) { val off = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getBoolean(PREF_ANDROID_12_OFF, false) val global = try { - Settings.Global.getString(context.contentResolver, SETTING) + GlobalSettings.read(context, SETTING) } catch (_: Exception) { null } return android12Status(off, global, systemProperty(OVERRIDE_PROPERTY)) } val global = try { - Settings.Global.getString(context.contentResolver, SETTING) + GlobalSettings.read(context, SETTING) } catch (_: Exception) { return PhantomProcessStatus.UNREADABLE } diff --git a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt index 9ba5c2f6f..b9c0256db 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt @@ -52,8 +52,6 @@ object SessionLogCapture { if (t.parentFile?.absolutePath == dir.absolutePath) stop() } - /** flush() only reaches the page cache, and a hard reset on f2fs lost the last minutes of every - * log. Every 2 s the session folder's files (ours and the native parts') are synced to storage. */ private fun startSyncing(dir: File): Thread = Thread({ while (true) { try { Thread.sleep(2000) } catch (e: InterruptedException) { break } diff --git a/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt b/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt new file mode 100644 index 000000000..f9ee889bd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.core + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent + +class ShortcutsListingReceiver : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) SteamIntegration.syncShortcutsListing(context) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt new file mode 100644 index 000000000..b9968ebdb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.core + +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.provider.Settings +import android.view.accessibility.AccessibilityManager +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.input.HomeButtonService +import com.droiddeck.launcher.session.SessionPrefs + +object SteamIntegration { + const val ACTION_SETUP = "com.droiddeck.launcher.STEAM_INTEGRATION" + const val EXTRA_FEATURE = "integration_feature" + enum class Feature { WIFI, BRIGHTNESS, HOME, SHORTCUTS } + + data class State( + val wifi: Boolean = false, + val locationPermission: Boolean = false, + val locationOn: Boolean = false, + val locationBlocked: Boolean = false, + val brightness: Boolean = false, + val home: Boolean = false, + val shortcuts: Boolean = false, + val shortcutsRestricted: Boolean = false, + val shortcutsTried: Boolean = false, + val suggested: Boolean = true, + ) + + fun read(context: Context) = State( + wifi = SessionPrefs.wifiDiscoveryEnabled(context), + locationPermission = WifiDiscovery.permissionGranted(context), + locationOn = WifiDiscovery.locationEnabled(context), + brightness = Settings.System.canWrite(context), + home = HomeApp.isDefault(context), + shortcuts = context.getSystemService(AccessibilityManager::class.java) + .getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK).any { + val service = it.resolveInfo.serviceInfo + ComponentName(service.packageName, service.name) == ComponentName(context, HomeButtonService::class.java) + }, + shortcutsRestricted = restrictedSettings(context), + suggested = !SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false), + ) + + private fun restrictedSettings(context: Context): Boolean { + if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) return false + val mode = runCatching { + context.getSystemService(android.app.AppOpsManager::class.java) + .unsafeCheckOpNoThrow("android:access_restricted_settings", android.os.Process.myUid(), context.packageName) + }.getOrDefault(android.app.AppOpsManager.MODE_ALLOWED) + return mode == android.app.AppOpsManager.MODE_ERRORED || mode == android.app.AppOpsManager.MODE_IGNORED + } + + private fun shortcutsComponent(context: Context) = ComponentName(context, HomeButtonService::class.java) + + fun shortcutsChosen(context: Context): Boolean = shortcutsSelection(context) == true + + private fun shortcutsSelection(context: Context): Boolean? { + val target = shortcutsComponent(context) + val enabled = runCatching { + Settings.Secure.getString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES) + }.getOrElse { return null }.orEmpty() + return enabled.split(':').any { ComponentName.unflattenFromString(it.trim()) == target } + } + + fun setShortcutsListed(context: Context, listed: Boolean) { + val packages = context.packageManager + val component = shortcutsComponent(context) + val state = if (listed) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED + runCatching { + if (packages.getComponentEnabledSetting(component) != state) { + packages.setComponentEnabledSetting(component, state, PackageManager.DONT_KILL_APP) + } + } + } + + fun syncShortcutsListing(context: Context) { + shortcutsSelection(context)?.let { setShortcutsListed(context, it) } + } + + fun dismissSuggestion(context: Context) { + SessionPrefs.sessionPrefs(context).edit().putBoolean("steam_integration_seen", true).apply() + } + + fun brightnessSettings(context: Context) = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, + Uri.parse("package:${context.packageName}")) + + fun shortcutSettings(context: Context): Intent { + val service = ComponentName(context, HomeButtonService::class.java).flattenToString() + return Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS) + .putExtra(":settings:fragment_args_key", service) + .putExtra(":settings:show_fragment_args", android.os.Bundle().apply { putString(":settings:fragment_args_key", service) }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/SystemInsets.kt b/app/src/main/java/com/droiddeck/launcher/core/SystemInsets.kt new file mode 100644 index 000000000..6e17b7fb9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/SystemInsets.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.core + +import android.os.Build +import android.view.View +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +object SystemInsets { + fun fit(view: View) { + if (Build.VERSION.SDK_INT < 35) return + val left = view.paddingLeft + val top = view.paddingTop + val right = view.paddingRight + val bottom = view.paddingBottom + ViewCompat.setOnApplyWindowInsetsListener(view) { target, insets -> + val safe = insets.getInsets(WindowInsetsCompat.Type.systemBars() or + WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime()) + target.setPadding(left + safe.left, top + safe.top, right + safe.right, bottom + safe.bottom) + insets + } + ViewCompat.requestApplyInsets(view) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index e3f432e18..fcb5d0889 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -182,25 +182,47 @@ object WirelessAdbFix { } fun setUsingSavedPairing(context: Context, enabled: Boolean) { + withSavedPairing(context) { appContext, host, port -> 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/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt index c924f8532..33f11b1aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt @@ -60,7 +60,10 @@ class WirelessAdbPairingService : Service() { pairingPort = null working = false publish(Stage.Waiting) - startForeground(NOTIFICATION_ID, notification(Stage.Waiting)) + if (!ForegroundServices.start(this, NOTIFICATION_ID, notification(Stage.Waiting))) { + finish(Stage.Failed(getString(R.string.adbpair_title_failed))) + return + } startDiscovery() main.removeCallbacks(timeout) main.postDelayed(timeout, TIMEOUT_MS) @@ -184,12 +187,15 @@ class WirelessAdbPairingService : Service() { setSound(null, null) enableVibration(false) }) + manager?.createNotificationChannel(NotificationChannel(PROGRESS_CHANNEL_ID, getString(R.string.adbpair_progress_channel_name), + NotificationManager.IMPORTANCE_LOW).apply { setShowBadge(false) }) val open = PendingIntent.getActivity(this, 0, Intent(this, FrontEndActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), PendingIntent.FLAG_IMMUTABLE) val cancel = PendingIntent.getService(this, 1, Intent(this, WirelessAdbPairingService::class.java).setAction(ACTION_CANCEL), PendingIntent.FLAG_IMMUTABLE) - val builder = Notification.Builder(this, CHANNEL_ID) + val quiet = stage == Stage.Waiting || stage == Stage.Idle || stage is Stage.Working + val builder = Notification.Builder(this, if (quiet) PROGRESS_CHANNEL_ID else CHANNEL_ID) .setSmallIcon(R.drawable.ic_stat_session) .setContentIntent(open) .setShowWhen(false) @@ -239,6 +245,7 @@ class WirelessAdbPairingService : Service() { companion object { private const val CHANNEL_ID = "wireless-adb-pairing" + private const val PROGRESS_CHANNEL_ID = "wireless-adb-pairing-progress" private const val NOTIFICATION_ID = 3 private const val PAIRING_TYPE = "_adb-tls-pairing._tcp" private const val ACTION_CODE = "com.droiddeck.launcher.action.WIRELESS_ADB_CODE" @@ -252,6 +259,10 @@ class WirelessAdbPairingService : Service() { private fun publish(stage: Stage) { current.value = stage } fun start(context: Context) { + if (!AppPermissions.localNetwork(context)) { + publish(Stage.Failed(context.getString(R.string.setup_local_network))) + return + } context.getSystemService(NotificationManager::class.java)?.cancel(NOTIFICATION_ID) publish(Stage.Waiting) val intent = Intent(context, WirelessAdbPairingService::class.java) diff --git a/app/src/main/java/com/droiddeck/launcher/core/AllFilesAccess.kt b/app/src/main/java/com/droiddeck/launcher/files/AllFilesAccess.kt similarity index 56% rename from app/src/main/java/com/droiddeck/launcher/core/AllFilesAccess.kt rename to app/src/main/java/com/droiddeck/launcher/files/AllFilesAccess.kt index c4fd08d0a..d0d24564e 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AllFilesAccess.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/AllFilesAccess.kt @@ -1,4 +1,4 @@ -package com.droiddeck.launcher.core +package com.droiddeck.launcher.files import android.app.Activity import android.app.AlertDialog @@ -25,22 +25,28 @@ object AllFilesAccess { } fun ask(activity: Activity): Boolean { - if (granted() || activity.isFinishing) return false + if (granted() || activity.isFinishing || activity.isDestroyed) return false AlertDialog.Builder(activity) - .setTitle(R.string.all_files_title) - .setMessage(R.string.all_files_message) - .setPositiveButton(R.string.all_files_allow) { _, _ -> openSettings(activity) } - .setNegativeButton(R.string.all_files_later, null) + .setTitle(R.string.setup_all_files) + .setMessage(R.string.fm_drive_access_text) + .setPositiveButton(R.string.upd_open_settings) { _, _ -> openSettings(activity) } + .setNegativeButton(R.string.common_cancel, null) .show() return true } - fun openSettings(activity: Activity) { - val forApp = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, Uri.parse("package:" + activity.packageName)) + fun missing(sdk: Int = Build.VERSION.SDK_INT, granted: () -> Boolean = { AllFilesAccess.granted() }): Boolean = + sdk >= Build.VERSION_CODES.R && !granted() + + fun openSettings(activity: Activity) = open(activity) + + fun open(context: Context) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return + val forApp = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, Uri.parse("package:" + context.packageName)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) try { - activity.startActivity(forApp) + context.startActivity(forApp) } catch (e: ActivityNotFoundException) { - runCatching { activity.startActivity(Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)) } + runCatching { context.startActivity(Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } } } } 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 bcba0189b..8484da0eb 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) } @@ -309,86 +311,3 @@ fun CollapsibleRail( } } -@Composable -fun RailTopTabs( - items: List, - modifier: Modifier = Modifier, - links: List = emptyList(), -) { - Column(modifier = modifier.fillMaxWidth()) { - Row( - modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp, vertical = 2.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - items.forEach { item -> - TopTabCell( - icon = item.icon, - label = item.label, - selected = item.selected, - onClick = item.onClick, - modifier = Modifier.weight(1f), - ) - } - if (links.isNotEmpty()) { - Box( - modifier = Modifier - .padding(horizontal = 2.dp) - .width(1.dp) - .height(30.dp) - .background(MaterialTheme.colorScheme.outline.copy(alpha = 0.4f)), - ) - links.forEach { link -> - TopTabCell(link.icon, link.label, selected = false, onClick = link.onClick, isTab = false, modifier = Modifier.weight(1f)) - } - } - } - HorizontalDivider() - } -} - -@Composable -private fun TopTabCell( - icon: ImageVector, - label: String, - selected: Boolean, - onClick: () -> Unit, - modifier: Modifier = Modifier, - isTab: Boolean = true, -) { - val tint = if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant - Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = modifier - .clip(RoundedCornerShape(9.dp)) - .background(if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) - .then( - if (isTab) { - Modifier.selectable(selected = selected, role = androidx.compose.ui.semantics.Role.Tab, onClick = onClick) - } else { - Modifier.clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onClick) - }, - ) - .padding(vertical = 6.dp, horizontal = 1.dp), - ) { - Icon(icon, contentDescription = label, tint = tint, modifier = Modifier.size(20.dp)) - Spacer(Modifier.height(3.dp)) - Text( - label, - color = tint, - fontSize = 8.5.sp, - fontWeight = FontWeight.Bold, - letterSpacing = 0.2.sp, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - textAlign = TextAlign.Center, - ) - Spacer(Modifier.height(2.dp)) - Box( - modifier = Modifier - .height(2.dp) - .width(if (selected) 16.dp else 0.dp) - .clip(RoundedCornerShape(3.dp)) - .background(if (selected) MaterialTheme.colorScheme.primary else Color.Transparent), - ) - } -} 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 d7e0af848..904ea2bba 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -22,17 +22,18 @@ 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 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - com.droiddeck.launcher.core.AllFilesAccess.ask(this) - } else if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) + com.droiddeck.launcher.files.AllFilesAccess.ask(this) + } else if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || + checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE), 1) } val initialDir = intent.getStringExtra(EXTRA_START_DIR)?.let(::File) setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Surface(modifier = Modifier.fillMaxSize().systemBarsPadding(), color = MaterialTheme.colorScheme.background) { - FileManagerScreen(initialDir = initialDir) + FileManagerScreen(initialDir = initialDir, onExit = { finish() }) } } } 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 e6289a3b9..3fb876ac2 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 0843057f7..52fc3bfe6 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 @@ -28,6 +33,8 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ExitToApp +import androidx.compose.material.icons.automirrored.filled.KeyboardReturn import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ContentPaste import androidx.compose.material.icons.filled.CreateNewFolder @@ -48,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 @@ -68,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 @@ -90,12 +98,20 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File import java.util.Date +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 + @OptIn(ExperimentalMaterial3Api::class) @Composable fun FileManagerScreen( @@ -105,6 +121,7 @@ fun FileManagerScreen( initialDir: File? = null, pickerTitle: String? = null, onPick: ((File) -> Unit)? = null, + onExit: (() -> Unit)? = null, ) { val context = LocalContext.current val scope = rememberCoroutineScope() @@ -118,12 +135,14 @@ fun FileManagerScreen( val pickPrefs = remember { context.getSharedPreferences("file_manager", android.content.Context.MODE_PRIVATE) } val browsePrefs = pickPrefs - val rootDir = remember { + val rootDir = remember(initialDir) { initialDir?.takeIf { it.isDirectory } ?: File("/storage/emulated/0") } - + val launchDir = remember(initialDir, pickMode) { + initialDir?.takeIf { !pickMode } + } var currentDir by remember { mutableStateOf(rootDir) } - var currentRoot by remember { + val initialRoot = remember(rootDir) { val abs = rootDir.absolutePath val internal = "/storage/emulated/0" val vol = when { @@ -139,8 +158,9 @@ fun FileManagerScreen( ?: rootDir } } - mutableStateOf(vol) + vol } + var currentRoot by remember { mutableStateOf(initialRoot) } var entries by remember { mutableStateOf(listOf()) } var selectedEntry by remember { mutableStateOf(null) } var showMenuFor by remember { mutableStateOf(null) } @@ -151,8 +171,10 @@ fun FileManagerScreen( var pendingConflict by remember { mutableStateOf(null) } var conflictChoice by remember { mutableStateOf(null) } var conflictApplyToAll by remember { mutableStateOf(false) } - var operationJob by remember { mutableStateOf(null) } - var cancelledJob by remember { mutableStateOf(null) } + var operationJob by remember { mutableStateOf(null) } + var cancelledJob by remember { mutableStateOf(null) } + var pendingNavigation by remember { mutableStateOf(null) } + var cancellingNavigation by remember { mutableStateOf(false) } var pendingBulkDelete by remember { mutableStateOf>(emptyList()) } var searchQuery by remember { mutableStateOf("") } val visibleEntries = if (searchQuery.isBlank()) entries @@ -178,10 +200,18 @@ fun FileManagerScreen( var showFavorites by remember { mutableStateOf(false) } var favTick by remember { mutableIntStateOf(0) } - var listingJob by remember { mutableStateOf(null) } + 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 { @@ -205,25 +235,102 @@ fun FileManagerScreen( } fun openDrive(dir: File) { + if (cancellingNavigation) return currentRoot = dir loadDirectory(dir) } + fun returnToStart() { + if (cancellingNavigation) return + val dir = launchDir ?: return + if (!dir.isDirectory) { + Toast.makeText(context, R.string.fm_start_unavailable, Toast.LENGTH_SHORT).show() + return + } + showFavorites = false + showSearch = false + searchQuery = "" + currentRoot = initialRoot + loadDirectory(dir) + } + LaunchedEffect(Unit) { loadDirectory(rootDir) } - BackHandler(enabled = showFavorites || currentDir != currentRoot) { - if (showFavorites) { - showFavorites = false - return@BackHandler + val canGoUp = currentDir != currentRoot && currentDir.parentFile?.exists() == true + fun isOperationActive() = isOperationRunning || operationJob?.isCompleted == false || cancelledJob?.isCompleted == false + val operationActive = isOperationActive() + + fun navigate(action: FileManagerNavigation) { + if (cancellingNavigation) return + when (action) { + 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() + } } - val parent = currentDir.parentFile - if (parent != null && parent.exists()) loadDirectory(parent) } - val canGoUp = currentDir != currentRoot && currentDir.parentFile?.exists() == true - fun goUp() { - val parent = currentDir.parentFile - if (currentDir != currentRoot && parent != null && parent.exists()) loadDirectory(parent) + fun requestNavigation(action: FileManagerNavigation) { + if (cancellingNavigation) return + if (isOperationActive()) pendingNavigation = action else navigate(action) + } + + BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot || history.isNotEmpty()) { + requestNavigation(FileManagerNavigation.BACK) + } + + if (pendingNavigation != null) { + OutlinedAlertDialog( + onDismissRequest = { pendingNavigation = null }, + title = { Text(stringResource(R.string.fm_cancel_operation_title)) }, + text = { Text(stringResource(R.string.fm_cancel_operation_confirmation)) }, + confirmButton = { + TextButton(onClick = { + val action = pendingNavigation ?: return@TextButton + pendingNavigation = null + val job = operationJob?.takeUnless(Job::isCompleted) + ?: cancelledJob?.takeUnless(Job::isCompleted) + if (job == null) { + navigate(action) + } else { + cancellingNavigation = true + cancelledJob = job + job.cancel() + scope.launch { + job.join() + if (operationJob === job) operationJob = null + if (cancelledJob === job) cancelledJob = null + pendingConflict = null + isOperationRunning = false + operationDeterminate = false + cancellingNavigation = false + if (action != FileManagerNavigation.EXIT) loadDirectory(currentDir, resetScroll = false) + navigate(action) + } + } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_accept)) } + }, + dismissButton = { + TextButton(onClick = { pendingNavigation = null }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.fm_decline)) + } + }, + ) } fun uniqueDestination(dir: File, name: String): File { @@ -241,11 +348,14 @@ fun FileManagerScreen( } fun performDelete(file: File) { - scope.launch { + if (isOperationActive()) return + operationJob = scope.launch { isOperationRunning = true operationLabel = context.getString(R.string.fm_op_deleting) - val ok = withContext(Dispatchers.IO) { FileOps.delete(file) } + val job = coroutineContext[Job] + val ok = withContext(Dispatchers.IO) { FileOps.delete(file) { job?.isActive == false } } isOperationRunning = false + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_delete_failed, Toast.LENGTH_SHORT).show() } @@ -260,7 +370,7 @@ fun FileManagerScreen( fun performPaste() { val sources = clipboardFiles - if (sources.isEmpty() || isOperationRunning || operationJob?.isActive == true || cancelledJob?.isCompleted == false) return + if (sources.isEmpty() || isOperationActive()) return val dstDir = currentDir val cut = isCutOperation @@ -269,7 +379,7 @@ fun FileManagerScreen( operationDeterminate = true operationLabel = context.getString(if (cut) R.string.fm_op_moving else R.string.fm_op_copying) isOperationRunning = true - val job = coroutineContext[kotlinx.coroutines.Job] + val job = coroutineContext[Job] var applyToAll: ConflictChoice? = null var failed = 0 @@ -322,7 +432,7 @@ fun FileManagerScreen( isOperationRunning = false operationDeterminate = false - operationJob = null + if (operationJob === job) operationJob = null clipboardFiles = emptyList() isCutOperation = false selectionMode = false @@ -340,32 +450,38 @@ fun FileManagerScreen( } fun performRename(file: File, newName: String) { + if (isOperationActive()) return val target = File(file.parentFile, newName) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, newName), Toast.LENGTH_SHORT).show() return } - scope.launch { + operationJob = scope.launch { + val job = coroutineContext[Job] isOperationRunning = true operationLabel = context.getString(R.string.fm_op_renaming) val ok = withContext(Dispatchers.IO) { file.renameTo(target) } isOperationRunning = false + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_rename_failed, Toast.LENGTH_SHORT).show() } } fun createFolder(parent: File, name: String) { + if (isOperationActive()) return val target = File(parent, name) if (target.exists()) { Toast.makeText(context, context.getString(R.string.fm_already_exists, name), Toast.LENGTH_SHORT).show() return } - scope.launch { + operationJob = scope.launch { + val job = coroutineContext[Job] isOperationRunning = true operationLabel = context.getString(R.string.fm_op_creating_folder) val ok = withContext(Dispatchers.IO) { target.mkdirs() } isOperationRunning = false + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (!ok) Toast.makeText(context, R.string.fm_create_folder_failed, Toast.LENGTH_SHORT).show() } @@ -382,6 +498,25 @@ fun FileManagerScreen( onDispose { lifecycleOwner.lifecycle.removeObserver(observer) } } val drives = remember(storageTick) { StorageRoots.list(context) } + var accessDrive by remember { mutableStateOf(null) } + fun unreadable(drive: StorageRoot) { + if (AllFilesAccess.missing()) accessDrive = drive.label + else Toast.makeText(context, context.getString(R.string.fm_drive_not_readable, drive.label), Toast.LENGTH_SHORT).show() + } + accessDrive?.let { label -> + OutlinedAlertDialog( + onDismissRequest = { accessDrive = null }, + title = { Text(stringResource(R.string.fm_drive_access_title, label)) }, + text = { Text(stringResource(R.string.fm_drive_access_text)) }, + confirmButton = { + TextButton(onClick = { + accessDrive = null + AllFilesAccess.open(context) + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_open_settings)) } + }, + dismissButton = { TextButton(onClick = { accessDrive = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) + } val linuxRoot = remember(storageTick) { com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context).takeIf { File(it, "usr").isDirectory } } @@ -398,15 +533,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)) } }, ) } @@ -421,6 +557,7 @@ fun FileManagerScreen( onValueChange = { newName = it }, label = { Text(stringResource(R.string.fm_new_name)) }, singleLine = true, + modifier = Modifier.focusGlide(), ) }, confirmButton = { @@ -428,9 +565,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)) } }, ) } @@ -452,9 +589,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)) } }, ) } @@ -481,26 +618,28 @@ fun FileManagerScreen( }, confirmButton = { TextButton(onClick = { + if (isOperationActive()) return@TextButton pendingBulkDelete = emptyList() selectionMode = false selectedPaths = emptySet() operationJob = scope.launch { isOperationRunning = true + val job = coroutineContext[Job] var failed = 0 victims.forEachIndexed { i, f -> operationLabel = context.getString(R.string.fm_op_deleting_batch, i + 1, victims.size, f.name) - if (!withContext(Dispatchers.IO) { FileOps.delete(f) }) failed++ + if (!withContext(Dispatchers.IO) { FileOps.delete(f) { job?.isActive == false } }) failed++ } isOperationRunning = false - operationJob = null + if (operationJob === job) operationJob = null loadDirectory(currentDir, resetScroll = false) if (failed > 0) { 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)) } }, ) } @@ -523,6 +662,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) } @@ -535,7 +675,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()) } } @@ -543,13 +683,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( @@ -568,7 +709,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)) @@ -580,9 +721,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 = { goUp() }, enabled = canGoUp) { + 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) } @@ -624,13 +766,10 @@ fun FileManagerScreen( if (drive.readable) { openDrive(drive.dir) } else { - Toast.makeText( - context, - context.getString(R.string.fm_drive_not_readable, drive.label), - Toast.LENGTH_SHORT, - ).show() + unreadable(drive) } }, + modifier = Modifier.focusGlide(), ) } linuxRoot?.let { root -> @@ -641,6 +780,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(), ) } } @@ -656,10 +796,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 }, @@ -668,17 +808,24 @@ 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, 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)) + } + if (!showFavorites) { if (!pickMode) { OutlinedButton( 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)) @@ -688,18 +835,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 }) { @@ -716,6 +863,7 @@ fun FileManagerScreen( showSortMenu = false loadDirectory(currentDir, resetScroll = false) }, + modifier = Modifier.focusGlide(), ) } HorizontalDivider(color = MaterialTheme.colorScheme.outline) @@ -726,6 +874,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)) }, @@ -735,18 +884,24 @@ 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 { Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } + if (!pickMode && onExit != null) { + 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) + } + } } if (showSearch && !showFavorites) { @@ -755,7 +910,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(), ) } @@ -793,13 +948,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 } @@ -810,6 +966,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( @@ -821,6 +978,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( @@ -832,6 +990,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( @@ -839,11 +998,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) } } } @@ -865,7 +1026,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) } } @@ -896,7 +1057,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)) @@ -926,7 +1087,7 @@ fun FileManagerScreen( add(locItem(stringResource(R.string.fm_drive_internal), Icons.Filled.Smartphone, File("/storage/emulated/0"))) drives.filter { it.removable }.forEach { d -> add(RailItem(d.label, Icons.Filled.SdStorage, !showFavorites && currentRoot.absolutePath == d.dir.absolutePath) { - showFavorites = false; if (d.readable) openDrive(d.dir) + showFavorites = false; if (d.readable) openDrive(d.dir) else unreadable(d) }) } linuxRoot?.let { add(locItem(stringResource(R.string.fm_drive_linux), Icons.Filled.Terminal, it)) } @@ -986,7 +1147,7 @@ fun FileManagerScreen( contentPadding = PaddingValues(8.dp), ) { if (canGoUp) item(key = "..", span = { GridItemSpan(maxLineSpan) }) { - ParentFolderRow(compact = compactRows, onTap = { goUp() }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } items(shownEntries, key = { it.absolutePath }) { file -> val isFav = remember(file.absolutePath, favTick) { @@ -1049,10 +1210,10 @@ fun FileManagerScreen( ) } } - } else + } else { LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) { if (canGoUp) item(key = "..") { - ParentFolderRow(compact = compactRows, onTap = { goUp() }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } if (entries.isEmpty()) { item { @@ -1129,6 +1290,7 @@ fun FileManagerScreen( } } } + } if (pullState.verticalOffset > 0.5f || pullState.isRefreshing) { PullToRefreshContainer( state = pullState, diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index 29df5ff6d..6f5988fc1 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -9,6 +9,7 @@ import java.io.FileOutputStream import java.io.IOException import java.nio.file.Files import java.util.Locale +import java.util.concurrent.CancellationException object FileOps { private const val TAG = "FileOps" @@ -24,24 +25,27 @@ object FileOps { fun isSymlink(file: File): Boolean = try { Files.isSymbolicLink(file.toPath()) } catch (e: Exception) { false } - fun delete(target: File?): Boolean { + fun delete(target: File?, isCancelled: () -> Boolean = { false }): Boolean { + if (isCancelled()) throw CancellationException("Delete cancelled: $target") if (target == null) return false if (target.isDirectory && !isSymlink(target)) { - if (!clear(target)) return false + if (!clear(target, isCancelled)) return false } + if (isCancelled()) throw CancellationException("Delete cancelled: $target") return target.delete() } - fun clear(dir: File): Boolean { + fun clear(dir: File, isCancelled: () -> Boolean = { false }): Boolean { val children = dir.listFiles() ?: return true var ok = true - for (child in children) if (!delete(child)) ok = false + for (child in children) if (!delete(child, isCancelled)) ok = false return ok } - fun totalSize(f: File?): Long { + fun totalSize(f: File?, isCancelled: () -> Boolean = { false }): Long { + if (isCancelled()) throw CancellationException("Size scan cancelled: $f") if (f == null || !f.exists() || isSymlink(f)) return 0 - if (f.isDirectory) return f.listFiles()?.sumOf { totalSize(it) } ?: 0 + if (f.isDirectory) return f.listFiles()?.sumOf { totalSize(it, isCancelled) } ?: 0 return f.length() } @@ -53,12 +57,11 @@ object FileOps { return true } if (!copyWithProgress(src, dst, progress, isCancelled)) return false - if (isCancelled()) return false return delete(src) } fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { - val total = maxOf(totalSize(src), 1L) + val total = maxOf(totalSize(src, isCancelled), 1L) return copyWithProgress(src, dst, longArrayOf(0), total, progress, isCancelled) } @@ -71,15 +74,23 @@ object FileOps { return false } if (src.isDirectory) { - if (!dst.exists() && !dst.mkdirs()) return false - var allOk = true - src.list()?.forEach { name -> - if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { - Log.e(TAG, "Failed to copy: ${File(src, name)}") - allOk = false + val created = if (dst.exists()) false else { + if (!dst.mkdirs()) return false + true + } + try { + var allOk = true + src.list()?.forEach { name -> + if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { + Log.e(TAG, "Failed to copy: ${File(src, name)}") + allOk = false + } } + return allOk + } catch (e: CancellationException) { + if (created) delete(dst) + throw e } - return allOk } val parent = dst.parentFile if (!src.exists() || (parent != null && !parent.exists() && !parent.mkdirs())) return false @@ -118,6 +129,7 @@ object FileOps { val size = input.size() var position = 0L while (position < size) { + if (isCancelled()) throw CancellationException("Copy cancelled: $src") val transferred = input.transferTo(position, minOf(chunk, size - position), channel) if (transferred <= 0) break position += transferred @@ -125,12 +137,19 @@ object FileOps { progress?.onProgress(done[0], total) } if (position < size) throw IOException("Incomplete copy: $position/$size bytes") + if (size > 0 && isCancelled()) throw CancellationException("Copy cancelled: $src") } } staging?.let { directory -> val copied = File(directory, "file").toPath() - if (permissions != null && Files.getPosixFilePermissions(copied) != permissions) { - Files.setPosixFilePermissions(copied, permissions) + if (permissions != null) { + try { + if (Files.getPosixFilePermissions(copied) != permissions) { + Files.setPosixFilePermissions(copied, permissions) + } + } catch (e: Exception) { + Log.w(TAG, "Failed to restore destination permissions: $target", e) + } } if (isCancelled()) throw java.util.concurrent.CancellationException("Copy cancelled: $src") Files.move(copied, target.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) 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 b6c1e1304..6a326bdda 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -26,11 +26,12 @@ 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 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - com.droiddeck.launcher.core.AllFilesAccess.ask(this) - } else if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) + com.droiddeck.launcher.files.AllFilesAccess.ask(this) + } else if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || + checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE), 1) } val extensions = intent.getStringArrayExtra(EXTRA_EXTENSIONS)?.toList() ?: emptyList() @@ -53,6 +54,7 @@ class FilePickerActivity : ComponentActivity() { setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_SELECTED_FILE, file.absolutePath)) finish() }, + onExit = { finish() }, ) } } 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 f4f8d80fb..07fbb1560 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 3919e89b0..2eda726c3 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 99e940157..22a490769 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,49 @@ 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 + } + 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 +87,27 @@ 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 = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) volume.directory?.name?.takeIf { it.isNotBlank() } else null + 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") + 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 +117,11 @@ object StorageRoots { File("/mnt/media_rw").listFiles().orEmpty().forEach { child -> if (child.isDirectory) volumeOf(child.name).candidates += child } + 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 +195,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 8315c22e9..bad61e602 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") } @@ -279,14 +287,17 @@ object AddedGameArt { var sgdbDown = false var changed = false for (game in games) { + if (forgetOtherAppsArt(context, game)) changed = true + val cache = cacheDir(context, game) val start = missing(context, game) + val again = refetch(cache) intersect start + if (again.isEmpty()) File(cache, REFETCH).delete() val full = Slot.COVER in start - val allowed = if (full) Slot.values().toSet() else EXTRAS + val allowed = if (full) Slot.values().toSet() else EXTRAS + again var need = start intersect allowed if (need.isEmpty() || (need == setOf(Slot.ICON) && sgdbKey.isEmpty())) continue - val cache = cacheDir(context, game) val tried = File(cache, EXTRAS_TRIED) - if (!full && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue + if (!full && again.isEmpty() && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue cache.mkdirs() if (Slot.LOGO in need && game.source != Library.ADDED && runCatching { sources.storeLogo(game) }.getOrDefault(false)) { changed = true @@ -316,12 +327,47 @@ object AddedGameArt { asked = false } } - if ((missing(context, game) intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") + val left = missing(context, game) + if (again.isNotEmpty()) keepRefetch(cache, again intersect left) + if ((left intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") } return changed } + internal const val REFETCH = "refetch" + + private fun refetch(cache: File): Set = + runCatching { File(cache, REFETCH).readText() }.getOrDefault("").split(',').mapNotNull { key -> Slot.values().firstOrNull { it.key == key } }.toSet() + + private fun keepRefetch(cache: File, slots: Set) { + if (slots.isEmpty()) File(cache, REFETCH).delete() else File(cache, REFETCH).writeText(slots.joinToString(",") { it.key }) + } + + internal fun forgetOtherAppsArt(context: Context, game: AddedGames.Game): Boolean { + val cache = cacheDir(context, game) + val recorded = SteamMatch.get(context, game.folder.path)?.takeIf { it.appId != null } + val legacy = runCatching { File(cache, "steam-appid").readText().trim().toInt() }.getOrNull()?.takeIf { it > 0 } + val before = recorded?.appId ?: legacy ?: return false + val identity = runCatching { GameIdentifier.identify(game.exe) }.getOrNull() + val now = identity?.appId + val fromFiles = recorded?.certainty == SteamMatch.Certainty.FILES || before == GameIdentifier.SPACEWAR + if (now == before || (now == null && !fromFiles)) return false + SteamMatch.put(context, game.folder.path, + if (identity != null && now != null) SteamMatch.Match(now, SteamMatch.Certainty.FILES, identity.source.name.lowercase(), System.currentTimeMillis()) + else SteamMatch.Match(null, SteamMatch.Certainty.NONE, "", 0)) + val dropped = Slot.values().filter { File(cache, SteamGridDb.cacheName(it)).delete() }.toSet() + Slot.values().forEach { File(cache, SteamGridDb.cacheName(it) + ".src").delete() } + listOf("sgdb-id", "steam-appid", EXTRAS_TRIED).forEach { File(cache, it).delete() } + keepRefetch(cache, refetch(cache) + dropped) + Log.i(TAG, "${game.name}: its files no longer name Steam app $before; its art is fetched again") + return dropped.isNotEmpty() + } + internal fun steamMatch(context: Context, game: AddedGames.Game, search: (String) -> Int?): SteamMatch.Match { + if (game.source == Store.BATTLENET.id) { + val id = game.storeId?.let(BattleNet::title)?.steam + 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 +407,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 5cf0c326f..b94552ce6 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -6,6 +6,7 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import org.json.JSONObject import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreInstallRoot @@ -69,6 +70,10 @@ object AddedGames { if (path.startsWith("$roms/")) return "/root/ROMs/" + path.removePrefix("$roms/") } StoreInstallRoot.externalGuestPath(context, host)?.let { return it } + for (lib in SteamLibraries.list(context)) { + if (path == lib.path) return lib.guest + if (path.startsWith("${lib.path}/")) return lib.guest + "/" + path.removePrefix("${lib.path}/") + } GameStorage.effective(context)?.let { lib -> if (path.startsWith("${lib.path}/")) return "$LIBRARY/" + path.removePrefix("${lib.path}/") } @@ -79,6 +84,19 @@ 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 }) + + SteamLibraries.list(context).map { it.host to it.guest } + + (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 { @@ -149,7 +167,25 @@ object AddedGames { "appxmanifest.xml" to Regex("]*?\\bExecutable\\s*=\\s*\"([^\"]+)\"", RegexOption.IGNORE_CASE), ) - /** The card's Steam libraries: the arm64 client's steamapps and the x86-64 client's own folder beside it. */ + private val GAME_PARTS = setOf( + "bin", "bin32", "bin64", "binaries", "x64", "x86", "win64", "win32", "windows", + "launcher", "game", "engine", "system", "data", "app", + ) + + internal fun groupGames(folder: File): List? { + val files = folder.listFiles() ?: return null + if (files.any { it.isFile && it.name.endsWith(".exe", ignoreCase = true) && !skipExe(it.name) }) return null + if (declaredExes(folder).isNotEmpty()) return null + val dirs = files.filter { it.isDirectory && !it.name.startsWith(".") && !isSteamLibraryFolder(it.name) }.sortedBy { it.name.lowercase() } + if (dirs.any { it.name.lowercase() in GAME_PARTS || GameExePicker.auxiliaryDir(it) }) return null + return dirs.filter { rank(it).exes.isNotEmpty() }.takeIf { it.size >= 2 } + } + + private fun expand(folder: File, entries: Set): List = + if (folder.path in entries) listOf(folder) else groupGames(folder) ?: listOf(folder) + + private fun entryFolders(context: Context): Set = AddedExes.list(context).map { it.folder }.toSet() + internal fun isSteamLibraryFolder(name: String): Boolean = name.equals("steamapps", ignoreCase = true) || name == com.droiddeck.launcher.session.GameStorage.X64_CARD_DIR @@ -161,6 +197,7 @@ object AddedGames { GameStorage.effective(context)?.let { File(it.path, "steamapps/common") }, ) val removed = SessionPrefs.removedAddedGames(context).toSet() + val entries = entryFolders(context) for (dir in folders.distinctBy { it.absolutePath }) { if (!dir.isDirectory) { Log.w(TAG, "$dir is not a folder; skipped"); continue } val steamInstalls = steamInstallDirs(dir) @@ -168,7 +205,7 @@ object AddedGames { if (folder.name.lowercase() in steamInstalls || isSteamLibraryFolder(folder.name)) continue if (folder.path in removed) continue if (folder.name == "Games" && StoreInstallRoot.roots(context).any { it.absolutePath == folder.absolutePath }) continue - scanGame(context, folder, out) + for (game in expand(folder, entries)) if (game.path !in removed) scanGame(context, game, out) } } for (entry in AddedExes.list(context)) { @@ -177,6 +214,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 } } @@ -217,8 +257,9 @@ object AddedGames { val entries = AddedExes.list(context) fun owns(f: File) = holds(f) && sameGame(f, currentExe(context, entries, f), exe) entries.map { File(it.folder) }.filter(::owns).maxByOrNull { canonical(it).length }?.let { return it } - SessionPrefs.removedAddedGames(context).map { File(it) }.filter(::owns).maxByOrNull { canonical(it).length }?.let { return it } + SessionPrefs.removedAddedGames(context).map { File(it) }.filter { owns(it) && groupGames(it) == null }.maxByOrNull { canonical(it).length }?.let { return it } StoreInstallRoot.gameFolders(context).firstOrNull(::holds)?.let { return it } + val removed = SessionPrefs.removedAddedGames(context) val dirs = listOfNotNull( GameStorage.effective(context)?.let { File(it.path, "steamapps/common") }, GameStorage.effective(context)?.let { File(it.path) }, @@ -227,7 +268,10 @@ object AddedGames { val base = canonical(dir) if (!inside(path, base)) continue val first = path.removePrefix("$base/").substringBefore('/') - File(dir, first).takeIf { it.isDirectory && !isSteamLibraryFolder(first) }?.let { return it } + val top = File(dir, first).takeIf { it.isDirectory && !isSteamLibraryFolder(first) && it.path !in removed } ?: continue + val group = groupGames(top) ?: return top + if (top.path in entries.map { it.folder }) return null + return group.firstOrNull(::holds) } return null } @@ -274,16 +318,16 @@ object AddedGames { class FolderResult(val added: List, val already: Int) - fun addFolder(context: Context, dir: File, onGame: (Game) -> Unit = {}, onChecking: (String?) -> Unit = {}): FolderResult { + fun addFolder(context: Context, dir: File, onGame: (Game) -> Unit = {}, onChecking: (String?) -> Unit = {}, showHidden: Boolean = false): FolderResult { val app = context.applicationContext - // Binds are mounted at session start, so a new one reaches the session from the next start. if (guestPath(app, dir) == null) bindFolder(app, dir) val removed = SessionPrefs.removedAddedGames(app).toSet() val listed = listedFolders(app, removed) + val entries = entryFolders(app) var already = 0 val fresh = ArrayList() val added = ArrayList() - for (sub in dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") }?.sortedBy { it.name.lowercase() }.orEmpty()) { + for (sub in dir.listFiles { f -> f.isDirectory && (showHidden || !f.name.startsWith(".")) }?.sortedBy { it.name.lowercase() }.orEmpty().flatMap { expand(it, entries) }) { val path = canonical(sub) if (listed.any { it == path || inside(path, it) || inside(it, path) }) { already++; continue } onChecking(sub.name) @@ -317,6 +361,7 @@ object AddedGames { private fun listedFolders(context: Context, removed: Set): List { val out = ArrayList() + val entries = entryFolders(context) GamesFolderMigration.run(context) val dirs = listOfNotNull( GameStorage.effective(context)?.let { File(it.path) }, @@ -326,7 +371,7 @@ object AddedGames { for (folder in dir.listFiles { f -> f.isDirectory }.orEmpty()) { if (folder.path in removed || isSteamLibraryFolder(folder.name)) continue if (folder.name == "Games" && StoreInstallRoot.roots(context).any { it.absolutePath == folder.absolutePath }) continue - out.add(canonical(folder)) + expand(folder, entries).filter { it.path !in removed }.forEach { out.add(canonical(it)) } } } AddedExes.list(context).filter { it.folder !in removed }.forEach { out.add(canonical(File(it.folder))) } @@ -387,11 +432,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/AddedGamesPublisher.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesPublisher.kt index 52eff3879..f9dc939b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesPublisher.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesPublisher.kt @@ -26,27 +26,29 @@ object AddedGamesPublisher { if (now) work.run() else worker.execute(work) } - fun refreshDuringSession(context: Context) { + fun refreshDuringSession(context: Context, active: () -> Boolean) { val app = context.applicationContext worker.execute { try { + if (!active()) return@execute val before = AddedGames.listingFile(app).takeIf { it.isFile }?.readText().orEmpty() val known = runCatching { val listing = JSONArray(before) List(listing.length()) { listing.getJSONObject(it).optString("exe") }.toSet() }.getOrDefault(emptySet()) val games = AddedGames.scan(app) + if (!active()) return@execute AddedGames.writeListing(app, games) val arch = com.droiddeck.launcher.session.SessionPrefs.activeSteamClientArch(app) LibraryCache.save(app, Library.launchableGames(app, added = games, arch = arch), arch == "x86_64") val fresh = games.filter { it.guestExe !in known } if (fresh.isEmpty()) return@execute Log.i(TAG, "session refresh: ${fresh.size} game(s) not in the listing the session started with") - val attempts = java.util.concurrent.atomic.AtomicInteger() - val retry = retries.scheduleWithFixedDelay({ + retries.scheduleWithFixedDelay({ try { + if (!active()) throw java.util.concurrent.CancellationException() if (com.droiddeck.launcher.stores.SteamLiveShortcuts.sync(app, fresh) { true } || - !com.droiddeck.launcher.session.SessionState.running || attempts.incrementAndGet() >= 36) { + !com.droiddeck.launcher.session.SessionState.running) { throw java.util.concurrent.CancellationException() } } catch (e: java.util.concurrent.CancellationException) { @@ -55,7 +57,6 @@ object AddedGamesPublisher { Log.w(TAG, "session shortcut retry: ${e.message}") } }, 5, 5, TimeUnit.SECONDS) - retries.schedule({ retry.cancel(false) }, 180, TimeUnit.SECONDS) } catch (e: Exception) { Log.w(TAG, "session refresh: ${e.message}") } 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 fc3274427..1d4fb5ef5 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -89,7 +89,13 @@ object AutoComponents { private fun enqueue(context: Context, job: Job) { if (!queuedKeys.add(job.key)) { - if (job.asked && jobs.removeIf { it.key == job.key && !it.asked }) jobs.add(job) + synchronized(jobs) { + val old = jobs.firstOrNull { it.key == job.key } + if (old != null && ((job.asked && !old.asked) || (job.inSession && !old.inSession)) && jobs.remove(old)) { + jobs.add(Job(old.game ?: job.game, old.component, old.asked || job.asked, + if (job.asked && !old.asked) job.seq else old.seq, old.pics ?: job.pics, old.inSession || job.inSession)) + } + } if (runNow && !draining) drain(context) return } @@ -105,10 +111,7 @@ object AutoComponents { @VisibleForTesting internal var gameRunning: () -> Boolean = { gameProcessRunning() } - private fun gameProcessRunning(): Boolean = File("/proc").listFiles()?.any { p -> - p.name.all(Char::isDigit) && runCatching { String(File(p, "cmdline").readBytes()).replace('\u0000', ' ') }.getOrNull() - ?.let { it.contains("SteamLaunch AppId=") || it.contains("proton waitforexitandrun") } == true - } == true + private fun gameProcessRunning(): Boolean = com.droiddeck.launcher.session.SteamGameProcess.running() fun queueInSession(context: Context, game: Library.SteamGame) { if (appKey(game) == null) return @@ -185,18 +188,19 @@ object AutoComponents { val catalog = (catalogOf(context, false) ?: catalogOf(context, true))?.associateBy { it.name } ?: return val wanted = autoPicks(findings, catalog) val user = WinComponents.selection(context, key).user + val before = WinComponents.selection(context, key).auto val installed = installedOf(context) val kept = LinkedHashMap() val missing = ArrayList() for ((id, reason) in wanted) { if (user[id] == false) { kept[id] = reason; continue } if (id in installed) { kept[id] = reason; continue } + if (id in before) kept[id] = reason synchronized(waiting) { waiting.getOrPut(id) { ArrayList() }.let { if (it.none { g -> appKey(g) == key }) it.add(game) } } queueDownload(context, id, asked, inSession) missing.add(id) } - if (inSession) Pending.set(context, key, missing) - val before = WinComponents.selection(context, key).auto + if (inSession) Pending.set(context, key, (Pending.ids(context, key).filter { it !in installed && it !in wanted } + missing).distinct()) if (before.keys != kept.keys) { WinComponents.setAuto(context, key, kept) Log.i(TAG, "${game.name}: on by itself ${kept.keys.joinToString().ifEmpty { "(none)" }}") @@ -235,6 +239,16 @@ object AutoComponents { write(context, games) } + @Synchronized fun ids(context: Context, key: String): List = + read(context).optJSONArray(key)?.let { a -> (0 until a.length()).map { a.optString(it) } }.orEmpty() + + @Synchronized fun add(context: Context, key: String, ids: List) { + val games = read(context) + val have = games.optJSONArray(key)?.let { a -> (0 until a.length()).map { a.optString(it) } }.orEmpty() + games.put(key, JSONArray((have + ids).distinct())) + write(context, games) + } + @Synchronized fun drop(context: Context, id: String) { val games = read(context) for (k in games.keys().asSequence().toList()) { @@ -257,14 +271,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) }, @@ -313,6 +331,32 @@ object AutoComponents { fun beforeLaunch(context: Context, game: Library.SteamGame) = queueGame(context, game, asked = false) + fun restoreMissing(context: Context): List { + val selections = WinComponents.selections(context) + if (selections.isEmpty()) return emptyList() + val catalog = (catalogOf(context, false) ?: catalogOf(context, true))?.associateBy { it.name } ?: return emptyList() + val installed = installedOf(context) + val lostFor = selections.mapValues { (_, selection) -> + withParts(selection.effective.filter { WinComponents.validId(it) }, catalog).filter { it !in installed && it in catalog } + }.filterValues { it.isNotEmpty() } + if (lostFor.isEmpty()) return emptyList() + val lost = lostFor.values.flatten().distinct() + Log.i(TAG, "wincomp: reinstalling ${lost.joinToString()}, picked for games but missing from the runtime") + lostFor.forEach { (key, ids) -> Pending.add(context, key, ids) } + lost.forEach { queueDownload(context, it, asked = true, inSession = true) } + return lost + } + + private fun withParts(ids: List, catalog: Map): List { + val out = LinkedHashSet() + fun visit(id: String, depth: Int) { + if (depth > 8 || !out.add(id)) return + catalog[id]?.dependencies?.forEach { visit(it, depth + 1) } + } + ids.forEach { visit(it, 0) } + return out.toList() + } + fun refreshLater(context: Context, game: Library.SteamGame) = queueGame(context, game, asked = true) fun sweep(context: Context, games: List) { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt index 330265a0f..0983a2997 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt @@ -54,21 +54,6 @@ object DependencyDetector { "d3dx9", "d3dx11", "xact", "xact_x64", "xna31", "xna40", "physx", "oalinst", "XLiveRedist", ) - fun detectForExe(exeFile: File): List { - val start = exeFile.absoluteFile.parentFile ?: return emptyList() - var d: File? = start - var depth = 0 - while (d != null && depth < 4) { - val hasRedistContainer = try { - d.listFiles()?.any { it.isDirectory && REDIST_DIR_RE.matches(it.name.lowercase(Locale.US)) } == true - } catch (_: Throwable) { false } - if (hasRedistContainer) return detect(d) - d = d.parentFile - depth++ - } - return detect(start) - } - fun detect(gameDir: File): List { if (!gameDir.isDirectory) return emptyList() val hits = LinkedHashMap() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt index f692c7523..2466c8df8 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt @@ -89,6 +89,8 @@ object GameExePicker { return score } + internal fun auxiliaryDir(dir: File): Boolean = skipDir(dir, dir.name) + private fun skipDir(dir: File, relative: String): Boolean { val name = dir.name.lowercase().trim() if (name in SKIP_DIRS || SKIP_DIR_PREFIX.any { name.startsWith(it) }) return true diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt index c8faf20e7..90735d1e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt @@ -5,6 +5,7 @@ import java.io.File object GameIdentifier { private const val MAX_PARENT_DEPTH = 6 + internal const val SPACEWAR = 480 enum class Source { STEAM_APPID_TXT, STEAM_MANIFEST_ACF, STEAM_EMU_INI, GOG_INFO, PE_VERSION, FILENAME, NONE } enum class Confidence { HIGH, MEDIUM, LOW } @@ -92,7 +93,7 @@ object GameIdentifier { for (candidate in arrayOf(File(dir, "steam_appid.txt"), File(dir, "steam_settings/steam_appid.txt"))) { val id = readSmallTextFile(candidate)?.removePrefix("\uFEFF")?.trim() ?.takeWhile { it.isDigit() }?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -111,7 +112,7 @@ object GameIdentifier { for (f in candidates) { val text = readSmallTextFile(f) ?: continue val id = re.find(text)?.groupValues?.getOrNull(1)?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -133,7 +134,8 @@ object GameIdentifier { val match = manifests.firstOrNull { m -> val text = readSmallTextFile(m) ?: return@firstOrNull false val installdir = vdfValue(text, "installdir") - gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) + gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) && + vdfValue(text, "appid")?.toIntOrNull() != SPACEWAR } ?: return null val text = readSmallTextFile(match) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt index ab997f027..388448e18 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/GamesFolderMigration.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt index 2c544b010..91e546957 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt @@ -24,15 +24,33 @@ object GamesFolderMigration { for (root in roots) { var n = 0 val steamInstalls = AddedGames.steamInstallDirs(root.host) - for (folder in root.host.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() }.orEmpty()) { - if (AddedGames.isSteamLibraryFolder(folder.name) || folder.name.lowercase() in steamInstalls) continue - if (folder.absolutePath in storeRoots || StoreGameSidecar.read(folder) != null) continue - if (folder.path in entries) continue - val picked = SessionPrefs.addedGameExe(context, folder.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } - val exe = picked ?: AddedGames.rank(folder).exes.firstOrNull() ?: continue - AddedExes.put(context, AddedExes.Entry(folder.path, exe.path, picked = picked != null)) - entries.add(folder.path) - if (folder.path !in removed) n++ + for (top in root.host.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() }.orEmpty()) { + if (AddedGames.isSteamLibraryFolder(top.name) || top.name.lowercase() in steamInstalls) continue + if (top.absolutePath in storeRoots || StoreGameSidecar.read(top) != null) continue + if (top.path in entries) continue + val topPick = SessionPrefs.addedGameExe(context, top.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } + val groups = AddedGames.groupGames(top) + val played = topPick ?: groups?.let { AddedGames.rank(top).exes.firstOrNull() } + val owner = played?.let { exe -> top.listFiles { f -> f.isDirectory }?.firstOrNull { exe.path.startsWith(it.path + File.separator) } } + val folders = when { + groups == null -> listOf(top) + topPick == null || owner in groups -> groups + owner == null || owner.name.startsWith(".") || AddedGames.isSteamLibraryFolder(owner.name) -> listOf(top) + else -> (groups + owner).sortedBy { it.name.lowercase() } + } + for (folder in folders) { + if (folder.absolutePath in storeRoots || StoreGameSidecar.read(folder) != null) continue + if (folder.path in entries) continue + val picked = SessionPrefs.addedGameExe(context, folder.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } + ?: topPick?.takeIf { it.path.startsWith(folder.path + File.separator) } + val ranked = AddedGames.rank(folder).exes.firstOrNull() + val exe = picked ?: played?.takeIf { folder == owner } ?: ranked ?: continue + AddedExes.put(context, AddedExes.Entry(folder.path, exe.path, picked = picked != null || exe != ranked)) + entries.add(folder.path) + if (folder != top && folder == owner) SessionPrefs.inheritAddedGame(context, top.path, folder.path) + if (folder != top && top.path in removed) SessionPrefs.setAddedGameRemoved(context, folder.path, true) + else if (folder.path !in removed) n++ + } } Log.i(TAG, "games: migrated ${root.host} → $n games") } 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 91691cb1e..723181f08 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -5,6 +5,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.session.SecondaryLibrary import java.io.File @@ -22,11 +23,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 +53,14 @@ object Library { 1054830, 1070560, 1113280, + 1161040, 1245040, 1391110, 1420170, 1493710, 1580130, 1628350, + 1826330, 1887720, 2180100, 228980, @@ -79,13 +88,14 @@ object Library { internal fun steamLibraries(context: Context, arch: String = SessionPrefs.activeSteamClientArch(context)): List> { val root = SessionPrefs.steamRoot(context, arch) - // The session gives the x86-64 client only its card folder; the games folders stay the arm64 client's. val card = GameStorage.effective(context) - if (arch == "x86_64") return listOfNotNull(root to "internal", card?.let { File(it.path, GameStorage.X64_CARD_DIR) to it.label }) + val added = SteamLibraries.list(context).filter { it.host.isDirectory } + if (arch == "x86_64") return listOfNotNull(root to "internal", card?.let { File(it.path, GameStorage.X64_CARD_DIR) to it.label }) + + added.map { it.x64Host to it.label } return listOfNotNull( root to "internal", card?.let { File(it.path) to it.label }, - ) + GameStorage.gamesFolderLibraries(context).map { it.host to it.label } + ) + added.map { it.host to it.label } + GameStorage.gamesFolderLibraries(context).map { it.host to it.label } } fun protonPrefix( @@ -93,18 +103,27 @@ object Library { libraries: List = steamLibraries(context).map { it.first }, ): File? { val ids = listOf(appId.toString(), java.lang.Integer.toString(appId.toInt())).distinct() - val secondary = libraries.drop(1).mapNotNull { runCatching { it.canonicalPath }.getOrNull() }.toSet() - fun prefixRoot(root: File): File = if (runCatching { root.canonicalPath }.getOrNull() in secondary) - SecondaryLibrary.privateRoot(context.filesDir, root).takeIf { File(it, "steamapps/compatdata").isDirectory } ?: root - else root - val roots = (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) - .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } - return roots.asSequence() + return prefixRoots(context, libraries, preferredLibrary).asSequence() .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } .firstOrNull { it.isDirectory } } - fun steamGames(context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context)): List { + fun compatdataDirs(context: Context, libraries: List = steamLibraries(context).map { it.first }): List = + prefixRoots(context, libraries).map { File(it, "steamapps/compatdata") }.filter { it.isDirectory } + + private fun prefixRoots(context: Context, libraries: List, preferredLibrary: File? = null): List { + val secondary = libraries.drop(1).mapNotNull { runCatching { it.canonicalPath }.getOrNull() }.toSet() + fun prefixRoot(root: File): File = if (runCatching { root.canonicalPath }.getOrNull() in secondary) + SecondaryLibrary.privateRoot(context.filesDir, root).takeIf { File(it, "steamapps/compatdata").isDirectory } ?: root + else root + return (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) + .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } + } + + 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 +140,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 +151,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") @@ -150,7 +180,6 @@ object Library { } } - /** Apps the user hid (the "hidden" collection) or marked private in Steam. */ internal fun concealedSteamApps(root: File): Set { val config = AddedGames.accountConfig(root) ?: return emptySet() val hidden = runCatching { @@ -187,9 +216,23 @@ 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 } } + 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 +241,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) @@ -227,7 +280,7 @@ object Library { Spec("duckstation", "DuckStation", "PS1", "/opt/appimages/duckstation.AppImage", listOf("ps1", "psx"), setOf("cue", "chd", "pbp", "iso", "bin", "img", "ecm", "m3u")), Spec("melonds", "melonDS", "DS", "/opt/appimages/melonds.AppImage", listOf("ds", "nds"), setOf("nds", "dsi"), atPanel = true), Spec("cemu", "Cemu", "Wii U", "/opt/appimages/cemu.AppImage", listOf("wiiu", "wii u"), setOf("wua", "wud", "wux", "rpx")), - Spec("ppsspp", "PPSSPP", "PSP", "/usr/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), + Spec("ppsspp", "PPSSPP", "PSP", "/usr/local/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), Spec("retroarch", "RetroArch", "many systems", "/usr/bin/retroarch", emptyList(), emptySet()), ) private fun displayTitle(name: String): String = diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt index cd30e400c..6fa35c753 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt @@ -10,7 +10,6 @@ object LibraryCache { private const val TAG = "LibraryCache" private fun file(context: Context) = File(context.filesDir, "library-cache.json") - /** The cached games and whether they are the x86-64 client's; a cache written as a bare list is arm64's. */ @Synchronized fun snapshot(context: Context): Pair, Boolean> = runCatching { val f = file(context) @@ -36,7 +35,6 @@ object LibraryCache { fun listedX64(context: Context): Boolean = snapshot(context).second - /** Without [x64] the list keeps the client already recorded. */ @Synchronized fun save(context: Context, games: List, x64: Boolean? = null) { runCatching { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt b/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt index a047da09e..64491df82 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.frontend import org.json.JSONObject -/** Where Steam pins a game's logo on its hero image and how big it draws it; the same JSON Steam keeps in `.json`. */ object LogoPosition { enum class Pin(val steam: String) { UPPER_LEFT("UpperLeft"), UPPER_CENTER("UpperCenter"), CENTER("CenterCenter"), BOTTOM_LEFT("BottomLeft"), BOTTOM_CENTER("BottomCenter"); @@ -17,7 +16,6 @@ object LogoPosition { const val MIN_PCT = 10 const val MAX_PCT = 100 - /** What Steam draws when a game has no custom position. */ val DEFAULT = Value(Pin.BOTTOM_LEFT, 50, 50) private const val VERSION = 1 @@ -25,7 +23,6 @@ object LogoPosition { fun sized(pin: Pin, size: Int): Value = size.coerceIn(MIN_PCT, MAX_PCT).let { Value(pin, it, it) } - /** `{"nVersion":1,"logoPosition":{...}}`, with whatever else [into] already held kept as it was. */ fun toJson(value: Value, into: JSONObject = JSONObject()): JSONObject = into .put("nVersion", VERSION) .put(KEY, JSONObject().put("pinnedPosition", value.pin.steam).put("nWidthPct", value.widthPct).put("nHeightPct", value.heightPct)) @@ -39,7 +36,6 @@ object LogoPosition { return Value(pin, inner.optInt("nWidthPct").coerceIn(MIN_PCT, MAX_PCT), inner.optInt("nHeightPct").coerceIn(MIN_PCT, MAX_PCT)) } - /** [existing] without the logo position; null when nothing but the version number would be left. */ fun without(existing: JSONObject): JSONObject? { existing.remove(KEY) val rest = existing.keys().asSequence().filter { it != "nVersion" }.toList() 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 47b679031..e52defb7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt @@ -5,12 +5,11 @@ 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 { private const val TAG = "SteamGrid" - /** Every change to a game's art, here or in a scan, takes this first so two of them never interleave. */ internal val lock = Any() private const val MANIFEST = ".droiddeck-art.json" private val SUFFIX = mapOf(AddedGameArt.Slot.COVER to "p", AddedGameArt.Slot.WIDE to "", AddedGameArt.Slot.BACKGROUND to "_hero", AddedGameArt.Slot.LOGO to "_logo") @@ -35,26 +34,48 @@ object SteamGrid { private fun signature(file: File?) = if (file == null) "" else "${file.length()}:${file.lastModified()}" - /** Each Steam client has its own grid folder, so what was last seen there is kept per client. */ private fun sigName(context: Context, key: String) = if (SessionPrefs.activeSteamClientArch(context) == "x86_64") "grid-x86_64-$key" else "grid-$key" 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) + 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() }.getOrDefault(emptySet()) - /** Puts a choice (or, with null, the lack of one) where Steam reads it, whether or not Steam is running. */ fun write(context: Context, target: Target, slot: AddedGameArt.Slot, file: File?): Boolean = synchronized(lock) { place(context, target, slot, file) } private fun place(context: Context, target: Target, slot: AddedGameArt.Slot, file: File?): Boolean { @@ -62,7 +83,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 +97,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 } @@ -87,16 +108,13 @@ object SteamGrid { private fun positionIn(file: File): LogoPosition.Value? = file.takeIf { it.isFile }?.let { runCatching { it.readText() }.getOrNull() }?.let(LogoPosition::parse) - /** 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) @@ -105,12 +123,10 @@ object SteamGrid { return runCatching { file.writeText(LogoPosition.toJson(value).toString()) }.isSuccess } - /** Sets (or with null, clears) a game's logo position here and in the client's grid folder, whether or not Steam is running. */ fun writePosition(context: Context, target: Target, value: LogoPosition.Value?): Boolean = synchronized(lock) { placePosition(context, target, value) && storePosition(target, value) } - /** Steam keeps the position in `.json`; anything else that file holds is left as it was. */ private fun placePosition(context: Context, target: Target, value: LogoPosition.Value?): Boolean { val grid = dir(context) ?: return true val file = positionFile(grid, target.id) @@ -119,7 +135,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,11 +145,10 @@ object SteamGrid { tmp.delete() return false } - recordPosition(context, target, signature(file)) + recordPosition(context, grid, target, signature(file)) return true } - /** A `logoPosition` this version cannot read (a pin it does not know, say) is left alone rather than read as "removed". */ private fun hasUnknownPosition(file: File): Boolean { val json = runCatching { JSONObject(file.readText()) }.getOrNull() ?: return false return json.has("logoPosition") && LogoPosition.parse(json) == null @@ -144,23 +159,21 @@ 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) } } - /** Takes over what changed in Steam since the last look; returns true when a choice was added, replaced or dropped. */ fun sync(context: Context, targets: List): Boolean = synchronized(lock) { reconcile(context, targets) } private fun reconcile(context: Context, targets: List): Boolean { @@ -173,20 +186,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/SteamLaunchOptions.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt new file mode 100644 index 000000000..cc832db34 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt @@ -0,0 +1,162 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.SteamLiveShortcuts +import java.io.File +import java.nio.file.Files +import java.nio.file.StandardCopyOption + +object SteamLaunchOptions { + private const val TAG = "SteamLaunchOptions" + private val STEAM = listOf("UserLocalConfigStore", "Software", "Valve", "Steam") + + fun current(context: Context, appId: Int): String = + SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: steam(SessionPrefs.activeSteamRoot(context), appId).orEmpty() + + enum class Saved { YES, NO, DESKTOP } + + fun set(context: Context, appId: Int, options: String, shown: String): Saved { + val value = options.trim() + if (SessionState.running && SessionState.mode == SessionService.MODE_DESKTOP) return Saved.DESKTOP + if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) { + val live = SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: return Saved.NO + if (live.trim() != shown.trim()) return Saved.NO + return if (SteamLiveShortcuts.setLaunchOptions(context, appId.toLong(), value)) Saved.YES else Saved.NO + } + val home = SessionPrefs.activeSteamRoot(context) + if (steam(home, appId).orEmpty().trim() != shown.trim()) return Saved.NO + return if (write(home, appId, value)) Saved.YES else Saved.NO + } + + internal fun steam(steamHome: File, appId: Int): String? { + val config = AddedGames.accountConfig(steamHome) ?: return null + val text = runCatching { File(config, "localconfig.vdf").readText() }.getOrNull() ?: return null + return launchOptions(text, appId) + } + + internal fun write(steamHome: File, appId: Int, options: String): Boolean { + val config = AddedGames.accountConfig(steamHome)?.let { File(it, "localconfig.vdf") } ?: return false + val text = runCatching { config.readText() }.getOrNull() ?: return false + val updated = withLaunchOptions(text, appId, options) ?: return false + if (updated == text) return true + val staged = File(config.parentFile, config.name + ".staged") + return try { + staged.writeText(updated) + if (config.readText() != text) { + staged.delete() + return false + } + Files.move(staged.toPath(), config.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + true + } catch (e: Exception) { + staged.delete() + Log.w(TAG, "could not write launch options to ${config.path}", e) + false + } + } + + internal fun launchOptions(text: String, appId: Int): String? { + val app = section(text, STEAM + "apps" + appId.toString()) ?: return null + return entries(text, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) } + ?.let { unescape(text.substring(it.valueStart + 1, it.end)) } + } + + internal fun withLaunchOptions(text: String, appId: Int, options: String): String? { + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + var updated = text + var path = STEAM + for (key in listOf("apps", appId.toString())) { + updated = withSection(updated, section(updated, path) ?: return null, key, newline) ?: return null + path = path + key + } + val app = section(updated, path) ?: return null + val value = "\"" + escape(options) + "\"" + entries(updated, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) }?.let { + return updated.replaceRange(it.valueStart, it.end + 1, value) + } + val lineStart = closingLine(updated, app) ?: return null + val indent = updated.substring(lineStart, app.end) + "\t" + return updated.substring(0, lineStart) + indent + "\"LaunchOptions\"\t\t" + value + newline + updated.substring(lineStart) + } + + private class Entry(val key: String, val valueStart: Int, val end: Int, val section: Boolean) + + private fun section(text: String, path: List): Entry? { + var found: Entry? = null + for (key in path) { + found = entries(text, found?.valueStart ?: -1, found?.end ?: text.length) + .firstOrNull { it.section && it.key.equals(key, true) } ?: return null + } + return found + } + + private fun entries(text: String, open: Int, close: Int): List { + val found = ArrayList() + var key: String? = null + var i = open + 1 + while (i < close) { + when { + text[i] == '"' -> { + val end = stringEnd(text, i) ?: return found + if (key == null) key = unescape(text.substring(i + 1, end)) else { found += Entry(key, i, end, false); key = null } + i = end + 1 + } + text[i] == '{' -> { + val end = sectionEnd(text, i) ?: return found + key?.let { found += Entry(it, i, end, true) } + key = null + i = end + 1 + } + text.startsWith("//", i) -> i = text.indexOf('\n', i).let { if (it < 0) close else it } + else -> i++ + } + } + return found + } + + private fun stringEnd(text: String, open: Int): Int? { + var i = open + 1 + while (i < text.length) { + when (text[i]) { + '\\' -> i += 2 + '"' -> return i + else -> i++ + } + } + return null + } + + private fun sectionEnd(text: String, open: Int): Int? { + var depth = 0 + var i = open + while (i < text.length) { + when (text[i]) { + '"' -> i = stringEnd(text, i) ?: return null + '{' -> depth++ + '}' -> if (--depth == 0) return i + } + i++ + } + return null + } + + private fun withSection(text: String, parent: Entry, key: String, newline: String): String? { + if (entries(text, parent.valueStart, parent.end).any { it.section && it.key.equals(key, true) }) return text + val lineStart = closingLine(text, parent) ?: return null + val indent = text.substring(lineStart, parent.end) + "\t" + return text.substring(0, lineStart) + "$indent\"$key\"$newline$indent{$newline$indent}$newline" + text.substring(lineStart) + } + + private fun closingLine(text: String, section: Entry): Int? { + val lineStart = text.lastIndexOf('\n', section.end - 1) + 1 + return lineStart.takeIf { lineStart > section.valueStart && text.substring(lineStart, section.end).all { it == '\t' || it == ' ' } } + } + + private fun escape(value: String) = value.replace("\\", "\\\\").replace("\"", "\\\"") + + private fun unescape(value: String) = value.replace(Regex("\\\\(.)"), "$1") +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt index c0c83676d..8371288e2 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt @@ -45,15 +45,15 @@ object SteamMatch { identity?.appId?.let { id -> return Match(id, Certainty.FILES, identity.source.name.lowercase(), now).also { put(context, key, it) } } - val known = get(context, key) + val known = get(context, key)?.takeUnless { it.appId == GameIdentifier.SPACEWAR } if (known != null && known.certainty == Certainty.NAME) return known if (known != null && known.certainty == Certainty.NONE && now - known.checkedAt < RETRY_AFTER_MS) return known - legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 }?.let { id -> + legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 && it != GameIdentifier.SPACEWAR }?.let { id -> return Match(id, Certainty.NAME, "store search", now).also { put(context, key, it) } } if (search == null) return known?.takeIf { it.certainty != Certainty.FILES } ?: Match(null, Certainty.NONE, "", 0) val id = runCatching { search(name) }.getOrNull() - val match = if (id != null && id > 0) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) + val match = if (id != null && id > 0 && id != GameIdentifier.SPACEWAR) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) put(context, key, match) return match } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt index f41b8265f..a287c2299 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,10 @@ object SteamRedists { "228989" to ("vcredist2022_dll" to "VC++ 2022"), "228990" to ("d3dx9" to "DirectX (June 2010)"), ) + 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 +27,16 @@ object SteamRedists { return File(steamapps, "appmanifest_$appId.acf").takeIf { it.isFile } } + 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 7562cc1ee..22044c76d 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,15 @@ 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 +75,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 +105,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/Glasses.kt b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt index fe09a7809..a0c58c6e8 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt @@ -162,6 +162,7 @@ object Glasses { private val simulating = java.util.concurrent.atomic.AtomicReference(null) private val frames = ArrayDeque() + @android.annotation.SuppressLint("UnspecifiedRegisterReceiverFlag") fun init(context: Context) { if (::handler.isInitialized) return app = context.applicationContext @@ -563,7 +564,6 @@ object Glasses { val device = selected?.first val m = selected?.second val controllable = m?.let(::canOpenModel) == true - // XREAL uses Android's Ethernet sockets, without opening or claiming USB interfaces. val permitted = controllable && device != null && (m === XrealModel || usb.hasPermission(device)) val identity = device?.let { GlassesModeState.Device(it.productId, if (permitted) runCatching { it.serialNumber }.getOrNull() else null) @@ -677,8 +677,6 @@ object Glasses { internal fun selectGlassesDisplay(displays: List, usbPresent: Boolean): Display? { val candidates = displays .filter { it.displayId != Display.DEFAULT_DISPLAY && it.flags and Display.FLAG_PRESENTATION != 0 } - // Android can expose the glasses name on either the logical display or - // its product metadata. A generic label on one must not hide the other. return candidates.firstOrNull { display -> isGlassesDisplayName(display.name) || (Build.VERSION.SDK_INT >= 31 && display.deviceProductInfo?.let { product -> @@ -728,7 +726,6 @@ object Glasses { if (device.productId == VitureProtocol.PRO2_PRODUCT_ID) { VitureV2Link.open(usb, device, v2Listener(generation)) } else if ((model as? VitureProtocol.Model)?.needsSdk == true) { - // Android can evict cacheDir while the SDK is running. Log.i(TAG, "opening VITURE SDK pid=0x%04X spatial=%s".format(device.productId, spatial)) VitureSdkLink.open(usb, device, File(app.noBackupFilesDir, "viture"), sdkListener(generation), (model as? VitureProtocol.Model)?.family, spatial) @@ -854,7 +851,6 @@ object Glasses { if (generation != linkGeneration) return@post closeLink() publish { it.copy(controlError = app.getString(R.string.glasses_connection_failed)) } - // Let a reconnect or explicit Allow retry restart the SDK, not an endless failure loop. } } @@ -974,7 +970,6 @@ object Glasses { } if (!s.usable || s.sbs || modeState.pendingStereo) return val hz = _settings.value.refreshHz - // Native 30 Hz is selected by the Android presentation, without a vendor mode command. if (hz == 30 && GlassesRendering.native30HzAvailable(_settings.value, s)) return if (glassesMode == m.mode(hz, false, outputResolution())) return if (!force) { diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt index 5de0f03f5..3bf992cbd 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.glasses -/** Hardware properties; display refresh is selected from Android's advertised modes. */ interface GlassesModel { val name: String val controllable: Boolean @@ -18,9 +17,6 @@ interface GlassesModel { fun modeForStep(step: Int): Int? } -/** The command IDs here are the existing glasses controller's internal vocabulary. - * Each transport translates them to its own wire protocol; unsupported controls return false. - */ internal interface GlassesLink { val hasImu: Boolean val badFrames: Long get() = 0L diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt index cefe3d932..501aaae1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt @@ -63,7 +63,6 @@ class GlassesMenuSurface( override fun onDetachedFromWindow() { close() super.onDetachedFromWindow() - // GLSurfaceView may exit its GL thread before queued cleanup is consumed. releaseInput() } 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 f8d6f4c5f..01df9fe56 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.glasses import com.droiddeck.launcher.gpu.Cardboard -/** Share the actual picture mode with settings so controls match the rendered view. */ internal object GlassesRendering { enum class Picture { FLAT, DUPLICATED, VIRTUAL_SCREEN, STEREO } @@ -32,12 +31,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) @@ -57,11 +50,7 @@ internal object GlassesRendering { outputActive: Boolean, steamVrRunning: Boolean, ): Cardboard { - // Mirror output still uses the glasses' picture and sensors during VR. if (!usesGlasses(state, outputActive, steamVrRunning)) { - // SteamVR uses the renderer's enabled flag as headset proximity. - // A flat phone preview still needs an active HMD and one SBS eye; - // otherwise SteamVR enters standby and leaves a frozen frame. return if (steamVrRunning && !base.enabled) base.copy( enabled = true, source = Cardboard.SOURCE_SBS, diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt index c15e9c623..43f80bfc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt @@ -36,7 +36,6 @@ class GlassesScreen(context: Context, display: Display, refreshHz: Int, private fun prefer(hz: Int, resolution: GlassesResolution? = null) { wantHz = hz wantResolution = resolution - // A 2D/SBS transition can replace the active mode without changing Hz. applyMode() } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt b/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt index b6aa9844a..a3d94cd6a 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt @@ -51,7 +51,6 @@ internal class HandImageBuffer { pixels.clear() pixels.put(rgb) pixels.rewind() - // MediaPipe applies the model metadata's float normalization to these RGB bytes. return ByteBufferImageBuilder(pixels, width, height, MPImage.IMAGE_FORMAT_RGB).build() } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt b/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt index 6a483a1a0..5f6175474 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt @@ -150,7 +150,6 @@ class LumaRgbCaptureService : Service() { intent?.getIntExtra("durationMs",5000) ?: 5000) } finally { stopSelf() - // SDK 2.4.0 can crash while cancelling failed USB transfers; isolate each diagnostic. android.os.Process.killProcess(android.os.Process.myPid()) } }, "luma-rgb-diagnostic").start() diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt index 8e579aee3..23ebcce81 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt @@ -40,12 +40,9 @@ internal data class RayNeoCalibration(val gyroBiasDps: Vec3, val level: Quaterni internal class RayNeoCalibrationStore(private val prefs: SharedPreferences) { companion object { - // GT and GT Max can share USB identity fields. Keep the non-Max mounting - // correction separate from existing Max profiles and their legacy keys. fun profileKey(base: String, gtUsb: Boolean, boardId: Int): String = if (gtUsb && boardId == RayNeoProtocol.BOARD_GT) "$base:gt-standard-v1" else base } - // A serial isolates physical units. Devices without one share their model profile. fun key(vid: Int, pid: Int, serial: String?, modelName: String = ""): String = "rayneo-cal-v1:$vid:$pid:${serial?.takeIf { it.isNotBlank() } ?: "model:$modelName"}" fun load(key: String): RayNeoCalibration? = RayNeoCalibration.decode(prefs.getString(key, null)) @@ -55,7 +52,6 @@ internal class RayNeoCalibrationStore(private val prefs: SharedPreferences) { } } -/** One upside-down stationary pose estimates gyro bias and tilt, never yaw or accelerometer scale. */ internal class RayNeoCalibrationCollector(private val axes: RayNeoSensorAxes, private val beganMs: Long) { var phase = CalibrationPhase.SETTLING; private set var progress = 0; private set diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt index c9770ed22..78c2275b4 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt @@ -6,7 +6,6 @@ import android.hardware.usb.UsbManager import android.os.SystemClock import android.util.Log -/** RayNeo command/response and IMU share one endpoint. Keep reads on a single worker. */ internal class RayNeoLink private constructor( private val connection: UsbDeviceConnection, private val endpoints: RayNeoEndpointSelection, @@ -52,7 +51,6 @@ internal class RayNeoLink private constructor( ready && (mode == RayNeoProtocol.CMD_SWITCH_TO_3D || mode == RayNeoProtocol.CMD_SWITCH_TO_2D) && command(mode) } - // No VITURE brightness, volume, film, rate or raw command is sent to RayNeo. else -> false } } @@ -159,7 +157,6 @@ internal class RayNeoLink private constructor( } val wxyz = filter.update(packet.sample) if (wantImu && collector == null && lastSensor >= warmupUntil) { - // Normalize basis and component order at the hardware boundary. listener.onPose(raw, RayNeoOrientationFilter.glassesPose(wxyz), SystemClock.elapsedRealtimeNanos()) } @@ -176,7 +173,6 @@ internal class RayNeoLink private constructor( override fun close() { synchronized(writeLock) { if (!running) return - // Best effort: stop the sensor before releasing the claimed interface. if (ready) runCatching { command(RayNeoProtocol.CMD_CLOSE_IMU) } running = false } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt index ccb19f744..72c88b34b 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt @@ -8,8 +8,6 @@ object RayNeoModel { fun model(vid: Int, pid: Int, name: String?): GlassesModel? { if (!isVendor(vid)) return null - // GT's identity is confirmed by verncat's SDK; do not claim other products - // from that vendor just because their name resembles a supported model. val gt = RayNeoProtocol.isGt(vid, pid) if (vid == RayNeoProtocol.GT_VENDOR_ID && !gt) return null if (!(vid == RayNeoProtocol.VENDOR_ID && pid == RayNeoProtocol.PRODUCT_ID) && @@ -23,8 +21,6 @@ object RayNeoModel { name.contains("rayneo", ignoreCase = true) || name.contains("ray neo", ignoreCase = true) || modelName.containsMatchIn(name) - // Observed on GT Max: Android exposes an unbranded EDID monitor name. - // Match its product metadata, not every display called SmartGlasses/TCL. fun isDisplayProduct(name: String?, manufacturer: String?, productId: String?): Boolean = name?.trim().equals("SmartGlasses", ignoreCase = true) && manufacturer.equals("TCL", ignoreCase = true) && productId == "980" @@ -33,7 +29,7 @@ object RayNeoModel { override val controllable = true override val brightnessMax = 0 override val volumeMax = 0 - override val diagonalFovDeg = 46f // Conservative existing default, not a calibrated model profile. + override val diagonalFovDeg = 46f override val sbs90 = false override fun mode(hz: Int, sbs: Boolean) = if (sbs) RayNeoProtocol.CMD_SWITCH_TO_3D else RayNeoProtocol.CMD_SWITCH_TO_2D diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt index 96bff8500..22a3a8965 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt @@ -1,5 +1,4 @@ -// Adapted from informalTechCode/RayNeo-Air-Series-3DoF-Scaffold (Apache-2.0). -// See docs/third-party/rayneo/. Returns scaffold quaternions in (w, x, y, z) order. +// Adapted from informalTechCode/RayNeo-Air-Series-3DoF-Scaffold (Apache-2.0); see docs/third-party/rayneo/ for license and attribution. package com.droiddeck.launcher.glasses import kotlin.math.cos @@ -123,10 +122,6 @@ internal class RayNeoOrientationFilter( private var lastRealtimeNs: Long = 0L companion object { - /** Scaffold: right +X, up +Y, back +Z. VITURE: right -Y, up +Z, back -X. - * Conjugate by HeadPose.GLASSES_AXES before entering the unchanged VITURE pose path. - * This is a basis conversion, not a projection or seated-origin adjustment. - */ fun glassesPose(wxyz: FloatArray): FloatArray = floatArrayOf(-wxyz[3], -wxyz[1], wxyz[2], wxyz[0]) } @@ -168,8 +163,6 @@ internal class RayNeoOrientationFilter( if (accelNorm > 1e-3f) { val measuredUp = accel.normalized() if (!gravityInitialized) { - // Align gravity before publishing the first pose. Starting at - // identity and settling after recenter can rotate the horizon. val axis = measuredUp.cross(worldUp) q = if (measuredUp.y < -0.9999f) { Quaternion.fromAxisAngle(Vec3(1f, 0f, 0f), Math.PI.toFloat()) @@ -179,7 +172,6 @@ internal class RayNeoOrientationFilter( gravityInitialized = true } val predictedUp = q.conjugate().rotate(worldUp).normalized() - // q maps body to world: measured x predicted reduces gravity error. val correction = measuredUp.cross(predictedUp) gyro += correction * accelGain } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt index 9f65b04df..781f0555d 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt @@ -40,14 +40,13 @@ data class RayNeoEndpointSelection( object RayNeoProtocol { const val VENDOR_ID = 0x1BBB const val PRODUCT_ID = 0xAF50 - // verncat/RayNeo-Air-3S-Pro-OpenVR PR #3 (MIT), tested on GT hardware. const val GT_VENDOR_ID = 0x3941 private const val GT_CONTROL_INTERFACE = 5 fun isGt(vid: Int, pid: Int) = vid == GT_VENDOR_ID && pid == PRODUCT_ID const val BOARD_AIR_4_PRO = 0x3A - const val BOARD_GT = 0x40 // Observed on the user's non-Max GT. + const val BOARD_GT = 0x40 const val PKT_MAGIC = 0x99 const val PKT_SENSOR = 0x65 @@ -131,7 +130,6 @@ object RayNeoProtocol { endpoint.type != UsbConstants.USB_ENDPOINT_XFER_BULK) { continue } - // Exclude small button reports from GT's protocol transport. if (gt && endpoint.maxPacketSize < 64) continue if (endpoint.direction == UsbConstants.USB_DIR_IN && inEndpoint == null) { @@ -159,8 +157,6 @@ object RayNeoProtocol { } } - // Interface numbers can change with firmware. Use a unique protocol-sized - // pair when interface 5 is absent, never an arbitrary composite interface. return if (gt) gtCandidates.singleOrNull() else fallback } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt index dbf10a6e6..3b1002eba 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt @@ -9,7 +9,6 @@ import android.hardware.usb.UsbManager import android.os.SystemClock import android.util.Log -/** Controls are vendor control transfers; the HID interrupt endpoint streams IMU reports unprompted. */ internal class RokidLink private constructor( private val connection: UsbDeviceConnection, private val usbInterface: UsbInterface, @@ -44,7 +43,7 @@ internal class RokidLink private constructor( ?.let { listener.onValue(VitureProtocol.MSG_BRIGHTNESS, RokidModel.brightnessStep(it)) } != null VitureProtocol.MSG_BRIGHTNESS -> value in 0..RokidModel.BRIGHTNESS_STEPS && control(RokidModel.REQUEST_SET_BRIGHTNESS, RokidModel.brightnessRaw(value), RokidModel.INDEX_BRIGHTNESS) - else -> false // Volume is the glasses' USB audio device; there is no film or IMU-rate control. + else -> false } } @@ -54,7 +53,6 @@ internal class RokidLink private constructor( if (!running) return null val buffer = ByteArray(64) val count = connection.controlTransfer(VENDOR_IN, request, 0, index, buffer, buffer.size, TIMEOUT_MS) - // Display mode is reported in the second byte, brightness in the first. val offset = if (request == RokidModel.REQUEST_GET_DISPLAY) 1 else 0 if (count > offset) buffer[offset].toInt() and 0xff else null } @@ -90,7 +88,6 @@ internal class RokidLink private constructor( if (enabled && !wasTracking) fusion = ImuFusion() wasTracking = enabled if (!enabled) continue - // Max captures: already right/up/back; level gravity +Y, turn left +gyroY, look up +gyroX, roll right -gyroZ. fusion.update(sample.timeNs, sample.accel, sample.gyro)?.let { if (running && tracking) listener.onPose(buffer.copyOf(count), it, SystemClock.elapsedRealtimeNanos()) } 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 a1ad6e83a..62d5ab81d 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,6 @@ 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. */ internal class RokidModel private constructor(override val name: String, private val max: Boolean) : GlassesModel { override val controllable = true override val brightnessMax = BRIGHTNESS_STEPS @@ -33,9 +32,9 @@ 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. const val REQUEST_SET_DISPLAY = 0x01 const val REQUEST_GET_DISPLAY = 0x81 const val REQUEST_SET_BRIGHTNESS = 0x02 @@ -50,16 +49,14 @@ internal class RokidModel private constructor(override val name: String, private const val MODE_SBS_1200_60 = 5 val MODES = setOf(MODE_2D_60, MODE_SBS_1080_60, MODE_2D_120, MODE_SBS_1200_90, MODE_SBS_1200_60) - // 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) - /** Device brightness is 0..100; the shared slider uses ten steps. */ fun brightnessStep(raw: Int): Int = ((raw.coerceIn(0, 100) + 5) / 10).coerceIn(0, BRIGHTNESS_STEPS) fun brightnessRaw(step: Int): Int = step.coerceIn(0, BRIGHTNESS_STEPS) * 10 } @@ -73,7 +70,6 @@ internal object RokidProtocol { private const val SENSOR_ACCEL = 1 private const val SENSOR_GYRO = 2 - /** Max sends one combined report; Air sends accel and gyro reports that share a timestamp. */ class Parser { private var accel: Vec3? = null private var accelTime = -1L @@ -86,7 +82,7 @@ internal object RokidProtocol { return when (packet[0].toInt() and 0xff) { COMBINED -> Sample(b.getLong(1), vec(b, 9), vec(b, 21), packet[59].toInt() and 0xff) SEPARATE -> { - val time = b.getLong(9) * 1000 // Air reports microseconds; Max reports nanoseconds. + val time = b.getLong(9) * 1000 when (packet[1].toInt() and 0xff) { SENSOR_ACCEL -> { accel = vec(b, 21); accelTime = time } SENSOR_GYRO -> { gyro = vec(b, 21); gyroTime = time } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt index 027f0b92e..8c08316d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt @@ -26,7 +26,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh val source get() = if (bundledBase && !verified) "luma-ultra-base" else "device" private val p1 = Mat.zeros(3, 4, CvType.CV_64F) private val p2 = Mat.zeros(3, 4, CvType.CV_64F) - private val undistortionMaps = Array(2) { arrayOf(Mat(),Mat()) } init { val a = Mat.eye(3, 4, CvType.CV_64F) val b = Mat.zeros(3, 4, CvType.CV_64F) @@ -35,18 +34,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh Core.gemm(k1, a, 1.0, empty, 0.0, p1); Core.gemm(k2, b, 1.0, empty, 0.0, p2) a.release(); b.release(); empty.release() } - fun undistort(src: Mat, dst: Mat, right: Boolean) { - val k = if (right) k2 else k1; val d = if (right) d2 else d1 - val maps=undistortionMaps[if(right) 1 else 0] - if(maps[0].empty()) { - val identity=Mat.eye(3,3,CvType.CV_64F) - try { - if(fisheye) Calib3d.fisheye_initUndistortRectifyMap(k,d,identity,k,src.size(),CvType.CV_16SC2,maps[0],maps[1]) - else Calib3d.initUndistortRectifyMap(k,d,identity,k,src.size(),CvType.CV_16SC2,maps[0],maps[1]) - } finally { identity.release() } - } - Imgproc.remap(src,dst,maps[0],maps[1],Imgproc.INTER_LINEAR) - } fun triangulateRaw(left: List, right: List): List? { val points = triangulateLandmarksRaw(left,right) ?: return null return if(points.any { it == null }) null else points.filterNotNull() @@ -74,10 +61,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh return triangulatePoints(l.toList(),r.toList()) } finally { l.release(); r.release(); identity.release() } } - fun triangulate(left: List, right: List): List? { - val points = triangulatePoints(left,right) ?: return null - return if(points.any { it == null }) null else points.filterNotNull() - } private fun triangulatePoints(left: List, right: List): List? { if (left.size != right.size || left.isEmpty()) return null val a = Mat(2, left.size, CvType.CV_64F); val b = Mat(2, right.size, CvType.CV_64F); val out = Mat() @@ -105,7 +88,7 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh val tmp = File(file.parentFile,file.name+".tmp"); tmp.writeText(j.toString()) java.nio.file.Files.move(tmp.toPath(),file.toPath(),java.nio.file.StandardCopyOption.REPLACE_EXISTING) } - override fun close() { (listOf(k1,d1,k2,d2,r,t,p1,p2)+undistortionMaps.flatMap { it.toList() }).forEach { it.release() } } + override fun close() { listOf(k1,d1,k2,d2,r,t,p1,p2).forEach { it.release() } } companion object { fun load(file: File, identity: String, width: Int, height: Int): StereoCalibration? = runCatching { StereoCalibrationProfile.parse(file.readText(), identity, width, height)?.let(::fromProfile) }.getOrNull() @@ -286,7 +269,6 @@ internal class StereoCalibrator(private val context: Context) : AutoCloseable { Mat().also { output -> corrected.add(output); Calib3d.fisheye_undistortPoints(pixels,output,k,d,identity,k) } } try { - // OpenCV 4.13 fisheye stereo fitting assumes equal corner counts in every view. Calib3d.stereoCalibrate(objects,images(left,k1,d1),images(right,k2,d2),k1,if(fish)zero else d1,k2,if(fish)zero else d2, size,r,t,e,f,Calib3d.CALIB_FIX_INTRINSIC) } finally { (corrected+listOf(e,f,identity,zero)).forEach(Mat::release) } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt index becad63a0..78aad3f61 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt @@ -383,7 +383,6 @@ internal class StereoHandEngine(private val context: Context, private val token: message=context.getString(R.string.spatial_frame_changed) calibrationProgress = calibrationProgress.copy(collecting = false, capturing = false, captureMessage = message) } - // The callback pose's basis is undocumented; use canonical GL pose history. val observation=HandObservation(time,generation,trackingFrame) var captureHead=observation.headPose(SpatialTracking.session,metadata[6]>0) val w=metadata[0].toInt();val h=metadata[1].toInt() @@ -499,7 +498,6 @@ internal class StereoHandEngine(private val context: Context, private val token: dl=pair.first.hands;dr=pair.second.hands if(scheduled) inferenceSchedule.observe(stamp,dl.map { it.side },dr.map { it.side },pair.first.rawCount,pair.second.rawCount) val inferenceMs=(System.nanoTime()-inferenceStart)/1e6f - // VIO callbacks can arrive during inference; verify this exact camera stamp before publishing. captureHead=observation.headPose(SpatialTracking.session, metadata[6]>0 || VitureSdk.nativeCameraSynchronized(token,metadata[2])) val hands=Array(2) { SpatialHand() } @@ -631,7 +629,7 @@ internal class StereoHandEngine(private val context: Context, private val token: SpatialTracking.publish(System.nanoTime()) } } - } catch(e: InterruptedException) { /* Shutdown interrupts the idle wait. */ } + } catch(e: InterruptedException) { } catch(e: Throwable) { message=context.getString(R.string.spatial_hand_error, e.message.orEmpty()) val unavailable=HandObservationDiagnostic(HandObservationOutcome.INFERENCE_UNAVAILABLE) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt index 351fe332e..a8c994504 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt @@ -31,7 +31,6 @@ internal class StereoInferenceRunner : AutoCloseable { catch (e: ExecutionException) { throw e.cause ?: e } } } finally { - // Native inference must finish before either camera's pixels or detector can be reused. if (interrupted) Thread.currentThread().interrupt() } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt b/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt index 6bd9c6b15..ce119c044 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt @@ -12,8 +12,6 @@ internal object UvcRgbDiagnostic { internal data class UvcStreamHealth(val observationMs: Double, val observedFps: Double, val maximumGapMs: Double, val healthy: Boolean) { companion object { - // Health requires the full requested window, 80% of requested FPS, and no gap - // (including the final silent interval) above max(250 ms, three frame periods). fun assess(metadata: LongArray, requestedFps: Int, durationMs: Int): UvcStreamHealth { require(metadata.size == 14 && requestedFps > 0 && durationMs > 0) val first = metadata[7] diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt index 573f0f8dc..55302dfc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt @@ -81,7 +81,6 @@ object VitureProtocol { } } - /** SDK validates the PID before returning this market name. Never guess a new PID. */ fun sdkModel(marketName: String): Model? { val family = when (marketName) { "One", "Lite" -> Family.ONE diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt index 1b5f09e3d..bdad575c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.glasses import android.util.Log import kotlin.math.sqrt -/** JNI adapter to VITURE's Android C SDK. The vendor binary is a local build input. */ internal object VitureSdk { val available: Boolean by lazy { runCatching { @@ -27,7 +26,6 @@ internal object VitureSdk { external fun nativeSpatialDiagnostics(token: Long): DoubleArray? external fun nativeTracking(token: Long, enabled: Boolean): Int external fun nativeCommand(token: Long, command: Int, value: Int): Int - /** Returns CLOCK_BOOTTIME receipt time, zero for no new pose, or a negative SDK error. */ external fun nativePose(token: Long, wxyz: FloatArray): Long external fun nativeNextState(token: Long, event: IntArray): Int external fun nativeClose(token: Long) @@ -48,12 +46,9 @@ internal object VitureSpatialIdentity { } internal object VitureSdkPose { - // Pro 2 hardware captures use OpenGL axes despite the generic Gen2 callback's - // NWU documentation. Keep that model-specific exception out of other Gen2 devices. fun usesOpenGlAxes(carina: Boolean, family: VitureProtocol.Family?) = carina || family == VitureProtocol.Family.PRO2 - /** SDK quaternions are wxyz; normalize their coordinate basis at the boundary. */ fun toGlasses(wxyz: FloatArray, openGlAxes: Boolean): FloatArray? { if (wxyz.size != 4 || wxyz.any { !it.isFinite() }) return null val length = sqrt(wxyz.sumOf { it.toDouble() * it }.toFloat()) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt index 36ceedf6e..fe42adc71 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt @@ -7,7 +7,6 @@ import android.os.SystemClock import android.util.Log import java.io.File -/** SDK owns interface selection (including Ultra bulk endpoints) and all USB I/O. */ internal class VitureSdkLink private constructor( private val connection: UsbDeviceConnection, private val token: Long, @@ -47,7 +46,6 @@ internal class VitureSdkLink private constructor( if (rc == 0 || !wanted) tracking = wanted return result("tracking", rc) } - // Frequency is negotiated against SDK capabilities, including Pro 2's pose limit. VitureProtocol.MSG_IMU_RATE -> return tracking VitureProtocol.MSG_GET_IMU -> return true } @@ -89,7 +87,6 @@ internal class VitureSdkLink private constructor( if (VitureSdk.nativeNextState(token, event) == 1) when (event[0]) { 0 -> listener.onValue(VitureProtocol.MSG_GET_BRIGHTNESS, event[1]) 1 -> listener.onValue(VitureProtocol.MSG_GET_VOLUME, event[1]) - // A device event can use a different display-mode namespace. 2 -> send(VitureProtocol.MSG_GET_DISPLAY) 3 -> listener.onValue(VitureProtocol.MSG_FILM, event[1]) } @@ -122,7 +119,6 @@ internal class VitureSdkLink private constructor( if (!running) return running = false VitureSdk.nativeClose(token) - // Keep Java's descriptor alive until the SDK and its worker threads have stopped. connection.close() } if (Thread.currentThread() !== worker) worker.join(1000) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt index d46c246b7..16bd1195a 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt @@ -69,7 +69,6 @@ internal class VitureV2Link internal constructor( return true } if (msgId == VitureProtocol.MSG_GET_IMU) return true - // Keep the measured 120 Hz mode; the generic controller requests 240 Hz. if (msgId == VitureProtocol.MSG_IMU_RATE) return false val query = when (msgId) { VitureProtocol.MSG_GET_BRIGHTNESS -> VitureV2Protocol.MSG_GET_BRIGHTNESS @@ -146,9 +145,7 @@ internal class VitureV2Link internal constructor( tracking(true) if (becameReady) listener.onReady() val q = pose.quaternion - // Upstream right/up/back pose converted to the shared VITURE legacy basis. val shared = floatArrayOf(-q[2], -q[0], q[1], q[3]) - // Upstream does not establish device tick units; use host monotonic receipt time. if (running && wanted && streamOn) listener.onPose(received.bytes, shared, received.timeNs) return } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt index 548ad6b91..e2e4fdbfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt @@ -1,5 +1,4 @@ -// Adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. -// Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. +// Adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. package com.droiddeck.launcher.glasses import kotlin.math.sqrt @@ -37,7 +36,6 @@ object VitureV2Protocol { val success: Boolean get() = status == 0 } - // Device ticks have no established time unit; quaternion is xyzw with no axis remapping. class Pose internal constructor( val deviceTick: Long, val quaternion: FloatArray, @@ -64,7 +62,6 @@ object VitureV2Protocol { } fun imuControl(streams: Int, rate: Rate = Rate.HZ_120): ByteArray { - // Upstream measured that stream mask 3 ACKs but produces no events on Pro 2. require(streams == STREAM_OFF || streams == STREAM_POSE || streams == STREAM_RAW) require(streams != STREAM_POSE || rate.hz <= 240) val wireRate = if (streams == STREAM_OFF) 0 else rate.wireValue diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt index 3dbd22eb3..46b5bc11f 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt @@ -24,7 +24,6 @@ internal interface XrealConnector : Closeable { internal class XrealNetworkMissing : IOException("XREAL USB Ethernet network is not available") -/** Bind individual sockets, never the process: Steam must retain its Internet network. */ internal class AndroidXrealConnector(context: Context) : XrealConnector { private val manager = context.getSystemService(ConnectivityManager::class.java) private val address = InetAddress.getByName(XrealProtocol.HOST) @@ -34,7 +33,7 @@ internal class AndroidXrealConnector(context: Context) : XrealConnector { companion object { internal fun hasDirectRoute(properties: LinkProperties, address: InetAddress): Boolean = - properties.routes.any { !it.hasGateway() && it.destination.prefixLength > 0 && it.matches(address) } + properties.routes.any { (it.gateway?.isAnyLocalAddress != false) && it.destination.prefixLength > 0 && it.matches(address) } } override fun connect(): XrealChannels { diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt index 86f93fbef..18ce636ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt @@ -7,7 +7,6 @@ import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference -/** One connection owns two TCP channels. All control requests are serialized off the UI thread. */ internal class XrealLink internal constructor( private val connector: XrealConnector, private val listener: Listener, @@ -47,7 +46,7 @@ internal class XrealLink internal constructor( VitureProtocol.MSG_DISPLAY -> value in 2..5 || value == XrealModel.NATIVE_60HZ VitureProtocol.MSG_BRIGHTNESS -> value in 0..9 VitureProtocol.MSG_FILM -> value in 0..1 - else -> false // No guessed volume, sensor-rate, or VITURE wire commands. + else -> false } return valid && commands.offer(Command(msgId, value)) } @@ -88,7 +87,7 @@ internal class XrealLink internal constructor( } } catch (e: Exception) { failure.set(e) - current.close() // Wake a control read immediately. + current.close() } }, "xreal-reports").apply { isDaemon = true; start() } ready = true @@ -145,12 +144,11 @@ internal class XrealLink internal constructor( tracking = false commands.clear() connection.getAndSet(null)?.close() - connector.close() // Includes sockets still inside connect(). + connector.close() worker.interrupt() } } -/** Kept independent of Android so the real framing/acknowledgement path is testable. */ internal class XrealControl(private val channels: XrealChannels, private val settleDelayMs: Long = 150) { private var transaction = 0 private fun exchange(command: Int, value: Int? = null): ByteArray { @@ -158,7 +156,7 @@ internal class XrealControl(private val channels: XrealChannels, private val set channels.controlOutput.write(XrealProtocol.request(command, transaction, value)) channels.controlOutput.flush() val deadline = System.nanoTime() + 3_000_000_000L - repeat(32) { // Bound unsolicited button/status packets and stale responses. + repeat(32) { if (System.nanoTime() > deadline) throw IOException("XREAL control timed out") XrealProtocol.response(XrealProtocol.read(channels.controlInput), command, transaction)?.let { return it } } @@ -172,9 +170,6 @@ internal class XrealControl(private val channels: XrealChannels, private val set fun changeDisplay(mode: Int): Int { val stereo = mode == 5 set(XrealProtocol.SET_INPUT, if (stereo) 1 else 0) - // On 1S, SET_INPUT itself changes EDID. Sending SET_DISPLAY immediately - // receives error 5001 while that change is pending. GET_DISPLAY returns - // an empty property during the transition; wait for a real mode report. val current = awaitDisplay { (it == 5) == stereo } if (current == mode) return current set(XrealProtocol.SET_DISPLAY, mode) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt index 19cd2097c..2de2236c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt @@ -1,10 +1,9 @@ package com.droiddeck.launcher.glasses -/** First One-family target. Recovery and Air USB products must not use this transport. */ object XrealModel : GlassesModel { const val VENDOR_ID = 0x3318 const val PRODUCT_1S = 0x043e - const val NATIVE_60HZ = 29 // Captured on 1S: 1920 x 1200 at 60 Hz. + const val NATIVE_60HZ = 29 override val name = "XREAL 1S" override val controllable = true override val brightnessMax = 9 @@ -16,7 +15,6 @@ object XrealModel : GlassesModel { fun matches(vid: Int, pid: Int) = vid == VENDOR_ID && pid == PRODUCT_1S fun isDisplay(name: String) = name.contains("XREAL", ignoreCase = true) - // One-family EDID configuration values, not VITURE's display mode IDs. override fun mode(hz: Int, sbs: Boolean) = when { sbs -> 5 hz >= 120 -> 4 diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt index e8d34f44a..c10bb9473 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt @@ -2,19 +2,14 @@ package com.droiddeck.launcher.glasses import kotlin.math.abs -/** 1S radians/sec and device nanoseconds, mapped using directed hardware captures. */ internal class XrealOrientationFilter { private val fusion = ImuFusion() - // 1S reports right/down/forward. Rotate 180 degrees about X into the - // shared right/up/back basis before either gravity alignment or fusion. - // Captures: level gravity -Y; looking left -gyroY; up +gyroX; right tilt +gyroZ. fun update(sample: XrealProtocol.Sample): FloatArray? = fusion.update(sample.timeNs, Vec3(sample.accel.x, -sample.accel.y, -sample.accel.z), Vec3(sample.gyro.x, -sample.gyro.y, -sample.gyro.z)) } -/** Gyro integration with gravity correction in the shared right/up/back basis, rad/s and device ns. */ internal class ImuFusion { private var previous = 0L private var rotation = Quaternion.IDENTITY @@ -27,7 +22,7 @@ internal class ImuFusion { previous = timeNs val norm = accel.length() val gravityValid = abs(norm - 9.81f) < 1.5f - if (dt > 0.25f) initialized = false // Never integrate a reconnect/stall as motion. + if (dt > 0.25f) initialized = false if (!initialized) { if (!gravityValid) return null val up = accel.normalized() @@ -47,7 +42,6 @@ internal class ImuFusion { } rotation = rotation.integrateBodyRate(rate, dt).normalized() } - // Same right/up/back -> shared glasses basis used by the RayNeo adapter. return RayNeoOrientationFilter.glassesPose(floatArrayOf(rotation.w, rotation.x, rotation.y, rotation.z)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt index d18ca1a94..09bed0179 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt @@ -6,7 +6,6 @@ import java.io.InputStream import java.nio.ByteBuffer import java.nio.ByteOrder -/** Independent implementation of the One-family wire format; see xreal-investigation.md. */ internal object XrealProtocol { const val HOST = "169.254.2.1" const val REPORT_PORT = 52998 @@ -46,7 +45,7 @@ internal object XrealProtocol { fun sample(frame: Frame): Sample? { if (frame.command != REPORT || frame.body.size != 128) return null val b = ByteBuffer.wrap(frame.body).order(ByteOrder.LITTLE_ENDIAN) - if (b.getInt(24) != 11) return null // Magnetometer reports are a different type. + if (b.getInt(24) != 11) return null val time = b.getLong(8) val gyro = Vec3(b.getFloat(28), b.getFloat(32), b.getFloat(36)) val accel = Vec3(b.getFloat(40), b.getFloat(44), b.getFloat(48)) @@ -64,7 +63,6 @@ internal object XrealProtocol { .putInt(4 + payload.size).putInt(transaction or Int.MIN_VALUE).put(payload).array() } - /** No acknowledgement is inferred from a write; match both command and transaction. */ fun response(frame: Frame, command: Int, transaction: Int): ByteArray? { if (frame.command != command || frame.body.size < 4 || ByteBuffer.wrap(frame.body).int != transaction) return null diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt index a63a80249..fc55247a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt @@ -48,10 +48,6 @@ object AutoDriverTrial { fun bad(context: Context): Set = prefs(context).getStringSet("bad", emptySet()).orEmpty() - /** - * Counted before the compositor loads the trial display driver, so a driver that kills the process during - * Vulkan init still counts towards a rollback; sessionStarting runs too late for that. - */ fun displayStarting(context: Context, display: String) { val p = prefs(context) if (p.getString("release", null) == null || p.getString("display", "") != display) return diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt index 76b6dddc9..6216ccf7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt @@ -29,9 +29,10 @@ object AutoPicks { val BUILT_IN = listOf( Rule(setOf(Family.A8XX), models = setOf(840), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.WN_BALANCED)), Rule(setOf(Family.A8XX), prefer = listOf(DriverPairs.WN_BALANCED)), - Rule(setOf(Family.A7XX_LOW), prefer = listOf(DriverPairs.BANNER_710)), + Rule(setOf(Family.A7XX_LOW), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.BANNER_710)), Rule(setOf(Family.A7XX), oneUi8Gen2 = true, prefer = listOf(DriverPairs.BANNER_ONEUI)), - Rule(setOf(Family.A7XX, Family.A6XX), prefer = listOf(DriverPairs.BANNER)), + Rule(setOf(Family.A7XX), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.BANNER)), + Rule(setOf(Family.A6XX), prefer = listOf(DriverPairs.BANNER)), Rule(setOf(Family.ADRENO_UNKNOWN), minSdk = 36, prefer = listOf(DriverPairs.WN_BALANCED)), Rule(setOf(Family.ADRENO_UNKNOWN), prefer = listOf(DriverPairs.BANNER)), ) 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 4282ecf6f..c31cd348e 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,9 @@ 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) + + 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/gpu/GpuInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt index 652d33fbe..c137e666f 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt @@ -16,6 +16,7 @@ data class GpuInfo( val modelSource: String = "", val kgslChipId: String = "", val platformGpuModel: Int = 0, + val verifiedDevice: Boolean = false, ) { enum class Family(val label: String) { A8XX("Adreno 8xx"), @@ -36,6 +37,7 @@ data class GpuInfo( get() = when { family == Family.NOT_ADRENO -> Support.UNSUPPORTED isA850 -> Support.UNTESTED + verifiedDevice -> Support.TESTED family == Family.A6XX && model == 650 -> Support.TESTED family == Family.A8XX -> Support.TESTED family == Family.A7XX && model >= 725 -> Support.TESTED @@ -85,9 +87,13 @@ data class GpuInfo( oneUi8Gen2 = samsung && model == 740, kgslName = raw.orEmpty(), modelSource = source, kgslChipId = chipId, platformGpuModel = platformGpuModel, + verifiedDevice = adreno && verifiedOn(model, Build.MODEL), ) } + internal fun verifiedOn(model: Int, device: String): Boolean = + model == 722 && device.equals("Retroid Pocket Duo", ignoreCase = true) + internal fun threeDigits(text: String): Int = Regex("""(?i)\badreno\s*(?:\(TM\)\s*)?(\d{3})(?!\d)""").find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 internal fun modelFromNames( diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java index d74b5a3f1..42dce3d64 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java @@ -25,14 +25,6 @@ public final class LinuxVulkanDriver { return values; } - public static String optionLabel(Context context, String value) { - if (value == null || value.isEmpty()) return "Runtime default (built into the runtime)"; - LinuxVulkanDriverManager m = new LinuxVulkanDriverManager(context); - if (!m.isInstalled(value)) return value + " (imported, missing - uses the runtime default)"; - String ver = m.getDriverVersion(value); - return m.getDriverName(value) + (ver.isEmpty() ? "" : " " + ver) + " (imported)"; - } - public static String resolveIcdPath(Context context, String value) { if (value == null || value.isEmpty()) return null; LinuxVulkanDriverManager m = new LinuxVulkanDriverManager(context); diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt index 4d94b6628..8709c3a74 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt @@ -6,7 +6,6 @@ import java.io.RandomAccessFile import java.nio.file.Files import java.nio.file.attribute.BasicFileAttributes -/** Only new compositor output is evidence of a fault in the current session. */ internal class SteamVrDeviceLossLog(private val file: File) { private var identity: Any? = identity() private var position = file.length() @@ -34,7 +33,6 @@ internal class SteamVrDeviceLossLog(private val file: File) { } identity = current prefix = head - // Fault loops can produce megabytes per second. Bound work and keep the newest output. if (input.length() - position > MAX_READ) { position = input.length() - MAX_READ partial = "" diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt index 8c045b68e..d8a546eb5 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt @@ -11,7 +11,6 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionEvents import java.io.File -/** Process-wide cursor survives Activity recreation; a new session ignores older log errors. */ internal object SteamVrHealth { private var session: String? = null private var log: SteamVrDeviceLossLog? = null @@ -49,7 +48,6 @@ internal class SteamVrRecovery(private val activity: Activity, private val foreg .create() prompt.setOnDismissListener { countdown?.let(handler::removeCallbacks); countdown = null; dialog = null } dialog = prompt - // A touch meant for the game must not silently dismiss the recovery controls. prompt.setCanceledOnTouchOutside(false) prompt.show() if (automatic) { @@ -66,7 +64,6 @@ internal class SteamVrRecovery(private val activity: Activity, private val foreg private fun restart() { if (!foreground()) return - // Commit before crossing processes so a repeated fault cannot create a restart loop. if (!activity.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() .putLong(LAST_ATTEMPT, System.currentTimeMillis()).commit()) return SessionEvents.record("steamvr.recovery_requested") diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt index c05cc2129..63efb3c87 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt @@ -5,13 +5,11 @@ import org.json.JSONObject import java.io.File internal object SteamVrRecoverySettings { - /** After a graphics crash SteamVR can quarantine our HMD, leaving a server with no VR output. */ fun unblockHeadset(file: File): Boolean { if (!file.isFile) return false val settings = JSONObject(file.readText()) val driver = settings.optJSONObject("driver_droiddeck") ?: return false if (!driver.optBoolean("blocked_by_safe_mode")) return false - // Preserve every other setting, including safe mode and blocks on other drivers. driver.put("blocked_by_safe_mode", false) val atomic = AtomicFile(file) val output = atomic.startWrite() diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt index 671132c4f..0cf01a9d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt @@ -14,7 +14,6 @@ import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.session.SessionService import org.json.JSONObject -/** A visible, private process survives destruction of the app's native graphics context. */ class SteamVrRestartActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -41,7 +40,6 @@ class SteamVrRestartActivity : Activity() { }, SystemClock::elapsedRealtime, SystemClock::sleep) if (shutdown != SteamVrRecoveryPolicy.Shutdown.COMPLETE) android.util.Log.w("SteamVrRecovery", "Restarting before the session finished stopping: $shutdown") - // Only the verified main process, never a caller-supplied PID or an external app. Process.killProcess(main.pid) val exited = SystemClock.elapsedRealtime() + 5000 while (java.io.File("/proc/${main.pid}").exists() && SystemClock.elapsedRealtime() < exited) SystemClock.sleep(50) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt index 1ccee78e2..0ac66004b 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.gpu +import android.content.Context import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs object TpUbwcHint { const val ENV = "FD_DEV_FEATURES" @@ -8,31 +10,40 @@ object TpUbwcHint { @Volatile private var resolved = false @Volatile private var cached: String? = null + @Volatile var activeMode: String? = null + private set - // On Adreno 740, TPL1_DBG_ECO_CNTL1.TP_UBWC_FLAG_HINT is shared by every driver on the GPU and must - // match the system driver: blob v6xx leaves it off, newer blobs set it. A mismatch corrupts Android UI. - // Samsung's One UI firmware sets it whatever blob version it reports. - internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false): String? { + internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false, + mode: String = SessionPrefs.TP_UBWC_AUTO): String? { if (model != 740) return null + if (mode == SessionPrefs.TP_UBWC_ON) return "enable_tp_ubwc_flag_hint=1" + if (mode == SessionPrefs.TP_UBWC_OFF) return "enable_tp_ubwc_flag_hint=0" if (samsung) return "enable_tp_ubwc_flag_hint=1" - val blob = systemDriverVersion?.split('.')?.getOrNull(1)?.toIntOrNull() ?: return null - return "enable_tp_ubwc_flag_hint=" + if (blob >= 700) "1" else "0" + val parts = systemDriverVersion?.split('.') ?: return null + val blob = parts.getOrNull(1)?.toIntOrNull() ?: return null + val patch = parts.getOrNull(2)?.toIntOrNull() ?: 0 + val on = blob >= 700 || (blob == 676 && patch >= 76) + return "enable_tp_ubwc_flag_hint=" + if (on) "1" else "0" } @Synchronized - fun forThisDevice(): String? { + fun forThisDevice(context: Context): String? { if (resolved) return cached + val mode = SessionPrefs.tpUbwcMode(context) val gpu = GpuInfo.detect() val model = gpu.model val version = if (model == 740) VulkanInfo.query()["driver_version"] else null - cached = features(model, version, gpu.oneUi8Gen2) + cached = features(model, version, gpu.oneUi8Gen2, mode) + activeMode = mode resolved = true - Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}: ${cached ?: "driver default"}") + Log.i(TAG, "Adreno $model${if (gpu.oneUi8Gen2) " (One UI)" else ""}, system driver ${version ?: "n/a"}, mode $mode: ${cached ?: "driver default"}") return cached } - fun applyToProcess() { - val value = forThisDevice() ?: return + fun restartRequired(context: Context): Boolean = resolved && activeMode != SessionPrefs.tpUbwcMode(context) + + fun applyToProcess(context: Context) { + val value = forThisDevice(context) ?: return runCatching { android.system.Os.setenv(ENV, value, true) } .onFailure { Log.w(TAG, "setenv $ENV failed: ${it.javaClass.simpleName}") } } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 9978409c5..9bae92e42 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.function.Supplier; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -47,10 +48,16 @@ public final class TurnipDriver { private final Context context; private final File contentDir; + private final Supplier gpuDetector; public TurnipDriver(Context context) { + this(context, GpuInfo.Companion::detect); + } + + TurnipDriver(Context context, Supplier gpuDetector) { this.context = context; this.contentDir = new File(context.getFilesDir(), "graphics_driver"); + this.gpuDetector = gpuDetector; } public String driverPath(String driverId) { @@ -284,7 +291,12 @@ public final class TurnipDriver { } String quest = QuestExperimental.INSTANCE.defaultAndroidDriver(); if (quest != null) return quest; - int model = GpuInfo.Companion.detect().getModel(); + GpuInfo gpu = gpuDetector.get(); + if (gpu.getFamily() == GpuInfo.Family.NOT_ADRENO) { + Log.i(TAG, "not an Adreno GPU; leaving the display driver to the system"); + return null; + } + int model = gpu.getModel(); Log.i(TAG, "gpu model: " + (model == 0 ? "unknown" : model)); return chooseByModel(model, android.os.Build.VERSION.SDK_INT); } diff --git a/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt b/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt index 85a1e3844..0d19d7694 100644 --- a/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt @@ -8,7 +8,6 @@ import java.io.FileInputStream import java.nio.ByteBuffer import java.nio.channels.FileChannel -/** Hand-tracking models and the OpenCV/MediaPipe native libraries, downloaded on first use. */ internal object TrackingPack { const val HAND = "hand_landmarker.task" const val HAND_LITE = "hand_landmarker_lite.task" @@ -32,25 +31,23 @@ internal object TrackingPack { fun model(context: Context, name: String): ByteBuffer = FileInputStream(file(context, name)).use { it.channel.map(FileChannel.MapMode.READ_ONLY, 0, it.channel.size()) } - /** - * Loads OpenCV and MediaPipe from the pack. MediaPipe's own System.loadLibrary then resolves to the - * already-loaded library by soname, so this must run before any MediaPipe task class initializes. - */ fun loadNative(context: Context): Boolean { if (nativeLoaded) return true synchronized(lock) { if (nativeLoaded) return true if (!pack.installed(context)) return false return runCatching { - System.load(file(context, OPENCV).absolutePath) - System.load(file(context, MEDIAPIPE).absolutePath) + for (name in listOf(OPENCV, MEDIAPIPE)) { + val library = file(context, name) + check(library.isFile && library.setReadOnly()) { "Tracking library cannot be made read-only: $name" } + System.load(library.absolutePath) + } nativeLoaded = true true }.onFailure { Log.e(TAG, "native libraries failed to load", it) }.getOrDefault(false) } } - /** Blocks the calling worker thread until the pack is usable, starting the download if needed. */ fun awaitNative(context: Context, running: () -> Boolean, onState: (AddonPack.State) -> Unit): Boolean = pack.await(context, running, onState) && loadNative(context) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt new file mode 100644 index 000000000..86e9f8f39 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.hud + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs + +internal object DroidDeckHudConfig { + val DEFAULTS: Map = linkedMapOf( + "hudSize" to "minimal", "hudLocked" to "1", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", + "hudOutline" to "40", "hudOutlineAccent" to "1", + "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", + "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", + "showGpuTemp" to "0", "showBattery" to "0", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", + "showSwap" to "1", "showNet" to "1", "showResolution" to "1", "showProton" to "1", "showSession" to "1", + "showClock" to "1", "showEngine" to "1", "showRenderer" to "1", "showGpuModel" to "1", + "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", + ) + + private val TWINS = mapOf("showCPUUsage" to "showCPULoad", "showTemp" to "showBatteryTemp", "showEngine" to "showRenderer") + + fun load(context: Context): MutableMap { + val values = LinkedHashMap(DEFAULTS) + val stored = SessionPrefs.droidDeckHudConfig(context) + if (stored == null) { + values["showFPS"] = flag(SessionPrefs.hudShowFps(context)) + values["showFPSGraph"] = flag(SessionPrefs.hudShowGraph(context)) + values["hudOpacity"] = SessionPrefs.hudOpacity(context).toString() + } else { + for (entry in KeyValueSet(stored)) if (entry.size == 2 && entry[0] in DEFAULTS) values[entry[0]] = entry[1] + } + return values + } + + fun encode(values: Map): String = values.entries.joinToString(",") { "${it.key}=${it.value}" } + + fun set(context: Context, key: String, value: String): Map { + val values = load(context) + if (key !in DEFAULTS) return values + values[key] = value + TWINS[key]?.let { values[it] = value } + SessionPrefs.setDroidDeckHudConfig(context, encode(values)) + return values + } + + fun reset(context: Context): Map { + SessionPrefs.setDroidDeckHudConfig(context, encode(DEFAULTS)) + return DEFAULTS + } + + private fun flag(on: Boolean) = if (on) "1" else "0" +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt new file mode 100644 index 000000000..a3c217e4b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -0,0 +1,501 @@ +package com.droiddeck.launcher.hud + +import android.content.Context +import android.os.Environment +import android.os.Handler +import android.os.Looper +import android.animation.ValueAnimator +import android.view.Choreographer +import android.view.View +import android.view.animation.PathInterpolator +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import com.droiddeck.launcher.wayland.WaylandCompositor +import java.io.File +import kotlin.math.roundToInt + +class DroidDeckHudHost(context: Context) { + private val context = context.applicationContext + private val handler = Handler(Looper.getMainLooper()) + private val feed = GameFrameFeed(File(LinuxRuntime.rootDir(this.context), HudFrames.PATH)) + private val readings = MangoReadings(File(this.context.filesDir, "session"), LinuxRuntime.rootDir(this.context)) + private var view: DroidDeckHudView? = null + private var parent: ViewGroup? = null + private var running = false + private var hidden = false + private var backgrounded = false + private var polling = false + private var wantX = Float.NaN + private var wantY = Float.NaN + private var anchorX = Float.NaN + private var snaps = true + private var snapping = false + private var previewFade: ValueAnimator? = null + private var flingX = 0f + private var engine = "" + private var gpuName = "" + private var protonPid = 0 + private var proton = "" + @Volatile private var lastWindow: String? = null + + var onPresentingWindowChanged: (() -> Unit)? = null + + val liveFps: Float? get() = if (polling) feed.stats.fps else null + + var onConfigChanged: (() -> Unit)? = null + + var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null + + private val listener = object : WaylandCompositor.GameListener { + override fun onGameSurface(window: String?, gpuName: String?) { + if (!gpuName.isNullOrBlank()) handler.post { this@DroidDeckHudHost.gpuName = cleanGpuName(gpuName) } + if (window != null && window != lastWindow) { + lastWindow = window + handler.post { onPresentingWindowChanged?.invoke() } + } + } + + override fun onGameFrame() { + feed.onCompositorFrame(System.nanoTime()) + } + } + + private val frameCallback = object : Choreographer.FrameCallback { + override fun doFrame(frameTimeNanos: Long) { + if (!running || !polling) return + if (feed.poll(System.nanoTime())) view?.onFrames() + Choreographer.getInstance().postFrameCallback(this) + } + } + + private val enabled: Boolean + get() = SessionPrefs.hudEnabled(context) && + !File(Environment.getExternalStorageDirectory(), "Download/droiddeck-no-hud").exists() + + fun attach(root: FrameLayout, index: Int) { + if (view != null) return + val hud = DroidDeckHudView(root.context) + hud.setFrameStats(feed.stats) + hud.setMangoReadings(readings) + hud.setGpuModel(cleanGpuName(GpuInfo.detect().displayName(context))) + hud.onRefresh = Runnable { refreshLabels(hud) } + hud.setOnDraggedListener { rawX, rawY -> + anchorX = Float.NaN; snapping = false + previewFade?.cancel(); previewFade = null + stopMotion(hud) + shrinkPastEdge(hud, rawX, rawY) + } + hud.setOnFlungListener { vx, _ -> flingX = vx } + hud.setOnTabDraggedListener { x, y -> dragTab(hud, x, y) } + hud.setOnTabDroppedListener { dropTab(hud) } + hud.setOnTabDragCancelledListener { snapping = false; keepOnScreen(hud) } + hud.setOnMovedListener { x, y -> + wantX = x; wantY = y + val vx = flingX + flingX = 0f + dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } + stopMotion(hud) + fadeDockPreview(hud) + if (snaps && !hud.isStrip) { snapToAnchor(hud, vx); return@setOnMovedListener } + val fromX = hud.x; val fromY = hud.y + keepOnScreen(hud) + wantX = hud.x; wantY = hud.y + SessionPrefs.setDroidDeckHudPosition(context, hud.x, hud.y) + glideFrom(hud, fromX, fromY) + } + hud.setOnSizeCycledListener { size -> DroidDeckHudConfig.set(context, "hudSize", size); onConfigChanged?.invoke() } + hud.setOnDockChangedListener { token -> setDock(hud, DroidDeckHudDock.from(token)) } + hud.setOnScaledListener { percent -> + DroidDeckHudConfig.set(context, "hudScale", percent.toString()) + onConfigChanged?.invoke() + } + hud.setOnLockChangedListener { locked -> + DroidDeckHudConfig.set(context, "hudLocked", if (locked) "1" else "0") + onConfigChanged?.invoke() + } + hud.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> if (!hud.isDragging) keepOnScreen(hud) } + hud.passesTouchAt = { x, y -> passesTouchAt?.invoke(x, y) == true } + hud.visibility = View.GONE + val margin = (16 * root.resources.displayMetrics.density).roundToInt() + root.addView(hud, index, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + leftMargin = margin + topMargin = margin + }) + SessionPrefs.droidDeckHudPosition(context)?.let { (x, y) -> wantX = x; wantY = y; hud.post { keepOnScreen(hud) } } + view = hud + parent = root + applyConfig() + } + + fun applyConfig() { + val config = DroidDeckHudConfig.load(context) + snaps = config["hudSnap"] != "0" + if (!snaps) anchorX = Float.NaN + view?.applyConfig(DroidDeckHudConfig.encode(config)) + } + + fun refresh() { + applyConfig() + if (!enabled) stop() else if (!running) start() + } + + fun start() { + if (running || !enabled || view == null) return + running = true + WaylandCompositor.setGameListener(listener) + applyShown() + } + + fun stop() { + running = false + showing = false + polling = false + Choreographer.getInstance().removeFrameCallback(frameCallback) + WaylandCompositor.clearGameListener(listener) + feed.close() + view?.visibility = View.GONE + } + + fun setHidden(hide: Boolean) { + hidden = hide + applyShown() + } + + fun setBackgrounded(stopped: Boolean) { + backgrounded = stopped + applyShown() + } + + private fun applyShown() { + if (!running) return + val show = !hidden && !backgrounded + view?.visibility = if (show) View.VISIBLE else View.GONE + showing = show + if (show != polling) { + polling = show + if (show) Choreographer.getInstance().postFrameCallback(frameCallback) + else Choreographer.getInstance().removeFrameCallback(frameCallback) + } + } + + fun exportDiagnostics(): File? = runCatching { + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "DroidDeck") + dir.mkdirs() + val stamp = java.text.SimpleDateFormat("yyyyMMdd-HHmmss", java.util.Locale.US).format(java.util.Date()) + val file = File(dir, "HUD-diagnostics-$stamp.txt") + val metrics = HudMetrics(context) + metrics.setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) + metrics.snapshot() + Thread.sleep(500) + val mango = metrics.snapshot() + file.writeText(metrics.also { it.setMangoReadings(null) }.buildDiagnosticsReport(context) + "\n== As the HUD shows them (MangoHud's sources) ==\n" + + "CPU ${mango.cpuPercent}% ${mango.cpuTempC}°C, GPU ${mango.gpuPercent}% ${mango.gpuClockMhz}MHz ${mango.gpuTempC}°C, " + + "RAM ${mango.ramUsedText()}/${mango.ramTotalText()}, VRAM ${mango.vramText()}, battery ${mango.battery.percent}% " + + "${mango.battery.watts}W charging=${mango.battery.charging}\n" + + "GPU feeds: ${com.droiddeck.launcher.session.GpuStatsComponent.sources.ifEmpty { "none (no session, or kgsl absent)" }}\n" + + "CPU temperature zones: ${LinuxRuntime.cpuTempZones().joinToString { it.name }}\n" + + "Frames: ${if (feed.engine.isNotEmpty() || feed.pid > 0) "gamescope (pid ${feed.pid}, ${feed.engine})" else "compositor"}, " + + "fps ${feed.stats.fps}\n") + file + }.getOrNull() + + private fun refreshLabels(hud: DroidDeckHudView) { + if (feed.engine.isNotBlank() && !feed.steamFocused) engine = feed.engine + hud.setEngineLabel(engine) + if (gpuName.isNotBlank()) hud.setGpuModel(gpuName) + hud.setResolution(if (feed.outputWidth > 0 && feed.outputHeight > 0) buildString { + append(feed.outputWidth).append('x').append(feed.outputHeight) + if (feed.refreshMilliHz > 0) append(" @ ").append((feed.refreshMilliHz + 499) / 1000).append("Hz") + } else "") + val pid = feed.pid + if (pid > 0 && pid != protonPid) { + protonPid = pid + proton = protonName(pid) ?: proton + } + hud.setWineVersion(proton) + hud.setPresentedFps(presentedFps()) + } + + private fun presentedFps(): Float { + if (FrameGen.mode(context).engine == FrameGen.ENGINE_OFF) return 0f + val stats = runCatching { WaylandCompositor.nativeFrameGenStats() }.getOrNull() ?: return 0f + return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f + } + + private fun dockEdgeFor(v: View): DroidDeckHudDock? { + val over = overhang(v) ?: return null + return over.key.takeIf { over.value >= DOCK_OVERHANG } + } + + private fun overhang(v: View): Map.Entry? { + val p = v.parent as? View ?: return null + if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return null + val strip = (v as? DroidDeckHudView)?.isStrip == true + val density = v.resources.displayMetrics.density + val w = if (strip) minOf(v.width.toFloat(), STRIP_PULL_ACROSS_DP * density) else v.width.toFloat() + val h = if (strip) maxOf(v.height.toFloat(), STRIP_PULL_OFF_DP * density) else v.height.toFloat() + return mapOf( + DroidDeckHudDock.LEFT to -v.x / w, + DroidDeckHudDock.RIGHT to (v.x + v.width - p.width) / w, + DroidDeckHudDock.TOP to -v.y / h, + DroidDeckHudDock.BOTTOM to (v.y + v.height - p.height) / h, + ).maxByOrNull { it.value } + } + + private fun dragTab(hud: DroidDeckHudView, x: Float, y: Float) { + val p = hud.parent as? View ?: return + stopMotion(hud) + snapping = false + hud.x = x.coerceIn(0f, (p.width - hud.width).toFloat().coerceAtLeast(0f)) + hud.y = y.coerceIn(0f, (p.height - hud.height).toFloat().coerceAtLeast(0f)) + } + + private fun dropTab(hud: DroidDeckHudView) { + val p = hud.parent as? View ?: return + val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) + val pulled = when (hud.dock) { + DroidDeckHudDock.LEFT -> hud.x / hud.width + DroidDeckHudDock.RIGHT -> (maxX - hud.x) / hud.width + DroidDeckHudDock.TOP -> hud.y / hud.height + DroidDeckHudDock.BOTTOM -> (maxY - hud.y) / hud.height + DroidDeckHudDock.NONE -> 0f + } + if (pulled >= 1f) { setDock(hud, DroidDeckHudDock.NONE); return } + wantX = hud.x; wantY = hud.y + val (x, y) = settled(p, hud.dock, hud.width.toFloat(), hud.height.toFloat()) + wantX = x; wantY = y + SessionPrefs.setDroidDeckHudPosition(context, x, y) + if (Motion.scale == 0f) { hud.x = x; hud.y = y; return } + snapping = true + hud.animate().x(x).y(y).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false }.start() + } + + private fun stopMotion(hud: DroidDeckHudView) { + hud.animate().setUpdateListener(null) + hud.animate().cancel() + } + + private fun glideFrom(hud: DroidDeckHudView, fromX: Float, fromY: Float) { + if (Motion.scale == 0f || (fromX == hud.x && fromY == hud.y && hud.scaleX == 1f && hud.scaleY == 1f)) { + hud.scaleX = 1f; hud.scaleY = 1f + return + } + val toX = hud.x; val toY = hud.y + hud.x = fromX; hud.y = fromY + snapping = true + hud.animate().x(toX).y(toY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false; keepOnScreen(hud) }.start() + } + + private fun fadeDockPreview(hud: DroidDeckHudView) { + val from = hud.dockPreviewBlend + if (from <= 0f) return + val edge = overhang(hud)?.key ?: DroidDeckHudDock.NONE + if (Motion.scale == 0f) { hud.setDockPreview(DroidDeckHudDock.NONE, 0f); return } + previewFade?.cancel() + previewFade = ValueAnimator.ofFloat(from, 0f).apply { + duration = Motion.ms(200).toLong() + addUpdateListener { hud.setDockPreview(edge, it.animatedValue as Float) } + start() + } + } + + private fun snapToAnchor(hud: DroidDeckHudView, vx: Float) { + val p = hud.parent as? View ?: return + val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) + anchorX = if (hud.x + vx * FLING_REACH_S < maxX / 2f) 0f else 1f + wantX = anchorX * maxX + wantY = hud.y.coerceIn(0f, maxY) + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + stopMotion(hud) + if (Motion.scale == 0f) { + hud.scaleX = 1f; hud.scaleY = 1f + hud.x = wantX; hud.y = wantY + return + } + snapping = true + hud.animate().x(wantX).y(wantY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(260).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false; keepOnScreen(hud) }.start() + } + + private fun shrinkPastEdge(hud: DroidDeckHudView, rawX: Float, rawY: Float) { + if (hud.dock != DroidDeckHudDock.NONE) return + val p = hud.parent as? View ?: return + val edge = overhang(hud) ?: return + val over = edge.value + val t = (over / DOCK_OVERHANG).coerceIn(0f, 1f) + val fade = ((t - PREVIEW_FROM) / (1f - PREVIEW_FROM)).coerceIn(0f, 1f) + hud.setDockPreview(edge.key, fade * fade * (3f - 2f * fade)) + val (tabW, tabH) = hud.dockTabSize() + val e = t * t * (3f - 2f * t) + val at = IntArray(2).also { p.getLocationOnScreen(it) } + hud.pivotX = rawX - at[0] - hud.x + hud.pivotY = rawY - at[1] - hud.y + if (hud.isStrip) { + hud.scaleX = 1f + (tabW / hud.width - 1f) * e + hud.scaleY = 1f + return + } + val tabScale = maxOf(tabW / hud.width, tabH / hud.height).coerceAtMost(1f) + val s = 1f + (tabScale - 1f) * e + hud.scaleX = s; hud.scaleY = s + } + + private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + if (edge == hud.dock) return + animateDock(hud, edge) { commitDock(hud, edge) } + } + + private fun commitDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + val tabX = hud.x; val tabY = hud.y + if (edge != DroidDeckHudDock.NONE) { + val p = hud.parent as? View + if (p != null) { + wantX = wantX.coerceIn(0f, p.width.toFloat()) + wantY = wantY.coerceIn(0f, p.height.toFloat()) + } + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + } + DroidDeckHudConfig.set(context, "hudDock", edge.token) + applyConfig() + if (edge == DroidDeckHudDock.NONE) settleOutOfTab(hud, tabX, tabY) + hud.post { keepOnScreen(hud) } + onConfigChanged?.invoke() + } + + private fun settleOutOfTab(hud: DroidDeckHudView, tabX: Float, tabY: Float) { + val p = hud.parent as? View + val maxX = if (p == null) Float.MAX_VALUE else (p.width - hud.contentWidth).coerceAtLeast(0f) + val maxY = if (p == null) Float.MAX_VALUE else (p.height - hud.contentHeight).coerceAtLeast(0f) + wantX = tabX.coerceIn(0f, maxX); wantY = tabY.coerceIn(0f, maxY) + anchorX = if (snaps && !hud.isStrip && p != null) (if (wantX < maxX / 2f) 0f else 1f) else Float.NaN + if (!anchorX.isNaN()) wantX = anchorX * maxX + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + } + + private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, commit: () -> Unit) { + stopMotion(hud) + previewFade?.cancel(); previewFade = null + snapping = false + hud.alpha = 1f + val p = hud.parent as? View + if (Motion.scale == 0f || p == null || !hud.isLaidOut || hud.width <= 0) { + hud.scaleX = 1f; hud.scaleY = 1f + hud.setDockPreview(DroidDeckHudDock.NONE, 0f) + commit(); return + } + if (edge != DroidDeckHudDock.NONE) { + val left = hud.x + hud.pivotX * (1f - hud.scaleX); val top = hud.y + hud.pivotY * (1f - hud.scaleY) + val shownW = hud.width * hud.scaleX; val shownH = hud.height * hud.scaleY + hud.pivotX = 0f; hud.pivotY = 0f + hud.x = left; hud.y = top + val (tabW, tabH) = hud.dockTabSize() + wantX = left + (shownW - tabW) / 2f + wantY = top + (shownH - tabH) / 2f + val (tabX, tabY) = settled(p, edge, tabW, tabH) + val sx = tabW / hud.width; val sy = tabH / hud.height + val from = hud.dockPreviewBlend + hud.animate().x(tabX).y(tabY).scaleX(sx).scaleY(sy).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .setUpdateListener { hud.setDockPreview(edge, from + (1f - from) * it.animatedFraction) } + .withEndAction { + hud.animate().setUpdateListener(null) + commit() + hud.setDockPreview(DroidDeckHudDock.NONE, 0f) + hud.scaleX = 1f; hud.scaleY = 1f + hud.x = tabX; hud.y = tabY + }.start() + } else { + hud.scaleX = 1f; hud.scaleY = 1f + val was = hud.dock + val tabX = hud.x; val tabY = hud.y + val tabW = hud.width.toFloat(); val tabH = hud.height.toFloat() + commit() + val w = hud.contentWidth; val h = hud.contentHeight + val (x, y) = settled(p, DroidDeckHudDock.NONE, w, h) + hud.x = x; hud.y = y + val sx = tabW / w; val sy = tabH / h + hud.pivotX = pivotFor(x, tabX, sx) - x + hud.pivotY = pivotFor(y, tabY, sy) - y + hud.scaleX = sx; hud.scaleY = sy + hud.setDockPreview(was, 1f) + hud.animate().scaleX(1f).scaleY(1f).setDuration(Motion.ms(360).toLong()).setInterpolator(EASE) + .setUpdateListener { + val f = (1f - it.animatedFraction / EXPAND_FADE).coerceIn(0f, 1f) + hud.setDockPreview(was, f * f * (3f - 2f * f)) + } + .withEndAction { hud.animate().setUpdateListener(null); hud.setDockPreview(DroidDeckHudDock.NONE, 0f) } + .start() + } + } + + private fun pivotFor(from: Float, to: Float, scale: Float): Float = + if (scale > 0.999f) from else (to - from * scale) / (1f - scale) + + private fun settled(p: View, dock: DroidDeckHudDock, w: Float, h: Float): Pair { + val maxX = (p.width - w).coerceAtLeast(0f); val maxY = (p.height - h).coerceAtLeast(0f) + var x = wantX.coerceIn(0f, maxX); var y = wantY.coerceIn(0f, maxY) + when (dock) { + DroidDeckHudDock.LEFT -> x = 0f + DroidDeckHudDock.RIGHT -> x = maxX + DroidDeckHudDock.TOP -> y = 0f + DroidDeckHudDock.BOTTOM -> y = maxY + DroidDeckHudDock.NONE -> {} + } + return Pair(x, y) + } + + private fun keepOnScreen(v: View) { + if (snapping) return + val p = v.parent as? View ?: return + if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return + if (wantX.isNaN()) { wantX = v.x; wantY = v.y } + val maxX = (p.width - v.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - v.height).toFloat().coerceAtLeast(0f) + val anchored = (v as? DroidDeckHudView)?.let { it.dock == DroidDeckHudDock.NONE && !it.isStrip } == true + if (snaps && anchored && anchorX.isNaN()) { + anchorX = if (wantX.coerceIn(0f, maxX) < maxX / 2f) 0f else 1f + } + if (snaps && anchored && !anchorX.isNaN()) wantX = anchorX * maxX + var x = wantX.coerceIn(0f, maxX) + var y = wantY.coerceIn(0f, maxY) + if ((v as? DroidDeckHudView)?.isStrip == true) y = if (y + v.height / 2f < p.height / 2f) 0f else maxY + when (v.let { it as? DroidDeckHudView }?.dock) { + DroidDeckHudDock.LEFT -> x = 0f + DroidDeckHudDock.RIGHT -> x = maxX + DroidDeckHudDock.TOP -> y = 0f + DroidDeckHudDock.BOTTOM -> y = maxY + else -> {} + } + if (v.x != x) v.x = x + if (v.y != y) v.y = y + } + + companion object { + private const val DOCK_OVERHANG = 0.4f + private const val FLING_REACH_S = 0.18f + private const val PREVIEW_FROM = 0.55f + private const val STRIP_PULL_ACROSS_DP = 600f + private const val STRIP_PULL_OFF_DP = 150f + private const val EXPAND_FADE = 0.5f + private val EASE = PathInterpolator(0.2f, 0.8f, 0.2f, 1f) + + @Volatile @JvmStatic var showing = false + private set + + internal fun cleanGpuName(name: String): String = name.replace("(TM)", "").replace(Regex("\\s+"), " ").trim() + + internal fun protonName(pid: Int): String? = runCatching { + val environ = File("/proc/$pid/environ").readBytes().toString(Charsets.UTF_8).split('\u0000') + val paths = environ.firstOrNull { it.startsWith("STEAM_COMPAT_TOOL_PATHS=") }?.substringAfter('=') ?: return null + paths.split(':').firstOrNull { it.isNotBlank() }?.trimEnd('/')?.substringAfterLast('/') + }.getOrNull()?.takeIf { it.isNotBlank() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt new file mode 100644 index 000000000..9f59512e5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -0,0 +1,69 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + */ + +package com.droiddeck.launcher.hud + +enum class DroidDeckHudSize(val token: String, val label: String) { + FULL("full", "Full"), + TILES("tiles", "Tiles"), + PILL("pill", "Pill"), + MINIMAL("minimal", "Minimal"), + MEGA("mega", "Mega"), + STRIP("strip", "Strip"); + + fun next(): DroidDeckHudSize { + val all = values() + return all[(ordinal + 1) % all.size] + } + + fun supportedChips(): Set = when (this) { + MINIMAL -> MINIMAL_CHIPS + PILL -> PILL_CHIPS + FULL, TILES, STRIP -> STANDARD_CHIPS + MEGA -> MEGA_CHIPS + } + + companion object { + fun from(token: String?): DroidDeckHudSize = + values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL + + val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "0.01% low", "FPS .1", "Engine", "Clock") + val PILL_CHIPS = setOf("FPS", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") + val STANDARD_CHIPS = setOf( + "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", + "Battery", "GPU model", "Engine", "0.01% low", "FPS .1", "Clock", + ) + val MEGA_ONLY = setOf( + "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", + ) + val MEGA_CHIPS = STANDARD_CHIPS + MEGA_ONLY + } +} + +enum class DroidDeckHudDock(val token: String) { + NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"); + + companion object { + fun from(token: String?): DroidDeckHudDock = values().firstOrNull { it.token == token } ?: NONE + } +} + +object DroidDeckHudHdr { + const val NONE = 0 + const val ON = 1 + const val NO_HEADROOM = 2 + const val OFF = 3 + const val READY = 4 + const val TONEMAPPED = 5 + const val NOT_ON_THIS_SCREEN = 6 +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt new file mode 100644 index 000000000..80d3deb88 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -0,0 +1,1499 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + */ + +package com.droiddeck.launcher.hud + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BlurMaskFilter +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Path +import android.graphics.RectF +import android.graphics.Typeface +import android.os.SystemClock +import android.text.format.DateFormat +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import androidx.annotation.VisibleForTesting +import androidx.compose.ui.graphics.toArgb +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import com.droiddeck.launcher.ui.Palette +import com.droiddeck.launcher.ui.Themes +import java.util.Date +import java.util.Locale +import java.util.function.BiConsumer +import java.util.function.Consumer +import java.util.function.IntConsumer +import kotlin.math.max +import kotlin.math.min +import kotlin.math.roundToInt +import kotlin.math.sqrt +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import kotlinx.coroutines.withTimeoutOrNull + +class DroidDeckHudView(context: Context) : View(context) { + + private var frames: FrameStats? = null + internal fun setFrameStats(stats: FrameStats?) { frames = stats } + internal fun setMangoReadings(readings: MangoReadings?) { metrics.setMangoReadings(readings) } + + private var presentedFps = 0f + fun setPresentedFps(fps: Float) { presentedFps = fps } + + private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) + private var updateJob: Job? = null + private var hueJob: Job? = null + private val metrics = HudMetrics(context) + + private val density = resources.displayMetrics.density + + private var size = DroidDeckHudSize.FULL + private var scale = 1f + private var bgOpacity = 0.8f + private var outlineIntensity = 0.4f + private var outlineFollowAccent = true + private var colorIntensity = 1f + private var tempDisplay = HudMetrics.TempDisplay.from(null) + + private var showFPS = true + private var showEngine = true + private var showGpuModel = true + private var showCPU = true + private var showGPU = true + private var showCpuTemp = true + private var showGpuTemp = false + private var showVram = true + private var showRAM = true + private var showBattery = true + private var showPower = true + private var showBatteryTemp = false + private var showGraph = false + private var showLow001 = true + private var fpsDecimal = true + private var showClockTime = true + private var showPerCore = true + private var showSwap = true + private var showNet = true + private var showResolution = true + private var showProton = true + private var showWrapper = true + private var showDxVer = true + private var showSession = true + + private var engineLabel = "" + private var displayServer = "" + private var hdrState = DroidDeckHudHdr.NONE + private var gpuModel = "" + private var gpuSpoofName = "" + private var wineVersion = "" + private var graphicsWrapper = "" + private var dxvkVersion = "" + private var vkd3dVersion = "" + + private var snap: HudMetrics.Snapshot? = null + private var fpsNow = 0f + private var fpsAvg = 0f + private var lows: FrameStats.Lows = FrameStats.Lows.EMPTY + private var graphMinMs = 0f + private var graphMaxMs = 0f + private val graphBuf = FloatArray(FrameStats.GRAPH_FRAMES) + private val graphPath = Path() + private var resolution = "" + + private var accent = 0xFF1A9FFF.toInt() + private var surfaceRgb = 0x121417 + private var headerMark: RectF? = null + private var chipRect: RectF? = null + + var dock = DroidDeckHudDock.NONE + private set + private var tabRect: RectF? = null + private var stripRect: RectF? = null + private val tabPath = Path() + + private var dPanel: RectF? = null + private var dRadius = 0f + private var dDividerTop = -1f + private var dFrame: Bitmap? = null + private var dFrameKey = "" + private val glowPaint = Paint(Paint.ANTI_ALIAS_FLAG) + + private val colGpu = 0xFF5EE08A.toInt() + private val colCpu = 0xFF58A6FF.toInt() + private val colVram = 0xFFC98BFF.toInt() + private val colRam = 0xFFFF7BC0.toInt() + private val colBat = 0xFFFFAB5E.toInt() + private var colFps = 0xFF1A9FFF.toInt() + private var colGraph = 0xFF5CB8FF.toInt() + private val colValue = 0xFFF2F5F9.toInt() + private val colDim = 0xFF9AA4B2.toInt() + private val colLo = 0xFFE4E8EE.toInt() + private val colDisp = 0xFF4DD0E1.toInt() + private val colHdr = 0xFFFFD54F.toInt() + + private val measurePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + typeface = Typeface.create(Typeface.MONOSPACE, Typeface.BOLD) + } + private val drawPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + typeface = Typeface.create(Typeface.MONOSPACE, Typeface.BOLD) + } + private val bgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val tilePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + private val graphPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + style = Paint.Style.STROKE; strokeCap = Paint.Cap.ROUND; strokeJoin = Paint.Join.ROUND + color = colGraph + } + private val headerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + private val wordmarkPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) + } + + private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val sans: Boolean = false, val glow: Boolean = false) { + fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, sans, glow) + } + private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) + private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) + private val glyphs = ArrayList() + private val tileRects = ArrayList() + private var graphRect: RectF? = null + private var contentW = 0f + private var contentH = 0f + + private var onMovedListener: BiConsumer? = null + private var onSizeCycledListener: Consumer? = null + private var onLockChangedListener: Consumer? = null + fun setOnMovedListener(l: BiConsumer?) { onMovedListener = l } + fun setOnSizeCycledListener(l: Consumer?) { onSizeCycledListener = l } + fun setOnLockChangedListener(l: Consumer?) { onLockChangedListener = l } + private var onDockChangedListener: Consumer? = null + private var onScaledListener: IntConsumer? = null + private var onDraggedListener: BiConsumer? = null + fun setOnDraggedListener(l: BiConsumer?) { onDraggedListener = l } + private var onFlungListener: BiConsumer? = null + fun setOnFlungListener(l: BiConsumer?) { onFlungListener = l } + fun setOnDockChangedListener(l: Consumer?) { onDockChangedListener = l } + fun setOnScaledListener(l: IntConsumer?) { onScaledListener = l } + + private val lockController = HudLockController(context, this, object : HudLockController.Callbacks { + override fun onTap() { cycleSize() } + override fun onMoved(x: Float, y: Float) { onMovedListener?.accept(x, y) } + override fun onDragged(rawX: Float, rawY: Float) { onDraggedListener?.accept(rawX, rawY) } + override fun onFlung(velocityX: Float, velocityY: Float) { onFlungListener?.accept(velocityX, velocityY) } + override fun onLockChanged(locked: Boolean) { onLockChangedListener?.accept(locked) } + override fun onPinch(factor: Float) { + val next = (scale * factor).coerceIn(MIN_SCALE, MAX_SCALE) + if (next == scale) return + scale = next + rebuildAndInvalidate() + } + override fun onPinchEnd() { onScaledListener?.accept((scale * 100f).roundToInt()) } + }) + + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private var tabDownRawX = 0f + private var tabDownRawY = 0f + private var tabStartX = 0f + private var tabStartY = 0f + private var tabDragging = false + private var onTabDraggedListener: BiConsumer? = null + private var onTabDroppedListener: Runnable? = null + private var onTabDragCancelledListener: Runnable? = null + fun setOnTabDraggedListener(l: BiConsumer?) { onTabDraggedListener = l } + fun setOnTabDroppedListener(l: Runnable?) { onTabDroppedListener = l } + fun setOnTabDragCancelledListener(l: Runnable?) { onTabDragCancelledListener = l } + + private fun onTabTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + tabDownRawX = event.rawX; tabDownRawY = event.rawY + tabStartX = x; tabStartY = y + tabDragging = false + } + MotionEvent.ACTION_MOVE -> { + val dx = event.rawX - tabDownRawX; val dy = event.rawY - tabDownRawY + if (!tabDragging && dx * dx + dy * dy > touchSlop * touchSlop) tabDragging = true + if (tabDragging) onTabDraggedListener?.accept(tabStartX + dx, tabStartY + dy) + } + MotionEvent.ACTION_UP -> { + if (tabDragging) { tabDragging = false; onTabDroppedListener?.run() } + else onDockChangedListener?.accept(DroidDeckHudDock.NONE.token) + } + MotionEvent.ACTION_CANCEL -> if (tabDragging) { + tabDragging = false + onTabDragCancelledListener?.run() + } + } + return true + } + + private var previewEdge = DroidDeckHudDock.NONE + private var previewBlend = 0f + internal fun setDockPreview(edge: DroidDeckHudDock, blend: Float) { + val b = blend.coerceIn(0f, 1f) + if (edge == previewEdge && b == previewBlend) return + previewEdge = edge; previewBlend = b + invalidate() + } + internal val dockPreviewBlend: Float get() = previewBlend + + fun setEngineLabel(s: String?) { if ((s ?: "") != engineLabel) { engineLabel = s ?: ""; post { rebuildAndInvalidate() } } } + fun setGpuModel(s: String?) { if ((s ?: "") != gpuModel) { gpuModel = s ?: ""; post { rebuildAndInvalidate() } } } + fun setWineVersion(s: String?) { if ((s ?: "") != wineVersion) { wineVersion = s ?: ""; post { rebuildAndInvalidate() } } } + + fun setResolution(s: String?) { resolution = s ?: "" } + + private val periodDone = Channel(Channel.CONFLATED) + private var seenFpsUpdates = 0L + + fun onFrames() { + val updates = frames?.fpsUpdates ?: 0L + if (updates != seenFpsUpdates) { + seenFpsUpdates = updates + periodDone.trySend(Unit) + } + if (graphRect != null) invalidate() + } + + private fun cycleSize() { + size = size.next() + onSizeCycledListener?.accept(size.token) + rebuildAndInvalidate() + } + + fun applyConfig(configString: String?) { + if (configString.isNullOrEmpty()) return + val cfg = KeyValueSet(configString) + + size = DroidDeckHudSize.from(cfg.get("hudSize", "minimal")) + showFPS = cfg.get("showFPS", "1") == "1" + showEngine = cfg.get("showEngine", "1") == "1" + showGpuModel = cfg.get("showGpuModel", "1") == "1" + showCPU = cfg.get("showCPUUsage", cfg.get("showCPULoad", "1")) == "1" + showGPU = cfg.get("showGPULoad", "1") == "1" + showCpuTemp = cfg.get("showTemp", "1") == "1" + showGpuTemp = cfg.get("showGpuTemp", "0") == "1" + showVram = cfg.get("showVram", "1") == "1" + showRAM = cfg.get("showRAM", "1") == "1" + showBattery = cfg.get("showBattery", "1") == "1" + showPower = cfg.get("showPower", "1") == "1" + showBatteryTemp = cfg.get("showBatteryTemp", "0") == "1" + showGraph = cfg.get("showFPSGraph", "0") == "1" + showLow001 = cfg.get("showLow001", "1") == "1" + fpsDecimal = cfg.get("fpsDecimal", "1") == "1" + showClockTime = cfg.get("showClock", "1") == "1" + showPerCore = cfg.get("showPerCore", "1") == "1" + showSwap = cfg.get("showSwap", "1") == "1" + showNet = cfg.get("showNet", "1") == "1" + showResolution = cfg.get("showResolution", "1") == "1" + showProton = cfg.get("showProton", "1") == "1" + showWrapper = cfg.get("showWrapper", "1") == "1" + showDxVer = cfg.get("showDxVer", "1") == "1" + showSession = cfg.get("showSession", "1") == "1" + tempDisplay = HudMetrics.TempDisplay.from(cfg) + lockController.setLocked(cfg.get("hudLocked", "1") == "1") + dock = DroidDeckHudDock.from(cfg.get("hudDock", "none")) + + colorIntensity = when (cfg.get("hudColor", "vivid")) { + "soft" -> 0.72f; "mid" -> 0.88f; else -> 1.0f + } + outlineIntensity = (parseOutline(cfg.get("hudOutline", "40")) / 100f).coerceIn(0f, 1f) + outlineFollowAccent = cfg.get("hudOutlineAccent", "1") == "1" + scale = (parseIntOr(cfg.get("hudScale", "100"), 100).coerceIn(50, 200)) / 100f + bgOpacity = (parseIntOr(cfg.get("hudOpacity", "80"), 80).coerceIn(0, 100)) / 100f + applyTheme() + + rebuildAndInvalidate() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (isShown) startUpdates() + } + + override fun onDetachedFromWindow() { + stopUpdates() + super.onDetachedFromWindow() + } + + override fun onVisibilityChanged(changedView: View, visibility: Int) { + super.onVisibilityChanged(changedView, visibility) + if (isAttachedToWindow && isShown) startUpdates() else stopUpdates() + } + + private fun stopUpdates() { + updateJob?.cancel(); updateJob = null + hueJob?.cancel(); hueJob = null + } + + private fun startUpdates() { + startHueCycle() + if (updateJob?.isActive == true) return + updateJob = scope.launch { + while (isActive) { + val stats = frames + val now = System.nanoTime() + val collected = withContext(Dispatchers.IO) { + Pair(metrics.snapshot(), stats?.lows(now) ?: FrameStats.Lows.EMPTY) + } + snap = collected.first + lows = collected.second + fpsNow = stats?.fps ?: 0f + fpsAvg = stats?.averageFps() ?: 0f + graphMinMs = stats?.graphMinMs() ?: 0f + graphMaxMs = stats?.graphMaxMs() ?: 0f + onRefresh?.run() + rebuildAndInvalidate() + withTimeoutOrNull(REFRESH_MS) { periodDone.receive() } + } + } + } + + var onRefresh: Runnable? = null + + private fun applyTheme() { + applyPalette(Themes.current(context)) + if (isAttachedToWindow && isShown) startHueCycle() + } + + private fun applyPalette(palette: Palette) { + accent = palette.primary.toArgb() + surfaceRgb = palette.surface.toArgb() and 0xFFFFFF + colFps = accent + colGraph = lighten(accent, 0.3f) + } + + private fun startHueCycle() { + if (hueJob?.isActive == true) return + if (SessionPrefs.theme(context) != Themes.INNER_GAMER) return + hueJob = scope.launch { + var hue = Themes.rgbHue + var shown = Float.NaN + var last = SystemClock.uptimeMillis() + while (isActive && SessionPrefs.theme(context) == Themes.INNER_GAMER) { + val now = SystemClock.uptimeMillis() + val cycle = Themes.rgbCycleMillis(Themes.rgbSpeed).toFloat() + if (Motion.scale == 0f) { + last = now + delay(HUE_IDLE_MS) + continue + } + hue = (hue + (now - last) / cycle * 360f) % 360f + last = now + val stepped = (hue / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + if (stepped != shown) { + shown = stepped + Themes.moveRgbHue(stepped) + applyPalette(Themes.innerGamer(stepped)) + rebuildAndInvalidate() + } + delay((cycle * Themes.RGB_HUE_STEP / 360f).toLong().coerceAtLeast(16L)) + } + } + } + + private fun lighten(color: Int, amount: Float): Int = Color.rgb( + (Color.red(color) + (255 - Color.red(color)) * amount).roundToInt(), + (Color.green(color) + (255 - Color.green(color)) * amount).roundToInt(), + (Color.blue(color) + (255 - Color.blue(color)) * amount).roundToInt(), + ) + + private fun rebuildAndInvalidate() { + rebuild() + requestLayout() + invalidate() + } + + private fun blend(color: Int): Int { + val i = colorIntensity.coerceIn(0f, 1f) + if (i >= 0.999f) return color + val hsv = FloatArray(3) + Color.colorToHSV(color, hsv) + hsv[1] *= i + return Color.HSVToColor(Color.alpha(color), hsv) + } + + private fun sp(v: Float) = v * density * scale + private fun measure(text: String, sizePx: Float): Float { measurePaint.textSize = sizePx; return measurePaint.measureText(text) } + private fun lineH(sizePx: Float): Float { measurePaint.textSize = sizePx; val fm = measurePaint.fontMetrics; return fm.descent - fm.ascent } + private fun ascent(sizePx: Float): Float { measurePaint.textSize = sizePx; return measurePaint.fontMetrics.ascent } + + private fun runWidth(spans: List): Float { + var w = 0f + for (s in spans) w += measure(s.text, s.sizePx) + return w + } + + private fun placeRun(startX: Float, baseline: Float, spans: List, glow: Boolean = false): Float { + var x = startX + for (s in spans) { + glyphs.add(Glyph(x, baseline, s.text, blend(s.color), s.sizePx, glow = glow || s.glow)) + x += measure(s.text, s.sizePx) + } + return x + } + + private fun one(v: Float): String = + if (fpsDecimal) String.format(Locale.US, "%.1f", v) else v.roundToInt().toString() + + private fun fpsText(v: Float): String = + if (differs(v)) "${one(v)}\u2192${one(presentedFps)}" else one(v) + + private fun differs(v: Float): Boolean = + presentedFps > 0f && kotlin.math.abs(presentedFps - v) > maxOf(1f, v * 0.10f) + + private fun fmt1(v: Float): String = String.format(Locale.US, "%.1f", v) + private fun lowText(v: Float): String? = if (v <= 0f) null else fmt1(v) + + private fun numUnit(num: String?, unit: String, numPx: Float, unitPx: Float): List = + if (num == null) listOf(Span("—", colDim, numPx), Span(unit, colDim, unitPx)) + else listOf(Span(num, colValue, numPx), Span(unit, colDim, unitPx)) + + private fun valueUnit(text: String, numPx: Float, unitPx: Float): List { + val i = text.indexOfFirst { !(it.isDigit() || it == '.' || it == '-') } + return if (i <= 0) listOf(Span(text, colValue, numPx)) + else listOf(Span(text.substring(0, i), colValue, numPx), Span(text.substring(i), colDim, unitPx)) + } + + private fun tempSpans(c: Int?, sensor: HudMetrics.TempSensor, numPx: Float, unitPx: Float): List { + if (c == null) return emptyList() + val txt = HudMetrics.formatTemp(c.toFloat(), tempDisplay, false) + val col = HudMetrics.tempColor( + c.toFloat(), metrics.resolveThresholds(sensor, tempDisplay), tempDisplay, colValue) + val i = txt.indexOf('°') + return if (i <= 0) listOf(Span(txt, col, numPx)) + else listOf(Span(txt.substring(0, i), col, numPx), Span(txt.substring(i), colDim, unitPx)) + } + + private fun gap(unitPx: Float) = Span(" ", colDim, unitPx) + + private fun glowing(spans: List): List = + spans.mapIndexed { i, s -> if (i == 0) Span(s.text, s.color, s.sizePx, glow = true) else s } + + private fun hdrLine(px: Float): List = when (hdrState) { + DroidDeckHudHdr.ON -> listOf(Span("HDR", colHdr, px)) + DroidDeckHudHdr.NO_HEADROOM -> listOf(Span("HDR", colHdr, px), Span(" (no headroom)", colBat, px)) + DroidDeckHudHdr.OFF -> listOf(Span("HDR off", colDim, px)) + DroidDeckHudHdr.READY -> listOf(Span("HDR ready", colDim, px)) + DroidDeckHudHdr.TONEMAPPED -> listOf(Span("HDR", colDim, px), Span(" tone-mapped", colBat, px)) + DroidDeckHudHdr.NOT_ON_THIS_SCREEN -> listOf(Span("HDR", colDim, px), Span(" not on this screen", colBat, px)) + else -> emptyList() + } + private fun hdrValue(px: Float): List = when (hdrState) { + DroidDeckHudHdr.ON -> listOf(Span("on", colHdr, px)) + DroidDeckHudHdr.NO_HEADROOM -> listOf(Span("no headroom", colBat, px)) + DroidDeckHudHdr.OFF -> listOf(Span("off", colDim, px)) + DroidDeckHudHdr.READY -> listOf(Span("ready", colDim, px)) + DroidDeckHudHdr.TONEMAPPED -> listOf(Span("tone-mapped", colBat, px)) + DroidDeckHudHdr.NOT_ON_THIS_SCREEN -> listOf(Span("not on this screen", colBat, px)) + else -> emptyList() + } + private fun hdrText(): String = hdrLine(1f).joinToString("") { it.text } + + private fun gpuNameText(): String = gpuSpoofName.ifBlank { gpuModel } + private fun gpuModelSpans(px: Float, color: Int, compact: Boolean = false): List { + val name = Span(gpuNameText(), color, px) + if (gpuSpoofName.isBlank()) return listOf(name) + return listOf(name, Span(if (compact) " spoof" else " (spoof)", colBat, px)) + } + + private val inkRect = android.graphics.Rect() + + private fun rebuild() { + glyphs.clear(); tileRects.clear(); graphRect = null + headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null + val s = snap + if (s == null) { contentW = 0f; contentH = 0f; return } + if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } + when (size) { + DroidDeckHudSize.FULL -> { buildFull(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.TILES -> { buildTiles(s); intoPanel(sp(9f), header = true) } + DroidDeckHudSize.PILL -> { buildPill(s); intoPanel(sp(10f), header = false) } + DroidDeckHudSize.MINIMAL -> buildMinimal(s) + DroidDeckHudSize.MEGA -> { buildMega(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.STRIP -> buildStrip(s) + } + } + + private fun buildDockTab() { + val numPx = sp(20f) + val spans = tabSpans() + val padX = sp(9f); val padY = sp(7f) + placeRun(padX, padY + capHeight(numPx), spans) + val (w, h) = dockTabSize() + contentW = w; contentH = h + tabRect = RectF(0f, 0f, contentW, contentH) + } + + private fun tabSpans() = listOf(Span(one(fpsNow), colValue, sp(20f)), Span("fps", colDim, sp(8.5f))) + + internal fun dockTabSize(): Pair = + Pair(runWidth(tabSpans()) + 2f * sp(9f), capHeight(sp(20f)) + 2f * sp(7f)) + + private fun drawTab(canvas: Canvas, rect: RectF, edgeOf: DroidDeckHudDock = dock) { + val r = sp(8f); val stroke = outlineWidth(); val h = stroke / 2f + val round = floatArrayOf(r, r, r, r, r, r, r, r) + val edge = when (edgeOf) { + DroidDeckHudDock.LEFT -> intArrayOf(0, 3) + DroidDeckHudDock.RIGHT -> intArrayOf(1, 2) + DroidDeckHudDock.TOP -> intArrayOf(0, 1) + DroidDeckHudDock.BOTTOM -> intArrayOf(2, 3) + DroidDeckHudDock.NONE -> intArrayOf() + } + for (corner in edge) { round[corner * 2] = 0f; round[corner * 2 + 1] = 0f } + tabPath.rewind() + tabPath.addRoundRect(rect.left + h, rect.top + h, rect.right - h, rect.bottom - h, round, Path.Direction.CW) + headerPaint.shader = null + headerPaint.color = withAlpha(panelColor(), max(Color.alpha(panelColor()), 200)) + canvas.drawPath(tabPath, headerPaint) + if (stroke <= 0f) return + strokePaint.strokeWidth = stroke + strokePaint.color = outlineColor() + canvas.drawPath(tabPath, strokePaint) + } + + private fun footerClock(): Boolean = showClockTime && size == DroidDeckHudSize.PILL + + private fun measureSans(text: String, sizePx: Float): Float { wordmarkPaint.textSize = sizePx; return wordmarkPaint.measureText(text) } + + private fun panelInset() = sp(8f) + private fun panelLeft() = sp(13f) + private fun contentLeft() = panelLeft() + sp(16f) + + private fun addPanelHeader(left: Float, inner: Float): Pair { + val wordPx = sp(10f); val clockPx = sp(9.5f); val gapH = sp(7f) + wordmarkPaint.textSize = wordPx + val markH = wordmarkPaint.fontMetrics.let { it.descent - it.ascent } * 0.95f + val markTop = inner + gapH + val markLeft = left - DroidDeckMark.inkLeftFor(markH) + headerMark = RectF(markLeft, markTop, markLeft + DroidDeckMark.widthFor(markH), markTop + markH) + val midY = markTop + markH / 2f + var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(6f) + wordmarkPaint.getTextBounds("DroidDeck", 0, 9, inkRect) + glyphs.add(Glyph(x, midY - inkRect.exactCenterY(), "DroidDeck", blend(colValue), wordPx, sans = true)) + x += measureSans("DroidDeck", wordPx) + if (showClockTime) { + measurePaint.textSize = clockPx + measurePaint.getTextBounds("0", 0, 1, inkRect) + val base = midY - inkRect.exactCenterY() + x += sp(6f) + glyphs.add(Glyph(x, base, "·", blend(colDim), clockPx)) + x += measure("·", clockPx) + sp(6f) + val t = clockTimeString() + glyphs.add(Glyph(x, base, t, blend(colDim), clockPx)) + x += measure(t, clockPx) + } + dDividerTop = markTop + markH + gapH + return Pair(dDividerTop + max(1f, density), x) + } + + private fun intoPanel(pad: Float, header: Boolean) { + if (contentW <= 0f || contentH <= 0f) return + for (i in glyphs.indices) { + val g = glyphs[i] + if (kotlin.math.abs(g.x - pad) < 0.5f) glyphs[i] = g.moved(-inkLeft(g.text, g.sizePx), 0f) + } + val stroke = outlineWidth(); val inner = panelInset() + stroke + var left = contentLeft() + val content = glyphs.size + var top = inner + sp(10f) + var headerRight = 0f + if (header) { + val (bottom, right) = addPanelHeader(left, inner) + top = bottom + sp(8f); headerRight = right + } else { + val chip = sp(22f) + chipRect = RectF(left, 0f, left + chip, chip) + left += chip + sp(8f) + } + val dx = left - pad; val dy = top - pad + for (i in 0 until content) glyphs[i] = glyphs[i].moved(dx, dy) + for (r in tileRects) r.offset(dx, dy) + graphRect?.offset(dx, dy) + val panel = RectF(panelLeft(), panelInset(), max(contentW - pad + dx, headerRight) + sp(18f), + contentH - pad + dy + sp(10f) + stroke) + chipRect?.let { it.offsetTo(it.left, panel.centerY() - it.height() / 2f) } + finishPanel(panel, halfRound = !header) + } + + private fun finishPanel(panel: RectF, halfRound: Boolean) { + val r = if (halfRound) panel.height() / 2f else min(panel.height() / 2f, sp(56f)) + val margin = outlineWidth() + sp(4f) + fun curveIn(top: Float, bottom: Float): Float { + val d = max(max(panel.top + r - top, bottom - (panel.bottom - r)), 0f) + return if (d <= 0f) 0f else if (d >= r) r else r - sqrt(r * r - d * d) + } + var right = panel.right + for (g in glyphs) { + val paint = if (g.sans) wordmarkPaint else measurePaint + paint.textSize = g.sizePx + paint.getTextBounds(g.text, 0, g.text.length, inkRect) + if (inkRect.isEmpty) continue + right = max(right, g.x + inkRect.right + curveIn(g.baseline + inkRect.top, g.baseline + inkRect.bottom) + margin) + } + graphRect?.let { right = max(right, it.right + curveIn(it.top, it.bottom) + margin) } + for (t in tileRects) right = max(right, t.right + curveIn(t.top, t.bottom) + margin) + panel.right = max(right, panel.left + sp(6f) + r) + dPanel = panel; dRadius = r + contentW = panel.right + panelInset() + contentH = panel.bottom + panelInset() + } + + private fun clockTimeString(): String = DateFormat.getTimeFormat(context).format(Date()) + + private fun elapsedString(): String { + val sec = (frames?.sessionSeconds(System.nanoTime()) ?: 0f).toInt().coerceAtLeast(0) + val h = sec / 3600; val m = (sec % 3600) / 60; val s = sec % 60 + return if (h > 0) String.format(Locale.US, "%d:%02d:%02d", h, m, s) + else String.format(Locale.US, "%02d:%02d", m, s) + } + + private fun apiLabel(): String = + if (showEngine && engineLabel.isNotBlank()) engineLabel else "FPS" + + private fun dxVersionLabeled(): String = when { + engineLabel.contains("VKD3D", true) && vkd3dVersion.isNotBlank() -> "VKD3D $vkd3dVersion" + engineLabel.contains("DXVK", true) && dxvkVersion.isNotBlank() -> "DXVK $dxvkVersion" + else -> "" + } + + private fun dxVersion(): String = when { + engineLabel.contains("VKD3D", true) -> vkd3dVersion + engineLabel.contains("DXVK", true) -> dxvkVersion + else -> "" + } + + private fun resolutionString(): String { + if (resolution.isNotBlank()) return resolution + val dm = resources.displayMetrics + val hz = (display?.refreshRate ?: 0f) + val base = "${dm.widthPixels}x${dm.heightPixels}" + return if (hz >= 1f) "$base @ ${hz.roundToInt()}Hz" else base + } + + private fun addSubtleClock(pad: Float, leftAligned: Boolean = false) { + if (!footerClock()) return + val px = sp(9.5f) + val t = clockTimeString() + val w = measure(t, px) + val footerTop = contentH - pad + val baseline = footerTop - ascent(px) + val x = if (leftAligned) pad else (contentW - pad - w).coerceAtLeast(pad) + glyphs.add(Glyph(x, baseline, t, blend(colDim), px)) + contentH = footerTop + lineH(px) + pad * 0.5f + contentW = max(contentW, pad + w + pad) + } + + private fun buildFull(s: HudMetrics.Snapshot) { + val rowPx = sp(12f); val unitPx = rowPx * 0.62f + val pad = sp(10f); val lineGap = sp(4f); val lvGap = sp(8f) + val rows = ArrayList() + + if (showGpuModel && gpuNameText().isNotBlank()) + rows.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) + if (displayServer.isNotBlank()) + rows.add(HudRow(Span("DISP", colDisp, rowPx), listOf(Span(displayServer, colValue, rowPx)))) + if (hdrState != DroidDeckHudHdr.NONE) + rows.add(HudRow(Span("HDR", colHdr, rowPx), hdrValue(rowPx))) + if (showGPU) { + val v = ArrayList() + v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) + if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) + .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } + v += gap(unitPx); v += numUnit(s.gpuClockMhz?.toString(), "MHz", rowPx, unitPx) + rows.add(HudRow(Span("GPU", colGpu, rowPx), v)) + } + if (showCPU) { + val v = ArrayList() + v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) + .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) + rows.add(HudRow(Span("CPU", colCpu, rowPx), v)) + } + if (showVram && s.vramText() != null) + rows.add(HudRow(Span("VRAM", colVram, rowPx), valueUnit(s.vramText()!!, rowPx, unitPx))) + if (showRAM) { + val v = ArrayList() + v += valueUnit(s.ramUsedText(), rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.ramPercent.roundToInt().toString(), "%", rowPx, unitPx) + rows.add(HudRow(Span("RAM", colRam, rowPx), v)) + } + if (showBattery || showPower || showBatteryTemp) { + val v = ArrayList(); var any = false + if (showBattery && s.battery.percent != null) { v += numUnit(s.battery.percent.toString(), "%", rowPx, unitPx); any = true } + if (showBatteryTemp) tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx) + .let { if (it.isNotEmpty()) { if (any) v += gap(unitPx); v += it; any = true } } + if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } + if (any) rows.add(HudRow(Span("BAT", colBat, rowPx), v)) + } + if (showFPS) { + val v = ArrayList() + v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) + v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) + rows.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) + rows.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) + rows.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) + rows.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) + if (showLow001) + rows.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) + } + + var labelCol = 0f + for (r in rows) if (!r.inline) labelCol = max(labelCol, measure(r.label.text, rowPx)) + val h = lineH(rowPx); val asc = ascent(rowPx) + var y = pad; var maxRight = pad + for (r in rows) { + val baseline = y - asc + placeRun(pad, baseline, listOf(r.label)) + val valX = if (r.inline) pad + measure(r.label.text, rowPx) + lvGap + else pad + labelCol + lvGap + val end = placeRun(valX, baseline, r.vals) + maxRight = max(maxRight, end) + y += h + lineGap + } + + if (showFPS && showGraph) { + val ftPx = unitPx * 1.15f + val baseline = y - asc + placeRun(pad, baseline, listOf(Span("Frametime", colFps, ftPx))) + val stat = "min:${fmt1(graphMinMs)} max:${fmt1(graphMaxMs)}" + val statX = pad + max(labelCol, measure("Frametime", ftPx)) + lvGap + val end = placeRun(statX, baseline, listOf(Span(stat, colDim, unitPx))) + maxRight = max(maxRight, end) + y += h + lineGap + val gh = sp(22f) + val right = max(maxRight, pad + sp(160f)) + graphRect = RectF(pad, y, right, y + gh) + maxRight = max(maxRight, right) + y += gh + } + + contentW = maxRight + pad + contentH = y + pad + addSubtleClock(pad) + } + + private fun buildTiles(s: HudMetrics.Snapshot) { + val keyPx = sp(10f); val valPx = sp(18f); val subPx = sp(10f); val unitPx = sp(11f) + val pad = sp(9f); val innerPad = sp(8f); val tileGap = sp(6f); val lineGap = sp(4f) + + class Tile(val key: String, val keyColor: Int, val value: List, val sub: String?, val wide: Boolean) + val tiles = ArrayList() + + if (showFPS) tiles.add(Tile("FPS", colFps, listOf(Span(fpsText(fpsNow), colValue, valPx, glow = true)), + "${fmt1(fpsAvg)} avg · ${lowText(lows.low1Fps) ?: "—"} 1%", false)) + if (showFPS) tiles.add(Tile("FRAME", colDim, numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valPx, unitPx), + "${fmt1(graphMinMs)} – ${fmt1(graphMaxMs)}", false)) + if (showGPU) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), + if (showGpuTemp && s.gpuTempC != null) HudMetrics.formatTemp(s.gpuTempC.toFloat(), tempDisplay, false) + else s.gpuClockMhz?.let { "${it}MHz" }, false)) + if (showCPU) tiles.add(Tile("CPU", colCpu, numUnit(s.cpuPercent?.toString(), "%", valPx, unitPx), + listOfNotNull(if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null, + s.cpuClockMhz?.toString()).joinToString(" · ").ifBlank { null }, false)) + if (showVram && s.vramText() != null) tiles.add(Tile("VRAM", colVram, valueUnit(s.vramText()!!, valPx, unitPx), null, false)) + if (showRAM) tiles.add(Tile("RAM", colRam, numUnit(s.ramPercent.roundToInt().toString(), "%", valPx, unitPx), + "${s.ramUsedText()} / ${s.ramTotalText()}", false)) + if (showEngine && engineLabel.isNotBlank()) + tiles.add(Tile("API", colFps, listOf(Span(engineLabel, colValue, valPx)), + dxVersion().ifBlank { null }, false)) + if (displayServer.isNotBlank()) + tiles.add(Tile("DISPLAY", colDisp, listOf(Span(displayServer, colValue, valPx)), + if (hdrState != DroidDeckHudHdr.NONE) hdrText() else null, false)) + if (showGpuModel && gpuNameText().isNotBlank()) + tiles.add(Tile("GPU", colGpu, gpuModelSpans(valPx, colValue), null, true)) + if (showBattery || showPower || showBatteryTemp) { + val parts = ArrayList(); var any = false + if (showBattery && s.battery.percent != null) { parts += numUnit(s.battery.percent.toString(), "%", valPx, unitPx); any = true } + if (showBatteryTemp && s.battery.tempC != null) { if (any) parts += Span(" · ", colDim, subPx); parts += tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, valPx, unitPx); any = true } + if (showPower && s.battery.watts > 0f) { if (any) parts += Span(" · ", colDim, subPx); parts += numUnit(fmt1(s.battery.watts), "W", valPx, unitPx); any = true } + if (any) tiles.add(Tile("BAT", colBat, parts, null, true)) + } + if (tiles.isEmpty()) { contentW = 0f; contentH = 0f; return } + + val keyH = lineH(keyPx); val valH = lineH(valPx); val subH = lineH(subPx) + fun tileW(t: Tile) = max(max(measure(t.key, keyPx), runWidth(t.value)), + t.sub?.let { measure(it, subPx) } ?: 0f) + innerPad * 2 + var normalW = 0f + for (t in tiles) if (!t.wide) normalW = max(normalW, tileW(t)) + if (normalW == 0f) for (t in tiles) normalW = max(normalW, tileW(t) / 2f) + val tileH = innerPad * 2 + keyH + lineGap + valH + lineGap + subH + val fullW = normalW * 2 + tileGap + + var x = pad; var y = pad; var col = 0 + fun place(t: Tile, tx: Float, ty: Float, tw: Float) { + tileRects.add(RectF(tx, ty, tx + tw, ty + tileH)) + var by = ty + innerPad - ascent(keyPx) + placeRun(tx + innerPad, by, listOf(Span(t.key, t.keyColor, keyPx))) + by = ty + innerPad + keyH + lineGap - ascent(valPx) + placeRun(tx + innerPad, by, t.value) + if (t.sub != null) { + by = ty + innerPad + keyH + lineGap + valH + lineGap - ascent(subPx) + placeRun(tx + innerPad, by, listOf(Span(t.sub, colDim, subPx))) + } + } + for (t in tiles) { + if (t.wide) { + if (col != 0) { y += tileH + tileGap; col = 0; x = pad } + place(t, pad, y, fullW) + y += tileH + tileGap; col = 0; x = pad + } else { + place(t, x, y, normalW) + col++; x += normalW + tileGap + if (col == 2) { col = 0; x = pad; y += tileH + tileGap } + } + } + if (col != 0) y += tileH + tileGap + if (showFPS && showGraph) { + graphRect = RectF(pad, y, pad + fullW, y + sp(22f)) + y += sp(22f) + tileGap + } + contentW = pad + fullW + pad + contentH = y + (pad - tileGap) + addSubtleClock(pad) + } + + private fun buildPill(s: HudMetrics.Snapshot) { + val bigPx = sp(30f); val bigUnitPx = bigPx * 0.36f; val stkPx = sp(11.5f) + val pad = sp(10f); val midGap = sp(12f); val stkLineGap = sp(3f) + + val left = ArrayList() + val generating = differs(fpsNow) + val fpsPx = if (generating) bigPx * 0.55f else bigPx + left += Span(fpsText(fpsNow), colValue, fpsPx, glow = true) + left += Span("fps", colDim, if (generating) bigUnitPx * 0.8f else bigUnitPx) + + val stack = ArrayList>() + val gpuName = if (showGpuModel && gpuNameText().isNotBlank()) gpuModelSpans(stkPx, colDim, compact = true) else null + run { + val l = ArrayList() + if (showGPU) { l += Span("GPU ${s.gpuPercent ?: "—"}%", colGpu, stkPx) } + if (showCPU) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("CPU ${s.cpuPercent ?: "—"}%", colCpu, stkPx) } + if (l.isNotEmpty()) stack.add(l) + } + if (showRAM) stack.add(listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx))) + if (showBattery || showPower || showBatteryTemp) { + val l = ArrayList() + fun part(spans: List) { + l += if (l.isEmpty()) Span("BAT ", colBat, stkPx) else Span(" · ", colDim, stkPx) + l += spans + } + if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, stkPx))) + if (showBatteryTemp && s.battery.tempC != null) + part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f)) + if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, stkPx))) + if (l.isNotEmpty()) stack.add(l) + } + run { + val l = ArrayList() + l += Span("${fmt1(1000f / max(fpsNow, 1f))}ms", colDim, stkPx) + if (displayServer.isNotBlank()) { l += Span(" · ", colDim, stkPx); l += Span(displayServer, colDisp, stkPx) } + if (showVram && s.vramText() != null) { l += Span(" · ", colDim, stkPx); l += Span("${s.vramText()} vram", colDim, stkPx) } + stack.add(l) + } + if (hdrState != DroidDeckHudHdr.NONE) stack.add(hdrLine(stkPx)) + + var statsW = 0f + for (l in stack) statsW = max(statsW, runWidth(l)) + val nameOnTop = gpuName != null && runWidth(gpuName) > statsW + if (gpuName != null && !nameOnTop) stack.add(0, gpuName) + + val apiStr = apiLabel() + val hasApi = apiStr != "FPS" + val apiH = if (hasApi) lineH(stkPx) else 0f + val apiGap = if (hasApi) stkLineGap else 0f + + val leftW = runWidth(left); val leftH = lineH(bigPx) + val apiW = if (hasApi) measure(apiStr, stkPx) else 0f + val leftBlockW = max(leftW, apiW) + val leftColH = apiH + apiGap + leftH + val stkH = lineH(stkPx) + var stackW = 0f + for (l in stack) stackW = max(stackW, runWidth(l)) + val stackTotalH = stack.size * stkH + (stack.size - 1).coerceAtLeast(0) * stkLineGap + val innerH = max(leftColH, stackTotalH) + val topLineH = if (nameOnTop) stkH + stkLineGap else 0f + contentW = pad + leftBlockW + midGap + stackW + pad + contentH = pad + topLineH + innerH + pad + + var ly = pad + topLineH + (innerH - leftColH) / 2f + if (hasApi) { + placeRun(pad, ly - ascent(stkPx), listOf(Span(apiStr, colFps, stkPx))) + ly += apiH + apiGap + } + placeRun(pad, ly - ascent(bigPx), left) + var sy = pad + topLineH + (innerH - stackTotalH) / 2f + for (l in stack) { + placeRun(pad + leftBlockW + midGap, sy - ascent(stkPx), l) + sy += stkH + stkLineGap + } + addSubtleClock(pad, leftAligned = true) + if (nameOnTop && gpuName != null) { + val end = placeRun(pad, pad - ascent(stkPx), gpuName) + contentW = max(contentW, end + pad) + } + } + + private fun buildMinimal(s: HudMetrics.Snapshot) { + val bigPx = sp(34f); val bigUnitPx = bigPx * 0.32f; val subPx = sp(11.5f); val footPx = sp(9.5f) + val stroke = outlineWidth() + val left = contentLeft() + val inner = panelInset() + stroke + + val minGenerating = differs(fpsNow) + val big = listOf( + Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), + Span("fps", colDim, if (minGenerating) bigUnitPx * 0.8f else bigUnitPx)) + val sub = ArrayList() + sub += Span("1% ", colDim, subPx); sub += Span(lowText(lows.low1Fps) ?: "—", colFps, subPx) + sub += Span(" · 0.1% ", colDim, subPx); sub += Span(lowText(lows.low01Fps) ?: "—", colFps, subPx) + if (showLow001) { + sub += Span(" · 0.01% ", colDim, subPx); sub += Span(lowText(lows.low001Fps) ?: "—", colFps, subPx) + } + val footerLabel = listOf(if (showEngine) engineLabel else "", displayServer) + .filter { it.isNotBlank() }.joinToString(" · ") + val hdr = if (hdrState != DroidDeckHudHdr.NONE) hdrLine(footPx) else emptyList() + + val (headerBottom, headerRight) = addPanelHeader(left, inner) + val x = headerRight + + val colW = maxOf(runWidth(big), runWidth(sub), x - left, + max(measure(footerLabel, footPx), runWidth(hdr)), if (showGraph) sp(120f) else 0f) + val bigBase = headerBottom + sp(8f) + capHeight(big[0].sizePx) + placeRun(left - inkLeft(big[0].text, big[0].sizePx), bigBase, big, glow = true) + val subBase = bigBase + sp(10f) + capHeight(subPx) + placeRun(left - inkLeft(sub[0].text, subPx), subBase, sub) + var last = subBase + if (showGraph) { + val top = subBase + sp(9f) + graphRect = RectF(left, top, left + colW, top + sp(24f)) + last = top + sp(24f) + } + if (footerLabel.isNotBlank()) { + val base = last + sp(8f) + capHeight(footPx) + glyphs.add(Glyph(left - inkLeft(footerLabel, footPx), base, footerLabel, blend(colDim), footPx)) + last = base + } + if (hdr.isNotEmpty()) { + val base = last + sp(6f) + capHeight(footPx) + placeRun(left - inkLeft(hdr[0].text, footPx), base, hdr) + last = base + } + measurePaint.textSize = footPx + val panel = RectF(panelLeft(), panelInset(), left + colW + sp(34f), last + measurePaint.fontMetrics.descent + sp(9f) + stroke) + + finishPanel(panel, halfRound = true) + } + + private fun buildStrip(s: HudMetrics.Snapshot) { + val rowPx = sp(11.5f); val unitPx = rowPx * 0.8f; val fpsPx = sp(15f) + val padX = sp(10f); val groupGap = sp(13f) + val h = sp(26f) + val w = ((parent as? View)?.width?.takeIf { it > 0 } ?: resources.displayMetrics.widthPixels).toFloat() + val mid = h / 2f + val baseline = mid + capHeight(fpsPx) / 2f + + val markH = sp(13f) + val markLeft = padX - DroidDeckMark.inkLeftFor(markH) + headerMark = RectF(markLeft, mid - markH / 2f, markLeft + DroidDeckMark.widthFor(markH), mid + markH / 2f) + var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(8f) + + var right = w - padX + if (showClockTime) { + val t = clockTimeString() + right -= measure(t, rowPx) + glyphs.add(Glyph(right, baseline, t, blend(colDim), rowPx)) + right -= groupGap + } + + val generating = differs(fpsNow) + val fps = ArrayList() + if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) + fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) + fps += Span("fps", colDim, unitPx) + x = placeRun(x, baseline, fps) + groupGap + + if (showGraph) { + val gw = sp(72f); val gh = h * 0.55f + if (x + gw <= right) { + graphRect = RectF(x, mid - gh / 2f, x + gw, mid + gh / 2f) + x += gw + groupGap + } + } + + val groups = ArrayList>() + run { + val l = ArrayList() + l += Span("1% ", colDim, rowPx); l += Span(lowText(lows.low1Fps) ?: "—", colFps, rowPx) + l += Span(" 0.1% ", colDim, rowPx); l += Span(lowText(lows.low01Fps) ?: "—", colFps, rowPx) + if (showLow001) { l += Span(" 0.01% ", colDim, rowPx); l += Span(lowText(lows.low001Fps) ?: "—", colFps, rowPx) } + groups += l + } + if (showGPU || showGpuTemp) { + val l = arrayListOf(Span("GPU", colGpu, rowPx)) + if (showGPU) l += Span(" ${s.gpuPercent ?: "—"}%", colGpu, rowPx) + if (showGpuTemp && s.gpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) } + groups += l + } + if (showCPU || showCpuTemp) { + val l = arrayListOf(Span("CPU", colCpu, rowPx)) + if (showCPU) l += Span(" ${s.cpuPercent ?: "—"}%", colCpu, rowPx) + if (showCpuTemp && s.cpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) } + groups += l + } + if (showVram) s.vramText()?.let { groups += listOf(Span("VRAM $it", colVram, rowPx)) } + if (showRAM) groups += listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, rowPx)) + if (showBattery || showPower || showBatteryTemp) { + val l = ArrayList() + fun part(spans: List) { + l += if (l.isEmpty()) Span("BAT ", colBat, rowPx) else Span(" ", colDim, rowPx) + l += spans + } + if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, rowPx))) + if (showBatteryTemp && s.battery.tempC != null) + part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx)) + if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, rowPx))) + if (l.isNotEmpty()) groups += l + } + if (displayServer.isNotBlank()) groups += listOf(Span(displayServer, colDisp, rowPx)) + if (hdrState != DroidDeckHudHdr.NONE) groups += hdrLine(rowPx) + if (showGpuModel && gpuNameText().isNotBlank()) groups += gpuModelSpans(rowPx, colDim, compact = true) + + for (g in groups) { + if (x + runWidth(g) > right) break + x = placeRun(x, baseline, g) + groupGap + } + + stripRect = RectF(0f, 0f, w, h) + contentW = w; contentH = h + } + + private fun capHeight(px: Float): Float { + measurePaint.textSize = px + measurePaint.getTextBounds("0", 0, 1, inkRect) + return -inkRect.top.toFloat() + } + + private fun inkLeft(text: String, px: Float): Float { + if (text.isEmpty()) return 0f + measurePaint.textSize = px + measurePaint.getTextBounds(text, 0, text.length, inkRect) + return inkRect.left.toFloat() + } + + private fun layoutColumn(rows: List, x: Float, y0: Float, + rowPx: Float, lineGap: Float, lvGap: Float): Pair { + if (rows.isEmpty()) return Pair(y0, x) + var labelCol = 0f + for (r in rows) if (!r.inline) labelCol = max(labelCol, measure(r.label.text, rowPx)) + val h = lineH(rowPx); val asc = ascent(rowPx) + var y = y0; var right = x + for (r in rows) { + val baseline = y - asc + placeRun(x, baseline, listOf(r.label)) + val valX = if (r.inline) x + measure(r.label.text, rowPx) + lvGap + else x + labelCol + lvGap + val end = placeRun(valX, baseline, r.vals) + right = max(right, end) + y += h + lineGap + } + return Pair(y - lineGap, right) + } + + private fun layoutWrap(fragments: List>, x: Float, y0: Float, maxWidth: Float, + px: Float, lineGap: Float): Pair { + if (fragments.isEmpty()) return Pair(y0, x) + val h = lineH(px); val asc = ascent(px) + val sepW = measure(" · ", px) + var cx = x; var y = y0; var right = x; var firstOnLine = true + for (frag in fragments) { + val w = runWidth(frag) + if (!firstOnLine && (cx + sepW + w - x) > maxWidth) { y += h + lineGap; cx = x; firstOnLine = true } + if (!firstOnLine) { placeRun(cx, y - asc, listOf(Span(" · ", colDim, px))); cx += sepW } + val end = placeRun(cx, y - asc, frag) + cx = end; right = max(right, end); firstOnLine = false + } + return Pair(y + h, right) + } + + private fun buildMega(s: HudMetrics.Snapshot) { + val rowPx = sp(11.5f); val unitPx = rowPx * 0.62f; val bandPx = sp(9.5f) + val pad = sp(10f); val lineGap = sp(3.5f); val lvGap = sp(7f); val gutter = sp(16f) + + val left = ArrayList() + if (showGpuModel && gpuNameText().isNotBlank()) + left.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) + if (showGPU) { + val v = ArrayList() + v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) + if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) + .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } + v += gap(unitPx); v += numUnit(s.gpuClockMhz?.toString(), "MHz", rowPx, unitPx) + left.add(HudRow(Span("GPU", colGpu, rowPx), v)) + } + if (showCPU) { + val v = ArrayList() + v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) + .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) + left.add(HudRow(Span("CPU", colCpu, rowPx), v)) + } + if (showPerCore) { + val pct = s.perCorePercent; val clk = s.perCoreClockMhz + val n = max(pct.size, clk.size) + for (i in 0 until n) { + val v = ArrayList() + v += numUnit(if (i < pct.size && pct[i] >= 0) pct[i].toString() else null, "%", rowPx, unitPx) + v += gap(unitPx) + v += numUnit(if (i < clk.size && clk[i] > 0) clk[i].toString() else null, "MHz", rowPx, unitPx) + left.add(HudRow(Span("C$i", colCpu, rowPx), v)) + } + } + + val right = ArrayList() + if (showVram && s.vramText() != null) + right.add(HudRow(Span("VRAM", colVram, rowPx), valueUnit(s.vramText()!!, rowPx, unitPx))) + if (showRAM) { + val v = ArrayList() + v += valueUnit(s.ramUsedText(), rowPx, unitPx) + v += Span("/", colDim, unitPx); v += valueUnit(s.ramTotalText(), rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.ramPercent.roundToInt().toString(), "%", rowPx, unitPx) + right.add(HudRow(Span("RAM", colRam, rowPx), v)) + } + if (showSwap && s.swapUsedText() != null) { + val v = ArrayList() + v += valueUnit(s.swapUsedText()!!, rowPx, unitPx) + s.swapTotalText()?.let { v += Span("/", colDim, unitPx); v += valueUnit(it, rowPx, unitPx) } + right.add(HudRow(Span("SWP", colRam, rowPx), v)) + } + if (showNet && s.netDownBps != null) { + val d = (s.netDownBps ?: 0L) / 1024L + val u = (s.netUpBps ?: 0L) / 1024L + val v = ArrayList() + v += Span("↓", colDim, unitPx); v += Span(d.toString(), colValue, rowPx) + v += Span(" ↑", colDim, unitPx); v += Span(u.toString(), colValue, rowPx) + v += Span("KB/s", colDim, unitPx) + right.add(HudRow(Span("NET", colFps, rowPx), v)) + } + if (showBattery || showPower || showBatteryTemp) { + val v = ArrayList(); var any = false + if (showBattery && s.battery.percent != null) { v += numUnit(s.battery.percent.toString(), "%", rowPx, unitPx); any = true } + if (showBatteryTemp) tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx) + .let { if (it.isNotEmpty()) { if (any) v += gap(unitPx); v += it; any = true } } + if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } + if (any) right.add(HudRow(Span("BAT", colBat, rowPx), v)) + } + if (showFPS) { + val v = ArrayList() + v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) + v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) + right.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) + right.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) + right.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) + right.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) + if (showLow001) + right.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) + } + + val (leftBottom, leftRight) = layoutColumn(left, pad, pad, rowPx, lineGap, lvGap) + val rightX = (if (left.isEmpty()) pad else leftRight + gutter) + val (rightBottom, rightRight) = layoutColumn(right, rightX, pad, rowPx, lineGap, lvGap) + var y = max(leftBottom, rightBottom) + var maxRight = max(leftRight, rightRight) + + val band = ArrayList>() + if (showResolution) band.add(listOf(Span("RES ", colDim, bandPx), Span(resolutionString(), colValue, bandPx))) + if (displayServer.isNotBlank()) band.add(listOf(Span("DISP ", colDim, bandPx), Span(displayServer, colDisp, bandPx))) + if (hdrState != DroidDeckHudHdr.NONE) band.add(listOf(Span("HDR ", colDim, bandPx)) + hdrValue(bandPx)) + if (showProton && wineVersion.isNotBlank()) band.add(listOf(Span(wineVersion, colVram, bandPx))) + if (showSession) band.add(listOf(Span("elapsed ", colDim, bandPx), Span(elapsedString(), colValue, bandPx))) + if (band.isNotEmpty()) { + y += sp(4f) + val (bBottom, bRight) = layoutWrap(band, pad, y, max(maxRight - pad, sp(180f)), bandPx, lineGap) + y = bBottom; maxRight = max(maxRight, bRight) + } + + if (showGraph) { + y += sp(3f) + val gh = sp(22f) + val gr = max(maxRight, pad + sp(220f)) + graphRect = RectF(pad, y, gr, y + gh) + maxRight = max(maxRight, gr) + y += gh + } + + val dxLine = dxVersionLabeled() + val hasDx = showDxVer && dxLine.isNotBlank() + if (hasDx) { + y += sp(4f) + maxRight = max(maxRight, placeRun(pad, y - ascent(bandPx), listOf(Span(dxLine, colDim, bandPx)))) + y += lineH(bandPx) + } + if (showWrapper && graphicsWrapper.isNotBlank()) { + y += if (hasDx) sp(1f) else sp(4f) + maxRight = max(maxRight, placeRun(pad, y - ascent(bandPx), listOf(Span(graphicsWrapper, colDim, bandPx)))) + y += lineH(bandPx) + } + + contentW = maxRight + pad + contentH = y + pad + addSubtleClock(pad) + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + if (stripRect != null) { setMeasuredDimension(contentW.roundToInt(), resolveSize(contentH.roundToInt(), heightMeasureSpec)); return } + setMeasuredDimension( + resolveSize(contentW.roundToInt(), widthMeasureSpec), + resolveSize(contentH.roundToInt(), heightMeasureSpec), + ) + } + + override fun onDraw(canvas: Canvas) { + if (contentW <= 0f || contentH <= 0f) { lockController.drawBadge(canvas); return } + val blend = if (dock == DroidDeckHudDock.NONE && previewEdge != DroidDeckHudDock.NONE) previewBlend else 0f + if (blend <= 0f) { drawContent(canvas); return } + if (blend < 1f) { + canvas.saveLayerAlpha(0f, 0f, width.toFloat(), height.toFloat(), ((1f - blend) * 255f).roundToInt()) + drawContent(canvas) + canvas.restore() + } + drawTabPreview(canvas, blend) + } + + private fun drawTabPreview(canvas: Canvas, blend: Float) { + val (w, h) = dockTabSize() + if (scaleX <= 0f || scaleY <= 0f) return + canvas.save() + canvas.translate(width / 2f, height / 2f) + canvas.scale(1f / scaleX, 1f / scaleY) + canvas.translate(-w / 2f, -h / 2f) + canvas.saveLayerAlpha(0f, 0f, w, h, (blend * 255f).roundToInt()) + drawTab(canvas, RectF(0f, 0f, w, h), previewEdge) + var x = sp(9f) + val baseline = sp(7f) + capHeight(sp(20f)) + for (span in tabSpans()) { + drawPaint.textSize = span.sizePx + drawPaint.color = blend(span.color) + canvas.drawText(span.text, x, baseline, drawPaint) + x += measure(span.text, span.sizePx) + } + canvas.restore() + canvas.restore() + } + + private fun drawContent(canvas: Canvas) { + + dPanel?.let { panel -> panelFrame(panel)?.let { canvas.drawBitmap(it, 0f, 0f, null) } } + + if (tileRects.isNotEmpty()) { + tilePaint.color = Color.argb((14 * bgOpacity).roundToInt().coerceIn(8, 40), 255, 255, 255) + val tr = sp(6f) + for (rect in tileRects) canvas.drawRoundRect(rect, tr, tr, tilePaint) + } + + chipRect?.let { drawChip(canvas, it) } + tabRect?.let { drawTab(canvas, it) } + stripRect?.let { drawStrip(canvas, it) } + + for (g in glyphs) { + val paint = if (g.sans) wordmarkPaint else drawPaint + paint.textSize = g.sizePx + paint.color = g.color + if (g.glow) paint.setShadowLayer(sp(6f), 0f, 0f, withAlpha(colGraph, 217)) + canvas.drawText(g.text, g.x, g.baseline, paint) + if (g.glow) paint.clearShadowLayer() + } + headerMark?.let { DroidDeckMark.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } + + graphRect?.let { drawGraph(canvas, it) } + + lockController.drawBadge(canvas) + } + + private fun drawGraph(canvas: Canvas, rect: RectF) { + val stats = frames ?: return + stats.graph(graphBuf) + val step = rect.width() / (graphBuf.size - 1) + graphPath.rewind() + for (i in graphBuf.indices) { + val px = rect.left + i * step + val py = rect.bottom - min(graphBuf[i], GRAPH_CLIP_MS) / FrameStats.GRAPH_MAX_MS * rect.height() + if (i == 0) graphPath.moveTo(px, py) else graphPath.lineTo(px, py) + } + if (dPanel != null) { + graphPaint.strokeWidth = sp(4.5f) + graphPaint.color = withAlpha(blend(colGraph), 56) + canvas.drawPath(graphPath, graphPaint) + } + graphPaint.strokeWidth = sp(1.6f) + graphPaint.color = blend(colGraph) + canvas.drawPath(graphPath, graphPaint) + } + + private fun drawStrip(canvas: Canvas, rect: RectF) { + headerPaint.shader = null + headerPaint.color = panelColor() + canvas.drawRect(rect, headerPaint) + val stroke = outlineWidth() + if (stroke <= 0f) return + val line = max(stroke / 2f, density) + val p = parent as? View + val atBottom = p != null && p.height > 0 && y + height / 2f > p.height / 2f + headerPaint.color = withAlpha(outlineColor(), (110 + 145 * outlineIntensity).roundToInt().coerceAtMost(255)) + if (atBottom) canvas.drawRect(rect.left, rect.top, rect.right, rect.top + line, headerPaint) + else canvas.drawRect(rect.left, rect.bottom - line, rect.right, rect.bottom, headerPaint) + } + + private fun outlineWidth(): Float = if (outlineIntensity > 0f) outlineIntensity * sp(3.5f) else 0f + private fun outlineColor(): Int = if (outlineFollowAccent) accent else Color.rgb(200, 200, 200) + private fun panelColor(): Int = Color.argb((bgOpacity.coerceIn(0f, 1f) * 255f).roundToInt(), + Color.red(surfaceRgb), Color.green(surfaceRgb), Color.blue(surfaceRgb)) + private fun withAlpha(color: Int, alpha: Int): Int = + Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color)) + + private fun dShape(l: Float, t: Float, r: Float, b: Float, rad: Float, corner: Float): Path { + return Path().apply { + moveTo(l, t + corner) + lineTo(l, b - corner); quadTo(l, b, l + corner, b) + lineTo(r - rad, b) + arcTo(r - 2f * rad, b - 2f * rad, r, b, 90f, -90f, false) + lineTo(r, t + rad) + arcTo(r - 2f * rad, t, r, t + 2f * rad, 0f, -90f, false) + lineTo(l + corner, t); quadTo(l, t, l, t + corner) + close() + } + } + + private fun roundEdgeX(p: RectF, y: Float, stroke: Float): Float { + val r = dRadius - stroke + val cx = p.right - dRadius + val dy = p.top + dRadius - y + return if (dy <= 0f) p.right - stroke else if (dy >= r) cx else cx + sqrt(r * r - dy * dy) + } + + private fun panelFrame(panel: RectF): Bitmap? { + if (width <= 0 || height <= 0) return null + val stroke = outlineWidth() + val key = "$width,$height,$panel,$dRadius,$dDividerTop,$stroke,$accent,$surfaceRgb,$bgOpacity,${outlineColor()}" + if (key == dFrameKey) dFrame?.let { return it } + val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888) + val c = Canvas(bmp) + val corner = sp(6f) + val body = dShape(panel.left, panel.top, panel.right, panel.bottom, dRadius, corner) + bgPaint.color = panelColor() + c.drawPath(body, bgPaint) + c.save() + c.clipPath(body) + if (dDividerTop >= 0f) { + val dividerBottom = dDividerTop + max(1f, density) + headerPaint.shader = android.graphics.LinearGradient(panel.left, 0f, panel.right, 0f, + withAlpha(accent, 46), withAlpha(accent, 0), android.graphics.Shader.TileMode.CLAMP) + c.drawRect(panel.left, panel.top, panel.right, dividerBottom, headerPaint) + headerPaint.shader = null + headerPaint.color = withAlpha(accent, 90) + c.drawRect(panel.left, dDividerTop, roundEdgeX(panel, dDividerTop, stroke), dividerBottom, headerPaint) + } + val halfRound = dRadius >= panel.height() / 2f - 0.5f + val wmH = if (halfRound) panel.height() * 0.92f else min(panel.height(), panel.width()) * 0.55f + DroidDeckMark.draw(c, panel.right - DroidDeckMark.widthFor(wmH) - (if (halfRound) panel.height() * 0.02f else sp(10f)), + panel.centerY() - wmH / 2f, wmH, Color.argb(20, 255, 255, 255), withAlpha(accent, 20)) + c.restore() + if (stroke > 0f) { + val h = stroke / 2f + val outline = dShape(panel.left + h, panel.top + h, panel.right - h, panel.bottom - h, dRadius - h, corner) + val blur = BlurMaskFilter((sp(3.2f) - 0.5f).coerceAtLeast(0.5f) / 0.57735f, BlurMaskFilter.Blur.NORMAL) + glowPaint.strokeWidth = stroke + for (pass in 0..2) { + glowPaint.maskFilter = if (pass < 2) blur else null + glowPaint.style = Paint.Style.STROKE; glowPaint.color = outlineColor() + c.drawPath(outline, glowPaint) + } + glowPaint.maskFilter = null + } + dFrame = bmp; dFrameKey = key + return bmp + } + + @VisibleForTesting + internal fun showForTest(snapshot: HudMetrics.Snapshot, engine: String, nowNs: Long) { + engineLabel = engine + snap = snapshot + lows = frames?.lows(nowNs) ?: FrameStats.Lows.EMPTY + fpsNow = frames?.fps ?: 0f + rebuild() + } + + @VisibleForTesting internal fun panelForTest(): RectF? = dPanel + @VisibleForTesting internal fun panelRadiusForTest(): Float = dRadius + @VisibleForTesting internal fun graphForTest(): RectF? = graphRect + @VisibleForTesting internal fun linesForTest(): List = + glyphs.groupBy { it.baseline.roundToInt() }.toSortedMap().values.map { line -> line.sortedBy { it.x }.joinToString("") { it.text } } + + private fun drawChip(canvas: Canvas, rect: RectF) { + val r = sp(6f) + headerPaint.shader = null + headerPaint.color = Color.argb(235, Color.red(surfaceRgb), Color.green(surfaceRgb), Color.blue(surfaceRgb)) + canvas.drawRoundRect(rect, r, r, headerPaint) + strokePaint.strokeWidth = sp(1f) + strokePaint.color = accent + val h = strokePaint.strokeWidth / 2f + canvas.drawRoundRect(rect.left + h, rect.top + h, rect.right - h, rect.bottom - h, r, r, strokePaint) + val markH = rect.height() * 0.6f + val markW = DroidDeckMark.widthFor(markH) + DroidDeckMark.draw(canvas, rect.centerX() - markW / 2f, rect.centerY() - markH / 2f, markH, blend(colValue), accent) + } + + internal var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null + + override fun onTouchEvent(event: MotionEvent): Boolean { + if (dock != DroidDeckHudDock.NONE) return onTabTouch(event) + if (event.actionMasked == MotionEvent.ACTION_DOWN && lockController.isLocked() && + passesTouchAt?.invoke(event.rawX, event.rawY) == true) return false + return lockController.onTouchEvent(event) + } + + internal val isStrip: Boolean get() = stripRect != null + + internal val contentWidth: Float get() = contentW + internal val contentHeight: Float get() = contentH + + internal val isDragging: Boolean get() = lockController.isDragging() || tabDragging + + private companion object { + const val REFRESH_MS = 500L + private const val HUE_IDLE_MS = 500L + const val MIN_SCALE = 0.5f + const val MAX_SCALE = 2f + const val GRAPH_CLIP_MS = 49.9f + + fun parseIntOr(s: String?, d: Int): Int = try { s?.trim()?.toInt() ?: d } catch (e: Exception) { d } + + fun parseOutline(v: String?): Int = when (v?.trim()?.lowercase(Locale.US)) { + null -> 40; "off" -> 0; "soft" -> 40; "strong" -> 70 + else -> v.trim().toIntOrNull()?.coerceIn(0, 100) ?: 40 + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt new file mode 100644 index 000000000..621f6dc1f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Canvas +import android.graphics.Matrix +import android.graphics.Paint +import android.graphics.Path + +internal object DroidDeckMark { + private const val VIEW_X = -55.98f + const val VIEW_W = 239.92f + const val VIEW_H = 223.72f + + private val body: Path by lazy { + val d = Path().apply { + moveTo(-31.98f, 0f) + lineTo(63.97f, 0f) + cubicTo(125.81f, 0f, 175.93f, 50.08f, 175.93f, 111.86f) + cubicTo(175.93f, 173.64f, 125.81f, 223.72f, 63.97f, 223.72f) + lineTo(-31.98f, 223.72f) + close() + } + val cut = Path().apply { + addCircle(63.98f, 111.86f, 71.81f, Path.Direction.CW) + addRect(56.055f, 0f, 71.885f, 45f, Path.Direction.CW) + addRect(56.055f, 178.72f, 71.885f, 223.72f, Path.Direction.CW) + } + d.op(cut, Path.Op.DIFFERENCE) + d.offset(-VIEW_X, 0f) + d + } + + private val scaled = Path() + private val matrix = Matrix() + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + + fun widthFor(height: Float): Float = height * VIEW_W / VIEW_H + + fun inkLeftFor(height: Float): Float = (-31.98f - VIEW_X) * height / VIEW_H + fun inkRightFor(height: Float): Float = (175.93f - VIEW_X) * height / VIEW_H + + fun draw(canvas: Canvas, left: Float, top: Float, height: Float, bodyColor: Int, orbColor: Int) { + val s = height / VIEW_H + matrix.setScale(s, s) + matrix.postTranslate(left, top) + body.transform(matrix, scaled) + paint.color = bodyColor + canvas.drawPath(scaled, paint) + paint.color = orbColor + canvas.drawCircle(left + (63.98f - VIEW_X) * s, top + 111.86f * s, 55.98f * s, paint) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt new file mode 100644 index 000000000..2bc92b98d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt @@ -0,0 +1,238 @@ +package com.droiddeck.launcher.hud + +import java.io.File +import kotlin.math.roundToInt + +internal class FrameStats { + private val graph = FloatArray(GRAPH_FRAMES) + private var graphHead = 0 + private var lastPresentNs = 0L + private var lastFpsUpdateNs = 0L + private var framesSinceUpdate = 0 + + private val lowsRing = LongArray(LOWS_FRAMES) + private var lowsHead = 0 + private var lowsSize = 0 + private var cachedLows = Lows.EMPTY + private var cachedLowsNs = 0L + + private var sessionStartNs = 0L + private var sessionFrames = 0L + + @Volatile var fps = 0f + private set + + @Volatile var fpsUpdates = 0L + private set + + @Volatile var count = 0L + private set + + @Synchronized + fun add(frametimeNs: Long, timeNs: Long) { + if (frametimeNs <= 0L) return + if (lastPresentNs != 0L) { + graph[graphHead] = frametimeNs / 1e6f + graphHead = (graphHead + 1) % GRAPH_FRAMES + } + val elapsed = timeNs - lastFpsUpdateNs + if (elapsed >= FPS_PERIOD_NS) { + fps = (1e9 * framesSinceUpdate / elapsed).toFloat() + framesSinceUpdate = 0 + lastFpsUpdateNs = timeNs + fpsUpdates++ + } + lastPresentNs = timeNs + framesSinceUpdate++ + + if (frametimeNs < PAUSE_NS) { + lowsRing[lowsHead] = frametimeNs + lowsHead = (lowsHead + 1) % LOWS_FRAMES + if (lowsSize < LOWS_FRAMES) lowsSize++ + if (sessionStartNs == 0L) sessionStartNs = timeNs - frametimeNs + sessionFrames++ + } + count++ + } + + @Synchronized + fun reset() { + graph.fill(0f) + graphHead = 0 + lastPresentNs = 0L + lastFpsUpdateNs = 0L + framesSinceUpdate = 0 + lowsHead = 0 + lowsSize = 0 + cachedLows = Lows.EMPTY + cachedLowsNs = 0L + sessionStartNs = 0L + sessionFrames = 0L + fps = 0f + count++ + } + + fun frametimeMs(): Float = 1000f / maxOf(fps, 1f) + + @Synchronized + fun graph(out: FloatArray) { + for (i in 0 until GRAPH_FRAMES) out[i] = graph[(graphHead + i) % GRAPH_FRAMES] + } + + @Synchronized + fun graphMinMs(): Float = graph.min() + + @Synchronized + fun graphMaxMs(): Float = graph.max() + + @Synchronized + fun averageFps(): Float { + if (sessionFrames < 2 || lastPresentNs <= sessionStartNs) return 0f + return (1e9 * sessionFrames / (lastPresentNs - sessionStartNs)).toFloat() + } + + @Synchronized + fun sessionSeconds(nowNs: Long): Float = if (sessionStartNs == 0L) 0f else (nowNs - sessionStartNs) / 1e9f + + class Lows(val low1Fps: Float, val low01Fps: Float, val low001Fps: Float) { + companion object { + val EMPTY = Lows(0f, 0f, 0f) + } + } + + fun lows(nowNs: Long): Lows { + val copy: LongArray + synchronized(this) { + if (cachedLows !== Lows.EMPTY && nowNs - cachedLowsNs < LOWS_RECOMPUTE_NS) return cachedLows + if (lowsSize < 2) return Lows.EMPTY + copy = LongArray(lowsSize) + val start = (lowsHead - lowsSize + LOWS_FRAMES) % LOWS_FRAMES + for (i in 0 until lowsSize) copy[i] = lowsRing[(start + i) % LOWS_FRAMES] + } + copy.sort() + fun at(p: Double): Float { + val ft = copy[(p * (copy.size - 1)).roundToInt().coerceIn(0, copy.size - 1)] + return if (ft > 0) (1e9 / ft).toFloat() else 0f + } + val result = Lows(at(0.99), at(0.999), at(0.9999)) + synchronized(this) { + cachedLows = result + cachedLowsNs = nowNs + } + return result + } + + companion object { + const val GRAPH_FRAMES = 200 + const val GRAPH_MAX_MS = 50f + const val FPS_PERIOD_NS = 500_000_000L + const val LOWS_FRAMES = 8192 + private const val PAUSE_NS = 1_000_000_000L + private const val LOWS_RECOMPUTE_NS = 250_000_000L + } +} + +internal class GameFrameFeed(private val file: File, val stats: FrameStats = FrameStats()) { + private var handle = 0L + private var nextOpenNs = 0L + private var lastRingFrameNs = 0L + private var lastInfoNs = 0L + private val frametimes = LongArray(HudFrames.CAPACITY) + private val times = LongArray(HudFrames.CAPACITY) + private val info = IntArray(5) + @Volatile private var fromGamescope = false + private var lastCompositorNs = 0L + @Volatile private var compositorFrames = 0L + private var seenCompositorFrames = 0L + + @Volatile var engine = "" + private set + @Volatile var steamFocused = false + private set + @Volatile var pid = 0 + private set + @Volatile var outputWidth = 0 + private set + @Volatile var outputHeight = 0 + private set + @Volatile var refreshMilliHz = 0 + private set + + fun poll(nowNs: Long): Boolean { + val compositorAdded = compositorFrames != seenCompositorFrames + seenCompositorFrames = compositorFrames + if (handle == 0L) { + if (nowNs < nextOpenNs) return compositorAdded + nextOpenNs = nowNs + REOPEN_NS + handle = runCatching { HudFrames.nativeOpen(file.path) }.getOrDefault(0L) + if (handle == 0L) return compositorAdded + HudFrames.nativePoll(handle, frametimes, times) + } + val n = HudFrames.nativePoll(handle, frametimes, times) + if (n > 0) { + if (!fromGamescope) { + stats.reset() + fromGamescope = true + } + for (i in 0 until n) stats.add(frametimes[i], times[i]) + lastRingFrameNs = times[n - 1] + } else if (lastRingFrameNs != 0L && nowNs - lastRingFrameNs > LIVE_NS) { + fromGamescope = false + } + if (n <= 0 && nowNs - maxOf(lastRingFrameNs, nextOpenNs - REOPEN_NS) > STALE_NS) close() + if (nowNs - lastInfoNs >= INFO_NS) { + lastInfoNs = nowNs + readInfo() + } + return n > 0 || compositorAdded + } + + fun onCompositorFrame(nowNs: Long) { + if (fromGamescope) { + lastCompositorNs = 0L + return + } + val last = lastCompositorNs + lastCompositorNs = nowNs + if (last != 0L) { + stats.add(nowNs - last, nowNs) + compositorFrames++ + } + } + + fun close() { + if (handle != 0L) HudFrames.nativeClose(handle) + handle = 0L + } + + private fun readInfo() { + val name = if (handle != 0L && fromGamescope) HudFrames.nativeInfo(handle, info) else null + if (name == null) { + engine = "" + return + } + pid = info[0] + outputWidth = info[1] + outputHeight = info[2] + refreshMilliHz = info[3] + steamFocused = info[4] != 0 + engine = engineLabel(name) + } + + companion object { + private const val REOPEN_NS = 2_000_000_000L + private const val LIVE_NS = 2_000_000_000L + private const val STALE_NS = 5_000_000_000L + private const val INFO_NS = 500_000_000L + + fun engineLabel(name: String): String = when (name) { + "DXVK" -> "DXVK" + "vkd3d" -> "VKD3D" + "mesa zink" -> "ZINK" + "Damavand" -> "DAMAVAND" + "Feral3D" -> "Feral3D" + "gamescope", "" -> "GAMESCOPE" + else -> "VULKAN" + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt new file mode 100644 index 000000000..ca13e7a3e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.hud + +internal object HudFrames { + init { + System.loadLibrary("droiddeckwayland") + } + + const val PATH = "run/droiddeck-hud/frames" + const val CAPACITY = 1024 + + @JvmStatic external fun nativeOpen(path: String): Long + @JvmStatic external fun nativeClose(handle: Long) + @JvmStatic external fun nativePoll(handle: Long, frametimes: LongArray, times: LongArray): Int + @JvmStatic external fun nativeInfo(handle: Long, info: IntArray): String? +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java new file mode 100644 index 000000000..98c34df7c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -0,0 +1,260 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + */ + +package com.droiddeck.launcher.hud; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.RectF; +import android.os.SystemClock; +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.ScaleGestureDetector; +import android.view.View; + +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +public class HudLockController { + + public interface Callbacks { + void onTap(); + void onMoved(float x, float y); + default void onDragged(float rawX, float rawY) {} + default void onFlung(float velocityX, float velocityY) {} + void onLockChanged(boolean locked); + default void onPinch(float factor) {} + default void onPinchEnd() {} + } + + private static final long FADE_IN_MS = 160; + private static final long HOLD_TOGGLE_MS = 1500; + private static final long HOLD_REFLASH_MS = 750; + private static final long FADE_OUT_MS = 420; + private static final long FRAME_MS = 32; + + private final View view; + private final Callbacks cb; + private final GestureDetector detector; + private final ScaleGestureDetector scaleDetector; + + private boolean locked = false; + + private float downRawX, downRawY, startX, startY; + private boolean dragging = false; + private boolean pinched = false; + + private long fadeStart = 0; + private long holdMs = HOLD_TOGGLE_MS; + private boolean fadeShowLocked = false; + + private final Paint iconFill = new Paint(Paint.ANTI_ALIAS_FLAG); + private final Paint iconStroke = new Paint(Paint.ANTI_ALIAS_FLAG); + + public HudLockController(Context context, View view, Callbacks cb) { + this.view = view; + this.cb = cb; + this.detector = new GestureDetector(context, new Listener()); + this.detector.setIsLongpressEnabled(true); + this.scaleDetector = new ScaleGestureDetector(context, new PinchListener()); + this.scaleDetector.setQuickScaleEnabled(false); + iconFill.setStyle(Paint.Style.FILL); + iconStroke.setStyle(Paint.Style.STROKE); + iconStroke.setStrokeCap(Paint.Cap.ROUND); + iconStroke.setStrokeJoin(Paint.Join.ROUND); + } + + public void setLocked(boolean locked) { this.locked = locked; } + + public boolean isLocked() { return locked; } + + public boolean isDragging() { return dragging; } + + public boolean onTouchEvent(MotionEvent event) { + scaleDetector.onTouchEvent(event); + detector.onTouchEvent(event); + int action = event.getActionMasked(); + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + if (dragging && !locked) cb.onMoved(view.getX(), view.getY()); + dragging = false; + } + return true; + } + + private final class Listener extends GestureDetector.SimpleOnGestureListener { + @Override + public boolean onDown(MotionEvent e) { + downRawX = e.getRawX(); + downRawY = e.getRawY(); + startX = view.getX(); + startY = view.getY(); + dragging = false; + pinched = false; + return true; + } + + @Override + public void onLongPress(MotionEvent e) { + locked = !locked; + cb.onLockChanged(locked); + flash(locked, HOLD_TOGGLE_MS); + } + + @Override + public boolean onSingleTapUp(MotionEvent e) { + if (pinched) return true; + if (locked) { + flash(true, HOLD_REFLASH_MS); + } else { + cb.onTap(); + } + return true; + } + + @Override + public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { + if (dragging && !locked && !pinched) cb.onFlung(velocityX, velocityY); + return true; + } + + @Override + public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + if (pinched) return true; + if (locked) { + if (!dragging) flash(true, HOLD_REFLASH_MS); + dragging = true; + return true; + } + view.setX(startX + (e2.getRawX() - downRawX)); + view.setY(startY + (e2.getRawY() - downRawY)); + dragging = true; + cb.onDragged(e2.getRawX(), e2.getRawY()); + return true; + } + } + + private final class PinchListener extends ScaleGestureDetector.SimpleOnScaleGestureListener { + @Override + public boolean onScaleBegin(ScaleGestureDetector d) { + if (locked) return false; + pinched = true; + dragging = false; + return true; + } + + @Override + public boolean onScale(ScaleGestureDetector d) { + cb.onPinch(d.getScaleFactor()); + return true; + } + + @Override + public void onScaleEnd(ScaleGestureDetector d) { + cb.onPinchEnd(); + } + } + + private void flash(boolean showLocked, long hold) { + fadeShowLocked = showLocked; + holdMs = hold; + fadeStart = SystemClock.elapsedRealtime(); + view.removeCallbacks(fadeTick); + view.post(fadeTick); + } + + private final Runnable fadeTick = new Runnable() { + @Override + public void run() { + view.invalidate(); + if (currentAlpha() > 0f) view.postDelayed(this, FRAME_MS); + } + }; + + private float currentAlpha() { + if (fadeStart == 0) return 0f; + long e = SystemClock.elapsedRealtime() - fadeStart; + if (e < 0) return 0f; + if (e < FADE_IN_MS) return e / (float) FADE_IN_MS; + long holdEnd = FADE_IN_MS + holdMs; + if (e < holdEnd) return 1f; + long outEnd = holdEnd + FADE_OUT_MS; + if (e < outEnd) return 1f - (e - holdEnd) / (float) FADE_OUT_MS; + return 0f; + } + + private static int withAlpha(int color, float a) { + return Color.argb(Math.round(255 * a), Color.red(color), Color.green(color), Color.blue(color)); + } + + public void drawBadge(Canvas canvas) { + float a = currentAlpha(); + if (a <= 0f) return; + float d = view.getResources().getDisplayMetrics().density; + float size = 15f * d; + float margin = 4f * d; + float right = view.getWidth() - margin; + float left = right - size; + float top = margin; + + float cx = (left + right) / 2f; + float bottom = top + size; + float bodyTop = top + size * 0.46f; + float bodyLeft = left + size * 0.14f; + float bodyRight = right - size * 0.14f; + float r = size * 0.2f; + float shackleTop = top + size * 0.08f; + + drawLock(canvas, cx, bodyTop, bodyLeft, bodyRight, bottom, r, shackleTop, d, + Color.argb(Math.round(150 * a), 0, 0, 0), 3.0f * d, 0.9f * d, false); + drawLock(canvas, cx, bodyTop, bodyLeft, bodyRight, bottom, r, shackleTop, d, + withAlpha(0xFFFFFFFF, a), 1.7f * d, 0f, true); + } + + private void drawLock(Canvas canvas, float cx, float bodyTop, float bodyLeft, float bodyRight, + float bottom, float r, float shackleTop, float d, + int color, float strokeW, float expand, boolean punchKeyhole) { + iconFill.setColor(color); + iconStroke.setColor(color); + iconStroke.setStrokeWidth(strokeW); + + canvas.drawRoundRect(bodyLeft - expand, bodyTop - expand, bodyRight + expand, bottom + expand, + 2.4f * d, 2.4f * d, iconFill); + if (punchKeyhole) { + int prev = iconFill.getColor(); + iconFill.setColor(Color.argb(Color.alpha(color), 0, 0, 0)); + canvas.drawCircle(cx, (bodyTop + bottom) / 2f, 1.6f * d, iconFill); + iconFill.setColor(prev); + } + + RectF arc = new RectF(cx - r, shackleTop, cx + r, shackleTop + 2f * r); + if (fadeShowLocked) { + Path p = new Path(); + p.addArc(arc, 180f, 180f); + p.moveTo(cx - r, shackleTop + r); p.lineTo(cx - r, bodyTop); + p.moveTo(cx + r, shackleTop + r); p.lineTo(cx + r, bodyTop); + canvas.drawPath(p, iconStroke); + } else { + canvas.drawLine(cx + r, shackleTop + r, cx + r, bodyTop, iconStroke); + Path p = new Path(); + p.addArc(arc, 180f, 180f); + p.moveTo(cx - r, shackleTop + r); p.lineTo(cx - r, bodyTop); + canvas.save(); + canvas.rotate(-42f, cx + r, shackleTop + r); + canvas.drawPath(p, iconStroke); + canvas.restore(); + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java new file mode 100644 index 000000000..759e01351 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -0,0 +1,1316 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + * Metric readers from @xXJSONDeruloXx's work. + */ + +package com.droiddeck.launcher.hud; + +import android.app.ActivityManager; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.BatteryManager; +import android.os.Build; +import android.os.SystemClock; + + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; + +public class HudMetrics { + private final Context context; + + public HudMetrics(Context context) { this.context = context; } + + private MangoReadings mango; + public void setMangoReadings(MangoReadings readings) { mango = readings; } + + private Long lastCpuTotal = null; + private Long lastCpuIdle = null; + + public Integer getCpuUsagePercent() { + String line = readFirstLine("/proc/stat"); + if (line != null) { + String[] parts = line.trim().split("\\s+"); + if (parts.length >= 5 && "cpu".equals(parts[0])) { + long total = 0, idle = 0, iowait = 0; + boolean ok = true; + for (int i = 1; i < parts.length; i++) { + try { + long v = Long.parseLong(parts[i]); + total += v; + if (i == 4) idle = v; + else if (i == 5) iowait = v; + } catch (NumberFormatException e) { ok = false; break; } + } + if (ok) { + long idleTotal = idle + iowait; + Long prevTotal = lastCpuTotal, prevIdle = lastCpuIdle; + lastCpuTotal = total; + lastCpuIdle = idleTotal; + if (prevTotal != null && prevIdle != null) { + long dTotal = total - prevTotal; + long dIdle = idleTotal - prevIdle; + if (dTotal > 0) { + long usage = (Math.max(0, dTotal - dIdle) * 100L) / dTotal; + return clampPercent((int) usage); + } + } + } + } + } + return readCpuUsagePercentFromFrequency(); + } + + private Integer readCpuUsagePercentFromFrequency() { + long currentTotal = 0, maxTotal = 0; + int cores = Runtime.getRuntime().availableProcessors(); + for (int i = 0; i < cores; i++) { + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + Long max = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/cpuinfo_max_freq"); + if (cur != null && max != null && max > 0L) { + currentTotal += Math.max(0, Math.min(cur, max)); + maxTotal += max; + } + } + if (maxTotal <= 0L) return null; + return clampPercent((int) ((currentTotal * 100L) / maxTotal)); + } + + private List gpuUsagePathsCache = null; + private Long lastMaliGpuInfoMs = null; + private long lastMaliGpuInfoWallMs = 0L; + + public Integer getGpuUsagePercent() { + for (String path : discoverGpuUsagePaths()) { + Integer p = readGpuUsageSample(path); + if (p != null) return p; + } + return null; + } + + private List discoverGpuUsagePaths() { + if (gpuUsagePathsCache != null) return gpuUsagePathsCache; + LinkedHashSet candidates = new LinkedHashSet<>(); + + for (String p : GPU_USAGE_STATIC_PATHS) { + if (new File(p).canRead()) candidates.add(p); + } + + File platformDir = new File("/sys/devices/platform"); + File[] platformNodes = platformDir.listFiles(File::isDirectory); + if (platformNodes != null) { + for (File node : platformNodes) { + String name = node.getName().toLowerCase(Locale.US); + boolean looksLikeGpu = false; + for (String t : GPU_NODE_TOKENS) { + if (name.contains(t)) { looksLikeGpu = true; break; } + } + if (!looksLikeGpu) continue; + for (String fileName : GPU_USAGE_FILES) { + File f = new File(node, fileName); + if (f.canRead()) candidates.add(f.getPath()); + } + } + } + + File[] devfreqRoots = { + new File("/sys/class/devfreq"), + new File("/sys/devices/virtual/devfreq"), + }; + for (File root : devfreqRoots) { + if (!root.isDirectory()) continue; + File[] nodeDirs = root.listFiles(File::isDirectory); + if (nodeDirs == null) continue; + for (File node : nodeDirs) { + String nodePath = node.getPath().toLowerCase(Locale.US); + boolean looksLikeGpu = false; + for (String t : GPU_NODE_TOKENS) { + if (nodePath.contains(t)) { looksLikeGpu = true; break; } + } + for (String fileName : GPU_USAGE_FILES) { + File f = new File(node, fileName); + if (!f.canRead()) continue; + if (looksLikeGpu || fileName.equals("gpu_busy_percentage") + || fileName.equals("gpu_busy_percent") || fileName.equals("gpuinfo")) { + candidates.add(f.getPath()); + } + } + } + } + + gpuUsagePathsCache = new ArrayList<>(candidates); + return gpuUsagePathsCache; + } + + private static final String[] GPU_USAGE_STATIC_PATHS = { + "/sys/class/kgsl/kgsl-3d0/gpubusy", + "/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage", + "/sys/class/kgsl/kgsl-3d0/devfreq/gpu_load", + "/sys/class/misc/mali0/device/utilisation", + "/sys/class/misc/mali0/device/utilization", + "/sys/class/misc/mali0/device/gpuinfo", + "/sys/devices/platform/mali/utilization", + "/sys/kernel/gpu/gpu_busy", + "/sys/devices/platform/gpusysfs/gpu_busy", + "/sys/class/misc/pvrsrvkm/device/utilisation", + "/sys/class/pvr/utilisation", + "/sys/class/pvr/gpu_utilisation", + "/sys/class/drm/card0/device/gpu_busy_percent", + "/sys/class/devfreq/gpu/load", + "/sys/kernel/ged/hal/gpu_utilization", + "/sys/module/ged/parameters/gpu_loading", + }; + private static final String[] GPU_USAGE_FILES = { + "gpu_busy_percentage", "gpu_busy_percent", "gpu_load", "utilisation", "utilization", + "load", "gpu_busy", "gpuinfo", + }; + private static final String[] GPU_NODE_TOKENS = { + "gpu", "mali", "g3d", "kgsl", "panfrost", "pvr", "powervr", "xclipse", "sgpu", + }; + + private Integer readGpuUsageSample(String path) { + String fileName = path.substring(path.lastIndexOf('/') + 1); + switch (fileName) { + case "gpubusy": { + String raw = readFirstLine(path); + if (raw == null) return null; + String[] parts = raw.trim().split("\\s+"); + if (parts.length < 2) return null; + Long busy = parseLong(parts[0]); + Long total = parseLong(parts[1]); + if (busy == null || total == null || total <= 0L) return null; + return clampPercent((int) ((busy * 100L) / total)); + } + case "gpuinfo": { + String line = readNthLine(path, 1); + if (line == null) return null; + String[] toks = line.trim().split("\\s+"); + Long gpuMs = parseLong(toks[toks.length - 1]); + if (gpuMs == null) return null; + long now = SystemClock.elapsedRealtime(); + Long prevMs = lastMaliGpuInfoMs; + long prevWall = lastMaliGpuInfoWallMs; + lastMaliGpuInfoMs = gpuMs; + lastMaliGpuInfoWallMs = now; + if (prevMs == null || prevWall <= 0L) return null; + long wallDelta = now - prevWall; + if (wallDelta <= 0L) return null; + long gpuDelta = Math.max(0L, gpuMs - prevMs); + return clampPercent((int) ((gpuDelta * 100L) / wallDelta)); + } + default: + return readPercentFromLine(path); + } + } + + private Integer readPercentFromLine(String path) { + String raw = readFirstLine(path); + if (raw == null) return null; + for (String tok : raw.trim().split("\\s+")) { + String digits = tok.replaceAll("[^0-9]", ""); + if (!digits.isEmpty()) { + Integer v = parseInt(digits); + return v == null ? null : clampPercent(v); + } + } + return null; + } + + private List thermalZonesCache = null; + + public Integer getCpuTempC() { + return readTemperatureC(discoverPrioritizedCpuTempPaths()); + } + + public Integer getGpuTempC() { + ArrayList paths = new ArrayList<>(); + paths.add("/sys/class/kgsl/kgsl-3d0/temp"); + paths.add("/sys/class/kgsl/kgsl-3d0/devfreq/temp"); + paths.add("/sys/class/misc/mali0/device/temp"); + paths.add("/sys/kernel/gpu/temp"); + paths.addAll(discoverPrioritizedGpuTempPaths()); + return readTemperatureC(paths); + } + + private List discoverPrioritizedCpuTempPaths() { + return prioritizePaths(type -> { + if (type.contains("gpu")) return null; + if (type.contains("cpu-silicon")) return 0; + if (type.contains("cpu-0")) return 1; + if (type.contains("cpuss")) return 2; + if (type.contains("mtktscpu")) return 2; + if (type.contains("cpu")) return 2; + if (type.contains("s5p-tmu")) return 3; + if (type.contains("soc")) return 4; + if (type.contains("cputop")) return 5; + if (type.contains("tsens")) return 6; + if (type.contains("cluster")) return 7; + if (type.contains("big") || type.contains("little")) return 8; + return null; + }); + } + + private List discoverPrioritizedGpuTempPaths() { + return prioritizePaths(type -> { + if (type.contains("gpu-silicon")) return 0; + if (type.contains("gpuss")) return 1; + if (type.contains("mtktsgpu")) return 1; + if (type.contains("gpu-virt")) return 2; + if (type.contains("gpu")) return 2; + if (type.contains("g3d")) return 3; + if (type.contains("kgsl")) return 4; + if (type.contains("mali")) return 5; + if (type.contains("xclipse") || type.contains("sgpu")) return 6; + return null; + }); + } + + private interface Ranker { Integer rank(String type); } + + private List prioritizePaths(Ranker ranker) { + List zones = discoverAllThermalZones(); + ArrayList order = new ArrayList<>(); + for (int i = 0; i < zones.size(); i++) { + Integer r = ranker.rank(zones.get(i)[0]); + if (r != null) order.add(new int[]{i, r}); + } + order.sort((a, b) -> { + if (a[1] != b[1]) return Integer.compare(a[1], b[1]); + return zones.get(a[0])[1].compareTo(zones.get(b[0])[1]); + }); + ArrayList result = new ArrayList<>(); + for (int[] e : order) result.add(zones.get(e[0])[1]); + return result; + } + + private List discoverAllThermalZones() { + if (thermalZonesCache != null) return thermalZonesCache; + ArrayList zones = new ArrayList<>(); + LinkedHashSet seenPaths = new LinkedHashSet<>(); + File[] thermalDirs = { + new File("/sys/class/thermal"), + new File("/sys/devices/virtual/thermal"), + }; + for (File dir : thermalDirs) { + File[] zoneDirs = dir.listFiles((d, name) -> name.startsWith("thermal_zone")); + if (zoneDirs == null) continue; + for (File zone : zoneDirs) { + if (!zone.isDirectory()) continue; + String type = readFirstLine(new File(zone, "type").getPath()); + if (type == null) continue; + type = type.trim().toLowerCase(Locale.US); + String tempPath = new File(zone, "temp").getPath(); + if (seenPaths.add(tempPath)) zones.add(new String[]{type, tempPath}); + } + } + thermalZonesCache = zones; + return zones; + } + + private Integer readTemperatureC(List paths) { + LinkedHashSet seen = new LinkedHashSet<>(); + for (String path : paths) { + if (!seen.add(path)) continue; + Integer raw = readIntFromLine(path); + if (raw == null) continue; + int celsius = raw > 1000 ? (raw + 500) / 1000 : raw; + if (celsius >= 1 && celsius <= 150) return celsius; + } + return null; + } + + private String resolveTempPath(List paths) { + LinkedHashSet seen = new LinkedHashSet<>(); + for (String path : paths) { + if (!seen.add(path)) continue; + Integer raw = readIntFromLine(path); + if (raw == null) continue; + int celsius = raw > 1000 ? (raw + 500) / 1000 : raw; + if (celsius >= 1 && celsius <= 150) return path; + } + return null; + } + + public enum TempSensor { CPU, GPU, BATTERY } + + public static final class Thresholds { + public final int amberC; + public final int redC; + Thresholds(int amberC, int redC) { this.amberC = amberC; this.redC = redC; } + } + + public static final int TEMP_COLOR_OK = 0xFF66BB6A; + public static final int TEMP_COLOR_AMBER = 0xFFFFB74D; + public static final int TEMP_COLOR_RED = 0xFFEF5350; + + private static final int DEFAULT_RED_CPU = 90; + private static final int DEFAULT_RED_GPU = 90; + private static final int DEFAULT_RED_BAT = 48; + + public static int amberForRed(int redC) { + return Math.round(redC * 0.88f); + } + + public static final class TempDisplay { + public final boolean fahrenheit; + public final boolean colorBands; + public final boolean auto; + public final int redCpu, redGpu, redBat; + + public TempDisplay(boolean fahrenheit, boolean colorBands, boolean auto, + int redCpu, int redGpu, int redBat) { + this.fahrenheit = fahrenheit; + this.colorBands = colorBands; + this.auto = auto; + this.redCpu = redCpu; + this.redGpu = redGpu; + this.redBat = redBat; + } + + public static TempDisplay from(KeyValueSet cfg) { + if (cfg == null) return new TempDisplay(false, true, true, + DEFAULT_RED_CPU, DEFAULT_RED_GPU, DEFAULT_RED_BAT); + return new TempDisplay( + cfg.get("tempUnit", "c").equalsIgnoreCase("f"), + !cfg.get("tempBands", "1").equals("0"), + !cfg.get("tempAuto", "1").equals("0"), + parseInt(cfg.get("tempRedCpu", ""), DEFAULT_RED_CPU), + parseInt(cfg.get("tempRedGpu", ""), DEFAULT_RED_GPU), + parseInt(cfg.get("tempRedBat", ""), DEFAULT_RED_BAT)); + } + + int manualRedFor(TempSensor s) { + switch (s) { + case GPU: return redGpu; + case BATTERY: return redBat; + default: return redCpu; + } + } + + private static int parseInt(String s, int fallback) { + try { return s == null || s.isEmpty() ? fallback : Integer.parseInt(s.trim()); } + catch (NumberFormatException e) { return fallback; } + } + } + + private final java.util.EnumMap autoThresholdCache = + new java.util.EnumMap<>(TempSensor.class); + private final java.util.EnumSet autoThresholdResolved = + java.util.EnumSet.noneOf(TempSensor.class); + + public Thresholds resolveThresholds(TempSensor sensor, TempDisplay display) { + if (display != null && !display.auto) { + int red = display.manualRedFor(sensor); + return new Thresholds(amberForRed(red), red); + } + if (!autoThresholdResolved.contains(sensor)) { + autoThresholdResolved.add(sensor); + Thresholds fromDevice = readTripPointThresholds(sensor); + if (fromDevice != null) autoThresholdCache.put(sensor, fromDevice); + } + Thresholds cached = autoThresholdCache.get(sensor); + if (cached != null) return cached; + int red = sensor == TempSensor.GPU ? DEFAULT_RED_GPU + : sensor == TempSensor.BATTERY ? DEFAULT_RED_BAT + : DEFAULT_RED_CPU; + return new Thresholds(amberForRed(red), red); + } + + private Thresholds readTripPointThresholds(TempSensor sensor) { + String tempPath; + switch (sensor) { + case GPU: + tempPath = resolveTempPath(discoverPrioritizedGpuTempPaths()); + break; + case BATTERY: + return null; + default: + tempPath = resolveTempPath(discoverPrioritizedCpuTempPaths()); + } + if (tempPath == null) return null; + File zoneDir = new File(tempPath).getParentFile(); + if (zoneDir == null) return null; + + File[] tripTemps = zoneDir.listFiles( + (d, name) -> name.startsWith("trip_point_") && name.endsWith("_temp")); + if (tripTemps == null || tripTemps.length == 0) return null; + + Integer amber = null, red = null; + for (File tripTemp : tripTemps) { + Integer raw = readIntFromLine(tripTemp.getPath()); + if (raw == null) continue; + int celsius = raw > 1000 ? (raw + 500) / 1000 : raw; + if (celsius < 20 || celsius > 120) continue; + + String typePath = tripTemp.getPath().replaceAll("_temp$", "_type"); + String type = readFirstLine(typePath); + if (type == null) continue; + type = type.trim().toLowerCase(Locale.US); + + if (type.contains("critical") || type.contains("hot")) { + if (red == null || celsius < red) red = celsius; + } else if (type.contains("passive")) { + if (amber == null || celsius < amber) amber = celsius; + } + } + if (red == null) return null; + if (amber == null || amber >= red) amber = amberForRed(red); + return new Thresholds(amber, red); + } + + public static int tempColor(Float celsius, Thresholds t, TempDisplay display, int fallbackColor) { + if (celsius == null || t == null || display == null || !display.colorBands) return fallbackColor; + if (celsius >= t.redC) return TEMP_COLOR_RED; + if (celsius >= t.amberC) return TEMP_COLOR_AMBER; + return TEMP_COLOR_OK; + } + + public static String formatTemp(float celsius, TempDisplay display, boolean oneDecimal) { + boolean f = display != null && display.fahrenheit; + float value = f ? celsius * 9f / 5f + 32f : celsius; + String unit = f ? "°F" : "°C"; + return oneDecimal + ? String.format(Locale.ENGLISH, "%.1f%s", value, unit) + : String.format(Locale.ENGLISH, "%d%s", Math.round(value), unit); + } + + public static final class Battery { + public final float watts; + public final boolean charging; + public final Integer percent; + public final Integer tempC; + public final String runtimeText; + + Battery(float watts, boolean charging) { + this(watts, charging, null, null, null); + } + Battery(float watts, boolean charging, Integer percent, Integer tempC, String runtimeText) { + this.watts = watts; + this.charging = charging; + this.percent = percent; + this.tempC = tempC; + this.runtimeText = runtimeText; + } + } + + private static final String[] CURRENT_CHANNELS = { + "/sys/class/power_supply/battery/current_now", + "/sys/class/power_supply/bms/current_now", + "/sys/class/power_supply/main/current_now", + }; + + private static final String[] VOLTAGE_CHANNELS = { + "/sys/class/power_supply/battery/voltage_now", + "/sys/class/power_supply/bms/voltage_now", + "/sys/class/power_supply/main/voltage_now", + }; + private static final String[] POWER_CHANNELS = { + "/sys/class/power_supply/battery/power_now", + "/sys/class/power_supply/bms/power_now", + "/sys/class/power_supply/main/power_now", + }; + + private static Long readLongFromChannels(String[] paths) { + for (String p : paths) { + Long v = readLongFromLine(p); + if (v != null) return v; + } + return null; + } + + private static Boolean readChargingFromPowerSupply() { + File[] supplies = new File("/sys/class/power_supply").listFiles(); + if (supplies == null || supplies.length == 0) return null; + Boolean sawSignal = null; + for (File supply : supplies) { + String name = supply.getName().toLowerCase(Locale.US); + String type = readFirstLine(new File(supply, "type").getPath()); + type = type == null ? "" : type.trim().toLowerCase(Locale.US); + boolean isBattery = type.equals("battery") || name.equals("battery") || name.equals("bms"); + if (isBattery) { + String st = readFirstLine(new File(supply, "status").getPath()); + if (st == null) continue; + st = st.trim().toLowerCase(Locale.US); + sawSignal = Boolean.FALSE; + if (st.equals("charging") || st.equals("full")) return Boolean.TRUE; + } else { + Long online = readLongFromLine(new File(supply, "online").getPath()); + if (online == null) continue; + sawSignal = Boolean.FALSE; + if (online == 1L) return Boolean.TRUE; + } + } + return sawSignal; + } + + private Double smoothedBatteryRuntimeHours = null; + private static final double MAX_RUNTIME_HOURS = 72.0; + private static final double RUNTIME_SMOOTHING_OLD_WEIGHT = 0.65; + private static final double RUNTIME_SMOOTHING_NEW_WEIGHT = 0.35; + + public Battery collectBattery() { + BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE); + if (bm == null) return new Battery(0f, false); + + Integer percent = null; + int cap = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); + if (cap >= 0 && cap <= 100) percent = cap; + + Intent status = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + if (status == null) { + Boolean sysCharging = readChargingFromPowerSupply(); + return new Battery(0f, sysCharging != null && sysCharging, percent, null, null); + } + + int st = status.getIntExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN); + boolean charging = st == BatteryManager.BATTERY_STATUS_CHARGING || st == BatteryManager.BATTERY_STATUS_FULL; + if (st == BatteryManager.BATTERY_STATUS_UNKNOWN) { + Boolean sysCharging = readChargingFromPowerSupply(); + if (sysCharging != null) charging = sysCharging; + } + long currentMicroAmps = Math.abs(bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)); + long chargeCounter = bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER); + int voltageMv = status.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0); + + Integer tempC = null; + int rawTemp = status.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0); + if (rawTemp > 0) tempC = Math.round(rawTemp / 10f); + + if (voltageMv <= 0) { + Long uv = readLongFromChannels(VOLTAGE_CHANNELS); + if (uv != null && uv > 0) voltageMv = (int) (Math.abs(uv) / 1000L); + } + float amps = batteryCurrentAmps(bm); + float watts = 0f; + if (amps > 0f && voltageMv > 0) { + watts = (voltageMv / 1000f) * amps; + } else { + Long uw = readLongFromChannels(POWER_CHANNELS); + if (uw != null && uw != 0L) watts = (float) (Math.abs(uw) / 1_000_000.0); + } + + String runtimeText; + if (charging) { + smoothedBatteryRuntimeHours = null; + runtimeText = "LEFT CHG"; + } else if (currentMicroAmps <= 0L || chargeCounter <= 0L) { + runtimeText = null; + } else { + double rawHours = (double) chargeCounter / (double) currentMicroAmps; + if (!Double.isFinite(rawHours) || rawHours <= 0.0 || rawHours > MAX_RUNTIME_HOURS) { + runtimeText = null; + } else { + double smoothed = smoothedBatteryRuntimeHours == null ? rawHours + : (smoothedBatteryRuntimeHours * RUNTIME_SMOOTHING_OLD_WEIGHT) + + (rawHours * RUNTIME_SMOOTHING_NEW_WEIGHT); + smoothedBatteryRuntimeHours = smoothed; + runtimeText = "LEFT " + formatRuntimeHours(smoothed); + } + } + return new Battery(watts, charging, percent, tempC, runtimeText); + } + + private static String formatRuntimeHours(double hours) { + int totalMinutes = Math.max(1, (int) Math.round(hours * 60.0)); + int wholeHours = totalMinutes / 60; + int minutes = totalMinutes % 60; + if (wholeHours > 0 && minutes > 0) return wholeHours + "h " + minutes + "m"; + if (wholeHours > 0) return wholeHours + "h"; + return minutes + "m"; + } + + private static float currentRawToAmps(long raw) { + if (raw == 0L || raw == Long.MIN_VALUE) return 0f; + long a = Math.abs(raw); + return a < 20000L ? a / 1000f : a / 1_000_000f; + } + + private float batteryCurrentAmps(BatteryManager bm) { + long raw = (bm != null) ? bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) : 0L; + if (raw == 0L || raw == Long.MIN_VALUE) { + Long sys = readLongFromChannels(CURRENT_CHANNELS); + raw = (sys != null) ? sys : 0L; + } + return currentRawToAmps(raw); + } + + public Integer getCpuClockMhz() { + int cores = Runtime.getRuntime().availableProcessors(); + long maxKhz = 0; + for (int i = 0; i < cores; i++) { + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + if (cur != null && cur > maxKhz) maxKhz = cur; + } + if (maxKhz <= 0) return null; + return (int) (maxKhz / 1000L); + } + + private List gpuClockPathsCache = null; + private static final String[] GPU_CLOCK_PATHS = { + "/sys/class/kgsl/kgsl-3d0/gpuclk", + "/sys/class/kgsl/kgsl-3d0/devfreq/cur_freq", + "/sys/class/kgsl/kgsl-3d0/clock_mhz", + "/sys/kernel/gpu/gpu_clock", + "/sys/devices/platform/gpusysfs/gpu_clock", + "/sys/class/misc/mali0/device/clock", + "/sys/class/devfreq/gpu/cur_freq", + "/sys/kernel/ged/hal/current_freqency", + "/sys/kernel/ged/hal/gpu_clock", + }; + + private List discoverGpuClockPaths() { + if (gpuClockPathsCache != null) return gpuClockPathsCache; + LinkedHashSet found = new LinkedHashSet<>(); + for (String p : GPU_CLOCK_PATHS) if (new File(p).canRead()) found.add(p); + File[] devfreqRoots = { + new File("/sys/class/devfreq"), + new File("/sys/devices/virtual/devfreq"), + }; + for (File root : devfreqRoots) { + if (!root.isDirectory()) continue; + File[] nodeDirs = root.listFiles(File::isDirectory); + if (nodeDirs == null) continue; + for (File node : nodeDirs) { + String nodePath = node.getPath().toLowerCase(Locale.US); + boolean looksLikeGpu = false; + for (String t : GPU_NODE_TOKENS) { + if (nodePath.contains(t)) { looksLikeGpu = true; break; } + } + if (!looksLikeGpu) continue; + File f = new File(node, "cur_freq"); + if (f.canRead()) found.add(f.getPath()); + } + } + gpuClockPathsCache = new ArrayList<>(found); + return gpuClockPathsCache; + } + + public Integer getGpuClockMhz() { + for (String p : discoverGpuClockPaths()) { + Long raw = readLongFromLine(p); + if (raw == null || raw <= 0) continue; + long mhz; + if (raw >= 1_000_000L) mhz = raw / 1_000_000L; + else if (raw >= 10_000L) mhz = raw / 1_000L; + else mhz = raw; + if (mhz >= 1 && mhz <= 3000) return (int) mhz; + } + return null; + } + + private List vramUsedPathsCache = null; + private static final String[] VRAM_USED_PATHS = { + "/sys/class/kgsl/kgsl-3d0/gpumem_mapped", + "/sys/class/kgsl/kgsl-3d0/page_alloc", + "/sys/class/kgsl/kgsl-3d0/mapped", + "/sys/class/drm/card0/device/mem_info_vram_used", + "/sys/class/kgsl/kgsl-3d0/page_alloc_max", + }; + private static final String[] VRAM_TOTAL_PATHS = { + "/sys/class/drm/card0/device/mem_info_vram_total", + }; + + public Long getVramUsedBytes() { + if (vramUsedPathsCache == null) { + ArrayList found = new ArrayList<>(); + for (String p : VRAM_USED_PATHS) if (new File(p).canRead()) found.add(p); + vramUsedPathsCache = found; + } + for (String p : vramUsedPathsCache) { + Long b = sanitizeVramBytes(readLongFromLine(p)); + if (b != null) return b; + } + return null; + } + + private static Long sanitizeVramBytes(Long v) { + if (v == null) return null; + if (v < (1L << 20)) return null; + if (v > 64L * (1L << 30)) return null; + return v; + } + + private static String formatGiB(long bytes) { + return String.format(Locale.US, "%.1fGiB", bytes / (1024.0 * 1024.0 * 1024.0)); + } + + public static final class Snapshot { + public final Integer cpuPercent; + public final Integer gpuPercent; + public final Integer cpuClockMhz; + public final Integer gpuClockMhz; + public final Integer cpuTempC; + public final Integer gpuTempC; + public final long ramUsedBytes; + public final long ramTotalBytes; + public final float ramPercent; + public final Long vramUsedBytes; + public final Battery battery; + public final int[] perCorePercent; + public final int[] perCoreClockMhz; + public final Long swapUsedBytes; + public final Long swapTotalBytes; + public final Long netDownBps; + public final Long netUpBps; + + Snapshot(Integer cpuPercent, Integer gpuPercent, Integer cpuClockMhz, Integer gpuClockMhz, + Integer cpuTempC, Integer gpuTempC, long ramUsedBytes, long ramTotalBytes, + float ramPercent, Long vramUsedBytes, Battery battery, + int[] perCorePercent, int[] perCoreClockMhz, Long swapUsedBytes, Long swapTotalBytes, + Long netDownBps, Long netUpBps) { + this.cpuPercent = cpuPercent; + this.gpuPercent = gpuPercent; + this.cpuClockMhz = cpuClockMhz; + this.gpuClockMhz = gpuClockMhz; + this.cpuTempC = cpuTempC; + this.gpuTempC = gpuTempC; + this.ramUsedBytes = ramUsedBytes; + this.ramTotalBytes = ramTotalBytes; + this.ramPercent = ramPercent; + this.vramUsedBytes = vramUsedBytes; + this.battery = battery; + this.perCorePercent = perCorePercent != null ? perCorePercent : new int[0]; + this.perCoreClockMhz = perCoreClockMhz != null ? perCoreClockMhz : new int[0]; + this.swapUsedBytes = swapUsedBytes; + this.swapTotalBytes = swapTotalBytes; + this.netDownBps = netDownBps; + this.netUpBps = netUpBps; + } + + public String ramUsedText() { return formatBytesGb(ramUsedBytes); } + public String ramTotalText() { return formatBytesGb(ramTotalBytes); } + public String vramText() { return vramUsedBytes == null ? null : formatGiB(vramUsedBytes); } + public String swapUsedText() { return swapUsedBytes == null ? null : formatBytesGb(swapUsedBytes); } + public String swapTotalText() { return swapTotalBytes == null ? null : formatBytesGb(swapTotalBytes); } + + private static String formatBytesGb(long bytes) { + return String.format(Locale.US, "%.1fGiB", bytes / (1024.0 * 1024.0 * 1024.0)); + } + } + + public Snapshot snapshot() { + if (mango != null) return mangoSnapshot(mango); + Integer cpu = getCpuUsagePercent(); + Integer gpu = getGpuUsagePercent(); + Integer cpuClk = getCpuClockMhz(); + Integer gpuClk = getGpuClockMhz(); + Integer cpuTemp = getCpuTempC(); + Integer gpuTemp = getGpuTempC(); + + long usedBytes = 0, totalBytes = 0; + float ramPct = 0f; + ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + if (am != null) { + ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo(); + am.getMemoryInfo(mi); + totalBytes = Math.max(0L, mi.totalMem); + usedBytes = Math.max(0L, mi.totalMem - mi.availMem); + ramPct = totalBytes > 0 ? usedBytes * 100f / totalBytes : 0f; + } + + Long vram = getVramUsedBytes(); + Battery battery = collectBattery(); + + int[] perCorePct = readPerCorePercent(); + int[] perCoreClk = getPerCoreClockMhz(); + long[] swap = getSwapBytes(); + long[] net = readNetRateBps(); + + return new Snapshot(cpu, gpu, cpuClk, gpuClk, cpuTemp, gpuTemp, + usedBytes, totalBytes, ramPct, vram, battery, + perCorePct, perCoreClk, + swap == null ? null : swap[0], swap == null ? null : swap[1], + net == null ? null : net[0], net == null ? null : net[1]); + } + + private Snapshot mangoSnapshot(MangoReadings m) { + MangoReadings.Cpu cpu = m.cpu(); + MangoReadings.Memory mem = m.memory(); + long used = mem != null ? mem.getUsedBytes() : 0L; + long total = mem != null ? mem.getTotalBytes() : 0L; + Battery android = collectBattery(); + MangoReadings.Battery bat = m.battery(); + Battery battery = bat == null ? android : new Battery(bat.getWatts(), bat.getCharging(), + bat.getPercent() != null ? bat.getPercent() : android.percent, android.tempC, android.runtimeText); + long[] net = readNetRateBps(); + return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), getCpuClockMhz(), m.gpuClockMhz(), + m.cpuTempC(), m.gpuTempC(), used, total, total > 0 ? used * 100f / total : 0f, m.vramBytes(), battery, + cpu != null ? cpu.getPerCore() : new int[0], getPerCoreClockMhz(), + mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapUsedBytes() : null, + mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapTotalBytes() : null, + net == null ? null : net[0], net == null ? null : net[1]); + } + + public int[] getPerCoreClockMhz() { + int cores = Runtime.getRuntime().availableProcessors(); + int[] out = new int[Math.max(0, cores)]; + for (int i = 0; i < out.length; i++) { + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + out[i] = (cur != null && cur > 0) ? (int) (cur / 1000L) : 0; + } + return out; + } + + private long[] lastCoreTotal = null; + private long[] lastCoreIdle = null; + + public int[] readPerCorePercent() { + int cores = Runtime.getRuntime().availableProcessors(); + int[] out = new int[Math.max(0, cores)]; + java.util.Arrays.fill(out, -1); + if (lastCoreTotal == null || lastCoreTotal.length != cores) { + lastCoreTotal = new long[cores]; + lastCoreIdle = new long[cores]; + java.util.Arrays.fill(lastCoreTotal, -1L); + } + try (BufferedReader r = new BufferedReader(new FileReader("/proc/stat"))) { + String line; + while ((line = r.readLine()) != null) { + if (!line.startsWith("cpu")) break; + if (line.length() < 4 || !Character.isDigit(line.charAt(3))) continue; + String[] parts = line.trim().split("\\s+"); + int core; + try { core = Integer.parseInt(parts[0].substring(3)); } catch (Exception e) { continue; } + if (core < 0 || core >= cores) continue; + long total = 0, idle = 0; + boolean ok = true; + for (int i = 1; i < parts.length; i++) { + try { + long v = Long.parseLong(parts[i]); + total += v; + if (i == 4) idle = v; + else if (i == 5) idle += v; + } catch (NumberFormatException e) { ok = false; break; } + } + if (!ok) continue; + long prevTotal = lastCoreTotal[core], prevIdle = lastCoreIdle[core]; + lastCoreTotal[core] = total; + lastCoreIdle[core] = idle; + if (prevTotal >= 0) { + long dTotal = total - prevTotal, dIdle = idle - prevIdle; + if (dTotal > 0) out[core] = clampPercent((int) ((Math.max(0, dTotal - dIdle) * 100L) / dTotal)); + } + } + } catch (Exception ignored) {} + for (int i = 0; i < out.length; i++) { + if (out[i] >= 0) continue; + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + Long max = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/cpuinfo_max_freq"); + if (cur != null && max != null && max > 0L) + out[i] = clampPercent((int) ((Math.max(0L, Math.min(cur, max)) * 100L) / max)); + } + return out; + } + + public long[] getSwapBytes() { + long totalKb = -1, freeKb = -1; + try (BufferedReader r = new BufferedReader(new FileReader("/proc/meminfo"))) { + String line; + while ((line = r.readLine()) != null && (totalKb < 0 || freeKb < 0)) { + if (line.startsWith("SwapTotal:")) totalKb = parseMeminfoKb(line); + else if (line.startsWith("SwapFree:")) freeKb = parseMeminfoKb(line); + } + } catch (Exception e) { return null; } + if (totalKb <= 0) return null; + long used = Math.max(0L, (totalKb - Math.max(0L, freeKb))) * 1024L; + return new long[]{used, totalKb * 1024L}; + } + + private static long parseMeminfoKb(String line) { + String[] parts = line.trim().split("\\s+"); + if (parts.length < 2) return -1; + Long v = parseLong(parts[1]); + return v == null ? -1 : v; + } + + private long lastNetRx = -1, lastNetTx = -1, lastNetWallMs = 0; + + public long[] readNetRateBps() { + long rx = 0, tx = 0; + boolean any = false; + try (BufferedReader r = new BufferedReader(new FileReader("/proc/net/dev"))) { + String line; + while ((line = r.readLine()) != null) { + int colon = line.indexOf(':'); + if (colon < 0) continue; + String iface = line.substring(0, colon).trim(); + if (iface.equals("lo") || iface.isEmpty()) continue; + String[] f = line.substring(colon + 1).trim().split("\\s+"); + if (f.length < 9) continue; + Long rxB = parseLong(f[0]); + Long txB = parseLong(f[8]); + if (rxB == null || txB == null) continue; + rx += rxB; tx += txB; any = true; + } + } catch (Exception e) { return null; } + if (!any) return null; + long now = SystemClock.elapsedRealtime(); + long prevRx = lastNetRx, prevTx = lastNetTx, prevWall = lastNetWallMs; + lastNetRx = rx; lastNetTx = tx; lastNetWallMs = now; + if (prevRx < 0 || prevWall <= 0) return null; + long dt = now - prevWall; + if (dt <= 0) return null; + long down = Math.max(0L, (rx - prevRx) * 1000L / dt); + long up = Math.max(0L, (tx - prevTx) * 1000L / dt); + return new long[]{down, up}; + } + + public String buildDiagnosticsReport(Context ctxIn) { + final Context ctx = ctxIn != null ? ctxIn : this.context; + snapshot(); + try { Thread.sleep(350L); } catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } + Snapshot s = snapshot(); + + StringBuilder sb = new StringBuilder(); + sb.append("DroidDeck HUD diagnostics\n"); + sb.append("Generated: ") + .append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date())).append('\n'); + sb.append("Device: ").append(Build.MANUFACTURER).append(' ').append(Build.MODEL).append('\n'); + sb.append("Board/HW: ").append(Build.BOARD).append(" / ").append(Build.HARDWARE).append('\n'); + sb.append("SoC: ").append(socString()).append('\n'); + sb.append("Android: ").append(Build.VERSION.RELEASE) + .append(" (API ").append(Build.VERSION.SDK_INT).append(")\n"); + sb.append("CPU cores: ").append(Runtime.getRuntime().availableProcessors()).append('\n'); + sb.append("GPU renderer: ").append(safeGpu(() -> com.droiddeck.launcher.gpu.GpuInfo.Companion.detect().displayName(ctx))).append('\n'); + + sb.append("\n== Metrics ==\n"); + + boolean procStat = new File("/proc/stat").canRead(); + if (s.cpuPercent != null) { + metricHit(sb, "CPU %", s.cpuPercent + "%", + procStat ? "/proc/stat (cpu aggregate delta)" + : "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq (freq estimate)"); + } else { + metricMiss(sb, "CPU %", "/proc/stat", + "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); + } + + StringBuilder cores = new StringBuilder(); + for (int i = 0; i < s.perCorePercent.length; i++) { + if (i > 0) cores.append(' '); + int v = s.perCorePercent[i]; + cores.append('c').append(i).append('=').append(v < 0 ? "?" : (v + "%")); + } + if (s.perCorePercent.length > 0) + metricHit(sb, "Per-core %", cores.toString(), "/proc/stat (per-cpu lines)"); + else + metricMiss(sb, "Per-core %", "/proc/stat"); + + StringBuilder coreClk = new StringBuilder(); + for (int i = 0; i < s.perCoreClockMhz.length; i++) { + if (i > 0) coreClk.append(' '); + int v = s.perCoreClockMhz[i]; + coreClk.append('c').append(i).append('=').append(v <= 0 ? "?" : (v + "MHz")); + } + if (s.cpuClockMhz != null) + metricHit(sb, "CPU clock", s.cpuClockMhz + "MHz (peak); " + coreClk, + "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); + else + metricMiss(sb, "CPU clock", "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); + + String cpuTempPath = resolveTempPath(discoverPrioritizedCpuTempPaths()); + if (s.cpuTempC != null && cpuTempPath != null) + metricHit(sb, "CPU temp", s.cpuTempC + "°C", cpuTempPath); + else + metricMiss(sb, "CPU temp", + "/sys/class/thermal/thermal_zone*/temp (types: cpu*/cpuss/tsens/mtktscpu/s5p-tmu/soc)"); + + String gpuUsagePath = firstReadableGpuUsagePath(); + if (s.gpuPercent != null && gpuUsagePath != null) + metricHit(sb, "GPU %", s.gpuPercent + "%", gpuUsagePath); + else + metricMissList(sb, "GPU %", discoverGpuUsagePaths(), GPU_USAGE_STATIC_PATHS); + + String gpuClockPath = firstReadableGpuClockPath(); + if (s.gpuClockMhz != null && gpuClockPath != null) + metricHit(sb, "GPU clock", s.gpuClockMhz + "MHz", gpuClockPath); + else + metricMissList(sb, "GPU clock", discoverGpuClockPaths(), GPU_CLOCK_PATHS); + + String gpuTempPath = resolveTempPath(discoverPrioritizedGpuTempPaths()); + if (s.gpuTempC != null) + metricHit(sb, "GPU temp", s.gpuTempC + "°C", + gpuTempPath != null ? gpuTempPath : "kgsl/mali direct temp node"); + else + metricMiss(sb, "GPU temp", + "/sys/class/kgsl/kgsl-3d0/temp", "/sys/class/misc/mali0/device/temp", + "/sys/class/thermal/thermal_zone*/temp (types: gpu*/gpuss/g3d/kgsl/mali/mtktsgpu)"); + + metricHit(sb, "RAM", s.ramUsedText() + " / " + s.ramTotalText() + + " (" + Math.round(s.ramPercent) + "%)", "ActivityManager.MemoryInfo"); + if (s.swapUsedBytes != null) + metricHit(sb, "SWAP", s.swapUsedText() + " / " + s.swapTotalText(), "/proc/meminfo"); + else + metricMiss(sb, "SWAP", "/proc/meminfo (SwapTotal=0 or unreadable)"); + + String vramPath = firstReadableVramUsedPath(); + if (s.vramUsedBytes != null && vramPath != null) { + Long total = readFirstReadableLong(VRAM_TOTAL_PATHS); + String v = s.vramText() + (total != null ? " / " + formatGiB(total) : ""); + metricHit(sb, "VRAM", v, vramPath); + } else { + metricMissList(sb, "VRAM (Java sysfs; Vulkan budget = native TODO)", + new ArrayList<>(), VRAM_USED_PATHS); + } + + if (s.netDownBps != null) + metricHit(sb, "NET", formatRate(s.netDownBps) + " down / " + formatRate(s.netUpBps) + " up", + "/proc/net/dev"); + else + metricMiss(sb, "NET", "/proc/net/dev (first sample or unreadable)"); + + Battery b = s.battery; + StringBuilder bat = new StringBuilder(); + bat.append(b.percent != null ? b.percent + "%" : "?%") + .append(", ").append(String.format(Locale.US, "%.1fW", b.watts)) + .append(b.charging ? " (charging)" : "") + .append(", temp ").append(b.tempC != null ? b.tempC + "°C" : "?") + .append(b.runtimeText != null ? ", " + b.runtimeText : ""); + metricHit(sb, "Battery", bat.toString(), "BatteryManager + /sys/class/power_supply"); + + appendExistsDump(sb); + return sb.toString(); + } + + private static String socString() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + return Build.SOC_MANUFACTURER + " " + Build.SOC_MODEL; + } + return "(SoC id needs Android 12+; HW=" + Build.HARDWARE + ")"; + } + + private interface GpuStr { String get(); } + private static String safeGpu(GpuStr fn) { + try { String v = fn.get(); return v == null ? "(null)" : v; } + catch (Throwable t) { return "(unavailable: " + t.getClass().getSimpleName() + ")"; } + } + + private String firstReadableGpuUsagePath() { + for (String p : discoverGpuUsagePaths()) if (readGpuUsageSample(p) != null) return p; + return null; + } + + private String firstReadableGpuClockPath() { + for (String p : discoverGpuClockPaths()) { + Long raw = readLongFromLine(p); + if (raw != null && raw > 0) return p; + } + return null; + } + + private String firstReadableVramUsedPath() { + if (vramUsedPathsCache == null) getVramUsedBytes(); + if (vramUsedPathsCache == null) return null; + for (String p : vramUsedPathsCache) if (sanitizeVramBytes(readLongFromLine(p)) != null) return p; + return null; + } + + private static Long readFirstReadableLong(String[] paths) { + for (String p : paths) { + Long v = readLongFromLine(p); + if (v != null && v > 0) return v; + } + return null; + } + + private static String formatRate(Long bps) { + if (bps == null) return "?"; + double kb = bps / 1024.0; + if (kb >= 1024.0) return String.format(Locale.US, "%.1fMB/s", kb / 1024.0); + return String.format(Locale.US, "%.0fKB/s", kb); + } + + private static void metricHit(StringBuilder sb, String name, String value, String source) { + sb.append(name).append(": ").append(value).append("\n source: ").append(source).append('\n'); + } + + private static void metricMiss(StringBuilder sb, String name, String... candidates) { + sb.append(name).append(": MISS\n tried: "); + for (int i = 0; i < candidates.length; i++) { + if (i > 0) sb.append("\n "); + sb.append(candidates[i]); + } + sb.append('\n'); + } + + private static void metricMissList(StringBuilder sb, String name, List discovered, String[] statics) { + LinkedHashSet all = new LinkedHashSet<>(); + if (discovered != null) all.addAll(discovered); + for (String p : statics) all.add(p); + sb.append(name).append(": MISS\n tried: "); + boolean first = true; + for (String p : all) { + if (!first) sb.append("\n "); + sb.append(p); + first = false; + } + if (first) sb.append("(no candidates)"); + sb.append('\n'); + } + + private void appendExistsDump(StringBuilder sb) { + sb.append("\n== Exists on this device (send these back for any MISS above) ==\n"); + sb.append("-- /sys/class/thermal/thermal_zone*/type --\n"); + List zones = discoverAllThermalZones(); + if (zones.isEmpty()) sb.append(" (none readable)\n"); + for (String[] z : zones) sb.append(" ").append(z[1]).append(" type=").append(z[0]).append('\n'); + appendDevfreqListing(sb, "/sys/class/devfreq"); + appendDevfreqListing(sb, "/sys/devices/virtual/devfreq"); + appendReadableFiles(sb, "/sys/class/kgsl/kgsl-3d0"); + appendReadableFiles(sb, "/sys/class/misc/mali0/device"); + appendReadableFiles(sb, "/sys/class/drm/card0/device"); + appendPowerSupplyDump(sb); + appendGpuNoRootProbes(sb); + } + + private void appendGpuNoRootProbes(StringBuilder sb) { + sb.append("-- GPU no-root reachability probes --\n"); + sb.append(" /dev/kgsl-3d0 open O_RDWR: ") + .append(probeOpen("/dev/kgsl-3d0", android.system.OsConstants.O_RDWR)).append('\n'); + sb.append(" /dev/kgsl-3d0 open O_RDONLY: ") + .append(probeOpen("/dev/kgsl-3d0", android.system.OsConstants.O_RDONLY)).append('\n'); + sb.append(" /dev/dri/renderD128 O_RDWR: ") + .append(probeOpen("/dev/dri/renderD128", android.system.OsConstants.O_RDWR)).append('\n'); + boolean found = false; + File[] roots = { new File("/sys/devices/platform/soc"), new File("/sys/devices/platform") }; + for (File root : roots) { + File[] nodes = root.listFiles(); + if (nodes == null) continue; + for (File soc : nodes) { + if (!soc.getName().contains("kgsl-3d0")) continue; + File[] inner = new File(soc, "devfreq").listFiles(); + if (inner == null) continue; + for (File node : inner) { + found = true; + Long cur = readLongFromLine(node + "/cur_freq"); + Long load = readLongFromLine(node + "/gpu_load"); + if (load == null) load = readLongFromLine(node + "/load"); + sb.append(" devfreq ").append(node.getAbsolutePath()) + .append(": cur_freq=").append(cur == null ? "—" : cur.toString()) + .append(" load=").append(load == null ? "—" : load.toString()).append('\n'); + } + } + } + if (!found) sb.append(" devfreq (platform kgsl): (no app-readable node found)\n"); + } + + private static String probeOpen(String path, int flags) { + java.io.FileDescriptor fd = null; + try { + fd = android.system.Os.open(path, flags, 0); + return "OK"; + } catch (Throwable t) { + return t.getClass().getSimpleName() + ": " + t.getMessage(); + } finally { + if (fd != null) try { android.system.Os.close(fd); } catch (Throwable ignored) {} + } + } + + private void appendPowerSupplyDump(StringBuilder sb) { + sb.append("-- /sys/class/power_supply (battery watts inputs) --\n"); + File[] nodes = new File("/sys/class/power_supply").listFiles(); + if (nodes == null || nodes.length == 0) { sb.append(" (absent / unreadable)\n"); return; } + boolean any = false; + for (File node : nodes) { + Long v = readLongFromLine(node + "/voltage_now"); + Long c = readLongFromLine(node + "/current_now"); + Long p = readLongFromLine(node + "/power_now"); + if (v == null && c == null && p == null) continue; + any = true; + sb.append(" ").append(node.getName()) + .append(": voltage_now=").append(v == null ? "—" : v + "µV") + .append(" current_now=").append(c == null ? "—" : c + "µA") + .append(" power_now=").append(p == null ? "—" : p + "µW") + .append('\n'); + } + if (!any) sb.append(" (nodes present but voltage_now/current_now/power_now unreadable)\n"); + } + + private static void appendDevfreqListing(StringBuilder sb, String rootPath) { + File root = new File(rootPath); + File[] nodes = root.listFiles(File::isDirectory); + sb.append("-- ").append(rootPath).append(" --\n"); + if (nodes == null || nodes.length == 0) { sb.append(" (absent / empty)\n"); return; } + for (File node : nodes) { + sb.append(" ").append(node.getName()).append("/: ").append(readableFileNames(node)).append('\n'); + } + } + + private static void appendReadableFiles(StringBuilder sb, String dirPath) { + File dir = new File(dirPath); + sb.append("-- ").append(dirPath).append(" --\n"); + if (!dir.isDirectory()) { sb.append(" (absent / unreadable)\n"); return; } + sb.append(" ").append(readableFileNames(dir)).append('\n'); + } + + private static String readableFileNames(File dir) { + File[] files = dir.listFiles(); + if (files == null) return "(unreadable)"; + StringBuilder names = new StringBuilder(); + for (File f : files) { + if (f.isFile() && f.canRead()) { + if (names.length() > 0) names.append(", "); + names.append(f.getName()); + } + } + return names.length() == 0 ? "(no readable files)" : names.toString(); + } + + private static int clampPercent(int v) { return v < 0 ? 0 : (v > 100 ? 100 : v); } + + private static String readFirstLine(String path) { + try (BufferedReader r = new BufferedReader(new FileReader(path))) { + return r.readLine(); + } catch (Exception e) { + return null; + } + } + + private static String readNthLine(String path, int lineIndex) { + try (BufferedReader r = new BufferedReader(new FileReader(path))) { + String line = null; + for (int i = 0; i <= lineIndex; i++) { + line = r.readLine(); + if (line == null) return null; + } + return line; + } catch (Exception e) { + return null; + } + } + + private static Long readLongFromLine(String path) { + String line = readFirstLine(path); + return line == null ? null : parseLong(line.trim()); + } + + private static Integer readIntFromLine(String path) { + String line = readFirstLine(path); + return line == null ? null : parseInt(line.trim()); + } + + private static Long parseLong(String s) { + try { return Long.parseLong(s); } catch (Exception e) { return null; } + } + + private static Integer parseInt(String s) { + try { return Integer.parseInt(s); } catch (Exception e) { return null; } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java b/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java new file mode 100644 index 000000000..f455d8525 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java @@ -0,0 +1,117 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + */ + +package com.droiddeck.launcher.hud; + +import androidx.annotation.NonNull; + +import java.util.Iterator; + +public class KeyValueSet implements Iterable { + private String data = ""; + + public KeyValueSet() { + this.data = ""; + } + + public KeyValueSet(String data) { + this.data = data != null && !data.isEmpty() ? data : ""; + } + + private int[] indexOfKey(String key) { + int start = 0; + int end = data.indexOf(","); + if (end == -1) end = data.length(); + + while (start < end) { + int index = data.indexOf("=", start); + String currKey = data.substring(start, index); + if (currKey.equals(key)) return new int[]{start, end}; + start = end + 1; + end = data.indexOf(",", start); + if (end == -1) end = data.length(); + } + + return null; + } + + public String get(String key) { + for (String[] keyValue : this) if (keyValue[0].equals(key)) return keyValue[1]; + return ""; + } + + public String get(String key, String fallback) { + for (String[] keyValue : this) if (keyValue[0].equals(key)) return keyValue[1]; + return fallback; + } + + public boolean getBoolean(String key, boolean fallback) { + String value = get(key); + if (value.isEmpty()) return fallback; + return value.equals("1") || value.equals("t") || value.equalsIgnoreCase("true"); + } + + public float getFloat(String key, float fallback) { + String value = get(key); + try { + if (!value.isEmpty()) return Float.parseFloat(value); + } catch (NumberFormatException e) { + } + return fallback; + } + + public void put(String key, Object value) { + int[] range = indexOfKey(key); + if (range != null) { + data = data.substring(0, range[0]) + key + "=" + value + data.substring(range[1]); + } else { + data = (!data.isEmpty() ? data + "," : "") + key + "=" + value; + } + } + + public void put(String key, float value) { + put(key, String.valueOf(value)); + } + + @NonNull + @Override + public Iterator iterator() { + final int[] start = {0}; + final int[] end = {data.indexOf(",")}; + if (end[0] == -1) end[0] = data.length(); + final String[] item = new String[2]; + return new Iterator() { + @Override + public boolean hasNext() { + return start[0] < end[0]; + } + + @Override + public String[] next() { + int index = data.indexOf("=", start[0]); + item[0] = data.substring(start[0], index); + item[1] = data.substring(index + 1, end[0]); + start[0] = end[0] + 1; + end[0] = data.indexOf(",", start[0]); + if (end[0] == -1) end[0] = data.length(); + return item; + } + }; + } + + @NonNull + @Override + public String toString() { + return data; + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt new file mode 100644 index 000000000..ade7aa656 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt @@ -0,0 +1,144 @@ +package com.droiddeck.launcher.hud + +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File + +internal class MangoReadings(private val sessionDir: File, private val rootDir: File) { + class Cpu(val percent: Int, val perCore: IntArray) + class Memory(val usedBytes: Long, val totalBytes: Long, val swapUsedBytes: Long, val swapTotalBytes: Long) + class Battery(val percent: Int?, val watts: Float, val charging: Boolean) + + private val cpuTimes = HashMap() + private val cpuPercents = HashMap() + + @JvmOverloads + fun cpu(stat: File = statFile()): Cpu? { + val lines = runCatching { stat.readLines() }.getOrNull() ?: return null + var total: Int? = null + val cores = ArrayList() + for (line in lines) { + if (!line.startsWith("cpu")) break + val parts = line.split(WHITESPACE) + if (parts.size < 11) continue + val values = LongArray(10) { parts[it + 1].toLongOrNull() ?: 0L } + val percent = cpuPercent(parts[0], values) + if (parts[0] == "cpu") total = percent else cores.add(percent) + } + return total?.let { Cpu(it, cores.toIntArray()) } + } + + private fun statFile(): File = + File(sessionDir, "proc-stat").takeIf { !File("/proc/stat").canRead() && it.isFile } ?: File("/proc/stat") + + private fun cpuPercent(key: String, v: LongArray): Int { + val user = v[0] - v[8] + val nice = v[1] - v[9] + val systemAll = v[2] + v[5] + v[6] + val idleAll = v[3] + v[4] + val virt = v[8] + v[9] + val totalTime = user + nice + systemAll + idleAll + v[7] + virt + val now = longArrayOf(user, nice, systemAll, v[7], virt, totalTime) + val last = cpuTimes.put(key, now) ?: LongArray(6) + fun period(i: Int) = if (now[i] > last[i]) now[i] - last[i] else 0L + val totalPeriod = period(5).toFloat() + if (totalPeriod == 0f) return cpuPercents[key] ?: 0 + val busy = period(1) * 100f / totalPeriod + period(0) * 100f / totalPeriod + + period(2) * 100f / totalPeriod + (period(3) + period(4)) * 100f / totalPeriod + return busy.coerceIn(0f, 100f).toInt().also { cpuPercents[key] = it } + } + + fun cpuTempC(): Int? { + var sum = 0f + var count = 0 + for (zone in LinuxRuntime.cpuTempZones()) { + val milli = readLong(File(zone, "temp")) ?: continue + sum += milli / 1000f + count++ + } + return if (count == 0) null else (sum / count).toInt() + } + + fun gpuPercent(): Int? { + val feed = fresh(File(sessionDir, "sys/kgsl-3d0/perf_now")) + val source = feed ?: LinuxRuntime.gpuLoadSource()?.let(::File) ?: return null + return leadingNumber(source)?.toInt()?.coerceIn(0, 100) + } + + fun gpuClockMhz(): Int? { + val feed = fresh(File(sessionDir, "sys/kgsl-3d0/cur_freq")) + val source = feed ?: listOf("$KGSL/devfreq/cur_freq", "$KGSL/gpuclk").map(::File).firstOrNull { it.canRead() } ?: return null + val hz = leadingNumber(source) ?: return null + return (hz / 1_000_000.0).toInt().takeIf { it > 0 } + } + + fun gpuTempC(): Int? { + val milli = LinuxRuntime.gpuTempSource()?.let { readLong(File(it)) } ?: return null + return (milli / 1000.0).toInt() + } + + fun memory(): Memory? { + val kb = HashMap() + runCatching { + File("/proc/meminfo").forEachLine { line -> + val colon = line.indexOf(':') + if (colon > 0) line.substring(colon + 1).trim().split(WHITESPACE).firstOrNull()?.toLongOrNull() + ?.let { kb[line.substring(0, colon)] = it } + } + } + val total = kb["MemTotal"] ?: return null + val available = kb["MemAvailable"] ?: return null + val swapTotal = kb["SwapTotal"] ?: 0L + val swapFree = kb["SwapFree"] ?: 0L + return Memory((total - available) * 1024, total * 1024, (swapTotal - swapFree) * 1024, swapTotal * 1024) + } + + fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong) + + fun battery(): Battery? { + val dirs = File(sessionDir, "sys/power_supply").listFiles { f -> f.name.contains("BAT") }?.sortedBy { it.name } + if (dirs.isNullOrEmpty()) return null + var chargeNow = 0f + var chargeFull = 0f + var watts = 0f + var charging = false + for (dir in dirs) { + val status = runCatching { File(dir, "status").readLines().firstOrNull() }.getOrNull() + if (status == "Charging" || status == "Unknown" || status == "Full") charging = true + val now = File(dir, "charge_now").takeIf { it.exists() } ?: File(dir, "energy_now") + val full = File(dir, "charge_full").takeIf { it.exists() } ?: File(dir, "energy_full") + if (now.exists()) { + chargeNow += (readFloat(now) ?: 0f) / 1_000_000f + chargeFull += (readFloat(full) ?: 0f) / 1_000_000f + } else { + chargeNow += (readFloat(File(dir, "capacity")) ?: 0f) / 100f + chargeFull = dirs.size.toFloat() + } + if (!charging) { + val power = File(dir, "power_now") + watts += if (power.exists()) kotlin.math.abs(readFloat(power) ?: 0f) / 1_000_000f + else kotlin.math.abs((readFloat(File(dir, "current_now")) ?: 0f) * (readFloat(File(dir, "voltage_now")) ?: 0f)) / 1e12f + } + } + val percent = if (chargeFull > 0f) Math.round(chargeNow / chargeFull * 100f) else null + return Battery(percent, if (charging) 0f else watts, charging) + } + + private fun fresh(file: File, maxAgeMs: Long = FEED_FRESH_MS): File? = + file.takeIf { it.isFile && System.currentTimeMillis() - it.lastModified() < maxAgeMs } + + + companion object { + private const val KGSL = "/sys/class/kgsl/kgsl-3d0" + const val VRAM_FILE = "run/droiddeck-hud/gpu-mem" + private const val FEED_FRESH_MS = 10_000L + private const val VRAM_FRESH_MS = 15_000L + private val WHITESPACE = Regex("\\s+") + + private fun readLong(file: File): Long? = runCatching { file.readText().trim().toLong() }.getOrNull() + private fun readFloat(file: File): Float? = runCatching { file.readLines().first().trim().toFloat() }.getOrNull() + + fun leadingNumber(file: File): Double? = runCatching { + Regex("^\\s*-?\\d+(\\.\\d+)?").find(file.readLines().first())?.value?.trim()?.toDouble() + }.getOrNull() + } +} 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 000000000..54ae373ae --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -0,0 +1,100 @@ +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 val holds: () -> Boolean = { true }) { + 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 + if (!holds()) { + presses.values.forEach { handler.removeCallbacks(it.hold); it.used = true } + cancelTap() + 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 + if (!holds()) { press.used = true; cancelTap(); 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 4bd76a4e7..cb544d5a4 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 9b08fd8ad..c784bc3bf 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/DesktopKeyboardButton.kt b/app/src/main/java/com/droiddeck/launcher/input/DesktopKeyboardButton.kt new file mode 100644 index 000000000..50eba5be9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/DesktopKeyboardButton.kt @@ -0,0 +1,119 @@ +package com.droiddeck.launcher.input + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.RectF +import android.os.Build +import android.view.Gravity +import android.view.HapticFeedbackConstants +import android.view.MotionEvent +import android.view.View +import android.view.WindowInsets +import android.widget.FrameLayout +import com.droiddeck.launcher.R + +@SuppressLint("ViewConstructor") +class DesktopKeyboardButton(context: Context, private val onTap: () -> Unit) : View(context) { + + private val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = dp(1.5f) } + private val box = RectF() + private var idleFill = 0 + private var idleStroke = 0 + private var heldStroke = 0 + private var pressed = false + + init { + contentDescription = context.getString(R.string.second_show_keyboard) + isClickable = true + visibility = GONE + layoutParams = FrameLayout.LayoutParams(dp(SIZE).toInt(), dp(SIZE).toInt(), Gravity.BOTTOM or Gravity.START) + place(0, 0) + applyColors() + } + + private fun dp(value: Float) = value * resources.displayMetrics.density + + fun applyColors() { + val settings = ControllerPrefs.read(context) + val tint = settings.tint + val alpha = settings.opacity / 100f + fun light(a: Int, f: Float) = Color.argb( + (a * alpha).toInt(), + (Color.red(tint) + (255 - Color.red(tint)) * f).toInt(), + (Color.green(tint) + (255 - Color.green(tint)) * f).toInt(), + (Color.blue(tint) + (255 - Color.blue(tint)) * f).toInt(), + ) + idleFill = Color.argb(190, (Color.red(tint) * 0.12f).toInt(), (Color.green(tint) * 0.12f).toInt(), (Color.blue(tint) * 0.12f).toInt()) + idleStroke = light(150, 0.25f) + heldStroke = light(230, 0.7f) + invalidate() + } + + private fun place(left: Int, bottom: Int) { + val params = layoutParams as FrameLayout.LayoutParams + val marginStart = left + (dp(CENTER_X) - dp(SIZE) / 2f).toInt() + val marginBottom = bottom + (dp(CENTER_Y) - dp(SIZE) / 2f).toInt() + if (params.leftMargin == marginStart && params.bottomMargin == marginBottom) return + params.leftMargin = marginStart + params.bottomMargin = marginBottom + layoutParams = params + } + + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null + if (Build.VERSION.SDK_INT >= 28) place(cutout?.safeInsetLeft ?: 0, cutout?.safeInsetBottom ?: 0) + else place(0, 0) + return super.onApplyWindowInsets(insets) + } + + override fun onDraw(canvas: Canvas) { + val x = width / 2f + val y = height / 2f + fill.color = idleFill + canvas.drawCircle(x, y, dp(18f), fill) + stroke.color = if (pressed) heldStroke else idleStroke + canvas.drawCircle(x, y, dp(18f), stroke) + box.set(x - dp(10f), y - dp(7f), x + dp(10f), y + dp(7f)) + canvas.drawRoundRect(box, dp(2f), dp(2f), stroke) + for (row in 0..1) for (col in 0..2) { + val kx = x + dp(-6f + col * 5f) + val ky = y + dp(-3f + row * 4f) + canvas.drawLine(kx, ky, kx + dp(2f), ky, stroke) + } + canvas.drawLine(x - dp(5f), y + dp(4f), x + dp(5f), y + dp(4f), stroke) + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { pressed = true; invalidate() } + MotionEvent.ACTION_UP -> { + val inside = event.x in 0f..width.toFloat() && event.y in 0f..height.toFloat() + pressed = false + invalidate() + if (inside) { + performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) + performClick() + } + } + MotionEvent.ACTION_CANCEL -> { pressed = false; invalidate() } + } + return true + } + + override fun performClick(): Boolean { + super.performClick() + onTap() + return true + } + + private companion object { + const val SIZE = 52f + const val CENTER_X = 90f + const val CENTER_Y = 34f + } +} 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 318941c71..d38eb9758 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -8,46 +8,125 @@ import kotlin.math.abs class DirectTouchHold( private val slopPx: Float, private val listener: PointerGestures.Listener, - private val cancelTouch: () -> Unit, + private val touch: Touch, ) { + interface Touch { + fun down(pointerId: Int, x: Float, y: Float) + fun move(pointerId: Int, x: Float, y: Float) + fun up(pointerId: Int, x: Float, y: Float) + fun cancel() + } + private val handler = Handler(Looper.getMainLooper()) - private var x = 0f - private var y = 0f - private var consumed = false - private var pressed = false + private var downX = 0f + private var downY = 0f + private var downId = 0 + private var delayMs = 0L + private var holdBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_CLICK + private var forwarded = false + private var held = false + private var pressing = false + private var upX = 0f + private var upY = 0f + private var liftId = 0 + private var liftPending = false + private val lift = Runnable { + liftPending = false + if (forwarded) { + touch.up(liftId, upX, upY) + forwarded = false + } + } private val release = Runnable { - if (pressed) listener.onButton(PointerGestures.BTN_RIGHT, false, x, y) - pressed = false + if (pressing) listener.onButton(PointerGestures.BTN_RIGHT, false, downX, downY) + pressing = false } private val hold = Runnable { - cancelTouch() - consumed = true + held = true listener.onLongPress() - listener.onButton(PointerGestures.BTN_RIGHT, true, x, y) - pressed = true - handler.postDelayed(release, 50L) + listener.onButton(PointerGestures.BTN_RIGHT, true, downX, downY) + pressing = true + if (holdBehavior != TouchGestureConfig.MOUSE_BEHAVIOR_HOLD) handler.postDelayed(release, 50L) + } + + fun configure(config: TouchGestureConfig) { + cancel() + delayMs = config.longPressDelay.toLong().coerceAtLeast(1L) + holdBehavior = config.directHoldBehavior } fun cancel() { handler.removeCallbacks(hold) handler.removeCallbacks(release) + handler.removeCallbacks(lift) + liftPending = false release.run() - consumed = false + if (forwarded) touch.cancel() + forwarded = false + held = false } fun onTouch(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + if (liftPending) { + handler.removeCallbacks(lift) + lift.run() + } + cancel() + downX = event.x + downY = event.y + downId = event.getPointerId(0) + if (holdBehavior == TouchGestureConfig.MOUSE_BEHAVIOR_NONE) forwardDown() + else handler.postDelayed(hold, delayMs) + return true + } + if (held) { + when (event.actionMasked) { + MotionEvent.ACTION_UP -> { release.run(); held = false } + MotionEvent.ACTION_CANCEL -> cancel() + } + return true + } when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - cancel() - x = event.x; y = event.y - handler.postDelayed(hold, 500L) + MotionEvent.ACTION_POINTER_DOWN -> { + handler.removeCallbacks(hold) + if (!forwarded) forwardDown() + val index = event.actionIndex + touch.down(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_MOVE -> { + if (!forwarded && (event.pointerCount > 1 || + abs(event.x - downX) > slopPx || abs(event.y - downY) > slopPx)) { + handler.removeCallbacks(hold) + forwardDown() + } + if (forwarded) for (index in 0 until event.pointerCount) + touch.move(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_POINTER_UP -> { + val index = event.actionIndex + touch.up(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_UP -> { + handler.removeCallbacks(hold) + if (!forwarded) forwardDown() + upX = event.x + upY = event.y + liftId = event.getPointerId(event.actionIndex) + liftPending = true + handler.postDelayed(lift, LIFT_MS) } - MotionEvent.ACTION_MOVE -> if (event.pointerCount > 1 || - abs(event.x - x) > slopPx || abs(event.y - y) > slopPx) handler.removeCallbacks(hold) - MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_POINTER_UP, - MotionEvent.ACTION_UP -> handler.removeCallbacks(hold) MotionEvent.ACTION_CANCEL -> cancel() } - return consumed + return true + } + + private fun forwardDown() { + touch.down(downId, downX, downY) + forwarded = true + } + + private companion object { + const val LIFT_MS = 50L } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt new file mode 100644 index 000000000..e8d7fd71e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -0,0 +1,81 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.hardware.display.DisplayManager +import android.os.Build +import android.view.Display +import android.view.InputDevice +import android.view.MotionEvent +import com.droiddeck.launcher.session.SessionPrefs +import kotlin.math.abs +import kotlin.math.roundToInt + +object DualScreen { + const val MODE_AUTO = "auto" + const val MODE_ON = "on" + const val MODE_OFF = "off" + val modes = listOf(MODE_AUTO, MODE_ON, MODE_OFF) + private const val TYPE_INTERNAL = 1 + private val knownModels = setOf("retroid pocket duo", "ayn thor") + private val touchedDisplays = mutableSetOf() + + fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? { + val primary = displayManager.getDisplay(primaryDisplayId) + val awake = primary?.state != Display.STATE_OFF + val panels = if (awake) touchPanels() else emptyList() + return internalDisplay(displayManager, primaryDisplayId) { + if (awake && it.state == Display.STATE_OFF) return@internalDisplay false + synchronized(touchedDisplays) { + if (awake && hasOwnTouchPanel(size(it), primary?.let(::size), panels)) touchedDisplays += it.displayId + it.displayId in touchedDisplays + } + } + } + + private fun internalDisplay(displayManager: DisplayManager, primaryDisplayId: Int, accept: (Display) -> Boolean = { true }): Display? = + displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { + it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 && + isBuiltIn(displayType(it), Build.MODEL) && accept(it) + } + + internal fun hasOwnTouchPanel(display: Pair, primary: Pair?, panels: List>): Boolean { + val matching = panels.count { covers(it, display) } + return if (primary != null && covers(primary, display)) matching >= 2 else matching >= 1 + } + + private fun covers(panel: Pair, display: Pair): Boolean = + (near(panel.first, display.first) && near(panel.second, display.second)) || + (near(panel.first, display.second) && near(panel.second, display.first)) + + private fun near(a: Int, b: Int) = abs(a - b) <= 2 + + private fun size(display: Display): Pair = + display.mode.let { it.physicalWidth to it.physicalHeight } + + private fun touchPanels(): List> = + InputDevice.getDeviceIds().toList().mapNotNull { id -> + val device = InputDevice.getDevice(id) ?: return@mapNotNull null + if (device.isVirtual || !device.supportsSource(InputDevice.SOURCE_TOUCHSCREEN)) return@mapNotNull null + val x = device.getMotionRange(MotionEvent.AXIS_X, InputDevice.SOURCE_TOUCHSCREEN) ?: return@mapNotNull null + val y = device.getMotionRange(MotionEvent.AXIS_Y, InputDevice.SOURCE_TOUCHSCREEN) ?: return@mapNotNull null + (x.max - x.min + 1f).roundToInt() to (y.max - y.min + 1f).roundToInt() + } + + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = + when (SessionPrefs.dualScreenMode(context)) { + MODE_OFF -> null + MODE_ON -> internalDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) + else -> builtInDisplay(displayManager, primaryDisplayId) + } + + fun anyDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? = + displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { + it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 + } + + internal fun isBuiltIn(type: Int?, model: String): Boolean = + if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels + + private fun displayType(display: Display): Int? = + runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull() +} 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 05469e634..8cbe135e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java +++ b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java @@ -14,6 +14,7 @@ public class FakeInputWriter { public static final short EV_SYN = 0x00; public static final short EV_KEY = 0x01; + public static final short EV_REL = 0x02; public static final short EV_ABS = 0x03; public static final short EV_MSC = 0x04; @@ -52,7 +53,8 @@ public class FakeInputWriter { private static final int EVENT_SIZE = 24; static final int MAX_EVENTS_PER_UPDATE = 32; private static final int BUFFER_SIZE = EVENT_SIZE * MAX_EVENTS_PER_UPDATE; - private static final int MAX_FAKE_INPUT_SLOTS = 4; + private static final int MAX_FAKE_INPUT_SLOTS = 5; + public static final int MOUSE_SLOT = 4; private static final int RING_CAPACITY_EVENTS = 4096; private static final int RING_HEADER_SIZE = 64; @@ -88,6 +90,17 @@ public class FakeInputWriter { public static final int PAD_TYPE_XBOX = 2; public static final int PAD_TYPE_DS4 = 3; public static final int PAD_TYPE_DUALSENSE = 4; + public static final int PAD_TYPE_MOUSE = 5; + + public static final short REL_X = 0x00; + public static final short REL_Y = 0x01; + public static final short REL_HWHEEL = 0x06; + public static final short REL_WHEEL = 0x08; + public static final short REL_WHEEL_HI_RES = 0x0b; + public static final short REL_HWHEEL_HI_RES = 0x0c; + public static final short MOUSE_BTN_LEFT = 0x110; + public static final short MOUSE_BTN_RIGHT = 0x111; + public static final short MOUSE_BTN_MIDDLE = 0x112; private static volatile int padType = -1; private static volatile boolean tritonConnected = false; private static final int TRITON_OFFSET = RING_SIZE + 64; @@ -136,6 +149,8 @@ public class FakeInputWriter { private int prevThumbLX, prevThumbLY, prevThumbRX, prevThumbRY; private int prevTriggerL, prevTriggerR; private int prevHatX, prevHatY; + private final boolean[] prevMouseButtons = new boolean[3]; + private float pendingMouseX, pendingMouseY; private boolean hasChanges = false; private boolean pendingFullResend = false; private boolean forceResend = false; @@ -201,7 +216,7 @@ public class FakeInputWriter { return FakeInputRingPaths.ringFile(fakeInputDir, slot); } - private static void initializeRingHeader(ByteBuffer data) { + private static void initializeRingHeader(int slot, ByteBuffer data) { data.order(ByteOrder.LITTLE_ENDIAN); data.putInt(RING_MAGIC_OFFSET, RING_MAGIC); data.putInt(RING_VERSION_OFFSET, RING_VERSION); @@ -221,7 +236,7 @@ public class FakeInputWriter { data.putShort(IMU_ACCEL_OFFSET + (i * 2), (short) 0); } data.putInt(DECK_CONTROLS_OFFSET, 0); - int type = padType; + int type = slot == MOUSE_SLOT ? PAD_TYPE_MOUSE : padType; data.putInt(PAD_TYPE_OFFSET, type >= 0 ? PAD_TYPE_SET | type : 0); data.putInt(LATENCY_OFFSET, latency); data.putInt(TRITON_OFFSET, TRITON_MAGIC); @@ -312,7 +327,7 @@ public class FakeInputWriter { raf.setLength(RING_FILE_SIZE); channel = raf.getChannel(); ByteBuffer data = channel.map(FileChannel.MapMode.READ_WRITE, 0, RING_FILE_SIZE); - initializeRingHeader(data); + initializeRingHeader(slot, data); RingSlot ringSlot = new RingSlot(); ringSlot.data = data; @@ -525,8 +540,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) { @@ -597,7 +612,6 @@ public class FakeInputWriter { for (int i = 0; i < length; i++) output[9 + i] = ring.get(TRITON_OUTPUT_OFFSET + i); nativeStoreFence(); if (seq != ring.getLong(TRITON_OUTPUT_SEQ_OFFSET)) return null; - // Acknowledge the exact report sequence taken so a concurrent timeout overwrite cannot lose its length. ring.putInt(TRITON_OUTPUT_ACK_OFFSET, (int) seq); nativeStoreFence(); return output; @@ -745,6 +759,14 @@ public class FakeInputWriter { prevHatY = 0; writeEvent(EV_ABS, ABS_HAT0Y, 0); } + for (int i = 0; i < prevMouseButtons.length; i++) { + if (prevMouseButtons[i]) { + prevMouseButtons[i] = false; + writeEvent(EV_KEY, (short) (MOUSE_BTN_LEFT + i), 0); + } + } + pendingMouseX = 0; + pendingMouseY = 0; if (hasChanges) { writeEvent(EV_SYN, SYN_REPORT, 0); @@ -874,4 +896,64 @@ public class FakeInputWriter { public boolean isOpen() { return isOpen; } + + public synchronized void writeMouseDelta(float dx, float dy) { + if (!isOpen && !open()) + return; + pendingMouseX += dx; + pendingMouseY += dy; + int x = (int) Math.floor(pendingMouseX); + int y = (int) Math.floor(pendingMouseY); + if (x == 0 && y == 0) + return; + pendingMouseX -= x; + pendingMouseY -= y; + buffer.clear(); + hasChanges = false; + if (x != 0) writeEvent(EV_REL, REL_X, x); + if (y != 0) writeEvent(EV_REL, REL_Y, y); + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse delta write error: fake input mmap ring unavailable"); + } + + public synchronized void writeMouseButton(short code, boolean pressed) { + if (code < MOUSE_BTN_LEFT || code > MOUSE_BTN_MIDDLE) + return; + int idx = code - MOUSE_BTN_LEFT; + if (!isOpen && !open()) + return; + if (prevMouseButtons[idx] == pressed) + return; + prevMouseButtons[idx] = pressed; + buffer.clear(); + hasChanges = false; + writeEvent(EV_KEY, code, pressed ? 1 : 0); + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse button write error: fake input mmap ring unavailable"); + } + + public synchronized void writeMouseWheel(int verticalClicks, int horizontalClicks, int value120) { + if (verticalClicks == 0 && horizontalClicks == 0) + return; + if (!isOpen && !open()) + return; + buffer.clear(); + hasChanges = false; + if (verticalClicks != 0) { + writeEvent(EV_REL, REL_WHEEL, verticalClicks); + writeEvent(EV_REL, REL_WHEEL_HI_RES, verticalClicks * value120); + } + if (horizontalClicks != 0) { + writeEvent(EV_REL, REL_HWHEEL, horizontalClicks); + writeEvent(EV_REL, REL_HWHEEL_HI_RES, horizontalClicks * value120); + } + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse wheel write error: fake input mmap ring unavailable"); + } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt index b8be5bf54..55588d6fd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.input import android.content.Context -/** Global defaults with optional overrides for the currently focused game. */ object GesturePrefs { private fun prefs(context: Context) = context.getSharedPreferences("touch_gestures", Context.MODE_PRIVATE) 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 000000000..4d69f68c5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.input + +import android.view.MotionEvent + +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/GuestKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/GuestKeys.kt new file mode 100644 index 000000000..fbc3739cd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GuestKeys.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent + +object GuestKeys { + /** Sends [event] as evdev presses, with Shift around characters typed by a keyboard that has no Shift key; false when it has no evdev code. */ + fun send(event: KeyEvent, sendKey: (code: Int, down: Boolean) -> Unit): Boolean { + val down = event.action == KeyEvent.ACTION_DOWN + if (!down && event.action != KeyEvent.ACTION_UP) return false + var evdev = EvdevKeys.fromKeyCode(event.keyCode) + val ch = event.unicodeChar + val plain = if (ch > 0) EvdevKeys.unshiftedChar(ch) else 0 + if (evdev <= 0 && ch > 0) { + val code = EvdevKeys.fromKeyCode(EvdevKeys.keycodeForChar(if (plain != 0) plain else ch)) + if (code > 0) evdev = code + } + val shiftEvdev = if (evdev > 0 && plain != 0 && event.deviceId <= 0) KEY_LEFTSHIFT else 0 + if (evdev <= 0 && event.scanCode > 0) evdev = event.scanCode + if (evdev <= 0) return false + if (down) { + if (shiftEvdev != 0) sendKey(shiftEvdev, true) + sendKey(evdev, true) + } else { + sendKey(evdev, false) + if (shiftEvdev != 0) sendKey(shiftEvdev, false) + } + return true + } + + private const val KEY_LEFTSHIFT = 42 +} 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 000000000..61dfe32c4 --- /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 { + if (!HomeGuideInput.isHome(event.keyCode) || !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() + com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) + 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 000000000..e4d712044 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.input + +import android.os.Build +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 (!isHome(event.keyCode)) return false + if (isQuickMenuKey(event)) { + if (event.action == KeyEvent.ACTION_DOWN) cancel() + 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) } + } + + companion object { + fun isHome(keyCode: Int) = keyCode == KeyEvent.KEYCODE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_HOME + + private const val DUO_QUICK_MENU_SCAN_CODE = 194 + + fun isQuickMenuKey(event: KeyEvent) = + event.scanCode == DUO_QUICK_MENU_SCAN_CODE && "Retroid Pocket Duo".equals(Build.MODEL, ignoreCase = true) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt index 494533f43..ab2550a4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt @@ -23,6 +23,9 @@ class KeyboardHost( private val map: KeyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD) var shown = false private set + var imeShowing = false + private set + var onImeChanged: ((Boolean) -> Unit)? = null init { isFocusable = false @@ -42,6 +45,28 @@ class KeyboardHost( return KeyConnection() } + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + val visible = insets.isVisible(WindowInsets.Type.ime()) + if (visible != imeShowing) { + imeShowing = visible + onImeChanged?.invoke(visible) + } + } + return super.onApplyWindowInsets(insets) + } + + override fun onKeyPreIme(keyCode: Int, event: KeyEvent): Boolean { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || keyCode != KeyEvent.KEYCODE_BACK || !shown) { + return super.onKeyPreIme(keyCode, event) + } + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) { + hide() + onImeChanged?.invoke(false) + } + return true + } + fun toggle() = if (shown && imeVisible()) hide() else show() private fun imeVisible() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || 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 50ffb17a8..4e17080e3 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() @@ -203,7 +205,7 @@ class OnScreenControls( 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) + val fresh = if (Build.VERSION.SDK_INT >= 28) Rect(cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0, cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0) else Rect() if (fresh != safe) { safe = fresh; relayout() } return super.onApplyWindowInsets(insets) } @@ -515,6 +517,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() @@ -542,11 +547,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 } @@ -568,10 +575,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 @@ -604,6 +617,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 -> { @@ -642,6 +672,10 @@ class OnScreenControls( private fun closestSnap(position: Float, targets: List): Float? = targets.minByOrNull { abs(position - it) }?.takeIf { abs(position - it) <= dp(SNAP_DP) } + fun takesTouchAt(x: Float, y: Float): Boolean = + editing || keyboardContains(x, y) || (!buttonsOnly && quickContains(x, y)) || + (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) + private fun controlAt(x: Float, y: Float): Control? = controls.firstOrNull { !quickHidden && isVisible(it) && (editing || !settings.adaptiveSticks || it.stick < 0) && it.contains(x, y, it.radius) 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 cfb0978cb..edb95fbe6 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; @@ -52,6 +53,7 @@ public final class PadBridge { private final FakeInputWriter[] playerWriters = new FakeInputWriter[SLOTS]; private final PadState[] playerStates = new PadState[SLOTS]; private final PadState effectiveState = new PadState(); + private final PadState homeGuideReport = new PadState(); private final Handler mainHandler = new Handler(Looper.getMainLooper()); private boolean open; private volatile boolean selectSteam; @@ -60,12 +62,21 @@ public final class PadBridge { private final PadState routedTouch = new PadState(); private boolean systemGuidePressed; private boolean systemQamPressed; + private boolean backQamPressed; + private boolean homeGuidePressed; + private int homeGuideSlot = -1; + private final PadState lastBackQamReport = new PadState(); + private final PadState lastWrittenReport = 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; private boolean qamTapPressed; 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,9 +139,12 @@ public final class PadBridge { } private void resetBuiltin() { + homeGuidePressed = false; + clearBackQamWrites(); routedTouch.clear(); systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamTapPressed = false; qamChordActive = false; chordButtonPressed = false; @@ -149,6 +163,9 @@ public final class PadBridge { } public synchronized void stop() { + homeGuidePressed = false; + homeGuideSlot = -1; + clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; for (int slot = 0; slot < SLOTS; slot++) { @@ -164,6 +181,7 @@ public final class PadBridge { } systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamChordActive = false; chordButtonPressed = false; qamTapPressed = false; @@ -214,6 +232,7 @@ public final class PadBridge { case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_MENU: case KeyEvent.KEYCODE_HOME: + case KeyEvent.KEYCODE_MOVE_HOME: if (!isFromController(device)) return false; return device.supportsSource(InputDevice.SOURCE_GAMEPAD) || device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC @@ -231,11 +250,6 @@ public final class PadBridge { || device.supportsSource(InputDevice.SOURCE_JOYSTICK)); } - public static boolean isControllerKey(KeyEvent event) { - return isFromController(event.getDevice()) - && isPadKey(event.getKeyCode(), event.getDevice().getKeyboardType()); - } - public static boolean isPadKey(int keyCode, int keyboardType) { if ((keyCode >= KeyEvent.KEYCODE_BUTTON_A && keyCode <= KeyEvent.KEYCODE_BUTTON_MODE) || (keyCode >= KeyEvent.KEYCODE_BUTTON_1 && keyCode <= KeyEvent.KEYCODE_BUTTON_16)) return true; @@ -272,6 +286,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; @@ -306,12 +328,13 @@ public final class PadBridge { case KeyEvent.KEYCODE_BUTTON_THUMBL: pad.press(8, pressed); break; case KeyEvent.KEYCODE_BUTTON_THUMBR: pad.press(9, pressed); break; case KeyEvent.KEYCODE_BUTTON_MODE: - case KeyEvent.KEYCODE_HOME: pad.press(PadState.GUIDE, pressed); break; + case KeyEvent.KEYCODE_HOME: + case KeyEvent.KEYCODE_MOVE_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; @@ -322,6 +345,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(); @@ -351,6 +375,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); return true; @@ -381,6 +406,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(); @@ -457,7 +484,11 @@ public final class PadBridge { } public synchronized void releaseAll() { + homeGuidePressed = false; + homeGuideSlot = -1; + clearBackQamWrites(); routedTouch.clear(); + backQamPressed = false; releaseBackPaddles(); state.clear(); publish(); @@ -478,6 +509,145 @@ public final class PadBridge { return SessionState.getDeckPad() && FakeInputWriter.padHasQam(); } + public boolean canHoldQam() { + return builtinPad && nativeQam(); + } + + public synchronized void setHomeGuidePressed(boolean pressed) { + int slot = pressed ? firstPlayerSlot() : homeGuideSlot; + if (slot > 0) { + homeGuideSlot = pressed ? slot : -1; + publish(slot); + return; + } + if (homeGuidePressed == pressed) return; + homeGuidePressed = pressed; + updateHeldModifier(PadState.GUIDE, pressed); + } + + public synchronized void cancelHomeGuide() { + int slot = homeGuideSlot; + if (slot > 0) { + homeGuideSlot = -1; + publish(slot); + } + if (!homeGuidePressed) return; + clearBackQamWrites(); + homeGuidePressed = false; + state.clear(); + 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(state); + 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; + state.clear(); + 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) { + if (backQamAxesBlocked && !hasAxes(state)) backQamAxesBlocked = false; + long at = android.os.SystemClock.uptimeMillis(); + 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 = state.leftX; live.leftY = state.leftY; + live.rightX = state.rightX; live.rightY = state.rightY; + live.leftTrigger = state.leftTrigger; live.rightTrigger = state.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()) { @@ -556,7 +726,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; } @@ -573,6 +745,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(); @@ -585,6 +763,7 @@ public final class PadBridge { } private void leave(int slot, int id) { + if (slot == 0) clearBackQamWrites(); if (partners[slot] == NO_CONTROLLER) { free(slot); return; @@ -611,6 +790,7 @@ public final class PadBridge { partners[slot] = NO_CONTROLLER; clearJoyCons(slot); slotControllers.set(slot, NO_CONTROLLER); + if (slot == homeGuideSlot) homeGuideSlot = -1; if (slot == firstPlayerSlot()) releaseBackPaddles(); if (slot == 0) { state.clear(); @@ -667,7 +847,13 @@ public final class PadBridge { } playerWriters[slot] = player; } - player.writePad(playerStates[slot]); + PadState report = playerStates[slot]; + if (slot == homeGuideSlot) { + homeGuideReport.copyFrom(report); + homeGuideReport.press(PadState.GUIDE, true); + report = homeGuideReport; + } + player.writePad(report); } private void publish() { @@ -676,17 +862,17 @@ public final class PadBridge { statDropped++; return; } - boolean guide = systemGuidePressed || qamChordActive; - boolean qam = nativeQam() && (systemQamPressed || qamTapPressed); + boolean guide = systemGuidePressed || qamChordActive || homeGuidePressed; + boolean qam = nativeQam() && (systemQamPressed || qamTapPressed || backQamPressed); if (!guide && !qam) { - writer.writePad(state); + writePad(state); return; } effectiveState.copyFrom(state); if (guide) effectiveState.press(PadState.GUIDE, true); if (qam) effectiveState.press(PadState.QAM, true); if (chordButtonPressed) effectiveState.press(chordButton, true); - writer.writePad(effectiveState); + writePad(effectiveState); } public static boolean wiredXboxLayout(MotionEvent event) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt new file mode 100644 index 000000000..f3ab1d4c6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import androidx.annotation.StringRes +import com.droiddeck.launcher.R + +data class PcKey( + val label: String, + val code: Int, + val weight: Float = 1f, + val shifted: String? = null, + @StringRes val labelRes: Int = 0, +) + +internal fun k(label: String, code: Int, weight: Float = 1f, shifted: String? = null) = PcKey(label, code, weight, shifted) + +internal fun k(@StringRes labelRes: Int, code: Int, weight: Float = 1f) = PcKey("", code, weight, null, labelRes) + +val PC_KEY_ROWS: List> = listOf( + listOf( + k(R.string.pckb_key_esc, 1), k("F1", 59), k("F2", 60), k("F3", 61), k("F4", 62), k("F5", 63), k("F6", 64), + k("F7", 65), k("F8", 66), k("F9", 67), k("F10", 68), k("F11", 87), k("F12", 88), + k(R.string.pckb_key_ins, 110), k(R.string.pckb_key_del, 111), k(R.string.pckb_key_home, 102), k(R.string.pckb_key_end, 107), k(R.string.pckb_key_pgup, 104), k(R.string.pckb_key_pgdn, 109), + ), + listOf( + k("`", 41, shifted = "~"), k("1", 2, shifted = "!"), k("2", 3, shifted = "@"), k("3", 4, shifted = "#"), + k("4", 5, shifted = "$"), k("5", 6, shifted = "%"), k("6", 7, shifted = "^"), k("7", 8, shifted = "&"), + k("8", 9, shifted = "*"), k("9", 10, shifted = "("), k("0", 11, shifted = ")"), k("-", 12, shifted = "_"), + k("=", 13, shifted = "+"), k(R.string.pckb_key_backspace, 14, 2f), + ), + listOf( + k(R.string.pckb_key_tab, 15, 1.5f), k("q", 16), k("w", 17), k("e", 18), k("r", 19), k("t", 20), k("y", 21), + k("u", 22), k("i", 23), k("o", 24), k("p", 25), k("[", 26, shifted = "{"), k("]", 27, shifted = "}"), + k("\\", 43, 1.5f, shifted = "|"), + ), + listOf( + k(R.string.pckb_key_caps, 58, 1.75f), k("a", 30), k("s", 31), k("d", 32), k("f", 33), k("g", 34), k("h", 35), + k("j", 36), k("k", 37), k("l", 38), k(";", 39, shifted = ":"), k("'", 40, shifted = "\""), + k(R.string.pckb_key_enter, 28, 2.25f), + ), + listOf( + k(R.string.pckb_key_shift, 42, 2.25f), k("z", 44), k("x", 45), k("c", 46), k("v", 47), k("b", 48), k("n", 49), + k("m", 50), k(",", 51, shifted = "<"), k(".", 52, shifted = ">"), k("/", 53, shifted = "?"), + k(R.string.pckb_key_shift, 54, 1.75f), k("↑", 103), + ), + listOf( + k(R.string.pckb_key_ctrl, 29, 1.5f), k(R.string.pckb_key_super, 125, 1.25f), k(R.string.pckb_key_alt, 56, 1.25f), k(R.string.pckb_key_space, 57, 6.25f), + k(R.string.pckb_key_altgr, 100, 1.25f), k(R.string.pckb_key_ctrl, 97, 1.25f), k("←", 105), k("↓", 108), k("→", 106), + ), +) + +val PC_MODIFIERS: Set = setOf(42, 54, 29, 97, 56, 100, 125) + +val PC_KEYS: Map = PC_KEY_ROWS.flatten().associateBy { it.code } + +fun pcKeyLabel(context: Context, code: Int): String { + val key = PC_KEYS[code] ?: return code.toString() + val text = if (key.labelRes != 0) context.getString(key.labelRes) else key.label + return if (text.length == 1 && text[0].isLetter()) text.uppercase() else text +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt new file mode 100644 index 000000000..a79fa8c70 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt @@ -0,0 +1,145 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.util.Log +import android.view.InputDevice +import android.view.KeyEvent +import androidx.annotation.StringRes +import com.droiddeck.launcher.R +import org.json.JSONArray +import org.json.JSONException +import org.json.JSONObject + +object PhysicalShortcuts { + internal const val KEY = "physicalShortcuts" + private const val TAG = "PhysicalShortcuts" + + enum class Action(@StringRes val label: Int) { + STEAM(R.string.drawer_steam_menu), + QAM(R.string.drawer_open_qam), + DROIDDECK(R.string.shortcuts_dd_menu), + } + + data class Button( + val device: String, + val name: String, + val keyCode: Int, + val scanCode: Int, + ) { + fun matches(event: KeyEvent): Boolean = + event.device?.let { device == identity(it) } == true && + keyCode == event.keyCode && scanCode == event.scanCode + + fun sameInput(other: Button): Boolean = + device == other.device && keyCode == other.keyCode && scanCode == other.scanCode + + val label: String + get() = KeyEvent.keyCodeToString(keyCode).removePrefix("KEYCODE_").removePrefix("BUTTON_") + + } + + data class Binding(val button: Button, val action: Action) + + private fun identity(device: InputDevice): String = + "${device.vendorId}:${device.productId}:${device.descriptor.ifBlank { device.name }}" + + fun isVolumeKey(event: KeyEvent): Boolean = when (event.keyCode) { + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> true + else -> false + } + + fun isDrawerNavigationKey(event: KeyEvent): Boolean = when (event.keyCode) { + KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN, + KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> true + else -> false + } + + fun button(event: KeyEvent): Button? { + val device = event.device ?: return null + if (device.isVirtual || isVolumeKey(event)) return null + when (event.keyCode) { + KeyEvent.KEYCODE_HOME, KeyEvent.KEYCODE_POWER, KeyEvent.KEYCODE_SLEEP, + KeyEvent.KEYCODE_WAKEUP, KeyEvent.KEYCODE_APP_SWITCH -> return null + } + if (event.keyCode == KeyEvent.KEYCODE_UNKNOWN && event.scanCode <= 0) return null + return Button(identity(device), device.name, event.keyCode, event.scanCode) + } + + fun read(context: Context): List { + val raw = ControllerPrefs.prefs(context).getString(KEY, null) ?: return emptyList() + return try { + val array = JSONArray(raw) + buildList { + for (i in 0 until array.length()) { + try { + val entry = array.getJSONObject(i) + val action = Action.entries.firstOrNull { it.name == entry.getString("action") } + val code = entry.getInt("keyCode") + val scan = entry.getInt("scanCode") + val device = entry.getString("device") + if (action == null || device.isBlank() || code < 0 || scan < 0) { + Log.w(TAG, "Ignoring invalid shortcut at index $i") + continue + } + val binding = Binding(Button(device, entry.getString("name"), code, scan), action) + if (none { it.button.sameInput(binding.button) }) add(binding) + } catch (e: JSONException) { + Log.w(TAG, "Ignoring malformed shortcut at index $i", e) + } + } + } + } catch (e: JSONException) { + Log.w(TAG, "Could not read physical shortcuts; reset shortcuts to restore defaults", e) + emptyList() + } + } + + fun assign(context: Context, button: Button, action: Action) { + val bindings = read(context).filterNot { + it.button.sameInput(button) || (it.button.device == button.device && it.action == action) + } + Binding(button, action) + write(context, bindings) + } + + fun remove(context: Context, binding: Binding) { + write(context, read(context).filterNot { it == binding }) + } + + private fun write(context: Context, bindings: List) { + val array = JSONArray() + bindings.forEach { + array.put(JSONObject().put("device", it.button.device).put("name", it.button.name) + .put("keyCode", it.button.keyCode).put("scanCode", it.button.scanCode).put("action", it.action.name)) + } + ControllerPrefs.prefs(context).edit().putString(KEY, array.toString()).apply() + } + +} + +class PhysicalShortcutRouter { + var bindings: List = emptyList() + private data class Press(val device: Int, val keyCode: Int, val scanCode: Int) + private val held = mutableSetOf() + + fun onKey(event: KeyEvent, enabled: Boolean, steam: Boolean, perform: (PhysicalShortcuts.Action) -> Unit): Boolean { + val press = Press(event.deviceId, event.keyCode, event.scanCode) + if (event.action == KeyEvent.ACTION_UP) return held.remove(press) + if (event.action != KeyEvent.ACTION_DOWN) return false + if (press in held) return true + if (!enabled || bindings.isEmpty()) return false + val button = PhysicalShortcuts.button(event) ?: return false + val binding = bindings.firstOrNull { it.button.sameInput(button) } ?: return false + if (!steam && binding.action != PhysicalShortcuts.Action.DROIDDECK) return false + held.add(press) + if (event.repeatCount == 0) perform(binding.action) + return true + } + + fun onDeviceRemoved(deviceId: Int) { + held.removeAll { it.device == deviceId } + } + + fun clear() { + held.clear() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt index dab9ff652..ca1ec046a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt @@ -1,104 +1,23 @@ package com.droiddeck.launcher.input -import android.os.Handler -import android.os.Looper -import android.view.MotionEvent import android.view.ViewConfiguration -import kotlin.math.abs -import kotlin.math.roundToInt -class PointerGestures( - private val slopPx: Float, - private val listener: Listener, -) { +class PointerGestures { interface Listener { fun onMove(x: Float, y: Float) fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) fun onWheel(steps: Int) fun onLongPress() - } - - private val handler = Handler(Looper.getMainLooper()) - private var downX = 0f - private var downY = 0f - private var downAt = 0L - private var moved = false - private var held = false - private var dragging = false - private var scrolling = false - private var scrollAnchorY = 0f - private val longPress = Runnable { - held = true - listener.onLongPress() - } - - fun onTouch(event: MotionEvent): Boolean { - when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - downX = event.x; downY = event.y; downAt = event.eventTime - moved = false; held = false; dragging = false; scrolling = false - listener.onMove(event.x, event.y) - handler.postDelayed(longPress, HOLD_MS) - return true - } - MotionEvent.ACTION_POINTER_DOWN -> { - handler.removeCallbacks(longPress) - if (dragging) { listener.onButton(BTN_LEFT, false, event.x, event.y); dragging = false } - scrolling = true - scrollAnchorY = event.getY(0) - return true - } - MotionEvent.ACTION_MOVE -> { - if (scrolling) { - val dy = event.getY(0) - scrollAnchorY - val steps = (dy / SCROLL_STEP_PX).toInt() - if (steps != 0) { - listener.onWheel(-steps) - scrollAnchorY += steps * SCROLL_STEP_PX - } - return true - } - if (!moved && (abs(event.x - downX) > slopPx || abs(event.y - downY) > slopPx)) { - moved = true - handler.removeCallbacks(longPress) - if (held) { - dragging = true - listener.onButton(BTN_LEFT, true, downX, downY) - } - } - if (moved) listener.onMove(event.x, event.y) - return true - } - MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { - handler.removeCallbacks(longPress) - val cancelled = event.actionMasked == MotionEvent.ACTION_CANCEL - when { - scrolling -> {} - dragging -> listener.onButton(BTN_LEFT, false, event.x, event.y) - held && !moved && !cancelled -> { - listener.onButton(BTN_RIGHT, true, downX, downY) - listener.onButton(BTN_RIGHT, false, downX, downY) - } - !moved && !cancelled && event.eventTime - downAt < TAP_MS -> { - listener.onButton(BTN_LEFT, true, downX, downY) - listener.onButton(BTN_LEFT, false, downX, downY) - } - } - scrolling = false; dragging = false; held = false - return true - } - MotionEvent.ACTION_POINTER_UP -> return true - } - return false + fun onScroll(dx: Float, dy: Float) {} + fun onScrollEnd() {} + fun onZoom(steps: Int) {} + fun onThreeFingerTap(): Boolean = false } companion object { const val BTN_LEFT = 0x110 const val BTN_RIGHT = 0x111 const val BTN_MIDDLE = 0x112 - private const val HOLD_MS = 450L - private const val TAP_MS = 350L - private const val SCROLL_STEP_PX = 40f fun slop(context: android.content.Context) = ViewConfiguration.get(context).scaledTouchSlop.toFloat() } 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 000000000..d6d990ea8 --- /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 000000000..422375432 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt @@ -0,0 +1,52 @@ +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() +} + +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, +) { +} 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 000000000..b1ea677b9 --- /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 000000000..6a530697b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -0,0 +1,1096 @@ +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 = if (Build.VERSION.SDK_INT >= 28) Rect( + cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0, + cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0, + ) else Rect() + 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 + } + + fun takesTouchAt(x: Float, y: Float): Boolean = editing || entryAt(x, y) != null + + 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 000000000..fc2594071 --- /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/ScrollTouchGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt index 3bb1c9c1e..4f1ebc9bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt @@ -86,27 +86,14 @@ class ScrollTouchGestures( lastY = startY tracker = VelocityTracker.obtain().also { it.addMovement(event) } listener.onMove(startX, startY) - handler.postDelayed(longPress, HOLD_MS) + handler.postDelayed(longPress, TouchTiming.HOLD_MS) } MotionEvent.ACTION_MOVE -> { val index = event.findPointerIndex(pointerId).takeIf { it >= 0 } ?: return true tracker?.addMovement(event) - val x = event.getX(index) - val y = event.getY(index) - if (!scrolling && !dragging && hypot(x - startX, y - startY) > slopPx) { - handler.removeCallbacks(longPress) - if (held) { - dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true) - } else { - scrolling = true - vertical = abs(y - startY) >= abs(x - startX) - lastX = startX - lastY = startY - } - } - if (dragging) listener.onMove(x, y) - follow(event, x, y) + for (h in 0 until event.historySize) + sample(event.getHistoricalX(index, h), event.getHistoricalY(index, h), event.getHistoricalEventTime(h)) + sample(event.getX(index), event.getY(index), event.eventTime) } MotionEvent.ACTION_POINTER_UP -> { if (event.getPointerId(event.actionIndex) == pointerId) cancel() @@ -115,7 +102,7 @@ class ScrollTouchGestures( handler.removeCallbacks(longPress) if (pointerId == -1 || event.getPointerId(0) != pointerId) return true tracker?.addMovement(event) - follow(event, event.x, event.y) + follow(event.x, event.y, event.eventTime) when { scrolling -> tracker?.takeIf { event.eventTime - movedAt <= FLING_STILL_MS }?.let { t -> t.computeCurrentVelocity(1000) @@ -139,9 +126,26 @@ class ScrollTouchGestures( return true } - private fun follow(event: MotionEvent, x: Float, y: Float) { + private fun sample(x: Float, y: Float, t: Long) { + if (!scrolling && !dragging && hypot(x - startX, y - startY) > slopPx) { + handler.removeCallbacks(longPress) + if (held) { + dragging = true + listener.onButton(PointerGestures.BTN_LEFT, true) + } else { + scrolling = true + vertical = abs(y - startY) >= abs(x - startX) + lastX = startX + lastY = startY + } + } + if (dragging) listener.onMove(x, y) + follow(x, y, t) + } + + private fun follow(x: Float, y: Float, t: Long) { if (!scrolling || (x == lastX && y == lastY)) return - movedAt = event.eventTime + movedAt = t if (vertical) listener.onScroll(0f, lastY - y) else listener.onScroll(lastX - x, 0f) lastX = x lastY = y @@ -151,7 +155,7 @@ class ScrollTouchGestures( releaseClick() listener.onButton(button, true) clicked = button - handler.postDelayed(clickUp, CLICK_MS) + handler.postDelayed(clickUp, TouchTiming.CLICK_MS) } private fun releaseClick() { @@ -181,8 +185,6 @@ class ScrollTouchGestures( return if (pixels < 0) -units else units } - private const val HOLD_MS = 500L - private const val CLICK_MS = 50L private const val FLING_TIME_S = 0.45f private const val FLING_STOP_PX = 40f private const val FLING_STILL_MS = 60L diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index 6789654f7..0f18132ef 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -10,6 +10,23 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int) { KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad), TERMINAL("terminal", R.string.second_mode_terminal), DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls), + DASHBOARD("dashboard", R.string.second_mode_dashboard), + DESKTOP("desktop", R.string.second_mode_desktop); + + companion object { + fun opening(remembered: String?, deckPad: Boolean, dashboard: Boolean = false, desktop: Boolean = false): SecondScreenMode { + entries.firstOrNull { + it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) && (it != DASHBOARD || dashboard) && + (it != DESKTOP || desktop) + }?.let { return it } + val picked = entries.any { it != NONE && it.id == remembered } + return when { + dashboard && !picked -> DASHBOARD + deckPad -> DECK_CONTROLS + else -> KEYBOARD_TRACKPAD + } + } + } } data class SecondScreenDisplay(val id: Int, val label: String) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt index 4ec08bcb4..c29c77211 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt @@ -16,13 +16,19 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { private val handler = Handler(Looper.getMainLooper()) private val hostFile = File(context.filesDir, "session/android-clipboard") private var active = false - private val androidListener = ClipboardManager.OnPrimaryClipChangedListener { refresh() } + private var published = false + private var shared: String? = null + private var echo: String? = null + private val androidListener = ClipboardManager.OnPrimaryClipChangedListener { refresh(changed = true) } private val guestListener = object : WaylandCompositor.ClipboardListener { override fun onGuestClipboardText(text: String) { handler.post { if (active && hasFocus() && WaylandCompositor.isClipboardListener(this)) { val current = clipboard.primaryClip?.takeIf { it.itemCount > 0 }?.getItemAt(0)?.text + shared = text + published = true if (current?.toString() != text) { + echo = text clipboard.setPrimaryClip(ClipData.newPlainText("DroidDeck", text)) } } @@ -46,17 +52,23 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { handler.removeCallbacksAndMessages(null) } - fun refresh() { + fun refresh(changed: Boolean = false) { if (!active || !hasFocus()) return val clip = clipboard.primaryClip - if (clip == null) { - publish(null) - } else if (clip.itemCount > 0) { - publish(clip.getItemAt(0).text?.toString()) + if (clip != null && clip.itemCount == 0) return + val text = clip?.getItemAt(0)?.text?.toString() + if (echo != null && text == echo) { + echo = null + return } + echo = null + if (!changed && published && text == shared) return + publish(text) } private fun publish(text: String?) { + published = true + shared = text WaylandCompositor.setClipboardText(text) val pending = File(hostFile.parentFile, "android-clipboard.pending") try { diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt index e77b322f2..b1d7bc605 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt @@ -52,6 +52,11 @@ class SteamControllerBle(private val context: Context) { private fun connect() { if (!running || gatt != null) return + if (android.os.Build.VERSION.SDK_INT >= 31 && + !com.droiddeck.launcher.core.AppPermissions.granted(context, android.Manifest.permission.BLUETOOTH_CONNECT)) { + handler.postDelayed(::connect, RETRY_MS) + return + } if (SessionState.suspended) { handler.postDelayed(::connect, RETRY_MS) return @@ -86,8 +91,8 @@ class SteamControllerBle(private val context: Context) { outputReports.clear() connected = false FakeInputWriter.setTritonConnected(SLOT, false) - g.disconnect() - g.close() + runCatching { g.disconnect() } + runCatching { g.close() } release() Log.i(TAG, "disconnected: $why") listener?.invoke() diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt index 1387dce25..30c7dbc3c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt @@ -197,7 +197,7 @@ object SteamTouchConfig { } return try { val text = file.readText() - val kv = KeyValues.parse(text.removePrefix("")) + val kv = KeyValues.parse(text.removePrefix("\uFEFF")) val mappings = kv.child("controller_mappings") ?: kv val layouts = mappings.string("touch_layout")?.let { hex -> decodeLayouts(hexToBytes(hex)) } Log.i(TAG, "steam touch: app $appId uses ${file.path} (${layouts?.layouts?.size ?: 0} layouts)") 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 1c6921a89..d60ae7db1 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() @@ -107,7 +112,6 @@ class SteamTouchControls( private var selected = -1 private var dragOffset = 0f to 0f private var pinchStart = 0f - private var pinchScale = 1f private var saving = false private val pendingBindings = HashMap() private var pendingColor: FloatArray? = null @@ -191,6 +195,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() { @@ -237,6 +243,8 @@ class SteamTouchControls( private fun hit(list: List, x: Float, y: Float): Element? = list.filter { reach(it, x, y) <= 1.15f }.minByOrNull { reach(it, x, y) } + fun takesTouchAt(x: Float, y: Float): Boolean = editing || menuOpen || hit(live(), x, y) != null + private fun live(): List = if (shakenAway) emptyList() else if (options.inputMode == SteamTouchConfig.INPUT_MOUSE) elements.filter { it.type == SteamTouchConfig.THUMB } else elements @@ -340,17 +348,6 @@ class SteamTouchControls( canvas.restore() } - private fun drawSteamMark(canvas: Canvas, x: Float, y: Float, r: Float, color: Int) { - val p = Paint(Paint.ANTI_ALIAS_FLAG).apply { this.color = color; style = Paint.Style.STROKE; strokeCap = Paint.Cap.ROUND } - p.strokeWidth = r * 0.16f - canvas.drawCircle(x + r * 0.28f, y - r * 0.18f, r * 0.27f, p) - canvas.drawCircle(x + r * 0.28f, y - r * 0.18f, r * 0.1f, Paint(p).apply { style = Paint.Style.FILL }) - canvas.drawCircle(x - r * 0.3f, y + r * 0.3f, r * 0.17f, p) - p.strokeWidth = r * 0.2f - canvas.drawLine(x + r * 0.1f, y - r * 0.02f, x - r * 0.2f, y + r * 0.22f, p) - canvas.drawLine(x - r * 0.45f, y + r * 0.28f, x - r * 0.95f, y + r * 0.1f, p) - } - private fun drawFace(canvas: Canvas, type: Int, binding: SteamTouchBindings.Binding?, x: Float, y: Float, r: Float, alpha: Int, pressed: Boolean) { val square = isSquare(type) @@ -624,7 +621,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 +639,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 +658,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 +678,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() { @@ -813,19 +842,6 @@ class SteamTouchControls( invalidate() } - private fun controlName(type: Int) = when (type) { - SteamTouchConfig.DPAD -> context.getString(R.string.touch_dpad) - SteamTouchConfig.JOYSTICK_LEFT -> context.getString(R.string.touch_left_stick) - SteamTouchConfig.JOYSTICK_RIGHT -> context.getString(R.string.touch_right_stick) - SteamTouchConfig.TRACKPAD_LEFT -> context.getString(R.string.deck_left_trackpad) - SteamTouchConfig.TRACKPAD_RIGHT -> context.getString(R.string.deck_right_trackpad) - SteamTouchConfig.TRACKPAD_CENTER -> context.getString(R.string.deck_surface_trackpad) - SteamTouchConfig.STEAM -> "Steam" - SteamTouchConfig.THUMB -> context.getString(R.string.touch_menu) - SteamTouchConfig.KEYBOARD -> context.getString(R.string.touch_keyboard) - else -> label(type) - } - private fun moreMenu() { val host = parent as? android.view.ViewGroup ?: return val density = resources.displayMetrics.density @@ -964,7 +980,7 @@ class SteamTouchControls( BIG_PICTURE -> "Steam" else -> gameNames[appId] ?: run { val app = appId - gameNames[app] = context.getString(R.string.touch_app_id, Integer.toUnsignedLong(app)) + gameNames[app] = context.getString(R.string.touch_app_id, Integer.toUnsignedLong(app).toString()) loader.execute { val name = SteamTouchConfig.gameName(context, app) ?: return@execute handler.post { gameNames[app] = name; invalidate() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt index 2d63358d3..560bff4f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt @@ -74,8 +74,6 @@ class SteamTouchDevice private constructor(private val buffer: ByteBuffer) { Log.i(TAG, "steam touch: " + if (value) "plugged in" else "unplugged") } - fun setBattery(percent: Int) = buffer.putInt(OFF_BATTERY, percent.coerceIn(0, 100)) - fun state(): State { repeat(8) { val seq = buffer.getLong(OFF_STATE_SEQ) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt new file mode 100644 index 000000000..062bfbfdc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent + +internal object SteamVolumeKeys { + fun dispatch(event: KeyEvent, enabled: Boolean, adjust: (Int) -> Unit): Boolean { + val direction = when (event.keyCode) { + KeyEvent.KEYCODE_VOLUME_UP -> AudioManager.ADJUST_RAISE + KeyEvent.KEYCODE_VOLUME_DOWN -> AudioManager.ADJUST_LOWER + KeyEvent.KEYCODE_VOLUME_MUTE -> AudioManager.ADJUST_TOGGLE_MUTE + else -> return false + } + if (!enabled) return false + if (event.action == KeyEvent.ACTION_DOWN && + (event.keyCode != KeyEvent.KEYCODE_VOLUME_MUTE || event.repeatCount == 0)) { + adjust(direction) + } + return event.action == KeyEvent.ACTION_DOWN || event.action == KeyEvent.ACTION_UP + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt index 8021536a9..f386ebb17 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt @@ -15,6 +15,7 @@ data class TouchGestureConfig( val longPressAction: String = ACTION_RIGHT_CLICK, val longPressMouseBehavior: String = MOUSE_BEHAVIOR_HOLD, val longPressDelay: Int = DEFAULT_DELAY_MS, + val directHoldBehavior: String = MOUSE_BEHAVIOR_CLICK, val doubleTapEnabled: Boolean = true, val doubleTapDelay: Int = DEFAULT_DELAY_MS, val twoFingerDragEnabled: Boolean = true, @@ -50,6 +51,7 @@ data class TouchGestureConfig( put(KEY_LONG_PRESS_ACTION, longPressAction) put(KEY_LONG_PRESS_MOUSE_BEHAVIOR, longPressMouseBehavior) put(KEY_LONG_PRESS_DELAY, longPressDelay) + put(KEY_DIRECT_HOLD_BEHAVIOR, directHoldBehavior) put(KEY_DOUBLE_TAP_ENABLED, doubleTapEnabled) put(KEY_DOUBLE_TAP_DELAY, doubleTapDelay) put(KEY_TWO_FINGER_DRAG_ENABLED, twoFingerDragEnabled) @@ -85,6 +87,7 @@ data class TouchGestureConfig( const val MOUSE_BEHAVIOR_HOLD = "hold" const val MOUSE_BEHAVIOR_CLICK = "click" + const val MOUSE_BEHAVIOR_NONE = "none" const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct" const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative" @@ -110,6 +113,7 @@ data class TouchGestureConfig( private const val KEY_LONG_PRESS_ACTION = "longPressAction" private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior" private const val KEY_LONG_PRESS_DELAY = "longPressDelay" + private const val KEY_DIRECT_HOLD_BEHAVIOR = "directHoldBehavior" private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled" private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay" private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled" @@ -155,6 +159,9 @@ data class TouchGestureConfig( obj.optString(KEY_LONG_PRESS_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD) ), longPressDelay = obj.optInt(KEY_LONG_PRESS_DELAY, DEFAULT_DELAY_MS), + directHoldBehavior = normalizeDirectHoldBehavior( + obj.optString(KEY_DIRECT_HOLD_BEHAVIOR, MOUSE_BEHAVIOR_CLICK) + ), doubleTapEnabled = obj.optBoolean(KEY_DOUBLE_TAP_ENABLED, true), doubleTapDelay = obj.optInt(KEY_DOUBLE_TAP_DELAY, DEFAULT_DELAY_MS), twoFingerDragEnabled = obj.optBoolean(KEY_TWO_FINGER_DRAG_ENABLED, true), @@ -190,6 +197,10 @@ data class TouchGestureConfig( } } + private fun normalizeDirectHoldBehavior(value: String): String { + return if (value == MOUSE_BEHAVIOR_CLICK || value == MOUSE_BEHAVIOR_NONE) value else MOUSE_BEHAVIOR_HOLD + } + private fun normalizeMouseBehavior(value: String): String { return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD } diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt new file mode 100644 index 000000000..27cb87659 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.input + +import com.droiddeck.launcher.session.SessionPrefs + +object TouchRouter { + enum class Route { BLOCKED, GESTURES, SCROLL, OFF, TOUCHPAD, DIRECT } + + data class Snapshot( + val uiBlocking: Boolean, + val mode: String, + val scrollLayer: Boolean, + val steamSession: Boolean, + val steamDesktopUi: Boolean, + ) + + fun decide(s: Snapshot): Route { + if (s.uiBlocking) return Route.BLOCKED + if (s.mode == SessionPrefs.TOUCH_GESTURES) return Route.GESTURES + if (s.scrollLayer) return Route.SCROLL + if (s.mode == SessionPrefs.TOUCH_OFF) return Route.OFF + return if (touchpad(s)) Route.TOUCHPAD else Route.DIRECT + } + + fun steamKeyboardZone(s: Snapshot): Boolean = s.steamSession && !s.steamDesktopUi + + private fun touchpad(s: Snapshot): Boolean = when (s.mode) { + SessionPrefs.TOUCH_PAD -> true + SessionPrefs.TOUCH_DIRECT -> false + else -> !s.steamSession || s.steamDesktopUi + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt new file mode 100644 index 000000000..8db3c95c9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt @@ -0,0 +1,9 @@ +package com.droiddeck.launcher.input + +object TouchTiming { + const val HOLD_MS = 500L + const val TAP_MS = 300L + const val CLICK_MS = 30L + const val DOUBLE_TAP_MS = 300L + const val SCROLL_STEP_PX = 36f +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index 47f0e4b64..ed4e87732 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -4,6 +4,7 @@ import android.os.Handler import android.os.Looper import android.view.MotionEvent import kotlin.math.abs +import kotlin.math.hypot class TouchpadGestures( private val slopPx: Float, @@ -15,6 +16,7 @@ class TouchpadGestures( private set var bounds: android.graphics.RectF = android.graphics.RectF(0f, 0f, 1f, 1f) var sensitivity = 1.15f + var desktop = false private val handler = Handler(Looper.getMainLooper()) private var lastX = 0f @@ -27,7 +29,11 @@ class TouchpadGestures( private var secondDownAt = 0L private var secondWasTap = false private var twoFingers = false + private var scrollAnchorX = 0f private var scrollAnchorY = 0f + private var fingers = 0 + private var pinching = false + private var pinchSpan = 0f private var scrolled = false private var anchorId = -1 private var anchorStartX = 0f @@ -52,7 +58,7 @@ class TouchpadGestures( releaseClick() listener.onButton(button, true, x, y) clicked = button - handler.postDelayed(clickUp, CLICK_MS) + handler.postDelayed(clickUp, TouchTiming.CLICK_MS) } private fun releaseClick() { @@ -79,6 +85,20 @@ class TouchpadGestures( y = py.coerceIn(bounds.top, bounds.bottom) } + private fun trackMove(px: Float, py: Float) { + val dx = px - lastX + val dy = py - lastY + lastX = px; lastY = py + travelled += abs(dx) + abs(dy) + if (travelled > slopPx) { + handler.removeCallbacks(longPress) + val speed = abs(dx) + abs(dy) + val gain = sensitivity * (1f + minOf(speed / 40f, 1.5f)) + place(x + dx * gain, y + dy * gain) + listener.onMove(x, y) + } + } + fun onTouch(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_DOWN -> { @@ -86,18 +106,20 @@ class TouchpadGestures( lastX = event.x; lastY = event.y downAt = event.eventTime travelled = 0f; held = false; twoFingers = false; scrolled = false; secondWasTap = false + fingers = 1; pinching = false anchorId = event.getPointerId(0); moverId = -1; holdDrag = false; scrollLocked = false - if (event.eventTime - lastTapAt < DOUBLE_TAP_MS) { + if (event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { dragging = true listener.onButton(PointerGestures.BTN_LEFT, true, x, y) } else { dragging = false - handler.postDelayed(longPress, HOLD_MS) + handler.postDelayed(longPress, TouchTiming.HOLD_MS) } return true } MotionEvent.ACTION_POINTER_DOWN -> { handler.removeCallbacks(longPress) + fingers = maxOf(fingers, event.pointerCount) val i = event.actionIndex if (moverId == -1 && event.getPointerId(i) != anchorId) { moverId = event.getPointerId(i) @@ -111,7 +133,9 @@ class TouchpadGestures( twoFingers = true secondDownAt = event.eventTime secondWasTap = true + scrollAnchorX = (event.getX(0) + event.getX(1)) / 2f scrollAnchorY = (event.getY(0) + event.getY(1)) / 2f + pinchSpan = span(event) return true } MotionEvent.ACTION_MOVE -> { @@ -146,29 +170,49 @@ class TouchpadGestures( } else if (holdDrag) { return true } - if (twoFingers && event.pointerCount >= 2) { - val mid = (event.getY(0) + event.getY(1)) / 2f - val dy = mid - scrollAnchorY - val steps = (dy / SCROLL_STEP_PX).toInt() - if (steps != 0) { - listener.onWheel(-steps) - scrollAnchorY += steps * SCROLL_STEP_PX + if (twoFingers && event.pointerCount >= 2 && desktop) { + if (fingers >= 3) return true + val span = span(event) + if (!scrolled && !pinching && abs(span - pinchSpan) > slopPx * PINCH_SLOPS) { + pinching = true + secondWasTap = false + pinchSpan = span + } + if (pinching) { + val steps = ((span - pinchSpan) / PINCH_STEP_PX).toInt() + if (steps != 0) { + listener.onZoom(-steps) + pinchSpan += steps * PINCH_STEP_PX + } + return true + } + val midX = (event.getX(0) + event.getX(1)) / 2f + val midY = (event.getY(0) + event.getY(1)) / 2f + val dx = scrollAnchorX - midX + val dy = scrollAnchorY - midY + if (scrolled || abs(dx) + abs(dy) > slopPx) { + listener.onScroll(dx, dy) + scrollAnchorX = midX; scrollAnchorY = midY scrolled = true secondWasTap = false } return true } - val dx = event.x - lastX - val dy = event.y - lastY - lastX = event.x; lastY = event.y - travelled += abs(dx) + abs(dy) - if (travelled > slopPx) { - handler.removeCallbacks(longPress) - val speed = (abs(dx) + abs(dy)) - val gain = sensitivity * (1f + minOf(speed / 40f, 1.5f)) - place(x + dx * gain, y + dy * gain) - listener.onMove(x, y) + if (twoFingers && event.pointerCount >= 2) { + val mid = (event.getY(0) + event.getY(1)) / 2f + val dy = mid - scrollAnchorY + val steps = (dy / TouchTiming.SCROLL_STEP_PX).toInt() + if (steps != 0) { + listener.onWheel(-steps) + scrollAnchorY += steps * TouchTiming.SCROLL_STEP_PX + scrolled = true + secondWasTap = false + } + return true } + for (h in 0 until event.historySize) + trackMove(event.getHistoricalX(0, h), event.getHistoricalY(0, h)) + trackMove(event.x, event.y) return true } MotionEvent.ACTION_POINTER_UP -> { @@ -194,7 +238,13 @@ class TouchpadGestures( event.findPointerIndex(anchorId).takeIf { it >= 0 && it != event.actionIndex }?.let { lastX = event.getX(it); lastY = event.getY(it) } - if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TAP_MS && !scrolled) { + if (desktop && scrolled && event.pointerCount == 2) listener.onScrollEnd() + if (fingers >= 3) { + if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2 && + !listener.onThreeFingerTap()) + click(PointerGestures.BTN_MIDDLE) + if (event.pointerCount == 2) secondWasTap = false + } else if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TouchTiming.TAP_MS && !scrolled) { click(PointerGestures.BTN_RIGHT) secondWasTap = false } @@ -206,29 +256,30 @@ class TouchpadGestures( when { dragging -> listener.onButton(PointerGestures.BTN_LEFT, false, x, y) twoFingers -> { - if (secondWasTap && !scrolled && !cancelled && event.eventTime - downAt < TAP_MS * 2) { + if (secondWasTap && !scrolled && !cancelled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) { click(PointerGestures.BTN_RIGHT) } } - !cancelled && travelled <= slopPx && event.eventTime - downAt < TAP_MS -> { + !cancelled && travelled <= slopPx && event.eventTime - downAt < TouchTiming.TAP_MS -> { click(PointerGestures.BTN_LEFT) lastTapAt = event.eventTime } } dragging = false; held = false; twoFingers = false holdDrag = false; scrollLocked = false; anchorId = -1; moverId = -1 + pinching = false; fingers = 0 return true } } return false } + private fun span(event: MotionEvent): Float = + if (event.pointerCount < 2) 0f else hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1)) + companion object { - private const val HOLD_MS = 500L - private const val TAP_MS = 300L - private const val CLICK_MS = 50L - private const val DOUBLE_TAP_MS = 300L - private const val SCROLL_STEP_PX = 36f + private const val PINCH_SLOPS = 3f + private const val PINCH_STEP_PX = 60f private const val HOLD_DRAG_MOVER_SLOPS = 2f private const val HOLD_DRAG_ANCHOR_SLOPS = 0.5f } diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java index e71a14cd3..819226764 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java @@ -28,7 +28,6 @@ public final class TouchscreenGestures { void key(int code, boolean down); void wheel(int steps); void showKeyboard(); - /** Establish the pointer origin before a relative middle-mouse pan begins. */ default void prepareRelativePan() {} default void gesture(Gesture gesture) {} } @@ -36,7 +35,7 @@ public final class TouchscreenGestures { private final Output output; private final float doubleTapSlop; private TouchGestureConfig gestureConfig = new TouchGestureConfig(); - private static final int CLICK_DELAYED_TIME = 50; + private static final int CLICK_DELAYED_TIME = 30; private Runnable delayedPress, pendingHoldClickRelease; private Runnable pendingTapPress; private final ArrayDeque pendingTapClicks = new ArrayDeque<>(); @@ -97,12 +96,10 @@ public final class TouchscreenGestures { final int code; MouseButton(int code) { this.code = code; } } - // Long-press detection private Runnable longPressRunnable; private boolean longPressTriggered; private boolean longPressActionHeld, twoFingerHoldActionHeld, threeFingerHoldActionHeld; - // Double-tap detection private long lastTapTime; private float lastTapX; private float lastTapY; @@ -110,76 +107,54 @@ public final class TouchscreenGestures { private float doubleTapAnchorX, doubleTapAnchorY; private long singleFingerDownTime; - // Drag tracking (box selection) private boolean isDragging; private boolean dragButtonPressed; - // Two-finger tracking private boolean twoFingerDragging; private float twoFingerLastX0, twoFingerLastY0; private float twoFingerLastX1, twoFingerLastY1; private boolean twoFingerMiddleButtonDown; - // Pinch tracking private float pinchLastDistance; private float pinchZoomRemainder; private float keyPanRemainderX, keyPanRemainderY; private static final float PINCH_STEP_PX = 10f; - // Two-finger tap detection private boolean twoFingerTapPossible; private boolean twoFingerTapFired; - // Track which WASD/arrow keys are currently held private boolean panKeyUp, panKeyDown, panKeyLeft, panKeyRight; - // True when finger has moved beyond tap tolerance (prevents spurious tap on lift) private boolean movedBeyondTapThreshold; - // True after a multi-finger gesture has been active — prevents the remaining - // finger from starting a spurious single-finger drag on lift sequence. private boolean multiFingerGestureUsed; - // Remember which keycodes were actually pressed so releasePanKeys releases only those private Integer panLeftKey, panRightKey, panUpKey, panDownKey; - // Long-press movement tolerance (pixels of raw finger movement before cancelling long-press) private static final float LONG_PRESS_MOVE_TOLERANCE = 50f; - // Raw touch-down coordinates for measuring finger travel private float touchDownRawX, touchDownRawY; - // Last raw coordinates for single-finger drag delta private float singleFingerLastRawX, singleFingerLastRawY; - // Two-finger gesture mutual exclusion (only pan OR pinch, not both) private static final int TWO_FINGER_GESTURE_NONE = 0; private static final int TWO_FINGER_GESTURE_PAN = 1; private static final int TWO_FINGER_GESTURE_ZOOM = 2; private int twoFingerGestureMode = TWO_FINGER_GESTURE_NONE; - // Accumulated deltas for deciding which two-finger gesture to lock into private float accumulatedPinchDelta, accumulatedPanDelta; - // Settle window: ignore movement for first N ms after second finger lands (#1) - // Also serves as a grace period for a third finger to arrive before 2F locks in private static final long TWO_FINGER_SETTLE_MS = 120; private static final long THREE_FINGER_SETTLE_MS = 50; private long twoFingerDownTime; private long threeFingerDownTime; - // Velocity gating for two-finger hold vs drag (#2) private long twoFingerLastMoveTime; - private static final float MIN_DRAG_VELOCITY = 0.3f; // px/ms to commit to drag + private static final float MIN_DRAG_VELOCITY = 0.3f; - // Pinch vs drag ratio: pinch delta must exceed pan by this factor to classify as pinch (#4) private static final float PINCH_RATIO_THRESHOLD = 1.5f; - // Cancel-and-reclassify: allow reclassification within this window after lock-in (#5) private static final long RECLASSIFY_WINDOW_MS = 100; private long twoFingerLockTime; private float reclassifyPinchDelta, reclassifyPanDelta; - // Gesture pointer ownership tracking (prevents d-pad/button pointer conflicts) private int gestureFingerCount = 0; private final ArrayList gestureOwnedPointerIds = new ArrayList<>(); private final int[] multiFingerStartIds = new int[3]; private final float[] multiFingerStartX = new float[3], multiFingerStartY = new float[3]; private int multiFingerStartCount; - // Two-finger hold detection private Runnable twoFingerHoldRunnable; private boolean twoFingerHoldTriggered; - // Three-finger tracking private boolean threeFingerTapPossible; private boolean threeFingerTapFired; private boolean threeFingerDragging; @@ -199,9 +174,7 @@ public final class TouchscreenGestures { switch (action) { case MotionEvent.ACTION_DOWN: - // A new touch must not shorten or discard an already recognized click. handleTsCancel(true); - // First pointer overall — gesture system claims it gestureOwnedPointerIds.clear(); gestureOwnedPointerIds.add(pointerId); gestureFingerCount = 1; @@ -209,13 +182,11 @@ public final class TouchscreenGestures { break; case MotionEvent.ACTION_POINTER_DOWN: - // New pointer arrived — gesture system claims it if (!gestureOwnedPointerIds.contains(pointerId)) { gestureOwnedPointerIds.add(pointerId); gestureFingerCount++; } if (gestureFingerCount == 1) { - // First gesture finger (controls own earlier pointers) handleTsDown(event, actionIndex); } else if (gestureFingerCount == 2) { handleTsPointerDown(event); @@ -242,15 +213,12 @@ public final class TouchscreenGestures { gestureOwnedPointerIds.remove(Integer.valueOf(pointerId)); gestureFingerCount = Math.max(0, gestureFingerCount - 1); if (prevCount == 3 && gestureFingerCount == 2) { - // Three-finger gesture ending handleTsThreeFingerUp(event); } else if (prevCount == 2 && gestureFingerCount == 1) { - // Two-finger gesture ending (2→1) handleTsPointerUp(event); } else if (prevCount >= 4) { if (removedIndex < 3) rebaseThreeFingerMovement(event); } else if (prevCount >= 1 && gestureFingerCount == 0) { - // Last gesture finger lifted while controls still hold pointers handleTsUp(event, actionIndex); } } @@ -261,9 +229,6 @@ public final class TouchscreenGestures { int prevCount = gestureFingerCount; gestureOwnedPointerIds.remove(Integer.valueOf(pointerId)); gestureFingerCount = Math.max(0, gestureFingerCount - 1); - // Clean up multi-finger state if needed, routing by previous - // gesture mode so a 3-finger gesture isn't ended via the - // two-finger cleanup path. if (prevCount >= 3) { handleTsThreeFingerUp(event); } else if (prevCount == 2) { @@ -271,7 +236,6 @@ public final class TouchscreenGestures { } handleTsUp(event, actionIndex); } - // ACTION_UP = last pointer overall — full cleanup gestureOwnedPointerIds.clear(); gestureFingerCount = 0; break; @@ -309,15 +273,12 @@ public final class TouchscreenGestures { threeFingerHoldTriggered = false; accumulatedThreeFingerDelta = 0; - // Store raw touch coordinates for long-press movement tolerance touchDownRawX = event.getX(actionIndex); touchDownRawY = event.getY(actionIndex); singleFingerDownTime = SystemClock.uptimeMillis(); singleFingerLastRawX = touchDownRawX; singleFingerLastRawY = touchDownRawY; - // Keep a nearby re-tap undecided until UP: it can still become a drag, - // long press, or multi-finger gesture instead of a double click. if (isDoubleTap(event, actionIndex)) { secondTapCandidate = true; doubleTapAnchorX = lastTapX; @@ -327,7 +288,6 @@ public final class TouchscreenGestures { if (!secondTapCandidate && delayedPress == null && pendingTapPress == null) moveCursorTo(x, y); - // Schedule long-press if (gestureConfig.getLongPressEnabled()) { longPressRunnable = () -> { secondTapCandidate = false; @@ -342,7 +302,6 @@ public final class TouchscreenGestures { postDelayed(longPressRunnable, gestureConfig.getLongPressDelay()); } - // Tap: immediate cursor move (press is deferred to UP for click, or MOVE for drag) } private void handleTsPointerDown(MotionEvent event) { @@ -351,11 +310,6 @@ public final class TouchscreenGestures { flushPendingTapRelease(); lastTapTime = 0; flushPendingHoldClickRelease(); - // Cancel any single-finger long-press. cancelLongPressTimer only - // clears the pending runnable; if the long-press has already fired - // we must also release the held action before we transition into a - // multi-finger gesture, otherwise the long-press button/key stays - // down for the rest of the touch sequence. if (longPressTriggered) { longPressActionHeld = releaseHoldAction(longPressActionHeld, gestureConfig.getLongPressAction()); longPressTriggered = false; @@ -388,7 +342,6 @@ public final class TouchscreenGestures { event.getY(idx0) - event.getY(idx1)); recordMultiFingerOrigins(event, 2); } - // Schedule two-finger hold if (gestureConfig.getTwoFingerHoldEnabled()) { twoFingerHoldRunnable = () -> { twoFingerHoldTriggered = true; @@ -404,33 +357,26 @@ public final class TouchscreenGestures { } private void handleTsMove(MotionEvent event, int pointerIndex) { - // After a multi-finger gesture, ignore single-finger movement until all fingers lift if (multiFingerGestureUsed) return; int x = (int) event.getX(pointerIndex); int y = (int) event.getY(pointerIndex); - // If long press already triggered, ignore movement (right-click already sent) if (longPressTriggered) return; - // Measure raw finger travel from initial touch point float rawTravel = maxFingerTravel(event, pointerIndex, touchDownRawX, touchDownRawY); if (secondTapCandidate && (rawTravel > doubleTapSlop || maxFingerTravel(event, pointerIndex, doubleTapAnchorX, doubleTapAnchorY) >= doubleTapSlop)) { secondTapCandidate = false; } - // The threshold decides when a drag starts. An active drag must keep - // following the finger even when it returns through the touch origin. if (!isDragging && rawTravel <= LONG_PRESS_MOVE_TOLERANCE) { return; } - // Beyond tolerance — cancel long press cancelLongPressTimer(); movedBeyondTapThreshold = true; - // Detect drag start if (!isDragging && gestureConfig.getDragEnabled()) { flushPendingTapRelease(); String dragAction = gestureConfig.getDragAction(); @@ -438,14 +384,7 @@ public final class TouchscreenGestures { dragButtonPressed = true; singleFingerLastRawX = event.getX(pointerIndex); singleFingerLastRawY = event.getY(pointerIndex); - // Send the configured drag press immediately so that a short - // move followed straight by UP still produces a press+release - // pair. A zero-delta performPanAction just presses the button - // (or is a no-op for the key-pan variants, which press per - // direction on their next move frame). if (isClickDragAction(dragAction)) { - // The candidate's cursor stayed at the previous click. Start - // a drag at this touch's own origin before pressing its button. moveCursorTo((int) touchDownRawX, (int) touchDownRawY); if (useRelativeMouseDragMovement()) { pressClickDragAction(dragAction); @@ -456,7 +395,6 @@ public final class TouchscreenGestures { performPanAction(0f, 0f, dragAction); } notifyGesture(Gesture.DRAG); - // Non-click pan actions continue with real deltas on the next frame. return; } @@ -481,14 +419,11 @@ public final class TouchscreenGestures { return; } - // Move cursor moveCursorTo(x, y); } private void handleTsTwoFingerMove(MotionEvent event) { if (multiFingerGestureUsed) return; - // If a two-finger hold has already fired, ignore subsequent jitter so - // it can't lock into a pan/zoom gesture mid-hold. if (twoFingerHoldTriggered) return; if (gestureFingerCount < 2 || gestureOwnedPointerIds.size() < 2) return; @@ -496,20 +431,15 @@ public final class TouchscreenGestures { int idx1 = event.findPointerIndex(gestureOwnedPointerIds.get(1)); if (idx0 < 0 || idx1 < 0) return; - // Settling delays recognition, not movement tracking. A swipe or pinch - // must stop being a tap/hold even when it finishes inside that delay. if (multiFingerMovementExceeded(event)) { twoFingerTapPossible = false; cancelTwoFingerHoldTimer(); } - // Slow deliberate travel can cross touch slop before reaching the - // pan/zoom threshold. It must not turn into a stationary hold first. if (multiFingerMovementExceeded(event, true)) cancelTwoFingerHoldTimer(); float x0 = event.getX(idx0), y0 = event.getY(idx0); float x1 = event.getX(idx1), y1 = event.getY(idx1); - // Compute per-frame pan and pinch deltas float currDist = (float) Math.hypot(x0 - x1, y0 - y1); float framePinchDelta = Math.abs(currDist - pinchLastDistance); @@ -523,7 +453,6 @@ public final class TouchscreenGestures { long now = SystemClock.uptimeMillis(); if (now - twoFingerDownTime < TWO_FINGER_SETTLE_MS) { - // Still settling — update stored positions but don't accumulate deltas twoFingerLastX0 = x0; twoFingerLastY0 = y0; twoFingerLastX1 = x1; twoFingerLastY1 = y1; pinchLastDistance = currDist; @@ -531,14 +460,12 @@ public final class TouchscreenGestures { } long frameTime = now - twoFingerLastMoveTime; twoFingerLastMoveTime = now; - float velocity = (frameTime > 0) ? framePanDelta / frameTime : 0; // px/ms + float velocity = (frameTime > 0) ? framePanDelta / frameTime : 0; - // Accumulate deltas until we have enough movement to decide gesture type if (twoFingerGestureMode == TWO_FINGER_GESTURE_NONE) { accumulatedPinchDelta += framePinchDelta; accumulatedPanDelta += framePanDelta; if (accumulatedPinchDelta + accumulatedPanDelta > (float) gestureConfig.getGestureThreshold()) { - // Enough movement to lock into a gesture — no longer a tap or hold twoFingerTapPossible = false; cancelTwoFingerHoldTimer(); if (accumulatedPinchDelta > accumulatedPanDelta * PINCH_RATIO_THRESHOLD @@ -551,7 +478,6 @@ public final class TouchscreenGestures { twoFingerLockTime = now; notifyGesture(Gesture.TWO_FINGER_DRAG); } else if (accumulatedPanDelta >= accumulatedPinchDelta && gestureConfig.getTwoFingerDragEnabled()) { - // Fallback: pan is dominant but velocity was too low — still drag twoFingerGestureMode = TWO_FINGER_GESTURE_PAN; twoFingerLockTime = now; notifyGesture(Gesture.TWO_FINGER_DRAG); @@ -571,7 +497,7 @@ public final class TouchscreenGestures { reclassifyPinchDelta += framePinchDelta; reclassifyPanDelta += framePanDelta; float reclassifyTotal = reclassifyPinchDelta + reclassifyPanDelta; - if (reclassifyTotal > 20f) { // enough post-lock data to reclassify + if (reclassifyTotal > 20f) { boolean shouldBeZoom = reclassifyPinchDelta > reclassifyPanDelta * PINCH_RATIO_THRESHOLD; if (shouldBeZoom && twoFingerGestureMode == TWO_FINGER_GESTURE_PAN && gestureConfig.getPinchEnabled()) { @@ -585,7 +511,7 @@ public final class TouchscreenGestures { resetSmallMovement(); notifyGesture(Gesture.TWO_FINGER_DRAG); } - twoFingerLockTime = 0; // done reclassifying + twoFingerLockTime = 0; reclassifyPinchDelta = 0; reclassifyPanDelta = 0; } @@ -595,12 +521,10 @@ public final class TouchscreenGestures { pinchZoomRemainder = accumulateSignedMovement(pinchZoomRemainder, delta); if (Math.abs(pinchZoomRemainder) >= PINCH_STEP_PX) { performZoomAction(pinchZoomRemainder > 0); - // Keep the fractional travel, without queuing a burst of old - // zoom actions after a large move or a direction reversal. pinchZoomRemainder %= PINCH_STEP_PX; } } - pinchLastDistance = currDist; // Always update baseline to avoid stale deltas + pinchLastDistance = currDist; if (twoFingerGestureMode == TWO_FINGER_GESTURE_PAN) { String twoFingerDragAction = gestureConfig.getTwoFingerDragAction(); if (isClickDragAction(twoFingerDragAction)) { @@ -627,14 +551,11 @@ public final class TouchscreenGestures { private void handleTsPointerUp(MotionEvent event) { cancelTwoFingerHoldTimer(); if (multiFingerMovementExceeded(event)) twoFingerTapPossible = false; - // Two-finger hold release if (twoFingerHoldTriggered) { twoFingerHoldActionHeld = releaseHoldAction(twoFingerHoldActionHeld, gestureConfig.getTwoFingerHoldAction()); twoFingerHoldTriggered = false; } - // Two-finger tap detection else if (twoFingerTapPossible && !twoFingerDragging && gestureConfig.getTwoFingerTapEnabled()) { - // Move cursor to midpoint between the two fingers float midX = (twoFingerLastX0 + twoFingerLastX1) / 2f; float midY = (twoFingerLastY0 + twoFingerLastY1) / 2f; queueTapClick(gestureConfig.getTwoFingerTapAction(), midX, midY); @@ -652,7 +573,6 @@ public final class TouchscreenGestures { reclassifyPinchDelta = 0; reclassifyPanDelta = 0; twoFingerLockTime = 0; - // Suppress single-finger tap/drag when last finger lifts after any 2F gesture movedBeyondTapThreshold = true; multiFingerGestureUsed = true; } @@ -661,7 +581,6 @@ public final class TouchscreenGestures { cancelLongPressTimer(); if (longPressTriggered) { - // Release the long-press action longPressActionHeld = releaseHoldAction(longPressActionHeld, gestureConfig.getLongPressAction()); longPressTriggered = false; return; @@ -671,7 +590,6 @@ public final class TouchscreenGestures { float y = event.getY(actionIndex); if (isDragging && dragButtonPressed) { - // End drag (release any held drag buttons/keys) releaseDragInput(); dragButtonPressed = false; isDragging = false; @@ -685,8 +603,6 @@ public final class TouchscreenGestures { ? gestureConfig.getLongPressDelay() : ViewConfiguration.getLongPressTimeout(); if (SystemClock.uptimeMillis() - singleFingerDownTime < tapLimit && Math.hypot(x - doubleTapAnchorX, y - doubleTapAnchorY) < doubleTapSlop) { - // A normal left tap already supplied the first click. Other - // single-tap mappings need a complete synthesized double click. boolean firstTapClicked = gestureConfig.getTapEnabled() && TouchGestureConfig.ACTION_LEFT_CLICK.equals(gestureConfig.getTapAction()); int clicks = firstTapClicked ? 1 : 2; @@ -697,26 +613,21 @@ public final class TouchscreenGestures { } } - // Two-finger tap already sent its click on POINTER_UP — skip the tap on UP if (twoFingerTapFired) { twoFingerTapFired = false; return; } - // Three-finger tap already sent its click — skip the tap on UP if (threeFingerTapFired) { threeFingerTapFired = false; return; } - // Simple tap — only if finger stayed within tap tolerance if (gestureConfig.getTapEnabled() && !movedBeyondTapThreshold) { queueTapClick(gestureConfig.getTapAction(), x, y); notifyGesture(Gesture.TAP); } - // Record for double-tap detection (even if tap itself is disabled, - // so double-tap can still prime from single touch-ups) if (!movedBeyondTapThreshold && (gestureConfig.getTapEnabled() || gestureConfig.getDoubleTapEnabled())) { lastTapTime = SystemClock.uptimeMillis(); lastTapX = x; @@ -776,13 +687,10 @@ public final class TouchscreenGestures { cancelLongPressTimer(); cancelDrag(); cancelTwoFingerHoldTimer(); - // If a two-finger hold already injected its action, release it before - // transitioning so the held button/key doesn't stay down. if (twoFingerHoldTriggered) { twoFingerHoldActionHeld = releaseHoldAction(twoFingerHoldActionHeld, gestureConfig.getTwoFingerHoldAction()); twoFingerHoldTriggered = false; } - // Clean up two-finger state releaseDragInput(); resetSmallMovement(); twoFingerDragging = false; @@ -797,7 +705,6 @@ public final class TouchscreenGestures { threeFingerDragOffsetX = threeFingerDragOffsetY = 0f; threeFingerDownTime = SystemClock.uptimeMillis(); - // Compute midpoint of three gesture fingers if (gestureOwnedPointerIds.size() >= 3) { float sumX = 0, sumY = 0; int validCount = 0; @@ -809,13 +716,12 @@ public final class TouchscreenGestures { validCount++; } } - if (validCount < 3) return; // Can't proceed without all 3 pointers + if (validCount < 3) return; threeFingerLastMidX = sumX / 3f; threeFingerLastMidY = sumY / 3f; recordMultiFingerOrigins(event, 3); } - // Schedule three-finger hold if (gestureConfig.getThreeFingerHoldEnabled()) { threeFingerHoldRunnable = () -> { threeFingerHoldTriggered = true; @@ -831,8 +737,6 @@ public final class TouchscreenGestures { private void handleTsThreeFingerMove(MotionEvent event) { if (gestureFingerCount < 3 || gestureOwnedPointerIds.size() < 3) return; - // If a three-finger hold has already fired, ignore subsequent jitter so - // it can't lock into a pan gesture mid-hold. if (threeFingerHoldTriggered) return; if (multiFingerMovementExceeded(event)) { threeFingerTapPossible = false; @@ -877,8 +781,6 @@ public final class TouchscreenGestures { } if (threeFingerGestureMode == THREE_FINGER_GESTURE_PAN) { - // Once recognized, retain small mouse movements. Keyboard panning - // accumulates its own direction threshold in performKeyPan. String threeFingerDragAction = gestureConfig.getThreeFingerDragAction(); if (isClickDragAction(threeFingerDragAction)) { if (useRelativeMouseDragMovement()) { @@ -919,7 +821,6 @@ public final class TouchscreenGestures { multiFingerStartCount = 0; resetSmallMovement(); threeFingerGestureMode = THREE_FINGER_GESTURE_NONE; - // Suppress single-finger tap/drag when last finger lifts after any 3F gesture movedBeyondTapThreshold = true; multiFingerGestureUsed = true; } @@ -966,7 +867,6 @@ public final class TouchscreenGestures { } x /= 3f; y /= 3f; - // Replacing a tracked finger changes the centroid without moving the cursor. if (threeFingerDragging) { threeFingerDragOffsetX += threeFingerLastMidX - x; threeFingerDragOffsetY += threeFingerLastMidY - y; @@ -1030,9 +930,6 @@ public final class TouchscreenGestures { private void startPendingTapClick() { if (delayedPress != null || pendingTapPress != null || pendingTapClicks.isEmpty()) return; TapClick click = pendingTapClicks.peekFirst(); - // Games that poll button state need an observable UP interval too. - // Reuse the first tap's location: normal finger drift must not turn - // this into two clicks on different targets or a tiny drag. long delay = Math.max(0, CLICK_DELAYED_TIME - (SystemClock.uptimeMillis() - lastInputReleaseTime)); pendingTapPress = () -> { pendingTapPress = null; @@ -1224,9 +1121,6 @@ public final class TouchscreenGestures { pressButton(MouseButton.BUTTON_MIDDLE); twoFingerMiddleButtonDown = true; } - // Pan from the client's current pointer. Games can recenter the mouse - // when the middle button goes down; replaying our old absolute touch - // anchor after that warp causes a large, unintended camera movement. moveCursorByRelativeDelta(dx, dy); } @@ -1287,10 +1181,6 @@ public final class TouchscreenGestures { } private void performKeyPan(float dx, float dy, Integer leftKey, Integer rightKey, Integer upKey, Integer downKey) { - // When fingers are actively moving, update key states to match the - // swipe direction. When fingers stop moving but stay on screen, - // keep the current keys held — movement continues until finger-up - // calls releasePanKeys(). keyPanRemainderX = accumulateSignedMovement(keyPanRemainderX, dx); keyPanRemainderY = accumulateSignedMovement(keyPanRemainderY, dy); @@ -1300,9 +1190,6 @@ public final class TouchscreenGestures { dy = keyPanRemainderY; keyPanRemainderX = keyPanRemainderY = 0f; - // --- Significant movement detected: update each axis --- - - // Horizontal: determine desired state from this frame's delta boolean wantLeft = dx < -3f; boolean wantRight = dx > 3f; @@ -1311,7 +1198,6 @@ public final class TouchscreenGestures { if (wantLeft && !panKeyLeft) { pressKey(leftKey); panKeyLeft = true; panLeftKey = leftKey; } if (wantRight && !panKeyRight) { pressKey(rightKey); panKeyRight = true; panRightKey = rightKey; } - // Vertical: determine desired state from this frame's delta boolean wantUp = dy < -3f; boolean wantDown = dy > 3f; diff --git a/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt new file mode 100644 index 000000000..9507728b2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt @@ -0,0 +1,205 @@ +package com.droiddeck.launcher.input + +import android.os.Handler +import android.os.Looper +import android.view.MotionEvent +import kotlin.math.abs +import kotlin.math.hypot + +class TwoFingerGestures(private val slopPx: Float, private val listener: Listener) { + interface Listener { + fun cancelTouch() + fun replay(event: MotionEvent) + fun rightClick(x: Float, y: Float) + fun scrollStart(x: Float, y: Float) + fun scroll(dx: Float, dy: Float) + fun scrollEnd() + } + + private enum class State { IDLE, PENDING, CANDIDATE, TAPPED, HELD, SCROLLING, PASSING } + + private val handler = Handler(Looper.getMainLooper()) + private var state = State.IDLE + private var x = 0f + private var y = 0f + private var twoAt = 0L + private var startSpan = 0f + private var lastX = 0f + private var lastY = 0f + private val starts = HashMap>() + private val held = ArrayList() + private val hold = Runnable { + if (state != State.CANDIDATE) return@Runnable + state = State.HELD + drop() + listener.cancelTouch() + listener.rightClick(x, y) + } + private val release = Runnable { + if (state == State.PENDING) pass(State.IDLE) + } + + fun cancel() { + if (state == State.SCROLLING) listener.scrollEnd() + handler.removeCallbacks(hold) + handler.removeCallbacks(release) + drop() + state = State.IDLE + } + + fun onTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + cancel() + starts.clear() + x = event.x + y = event.y + note(event, event.actionIndex) + state = State.PENDING + keep(event) + handler.postDelayed(release, LAND_MS) + return true + } + MotionEvent.ACTION_POINTER_DOWN -> { + note(event, event.actionIndex) + when (state) { + State.PENDING -> { + handler.removeCallbacks(release) + keep(event) + if (event.pointerCount != 2) { + pass(State.PASSING) + return true + } + state = State.CANDIDATE + twoAt = event.eventTime + startSpan = span(event) + lastX = midX(event) + lastY = midY(event) + handler.postDelayed(hold, HOLD_MS) + return true + } + State.CANDIDATE -> { + keep(event) + pass(State.PASSING) + return true + } + State.SCROLLING, State.HELD, State.TAPPED -> return true + else -> Unit + } + } + MotionEvent.ACTION_MOVE -> when (state) { + State.PENDING -> { + keep(event) + if (moved(event)) pass(State.IDLE) + return true + } + State.CANDIDATE -> { + if (event.pointerCount == 2 && moved(event)) { + handler.removeCallbacks(hold) + if (abs(span(event) - startSpan) > slopPx * 2) { + keep(event) + pass(State.PASSING) + return true + } + state = State.SCROLLING + drop() + listener.cancelTouch() + lastX = midX(event) + lastY = midY(event) + listener.scrollStart(lastX, lastY) + return true + } + keep(event) + return true + } + State.SCROLLING -> { + if (event.pointerCount >= 2) { + val mx = midX(event) + val my = midY(event) + listener.scroll(lastX - mx, lastY - my) + lastX = mx + lastY = my + } + return true + } + State.TAPPED, State.HELD -> return true + else -> Unit + } + MotionEvent.ACTION_POINTER_UP -> when (state) { + State.CANDIDATE -> { + handler.removeCallbacks(hold) + keep(event) + if (event.eventTime - twoAt < TAP_MS) { + state = State.TAPPED + drop() + return true + } + pass(State.PASSING) + return true + } + State.SCROLLING, State.HELD, State.TAPPED -> return true + else -> Unit + } + MotionEvent.ACTION_UP -> { + val was = state + if (was == State.PENDING) { + keep(event) + pass(State.IDLE) + return true + } + cancel() + when (was) { + State.TAPPED -> { + listener.cancelTouch() + listener.rightClick(x, y) + return true + } + State.SCROLLING, State.HELD -> return true + else -> Unit + } + } + MotionEvent.ACTION_CANCEL -> cancel() + } + return false + } + + private fun keep(event: MotionEvent) { + held += MotionEvent.obtain(event) + } + + private fun drop() { + held.forEach { it.recycle() } + held.clear() + } + + private fun pass(next: State) { + handler.removeCallbacks(release) + handler.removeCallbacks(hold) + state = next + val events = held.toList() + held.clear() + events.forEach { + listener.replay(it) + it.recycle() + } + } + + private fun note(event: MotionEvent, index: Int) { + starts[event.getPointerId(index)] = event.getX(index) to event.getY(index) + } + + private fun moved(event: MotionEvent): Boolean = (0 until event.pointerCount).any { i -> + val start = starts[event.getPointerId(i)] ?: return@any false + hypot(event.getX(i) - start.first, event.getY(i) - start.second) > slopPx + } + + private fun span(event: MotionEvent) = hypot(event.getX(1) - event.getX(0), event.getY(1) - event.getY(0)) + private fun midX(event: MotionEvent) = (event.getX(0) + event.getX(1)) / 2f + private fun midY(event: MotionEvent) = (event.getY(0) + event.getY(1)) / 2f + + companion object { + const val LAND_MS = 250L + const val TAP_MS = 350L + const val HOLD_MS = 500L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt index 343d18bdd..0734710a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import java.io.File -/** What SteamVR sees for the game pad. The driver reads the file once, when SteamVR starts. */ object VrControllers { enum class Emulate(val key: String) { OFF("off"), INDEX("index"), TOUCH("touch"), VIVE("vive") } @@ -46,7 +45,6 @@ object VrControllers { fun encode(settings: Settings): String = "emulate=${settings.emulate.key}\nsticks=${if (settings.sticksMoveHands) "hands" else "game"}\n" - /** Writes into the session's runtime dir, which the guest sees as /run/droiddeck. */ fun publish(context: Context) { runCatching { val dir = File(context.filesDir, ".wayland-rt").apply { mkdirs() } 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 000000000..e3a64e962 --- /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 482564678..e8631c1ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -75,7 +75,10 @@ object BwrapSpawner { } } - class Plan(val root: File, val binds: List<Bind>, val cwd: String, val argv: List<String>, val env: Map<String, String>) + class Plan( + val root: File, val binds: List<Bind>, val cwd: String, val argv: List<String>, val env: Map<String, String>, + val envTool: String = "/usr/bin/env", + ) data class Bind(val host: String, val guest: String) { val spec: String get() = if (host == guest) host else "$host:$guest" @@ -179,25 +182,31 @@ object BwrapSpawner { val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } val env = LinkedHashMap<String, String>() request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> env[k] = e.getString(k) } } - if (binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } - preload(session, rootfs, env).forEach { addBind(it) } + val envTool = request.optString("envTool").takeIf { it.startsWith("/") } + if (envTool == null && binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } + val libc = listOf("/usr/lib/aarch64-linux-gnu/libc.so.6", "/lib/aarch64-linux-gnu/libc.so.6").map { hostPath(binds, root.path, it) } + if (envTool == null && preloadFits(rootfs, libc.firstOrNull { File(it).isFile } ?: libc.first())) preload(session, rootfs, env).forEach { addBind(it) } zypakShims(binds, root, dir).forEach { addBind(it) } browserSandboxes(env) - return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env) + return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env, envTool ?: "/usr/bin/env") } private const val GPU_DIR = "/run/droiddeck-gpu" + private val LIB_DIRS = listOf("usr/lib/aarch64-linux-gnu", "usr/lib") + private val GPU_LIBS = listOf("libdisplay-info.so.3", "libdisplay-info.so.2", "libSPIRV-Tools.so", "libSPIRV-Tools-opt.so") + + private fun runtimeLib(rootfs: String, name: String): File? = + LIB_DIRS.map { File(rootfs, "$it/$name") }.firstOrNull { it.exists() } + private fun gpu(rootfs: String, root: File, env: MutableMap<String, String>): List<Bind>? { - val lib = File(rootfs, "usr/lib") - val driver = File(lib, "libvulkan_freedreno.so") - if (!driver.isFile || !File("/dev/kgsl-3d0").exists()) return null + val driver = runtimeLib(rootfs, "libvulkan_freedreno.so") + if (driver == null || !File("/dev/kgsl-3d0").exists()) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null if (env["BL_DESKTOP"] == "1" && env["GAMESCOPE_WAYLAND_DISPLAY"] == null) return null - val binds = ArrayList<Bind>() - for (name in listOf("libvulkan_freedreno.so", "libdisplay-info.so.3", "libSPIRV-Tools.so", "libSPIRV-Tools-opt.so")) { - val f = File(lib, name) - if (!f.exists()) { Log.w(TAG, "gpu: the runtime has no $name; apps draw on the CPU"); return null } + val binds = arrayListOf(Bind(driver.canonicalPath, "$GPU_DIR/libvulkan_freedreno.so")) + for (name in GPU_LIBS) { + val f = runtimeLib(rootfs, name) ?: continue binds.add(Bind(f.canonicalPath, "$GPU_DIR/$name")) } val icd = File(root.parentFile, "freedreno_icd.json") @@ -220,13 +229,36 @@ 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)) } return binds } + private val GLIBC_RELEASE = Regex("release version 2\\.(\\d+)") + private val GLIBC_NEED = Regex("GLIBC_2\\.(\\d+)") + private val glibcMinors = java.util.concurrent.ConcurrentHashMap<String, Int>() + + private fun glibcMinor(file: File, pattern: Regex, pick: (Sequence<Int>) -> Int?): Int? { + val key = "${file.path}:${file.length()}:${file.lastModified()}:${pattern.pattern}" + glibcMinors[key]?.let { return it } + val text = runCatching { String(file.readBytes(), Charsets.ISO_8859_1) }.getOrNull() ?: return null + return pick(pattern.findAll(text).map { it.groupValues[1].toInt() })?.also { glibcMinors[key] = it } + } + + internal fun preloadFits(rootfs: String, sandboxLibc: String): Boolean { + val libc = File(sandboxLibc) + if (!libc.isFile) return true + val have = glibcMinor(libc, GLIBC_RELEASE) { it.firstOrNull() } ?: return true + val libs = FileUtils.readString(File(rootfs, "etc/ld.so.preload"))?.lines() + ?.map { it.trim() }?.filter { it.startsWith("/") } ?: return true + val need = libs.mapNotNull { File(rootfs + it).takeIf { f -> f.isFile }?.let { f -> glibcMinor(f, GLIBC_NEED) { m -> m.maxOrNull() } } }.maxOrNull() ?: return true + return have >= need + } + 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" @@ -297,7 +329,7 @@ object BwrapSpawner { val verbose = plan.env["DROIDDECK_PROOT_VERBOSE"]?.toIntOrNull() if (verbose != null) { cmd.add(1, "-v"); cmd.add(2, verbose.toString()) } plan.binds.forEach { cmd.add("-b"); cmd.add(it.spec) } - cmd.add("/usr/bin/env") + cmd.add(plan.envTool) cmd.add("-i") plan.env.forEach { (k, v) -> cmd.add("$k=$v") } cmd.addAll(plan.argv) @@ -319,7 +351,15 @@ object BwrapSpawner { catch (e: IOException) { } if (process.isAlive) { Log.i(TAG, "sandbox $id: its bwrap is gone; stopping it") - process.destroy() + if (pid > 0) { + runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } + } else { + process.destroy() + } + try { + if (!process.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) process.destroyForcibly() + } catch (_: InterruptedException) { + } } }, "bwrap-$id-watch").apply { isDaemon = true; start() } val buffer = ByteArray(16384) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt index 5c5687c96..c45c74821 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt @@ -23,7 +23,6 @@ object DeckyManager { private const val PATH = "root/homebrew/services/PluginLoader" private const val VERSION = "root/homebrew/services/.droiddeck-decky-version" private const val SETTINGS = "root/homebrew/settings/loader.json" - // droiddeck-session reads the marker from the root of the client it runs. private val CEF_REMOTE_DEBUG_MARKERS = listOf( "root/.local/share/Steam/.cef-enable-remote-debugging", "root/.droiddeck-x64/.local/share/Steam/.cef-enable-remote-debugging", @@ -58,7 +57,6 @@ object DeckyManager { check(staged.renameTo(file)) { "cannot write ${file.path}" } } - // Mirrors Decky's updater: Stable takes the newest non-prerelease tag, Prerelease the newest tag of either kind. fun latest(channels: ReleaseChannels, branch: Int): Release? = if (branch == BRANCH_STABLE) channels.stable.firstOrNull() else channels.all.firstOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 20714b552..e3cbecd1d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -22,8 +22,8 @@ object DesktopCatalog { val icon: String, val category: String, ) - fun fetch(url: String = CATALOG_URL): List<Entry>? { - val body = Downloader.downloadString(url) ?: return null + fun fetch(url: String = CATALOG_URL, cancelled: java.util.function.BooleanSupplier? = null): List<Entry>? { + val body = Downloader.downloadString(url, cancelled) ?: return null return try { val json = JSONObject(body) val arr = json.getJSONArray("packages") @@ -51,7 +51,6 @@ object DesktopCatalog { private fun journal(root: File, id: String) = File(root, ".droiddeck-pkg-$id$JOURNAL_SUFFIX") - /** Packages whose extraction over the runtime started and never finished. */ fun interrupted(context: Context): List<Entry> = interrupted(LinuxRuntime.rootDir(context)) fun interrupted(root: File): List<Entry> = @@ -63,7 +62,6 @@ object DesktopCatalog { private fun downloadFile(context: Context, entry: Entry) = File(context.cacheDir, "pkg-${entry.id}-${entry.sha256.take(12)}.download") - /** Drops downloads kept for installs that no longer need finishing, such as after the runtime was reinstalled. */ fun pruneDownloads(context: Context) = synchronized(installLock) { val keep = interrupted(context).map { downloadFile(context, it).name }.toSet() context.cacheDir.listFiles { f -> f.name.startsWith("pkg-") && f.name.removeSuffix(".resume.properties").endsWith(".download") } @@ -71,9 +69,22 @@ object DesktopCatalog { } fun resumeInterrupted(context: Context, listener: LinuxRuntimeInstaller.ProgressListener?): String? = synchronized(installLock) { + resumeInterrupted(context, null, listener) + } + + fun resumeInterrupted( + context: Context, + cancelled: Downloader.Cancellation?, + listener: LinuxRuntimeInstaller.ProgressListener?, + ): String? = synchronized(installLock) { for (entry in interrupted(context)) { Log.w(TAG, "finishing the interrupted install of ${entry.id} ${entry.version}") - install(context, entry, listener)?.let { return it } + val problem = if (cancelled == null) { + install(context, entry, listener) + } else { + install(context, entry, cancelled, listener) + } + if (problem != null) return problem } null } @@ -89,7 +100,6 @@ object DesktopCatalog { o.optString("icon", "applications-games"), o.optString("category", "Game"), ) - /** A finished download is kept until its extraction completes, so resuming does not fetch it again. */ private fun downloaded(file: File, entry: Entry): Boolean = file.isFile && file.length() > 0 && !File(file.path + ".resume.properties").exists() && (entry.size <= 0 || file.length() == entry.size) && entry.sha256.equals(Hashes.sha256(file), ignoreCase = true) @@ -102,19 +112,27 @@ object DesktopCatalog { !File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/appmanifest_4427310.acf").isFile const val DESKTOP_ID = "desktop-kde" + const val EMULATORS_ID = "emulators" + private const val EMULATORS_SCRIPT = "/usr/local/bin/droiddeck-emulators" - fun desktopEntry(context: Context) = Entry( - DESKTOP_ID, context.getString(R.string.content_linux_desktop), 1, BuildConfig.DESKTOP_KDE_TAG, "tar", - BuildConfig.DESKTOP_KDE_URL, BuildConfig.DESKTOP_KDE_SHA256, BuildConfig.DESKTOP_KDE_SIZE, "", - "", "", - ) + fun desktopEntry(context: Context): Entry { + val pack = DesktopPack.info(LinuxRuntime.rootDir(context)) + return Entry( + DESKTOP_ID, context.getString(R.string.content_linux_desktop), 1, pack?.tag ?: BuildConfig.DESKTOP_KDE_TAG, "tar", + pack?.url ?: BuildConfig.DESKTOP_KDE_URL, pack?.sha256 ?: BuildConfig.DESKTOP_KDE_SHA256, + pack?.size ?: BuildConfig.DESKTOP_KDE_SIZE, "", "", "", + ) + } fun desktopInstalled(context: Context): Boolean = desktopInstalled(LinuxRuntime.rootDir(context)) + fun desktopFromPack(root: File): Boolean = DesktopPack.info(root) != null + fun desktopInstalled(root: File): Boolean = !File(root, DesktopRemoval.PENDING).exists() && File(root, "usr/bin/kwin_wayland").isFile && - FileUtils.readString(File(root, ".droiddeck-pkg-$DESKTOP_ID"))?.trim() == BuildConfig.DESKTOP_KDE_TAG + FileUtils.readString(File(root, ".droiddeck-pkg-$DESKTOP_ID"))?.trim() == + (DesktopPack.info(root)?.tag ?: BuildConfig.DESKTOP_KDE_TAG) fun desktopPresent(context: Context): Boolean { val root = LinuxRuntime.rootDir(context) @@ -144,12 +162,19 @@ object DesktopCatalog { } fun install(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? = synchronized(installLock) { - installLocked(context, entry, listener) + installLocked(context, entry, null, listener) } - private fun installLocked(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? { + fun install(context: Context, entry: Entry, cancelled: Downloader.Cancellation, + listener: LinuxRuntimeInstaller.ProgressListener?): String? = synchronized(installLock) { + installLocked(context, entry, cancelled, listener) + } + + private fun installLocked(context: Context, entry: Entry, cancelled: Downloader.Cancellation?, + listener: LinuxRuntimeInstaller.ProgressListener?): String? { val root = LinuxRuntime.rootDir(context) if (!root.isDirectory) return context.getString(R.string.deskpkg_runtime_missing) + if (entry.id == EMULATORS_ID && desktopFromPack(root)) return installEmulators(context, entry, cancelled, listener) if (entry.sha256.isEmpty()) return context.getString(R.string.deskpkg_no_checksum, entry.name) val download = downloadFile(context, entry) val journal = journal(root, entry.id) @@ -166,14 +191,20 @@ object DesktopCatalog { if (!downloaded(download, entry)) { val downloading = context.getString(R.string.user_apps_downloading, entry.name) report.onProgress(LinuxRuntimeInstaller.Step.DOWNLOADING, downloading, 0) - val ok = Downloader.downloadFile(entry.url, download, true, entry.sha256) { f -> + val progress = java.util.function.Consumer<Float> { f -> report.onProgress(LinuxRuntimeInstaller.Step.DOWNLOADING, downloading, if (f < 0) -1 else Math.round(f * 100f)) } - if (!ok) return context.getString(R.string.user_apps_download_failed) + val ok = if (cancelled == null) { + Downloader.downloadFile(entry.url, download, true, entry.sha256, progress) + } else { + Downloader.downloadFile(entry.url, download, true, entry.sha256, cancelled, progress) + } + if (!ok || cancelled?.getAsBoolean() == true) return context.getString(R.string.user_apps_download_failed) report.onProgress(LinuxRuntimeInstaller.Step.VERIFYING, context.getString(R.string.rtinst_verifying), -1) val actual = Hashes.sha256(download) if (!entry.sha256.equals(actual, ignoreCase = true)) return context.getString(R.string.deskpkg_checksum_mismatch) } + if (Thread.currentThread().isInterrupted || cancelled?.getAsBoolean() == true) return context.getString(R.string.user_apps_download_failed) report.onProgress(context.getString(R.string.deskpkg_installing, entry.name), -1) when (entry.kind) { "appimage" -> { @@ -192,11 +223,12 @@ object DesktopCatalog { check(FileUtils.writeString(journal, entryJson(entry).toString())) { "Could not record the package installation" } keepDownload = true marker(context, entry.id).delete() + if (entry.id == DESKTOP_ID && desktopFromPack(root)) DesktopPack.prepareInstall(root) if (!LinuxRuntimeInstaller.extract(context, download, root, report)) return context.getString(R.string.deskpkg_extract_failed) } } if (entry.id == DESKTOP_ID) { - cleanLegacy(context, report) + if (desktopFromPack(root)) DesktopPack.finishInstall(root) else cleanLegacy(context, report) val pending = File(root, DesktopRemoval.PENDING) check(!pending.exists() || pending.delete()) { "Could not finish desktop installation" } } @@ -214,6 +246,47 @@ object DesktopCatalog { } } + private fun installEmulators(context: Context, entry: Entry, cancelled: Downloader.Cancellation?, + listener: LinuxRuntimeInstaller.ProgressListener?): String? { + val release = RuntimeInstallService.holdForPackage(context, context.getString(R.string.deskpkg_installing, entry.name)) + val stop = java.util.concurrent.atomic.AtomicBoolean(false) + val finished = java.util.concurrent.atomic.AtomicBoolean(false) + cancelled?.let { token -> + Thread({ + try { + while (!finished.get() && !stop.get()) { + if (token.getAsBoolean()) stop.set(true) else Thread.sleep(200) + } + } catch (_: InterruptedException) { + } + }, "emulators-cancel").apply { isDaemon = true; start() } + } + try { + var failure: String? = null + val status = GuestCommand.run(context, listOf("/bin/bash", EMULATORS_SCRIPT, "install"), logName = "emulators", + cancelled = stop) { line -> + when { + line.startsWith("== STEP ") -> { + val stage = context.getString(R.string.deskpkg_installing, line.removePrefix("== STEP ")) + RuntimeInstallService.packageProgress(stage, -1) + listener?.onProgress(stage, -1) + } + line.startsWith("== FAIL ") -> failure = line.removePrefix("== FAIL ") + } + } + if (stop.get()) return context.getString(R.string.user_apps_download_failed) + if (failure != null || status != 0) return context.getString(R.string.deskpkg_install_failed) + check(FileUtils.writeString(marker(context, entry.id), entry.version)) { "Could not finish package installation" } + return null + } catch (e: Exception) { + Log.e(TAG, "install ${entry.id}", e) + return e.message ?: context.getString(R.string.deskpkg_install_failed) + } finally { + finished.set(true) + release() + } + } + private fun unzipAppImage(zip: File, target: File): Boolean { try { java.util.zip.ZipInputStream(java.io.BufferedInputStream(java.io.FileInputStream(zip))).use { zin -> diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt index 6d2c42b01..19c612159 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt @@ -73,10 +73,42 @@ internal object DesktopFileRemoval { } } + private val RECORD = Regex("[A-Za-z0-9@._+:-]+") + + fun desktopRecords(root: File): Set<String> { + val list = safeFile(root, "usr/share/droiddeck/pacman/desktop-packages.txt") ?: return emptySet() + if (!Files.isRegularFile(list.toPath(), NOFOLLOW_LINKS)) return emptySet() + return list.readLines().mapNotNull { line -> + line.split(' ').takeIf { it.size == 2 }?.let { "${it[0]}-${it[1]}" }?.takeIf { RECORD.matches(it) && it != "." && it != ".." } + }.toSet() + } + + fun removeRecords(root: File, records: Set<String>) { + val lib = File(root, "var/lib/pacman") + if (Files.isSymbolicLink(File(root, "var").toPath()) || Files.isSymbolicLink(lib.toPath())) return + val local = File(lib, "local") + if (!local.isDirectory || Files.isSymbolicLink(local.toPath())) return + for (record in records) { + if (!RECORD.matches(record) || record == "." || record == "..") continue + val dir = File(local, record) + if (Files.isSymbolicLink(dir.toPath()) || !dir.isDirectory) continue + for (file in dir.listFiles().orEmpty()) { + if (Files.isSymbolicLink(file.toPath()) || file.isFile) Files.delete(file.toPath()) + } + if (!dir.delete()) throw IOException("Cannot remove $dir") + } + for (name in listOf("sync/droiddeck.db", "droiddeck-desktop")) { + val file = File(lib, name) + if (Files.isSymbolicLink(file.toPath()) || file.isFile) Files.delete(file.toPath()) + } + } + fun runtimeFiles(root: File): Set<String> = buildSet { val database = File(root, "var/lib/pacman/local") if (!database.isDirectory || Files.isSymbolicLink(database.toPath())) throw IOException("Runtime package database missing") + val desktop = desktopRecords(root) for (pkg in database.listFiles().orEmpty()) { + if (pkg.name in desktop) continue val files = File(pkg, "files") if (!pkg.isDirectory || Files.isSymbolicLink(pkg.toPath()) || !files.isFile || Files.isSymbolicLink(files.toPath())) continue var inFiles = false diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt new file mode 100644 index 000000000..3b791c579 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt @@ -0,0 +1,178 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import java.io.File +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.Paths +import java.nio.file.StandardCopyOption +import java.util.zip.GZIPInputStream +import org.json.JSONObject + +internal object DesktopPack { + const val INFO = "usr/share/droiddeck/desktop-pack.json" + const val META = "usr/share/droiddeck/desktop" + private const val MANIFEST = "$META/files.tsv.gz" + private const val ORIGINALS = "$META/originals" + private const val STATUS = "var/lib/dpkg/status" + private const val STATUS_BEFORE = "var/lib/dpkg/status.droiddeck" + private const val PACK_STATUS = "$META/dpkg-status" + + data class Info(val tag: String, val url: String, val sha256: String, val size: Long) + + data class Entry(val kind: Char, val type: Char, val size: Long, val value: String, val path: String) { + companion object { + fun parse(line: String): Entry? { + val parts = line.split('\t', limit = 5) + if (parts.size != 5 || parts[0].length != 1 || parts[1].length != 1) return null + return Entry(parts[0][0], parts[1][0], parts[2].toLongOrNull() ?: return null, parts[3], parts[4]) + } + } + } + + data class Result(val removed: Int, val restored: Int, val kept: Int) + + fun info(root: File): Info? = runCatching { + val json = JSONObject(FileUtils.readString(File(root, INFO)) ?: return null) + Info(json.getString("tag"), json.getString("url"), json.getString("sha256"), json.getLong("size")) + }.getOrNull() + + fun installed(root: File): Boolean = File(root, MANIFEST).isFile + + fun entries(root: File): List<Entry> = + GZIPInputStream(File(root, MANIFEST).inputStream()).bufferedReader().use { reader -> + reader.lineSequence().mapNotNull(Entry::parse).toList() + } + + fun installedSize(root: File): Long = + if (installed(root)) entries(root).filter { it.kind == 'N' && it.type == 'F' }.sumOf { it.size } else 0L + + fun prepareInstall(root: File) { + val live = File(root, STATUS) + val before = File(root, STATUS_BEFORE) + if (!before.exists() && live.isFile) Files.copy(live.toPath(), before.toPath(), StandardCopyOption.COPY_ATTRIBUTES) + } + + fun finishInstall(root: File) { + for (entry in entries(root).filter { it.kind == 'R' }.sortedByDescending { it.path.length }) { + val file = inside(root, entry.path) ?: continue + if (entry.type == 'D') file.delete() else Files.deleteIfExists(file.toPath()) + } + val live = File(root, STATUS) + val packStatus = File(root, PACK_STATUS) + if (live.isFile && !packStatus.exists()) Files.copy(live.toPath(), packStatus.toPath()) + val before = File(root, STATUS_BEFORE) + val runtime = File(File(root, ORIGINALS), STATUS) + if (before.isFile && runtime.isFile && live.isFile) { + writeStatus(live, mergeStatus(runtime.readText(), packStatus.readText(), before.readText())) + } + Files.deleteIfExists(before.toPath()) + } + + internal fun mergeStatus(base: String, target: String, mine: String): String { + val from = stanzas(base) + val into = LinkedHashMap(stanzas(target)) + val kept = stanzas(mine) + for ((key, stanza) in kept) { + if (from[key] != stanza && into[key] == from[key]) into[key] = stanza + } + for (key in from.keys) { + if (key !in kept && into[key] == from[key]) into.remove(key) + } + return into.values.joinToString("") { it + "\n\n" } + } + + private fun stanzas(text: String): Map<String, String> { + val out = LinkedHashMap<String, String>() + for (stanza in text.split(Regex("\n[ \t]*\n")).map { it.trim('\n') }.filter { it.isNotBlank() }) { + val fields = stanza.lines() + fun field(name: String) = fields.firstOrNull { it.startsWith("$name:") }?.substringAfter(':')?.trim().orEmpty() + out["${field("Package")}:${field("Architecture")}"] = stanza + } + return out + } + + private fun writeStatus(file: File, text: String) { + val part = LinuxRuntimeInstaller.partFile(file).toPath() + Files.deleteIfExists(part) + Files.copy(file.toPath(), part, StandardCopyOption.COPY_ATTRIBUTES) + Files.write(part, text.toByteArray(), java.nio.file.StandardOpenOption.TRUNCATE_EXISTING) + Files.move(part, file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + } + + fun remove(root: File, progress: (Int) -> Unit = {}): Result { + val entries = entries(root) + var removed = 0 + var restored = 0 + var kept = 0 + val originals = File(root, ORIGINALS) + val live = File(root, STATUS) + val userStatus = if (live.isFile) live.readText() else null + for (entry in entries.filter { it.kind == 'C' || it.kind == 'R' }) { + val file = inside(root, entry.path) ?: continue + if (entry.type == 'D') { + file.mkdirs() + continue + } + if (entry.kind == 'C' && !entry.path.startsWith("var/lib/dpkg/") && !matchesOrMissing(file, entry)) { + kept++ + continue + } + val source = inside(originals, entry.path) ?: continue + val sourcePath = source.toPath() + if (!Files.exists(sourcePath, LinkOption.NOFOLLOW_LINKS)) continue + file.parentFile?.mkdirs() + val part = LinuxRuntimeInstaller.partFile(file).toPath() + Files.deleteIfExists(part) + if (Files.isSymbolicLink(sourcePath)) Files.createSymbolicLink(part, Files.readSymbolicLink(sourcePath)) + else Files.copy(sourcePath, part, StandardCopyOption.COPY_ATTRIBUTES) + if (Files.isDirectory(file.toPath(), LinkOption.NOFOLLOW_LINKS)) FileUtils.delete(file) + Files.move(part, file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + restored++ + } + val added = entries.filter { it.kind == 'N' } + val directories = ArrayList<File>() + added.forEachIndexed { index, entry -> + val file = inside(root, entry.path) + when { + file == null -> kept++ + entry.type == 'D' -> directories += file + matches(file, entry) -> { Files.deleteIfExists(file.toPath()); removed++ } + Files.exists(file.toPath(), LinkOption.NOFOLLOW_LINKS) -> kept++ + } + if (index % 2000 == 0) progress(index * 100 / added.size.coerceAtLeast(1)) + } + for (dir in directories.sortedByDescending { it.path.length }) { + if (Files.isDirectory(dir.toPath(), LinkOption.NOFOLLOW_LINKS) && dir.list()?.isEmpty() == true) dir.delete() + } + val packStatus = File(root, PACK_STATUS) + if (userStatus != null && packStatus.isFile && live.isFile) { + writeStatus(live, mergeStatus(packStatus.readText(), live.readText(), userStatus)) + } + FileUtils.delete(File(root, META)) + return Result(removed, restored, kept) + } + + private fun matchesOrMissing(file: File, entry: Entry) = + !Files.exists(file.toPath(), LinkOption.NOFOLLOW_LINKS) || matches(file, entry) + + private fun matches(file: File, entry: Entry): Boolean { + val path = file.toPath() + return when (entry.type) { + 'L' -> Files.isSymbolicLink(path) && Files.readSymbolicLink(path).toString() == entry.value + 'F' -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS) && file.length() == entry.size && + Hashes.sha256(file).equals(entry.value, ignoreCase = true) + else -> false + } + } + + internal fun inside(root: File, path: String): File? { + if (path.isEmpty() || path.startsWith("/")) return null + val normal = Paths.get(path).normalize() + if (normal.toString().isEmpty() || normal.startsWith("..")) return null + val parent = normal.parent + val dir = if (parent == null) root else com.droiddeck.launcher.core.ArchivePaths.inside(root, parent.toString()) ?: return null + return File(dir, normal.fileName.toString()) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt index ff244e6ad..b050c5f7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt @@ -18,8 +18,11 @@ internal object DesktopRemoval { private fun protected(context: Context, root: File) = DesktopFileRemoval.runtimeFiles(root) + lines(context, "emulators-keep.txt.gzip") - fun installedSize(context: Context): Long = - lines(context, "kde-remove.tsv.gzip").sumOf { line -> line.split('\t').getOrNull(1)?.toLongOrNull() ?: 0L } + fun installedSize(context: Context): Long { + val root = LinuxRuntime.rootDir(context) + if (DesktopPack.info(root) != null) return DesktopPack.installedSize(root) + return lines(context, "kde-remove.tsv.gzip").sumOf { line -> line.split('\t').getOrNull(1)?.toLongOrNull() ?: 0L } + } fun cleanLegacy(context: Context, listener: LinuxRuntimeInstaller.ProgressListener? = null) { val root = LinuxRuntime.rootDir(context) @@ -40,8 +43,12 @@ internal object DesktopRemoval { Log.i("DesktopRemoval", "LXQt: $result") } - fun remove(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { + fun remove(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? { val root = LinuxRuntime.rootDir(context) + return if (DesktopPack.info(root) != null) removePack(context, root, listener) else removeLegacy(context, root, listener) + } + + private fun removeLegacy(context: Context, root: File, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { val pending = File(root, PENDING) val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") val installing = DesktopCatalog.interrupted(root).firstOrNull { it.id == DesktopCatalog.DESKTOP_ID } @@ -50,12 +57,14 @@ internal object DesktopRemoval { check(version in versions && (installing == null || installing.version in versions)) { context.getString(R.string.desktop_removal_unknown) } val entries = lines(context, "kde-remove.tsv.gzip").map(DesktopFileRemoval.Entry::parse) val keep = protected(context, root) + val records = DesktopFileRemoval.desktopRecords(root) cleanLegacy(context, listener) FileUtils.writeString(pending, version!!) check(FileUtils.readString(pending)?.trim() == version) { "Could not reserve desktop removal" } if (marker.exists() && !marker.delete()) error("Could not clear desktop marker") val removing = context.getString(R.string.desktop_removing) val result = DesktopFileRemoval.remove(root, entries, keep) { listener.onProgress(removing, it) } + DesktopFileRemoval.removeRecords(root, records) for ((asset, path) in com.droiddeck.launcher.session.SessionFiles.DESKTOP_FILES) { val target = DesktopFileRemoval.safeFile(root, path) ?: continue if (!isRegularFile(target)) continue @@ -74,5 +83,29 @@ internal object DesktopRemoval { e.message ?: context.getString(R.string.deskpkg_install_failed) } + private fun removePack(context: Context, root: File, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { + val pending = File(root, PENDING) + val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") + FileUtils.writeString(pending, DesktopPack.info(root)!!.tag) + check(pending.isFile) { "Could not reserve desktop removal" } + if (marker.exists() && !marker.delete()) error("Could not clear desktop marker") + val removing = context.getString(R.string.desktop_removing) + for ((_, path) in com.droiddeck.launcher.session.SessionFiles.DESKTOP_FILES) { + DesktopFileRemoval.safeFile(root, path)?.takeIf { isRegularFile(it) }?.delete() + } + for (path in DESKTOP_STATE) DesktopPack.inside(root, path)?.let(FileUtils::delete) + val result = if (DesktopPack.installed(root)) DesktopPack.remove(root) { listener.onProgress(removing, it) } else null + DesktopCatalog.discardDesktopInstall(context) + if (!pending.delete()) error("Could not finish desktop removal") + Log.i("DesktopRemoval", "pack: $result") + listener.onProgress(context.getString(R.string.desktop_removed), 100) + null + } catch (e: Exception) { + Log.e("DesktopRemoval", "remove", e) + e.message ?: context.getString(R.string.deskpkg_install_failed) + } + + private val DESKTOP_STATE = listOf("var/lib/PackageKit", "var/cache/swcatalog") + private fun isRegularFile(file: File) = java.nio.file.Files.isRegularFile(file.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) } 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 000000000..334bce3df --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -0,0 +1,209 @@ +package com.droiddeck.launcher.runtime + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +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 volumeSteps = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { if (running) publishVolume() } + } + 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) + } + } + + private fun publishVolume() { + 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") + } catch (e: Exception) { + Log.w(TAG, "Could not publish Android volume", e) + } + } + + fun publish(force: Boolean = false) { + publishVolume() + try { + directory.mkdirs() + 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() + context.registerReceiver(volumeSteps, IntentFilter().apply { + addAction(VOLUME_CHANGED_ACTION) + addAction(STREAM_MUTE_CHANGED_ACTION) + }, null, handler) + refresh.run() + } + } + + override fun stop() { + handler.post { + running = false + handler.removeCallbacks(refresh) + requests.stopWatching() + try { context.unregisterReceiver(volumeSteps) } catch (e: IllegalArgumentException) { } + 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 VOLUME_CHANGED_ACTION = "android.media.VOLUME_CHANGED_ACTION" + private const val STREAM_MUTE_CHANGED_ACTION = "android.media.STREAM_MUTE_CHANGED_ACTION" + 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/FlatpakManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt index 56340b111..eabcd67b8 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt @@ -19,7 +19,7 @@ object FlatpakManager { @Volatile var busy: String? = null private set - class App(val id: String, val name: String, val icon: File?, val branch: String, val summary: String?) + class App(val id: String, val name: String, val icon: File?, val branch: String, val summary: String?, val arch: String = "aarch64") fun ready(context: Context): Boolean { val root = LinuxRuntime.rootDir(context) @@ -33,24 +33,33 @@ object FlatpakManager { else -> "aarch64" } + internal fun arches(native: String = arch()): List<String> = if (native == "aarch64") listOf("aarch64", "x86_64") else listOf(native) + + internal fun installedBranch(appDir: File, native: String = arch()): Pair<String, File>? = + arches(native).firstNotNullOfOrNull { arch -> + File(appDir, arch).listFiles()?.firstOrNull { File(it, "active").exists() }?.let { arch to it } + } + + fun foreign(app: App, native: String = arch()): Boolean = app.arch != native + + fun launchArgs(app: App, native: String = arch()): List<String> = if (foreign(app, native)) listOf("--arch=${app.arch}", app.id) else listOf(app.id) + fun installedApps(context: Context): List<App> { val apps = File(LinuxRuntime.rootDir(context), "$USER_DIR/app") - val arch = arch() return apps.listFiles()?.mapNotNull { dir -> val id = dir.name - val archDir = File(dir, arch) - val branch = archDir.listFiles()?.firstOrNull { File(it, "active").exists() } ?: return@mapNotNull null + val (arch, branch) = installedBranch(dir) ?: return@mapNotNull null val active = File(branch, "active") val export = File(active, "export/share") val desktop = FileUtils.readString(File(export, "applications/$id.desktop")) val name = desktop?.let { entry(it, "Name") } ?: id.substringAfterLast('.') val summary = desktop?.let { entry(it, "Comment") } - App(id, name, icon(export, id), branch.name, summary) + App(id, name, icon(export, id), branch.name, summary, arch) }?.sortedBy { it.name.lowercase() } ?: emptyList() } fun isInstalled(context: Context, id: String): Boolean = - File(LinuxRuntime.rootDir(context), "$USER_DIR/app/$id/${arch()}").listFiles()?.any { File(it, "active").exists() } == true + installedBranch(File(LinuxRuntime.rootDir(context), "$USER_DIR/app/$id")) != null private fun entry(desktop: String, key: String): String? { var inMain = false @@ -117,7 +126,11 @@ object FlatpakManager { when (o.optString("e")) { "op" -> { step = stage(context, o); onProgress(step, overall(o, 0)) } "progress" -> onProgress(step, overall(o, o.optInt("percent"))) - "error" -> { error = o.optString("message"); Log.w(TAG, "$verb $id: $error") } + "error" -> { + error = if (o.optString("code") == "arch") context.getString(R.string.flatpakmgr_wrong_arch, o.optString("id"), o.optString("arch")) + else o.optString("message") + Log.w(TAG, "$verb $id: ${o.optString("message")}") + } "warning" -> Log.w(TAG, "$verb $id: ${o.optString("message")}") "done" -> onDone(o) } 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 8b4f14e5a..11c7a186e 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) @@ -36,15 +39,21 @@ object GuestCommand { if (linkDir != null) cmd.add(1, "--link2symlink") val binds = LinuxRuntime.binds(context, null, runtimeDir, Environment.getExternalStorageDirectory(), extraBinds) binds.forEach { cmd.add("-b"); cmd.add(it) } - // Fake root and link2symlink are emulated by proot, so their syscalls must stay on the traced path. val fastPathKey = if (fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null cmd += listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "LANG=C.UTF-8", - "PATH=/usr/local/bin:/usr/bin:/bin", "XDG_RUNTIME_DIR=${LinuxRuntime.GUEST_RUNTIME_DIR}", + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games", "XDG_RUNTIME_DIR=${LinuxRuntime.GUEST_RUNTIME_DIR}", "XDG_DATA_HOME=/root/.local/share", "FLATPAK_BWRAP=${FlatpakManager.BWRAP}", "DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}", "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", ) + 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 +65,33 @@ 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 caller = Thread.currentThread() + val watcher = run { + val flag = cancelled + Thread({ + try { + while (process.isAlive && flag?.get() != true && !caller.isInterrupted) Thread.sleep(200) + if (flag?.get() == true || caller.isInterrupted) { + 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/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index ac87bd0aa..7bdc28e59 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -184,7 +184,7 @@ class LinuxNetworkLinkComponent( val state = JSONObject().apply { put("transport", transport) put("interface", properties?.interfaceName ?: "android") - put("mtu", properties?.mtu?.takeIf { it > 0 } ?: DEFAULT_MTU) + put("mtu", (if (android.os.Build.VERSION.SDK_INT >= 29) properties?.mtu else null)?.takeIf { it > 0 } ?: DEFAULT_MTU) put("connected", properties != null && capabilities != null) put("validated", capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) == true) put("captivePortal", capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL) == true) @@ -301,15 +301,18 @@ class LinuxNetworkLinkComponent( } } - private fun seededMac(): String { - val id = Settings.Secure.getString(appContext.contentResolver, Settings.Secure.ANDROID_ID) ?: "bannerlator" - val bytes = java.security.MessageDigest.getInstance("SHA-1").digest(id.toByteArray()) - val b0 = (bytes[0].toInt() and 0xfc) or 0x02 - return listOf(b0, bytes[1].toInt(), bytes[2].toInt(), bytes[3].toInt(), bytes[4].toInt(), bytes[5].toInt()) - .joinToString(":") { "%02x".format(it and 0xff) } - } + private fun seededMac(): String = + seededMac { Settings.Secure.getString(appContext.contentResolver, Settings.Secure.ANDROID_ID) } companion object { + internal fun seededMac(readId: () -> String?): String { + val id = runCatching(readId).getOrNull() ?: "bannerlator" + val bytes = java.security.MessageDigest.getInstance("SHA-1").digest(id.toByteArray()) + val b0 = (bytes[0].toInt() and 0xfc) or 0x02 + return listOf(b0, bytes[1].toInt(), bytes[2].toInt(), bytes[3].toInt(), bytes[4].toInt(), bytes[5].toInt()) + .joinToString(":") { "%02x".format(it and 0xff) } + } + private const val TAG = "LinuxNetworkLink" private const val LINK_FILE = "etc/droiddeck-net" private const val LINK_INDEX = 2 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 11be5bf9b..7e95d7423 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -50,7 +50,6 @@ public final class LinuxRuntime { } public static File liveDir(Context context) { - // Android may evict cache files even while guest processes are using them. File dir = new File(context.getNoBackupFilesDir(), "guest-runtime"); dir.mkdirs(); return dir; @@ -63,30 +62,74 @@ public final class LinuxRuntime { } private static final String HOST_DIR = "opt/android-host"; + public static final String PROOT_PACK = "add-on pack"; + public static final String PROOT_BUNDLED = "APK"; + public static final String PROOT_ROOTFS = "rootfs fallback"; + public static final String PROOT_MISSING = "missing"; - public static File prootBinary(Context context) { - if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); + private static File rootfsProot(Context context) { return new File(rootDir(context), HOST_DIR + "/proot"); } - public static File prootLoader(Context context) { - if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); + 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(); + } + + private static File bundledProot(Context context, String name) { + return new File(context.getApplicationInfo().nativeLibraryDir, name); + } + + private static boolean bundledProotReady(Context context) { + return context.getApplicationInfo().nativeLibraryDir != null && + bundledProot(context, "libproot.so").isFile() && bundledProot(context, "libproot-loader.so").isFile(); + } + + public static boolean patchedProot(Context context) { + return bundledProotReady(context) || AddonPack.PROOT.installed(context); + } + + public static File prootBinary(Context context) { + if (bundledProotReady(context)) return bundledProot(context, "libproot.so"); + if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); + if (SessionPrefs.allowStockProot(context)) return rootfsProot(context); + return AddonPack.PROOT.file(context, "libproot.so"); + } + + public static File prootLoader(Context context) { + if (bundledProotReady(context)) return bundledProot(context, "libproot-loader.so"); + if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); + if (SessionPrefs.allowStockProot(context)) return rootfsLoader(context); + return AddonPack.PROOT.file(context, "libproot-loader.so"); + } + + public static String prootSource(Context context) { + File bin = prootBinary(context); + if (!bin.isFile()) return PROOT_MISSING; + if (bundledProotReady(context)) return PROOT_BUNDLED; + 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) { File dir = new File(rootDir(context), HOST_DIR); return dir.equals(prootBinary(context).getParentFile()) ? dir.getPath() : ""; } public static boolean isInstalled(Context context) { + return hasRootfs(context) && (patchedProot(context) || rootfsProotReady(context)); + } + + public static boolean hasRootfs(Context context) { if (LinuxRuntimeInstaller.isRemoving() || LinuxRuntimeInstaller.hasRemovalPending(context)) return false; File root = rootDir(context); - return new File(root, "usr/bin/gamescope").isFile() + return (new File(root, "usr/bin/gamescope").isFile() || new File(root, "usr/games/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(); + || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()); } public static File vulkanIcd(Context context) { @@ -110,6 +153,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 +203,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"); @@ -303,9 +352,9 @@ public final class LinuxRuntime { } public static String cpuTempSource() { - for (java.util.Map.Entry<String, File> e : new java.util.TreeMap<>(thermalZones()).entrySet()) { - File temp = new File(e.getValue(), "temp"); - if (e.getKey().contains("cpu") && !e.getKey().contains("gpu") && temp.canRead()) return temp.getPath(); + for (File zone : cpuTempZones()) { + File temp = new File(zone, "temp"); + if (temp.canRead()) return temp.getPath(); } return null; } @@ -315,7 +364,7 @@ public final class LinuxRuntime { return firstReadable(kgsl + "temp", kgsl + "devfreq/temp", thermalZone("gpu")); } - private static String gpuLoadSource() { + public static String gpuLoadSource() { String kgsl = "/sys/class/kgsl/kgsl-3d0/"; return firstReadable(kgsl + "gpu_busy_percentage", kgsl + "devfreq/gpu_load"); } @@ -329,7 +378,7 @@ public final class LinuxRuntime { "/sys/devices/platform/soc@0/3d00000.gpu/devfreq/3d00000.gpu/cur_freq"}, {gpuTemp, "/sys/class/thermal/thermal_zone28/temp"}, {gpuTemp, "/sys/class/thermal/thermal_zone26/temp"}, - {thermalZone("ddr"), "/sys/class/thermal/thermal_zone22/temp"}, + {ddrTempSource(), "/sys/class/thermal/thermal_zone22/temp"}, }; for (String[] stat : stats) { boolean fed = false; @@ -346,6 +395,32 @@ public final class LinuxRuntime { return path != null ? path : "none"; } + private static String ddrTempSource() { + return thermalZone("ddr"); + } + + private static java.util.Map<String, String> replacedZoneTypes() { + java.util.Map<String, String> replaced = new java.util.HashMap<>(); + if (gpuTempSource() != null) { + replaced.put("thermal_zone28", "gpu-thermal"); + replaced.put("thermal_zone26", "gpu-thermal"); + } + if (ddrTempSource() != null) replaced.put("thermal_zone22", "ddr-thermal"); + return replaced; + } + + public static List<File> cpuTempZones() { + java.util.Map<String, String> replaced = replacedZoneTypes(); + List<File> zones = new ArrayList<>(); + for (java.util.Map.Entry<String, File> zone : new java.util.TreeMap<>(thermalZones()).entrySet()) { + String type = zone.getKey(); + if (type.contains("cpu") && !type.contains("gpu") && !replaced.containsKey(zone.getValue().getName())) { + zones.add(zone.getValue()); + } + } + return zones; + } + private static void bindCpuTemps(List<String> cmd, File root) { File name = new File(root, "etc/droiddeck/cpu-thermal-type"); try { @@ -353,9 +428,18 @@ public final class LinuxRuntime { } catch (IOException e) { return; } + java.util.Map<String, String> replaced = replacedZoneTypes(); for (java.util.Map.Entry<String, File> zone : thermalZones().entrySet()) { String type = zone.getKey(); - if (type.contains("cpu") && !type.contains("gpu") && !type.matches("cpu\\d-(top-)?thermal")) { + String other = replaced.get(zone.getValue().getName()); + if (other != null) { + File typeFile = new File(root, "etc/droiddeck/" + other + "-type"); + try { + if (!typeFile.isFile()) Files.write(typeFile.toPath(), (other + "\n").getBytes(StandardCharsets.US_ASCII)); + bind(cmd, typeFile.getPath() + ":" + new File(zone.getValue(), "type").getPath()); + } catch (IOException ignored) { + } + } else if (type.contains("cpu") && !type.contains("gpu") && !type.matches("cpu\\d-(top-)?thermal")) { bind(cmd, name.getPath() + ":" + new File(zone.getValue(), "type").getPath()); } } @@ -410,12 +494,72 @@ public final class LinuxRuntime { + "\\" + host.version + "\\" + host.machine + "\\localdomain\\-1\\"; } - public static void writeAccounts(Context context) throws IOException { + public static synchronized void writeAccounts(Context context) throws IOException { File root = rootDir(context); int uid = Process.myUid(); - Files.write(new File(root, "etc/passwd").toPath(), - ("root:x:" + uid + ":" + uid + ":root:/root:/bin/bash\n").getBytes(StandardCharsets.UTF_8)); - Files.write(new File(root, "etc/group").toPath(), - ("root:x:" + uid + ":\n").getBytes(StandardCharsets.UTF_8)); + mergeAccounts(new File(root, "etc/passwd"), 2, + "root:x:" + uid + ":" + uid + ":root:/root:/bin/bash", "root:x:0:0:root:/root:/bin/bash", uid); + mergeAccounts(new File(root, "etc/group"), 2, + "root:x:" + uid + ":", "root:x:0:", uid); + File group = new File(root, "etc/group"); + String groups = new String(Files.readAllBytes(group.toPath()), StandardCharsets.UTF_8); + writeIfChanged(group, groups, withStorageGroups(groups)); + } + + private static final String[][] STORAGE_GROUPS = { + {"sdcard_rw", "1015"}, {"media_rw", "1023"}, {"everybody", "9997"}}; + + static String withStorageGroups(String groups) { + StringBuilder out = new StringBuilder(); + List<String> present = new ArrayList<>(); + for (String line : groups.split("\n")) { + if (line.trim().isEmpty()) continue; + String[] fields = line.split(":", -1); + if (fields.length >= 4) { + for (String[] storage : STORAGE_GROUPS) { + if (fields[0].equals(storage[0])) present.add(storage[0]); + if (!fields[2].equals(storage[1])) continue; + present.add(storage[0]); + if (!java.util.Arrays.asList(fields[3].split(",")).contains("root")) { + fields[3] = fields[3].isEmpty() ? "root" : fields[3] + ",root"; + line = String.join(":", fields); + } + } + } + out.append(line).append('\n'); + } + for (String[] storage : STORAGE_GROUPS) { + if (!present.contains(storage[0])) { + out.append(storage[0]).append(":x:").append(storage[1]).append(":root\n"); + } + } + return out.toString(); + } + + static String mergedAccounts(String existing, int idField, String own, String zero, int uid) { + StringBuilder out = new StringBuilder(own).append('\n').append(zero).append('\n'); + if (existing == null) return out.toString(); + String ownId = Integer.toString(uid); + for (String line : existing.split("\n")) { + if (line.trim().isEmpty()) continue; + String[] fields = line.split(":", -1); + if (fields.length <= idField) continue; + if (fields[0].equals("root") || fields[idField].equals("0") || fields[idField].equals(ownId)) continue; + out.append(line).append('\n'); + } + return out.toString(); + } + + private static void mergeAccounts(File file, int idField, String own, String zero, int uid) throws IOException { + String existing = file.isFile() ? new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8) : null; + writeIfChanged(file, existing, mergedAccounts(existing, idField, own, zero, uid)); + } + + private static void writeIfChanged(File file, String existing, String merged) throws IOException { + if (merged.equals(existing)) return; + File staged = File.createTempFile(file.getName(), ".staged", file.getParentFile()); + Files.write(staged.toPath(), merged.getBytes(StandardCharsets.UTF_8)); + Files.move(staged.toPath(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING, + java.nio.file.StandardCopyOption.ATOMIC_MOVE); } } 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 e16a11870..9bcbdd2a9 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; @@ -35,7 +36,7 @@ public final class LinuxRuntimeInstaller { private static final String TAG = "LinuxRuntimeInstaller"; public static final String CATALOG_URL = - "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/linuxfs.json"; + "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/linuxfs-ubuntu.json"; private static final String VERSION_FILE = ".version"; @@ -71,6 +72,7 @@ public final class LinuxRuntimeInstaller { volatile int percent = -1; volatile boolean ok; volatile Thread worker; + volatile boolean cancelled; final boolean removal; boolean maintenance; Job(boolean removal, String stage) { this.removal = removal; this.stage = stage; } @@ -89,8 +91,20 @@ public final class LinuxRuntimeInstaller { return v == null ? null : v.trim(); } + private static String catalogUrl() { + if (!com.droiddeck.launcher.BuildConfig.DEBUG) return CATALOG_URL; + try { + Object value = Class.forName("android.os.SystemProperties").getMethod("get", String.class) + .invoke(null, "debug.droiddeck.linuxfs"); + if (value instanceof String && ((String) value).startsWith("http")) return (String) value; + } catch (ReflectiveOperationException e) { + Log.w(TAG, "catalog override: " + e); + } + return CATALOG_URL; + } + public static Release fetchRelease() { - String body = Downloader.downloadString(CATALOG_URL); + String body = Downloader.downloadString(catalogUrl()); if (body == null || body.isEmpty()) return null; try { JSONObject json = new JSONObject(body); @@ -153,7 +167,10 @@ public final class LinuxRuntimeInstaller { public static void cancelActiveOperation() { synchronized (JOB_LOCK) { - if (running != null && running.worker != null) running.worker.interrupt(); + if (running != null) { + running.cancelled = true; + if (running.worker != null) running.worker.interrupt(); + } } } @@ -186,8 +203,11 @@ public final class LinuxRuntimeInstaller { private Maintenance(Job job) { this.job = job; } public boolean run(ProgressListener listener, MaintenanceWork work) { if (!started.compareAndSet(false, true)) return join(job, listener); + job.worker = Thread.currentThread(); + if (job.cancelled) job.worker.interrupt(); if (listener != null) job.listeners.add(listener); try { + requireNotInterrupted(); removalError = work.run((stage, percent) -> { job.stage = stage; job.percent = percent; @@ -240,10 +260,6 @@ public final class LinuxRuntimeInstaller { } } - /** - * The download is named after the release, so a partial file is only ever resumed for the same - * version and checksum, never for a different runtime that happens to share a fixed name. - */ static String archiveName(Release release) { String version = release.version.replaceAll("[^A-Za-z0-9._-]", "_"); String sum = release.sha256.replaceAll("[^A-Za-z0-9]", ""); @@ -251,7 +267,6 @@ public final class LinuxRuntimeInstaller { return "linuxfs-" + version + "-" + sum + ".tar.zst"; } - /** Removes archives left by other releases and by builds that used the fixed name. */ private static void deleteOtherArchives(File dir, String keep) { File[] files = dir.listFiles((d, name) -> name.startsWith("linuxfs") && name.endsWith(".tar.zst") && !name.equals(keep)); if (files == null) return; @@ -260,8 +275,6 @@ public final class LinuxRuntimeInstaller { private static boolean installOnce(Context context, Release release, ProgressListener listener) { File archive = new File(context.getCacheDir(), archiveName(release)); - // A failed download keeps what it fetched so the next attempt resumes it; anything that - // reached verification and failed is not trusted and is removed. boolean keepPartial = false; try { deleteOtherArchives(context.getCacheDir(), archive.getName()); @@ -271,7 +284,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,7 +314,7 @@ public final class LinuxRuntimeInstaller { recoverInterruptedSwap(root, staging, old); if (!discard(staging, null) || !staging.mkdirs()) return false; if (listener != null) listener.onProgress(context.getString(R.string.rtinst_extracting), -1); - if (!extract(context, archive, staging, listener)) { + if (!extract(context, archive, staging, root, listener)) { RuntimeFileTree.delete(staging, null); return false; } @@ -310,6 +325,8 @@ 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; @@ -319,24 +336,49 @@ public final class LinuxRuntimeInstaller { 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 (Thread.currentThread().isInterrupted() || !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(); + try { RuntimeFileTree.dropStaleState(root); } + catch (IOException e) { Log.w(TAG, "could not clear caches left by the previous runtime", e); } discard(old, null); + try { com.droiddeck.launcher.session.SessionFiles.INSTANCE.stage(context, root, false); } + catch (Exception e) { Log.w(TAG, "could not stage the session files into the new runtime", e); } return LinuxRuntime.isInstalled(context); } catch (Exception e) { Log.e(TAG, "install", e); @@ -346,17 +388,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"; @@ -380,9 +446,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) { @@ -419,6 +486,8 @@ public final class LinuxRuntimeInstaller { public boolean run(ProgressListener listener) { if (!started.compareAndSet(false, true)) return join(job, listener); + job.worker = Thread.currentThread(); + if (job.cancelled) job.worker.interrupt(); if (listener != null) job.listeners.add(listener); try { requireStopped(); @@ -475,9 +544,11 @@ public final class LinuxRuntimeInstaller { } } - // Packages extract over the live runtime and their archives list a link before the file it - // names, so a kill mid-way must leave neither a truncated file nor a link to a missing one. public static boolean extract(Context context, File archive, File destination, ProgressListener listener) { + return extract(context, archive, destination, destination, listener); + } + + static boolean extract(Context context, File archive, File destination, File linkRoot, ProgressListener listener) { long entries = 0; String extracting = context.getString(R.string.rtinst_extracting); java.util.LinkedHashMap<File, String> links = new java.util.LinkedHashMap<>(); @@ -503,7 +574,7 @@ public final class LinuxRuntimeInstaller { links.remove(file); links.put(file, entry.getLinkName()); } else if (entry.isLink()) { - File target = ArchivePaths.inside(destination, entry.getLinkName()); + File target = hardLinkTarget(destination, entry.getLinkName()); if (target == null) { Log.w(TAG, "skipping hard link outside the rootfs: " + entry.getLinkName()); continue; @@ -514,11 +585,11 @@ public final class LinuxRuntimeInstaller { try { Files.createLink(part.toPath(), target.toPath()); } catch (IOException | UnsupportedOperationException e) { - if (target.isFile()) { + if (!l2sLink(target, part, destination, linkRoot) && target.isFile()) { Files.copy(target.toPath(), part.toPath(), StandardCopyOption.REPLACE_EXISTING); } } - if (part.exists()) place(part, file); + if (Files.exists(part.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) place(part, file); } else if (entry.isFile()) { links.remove(file); File part = partFile(file); @@ -562,6 +633,67 @@ public final class LinuxRuntimeInstaller { if (Thread.currentThread().isInterrupted()) throw new InterruptedIOException("Runtime installation was interrupted"); } + static File hardLinkTarget(File destination, String name) throws IOException { + java.nio.file.Path path = java.nio.file.Paths.get(name).normalize(); + java.nio.file.Path last = path.getFileName(); + if (last == null || last.toString().isEmpty() || last.toString().equals("..")) return null; + java.nio.file.Path parent = path.getParent(); + File dir = parent == null ? destination : ArchivePaths.inside(destination, parent.toString()); + return dir == null ? null : new File(dir, last.toString()); + } + + private static final String L2S = ".l2s."; + + static boolean l2sLink(File target, File link) { + return l2sLink(target, link, null, null); + } + + static boolean l2sLink(File target, File link, File tree, File linkTree) { + java.nio.file.Path here = tree == null ? null : tree.toPath().toAbsolutePath().normalize(); + java.nio.file.Path there = linkTree == null ? here : linkTree.toPath().toAbsolutePath().normalize(); + java.util.function.UnaryOperator<java.nio.file.Path> shown = path -> { + java.nio.file.Path p = path.toAbsolutePath().normalize(); + return here == null || !p.startsWith(here) ? p : there.resolve(here.relativize(p)); + }; + java.util.function.UnaryOperator<java.nio.file.Path> actual = path -> { + java.nio.file.Path p = path.toAbsolutePath().normalize(); + return there == null || !p.startsWith(there) ? p : here.resolve(there.relativize(p)); + }; + try { + java.nio.file.Path original = target.toPath().toAbsolutePath().normalize(); + java.nio.file.Path intermediate; + if (Files.isSymbolicLink(original)) { + intermediate = actual.apply(Files.readSymbolicLink(original)); + if (!intermediate.getFileName().toString().startsWith(L2S) || !Files.isSymbolicLink(intermediate)) return false; + java.nio.file.Path fin = actual.apply(Files.readSymbolicLink(intermediate)); + String name = fin.getFileName().toString(); + int count = Integer.parseInt(name.substring(name.length() - 4)) + 1; + java.nio.file.Path next = fin.resolveSibling(name.substring(0, name.length() - 4) + String.format(java.util.Locale.ROOT, "%04d", count)); + Files.move(fin, next, StandardCopyOption.ATOMIC_MOVE); + Files.delete(intermediate); + Files.createSymbolicLink(intermediate, shown.apply(next)); + } else { + if (!Files.isRegularFile(original, java.nio.file.LinkOption.NOFOLLOW_LINKS)) return false; + java.nio.file.Path dir = original.getParent(); + String base = L2S + original.getFileName(); + int suffix = 1; + do { + intermediate = dir.resolve(base + String.format(java.util.Locale.ROOT, "%04d", suffix++)); + } while (Files.exists(intermediate, java.nio.file.LinkOption.NOFOLLOW_LINKS) && suffix < 1000); + java.nio.file.Path fin = dir.resolve(intermediate.getFileName() + ".0002"); + Files.move(original, fin, StandardCopyOption.ATOMIC_MOVE); + Files.createSymbolicLink(intermediate, shown.apply(fin)); + Files.createSymbolicLink(original, shown.apply(intermediate)); + } + Files.deleteIfExists(link.toPath()); + Files.createSymbolicLink(link.toPath(), shown.apply(intermediate)); + return true; + } catch (IOException | RuntimeException e) { + Log.w(TAG, "l2s link " + link + " -> " + target + ": " + e); + return false; + } + } + static File partFile(File file) { return new File(file.getParentFile(), ".dd-part-" + Integer.toHexString(file.getName().hashCode())); } 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 94508e372..c834271ef 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,29 @@ package com.droiddeck.launcher.runtime import android.content.Context -import com.droiddeck.launcher.core.AddonPack +import android.os.Build +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) + fun allows(preference: Boolean, noSeccomp: Boolean, source: String): Boolean = + preference && !noSeccomp && (source == LinuxRuntime.PROOT_PACK || source == LinuxRuntime.PROOT_BUNDLED) + + 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 @@ -23,9 +34,10 @@ object ProotFastPath { fun hostEnv(key: String): Pair<String, String> = "PROOT_FASTPATH" to key - fun guestEnv(root: File, binds: List<String>, key: String): List<String> = listOf( + fun guestEnv(root: File, binds: List<String>, key: String, sdk: Int = Build.VERSION.SDK_INT): List<String> = listOf( "PROOT_FP_ROOT=" + root.path, "PROOT_FP_BINDS=" + binds.joinToString("|"), "PROOT_FP_KEY=$key", + "PROOT_FP_ANDROID_API=$sdk", ) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt new file mode 100644 index 000000000..e263bb5ab --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -0,0 +1,201 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.net.LocalServerSocket +import android.net.LocalSocket +import android.os.ParcelFileDescriptor +import android.os.Process +import android.util.Log +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.session.OrphanReaper +import com.droiddeck.launcher.session.SessionPrefs +import org.json.JSONObject +import java.io.DataInputStream +import java.io.DataOutputStream +import java.io.File +import java.io.FileDescriptor +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.IOException +import java.io.InputStream +import java.io.OutputStream +import java.util.concurrent.atomic.AtomicInteger + +object RootSpawner { + private const val TAG = "RootSpawner" + fun socket(context: Context): String = "${context.packageName}.root" + private val seq = AtomicInteger() + @Volatile private var server: LocalServerSocket? = null + + @Synchronized + fun start(context: Context) { + if (server != null) return + val app = context.applicationContext + val name = socket(app) + val socket = try { + LocalServerSocket(name) + } catch (e: IOException) { + Log.e(TAG, "cannot listen on $name", e) + return + } + server = socket + Thread({ + while (true) { + val client = try { socket.accept() } catch (e: IOException) { Log.e(TAG, "accept", e); break } + Thread({ serve(app, client) }, "root-${seq.get() + 1}").apply { isDaemon = true; start() } + } + }, "root-server").apply { isDaemon = true; start() } + } + + private fun serve(context: Context, client: LocalSocket) { + val id = seq.incrementAndGet() + val received = ArrayList<FileDescriptor>() + client.use { + val out = DataOutputStream(client.outputStream) + try { + if (client.peerCredentials.uid != Process.myUid()) { + Log.w(TAG, "refused root for uid ${client.peerCredentials.uid}") + return + } + val input = DataInputStream(client.inputStream) + val kind = input.readUnsignedByte() + client.ancillaryFileDescriptors?.let { received.addAll(it) } + val body = ByteArray(input.readInt()).also { input.readFully(it) } + client.ancillaryFileDescriptors?.let { received.addAll(it) } + if (kind != 'R'.code) return + run(context, JSONObject(String(body, Charsets.UTF_8)), received, client, input, out, id) + } catch (e: Exception) { + Log.e(TAG, "root $id", e) + runCatching { + frame(out, 'E', (e.message ?: e.toString()).toByteArray()) + frame(out, 'X', "1".toByteArray()) + } + } finally { + received.forEach { fd -> runCatching { android.system.Os.close(fd) } } + } + } + } + + private class Stdio(val redirect: ProcessBuilder.Redirect?, val fd: FileDescriptor?, val dup: ParcelFileDescriptor?) + + private fun stdio(fd: FileDescriptor?, write: Boolean): Stdio { + if (fd == null) return Stdio(null, null, null) + val dup = try { ParcelFileDescriptor.dup(fd) } catch (e: IOException) { return Stdio(null, fd, null) } + val path = File("/proc/self/fd/${dup.fd}") + val opens = try { + if (write) FileOutputStream(path, true).close() else FileInputStream(path).close() + true + } catch (e: IOException) { false } + if (!opens) return Stdio(null, fd, dup) + val redirect = if (write) ProcessBuilder.Redirect.appendTo(path) else ProcessBuilder.Redirect.from(path) + return Stdio(redirect, fd, dup) + } + + private fun pump(from: InputStream, to: OutputStream, name: String) = + Thread({ + val buffer = ByteArray(16384) + try { + while (true) { + val n = from.read(buffer) + if (n < 0) break + to.write(buffer, 0, n) + to.flush() + } + } catch (e: IOException) { + } finally { + runCatching { to.close() } + } + }, name).apply { isDaemon = true; start() } + + private fun run(context: Context, request: JSONObject, fds: List<FileDescriptor>, client: LocalSocket, + input: DataInputStream, out: DataOutputStream, id: Int) { + val root = LinuxRuntime.rootDir(context) + val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } + if (argv.isEmpty()) throw IOException("no command") + val cwd = request.optString("cwd", "/root").ifEmpty { "/root" } + val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) + cmd.add(1, "--link2symlink") + LinuxRuntime.lastBinds(context).filterNot { it.startsWith("/proc/self/fd/") }.forEach { cmd.add("-b"); cmd.add(it) } + cmd.add("/usr/bin/env") + cmd.add("-i") + request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> cmd.add("$k=${e.getString(k)}") } } + cmd.addAll(argv) + val builder = ProcessBuilder(cmd).directory(root) + builder.environment().apply { + clear() + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + val streams = listOf(stdio(fds.getOrNull(0), false), stdio(fds.getOrNull(1), true), stdio(fds.getOrNull(2), true)) + try { + builder.redirectInput(streams[0].redirect ?: ProcessBuilder.Redirect.PIPE) + builder.redirectOutput(streams[1].redirect ?: ProcessBuilder.Redirect.PIPE) + builder.redirectError(streams[2].redirect ?: ProcessBuilder.Redirect.PIPE) + val process = builder.start() + val pid = HostProcess.pidOf(process) + OrphanReaper.keep(pid) + Log.i(TAG, "root $id pid $pid: ${argv.joinToString(" ")}") + synchronized(out) { frame(out, 'P', pid.toString().toByteArray()) } + val pumps = ArrayList<Thread>() + if (streams[0].redirect == null) { + val fd = streams[0].fd + if (fd != null) pumps.add(pump(FileInputStream(fd), process.outputStream, "root-$id-in").also { it.isDaemon = true }) + else runCatching { process.outputStream.close() } + } + if (streams[1].redirect == null) pumps.add(pump(process.inputStream, + streams[1].fd?.let { FileOutputStream(it) } ?: FileOutputStream("/dev/null"), "root-$id-out")) + if (streams[2].redirect == null) pumps.add(pump(process.errorStream, + streams[2].fd?.let { FileOutputStream(it) } ?: FileOutputStream("/dev/null"), "root-$id-err")) + Thread({ + try { + while (true) { + val kind = input.readUnsignedByte() + val body = ByteArray(input.readInt()).also { input.readFully(it) } + if (kind == 'S'.code) String(body).trim().toIntOrNull()?.let { signal(pid, it) } + } + } catch (e: IOException) { + } + if (process.isAlive) { + Log.i(TAG, "root $id: its caller is gone; stopping it") + signal(pid, android.system.OsConstants.SIGHUP) + android.os.Process.sendSignal(pid, android.system.OsConstants.SIGQUIT) + } + }, "root-$id-watch").apply { isDaemon = true; start() } + val status = process.waitFor() + pumps.filter { it.name.endsWith("-out") || it.name.endsWith("-err") }.forEach { it.join(2000) } + OrphanReaper.release(pid) + Log.i(TAG, "root $id exited $status") + runCatching { synchronized(out) { frame(out, 'X', status.toString().toByteArray()) } } + } finally { + streams.forEach { s -> runCatching { s.dup?.close() } } + } + } + + private fun signal(top: Int, signal: Int) { + val parents = HashMap<Int, Int>() + File("/proc").listFiles()?.forEach { dir -> + val pid = dir.name.toIntOrNull() ?: return@forEach + val stat = try { File(dir, "stat").readText() } catch (e: IOException) { return@forEach } + val fields = stat.substringAfterLast(')').trim().split(' ') + fields.getOrNull(1)?.toIntOrNull()?.let { parents[pid] = it } + } + val tree = HashSet<Int>() + var grew = true + while (grew) { + grew = false + for ((pid, parent) in parents) { + if (pid !in tree && (parent == top || parent in tree)) { tree.add(pid); grew = true } + } + } + tree.forEach { runCatching { android.os.Process.sendSignal(it, signal) } } + } + + private fun frame(out: DataOutputStream, kind: Char, payload: ByteArray) { + out.writeByte(kind.code) + out.writeInt(payload.size) + out.write(payload) + out.flush() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt new file mode 100644 index 000000000..5bb53bbc0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdate.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import com.droiddeck.launcher.BuildConfig + +object RuntimeAutoUpdate { + private const val PREFS = "runtime-auto-update" + const val MAX_ATTEMPTS = 3 + const val RETRY_MS = 10 * 60_000L + + fun due(installed: String?, release: String?, attempts: Int, lastAt: Long = 0L, now: Long = lastAt + RETRY_MS): Boolean = + installed != null && !release.isNullOrEmpty() && release != installed && attempts < MAX_ATTEMPTS && + (attempts == 0 || now - lastAt !in 0 until RETRY_MS) + + fun key(appVersion: Int, release: String) = "$appVersion:$release" + + fun claim(context: Context, installed: String?, release: String?, now: Long = System.currentTimeMillis()): Boolean { + if (release.isNullOrEmpty()) return false + val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + val key = key(BuildConfig.VERSION_CODE, release) + synchronized(this) { + val attempts = prefs.getInt(key, 0) + if (!due(installed, release, attempts, prefs.getLong("$key@at", 0L), now)) return false + val edit = prefs.edit() + prefs.all.keys.filterNot { it.startsWith("${BuildConfig.VERSION_CODE}:") }.forEach { edit.remove(it) } + edit.putInt(key, attempts + 1).putLong("$key@at", now).apply() + return true + } + } +} 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 5fb94de05..fbbc5ddae 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,179 @@ public final class RuntimeFileTree { throw new IOException("Cannot make directory removable: " + dir); } + 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", "opt/droiddeck/wincomponents")); + 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())) continue; + if (rel.startsWith("usr/share/applications/") && exists(safePath(to, rel).toPath())) continue; + paths.add(rel); + } + return paths; + } + + private static final String[] STALE_HOME_STATE = { + ".local/share/droiddeck/pacman", ".cache/droiddeck/pacman-restore.log", + ".cache/appstream", ".cache/discover", ".cache/fontconfig", ".cache/kwin", ".cache/ksplash", + ".cache/ksvg-elements", ".cache/plasmashell", ".cache/kwinsession.kcache", ".cache/icon-cache.kcache", + }; + private static final String[] STALE_HOME_CACHE_PREFIXES = { + "mesa_shader_cache", "ksycoca", "plasma_theme_", "qtshadercache", "event-sound-cache.tdb.", + }; + + static void dropStaleState(File runtimeRoot) throws IOException { + File home = new File(runtimeRoot, "root"); + java.util.List<String> stale = new java.util.ArrayList<>(java.util.Arrays.asList(STALE_HOME_STATE)); + for (String n : children(new File(home, ".cache"))) { + for (String prefix : STALE_HOME_CACHE_PREFIXES) { + if (n.startsWith(prefix)) { stale.add(".cache/" + n); break; } + } + } + IOException failed = null; + for (String rel : stale) { + try { delete(safePath(home, rel), null); } + catch (IOException e) { if (failed == null) failed = e; else failed.addSuppressed(e); } + } + if (failed != null) throw failed; + } + + 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; + } + + 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; + } + + 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/runtime/RuntimeHealth.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt index 19ca93d5f..94d7f443f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt @@ -10,15 +10,15 @@ object RuntimeHealth { fun brokenLibraryLinks(context: Context): List<String> = brokenLibraryLinks(LinuxRuntime.rootDir(context)) - /** A complete runtime has no library link in usr/lib whose target is missing. */ - fun brokenLibraryLinks(root: File): List<String> { - val lib = File(root, "usr/lib") - val names = lib.list() ?: return emptyList() - return names.sorted().filter { name -> - val path = File(lib, name).toPath() - Files.isSymbolicLink(path) && !resolves(root, path) + fun brokenLibraryLinks(root: File): List<String> = + listOf("usr/lib", "usr/lib/aarch64-linux-gnu").flatMap { dir -> + val lib = File(root, dir) + val names = lib.list() ?: return@flatMap emptyList() + names.sorted().filter { name -> + val path = File(lib, name).toPath() + Files.isSymbolicLink(path) && !resolves(root, path) + }.map { if (dir == "usr/lib") it else "aarch64-linux-gnu/$it" } } - } private fun resolves(root: File, link: Path): Boolean = try { var path = link diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt index 0a1d338b1..960b0742c 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt @@ -14,17 +14,18 @@ import com.droiddeck.launcher.R class RuntimeInstallService : Service() { @Volatile private var activeWork: Thread? = null - @Volatile private var timedOut = false + @Volatile private var generation = 0L override fun attachBaseContext(newBase: android.content.Context) = super.attachBaseContext(com.droiddeck.launcher.core.AppLanguage.wrap(newBase)) override fun onBind(intent: Intent?): IBinder? = null override fun onTimeout(startId: Int, fgsType: Int) { - timedOut = true + generation++ LinuxRuntimeInstaller.cancelActiveOperation() activeWork?.interrupt() - stopForeground(STOP_FOREGROUND_DETACH) + packageWorkers.keys.forEach { it.interrupt() } + stopForeground(STOP_FOREGROUND_REMOVE) stopSelf() } @@ -32,23 +33,28 @@ class RuntimeInstallService : Service() { if (intent?.action == ACTION_PACKAGE) return holdPackage(startId) val removal = intent?.action == ACTION_REMOVE val release = intent?.let(::releaseFrom) - startForeground(NOTIFICATION_ID, notification(getString(if (LinuxRuntimeInstaller.isMaintaining()) R.string.desktop_removing else if (removal) R.string.rtinst_removing else R.string.user_apps_starting), -1)) + if (!com.droiddeck.launcher.core.ForegroundServices.start(this, NOTIFICATION_ID, + notification(getString(if (LinuxRuntimeInstaller.isMaintaining()) R.string.desktop_removing else if (removal) R.string.rtinst_removing else R.string.user_apps_starting), -1))) { + stopSelf(startId) + return START_NOT_STICKY + } if (release == null && !removal) { stopSelf(startId) return START_NOT_STICKY } + val workGeneration = ++generation activeWork = Thread({ val manager = getSystemService(NotificationManager::class.java) var shown = "" val progress = LinuxRuntimeInstaller.ProgressListener { stage, percent -> - if ("$stage:$percent" != shown) { + if (workGeneration == generation && "$stage:$percent" != shown) { shown = "$stage:$percent" manager?.notify(NOTIFICATION_ID, notification(stage, percent)) } } if (removal) LinuxRuntimeInstaller.attach(progress) else LinuxRuntimeInstaller.install(applicationContext, release!!, progress) - if (!timedOut) { + if (workGeneration == generation) { @Suppress("DEPRECATION") stopForeground(true) stopSelf(startId) @@ -58,11 +64,16 @@ class RuntimeInstallService : Service() { } private fun holdPackage(startId: Int): Int { - startForeground(NOTIFICATION_ID, notification(packageStage, packagePercent, packageTitle)) + if (!com.droiddeck.launcher.core.ForegroundServices.start(this, NOTIFICATION_ID, notification(packageStage, packagePercent, packageTitle))) { + packageWorkers.keys.forEach { it.interrupt() } + stopSelf(startId) + return START_NOT_STICKY + } + val workGeneration = ++generation Thread({ val manager = getSystemService(NotificationManager::class.java) var shown = "" - while (packageHolds.get() > 0) { + while (packageHolds.get() > 0 && workGeneration == generation) { val now = "$packageStage:$packagePercent" if (now != shown) { shown = now @@ -70,9 +81,11 @@ class RuntimeInstallService : Service() { } Thread.sleep(500) } - @Suppress("DEPRECATION") - stopForeground(true) - stopSelf(startId) + if (workGeneration == generation) { + @Suppress("DEPRECATION") + stopForeground(true) + stopSelf(startId) + } }, "package-install").start() return START_NOT_STICKY } @@ -107,6 +120,7 @@ class RuntimeInstallService : Service() { private const val ACTION_REMOVE = "com.droiddeck.launcher.REMOVE_RUNTIME" private const val ACTION_PACKAGE = "com.droiddeck.launcher.INSTALL_PACKAGE" private val packageHolds = java.util.concurrent.atomic.AtomicInteger() + private val packageWorkers = java.util.concurrent.ConcurrentHashMap<Thread, java.util.concurrent.atomic.AtomicInteger>() @Volatile private var packageTitle = "" @Volatile private var packageStage = "" @Volatile private var packagePercent = -1 @@ -129,17 +143,23 @@ class RuntimeInstallService : Service() { if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent) else context.startService(intent) } - /** Keeps the process in the foreground until the returned release runs, so closing the app does not stop the install. */ fun holdForPackage(context: Context, title: String): () -> Unit { packageTitle = title packageStage = title packagePercent = -1 packageHolds.incrementAndGet() + val worker = Thread.currentThread() + packageWorkers.compute(worker) { _, count -> (count ?: java.util.concurrent.atomic.AtomicInteger()).also { it.incrementAndGet() } } val intent = Intent(context, RuntimeInstallService::class.java).setAction(ACTION_PACKAGE) runCatching { if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent) else context.startService(intent) } .onFailure { android.util.Log.w("RuntimeInstallService", "package install runs without a foreground service: $it") } val released = java.util.concurrent.atomic.AtomicBoolean() - return { if (released.compareAndSet(false, true)) packageHolds.decrementAndGet() } + return { + if (released.compareAndSet(false, true)) { + packageHolds.decrementAndGet() + packageWorkers.computeIfPresent(worker) { _, count -> if (count.decrementAndGet() == 0) null else count } + } + } } fun packageProgress(stage: String, percent: Int) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt index b7ca15a18..f40443e02 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt @@ -97,7 +97,8 @@ object UserApps { App( "flatpak:${app.id}", Kind.FLATPAK, readName(custom) ?: app.name, File(custom, "icon.png").takeIf { it.isFile } ?: app.icon ?: FlathubApi.iconUrl(app.id), - app.summary, FlatpakManager.LAUNCHER, listOf(app.id), + app.summary, FlatpakManager.LAUNCHER, FlatpakManager.launchArgs(app), + arch = app.arch.takeIf { FlatpakManager.foreign(app) }, ) } return (scripts + images + flatpaks).sortedBy { it.name.lowercase() } 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 252e06a9e..ef64bfde0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -57,7 +57,7 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart val charging = status == BatteryManager.BATTERY_STATUS_CHARGING val timeToFullS = if (charging && chargeFullUah > chargeNowUah && abs(currentAvgUa) > 0) (chargeFullUah - chargeNowUah) * 3600L / abs(currentAvgUa) else 0L 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" @@ -126,9 +126,6 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart companion object { private const val TAG = "SessionService" - // CURRENT_NOW/CURRENT_AVERAGE are documented as µA, but Samsung and other vendors report mA, - // which made every lifetime estimate 1000x too long. No real µA reading under load is below 10 mA, - // and no mA reading is above 10 A, so anything smaller than 10_000 is taken as mA. private const val MILLIAMP_CEILING = 10_000L internal fun toMicroamps(raw: Long): Long = if (abs(raw) < MILLIAMP_CEILING) raw * 1000L else raw 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 8267edd57..a525bed37 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -24,7 +24,6 @@ object BootMovie { DROIDDECK_60 to "droiddeck-startup-60.webm", ) - // Steam's CEF player only takes WebM codecs; MediaMuxer's WebM writer cannot take AV1. internal val VIDEO_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9, MediaFormat.MIMETYPE_VIDEO_AV1) private val REMUX_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9) internal val AUDIO_CODECS = setOf(MediaFormat.MIMETYPE_AUDIO_OPUS, MediaFormat.MIMETYPE_AUDIO_VORBIS) @@ -39,19 +38,15 @@ object BootMovie { private fun dir(context: Context) = File(context.filesDir, "boot-movie") private fun customFile(context: Context) = File(dir(context), "custom.webm") - /** A movie imported before movies were kept in Steam's own folder. */ internal fun legacyCustomFile(context: Context) = customFile(context) - /** Unpacks one of DroidDeck's own movies on demand; null for anything else. */ internal fun assetFile(context: Context, id: String): File? = ASSETS[id]?.let { extractAsset(context, it) } - /** Picking a movie here makes it Steam's startup movie at the next session, over whatever Steam had picked. */ fun select(context: Context, id: String) { SessionPrefs.setBootMovie(context, id) 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? = @@ -67,7 +62,6 @@ object BootMovie { } } - /** The file the current choice plays from, before any volume or length change. */ fun currentFile(context: Context): File? = sourceOf(context, choice(context)) private fun sourceOf(context: Context, choice: String): File? = when { @@ -84,7 +78,6 @@ object BootMovie { return variant(context, source) } - /** The movie as Steam should get it: with the chosen volume and cut off after the chosen number of seconds. */ private fun variant(context: Context, source: File): File? { val volume = if (SessionPrefs.bootMovieSound(context)) SessionPrefs.bootMovieVolume(context) else 0 val seconds = SessionPrefs.bootMovieSeconds(context) @@ -124,21 +117,15 @@ object BootMovie { internal enum class Step { REMUX_SILENT, REMUX_AUDIO, TRANSCODE_SILENT, TRANSCODE_AUDIO, REGAIN } - /** - * How a movie is processed: the steps tried in order until one works, whether the source goes out untouched, and - * whether it still plays as it is when every step fails. - */ internal class Plan(val passthrough: Boolean, val steps: List<Step>, val sourceOnFailure: Boolean) internal fun plan(volume: Int, seconds: Int): Plan = when { volume == 100 && seconds == 0 -> Plan(true, emptyList(), true) volume == 0 -> Plan(false, listOf(Step.REMUX_SILENT, Step.TRANSCODE_SILENT), false) - // Only a length that could not be applied plays as it is; a volume that could not be applied plays no louder. volume == 100 -> Plan(false, listOf(Step.REMUX_AUDIO, Step.TRANSCODE_AUDIO), true) else -> Plan(false, listOf(Step.REGAIN, Step.REMUX_SILENT, Step.TRANSCODE_AUDIO), false) } - /** Frames beyond 1920x1080 (4K and the like) have made Steam crash while it starts, so such a movie is always scaled down. */ internal const val MAX_LONG_SIDE = 1920 internal const val MAX_SHORT_SIDE = 1080 @@ -150,29 +137,24 @@ object BootMovie { private fun isOversized(source: File): Boolean = probe(source)?.first?.let { oversized(it) } == true - /** A movie that is too large never goes out as it is: it is converted at the chosen volume, and plays nothing if that fails. */ internal fun oversizedPlan(volume: Int): Plan = Plan(false, listOf(if (volume == 0) Step.TRANSCODE_SILENT else Step.TRANSCODE_AUDIO), false) private fun transcodeSilent(source: File, target: File, limitUs: Long) = BootMovieTranscoder.transcode(source, target, keepAudio = false, limitUs = limitUs) {} != null - /** Keeps at most the one processed copy in use, so trying settings never leaves movies piling up. */ private fun prune(folder: File, keep: String?) { folder.listFiles()?.forEach { if (it.name != keep) it.delete() } } - /** - * Takes over a startup movie chosen in Steam's own settings: when Steam's config names a movie it did not name before, - * 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 { val listed = BootMovieLibrary.list(context).firstOrNull { it.id.startsWith(BootMovieLibrary.STEAM_PREFIX) && it.id.endsWith(path) } listed?.id ?: BootMovieLibrary.STEAM_PREFIX + path 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 7c125e819..6fb1f56a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt @@ -9,22 +9,14 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import org.json.JSONObject import java.io.File -/** - * The boot movies a person can pick from: DroidDeck's own two, a movie imported before this list existed, every `.webm` in - * Steam's custom movies folder (imports, SteamDeckRepo and movies put there by hand; all of them can be removed), Steam's own - * three startup movies and the movies bought in Steam's points shop (neither can be removed). - */ object BootMovieLibrary { private const val TAG = "BootMovieLibrary" const val PREFIX = "file:" - /** A movie Steam itself keeps outside its custom movies folder, such as one bought in its points shop: `steam:<path Steam names>`. */ const val STEAM_PREFIX = "steam:" - /** Held while the movie list is read and changed, so two imports at once cannot overwrite each other's entries. */ private val lock = Any() - /** Names DroidDeck stages the chosen movie under; they are copies, not movies of their own. */ internal val STAGED = setOf("bigpicture_startup.webm", "steam_os_startup.webm", "droiddeck-startup.webm") const val SOURCE_DROIDDECK = "droiddeck" @@ -37,28 +29,21 @@ object BootMovieLibrary { internal fun moviesDir(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/config/uioverrides/movies") - /** - * The folders whose custom movies are listed, found and removed: [moviesDir], where imports are put and managed, then the - * x86-64 client's. The order never depends on which client is running, so a saved choice keeps meaning the same file. - */ internal fun customMovieDirs(context: Context): List<File> = listOf(moviesDir(context), File(SessionPrefs.steamRoot(context, "x86_64"), "config/uioverrides/movies")).distinctBy { it.path } - /** Where imported and installed movies are kept for good; Steam's folder holds a copy, which is put back if it goes missing. */ internal fun libraryDir(context: Context) = File(context.filesDir, "boot-movie/library") private fun metaFile(context: Context) = File(context.filesDir, "boot-movie/movies.json") internal fun steamRoot(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam") - /** The running (else selected) Steam client's config, the one whose startup movie choice is read and recorded. */ internal fun steamConfig(context: Context) = File(SessionPrefs.activeSteamRoot(context), "config/config.vdf") private fun thumbsDir(context: Context) = File(context.filesDir, "boot-movie/thumbs") fun idOf(name: String) = PREFIX + name - /** Every Steam client folder: the usual one and the x86-64 client's. */ internal fun steamRoots(context: Context): List<File> = listOf( steamRoot(context), File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/.local/share/Steam"), ).filter { it.isDirectory } @@ -79,13 +64,13 @@ 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()) - /** Changes the movie list one writer at a time; [change] gets the list and returns whether to save it. */ private fun editMeta(context: Context, change: (JSONObject) -> Boolean) = synchronized(lock) { val meta = readMeta(context) if (change(meta)) { @@ -99,7 +84,6 @@ object BootMovieLibrary { } } - /** The post a movie was installed from, if it came from SteamDeckRepo. */ fun repoId(context: Context, name: String): String? = readMeta(context).optJSONObject(name)?.optString("repo")?.takeIf { it.isNotEmpty() } @@ -127,7 +111,6 @@ object BootMovieLibrary { val info = meta.optJSONObject(f.name) val source = info?.optString("source")?.takeIf { it.isNotEmpty() } ?: SOURCE_STEAM val title = info?.optString("title")?.takeIf { it.isNotEmpty() } ?: f.nameWithoutExtension - // Everything in Steam's custom movies folder is the person's own (imported, from SteamDeckRepo or put there by hand). out.add(Entry(idOf(f.name), title, if (source == SOURCE_STEAM) SOURCE_IMPORT else source, f, removable = true)) } val steam = LinkedHashMap<String, File>() @@ -136,7 +119,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,17 +127,18 @@ 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 - // Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it. + if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue 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)) } 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") + 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") @@ -163,13 +147,8 @@ object BootMovieLibrary { private val scans = HashMap<String, Scan>() - /** Forgets the last search for Steam's own movies. */ internal fun forgetScan() = synchronized(scanLock) { scans.clear() } - /** - * Movies Steam keeps outside its custom movies folder, such as ones bought in its points shop: every `.webm` below the - * client's config, cache and user folders. The search is repeated at most every 15 seconds for each client folder. - */ private fun pointShopMovies(root: File): Scan = synchronized(scanLock) { val now = System.currentTimeMillis() scans[root.path]?.let { if (now - it.at < 15_000L) return it } @@ -187,10 +166,8 @@ object BootMovieLibrary { scan } - /** The item number in the name Steam gives a bought movie, `<item number>_<hash>.webm`; null for any other name. */ private fun boughtId(file: File) = Regex("^(\\d+)_").find(file.nameWithoutExtension)?.groupValues?.get(1) - /** What the points shop calls a bought movie, from the list of startup movies Steam keeps in each user's local config. */ private fun boughtTitle(root: File, id: String): String? { val key = "communityitemid\\\":\\\"$id\\\"" val title = Regex("item_title\\\\\":\\\\\"([^\\\\\"]*)") @@ -205,7 +182,6 @@ object BootMovieLibrary { private const val OVERRIDES = "/uioverrides/movies/" - /** Puts back, in Steam's folder, any movie of DroidDeck's that went missing there, such as after the runtime was reset. */ internal fun restore(context: Context) = synchronized(lock) { migrateLegacyMeta(context) val meta = readMeta(context) @@ -218,7 +194,6 @@ object BootMovieLibrary { } } - /** Takes in the movie notes an earlier version kept inside Steam's movies folder, so those movies keep their title and source. */ private fun migrateLegacyMeta(context: Context) { val legacy = File(moviesDir(context), ".droiddeck-movies.json") if (!legacy.isFile) return @@ -234,7 +209,6 @@ object BootMovieLibrary { legacy.delete() } - /** Copies [kept] to [copy] through a staging name, so Steam never sees half a movie. */ private fun mirror(kept: File, copy: File): Boolean { val staged = File(copy.parentFile, copy.name + ".${System.nanoTime()}.staged") return try { @@ -251,10 +225,8 @@ object BootMovieLibrary { fun title(context: Context, id: String): String = list(context).firstOrNull { it.id == id }?.title ?: id - /** The file a movie id plays from; DroidDeck's own movies live in the app and are unpacked on demand. */ fun fileOf(context: Context, entry: Entry): File? = entry.file ?: BootMovie.assetFile(context, entry.id) - /** A free `.webm` name for a movie called [title]; the same title twice gets " (2)", " (3)"… */ fun freeName(context: Context, title: String): String { val base = title.replace(Regex("[^\\p{L}\\p{N} ._()\\-]"), "").replace(Regex("\\s+"), " ").trim().trim('.').take(60).ifEmpty { "movie" } val dirs = customMovieDirs(context) @@ -265,10 +237,6 @@ object BootMovieLibrary { return name } - /** - * Keeps the finished movie [staged] (a file in [libraryDir]) under a free name, copies it into Steam's folder and notes its - * title, source and cover. Returns the name, or null when it could not be kept. Runs one movie at a time. - */ internal fun commit(context: Context, staged: File, title: String, source: String, repoId: String? = null, cover: ByteArray? = null): String? = synchronized(lock) { val name = freeName(context, title) @@ -279,7 +247,6 @@ object BootMovieLibrary { name } - /** Notes a movie that was just put into Steam's folder: what to call it, where it came from and its cover. */ fun register(context: Context, name: String, title: String, source: String, repoId: String? = null, cover: ByteArray? = null) { editMeta(context) { meta -> val info = JSONObject().put("title", title).put("source", source) @@ -297,12 +264,10 @@ object BootMovieLibrary { val removed = when { id == BootMovie.CUSTOM -> { BootMovie.removeCustom(context); true } else -> { - // Only movies in Steam's custom movies folder are ever deleted; Steam's own and points shop movies are left alone. if (!id.startsWith(PREFIX)) return false val name = id.removePrefix(PREFIX) if (name.isEmpty() || name.contains('/') || name.contains('\\') || name in STAGED) return false val copies = customMovieDirs(context).map { File(it, name) } - // A name can exist in more than one client's folder; the entry is the first one found (see customMovieDirs), and only that file is deleted. val target = copies.firstOrNull { it.exists() } val managed = File(libraryDir(context), name) if (readMeta(context).optJSONObject(name) == null && target == null && !managed.isFile) return false @@ -331,14 +296,12 @@ object BootMovieLibrary { return removed } - /** What every processed copy of [source] starts with; the hash of its full path keeps same-named files in different places apart. */ internal fun variantPrefix(source: File) = safe(source.name) + "." + Integer.toHexString(source.absolutePath.hashCode()) + "-" private fun safe(name: String) = name.replace(Regex("[^A-Za-z0-9._-]"), "_") private fun coverName(name: String) = "cover-" + safe(name) - /** How long a movie runs, in whole seconds; 0 when it cannot be read. */ fun durationSeconds(file: File?): Int { if (file == null || !file.isFile) return 0 val retriever = MediaMetadataRetriever() @@ -353,7 +316,6 @@ object BootMovieLibrary { } } - /** The first frame that is not nearly black out of several taken through the movie, else the brightest; a movie may open dark. */ private fun brightestFrame(retriever: MediaMetadataRetriever, durationMs: Long): Bitmap? { var best: Bitmap? = null var bestLuma = -1 @@ -378,11 +340,9 @@ object BootMovieLibrary { private const val MIN_COVER_LUMA = 24 - /** A cover for a movie: the picture SteamDeckRepo gave it, or one frame taken from the video and remembered. */ fun cover(context: Context, entry: Entry): File? { val file = fileOf(context, entry) ?: return null val name = if (entry.id.startsWith(PREFIX)) file.name else entry.id - // Points Shop covers once kept a picture that was not always the movie's own; those files are not used. val given = File(thumbsDir(context), if (entry.source == SOURCE_POINTSHOP) "v2-" + coverName(name) else coverName(name)) if (given.isFile && given.length() > 0L) return given val key = "frame-" + safe(name) + "-v2-" + file.length() + "-" + file.lastModified() + ".jpg" diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt index 3a672dcfd..18ff31169 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt @@ -8,10 +8,6 @@ import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -/** - * What DroidDeck and Steam know about boot movies, in one text file: Steam's startup movie setting, every movie file and - * where it lives, DroidDeck's own state, and a short trace of what each session start did to Steam's config. - */ object BootMovieReport { private const val TAG = "BootMovieReport" private const val MAX_TRACE_LINES = 200 @@ -23,7 +19,6 @@ object BootMovieReport { private fun traceFile(context: Context) = File(context.filesDir, "boot-movie/apply.log") - /** Adds a line to the short trace kept for the report; only the latest lines are kept. */ fun note(context: Context, line: String) { synchronized(lock) { runCatching { @@ -36,7 +31,6 @@ object BootMovieReport { } } - /** Writes the report to Downloads/DroidDeck, or to the app's own folder when that is not possible; null when the report cannot be built or neither folder works. */ fun write(context: Context): File? { val text = runCatching { build(context) }.getOrElse { Log.w(TAG, "could not build the report", it) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt index 92bbbae4e..55f84c006 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt @@ -46,7 +46,6 @@ internal object BootMovieTranscoder { return Result(audioDropped = hadAudio && !muxedAudio) } - /** Copies the video of [source] untouched and gives it its sound again at [gain] of its level, cut to [limitUs]. */ fun regain(source: File, target: File, gain: Float, limitUs: Long): Boolean { val audio = runCatching { encodeAudio(source, gain, limitUs) } .onFailure { Log.w(TAG, "could not change the volume of ${source.name}", it) }.getOrNull() ?: return false @@ -121,7 +120,6 @@ internal object BootMovieTranscoder { internal class Layout(val width: Int, val height: Int, val x: Int, val y: Int, val contentWidth: Int, val contentHeight: Int) - // Steam fills the screen with its startup movie, so portrait clips are pillarboxed into 16:9 instead of cropped. internal fun layout(width: Int, height: Int, rotation: Int): Layout { val (w, h) = if (rotation % 180 != 0) height to width else width to height fun even(v: Double) = maxOf(2, (v.toInt() / 2) * 2) @@ -137,7 +135,6 @@ internal object BootMovieTranscoder { return Layout(canvas, ch, (canvas - cw) / 2, 0, cw, ch) } - /** [pcm] made quieter by [gain] and cut to its first [limitUs] microseconds. */ internal fun scale(pcm: ShortArray, channels: Int, gain: Float, limitUs: Long): ShortArray { val frames = pcm.size / channels val kept = if (limitUs == Long.MAX_VALUE) frames else minOf(frames.toLong(), limitUs * OPUS_RATE / 1_000_000L).toInt() @@ -164,7 +161,6 @@ internal object BootMovieTranscoder { return out } - /** Most decoded audio held in memory at once: about six minutes of 48 kHz stereo. */ private const val MAX_PCM_BYTES = 64 shl 20 private fun encodeAudio(source: File, gain: Float = 1f, limitUs: Long = Long.MAX_VALUE): Audio? { @@ -212,7 +208,6 @@ internal object BootMovieTranscoder { } dec.releaseOutputBuffer(index, false) if (info.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM != 0) break - // Past the length that will be kept there is nothing more to decode; without a length, a track too big to hold is dropped. if (limitUs != Long.MAX_VALUE && info.presentationTimeUs > limitUs) break if (pcm.size() > MAX_PCM_BYTES) { if (limitUs == Long.MAX_VALUE) return null else break } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt new file mode 100644 index 000000000..923ee2999 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -0,0 +1,353 @@ +package com.droiddeck.launcher.session + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.Environment +import android.os.Handler +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import android.util.Log +import android.view.Surface +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.runtime.DesktopCatalog +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.wayland.BottomDesktopCompositorService as Comp +import java.io.File + +/** + * KDE Plasma on the bottom screen while the session keeps the top one: its own compositor process + * ([Comp]) and a second guest started with the session's environment, like the bottom-screen terminal. + */ +object BottomDesktop { + private const val TAG = "BottomDesktop" + const val SCRIPT = "/usr/local/bin/droiddeck-bottom-desktop" + private const val TARGET_SHORT_SIDE = 720f + + enum class State { OFF, STARTING, RUNNING, ENDED, FAILED } + + private class Launch( + val guest: List<String>, + val binds: List<String>, + val sessionRoot: File, + val hostEnvironment: Array<String>, + val root: File, + val sessionDir: File, + val generation: Int, + val installed: Boolean, + ) + + @Volatile private var launch: Launch? = null + private val launchLock = Any() + private val main = Handler(Looper.getMainLooper()) + private val listeners = LinkedHashSet<() -> Unit>() + + @Volatile var state = State.OFF + private set + private var onTextInput: ((Boolean) -> Unit)? = null + private var imeWatcher: android.os.FileObserver? = null + + private var appContext: Context? = null + private var service: Messenger? = null + private var binding: ServiceConnection? = null + private var pendingAttach: Message? = null + /** The desktop guest's proot: -1 when there is none, 0 while it is being started. */ + @Volatile private var guestPid = -1 + + /** The proot to freeze with the session when it pauses. */ + val suspendPid: Int get() = guestPid + private var guestGeneration = 0 + private var outputSize = 0 to 0 + private var cursorShown = false + /** The session generation whose launch the running compositor and guest belong to; -1 when none. */ + private var owner = -1 + + private val replies = Messenger(object : Handler(Looper.getMainLooper()) { + override fun handleMessage(msg: Message) { + if (msg.arg1 != owner) return + when (msg.what) { + Comp.MSG_ATTACHED -> { + service?.let { send(it, Message.obtain(null, Comp.MSG_CURSOR, if (cursorShown) 1 else 0, 0)) } + if (guestPid < 0 && state == State.STARTING) startGuest() + } + Comp.MSG_FIRST_FRAME -> if (state == State.STARTING) setState(State.RUNNING) + } + } + }) + + fun prepare( + guest: List<String>, + binds: List<String>, + sessionRoot: File, + hostEnvironment: Array<String>, + root: File, + sessionDir: File, + generation: Int, + stillCurrent: () -> Boolean, + ) { + val prepared = Launch(ArrayList(guest), ArrayList(binds), sessionRoot, hostEnvironment.copyOf(), root, sessionDir, generation, + DesktopCatalog.desktopInstalled(root)) + synchronized(launchLock) { if (stillCurrent()) launch = prepared } + } + + fun available(): Boolean = + launch?.installed == true && SessionState.running && SessionState.mode != SessionService.MODE_DESKTOP + + /** + * The desktop renders below the panel's resolution: about 720 pixels on the short side keeps + * Plasma's text big enough to touch and its software rendering cheap. A running desktop keeps its size. + */ + fun outputSizeFor(width: Int, height: Int): Pair<Int, Int> { + if ((state == State.STARTING || state == State.RUNNING) && outputSize.first > 0) return outputSize + if (width <= 0 || height <= 0) return 0 to 0 + val scale = maxOf(1f, Math.round(minOf(width, height) / TARGET_SHORT_SIDE * 2f) / 2f) + return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) + } + + fun addListener(listener: () -> Unit) { listeners.add(listener) } + + fun removeListener(listener: () -> Unit) { listeners.remove(listener) } + + /** Called on the main thread when a text field in the desktop gains or loses focus (droiddeck-ime's report). */ + fun setTextInputListener(listener: ((Boolean) -> Unit)?) { onTextInput = listener } + + private fun watchIme(dir: File) { + imeWatcher?.stopWatching() + dir.deleteRecursively() + dir.mkdirs() + @Suppress("DEPRECATION") + imeWatcher = object : android.os.FileObserver(dir.path, MOVED_TO or CLOSE_WRITE) { + override fun onEvent(event: Int, path: String?) { + if (path != "ime.json") return + val focused = runCatching { org.json.JSONObject(File(dir, path).readText()).optBoolean("textField") } + .getOrNull() ?: return + main.post { if (imeWatcher === this) onTextInput?.invoke(focused) } + } + }.also { it.startWatching() } + } + + private fun setState(next: State) { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { setState(next) }; return } + if (state == next) return + Log.i(TAG, "state $state -> $next") + state = next + listeners.toList().forEach { it() } + } + + fun attach(context: Context, surface: Surface, width: Int, height: Int, refreshHz: Float) { + val current = launch + if (current == null || !SessionState.running) { + setState(State.FAILED) + return + } + if (owner != -1 && owner != current.generation) stop(context, owner) + appContext = context.applicationContext + owner = current.generation + outputSize = width to height + val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } + val msg = Message.obtain(null, Comp.MSG_ATTACH).apply { + arg1 = owner + obj = surface + replyTo = replies + data = Bundle().apply { + putString(Comp.KEY_RUNTIME_DIR, runtimeDir(context).path) + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + putFloat(Comp.KEY_REFRESH, refreshHz) + putString(Comp.KEY_LOG, File(dir, "wayland.log").path) + } + } + if (state == State.OFF || state == State.ENDED || state == State.FAILED) setState(State.STARTING) + val target = service + if (target != null) send(target, msg) else { + pendingAttach = msg + bind(context.applicationContext) + } + } + + fun detach() { + pendingAttach = null + service?.let { send(it, Message.obtain(null, Comp.MSG_DETACH)) } + } + + fun sendTouch(action: Int, pointerId: Int, x: Int, y: Int) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_TOUCH, (pointerId shl 8) or (action and 0xff), + (x.coerceIn(0, 0xffff) shl 16) or y.coerceIn(0, 0xffff))) + } + + fun sendPointer(x: Int, y: Int) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_POINTER, x, y)) + } + + /** Button (3), wheel (4) and smooth-scroll (12) input, as `WaylandCompositor.nativeSendSceneInput` takes it. */ + fun sendScene(type: Int, a: Int, b: Int = 0) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_SCENE, type, a).apply { + if (b != 0) data = Bundle().apply { putInt(Comp.KEY_B, b) } + }) + } + + fun showCursor(on: Boolean) { + cursorShown = on + service?.let { send(it, Message.obtain(null, Comp.MSG_CURSOR, if (on) 1 else 0, 0)) } + } + + /** False when the next attach starts a new compositor process, which needs a surface no earlier one used. */ + val connected: Boolean get() = service != null + + fun sendKey(evdev: Int, down: Boolean) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_KEY, evdev, if (down) 1 else 0)) + } + + fun sendText(text: String) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_TEXT).apply { data = Bundle().apply { putString(Comp.KEY_TEXT, text) } }) + } + + fun stop(context: Context, generation: Int? = null) { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { stop(context, generation) }; return } + synchronized(launchLock) { + if (generation != null && launch?.generation == generation) launch = null + } + // A newer session may already have prepared its launch; only the desktop the stopped session started goes. + if (generation != null && owner != generation) return + owner = -1 + val pid = guestPid + guestPid = -1 + guestGeneration++ + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + service?.let { send(it, Message.obtain(null, Comp.MSG_STOP)) } + binding?.let { runCatching { context.applicationContext.unbindService(it) } } + binding = null + service = null + pendingAttach = null + imeWatcher?.stopWatching() + imeWatcher = null + setState(State.OFF) + } + + private fun bind(context: Context) { + if (binding != null) return + val connection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName?, binder: IBinder?) { + if (binding !== this || binder == null) return + val messenger = Messenger(binder) + service = messenger + pendingAttach?.let { send(messenger, it) } + pendingAttach = null + } + + override fun onServiceDisconnected(name: ComponentName?) { + if (binding !== this) return + Log.w(TAG, "the desktop's compositor process died") + service = null + binding = null + runCatching { context.unbindService(this) } + val pid = guestPid + guestPid = -1 + guestGeneration++ + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + imeWatcher?.stopWatching() + imeWatcher = null + owner = -1 + setState(State.FAILED) + } + } + binding = connection + val bound = runCatching { + context.bindService(Intent(context, Comp::class.java), connection, + Context.BIND_AUTO_CREATE or Context.BIND_IMPORTANT) + }.getOrDefault(false) + if (!bound) { + Log.e(TAG, "could not bind the desktop's compositor") + binding = null + setState(State.FAILED) + } + } + + private fun send(target: Messenger, msg: Message) { + runCatching { target.send(msg) }.onFailure { Log.w(TAG, "compositor message ${msg.what} not delivered", it) } + } + + private fun runtimeDir(context: Context) = File(context.filesDir, ".wayland-rt-bottom") + + private fun startGuest() { + val context = appContext ?: return + val current = launch + if (current == null || !SessionState.running || current.generation != owner) { + setState(State.FAILED) + return + } + // A freeze collects its helpers once, when it begins; a guest started after that would run on unfrozen. + if (SessionState.suspended || SessionState.suspending) { + setState(State.OFF) + return + } + val generation = ++guestGeneration + guestPid = 0 + val (width, height) = outputSize + service?.let { send(it, Message.obtain(null, Comp.MSG_NEW_GUEST)) } + Thread({ + if (!DesktopCatalog.desktopInstalled(current.root)) { + Log.e(TAG, "the desktop package is not installed") + main.post { if (generation == guestGeneration) { guestPid = -1; setState(State.FAILED) } } + return@Thread + } + val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } + val runtime = runtimeDir(context).apply { mkdirs() } + val imeDir = File(current.sessionRoot, "bottom-desktop-ime") + main.post { if (generation == guestGeneration) watchIme(imeDir) } + val binds = LinuxRuntime.binds(context, current.sessionRoot, runtime, Environment.getExternalStorageDirectory(), current.binds) + val guest = ArrayList(current.guest).apply { + add("BL_WIDTH=$width") + add("BL_HEIGHT=$height") + add("BL_DEBUG_DIR=" + dir.path) + add("BL_TOP_SESSION=" + SessionState.mode) + add("BL_IME_DIR=" + imeDir.path) + add(SCRIPT) + } + val command = LinuxRuntime.commandWithBinds(context, current.root, binds, guest) + val line = command.joinToString(" ") { it.replace("\\", "\\\\").replace(" ", "\\ ") } + val pid = HostProcess.start(line, current.hostEnvironment, current.root, { status -> + main.post { + if (generation != guestGeneration) return@post + Log.i(TAG, "the desktop ended ($status)") + SessionService.terminalProcessExited(context, guestPid) + guestPid = -1 + guestGeneration++ + setState(if (state == State.RUNNING || status == 0) State.ENDED else State.FAILED) + } + }, null, File(dir, "proot.log")) + main.post { + if (generation != guestGeneration || launch !== current) { + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + if (generation == guestGeneration) guestPid = -1 + return@post + } + if (pid <= 1) { + guestPid = -1 + Log.e(TAG, "the desktop's guest did not start") + setState(State.FAILED) + return@post + } + if (SessionState.suspended || SessionState.suspending) { + SessionService.stopTerminalProcess(context, pid) + guestPid = -1 + guestGeneration++ + setState(State.OFF) + return@post + } + guestPid = pid + SessionService.registerTerminalProcess(context, pid) + Log.i(TAG, "desktop guest pid $pid at ${width}x$height") + } + }, "bottom-desktop-start").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt new file mode 100644 index 000000000..45e0890c5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.session + +import android.app.Notification +import android.content.Context +import android.service.notification.NotificationListenerService +import android.service.notification.StatusBarNotification +import androidx.compose.runtime.mutableStateListOf +import androidx.core.app.NotificationManagerCompat + +data class BottomNotification(val key: String, val app: String, val title: String, val text: String, val postedAt: Long) + +object BottomNotifications { + val items = mutableStateListOf<BottomNotification>() + + fun granted(context: Context): Boolean = + context.packageName in NotificationManagerCompat.getEnabledListenerPackages(context) + + internal fun keep(own: String, pkg: String, ongoing: Boolean, groupSummary: Boolean, title: String, text: String): Boolean = + pkg != own && !ongoing && !groupSummary && (title.isNotBlank() || text.isNotBlank()) + + internal fun add(list: MutableList<BottomNotification>, item: BottomNotification) { + list.removeAll { it.key == item.key } + list.add(0, item) + while (list.size > MAX_ITEMS) list.removeAt(list.lastIndex) + } + + fun clear() = items.clear() + + internal fun post(context: Context, sbn: StatusBarNotification) { + val n = sbn.notification ?: return + val extras = n.extras + val title = extras?.getCharSequence(Notification.EXTRA_TITLE)?.toString().orEmpty() + val text = (extras?.getCharSequence(Notification.EXTRA_BIG_TEXT) ?: extras?.getCharSequence(Notification.EXTRA_TEXT))?.toString().orEmpty() + if (!keep(context.packageName, sbn.packageName, sbn.isOngoing, (n.flags and Notification.FLAG_GROUP_SUMMARY) != 0, title, text)) return + val app = runCatching { + val pm = context.packageManager + pm.getApplicationLabel(pm.getApplicationInfo(sbn.packageName, 0)).toString() + }.getOrDefault(sbn.packageName) + add(items, BottomNotification(sbn.key, app, title, text, sbn.postTime)) + } + + internal fun remove(key: String) { + items.removeAll { it.key == key } + } + + private const val MAX_ITEMS = 30 +} + +class BottomNotificationListener : NotificationListenerService() { + override fun onListenerConnected() { + BottomNotifications.clear() + runCatching { activeNotifications }.getOrNull()?.sortedBy { it.postTime }?.forEach { BottomNotifications.post(this, it) } + } + + override fun onNotificationPosted(sbn: StatusBarNotification) = BottomNotifications.post(this, sbn) + + override fun onNotificationRemoved(sbn: StatusBarNotification) = BottomNotifications.remove(sbn.key) + + override fun onListenerDisconnected() = BottomNotifications.clear() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt new file mode 100644 index 000000000..905f22715 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.session + +import android.content.ContentValues +import android.content.Context +import android.graphics.Bitmap +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.MediaStore +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +data class BottomShot(val uri: Uri?, val file: File?, val takenAt: Long, val steam: Boolean) { + val model: Any get() = uri ?: file!! +} + +object BottomScreenshots { + private const val FOLDER = "DroidDeck" + private const val QUALITY = 95 + private const val LIMIT = 120 + + internal fun fileName(at: Long): String = + "DroidDeck_" + SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date(at)) + ".jpg" + + fun save(context: Context, bitmap: Bitmap, at: Long = System.currentTimeMillis()): Boolean = runCatching { + val name = fileName(at) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + val resolver = context.contentResolver + val values = ContentValues().apply { + put(MediaStore.Images.Media.DISPLAY_NAME, name) + put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg") + put(MediaStore.Images.Media.DATE_TAKEN, at) + put(MediaStore.Images.Media.RELATIVE_PATH, "${Environment.DIRECTORY_PICTURES}/$FOLDER") + put(MediaStore.Images.Media.IS_PENDING, 1) + } + val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return false + val written = runCatching { + resolver.openOutputStream(uri)?.use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } == true + }.getOrDefault(false) + if (!written) { + resolver.delete(uri, null, null) + return false + } + resolver.update(uri, ContentValues().apply { put(MediaStore.Images.Media.IS_PENDING, 0) }, null, null) + true + } else { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + if (!dir.isDirectory && !dir.mkdirs()) return false + val file = File(dir, name) + file.outputStream().use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } + android.media.MediaScannerConnection.scanFile(context, arrayOf(file.path), arrayOf("image/jpeg"), null) + true + } + }.getOrDefault(false) + + fun list(context: Context, runtimeRoot: File): List<BottomShot> = + (own(context) + steam(runtimeRoot)).sortedByDescending { it.takenAt }.take(LIMIT) + + private fun own(context: Context): List<BottomShot> = runCatching { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + return dir.listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty() + .map { BottomShot(null, it, it.lastModified(), steam = false) } + } + val shots = ArrayList<BottomShot>() + context.contentResolver.query( + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + arrayOf(MediaStore.Images.Media._ID, MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED), + "${MediaStore.Images.Media.RELATIVE_PATH} = ?", arrayOf("${Environment.DIRECTORY_PICTURES}/$FOLDER/"), + "${MediaStore.Images.Media.DATE_ADDED} DESC", + )?.use { c -> + while (c.moveToNext() && shots.size < LIMIT) { + val taken = c.getLong(1).takeIf { it > 0L } ?: (c.getLong(2) * 1000L) + shots += BottomShot(android.content.ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, c.getLong(0)), + null, taken, steam = false) + } + } + shots + }.getOrDefault(emptyList()) + + internal fun steam(runtimeRoot: File): List<BottomShot> = + SteamDownloadMonitor.STEAM_HOMES.flatMap { home -> + File(runtimeRoot, "$home/userdata").listFiles { f -> f.isDirectory }.orEmpty().flatMap { account -> + File(account, "760/remote").listFiles { f -> f.isDirectory }.orEmpty().flatMap { app -> + File(app, "screenshots").listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty().toList() + } + } + }.map { BottomShot(null, it, it.lastModified(), steam = true) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index d1aae9d72..b1d70902a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -34,7 +34,6 @@ object ComponentsManager { "Dxvk-gplasync-Linux" to "dxvk", "Vkd3d-proton-Linux" to "vkd3d", ) - // DD_NIGHTLY holds every component in one release; the file name says which. private val NIGHTLY_PREFIXES = linkedMapOf("DD-dxvk-" to "dxvk", "DD-vkd3d-proton-" to "vkd3d", "DD-FEXCore-" to "fex") private val SOURCES = RELEASES.keys.map { NIGHTLIES to it } + (DD_COMPONENTS to DD_NIGHTLY) private val DOWNLOAD_REPOS = listOf(NIGHTLIES, DD_COMPONENTS) @@ -155,8 +154,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 +173,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 +730,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 +762,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 +789,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 +934,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 +957,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) @@ -851,12 +975,9 @@ object ComponentsManager { internal fun assetComp(release: String, name: String): String? = RELEASES[release] ?: if (release == DD_NIGHTLY) NIGHTLY_PREFIXES.entries.firstOrNull { name.startsWith(it.key) }?.value else null - // Per component: the stable packages newest first, then the nightlies. internal val CATALOG_ORDER: Comparator<CatalogItem> = compareBy<CatalogItem> { it.comp }.thenBy { it.release == DD_NIGHTLY }.then(newestFirst { it.file }) - // A nightly DD-<flavor>-<version>[+N]-nightly.wcp pairs with the newest stable <flavor>-<version>[-<rev>]-linux.wcp - // in the same list, so the stable row can offer it behind a Stable/Nightly switch. Unpaired nightlies keep their own row. internal fun nightlyPairs(items: List<CatalogItem>): Map<CatalogItem, CatalogItem> { val stable = items.filter { it.release != DD_NIGHTLY } return items.filter { it.release == DD_NIGHTLY }.mapNotNull { n -> @@ -963,7 +1084,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 73f42cb14..d3471283e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt @@ -7,11 +7,6 @@ import com.droiddeck.launcher.core.Downloader 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. - * 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. - */ object FexCatalog { private const val TAG = "FexCatalog" const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/fex.json" @@ -43,7 +38,6 @@ object FexCatalog { fun cached(context: Context): Build? = runCatching { parse(file(context).readText()) }.getOrNull() - /** Reads fex.json straight from GitHub (a digest never comes from a mirror), at most every ten minutes. */ @Synchronized fun refresh(context: Context, now: Long = System.currentTimeMillis()): Build? { if (now - refreshedAt < REFRESH_MS) return cached(context) @@ -62,7 +56,6 @@ object FexCatalog { return build } - /** For droiddeck-steam-x64: 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 351fe304c..27882ebcf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -13,6 +13,7 @@ object GameEnvironmentStore { private const val GUEST_FILE = "root/.config/droiddeck/game-environment.json" const val DXVK_CONFIG = "dxvkConfig" const val DXVK_CONFIG_GAMES = "dxvkConfigGames" + const val GAME_DEBUG_LOGS = "gameDebugLogs" @Synchronized fun read(context: Context): GameEnvironment.Config { @@ -79,7 +80,19 @@ object GameEnvironmentStore { } @Synchronized - fun publish(context: Context, config: GameEnvironment.Config = read(context)) { + 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), + gameDebugLogsOverride: Boolean? = null, + ) { val resolved = config.copy(shared = GameEnvironment.defaults(SessionPrefs.fexPreset(context), SessionPrefs.forceSsbs(context)) + config.shared) val json = encode(resolved) val dxvk = TextureFiltering.dxvkOptions( @@ -102,6 +115,11 @@ object GameEnvironmentStore { ) } if (gameDxvk.length() > 0) json.put(DXVK_CONFIG_GAMES, gameDxvk) + json.put( + GAME_DEBUG_LOGS, + gameDebugLogsOverride ?: (SessionPrefs.logsEnabled(context) && + SessionPrefs.gameDebugLogsEnabled(context) && SessionPaths.currentSessionLogsRetained(context)), + ) write(File(LinuxRuntime.rootDir(context), GUEST_FILE), json.toString()) } 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 90feec16e..eb5bb4e0d 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,11 @@ 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 + 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) @@ -60,12 +62,14 @@ object GameStorage { fun gamesFolderLibraries(context: Context): List<Library> { if (SessionPrefs.gameStorage(context).isNotEmpty()) return emptyList() val card = effective(context)?.let { canonical(File(it.path)) } + val added = SteamLibraries.list(context).map { canonical(it.host) } val sm = context.getSystemService(StorageManager::class.java) return AddedGames.roots(context).mapNotNull { root -> val host = canonical(root.host) if (!hasInstalledGames(root.host)) return@mapNotNull null if ('"' in root.guest || '\\' in root.guest || !root.host.isDirectory || !root.host.canWrite()) return@mapNotNull null if (card != null && (host == card || host.startsWith("$card/") || card.startsWith("$host/"))) return@mapNotNull null + if (added.any { SteamLibraries.overlaps(it, host) }) return@mapNotNull null val volume = try { sm?.getStorageVolume(root.host)?.getDescription(context) } catch (e: Exception) { null } val name = root.host.name.ifEmpty { context.getString(R.string.gstore_folder) } val label = if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt new file mode 100644 index 000000000..2a32d817e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt @@ -0,0 +1,209 @@ +package com.droiddeck.launcher.session + +import java.nio.ByteBuffer +import java.nio.ByteOrder + +data class Telemetry( + val source: String, + val speedKmh: Float? = null, + val rpm: Float? = null, + val maxRpm: Float? = null, + val gear: String? = null, + val throttle: Float? = null, + val brake: Float? = null, + val lap: Int? = null, + val laps: Int? = null, + val position: Int? = null, + val fuel: Float? = null, + val currentLapS: Float? = null, + val lastLapS: Float? = null, + val bestLapS: Float? = null, + val gLat: Float? = null, + val gLon: Float? = null, + val steer: Float? = null, + val tireTempsC: List<Float>? = null, + val turboBar: Float? = null, + val engineTempC: Float? = null, + val oilTempC: Float? = null, + val lights: Int? = null, +) + +object GameTelemetry { + const val CODEMASTERS_PORT = 20777 + const val FORZA_PORT = 5300 + const val OUTGAUGE_PORT = 4444 + val PORTS = listOf(CODEMASTERS_PORT, FORZA_PORT, OUTGAUGE_PORT) + + val LISTEN_ADDRESS: java.net.InetAddress = java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1)) + + fun parse(port: Int, data: ByteArray, length: Int): Telemetry? = runCatching { + val buf = ByteBuffer.wrap(data, 0, length).order(ByteOrder.LITTLE_ENDIAN) + when (port) { + CODEMASTERS_PORT -> codemasters(buf, length) + FORZA_PORT -> forza(buf, length) + OUTGAUGE_PORT -> outGauge(buf, length) + else -> null + } + }.getOrNull() + + private const val MPS_TO_KMH = 3.6f + private const val GRAVITY = 9.81f + + const val DL_SHIFT = 1 + const val DL_HANDBRAKE = 4 + const val DL_PITSPEED = 8 + const val DL_TC = 16 + const val DL_ABS = 1024 + + private const val CM_LAP_TIME = 1 + private const val CM_SPEED = 7 + private const val CM_THROTTLE = 29 + private const val CM_STEER = 30 + private const val CM_BRAKE = 31 + private const val CM_GEAR = 33 + private const val CM_G_LAT = 34 + private const val CM_G_LON = 35 + private const val CM_LAP = 36 + private const val CM_RPM = 37 + private const val CM_POSITION = 39 + private const val CM_FUEL = 45 + private const val CM_FUEL_CAPACITY = 46 + private const val CM_LAPS = 60 + private const val CM_LAST_LAP = 62 + private const val CM_MAX_RPM = 63 + private const val CM_MIN_FLOATS = 38 + + internal fun codemasters(buf: ByteBuffer, length: Int): Telemetry? { + if (length < CM_MIN_FLOATS * 4) return null + val floats = length / 4 + fun f(i: Int) = if (i < floats) buf.getFloat(i * 4) else 0f + val gear = f(CM_GEAR).toInt() + val capacity = f(CM_FUEL_CAPACITY) + return Telemetry( + source = "Codemasters", + speedKmh = f(CM_SPEED) * MPS_TO_KMH, + rpm = f(CM_RPM) * 10f, + maxRpm = (f(CM_MAX_RPM) * 10f).takeIf { it > 0f }, + gear = when { + gear == 0 -> "N" + gear < 0 || gear == 10 -> "R" + else -> gear.toString() + }, + throttle = f(CM_THROTTLE).coerceIn(0f, 1f), + brake = f(CM_BRAKE).coerceIn(0f, 1f), + lap = f(CM_LAP).toInt() + 1, + laps = f(CM_LAPS).toInt().takeIf { it > 0 }, + position = f(CM_POSITION).toInt().takeIf { it > 0 }, + fuel = if (capacity > 0f) (f(CM_FUEL) / capacity).coerceIn(0f, 1f) else null, + currentLapS = f(CM_LAP_TIME).takeIf { it > 0f }, + lastLapS = f(CM_LAST_LAP).takeIf { it > 0f }, + gLat = f(CM_G_LAT), + gLon = f(CM_G_LON), + steer = f(CM_STEER).coerceIn(-1f, 1f), + ) + } + + private const val FORZA_SLED = 232 + private const val FORZA_FM7 = 311 + private const val FORZA_HORIZON = 324 + private const val FORZA_FM2023 = 331 + private const val HORIZON_SHIFT = 12 + + internal fun forza(buf: ByteBuffer, length: Int): Telemetry? { + if (length < FORZA_SLED) return null + val racing = buf.getInt(0) != 0 + val maxRpm = buf.getFloat(8) + val rpm = buf.getFloat(16) + val dash = when (length) { + FORZA_FM7, FORZA_FM2023 -> FORZA_SLED + FORZA_HORIZON -> FORZA_SLED + HORIZON_SHIFT + else -> -1 + } + if (dash < 0) return Telemetry(source = "Forza", rpm = rpm, maxRpm = maxRpm.takeIf { it > 0f }) + if (!racing) return Telemetry(source = "Forza") + val gear = buf.get(dash + 75).toInt() and 0xFF + val tiresF = (0 until 4).map { buf.getFloat(dash + 24 + it * 4) } + return Telemetry( + source = "Forza", + speedKmh = buf.getFloat(dash + 12) * MPS_TO_KMH, + rpm = rpm, + maxRpm = maxRpm.takeIf { it > 0f }, + gear = if (gear == 0) "R" else gear.toString(), + throttle = (buf.get(dash + 71).toInt() and 0xFF) / 255f, + brake = (buf.get(dash + 72).toInt() and 0xFF) / 255f, + lap = (buf.getShort(dash + 68).toInt() and 0xFFFF) + 1, + position = (buf.get(dash + 70).toInt() and 0xFF).takeIf { it > 0 }, + fuel = buf.getFloat(dash + 44).coerceIn(0f, 1f), + currentLapS = buf.getFloat(dash + 60).takeIf { it > 0f }, + lastLapS = buf.getFloat(dash + 56).takeIf { it > 0f }, + bestLapS = buf.getFloat(dash + 52).takeIf { it > 0f }, + gLat = buf.getFloat(20) / GRAVITY, + gLon = buf.getFloat(28) / GRAVITY, + steer = (buf.get(dash + 76).toFloat() / 127f).coerceIn(-1f, 1f), + tireTempsC = tiresF.takeIf { f -> f.any { it > 0f } }?.map { (it - 32f) * 5f / 9f }, + ) + } + + private const val OUTGAUGE_SIZE = 92 + + internal fun outGauge(buf: ByteBuffer, length: Int): Telemetry? { + if (length < OUTGAUGE_SIZE) return null + val gear = buf.get(10).toInt() and 0xFF + return Telemetry( + source = "OutGauge", + speedKmh = buf.getFloat(12) * MPS_TO_KMH, + rpm = buf.getFloat(16), + gear = when (gear) { + 0 -> "R" + 1 -> "N" + else -> (gear - 1).toString() + }, + throttle = buf.getFloat(48).coerceIn(0f, 1f), + brake = buf.getFloat(52).coerceIn(0f, 1f), + fuel = buf.getFloat(28).coerceIn(0f, 1f), + turboBar = buf.getFloat(20).takeIf { it != 0f }, + engineTempC = buf.getFloat(24).takeIf { it != 0f }, + oilTempC = buf.getFloat(36).takeIf { it != 0f }, + lights = buf.getInt(44).takeIf { buf.getInt(40) != 0 }, + ) + } +} + +object GameStatusFiles { + const val WAR_THUNDER_STATE = "http://127.0.0.1:8111/state" + private const val ELITE_APP = "359320" + private const val ELITE_STATUS = "pfx/drive_c/users/steamuser/Saved Games/Frontier Developments/Elite Dangerous/Status.json" + const val WAR_THUNDER_ROWS = 12 + + internal fun warThunder(json: String): List<Pair<String, String>> { + val state = org.json.JSONObject(json) + if (!state.optBoolean("valid", false)) return emptyList() + return state.keys().asSequence().filter { it != "valid" }.mapNotNull { key -> + val value = state.opt(key) as? Number ?: return@mapNotNull null + key to if (value.toDouble() % 1.0 == 0.0) value.toLong().toString() else "%.1f".format(java.util.Locale.US, value.toDouble()) + }.toList() + } + + fun eliteStatusFile(runtimeRoot: java.io.File, mounts: Map<String, java.io.File>): java.io.File? { + val libraries = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { it.parentFile } + + SteamDownloadMonitor.STEAM_HOMES.map { java.io.File(runtimeRoot, "$it/steamapps") } + return libraries.distinct().map { java.io.File(it, "compatdata/$ELITE_APP/$ELITE_STATUS") }.firstOrNull { it.isFile } + } + + data class Elite(val fuelMain: Double?, val fuelReserve: Double?, val cargo: Double?, val pips: List<Int>?, val legal: String?, val balance: Long?) + + internal fun elite(json: String): Elite? { + val s = org.json.JSONObject(json) + val fuel = s.optJSONObject("Fuel") + val pips = s.optJSONArray("Pips")?.let { a -> (0 until a.length()).map { a.optInt(it) } } + if (fuel == null && pips == null && !s.has("Cargo") && !s.has("Balance")) return null + return Elite( + fuelMain = fuel?.optDouble("FuelMain")?.takeIf { !it.isNaN() }, + fuelReserve = fuel?.optDouble("FuelReservoir")?.takeIf { !it.isNaN() }, + cargo = s.optDouble("Cargo").takeIf { !it.isNaN() }, + pips = pips, + legal = s.optString("LegalState").takeIf { it.isNotEmpty() }, + balance = if (s.has("Balance")) s.optLong("Balance") else null, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt b/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt index 1b5b90db6..fb4b09648 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt @@ -12,54 +12,26 @@ import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File import kotlin.math.abs -/** - * The game's busiest threads named to Android's performance hint service (ADPF) for a session. - * - * Qualcomm's WALT moves a thread to the prime cores only once it fills a mid core (the Odin 3's - * sched_upmigrate is 95), and a game thread that waits on its workers or the GPU for part of each - * frame never does: Factorio's update thread sat at ~68% on cores 0-5 with 6-7 idle, and ran 60% - * faster pinned to 6-7. An app may not raise a thread's uclamp (EPERM without CAP_SYS_NICE), but a - * hint session may name any thread of its UID - the guest's are - and one reported behind its - * target is boosted by the power HAL onto the prime cores: on the Odin 3 a 70%-busy thread of a - * child process went from cores 0-5 to 6-7 and ran 1.7x faster within a second. - * - * Once a second the busiest threads of this UID are read from /proc; one busy more than [ENTER] of - * the time (averaged with the second before, so a loading spike does not count) joins the session, - * and leaves it under [LEAVE] - well below, since it runs faster where it was moved. While the - * session has threads it reports them behind target, which is what asks for the boost: the reports - * carry no frame timing, the busy share is the signal (a capped game's frame interval looks the same - * as a slow one's). Nothing is boosted while the device is critically hot or saves power. - * - * Nor while the game holds the panel's rate or a fraction of it ([holdsPace]): there is nothing to - * gain, and it cost frame pacing - Serious Sam capped at 120 fps ran its boosted main thread on prime - * cores the governor kept at 2.2 GHz, slower than a 3.5 GHz mid core, and 23-25% of its frames fell - * under 90 fps against 2-7% unboosted. A game with no frames (Factorio's benchmark, a loading screen) - * or one falling behind the panel is boosted; one holding pace keeps what it has for [PACE_LEAVE_S] - * seconds and is then let go. - */ object GameThreadHints { private const val TAG = "GameThreadHints" private const val TARGET_NS = 10_000_000L private const val REPORT_MS = 50L - private const val SCAN_EVERY = 20 // reports, so once a second + private const val SCAN_EVERY = 20 private const val ENTER = 0.6 - private const val LEAVE = 0.15 // a capped game's main thread idles to ~30% on a prime core; under 0.3 it hopped back and forth - private const val MAX_THREADS = 2 // one per prime core; a third would be sped up in place instead + private const val LEAVE = 0.15 + private const val MAX_THREADS = 2 private const val TOP_PROCESSES = 3 private const val PACE_WINDOW_S = 3 private const val PACE_LEAVE_S = 10 private const val PACE_TOLERANCE = 0.08 - /** Busy, but not the game: the app itself and the Steam client, whose UI would otherwise hold the prime cores. */ private val NOT_GAMES = setOf("steam", "steamwebhelper") private var worker: Thread? = null - /** At a session's start. The line is for the log. */ @Synchronized fun start(context: Context): String { if (!SessionPrefs.gameThreadHints(context)) return "game thread hints: off" - // Measured on the Odin 3 (CQ8725S) only; another HAL may boost differently, or not at all. if (Build.VERSION.SDK_INT < 31 || Build.SOC_MODEL != "CQ8725S") return "game thread hints: Odin 3 only" val hm = context.getSystemService(PerformanceHintManager::class.java) ?: return "game thread hints: no PerformanceHintManager" @@ -69,13 +41,13 @@ object GameThreadHints { return "game thread hints: watching" } - /** At a session's end. */ @Synchronized fun stop() { worker?.interrupt() worker = null } + @androidx.annotation.RequiresApi(31) private fun run(hm: PerformanceHintManager, pm: PowerManager) { val scanner = Scanner() var session: PerformanceHintManager.Session? = null @@ -92,7 +64,6 @@ object GameThreadHints { val fps = (frames.last() - frames.first()).toDouble() / (frames.size - 1).coerceAtLeast(1) val paced = frames.size > PACE_WINDOW_S && holdsPace(fps, SessionState.refreshHz.toDouble()) pacedFor = if (paced) pacedFor + 1 else 0 - // Not SEVERE: the Odin 3 reports it once its skin reaches 50 C, a couple of minutes into any game. val spare = pm.isPowerSaveMode || pm.currentThermalStatus >= PowerManager.THERMAL_STATUS_CRITICAL val next = when { spare || pacedFor >= PACE_LEAVE_S -> emptySet() @@ -101,7 +72,6 @@ object GameThreadHints { } if (next != boosted) { session = update(hm, session, next) - // No session means a thread exited in between: tried again next second. boosted = if (session == null) emptySet() else next Log.i(TAG, (if (session == null && next.isNotEmpty()) "no session for " else "boosting ") + next.joinToString { "${readName("/proc/$it/comm")}/$it ${((busy[it] ?: 0.0) * 100).toInt()}%" }.ifEmpty { "nothing" } + @@ -119,7 +89,7 @@ object GameThreadHints { } } - /** A new session over [tids] in place of [session]; null for none. The set changes seldom, so no setThreads. */ + @androidx.annotation.RequiresApi(31) private fun update(hm: PerformanceHintManager, session: PerformanceHintManager.Session?, tids: Set<Int>): PerformanceHintManager.Session? { session?.close() if (tids.isEmpty()) return null @@ -131,19 +101,9 @@ object GameThreadHints { } } - /** - * Whether a game presenting [fps] frames a second keeps up with a [refreshHz] panel: within - * [PACE_TOLERANCE] of the rate or of a half, a third or a quarter of it (a 60 fps limiter on 120 Hz). - * A game with next to no frames (a headless benchmark, a loading screen) does not. - */ - // ponytail: a CPU-bound game that happens to run at ~60 fps on a 120 Hz panel reads as limited; narrow the band if that shows up internal fun holdsPace(fps: Double, refreshHz: Double): Boolean = fps >= 10 && refreshHz > 0 && (1..4).any { k -> abs(fps - refreshHz / k) < PACE_TOLERANCE * refreshHz / k } - /** - * The threads to boost next: those already boosted that are still above [LEAVE], then new ones - * above [ENTER], busiest first, at most [MAX_THREADS]. - */ internal fun pick(boosted: Set<Int>, busy: Map<Int, Double>): Set<Int> = busy.entries .filter { (tid, share) -> share >= if (tid in boosted) LEAVE else ENTER } @@ -154,7 +114,6 @@ object GameThreadHints { private fun readName(path: String) = try { File(path).readText().trim() } catch (_: Exception) { "?" } - /** Busy shares of this UID's threads since the last sample: /proc shows an app only its own processes. */ private class Scanner { private val self = Process.myPid() private val hz = Os.sysconf(OsConstants._SC_CLK_TCK).toDouble() @@ -163,7 +122,6 @@ object GameThreadHints { private var lastThread = HashMap<Int, Long>() private var lastBusy = HashMap<Int, Double>() - /** Only the busiest few processes have their threads read, so a second costs a few dozen small reads. */ fun sample(): Map<Int, Double> { val now = System.nanoTime() val seconds = (now - lastNs) / 1e9 @@ -197,7 +155,6 @@ object GameThreadHints { return busy } - /** utime + stime of a /proc stat line; fields counted after the command's closing parenthesis. */ private fun cpuTicks(path: String): Long? = try { val line = File(path).readText() val fields = line.substring(line.lastIndexOf(')') + 2).split(' ') diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt index 7855c4959..40135f08d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -26,6 +26,7 @@ object GpuClockPin { pinned = true "gpu clock: held at its top" } catch (t: Throwable) { + File(context.filesDir, MARKER).delete() Log.w(TAG, "pin", t) "gpu clock: pin failed" } diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt index 449c2bb7f..93214c3d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt @@ -21,7 +21,7 @@ class GpuMemComponent(private val file: File, private val root: File) : SessionP thread = Thread({ while (running) { try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } - if (running && OverlayShown.check(root)) sample()?.let { write(it) } + if (running && (OverlayShown.check(root) || com.droiddeck.launcher.hud.DroidDeckHudHost.showing)) sample()?.let { write(it) } } }, "gpu-mem").apply { isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt index 006350916..019d3b3df 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt @@ -7,10 +7,16 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.io.RandomAccessFile -class GpuStatsComponent(val dir: File) : SessionPart() { +class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { @Volatile private var running = false private var thread: Thread? = null private val feeds = ArrayList<Feed>() + private var layerLoad: LayerLoad? = null + private var memstore: KgslBusy.Reader? = null + private var memstoreLoad: MemstoreLoad? = null + private var memstoreState: String? = null + private var cycleClock: KgslClock.Sampler? = null + @Volatile private var shown = false private class Feed( val file: File, val source: String, val read: () -> Long?, val format: String, val percent: Boolean = false, @@ -24,9 +30,11 @@ class GpuStatsComponent(val dir: File) : SessionPart() { } fun prepare(): Boolean { + sources = "" if (!File(KGSL).exists()) return false val unreadable = MANGOHUD_FILES.any { File(KGSL, it).let { f -> f.exists() && !f.canRead() } } - if (!unreadable && !File(GPUBUSY).canRead()) return false + // Where SELinux hides the kgsl nodes completely (exists() is false too), the layer and cycle-counter feeds stand in. + if (!unreadable && !File(GPUBUSY).canRead() && !loadBlocked()) return false return try { dir.mkdirs() dir.listFiles()?.forEach { java.nio.file.Files.deleteIfExists(it.toPath()) } @@ -34,19 +42,18 @@ class GpuStatsComponent(val dir: File) : SessionPart() { PASSTHROUGH_FILES.forEach { name -> runCatching { File(dir, name).writeText(File(KGSL, name).readText()) } } - loadFeed()?.let { load -> + (loadFeed() ?: blockedLoadFeed())?.let { load -> feeds.add(load) feeds.add(Feed(File(dir, "perf_now"), load.source, load.read, "%-6s\n", percent = true)) } - pick("clock_mhz", clockSources(), "%5d\n") { mhz(it) }?.let { clock -> + (pick("clock_mhz", clockSources(), "%5d\n") { mhz(it) } ?: cycleClockFeed())?.let { clock -> feeds.add(clock) feeds.add(Feed(File(dir, "cur_freq"), clock.source, { clock.read()?.times(1_000_000) }, "%-10d\n")) } pick("temp", tempSources(), "%6d\n") { milliCelsius(it) }?.let { feeds.add(it) } refresh() - Log.i(TAG, "hud: kgsl stats from the session's own: " + MANGOHUD_FILES.joinToString { name -> - "$name " + (feeds.firstOrNull { it.file.name == name }?.source ?: "none") - }) + describeSources() + Log.i(TAG, "hud: kgsl stats from the session's own: $sources") true } catch (e: Exception) { Log.w(TAG, "hud: could not stand in for kgsl stats: $e") @@ -66,19 +73,213 @@ class GpuStatsComponent(val dir: File) : SessionPart() { }, "gpu-stats").apply { isDaemon = true; start() } } - // kgsl's gpubusy can read 0 0 straight after a read, so feeds that share a reader share one read. private fun refresh() { + if (layerLoad != null || cycleClock != null || memstore != null) { + shown = hudShown() + memstore?.run(shown) + if (!shown) memstoreLoad?.pause() + layerLoad?.wanted(shown && memstoreLoad?.working != true) + } val values = HashMap<() -> Long?, Long?>() for (feed in feeds) { if (feed.read !in values) values[feed.read] = feed.read() values[feed.read]?.let { write(feed, it) } } + memstoreLoad?.let { load -> + val state = when { + load.working -> "working" + load.failed -> "failed" + else -> null + } + if (state != memstoreState) { + memstoreState = state + if (load.failed) { + memstore?.close() + memstore = null + Log.i(TAG, "hud: kgsl memstore timestamps never moved; GPU load from Vulkan timing") + } else if (load.working) { + Log.i(TAG, "hud: GPU load from the kgsl memstore (all GPU work)") + } + describeSources() + } + } + } + + private fun describeSources() { + sources = MANGOHUD_FILES.joinToString { name -> + val source = if (name == "gpu_busy_percentage" && memstoreLoad != null) memstoreSource() + else feeds.firstOrNull { it.file.name == name }?.source + "$name " + (source ?: "none") + } + } + + private fun memstoreSource(): String = when { + memstoreLoad?.working == true -> "kgsl memstore ringbuffer timestamps (all GPU work)" + memstoreLoad?.failed == true -> LAYER_SOURCE + else -> "kgsl memstore once its timestamps move; until then $LAYER_SOURCE" } override fun stop() { running = false thread?.interrupt() thread = null + memstore?.close() + memstore = null + memstoreLoad = null + memstoreState = null + layerLoad?.clear() + cycleClock?.close() + cycleClock = null + sources = "" + } + + private fun hudShown(): Boolean = OverlayShown.check(root) || com.droiddeck.launcher.hud.DroidDeckHudHost.showing + + // Android hides the load (kgsl sysfs blocked): the kgsl memstore gives the whole GPU's busy share. The in-game + // Vulkan layer and the compositor time their own GPU work until the memstore timestamps are seen moving, and + // for the whole session where they never move. + private fun blockedLoadFeed(): Feed? { + if (!loadBlocked()) return null + val load = LayerLoad(guestLoadDir(root), extra = ::compositorBusyNs, onWanted = ::compositorTiming) + .also { it.clear(); layerLoad = it } + val sampled = KgslBusy.open()?.let { reader -> + memstore = reader + MemstoreLoad(reader::counts).also { memstoreLoad = it } + } + val read = read@{ + if (!shown) return@read null + val whole = sampled?.percent() + if (sampled?.working == true) whole else load.percent() + } + return Feed(File(dir, "gpu_busy_percentage"), LAYER_SOURCE, read, "%3d %%\n") + } + + // The clock nodes are blocked too: read the GPU's cycle counter from a small GPU job of our own. + private fun cycleClockFeed(): Feed? { + val sampler = KgslClock.open() ?: return null + cycleClock = sampler + // clock_mhz and cur_freq both read this; one GPU job per refresh serves both. + var at = 0L + var last: Long? = null + val read = { + val now = SystemClock.elapsedRealtime() + if (now - at > PERIOD_MS / 2) { at = now; last = if (shown) sampler.mhz()?.toLong() else null } + last + } + return Feed(File(dir, "clock_mhz"), "GPU cycle counter (own GPU job)", read, "%5d\n") + } + + private fun compositorBusyNs(): Long? = + runCatching { com.droiddeck.launcher.wayland.WaylandCompositor.nativeGpuBusyNs() }.getOrNull()?.takeIf { it >= 0 } + + private fun compositorTiming(on: Boolean) { + runCatching { com.droiddeck.launcher.wayland.WaylandCompositor.nativeSetGpuTiming(on) } + } + + /** + * Busy time the layer (tools/gpuload) writes per process, plus [extra] (the compositor's own GPU time), as a share + * of wall time between two reads. + */ + internal class LayerLoad( + private val dir: File, + private val clock: () -> Long = System::nanoTime, + private val extra: () -> Long? = { null }, + private val onWanted: (Boolean) -> Unit = {}, + ) { + private val last = HashMap<String, Long>() + private var lastAt = 0L + private var on = false + + fun wanted(on: Boolean) { + val flag = File(dir, "on") + if (on && !flag.exists()) runCatching { dir.mkdirs(); flag.createNewFile() } + if (!on && flag.exists()) { flag.delete(); last.clear(); lastAt = 0L } + if (on != this.on) onWanted(on) + this.on = on + } + + fun percent(): Long? { + val now = clock() + val files = dir.listFiles { f -> f.name.isNotEmpty() && f.name.all(Char::isDigit) }.orEmpty() + var busy = 0L + val seen = HashSet<String>() + for (file in files) { + val total = runCatching { file.readText().trim().substringBefore(' ').toLong() }.getOrNull() ?: continue + seen += file.name + last[file.name]?.let { if (total >= it) busy += total - it } + last[file.name] = total + if (System.currentTimeMillis() - file.lastModified() > STALE_MS) file.delete() + } + extra()?.let { total -> + seen += EXTRA + last[EXTRA]?.let { if (total >= it) busy += total - it } + last[EXTRA] = total + } + last.keys.retainAll(seen) + val wall = now - lastAt + val first = lastAt == 0L + lastAt = now + if (first || wall <= 0) return null + return (busy * 100 / wall).coerceIn(0, 100) + } + + fun clear() { + dir.listFiles()?.forEach { it.delete() } + last.clear() + lastAt = 0L + if (on) onWanted(false) + on = false + } + + private companion object { + const val EXTRA = "compositor" + } + } + + /** + * Busy share over the last [WINDOW] reads from [KgslBusy] running totals (busy samples, samples, samples with + * new ringbuffer work). Not [working] until new work has been seen; [failed] once [GIVE_UP_SAMPLES] samples + * passed without any. + */ + internal class MemstoreLoad(private val counts: () -> LongArray?) { + var working = false + private set + var failed = false + private set + private val window = ArrayDeque<LongArray>() + private var waited = 0L + + fun percent(): Long? { + if (failed) return null + val now = counts() ?: return null + val previous = window.lastOrNull() + window.addLast(now) + while (window.size > WINDOW + 1) window.removeFirst() + if (previous == null) return null + val fresh = now[1] - previous[1] + if (fresh <= 0) return null + if (!working) { + if (now[2] > previous[2]) { + working = true + } else { + waited += fresh + if (waited >= GIVE_UP_SAMPLES) failed = true + return null + } + } + val base = window.first() + return ((now[0] - base[0]) * 100 / (now[1] - base[1])).coerceIn(0, 100) + } + + /** The totals stop while sampling is off; the next reading starts a new window. */ + fun pause() { + window.clear() + } + + companion object { + const val GIVE_UP_SAMPLES = 5_000L + const val WINDOW = 2 + } } private fun loadFeed(): Feed? { @@ -86,8 +287,6 @@ class GpuStatsComponent(val dir: File) : SessionPart() { return pick("gpu_busy_percentage", LOAD_SOURCES, "%3d %%\n") { it.coerceIn(0, 100) } } - // kgsl publishes busy/total once per ~1 s of GPU-on time and zeroes it on any read while the GPU is - // power-collapsed, so direct pollers mostly see 0; latch each published window instead. private fun latchedBusyFeed(): Feed? { var load = 0L var windowAt = 0L @@ -134,6 +333,24 @@ class GpuStatsComponent(val dir: File) : SessionPart() { private const val LOAD_HOLD_MS = 5_000L private val MANGOHUD_FILES = listOf("gpu_busy_percentage", "clock_mhz", "temp") private val PASSTHROUGH_FILES = listOf("gpu_model", "gpu_chipid") + const val GUEST_LOAD_DIR = "/run/droiddeck-hud/gpu-load" + private const val LAYER_SOURCE = "Vulkan timing: games ($GUEST_LOAD_DIR) + DroidDeck compositor" + + /** Where the running session's GPU feeds come from, for the HUD diagnostics export. */ + @Volatile var sources = "" + private const val STALE_MS = 30_000L + + fun guestLoadDir(root: File) = File(root, GUEST_LOAD_DIR.removePrefix("/")) + + /** True when this app can see kgsl but none of its GPU load nodes (SELinux-blocked, e.g. the Retroid Pocket Duo). */ + fun loadBlocked(): Boolean = File(KGSL).exists() && !File(GPUBUSY).canRead() && LOAD_SOURCES.none { File(it).canRead() } + + /** Turns on the in-game layer (tools/gpuload) where the load is blocked; empty elsewhere. */ + fun guestEnv(root: File): List<String> { + if (!loadBlocked()) return emptyList() + guestLoadDir(root).mkdirs() + return listOf("DROIDDECK_GPU_LOAD=1", "DROIDDECK_GPU_LOAD_DIR=$GUEST_LOAD_DIR") + } private const val QCOM_GPU = "/sys/kernel/gpu" private val LOAD_SOURCES = listOf( "$KGSL/gpu_busy_percentage", "$KGSL/devfreq/gpu_load", "$KGSL/gpuload", "$QCOM_GPU/gpu_busy", diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt new file mode 100644 index 000000000..dad62121a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.session + +import android.util.Log + +/** + * Whole-GPU busy share for Adreno devices whose kgsl load nodes are SELinux-blocked for apps + * (app/src/main/cpp/gpuclock/kgsl_busy.c). It covers every process's GPU work, Android's own composition included. + */ +object KgslBusy { + private const val TAG = "SessionService" + + @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeRun(handle: Long, on: Boolean) + @JvmStatic private external fun nativeRead(handle: Long, out: LongArray): Boolean + @JvmStatic private external fun nativeClose(handle: Long) + + private val loaded: Boolean by lazy { + runCatching { System.loadLibrary("gpuclock") }.onFailure { Log.w(TAG, "hud: gpuclock library: $it") }.isSuccess + } + + class Reader internal constructor(private var handle: Long) : AutoCloseable { + /** Samples once a millisecond while on. */ + @Synchronized fun run(on: Boolean) { + if (handle != 0L) nativeRun(handle, on) + } + + /** Running totals: busy samples, samples, samples in which a ringbuffer started new work. */ + @Synchronized fun counts(): LongArray? { + if (handle == 0L) return null + val out = LongArray(3) + return if (nativeRead(handle, out)) out else null + } + + @Synchronized override fun close() { + if (handle != 0L) nativeClose(handle) + handle = 0L + } + } + + fun open(): Reader? { + if (!loaded) return null + val error = IntArray(1) + val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) + if (handle == 0L) { + Log.i(TAG, "hud: no GPU load from the kgsl memstore (open error ${error[0]})") + return null + } + return Reader(handle) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt new file mode 100644 index 000000000..11c7367ef --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.session + +import android.util.Log + +/** + * GPU clock from the GPU's own cycle counter, for Adreno devices whose kgsl clock nodes are SELinux-blocked for + * apps (app/src/main/cpp/gpuclock/kgsl_clock.c). Each [mhz] call runs one tiny GPU job, so callers sample only + * while a HUD is shown. + */ +object KgslClock { + private const val TAG = "SessionService" + + @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeSample(handle: Long): Int + @JvmStatic private external fun nativeClose(handle: Long) + + private val loaded: Boolean by lazy { + runCatching { System.loadLibrary("gpuclock") }.onFailure { Log.w(TAG, "hud: gpuclock library: $it") }.isSuccess + } + + class Sampler internal constructor(private var handle: Long) : AutoCloseable { + /** MHz, or null when this sample was refused or failed its checks. */ + @Synchronized fun mhz(): Int? = if (handle == 0L) null else nativeSample(handle).takeIf { it > 0 } + + @Synchronized override fun close() { + if (handle != 0L) nativeClose(handle) + handle = 0L + } + } + + /** A sampler that already produced one good reading, or null (the reason goes to the log). */ + fun open(): Sampler? { + if (!loaded) return null + val error = IntArray(1) + val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) + if (handle == 0L) { + Log.i(TAG, "hud: no GPU clock from the cycle counter (open error ${error[0]})") + return null + } + val sampler = Sampler(handle) + val first = (0 until 3).firstNotNullOfOrNull { sampler.mhz() } + if (first == null) { + Log.i(TAG, "hud: GPU cycle counter gave no usable reading") + sampler.close() + return null + } + Log.i(TAG, "hud: GPU clock from the cycle counter ($first MHz now)") + return sampler + } +} 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 a23f23beb..f69983f0d 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 000000000..c5fcf8a73 --- /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 6787d92d2..8d8070f87 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, ) @@ -45,11 +51,13 @@ object NoSteamLaunch { fun addedGame(context: Context, game: Library.SteamGame): AddedGames.Game? { val id = game.appId.toLong() and 0xFFFFFFFFL - return AddedGames.scan(context).firstOrNull { settingsId(it) == id } + val one = game.gameFiles?.let { AddedGames.single(context, it.path) } + return one?.takeIf { settingsId(it) == id } ?: AddedGames.scan(context).firstOrNull { settingsId(it) == id } } 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 +66,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/OfflineMode.kt b/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt index 5632bd27e..f673f282b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt @@ -21,7 +21,6 @@ object OfflineMode { fun account(context: Context): String? { val root = LinuxRuntime.rootDir(context) - // Until its first start the x86-64 client has no sign-in; droiddeck-steam-x64 --sync-login copies the arm64 one. val file = x64LoginUsers(root).takeIf { SessionPrefs.activeSteamClientArch(context) == "x86_64" && it.isFile } ?: loginUsers(root) val text = try { diff --git a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt index 35ac169a7..300306f8c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt @@ -11,7 +11,7 @@ object OrphanReaper { fun release(pid: Int) { kept.remove(pid) } - fun reap(reason: String): Int { + fun reap(reason: String, matching: (String) -> Boolean = { true }): Int { val me = android.os.Process.myPid() val uid = android.os.Process.myUid() val spared = descendants(kept) @@ -21,6 +21,7 @@ object OrphanReaper { if (pid == me || pid <= 1 || pid in spared) return@forEach if (uidOf(pid) != uid) return@forEach val name = try { File(entry, "cmdline").readText().substringBefore('\u0000') } catch (e: Exception) { "?" } + if (!matching(name)) return@forEach try { android.os.Process.killProcess(pid) killed++ diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt deleted file mode 100644 index 3829d9a25..000000000 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt +++ /dev/null @@ -1,183 +0,0 @@ -package com.droiddeck.launcher.session - -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.os.BatteryManager -import android.os.Environment -import android.os.Handler -import android.os.Looper -import android.os.SystemClock -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import com.droiddeck.launcher.R -import com.droiddeck.launcher.gpu.FrameGen -import com.droiddeck.launcher.gpu.Lossless -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("") - private set - var graph by mutableStateOf(FloatArray(0)) - private set - - private val context = context.applicationContext - private val frames = AtomicInteger() - private var lastTick = 0L - 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() - - @Volatile private var showFps = true - @Volatile private var showBattery = true - @Volatile private var showGraph = true - - private val enabled: Boolean - get() = SessionPrefs.hudEnabled(context) - && !File(Environment.getExternalStorageDirectory(), "Download/droiddeck-no-hud").exists() - - private val anyPart: Boolean - get() = showFps || showBattery || showGraph - - var onPresentingWindowChanged: (() -> Unit)? = null - private var lastWindow: String? = null - - private val listener = object : WaylandCompositor.GameListener { - override fun onGameSurface(window: String?, gpuName: String?) { - if (window != null && window != lastWindow) { - lastWindow = window - handler.post { onPresentingWindowChanged?.invoke() } - } - } - 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) - } - } - - private val tick = object : Runnable { - override fun run() { - if (!running) return - val now = SystemClock.elapsedRealtime() - val dt = (now - lastTick).coerceAtLeast(1L) / 1000f - lastTick = now - lastFps = frames.getAndSet(0) / dt - text = readout(lastFps) - if (showGraph) publishGraph() else clearGraph() - handler.postDelayed(this, TICK_MS) - } - } - - fun refresh() { - readOptions() - if (!enabled || !anyPart) { - stop() - return - } - if (!running) start() else { - if (!showGraph) clearGraph() else publishGraph() - text = readout(lastFps) - } - } - - fun start() { - readOptions() - if (!enabled || !anyPart || running) return - running = true - lastTick = SystemClock.elapsedRealtime() - lastFrameNs.set(0L) - frames.set(0) - graphWrite.set(0) - WaylandCompositor.setGameListener(listener) - handler.postDelayed(tick, TICK_MS) - } - - fun stop() { - running = false - handler.removeCallbacks(tick) - WaylandCompositor.clearGameListener(listener) - text = "" - graph = FloatArray(0) - } - - private fun readOptions() { - showFps = SessionPrefs.hudShowFps(context) - showBattery = SessionPrefs.hudShowBattery(context) - showGraph = SessionPrefs.hudShowGraph(context) - } - - private fun readout(fpsValue: Float): String { - val parts = ArrayList<String>(2) - if (showFps) parts.add(line(fpsValue)) - if (showBattery) batteryCelsius(readBatteryDeci())?.let { parts.add(it) } - return parts.joinToString("\n") - } - - private fun readBatteryDeci(): Int { - val sticky = runCatching { - context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) - }.getOrNull() ?: return 0 - return sticky.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) - } - - private fun clearGraph() { - lastFrameNs.set(0L) - graphWrite.set(0) - 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 - } - - private fun line(base: Float): String { - val mode = FrameGen.mode(context) - if (mode.engine == FrameGen.ENGINE_OFF) return fps(base) - val lsfg = mode.engine == FrameGen.ENGINE_LSFG - val name = if (lsfg) "LSFG" else "DD-FG" - val label = FrameGen.label(context, mode) - if (lsfg && Lossless.cacheFile(context)?.isFile != true) return context.getString(R.string.hud_fg_needs_lossless, name) - val stats = try { WaylandCompositor.nativeFrameGenStats() } catch (t: Throwable) { null } - val problem = try { WaylandCompositor.nativeFrameGenProblem() } catch (t: Throwable) { -1 } - return when { - problem == 1 -> context.getString(R.string.hud_fg_unsupported, name) - problem == 2 -> context.getString(R.string.hud_fg_failed, name) - stats != null && stats[3] > 1f -> String.format(Locale.US, "%s %.0f → %.0f fps", label, base, stats[3]) - else -> context.getString(R.string.hud_fg_starting, label, fps(base)) - } - } - - private fun fps(value: Float) = String.format(Locale.US, "%.0f fps", value) - - companion object { - private const val TICK_MS = 1_000L - private const val GRAPH = 128 - - 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 ff3214cf7..2c7110a85 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 42c0deeb6..962291d2c 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/RumbleComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt index f2b1c0a1e..39d99bfa6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt @@ -30,6 +30,7 @@ class RumbleComponent : SessionPart() { private val joyConPairs = HashMap<Long, Motors>() private var preferences: SharedPreferences? = null private var enabled = false + private var quiet = false private var motorThread: HandlerThread? = null private var handler: Handler? = null private val preferenceListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key -> @@ -44,6 +45,11 @@ class RumbleComponent : SessionPart() { if (!enabled) cancelAll() } + @Synchronized fun quiet(on: Boolean) { + quiet = on + if (on) cancelAll() + } + override fun start() { val ctx = app() ?: return val s = try { LocalServerSocket(NAME) } catch (e: Exception) { Log.w(TAG, "rumble: no listener ($e)"); return } @@ -89,7 +95,7 @@ class RumbleComponent : SessionPart() { private fun u16(b: ByteArray, at: Int): Int = (b[at].toInt() and 0xFF) or ((b[at + 1].toInt() and 0xFF) shl 8) @Synchronized private fun buzz(strong: Int, weak: Int, ms: Int, slot: Int) { - if (!enabled) return + if (!enabled || quiet) return val target = target(slot) val previous = playing[slot] if (target !== previous) { @@ -208,8 +214,6 @@ class RumbleComponent : SessionPart() { if (any) manager.vibrate(combined.combine()) else cancel() } - // Some vendors' input-device vibrator HALs (Samsung's) don't halt a Bluetooth pad's running - // effect on cancel(), but a new effect always replaces it. override fun cancel() { val supersede = CombinedVibration.startParallel() ids.forEach { supersede.addVibrator(it, VibrationEffect.createOneShot(1L, 1)) } @@ -249,7 +253,6 @@ class RumbleComponent : SessionPart() { private const val TAG = "SessionService" const val NAME = "droiddeck-rumble" const val MIN_GAP_MS = 50L - // Must match RUMBLE_HOLD_MS in fakeinput_steam.cpp. const val HOLD_MS = 0xFFFF const val HOLD_EFFECT_MS = 2000L const val KEEPALIVE_MS = 1500L 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 9ec21c209..4fc004304 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -7,6 +7,9 @@ import com.droiddeck.launcher.core.SessionLogCapture import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File +import java.io.Writer +import java.nio.file.Files +import java.nio.file.StandardCopyOption import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -16,6 +19,9 @@ object SessionArtifacts { const val COMPLETE_MARKER = ".complete" + private const val RECOVERY_RUNTIME_CAPTURED_MARKER = ".recovery-runtime-captured" + private const val RECOVERY_RUNTIME_EXPIRED_MARKER = ".recovery-runtime-expired" + private val SCRUBBED_MARKER = ".scrubbed-r${LogRedactor.RULES_VERSION}" private val OLD_SCRUBBED_MARKER = Regex("""\.scrubbed-(r?\d+)""") @@ -25,7 +31,6 @@ object SessionArtifacts { private val collectingDone = collectingLock.newCondition() private val collecting = HashSet<File>() - /** Recovery leaves [dir] alone from the stop until [collect] has finished it. */ fun collectionStarted(dir: File) { collectingLock.lock() try { collecting.add(dir) } finally { collectingLock.unlock() } @@ -72,9 +77,9 @@ object SessionArtifacts { copySteamLogs(context, dir, record, steamArch) VacDiagnostics.collect(context, dir) SessionLogCapture.dumpCrashBuffer(File(dir, "crash.log")) - markScrubbed(scrubTree(record)) + val scrubbed = markScrubbed(scrubTree(record)) SessionEvents.record("session.artifacts_collected", mapOf("reason" to reason), dir) - File(dir, COMPLETE_MARKER).writeText("collected: $reason at ${now()}\n") + if (scrubbed) File(dir, COMPLETE_MARKER).writeText("collected: $reason at ${now()}\n") } catch (e: Exception) { Log.w(TAG, "collecting session artifacts", e) } @@ -88,15 +93,10 @@ object SessionArtifacts { }?.toList() ?: return if (dirs.isEmpty()) return LogRedactor.learnFromRuntime(LinuxRuntime.rootDir(context)) - val workers = (Runtime.getRuntime().availableProcessors() / 2).coerceIn(1, 4) - val pool = java.util.concurrent.Executors.newFixedThreadPool(workers) { r -> - Thread({ android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND); r.run() }, "scrub-logs") - } - val done = try { - pool.invokeAll(dirs.map { dir -> java.util.concurrent.Callable { scrubAndMark(dir) } }) - .count { f -> try { f.get() } catch (e: Exception) { false } } - } finally { - pool.shutdown() + var done = 0 + for (dir in dirs) { + if (SessionState.running) break + if (scrubAndMark(dir, stopWhenSessionStarts = true)) done++ } val failed = dirs.size - done Log.i(TAG, "logs: scrubbed $done folders under r${LogRedactor.RULES_VERSION}" + @@ -114,35 +114,121 @@ object SessionArtifacts { private class Record(val dir: File) { val files = HashMap<File, Scrubbed>() var failed = false + var deferred = false } - private fun scrubFolder(dir: File, record: Record) { - dir.listFiles { f -> f.isFile && !f.name.startsWith(".") && f !in record.files }?.forEach { f -> - if (LogRedactor.isBinary(f)) return@forEach - // Too large to rewrite in memory: the folder must not be recorded as scrubbed. - if (!LogRedactor.isText(f)) { record.failed = true; return@forEach } - val done = scrubFile(dir, f) - if (done == null) record.failed = true else record.files[f] = done + private sealed class ScrubResult { + class Done(val scrubbed: Scrubbed) : ScrubResult() + object Failed : ScrubResult() + object Deferred : ScrubResult() + } + + private fun scrubFolder( + dir: File, + record: Record, + shouldStop: () -> Boolean, + beforeReplace: (File) -> Unit, + listFiles: (File) -> Array<File>?, + ): Boolean { + val files = listFiles(dir)?.filter { f -> f.isFile && !f.name.startsWith(".") && f !in record.files } + if (files == null) { + record.failed = true + return true } + for (f in files) { + if (shouldStop()) return false + if (LogRedactor.isBinary(f)) continue + when (val result = scrubFile(dir, f, shouldStop, beforeReplace)) { + is ScrubResult.Done -> record.files[f] = result.scrubbed + ScrubResult.Failed -> record.failed = true + ScrubResult.Deferred -> { + record.failed = true + record.deferred = true + return false + } + } + } + return true } - - private fun scrubFile(dir: File, f: File): Scrubbed? { + private fun scrubFile( + dir: File, + f: File, + shouldStop: () -> Boolean, + beforeReplace: (File) -> Unit, + ): ScrubResult { val tmp = File(dir, ".${f.name}.scrub") return try { val before = Scrubbed(f.length(), f.lastModified()) - tmp.bufferedWriter().use { w -> LogRedactor.scrubTo(f, w) } - val scrubbed = tmp.readBytes() - if (scrubbed.contentEquals(f.readBytes())) { + val scrubbed = tmp.bufferedWriter().use { w -> LogRedactor.scrubTo(f, w, shouldStop) } + if (!scrubbed) { tmp.delete() - before.takeIf { f.length() == it.length && f.lastModified() == it.modified } - } else { - if (!tmp.renameTo(f)) { f.writeBytes(scrubbed); tmp.delete() } - Scrubbed(scrubbed.size.toLong(), f.lastModified()).takeIf { f.length() == it.length } + return ScrubResult.Deferred + } + val scrubbedLength = tmp.length() + when (sameContents(tmp, f, shouldStop)) { + null -> { + tmp.delete() + ScrubResult.Deferred + } + true -> { + tmp.delete() + before.takeIf { f.length() == it.length && f.lastModified() == it.modified } + ?.let { ScrubResult.Done(it) } ?: ScrubResult.Failed + } + false -> { + if (shouldStop()) { + tmp.delete() + return ScrubResult.Deferred + } + beforeReplace(f) + if (f.length() != before.length || f.lastModified() != before.modified) { + tmp.delete() + return ScrubResult.Failed + } + if (!tmp.renameTo(f)) { + tmp.delete() + return ScrubResult.Failed + } + Scrubbed(scrubbedLength, f.lastModified()).takeIf { f.length() == it.length } + ?.let { ScrubResult.Done(it) } ?: ScrubResult.Failed + } } } catch (e: Exception) { Log.w(TAG, "could not scrub ${f.name}", e) tmp.delete() - null + ScrubResult.Failed + } + } + + internal fun sameContents(a: File, b: File, shouldStop: () -> Boolean = { false }): Boolean? { + if (shouldStop()) return null + if (a.length() != b.length()) return false + fun readChunk(input: java.io.InputStream, buffer: ByteArray): Int? { + var count = 0 + while (count < buffer.size) { + if (shouldStop()) return null + val read = input.read(buffer, count, buffer.size - count) + if (shouldStop()) return null + if (read < 0) break + if (read == 0) continue + count += read + } + return count + } + return a.inputStream().buffered().use { left -> + b.inputStream().buffered().use { right -> + val leftBuffer = ByteArray(64 * 1024) + val rightBuffer = ByteArray(64 * 1024) + while (true) { + val leftCount = readChunk(left, leftBuffer) ?: return null + val rightCount = readChunk(right, rightBuffer) ?: return null + if (leftCount != rightCount) return false + if (leftCount == 0) break + if (shouldStop()) return null + for (i in 0 until leftCount) if (leftBuffer[i] != rightBuffer[i]) return false + } + true + } } } @@ -183,10 +269,44 @@ object SessionArtifacts { }.toSet() } - internal fun scrubAndMark(dir: File): Boolean = markScrubbed(scrubTree(Record(dir))) + internal fun scrubAndMark( + dir: File, + stopWhenSessionStarts: Boolean = false, + beforeReplace: (File) -> Unit = {}, + listFiles: (File) -> Array<File>? = { it.listFiles() }, + sessionStarted: () -> Boolean = { SessionState.running }, + ): Boolean { + val shouldStop = { stopWhenSessionStarts && sessionStarted() } + val record = scrubTree( + Record(dir), + listFiles = listFiles, + beforeReplace = beforeReplace, + shouldStop = shouldStop, + ) + if (shouldStop()) { + record.failed = true + record.deferred = true + } + return markScrubbed(record) + } - private fun scrubTree(record: Record): Record { - record.dir.walkTopDown().filter { it.isDirectory }.forEach { scrubFolder(it, record) } + private fun scrubTree( + record: Record, + listFiles: (File) -> Array<File>? = { it.listFiles() }, + beforeReplace: (File) -> Unit = {}, + shouldStop: () -> Boolean = { false }, + ): Record { + for (dir in record.dir.walkTopDown().filter { it.isDirectory }) { + if (shouldStop() || !scrubFolder(dir, record, shouldStop, beforeReplace, listFiles)) { + record.failed = true + record.deferred = true + break + } + } + if (shouldStop()) { + record.failed = true + record.deferred = true + } return record } @@ -196,59 +316,288 @@ object SessionArtifacts { runCatching { File(dir, CLIENT_FILE).writeText("$arch\n") } } - /** The Steam client a session ran, when it recorded one. */ internal fun recordedClient(dir: File): String? = runCatching { File(dir, CLIENT_FILE).readText().trim() }.getOrNull()?.takeIf { it == "arm64" || it == "x86_64" } - private fun copySteamLogs(context: Context, dir: File, record: Record, steamArch: String? = null) { + 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) + private class CopyResult(val files: List<File>, val failed: Boolean, val deferred: Boolean) + + 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, + stopWhenSessionStarts: Boolean = false, + ) { 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 -> - try { - val dst = File(out, src.name) - dst.bufferedWriter().use { w -> - src.forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() } - } - record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) - } catch (e: Exception) { - Log.w(TAG, "could not scrub ${src.name}", e) - } - } + val result = copySessionLogsResult(logs, dir, out) { stopWhenSessionStarts && SessionState.running } + result.files.forEach { dst -> record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) } + record.failed = record.failed || result.failed + record.deferred = record.deferred || result.deferred Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out") } + internal fun copySessionLogs( + logs: File, + dir: File, + out: File, + openWriter: (File) -> Writer = { it.bufferedWriter() }, + ): List<File> = copySessionLogsResult(logs, dir, out, openWriter) { false }.files + + private fun copySessionLogsResult( + logs: File, + dir: File, + out: File, + openWriter: (File) -> Writer = { it.bufferedWriter() }, + shouldStop: () -> Boolean, + ): CopyResult { + val marks = steamLogMarks(dir) + val copied = ArrayList<File>() + var failed = false + var deferred = false + val sources = logs.listFiles { f -> f.isFile } ?: return CopyResult(copied, true, false) + for (src in sources) { + if (shouldStop()) { + failed = true + deferred = true + break + } + val size = src.length() + val from = marks?.let { startOf(src, size, it) } ?: 0L + if (marks != null && from == size || size - from >= MAX_STEAM_LOG) continue + val dst = File(out, src.name) + val staging = File(out, ".${src.name}.copy") + try { + 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 + } + } + val complete = openWriter(staging).use { w -> scrubSteamLog(input, w, shouldStop) } + if (!complete) { + staging.delete() + failed = true + deferred = true + } + } + if (deferred) break + Files.move( + staging.toPath(), + dst.toPath(), + StandardCopyOption.ATOMIC_MOVE, + StandardCopyOption.REPLACE_EXISTING, + ) + copied += dst + } catch (e: Exception) { + staging.delete() + Log.w(TAG, "could not scrub ${src.name}", e) + failed = true + } + } + return CopyResult(copied, failed, deferred) + } + + private fun scrubSteamLog( + input: java.io.InputStream, + out: java.io.Writer, + shouldStop: () -> Boolean, + ): Boolean { + input.reader().use { reader -> + val chunk = CharArray(8192) + val line = StringBuilder(4096) + var oversized = false + var pendingContent = false + var pendingCarriageReturn = false + + fun emit() { + out.write(if (oversized) LogRedactor.OVERSIZED_LINE else LogRedactor.redact(line.toString())) + out.write("\n") + line.setLength(0) + oversized = false + pendingContent = false + } + + while (true) { + if (shouldStop()) return false + val count = reader.read(chunk) + if (count < 0) break + if (shouldStop()) return false + for (i in 0 until count) { + if (shouldStop()) return false + val char = chunk[i] + if (pendingCarriageReturn) { + emit() + pendingCarriageReturn = false + if (char == '\n') continue + } + when (char) { + '\r' -> pendingCarriageReturn = true + '\n' -> emit() + else -> { + pendingContent = true + if (!oversized) { + if (line.length < LogRedactor.MAX_LINE_LENGTH) line.append(char) + else { + line.setLength(0) + oversized = true + } + } + } + } + } + } + if (pendingCarriageReturn || pendingContent) { + if (shouldStop()) return false + emit() + } + } + return true + } + @Synchronized - fun finishAbandoned(context: Context) { + fun finishAbandoned(context: Context, beforeGuestStart: Boolean = false) { + val stopWhenSessionStarts = !beforeGuestStart val parent = LinuxRuntime.logDir(context) val abandoned = parent.listFiles { f -> SessionPaths.isSessionFolder(f) && !File(f, COMPLETE_MARKER).exists() && !inFlight(f) }?.sortedWith(SessionPaths.chronological) ?: return if (abandoned.isEmpty()) return val current = SessionPaths.current() + val latestPreviousSession = SessionPaths.sessionFolders(context).lastOrNull { it != current } LogRedactor.learnFromRuntime(LinuxRuntime.rootDir(context)) - abandoned.forEachIndexed { i, dir -> - if (dir == current) return@forEachIndexed - val newest = i == abandoned.lastIndex + for (dir in abandoned) { + if (stopWhenSessionStarts && SessionState.running) break + if (dir == current) continue + if (beforeGuestStart && dir != latestPreviousSession) continue + val newest = dir == latestPreviousSession try { - File(dir, "ended-without-teardown.txt").writeText( - "This session's process ended without running its own teardown - killed by\n" + - "Android, a native crash, or the device going down - so the files below were\n" + - "gathered when the app next started, at ${now()}.\n" + - "The logs written during the session (session.log, app.log, wayland.log,\n" + - "audio.log, device.txt) were on disk already and are as they were left.\n" + - (if (newest) "" else "Steam's logs are not included: a later session has overwritten them.\n") + - "crash.log holds Android's crash buffer as of the next app start - if this\n" + - "session died of a crash, the entry is in there unless the device rebooted.\n" - ) + val recoveryNote = File(dir, "ended-without-teardown.txt") + val runtimeCaptured = File(dir, RECOVERY_RUNTIME_CAPTURED_MARKER) + val runtimeExpired = File(dir, RECOVERY_RUNTIME_EXPIRED_MARKER) + val recoveryPreviouslyAttempted = recoveryNote.exists() + val recoveryAttempted = recoveryPreviouslyAttempted && + (runtimeCaptured.exists() || runtimeExpired.exists() || !beforeGuestStart) + if (!recoveryAttempted) { + recoveryNote.writeText( + "This session's process ended without running its own teardown - killed by\n" + + "Android, a native crash, or the device going down - so the files below were\n" + + "gathered when the app next started, at ${now()}.\n" + + "The logs written during the session (session.log, app.log, wayland.log,\n" + + "audio.log, device.txt) were on disk already and are as they were left.\n" + + (if (newest) "" else "Steam's logs are not included: a later session has overwritten them.\n") + + "crash.log holds Android's crash buffer as of the next app start - if this\n" + + "session died of a crash, the entry is in there unless the device rebooted.\n" + ) + } + if (recoveryPreviouslyAttempted && !runtimeCaptured.exists() && + (runtimeExpired.exists() || !beforeGuestStart) && + !recoveryNote.readText().contains("runtime capture did not finish")) { + recoveryNote.appendText( + "Steam's logs and VAC evidence are not included: runtime capture did not finish " + + "before its evidence expired.\n" + ) + } + if (recoveryPreviouslyAttempted && !runtimeCaptured.exists() && !beforeGuestStart) { + runtimeExpired.writeText("runtime evidence no longer belongs to this session, at ${now()}\n") + } val record = Record(dir) - if (newest) { - copySteamLogs(context, dir, record, recordedClient(dir)) - VacDiagnostics.collect(context, dir) + if (newest && !recoveryAttempted) { + copySteamLogs( + context, + dir, + record, + steamArch = recordedClient(dir), + stopWhenSessionStarts = stopWhenSessionStarts, + ) + if (!record.deferred && (!stopWhenSessionStarts || !SessionState.running)) { + if (!record.failed && VacDiagnostics.collect(context, dir)) { + try { + runtimeCaptured.writeText("collected at ${now()}\n") + } catch (e: Exception) { + record.failed = true + if (beforeGuestStart) { + runtimeExpired.writeText("runtime capture marker failed, at ${now()}\n") + } + Log.w(TAG, "could not mark runtime capture for $dir", e) + } + } else { + record.failed = true + if (beforeGuestStart) { + runtimeExpired.writeText("runtime capture failed, at ${now()}\n") + } + } + } + } + if (record.deferred || stopWhenSessionStarts && SessionState.running) { + record.failed = true + record.deferred = true + markScrubbed(record) + break + } + val crashLog = File(dir, "crash.log") + if (!crashLog.exists()) { + SessionLogCapture.dumpCrashBuffer(crashLog) + } + if (stopWhenSessionStarts && SessionState.running) { + record.failed = true + record.deferred = true + markScrubbed(record) + break } - SessionLogCapture.dumpCrashBuffer(File(dir, "crash.log")) SessionEvents.record("session.artifacts_recovered", mapOf("newest" to newest), dir) - markScrubbed(scrubTree(record)) + if (beforeGuestStart) return + val scrubbed = scrubTree(record) { stopWhenSessionStarts && SessionState.running } + val marked = markScrubbed(scrubbed) + if (scrubbed.deferred) break + if (!marked) continue File(dir, COMPLETE_MARKER).writeText("collected: late, at next app start, ${now()}\n") Log.i(TAG, "finished the abandoned session folder $dir") } catch (e: Exception) { 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 c0bba6093..1cb526c90 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -7,6 +7,10 @@ object SessionDisplay { const val MATCH_SCREEN = "screen" const val FOLLOW_SCREEN = "follow" const val FOLLOW_MIN_SIDE = 480 + val FOLLOW_SCALES = listOf(1.5f, 2f, 2.5f, 3f, 4f) + const val FOLLOW_CUSTOM = "follow/custom" + const val FOLLOW_SCALE_MAX = 8f + private const val FOLLOW_SCALED_PREFIX = "follow/" const val DEFAULT_RESOLUTION = "720p" private val PRESET_HEIGHTS = listOf(720, 900, 1080) @@ -14,25 +18,49 @@ object SessionDisplay { fun presetHeight(choice: String): Int? = if (choice.endsWith("p")) choice.dropLast(1).toIntOrNull()?.takeIf { it > 0 } else null + fun followScaled(scale: Float): String = FOLLOW_SCALED_PREFIX + formatScale(scale) + + fun formatScale(scale: Float): String = + (Math.round(scale * 10) / 10f).let { if (it % 1f == 0f) it.toInt().toString() else it.toString() } + + fun parseFollowScale(text: String): Float? = + text.trim().replace(',', '.').toFloatOrNull() + ?.let { Math.round(it * 10) / 10f }?.takeIf { it > 1f && it <= FOLLOW_SCALE_MAX } + + fun isFollow(choice: String): Boolean = followScale(choice) != null + + fun followScale(choice: String): Float? = when { + choice == FOLLOW_SCREEN -> 1f + choice.startsWith(FOLLOW_SCALED_PREFIX) -> parseFollowScale(choice.removePrefix(FOLLOW_SCALED_PREFIX)) + else -> null + } + 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) return orient(screenSize(panel)) + followScale(choice)?.let { return orient(scaledDown(screenSize(panel), it)) } + 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> { val panelHeight = minOf(panel.first, panel.second) return PRESET_HEIGHTS.filter { it <= panelHeight }.map { "${it}p" } - .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + FOLLOW_SCALES.map(::followScaled) } - 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, scale: Float = 1f): Pair<Int, Int>? = + if (width <= 0 || height <= 0 || + (if (controlsBelow) width else minOf(width, height)) < FOLLOW_MIN_SIDE) null + else scaledDown(width to height, scale) + + private fun scaledDown(size: Pair<Int, Int>, scale: Float): Pair<Int, Int> = + (Math.round(size.first / scale) and 1.inv()) to (Math.round(size.second / scale) and 1.inv()) const val UNFOLDED_MAX_GAME_SHARE = 0.8f @@ -49,13 +77,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 +108,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 0dab068d8..09122644d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -22,17 +22,19 @@ object SessionFiles { internal val DESKTOP_FILES = arrayOf( "usr/local/bin/droiddeck-desktop" to "usr/local/bin/droiddeck-desktop", + "usr/local/bin/droiddeck-bottom-desktop" to "usr/local/bin/droiddeck-bottom-desktop", "usr/local/bin/droiddeck-gpu" to "usr/local/bin/droiddeck-gpu", "usr/local/bin/droiddeck-desktop-gpu" to "usr/local/bin/droiddeck-desktop-gpu", "usr/local/bin/droiddeck-desktop-window-rules" to "usr/local/bin/droiddeck-desktop-window-rules", + "usr/local/bin/droiddeck-library-perms" to "usr/local/bin/droiddeck-library-perms", + "usr/local/bin/droiddeck-ime" to "usr/local/bin/droiddeck-ime", "usr/local/bin/kwin_wayland_wrapper" to "usr/local/bin/kwin_wayland_wrapper", "usr/lib/firefox/defaults/pref/droiddeck.js" to "usr/lib/firefox/defaults/pref/droiddeck.js", "etc/xdg/autostart/droiddeck-clipboard.desktop" to "etc/xdg/autostart/droiddeck-clipboard.desktop", ) - /** Puts the session's files in place; [startsSession] is true only for the call that starts the Steam session. */ fun stage(context: Context, root: File, startsSession: Boolean = false) { - if (DesktopCatalog.desktopInstalled(root)) try { DesktopCatalog.cleanLegacy(context) } + if (DesktopCatalog.desktopInstalled(root) && !DesktopCatalog.desktopFromPack(root)) try { DesktopCatalog.cleanLegacy(context) } catch (e: Exception) { Log.w(TAG, "LXQt cleanup will retry next session", e) } GameEnvironmentStore.publish(context) WinComponents.publish(context) @@ -58,8 +60,10 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-install" to "usr/local/bin/droiddeck-steam-install", "usr/local/bin/droiddeck-steam-ui-scale" to "usr/local/bin/droiddeck-steam-ui-scale", "usr/local/bin/droiddeck-steam-language" to "usr/local/bin/droiddeck-steam-language", + "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", @@ -68,16 +72,30 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-launch" to "usr/local/bin/droiddeck-steam-launch", "usr/local/bin/droiddeck-desktop-games" to "usr/local/bin/droiddeck-desktop-games", "usr/local/bin/droiddeck-desktop-bookmarks" to "usr/local/bin/droiddeck-desktop-bookmarks", + "usr/local/bin/droiddeck-downloads" to "usr/local/bin/droiddeck-downloads", + "usr/local/bin/droiddeck-root" to "usr/local/bin/droiddeck-root", + "usr/local/bin/droiddeck-text" to "usr/local/bin/droiddeck-text", + "usr/local/bin/droiddeck-snapd" to "usr/local/bin/droiddeck-snapd", + "usr/local/bin/droiddeck-emulators" to "usr/local/bin/droiddeck-emulators", + "usr/local/bin/droiddeck-snap-run" to "usr/local/bin/droiddeck-snap-run", + "usr/local/bin/droiddeck-snap-confine" to "usr/local/bin/droiddeck-snap-confine", + "usr/local/bin/droiddeck-snapctl" to "usr/local/bin/droiddeck-snapctl", + "usr/local/bin/droiddeck-systemd-run" to "usr/local/bin/systemd-run", + "usr/local/bin/droiddeck-snap-cli" to "usr/local/bin/snap", "usr/local/bin/droiddeck-steam-shim" to "usr/local/bin/droiddeck-steam-shim", "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-gog-maintenance" to "usr/local/bin/droiddeck-gog-maintenance", + "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", "usr/local/bin/droiddeck-x64-webhelper" to "usr/local/bin/droiddeck-x64-webhelper", @@ -94,6 +112,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", @@ -133,15 +160,22 @@ object SessionFiles { ) + handModels).map { "usr/local/lib/droiddeck-vr/$it" to "usr/local/lib/droiddeck-vr/$it" } + listOf("usr/local/lib/droiddeck-vr/layer/VK_LAYER_DROIDDECK_vr_implicit.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_vr.json") + // HUD GPU load where Android hides it (GpuStatsComponent.guestEnv turns the layer on). + val gpuLoad = listOf( + "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", + "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_gpu_load.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_gpu_load.json", + ) val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libblsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } } + 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", + "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", - ) + mangoapp + msitools.map { it to it } + vr + fexPreloads).filter { (asset, _) -> + "usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll", + ) + mangoapp + msitools.map { it to it } + vr + gpuLoad + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) } @@ -202,7 +236,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()) @@ -214,6 +252,7 @@ object SessionFiles { Log.e(TAG, "could not write steam-compatibility-label") } writeCjkFontConfig(root, etc) + writeDesktopStrings(context, File(etc, "droiddeck").apply { mkdirs() }) val droiddeckEtc = File(etc, "droiddeck").apply { mkdirs() } val stagedSocket = File(droiddeckEtc, "bwrap-socket.staged") if (!FileUtils.writeString(stagedSocket, BwrapSpawner.socket(context) + "\n") @@ -221,6 +260,12 @@ object SessionFiles { stagedSocket.delete() Log.e(TAG, "could not write bwrap-socket") } + val stagedRoot = File(droiddeckEtc, "root-socket.staged") + if (!FileUtils.writeString(stagedRoot, com.droiddeck.launcher.runtime.RootSpawner.socket(context) + "\n") + || !stagedRoot.renameTo(File(droiddeckEtc, "root-socket"))) { + stagedRoot.delete() + Log.e(TAG, "could not write root-socket") + } BootMovie.syncFromSteam(context) val startupMovie = BootMovie.prepare(context) @@ -235,7 +280,6 @@ object SessionFiles { val movieDir = File(home, "config/uioverrides/movies") val config = File(home, "config/config.vdf") if (startupMovie == null) { - // Nothing to play (a movie whose volume could not be set is never played at another volume), so no earlier copy plays either. for (name in listOf("bigpicture_startup.webm", "steam_os_startup.webm")) { File(movieDir, name).delete() File(movieDir, ".$name.source").delete() @@ -250,21 +294,15 @@ object SessionFiles { "stage session=$startsSession pending=$force choice=${SessionPrefs.bootMovie(context)} movie=${startupMovie?.path} " + "staged=$bigPictureMovieInstalled done=$done steam=${home.path} config: $before -> ${startupMoviePath(config)}", ) + if (startsSession) disableIdleSleep(home) if (!done) allDone = false if (!bigPictureMovieInstalled) allInstalled = false if (done && home.path.contains(".droiddeck-x64") == activeIsX64) seen = if (bigPictureMovieInstalled) BOOT_MOVIE_PATH else "" } - // A pick made in the app is done once a session started with every Steam client's config having it; guest commands run - // before that, and a Steam that is already running writes its own choice back when it exits. if (force && allDone && allInstalled && startsSession) SessionPrefs.setBootMovieApplyNext(context, false) seen?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } - /** - * Points Steam's startup movie back at its own default when it names a movie that is gone: DroidDeck's staged copy that - * could not be prepared, or (when a pick here is waiting) a movie removed from Steam's folder. True when Steam's config - * no longer names a missing movie. - */ internal fun resetMissingStartupMovie(config: File, force: Boolean): Boolean { if (!config.isFile) return true val text = runCatching { config.readText() }.getOrElse { @@ -343,7 +381,6 @@ object SessionFiles { installed = staged.setReadable(true, false) && staged.renameTo(movie) if (installed) { FileUtils.writeString(stamp, identity) - // Steam's picker draws its preview from this picture and does not redraw it when the movie changes. File(directory, name.removeSuffix(".webm") + ".jpg").delete() } } catch (e: Exception) { @@ -360,10 +397,6 @@ object SessionFiles { internal const val BOOT_MOVIES_DIR = "/uioverrides/movies/" internal const val BOOT_MOVIE_PATH = "/uioverrides/movies/bigpicture_startup.webm" - /** - * Steam's startup movie setting is the `StartupMovie` section inside its `Customization` section; the one under the Steam - * settings is where older clients kept it, and DroidDeck still keeps it in step. - */ private fun customizationMovie(text: String): VdfBlock? { var from = 0 while (true) { @@ -373,7 +406,6 @@ object SessionFiles { } } - /** The older `StartupMovie` section: the first one that is not inside `Customization`. */ private fun olderMovie(text: String): VdfBlock? { val inside = customizationMovie(text) var from = 0 @@ -384,17 +416,16 @@ object SessionFiles { } } - /** The section Steam reads: the one under `Customization` when there is one. */ 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. */ internal fun startupMovieBlock(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val parts = listOfNotNull( @@ -404,7 +435,6 @@ object SessionFiles { return parts.takeIf { it.isNotEmpty() }?.joinToString("\n") } - /** The `Customization` section of Steam's config with the lines before it, for the report; null when there is none. */ internal fun customizationBlock(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val customization = findObject(text, "Customization", 0, text.length) ?: return null @@ -417,7 +447,6 @@ object SessionFiles { return text.replaceRange(movie.keyStart, movie.close + 1, setScalar(setScalar(block, "MovieID", "0", newline), "LocalPath", path, newline)) } - /** True when Steam's config selects DroidDeck's staged movie once this returns. */ internal fun ensureStartupMovieDefault(config: File, force: Boolean = false): Boolean { val path = BOOT_MOVIE_PATH val legacyPath = "/uioverrides/movies/droiddeck-startup.webm" @@ -444,7 +473,6 @@ object SessionFiles { return false } } - // Later sections first, so the positions of earlier ones stay valid. val targets = listOfNotNull(customizationMovie(text), olderMovie(text)).sortedByDescending { it.keyStart } for (target in targets) text = pointAt(text, target, path, newline) if (olderMovie(text) == null) { @@ -486,7 +514,38 @@ object SessionFiles { } } - /** Adds the `Customization` section Steam reads, next to the `Software` section, when the config has none. */ + private val IDLE_SLEEP_TIMERS = listOf("IdleSuspendBatterySeconds", "IdleSuspendACSeconds") + + internal fun disableIdleSleep(steamHome: File): Boolean { + val config = File(steamHome, "config/config.vdf") + val text = runCatching { config.readText() }.getOrNull() ?: return false + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + val steam = findSteamBlock(text) ?: return false + val system = findObject(text, "system", steam.open + 1, steam.close) + val updated = if (system != null) { + val block = text.substring(system.keyStart, system.close + 1) + text.replaceRange(system.keyStart, system.close + 1, IDLE_SLEEP_TIMERS.fold(block) { acc, key -> setScalar(acc, key, "0", newline) }) + } else { + val lineStart = text.lastIndexOf('\n', steam.close).let { if (it < 0) 0 else it + 1 } + val indent = text.substring(lineStart, steam.close).takeWhile { it == '\t' || it == ' ' } + "\t" + val section = (listOf(indent + "\"system\"", indent + "{") + + IDLE_SLEEP_TIMERS.map { "$indent\t\"$it\"\t\t\"0\"" } + (indent + "}")).joinToString(newline) + newline + text.substring(0, lineStart) + section + text.substring(lineStart) + } + val staged = File(config.parentFile, config.name + ".staged") + return try { + if (updated != text) { + staged.writeText(updated) + if (!staged.renameTo(config)) { staged.delete(); return false } + } + true + } catch (e: Exception) { + staged.delete() + Log.w(TAG, "could not disable Steam's idle sleep", e) + false + } + } + private fun withCustomization(text: String, path: String, newline: String): String { val root = findObject(text, "InstallConfigStore", 0, text.length) ?: return text val lineStart = text.lastIndexOf('\n', root.close).let { if (it < 0) 0 else it + 1 } @@ -556,13 +615,28 @@ object SessionFiles { fun logDirectory(context: Context): File = LinuxRuntime.logDir(context).apply { mkdirs() } - /** - * Registers the Android system fonts (which include CJK faces such as Noto Sans CJK / - * MiSans) with the container's fontconfig, so the Steam Deck UI (CEF/webkit renderer) - * resolves Chinese/Japanese glyphs instead of showing tofu / mojibake. - * The fonts themselves are bind-mounted by LinuxRuntime.bindSystemFonts() into - * /usr/local/share/fonts/android; here we only need to point fontconfig at them. - */ + private val DESKTOP_STRINGS = listOf( + "desktop_restore_title" to R.string.desktop_restore_title, + "desktop_restore_body" to R.string.desktop_restore_body, + "desktop_restore_done_title" to R.string.desktop_restore_done_title, + "desktop_restore_done_body" to R.string.desktop_restore_done_body, + "desktop_restore_failed_title" to R.string.desktop_restore_failed_title, + "desktop_restore_failed_body" to R.string.desktop_restore_failed_body, + ) + + private fun writeDesktopStrings(context: Context, dir: File) { + val text = DESKTOP_STRINGS.joinToString("") { (key, id) -> + key + "=" + context.getString(id).replace("\\", "\\\\").replace("%", "%%").replace("\n", "\\n") + "\n" + } + val target = File(dir, "strings") + if (FileUtils.readString(target) == text) return + val staged = File(dir, "strings.staged") + if (!FileUtils.writeString(staged, text) || !staged.renameTo(target)) { + staged.delete() + Log.e(TAG, "could not write desktop strings") + } + } + private fun writeCjkFontConfig(root: File, etc: File) { try { val confDir = File(etc, "fonts/conf.d").apply { mkdirs() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionLaunchFailure.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLaunchFailure.kt new file mode 100644 index 000000000..22d8b952c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLaunchFailure.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.session + +enum class SessionLaunchFailure { + STEAM_ILLEGAL_INSTRUCTION, + VULKAN_DEVICE_MISSING; + + companion object { + private val ANSI = Regex("\u001b\\[[0-?]*[ -/]*[@-~]") + private val STEAM_EXIT = Regex("== steam exited rc=(\\d+)") + + fun find(lines: Sequence<String>): SessionLaunchFailure? { + var steamStarted = false + var illegalInstruction = false + var missingDevice = false + lines.forEach { raw -> + val line = ANSI.replace(raw, "").trim() + when { + line.startsWith("== droiddeck-session ") -> { + steamStarted = false + illegalInstruction = false + missingDevice = false + } + line.startsWith("== STEP ") && line.contains("starting the Steam client") -> { + steamStarted = true + illegalInstruction = false + } + STEAM_EXIT.matches(line) && steamStarted -> + illegalInstruction = STEAM_EXIT.matchEntire(line)?.groupValues?.get(1) == "132" + line.startsWith("[gamescope]") && line.contains("vulkan:") -> when { + line.contains("failed to find physical device") -> missingDevice = true + line.contains("selecting physical device") -> missingDevice = false + } + } + } + return when { + illegalInstruction -> STEAM_ILLEGAL_INSTRUCTION + missingDevice -> VULKAN_DEVICE_MISSING + else -> null + } + } + } +} 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 b44c5c626..185550370 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,11 +64,11 @@ 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 } - /** Every entry is scrubbed line by line, whatever its size: a raw copy can carry tokens out of the device. */ private fun addEntry(z: ZipOutputStream, name: String, f: File) { z.putNextEntry(ZipEntry(name)) val w = z.bufferedWriter() @@ -88,6 +90,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/SessionPaths.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt index e67092c1d..6f335f231 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt @@ -44,6 +44,9 @@ object SessionPaths { fun current(): File? = dir + fun currentSessionLogsRetained(context: Context): Boolean = + dir?.let { it.parentFile == SessionFiles.logDirectory(context) } ?: true + fun lastEnded(): File? = ended?.takeIf { it.isDirectory } @Synchronized 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 a0ff19de6..fd5d1f4bd 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) @@ -21,6 +21,8 @@ object SessionPrefs { private const val LEGACY_SUSPEND_DOWNLOADS = "downloads" private const val STEAM_DOWNLOADS_IN_BACKGROUND = "steamDownloadsInBackground" private const val DECKY_ZIP_WARNING_SEEN = "deckyZipWarningSeen" + private const val SLOW_USB_WARNING_OFF = "slowUsbWarningOff" + private const val SLOW_USB_DISMISSED = "slowUsbDismissed" const val CONTROLLER_DECK = "deck" const val CONTROLLER_XBOX360 = "xbox360" @@ -44,21 +46,34 @@ 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, ) fun orientation(context: Context): Int = - prefs(context).getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + prefs(context).getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) .takeIf { value -> orientationOptions.any { it.first == value } } - ?: ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE + ?: ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE fun setOrientation(context: Context, orientation: Int) { require(orientationOptions.any { it.first == orientation }) 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) { @@ -71,6 +86,69 @@ object SessionPrefs { prefs(context).edit().putBoolean("animations", on).apply() } + fun dualScreenMode(context: Context): String = + prefs(context).getString("dualScreenMode", null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } + ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + + fun setDualScreenMode(context: Context, mode: String) { + prefs(context).edit().putString("dualScreenMode", mode).apply() + } + + fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) + + fun setSecondScreenPanel(context: Context, mode: String) { + prefs(context).edit().putString("secondScreenPanel", mode).apply() + } + + /** The bottom-screen desktop takes touch as a trackpad unless the user switched it to direct touch. */ + fun bottomDesktopDirectTouch(context: Context): Boolean = prefs(context).getBoolean("bottomDesktopDirectTouch", false) + + fun setBottomDesktopDirectTouch(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bottomDesktopDirectTouch", on).apply() + } + + fun statsStrip(context: Context): String? = prefs(context).getString("statsStrip", null) + + fun setStatsStrip(context: Context, id: String) { + prefs(context).edit().putString("statsStrip", id).apply() + } + + fun statsSpeedUnit(context: Context): String? = prefs(context).getString("statsSpeedUnit", null) + + fun setStatsSpeedUnit(context: Context, id: String) { + prefs(context).edit().putString("statsSpeedUnit", id).apply() + } + + fun statsDash(context: Context): String? = prefs(context).getString("statsDash", null) + + fun setStatsDash(context: Context, id: String) { + prefs(context).edit().putString("statsDash", id).apply() + } + + fun telemetryAuto(context: Context): Boolean = prefs(context).getBoolean("telemetryAuto", true) + + fun setTelemetryAuto(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("telemetryAuto", on).apply() + } + + fun telemetryOff(context: Context): Set<String> = prefs(context).getStringSet("telemetryOff", null)?.toSet().orEmpty() + + fun setTelemetryOff(context: Context, keys: Set<String>) { + prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).apply() + } + + fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) + + fun setDualScreenLauncher(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("dualScreenLauncher", on).apply() + } + + fun dualScreenSessionControls(context: Context): Boolean = prefs(context).getBoolean("dualScreenSessionControls", true) + + fun setDualScreenSessionControls(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("dualScreenSessionControls", on).apply() + } + fun gameStoresEnabled(context: Context): Boolean = prefs(context).getBoolean("gameStoresEnabled", true) fun setGameStoresEnabled(context: Context, on: Boolean) { @@ -83,22 +161,8 @@ object SessionPrefs { prefs(context).edit().putString("gameStoresSpeedTier", tier).apply() } - /** - * Hidden A/B switch for the Epic installer: "adaptive" (default: native parallel fetch written - * straight into staged files), "lookahead" (the native ordered-lookahead engine that caches each - * chunk and copies it into staged files), "batch" (the older whole-cache native fetch, then - * native assembly; needs about twice the game's size free) or "java" (the bounded Java writer). - * No UI; set it in the `session` preferences for benchmarks. - */ 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) { @@ -113,10 +177,40 @@ object SessionPrefs { } fun storesView(context: Context): String = - prefs(context).getString("storesView", null)?.takeIf { it in STORES_VIEWS } ?: STORES_VIEWS.first() + prefs(context).getString("storesView", null)?.takeIf { it in STORES_VIEWS } ?: DEFAULT_STORES_VIEW fun setStoresView(context: Context, view: String) { - prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else STORES_VIEWS.first()).apply() + prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else DEFAULT_STORES_VIEW).apply() + } + + fun libraryCardLevel(context: Context): Int = prefs(context).getInt("libraryCardLevel", 2) + + fun setLibraryCardLevel(context: Context, level: Int) { + prefs(context).edit().putInt("libraryCardLevel", level).apply() + } + + fun libraryShowTitle(context: Context): Boolean = prefs(context).getBoolean("libraryShowTitle", true) + + fun setLibraryShowTitle(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowTitle", show).apply() + } + + fun libraryShowSize(context: Context): Boolean = prefs(context).getBoolean("libraryShowSize", true) + + fun setLibraryShowSize(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowSize", show).apply() + } + + fun railLabels(context: Context): Boolean = prefs(context).getBoolean("railLabels", false) + + fun setRailLabels(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("railLabels", show).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)) @@ -135,9 +229,7 @@ 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" + const val DEFAULT_STORES_VIEW = "capsules" fun storesInstallTarget(context: Context): String = prefs(context).getString("storesInstallTarget", "") ?: "" @@ -145,20 +237,47 @@ object SessionPrefs { prefs(context).edit().putString("storesInstallTarget", path).apply() } - /** Empty means follow the app/system language for GOG and Epic installs. */ fun storesInstallLanguage(context: Context): String = prefs(context).getString("storesInstallLanguage", "") ?: "" fun setStoresInstallLanguage(context: Context, code: String) { 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) { prefs(context).edit().putInt("gameStoresParallel", count.coerceIn(1, 3)).apply() } - fun hudEnabled(context: Context): Boolean = prefs(context).getBoolean(hudKey(context), !mangoappSession(context)) + fun hudEnabled(context: Context): Boolean = prefs(context).getBoolean(hudKey(context), false) fun setHudEnabled(context: Context, on: Boolean) { prefs(context).edit().putBoolean(hudKey(context), on).apply() @@ -196,6 +315,20 @@ object SessionPrefs { prefs(context).edit().putInt("hudOpacity", percent.coerceIn(HUD_OPACITY_RANGE)).apply() } + fun droidDeckHudConfig(context: Context): String? = prefs(context).getString("__KEEP_droidDeckHud__", null) + + fun setDroidDeckHudConfig(context: Context, config: String) { + prefs(context).edit().putString("__KEEP_droidDeckHud__", config).apply() + } + + fun droidDeckHudPosition(context: Context): Pair<Float, Float>? = + prefs(context).getString("__KEEP_droidDeckHudPos__", null)?.split(',')?.mapNotNull { it.toFloatOrNull() } + ?.takeIf { it.size == 2 }?.let { it[0] to it[1] } + + fun setDroidDeckHudPosition(context: Context, x: Float, y: Float) { + prefs(context).edit().putString("__KEEP_droidDeckHudPos__", "$x,$y").apply() + } + const val HUD_COLOR_MINT = "mint" val HUD_COLORS = listOf(HUD_COLOR_MINT, "white", "sky", "amber", "violet") val HUD_OPACITY_RANGE = 30..100 @@ -206,16 +339,28 @@ 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 setLowLatency(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("lowLatency", on).apply() } - fun lowLatencyTouch(context: Context): Boolean = prefs(context).getBoolean("lowLatencyTouch", false) + fun evdevMouse(context: Context): Boolean = prefs(context).getBoolean("evdevMouse", false) - fun setLowLatencyTouch(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("lowLatencyTouch", on).apply() + fun setEvdevMouse(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("evdevMouse", on).apply() + } + + fun directCursor(context: Context): Boolean = prefs(context).getBoolean("directCursor", false) + + fun setDirectCursor(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("directCursor", on).apply() + } + + fun backHold(context: Context): Boolean = prefs(context).getBoolean("backHold", true) + + fun setBackHold(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("backHold", on).apply() } fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) @@ -224,6 +369,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" @@ -263,6 +418,19 @@ object SessionPrefs { const val GPU_DRIVERS_MANUAL = "manual" const val GPU_DRIVERS_MIX = "mix" + const val TP_UBWC_AUTO = "auto" + const val TP_UBWC_ON = "on" + const val TP_UBWC_OFF = "off" + + fun tpUbwcMode(context: Context): String = + prefs(context).getString("tpUbwcMode", TP_UBWC_AUTO) + ?.takeIf { it in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF) } ?: TP_UBWC_AUTO + + fun setTpUbwcMode(context: Context, mode: String) { + require(mode in setOf(TP_UBWC_AUTO, TP_UBWC_ON, TP_UBWC_OFF)) + prefs(context).edit().putString("tpUbwcMode", mode).commit() + } + fun gpuDriverMode(context: Context): String = prefs(context).getString("gpuDriverMode", GPU_DRIVERS_AUTO) ?: GPU_DRIVERS_AUTO @@ -294,16 +462,42 @@ object SessionPrefs { position.takeIf { it in listOf("top", "bottom", "center") } ?: "center").apply() } - /** - * After a game launched from the front end (or another launcher's link) closes, the client - * exits cleanly and the session returns there, instead of staying in Big Picture. - */ fun returnAfterGame(context: Context): Boolean = prefs(context).getBoolean("returnAfterGame", true) fun setReturnAfterGame(context: Context, on: Boolean) { prefs(context).edit().putBoolean("returnAfterGame", on).apply() } + private fun shaderPrecacheApplied(context: Context) = + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.bl-shader-precache-applied") + + fun pendingShaderPrecache(context: Context): Boolean? { + val prefs = prefs(context) + if (!prefs.contains("shaderPrecache")) { + if (steamConfig(context).exists()) return null + prefs.edit().putBoolean("shaderPrecache", false).apply() + } + val on = prefs.getBoolean("shaderPrecache", true) + val applied = shaderPrecacheApplied(context) + val written = runCatching { applied.readText().trim() }.getOrNull() ?: return on + applied.delete() + if (written != if (on) "1" else "0") return on + prefs.edit().remove("shaderPrecache").apply() + return null + } + + fun setShaderPrecache(context: Context, on: Boolean) { + shaderPrecacheApplied(context).delete() + prefs(context).edit().putBoolean("shaderPrecache", on).apply() + } + + private fun steamConfig(context: Context) = + java.io.File(steamRoot(context, steamClientArch(context)), "config/config.vdf") + + fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context) + ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache( + steamConfig(context).readText()) }.getOrDefault(true) + fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false) fun setStretch16x9(context: Context, on: Boolean) { @@ -353,30 +547,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() @@ -388,7 +571,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("noXalia", on).apply() } - fun fastSync(context: Context): Boolean = prefs(context).getBoolean("fastSync", false) + fun fastSync(context: Context): Boolean = prefs(context).getBoolean("fastSync", true) fun setFastSync(context: Context, on: Boolean) { prefs(context).edit().putBoolean("fastSync", on).apply() @@ -423,6 +606,17 @@ object SessionPrefs { .apply() } + fun applyNtsyncDefault(context: Context) { + val prefs = prefs(context) + if (prefs.getBoolean("ntsyncDefaultV1", false)) return + prefs.edit() + .putBoolean("fastSync", true) + .putBoolean("fsyncFirst", false) + .putBoolean("syncFallback", true) + .putBoolean("ntsyncDefaultV1", true) + .apply() + } + fun syncFallback(context: Context): Boolean = prefs(context).getBoolean("syncFallback", true) fun setSyncFallback(context: Context, on: Boolean) { @@ -435,13 +629,30 @@ 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) { prefs(context).edit().putBoolean("gpuClockPin", on).apply() } - /** Whether the game's busiest threads are named to the power HAL for a boost (GameThreadHints). */ fun gameThreadHints(context: Context): Boolean = prefs(context).getBoolean("gameThreadHints", true) fun prootNoSeccomp(context: Context): Boolean = prefs(context).getBoolean("prootNoSeccomp", false) @@ -456,6 +667,16 @@ object SessionPrefs { prefs(context).edit().putBoolean("prootFastPath", on).apply() } + fun cursorComposite(context: Context): Boolean = prefs(context).getBoolean("cursorComposite", false) + + fun setCursorComposite(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("cursorComposite", on).apply() + } + + @JvmStatic + fun allowStockProot(context: Context): Boolean = + context.getExternalFilesDir(null)?.let { File(it, "droiddeck-stock-proot").isFile } == true + const val DEFAULT_GUEST_HOSTNAME = "DroidDeck" @JvmStatic @@ -498,6 +719,8 @@ object SessionPrefs { } fun mangoapp(context: Context): Boolean = prefs(context).getBoolean("mangoapp", true) + fun vsyncThread(context: Context): Boolean = prefs(context).getBoolean("vsyncThread", true) + fun renderOnCommit(context: Context): Boolean = prefs(context).getBoolean("renderOnCommit", true) fun setMangoapp(context: Context, on: Boolean) { prefs(context).edit().putBoolean("mangoapp", on).apply() } fun zinkLazy(context: Context): Boolean = prefs(context).getBoolean("zinkLazy", true) @@ -525,8 +748,99 @@ object SessionPrefs { fun logsEnabled(context: Context): Boolean = prefs(context).getBoolean("logs", true) - fun setLogsEnabled(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("logs", on).apply() + fun setLogsEnabled(context: Context, on: Boolean): Boolean = synchronized(GameEnvironmentStore) { + setLogPreference( + context, + key = "logs", + oldValue = logsEnabled(context), + newValue = on, + newEffective = on && gameDebugLogsEnabled(context) && SessionPaths.currentSessionLogsRetained(context), + ) + } + + fun gameDebugLogsEnabled(context: Context): Boolean = + prefs(context).getBoolean("gameDebugLogsEnabled", false) + + fun setGameDebugLogsEnabled(context: Context, on: Boolean): Boolean = synchronized(GameEnvironmentStore) { + setLogPreference( + context, + key = "gameDebugLogsEnabled", + oldValue = gameDebugLogsEnabled(context), + newValue = on, + newEffective = logsEnabled(context) && on && SessionPaths.currentSessionLogsRetained(context), + ) + } + + private fun setLogPreference( + context: Context, + key: String, + oldValue: Boolean, + newValue: Boolean, + newEffective: Boolean, + ): Boolean { + if (oldValue == newValue) return true + val saved = prefs(context) + val oldEffective = logsEnabled(context) && gameDebugLogsEnabled(context) && + SessionPaths.currentSessionLogsRetained(context) + fun publish(value: Boolean) = GameEnvironmentStore.publish(context, gameDebugLogsOverride = value) + if (oldEffective == newEffective) { + if (saved.edit().putBoolean(key, newValue).commit()) return true + saved.edit().putBoolean(key, oldValue).commit() + return false + } + if (oldEffective && !newEffective) { + try { + publish(false) + } catch (e: Exception) { + android.util.Log.e("GameEnvironment", "Could not disable game diagnostics", e) + return false + } + if (saved.edit().putBoolean(key, newValue).commit()) return true + saved.edit().putBoolean(key, oldValue).commit() + runCatching { publish(oldEffective) } + .onFailure { android.util.Log.e("GameEnvironment", "Could not restore game diagnostics", it) } + return false + } + if (!saved.edit().putBoolean(key, newValue).commit()) { + saved.edit().putBoolean(key, oldValue).commit() + return false + } + return try { + publish(newEffective) + true + } catch (e: Exception) { + saved.edit().putBoolean(key, oldValue).commit() + runCatching { publish(oldEffective) } + .onFailure { android.util.Log.e("GameEnvironment", "Could not restore game diagnostics", it) } + android.util.Log.e("GameEnvironment", "Could not update game diagnostics", e) + false + } + } + + 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 = @@ -552,18 +866,20 @@ object SessionPrefs { fun resolutionChoice(context: Context, mode: String, panel: Pair<Int, Int>): String { val saved = prefs(context) saved.getString("displayResolution.$mode", null)?.let { value -> - if (value == SessionDisplay.MATCH_SCREEN || value == SessionDisplay.FOLLOW_SCREEN || + if (value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || SessionDisplay.presetHeight(value) != null) return value 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}" } fun setResolutionChoice(context: Context, mode: String, choice: String) { - val value = if (choice == SessionDisplay.MATCH_SCREEN || choice == SessionDisplay.FOLLOW_SCREEN || + val value = if (choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || SessionDisplay.presetHeight(choice) != null) choice else { val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" } "${size.first}x${size.second}" @@ -595,7 +911,6 @@ object SessionPrefs { prefs(context).edit().putString("steamClientArch", id).apply() } - /** The running session's client, else the selected one: a changed setting applies from the next session. */ fun activeSteamClientArch(context: Context): String = SessionState.steamClientArch?.takeIf { SessionState.running } ?: steamClientArch(context) @@ -613,13 +928,10 @@ object SessionPrefs { fun setBootMovieSound(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieSound", on).apply() } fun bootMovieVolume(context: Context): Int = prefs(context).getInt("bootMovieVolume", 100).coerceIn(0, 100) fun setBootMovieVolume(context: Context, percent: Int) { prefs(context).edit().putInt("bootMovieVolume", percent.coerceIn(0, 100)).apply() } - /** How long the boot movie plays, in seconds; 0 plays all of it. */ fun bootMovieSeconds(context: Context): Int = prefs(context).getInt("bootMovieSeconds", 0).coerceAtLeast(0) fun setBootMovieSeconds(context: Context, seconds: Int) { prefs(context).edit().putInt("bootMovieSeconds", seconds.coerceAtLeast(0)).apply() } - /** Set when a movie was picked here, so the next session makes it Steam's startup movie even if Steam had another one. */ fun bootMovieApplyNext(context: Context): Boolean = prefs(context).getBoolean("bootMovieApplyNext", false) fun setBootMovieApplyNext(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieApplyNext", on).apply() } - /** The startup movie path Steam's config held when it was last looked at, so only a change made in Steam is taken over. */ fun bootMovieSteamSeen(context: Context): String? = prefs(context).getString("bootMovieSteamSeen", null) fun setBootMovieSteamSeen(context: Context, path: String) { prefs(context).edit().putString("bootMovieSteamSeen", path).apply() } fun bootMovieCustomName(context: Context): String? = prefs(context).getString("bootMovieCustomName", null) @@ -737,21 +1049,34 @@ object SessionPrefs { if (previous != null && !p.contains("addedAppId:$folderPath")) { val moved = movedAddedGame(p.all, previous, folderPath) moved.keys.forEach { edit.remove(it) } - moved.values.forEach { (name, value) -> - when (value) { - is String -> edit.putString(name, value) - is Long -> edit.putLong(name, value) - is Int -> edit.putInt(name, value) - is Boolean -> edit.putBoolean(name, value) - is Float -> edit.putFloat(name, value) - } - } + moved.values.forEach { (name, value) -> edit.putValue(name, value) } val removed = removedAddedGames(context) if (previous in removed) edit.putString("removedAddedGames", removed.map { if (it == previous) folderPath else it }.joinToString("\n")) } edit.apply() } + fun inheritAddedGame(context: Context, from: String, to: String) = synchronized(addedGameLock) { + val p = prefs(context) + val all = p.all + val edit = p.edit() + all.filterKeys { it.startsWith("added") && it.endsWith(":$from") }.forEach { (name, value) -> + val key = name.removeSuffix(from) + to + if (key !in all) edit.putValue(key, value) + } + edit.apply() + } + + private fun android.content.SharedPreferences.Editor.putValue(name: String, value: Any?) { + when (value) { + is String -> putString(name, value) + is Long -> putLong(name, value) + is Int -> putInt(name, value) + is Boolean -> putBoolean(name, value) + is Float -> putFloat(name, value) + } + } + internal fun movedAddedGame(all: Map<String, *>, from: String, to: String): Map<String, Pair<String, Any?>> = all.filterKeys { it.startsWith("added") && it.endsWith(":$from") }.mapValues { (name, value) -> val moved = if (value is String && (value == from || value.startsWith("$from/"))) to + value.removePrefix(from) else value @@ -770,12 +1095,18 @@ object SessionPrefs { prefs(context).edit().putString("theme", id).apply() } - /** The custom Gradient theme's primary and secondary colours (ARGB). */ fun gradientColors(context: Context): Pair<Int, Int> = prefs(context).let { it.getInt("gradientPrimary", com.droiddeck.launcher.ui.Themes.DEFAULT_PRIMARY) to it.getInt("gradientSecondary", com.droiddeck.launcher.ui.Themes.DEFAULT_SECONDARY) } + fun rgbSpeed(context: Context): Int = + prefs(context).getInt("innerGamerSpeed", com.droiddeck.launcher.ui.Themes.DEFAULT_RGB_SPEED).coerceIn(1, com.droiddeck.launcher.ui.Themes.RGB_SPEEDS) + + fun setRgbSpeed(context: Context, speed: Int) { + prefs(context).edit().putInt("innerGamerSpeed", speed.coerceIn(1, com.droiddeck.launcher.ui.Themes.RGB_SPEEDS)).apply() + } + fun setGradientColors(context: Context, primary: Int, secondary: Int) { prefs(context).edit().putInt("gradientPrimary", primary).putInt("gradientSecondary", secondary).apply() } @@ -798,17 +1129,23 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - fun fpsLimit(context: Context, mode: String): Int = prefs(context).getInt("fpsLimit.$mode", 0) + const val FPS_UNPACED = -1 - fun setFpsLimit(context: Context, mode: String, fps: Int) { - prefs(context).edit().putInt("fpsLimit.$mode", fps.coerceAtLeast(0)).apply() + const val FPS_LIMIT_OFF = 15 + const val FPS_LIMIT_MAX = 165 + + const val PIP_FPS = 30 + + fun compositorFpsLimit(mirrorRefreshLimit: Int, sessionLimit: Int = 0, pip: Boolean = false): Int { + val limit = when { + mirrorRefreshLimit <= 0 && sessionLimit <= 0 -> FPS_UNPACED + mirrorRefreshLimit <= 0 -> sessionLimit + sessionLimit <= 0 -> mirrorRefreshLimit + else -> minOf(mirrorRefreshLimit, sessionLimit) + } + return if (pip && mirrorRefreshLimit <= 0 && (limit <= 0 || limit > PIP_FPS)) PIP_FPS else limit } - 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 } - val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 8 to "Snapdragon GSR (quality)", 7 to "NVIDIA NIS", 6 to "Sharpen only", @@ -988,7 +1325,7 @@ object SessionPrefs { resolutionChosen(context, SessionService.MODE_DESKTOP)) SessionService.MODE_DESKTOP else prefMode(mode) - fun pipAutoEnter(context: Context): Boolean = prefs(context).getBoolean("pipAutoEnter", false) + fun pipAutoEnter(context: Context): Boolean = prefs(context).getBoolean("pipAutoEnter", true) fun setPipAutoEnter(context: Context, enabled: Boolean) { prefs(context).edit().putBoolean("pipAutoEnter", enabled).apply() @@ -996,6 +1333,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() } @@ -1019,7 +1368,8 @@ object SessionPrefs { } fun suspendPolicy(context: Context, mode: String): String = - prefs(context).getString("suspendPolicy.${prefMode(mode)}", SUSPEND_MANUAL) + prefs(context).getString("suspendPolicy.${prefMode(mode)}", + if (mode == SessionService.MODE_STEAM) SUSPEND_NATIVE else SUSPEND_MANUAL) ?.let { if (it == LEGACY_SUSPEND_DOWNLOADS) SUSPEND_AUTO else it } ?.takeIf { it in setOf(SUSPEND_AUTO, SUSPEND_NATIVE, SUSPEND_MANUAL, SUSPEND_NEVER) } ?.let { if (mode != SessionService.MODE_STEAM && it == SUSPEND_NATIVE) SUSPEND_AUTO else it } @@ -1045,6 +1395,18 @@ object SessionPrefs { prefs(context).edit().putBoolean(DECKY_ZIP_WARNING_SEEN, true).apply() } + fun slowUsbWarningOff(context: Context): Boolean = prefs(context).getBoolean(SLOW_USB_WARNING_OFF, false) + + fun setSlowUsbWarningOff(context: Context) { + prefs(context).edit().putBoolean(SLOW_USB_WARNING_OFF, true).apply() + } + + fun slowUsbDismissed(context: Context): Set<String> = prefs(context).getStringSet(SLOW_USB_DISMISSED, null)?.toSet().orEmpty() + + fun setSlowUsbDismissed(context: Context, keys: Set<String>) { + prefs(context).edit().putStringSet(SLOW_USB_DISMISSED, keys.toSet()).apply() + } + fun steamDownloadsInBackground(context: Context): Boolean { val prefs = prefs(context) return prefs.getBoolean(STEAM_DOWNLOADS_IN_BACKGROUND, false) || @@ -1072,4 +1434,16 @@ object SessionPrefs { fun setGameStorage(context: Context, path: String, label: String) { prefs(context).edit().putString("gameStorage", path).putString("gameStorageLabel", label).apply() } + + fun steamLibraries(context: Context): String = prefs(context).getString("steamLibraries", "") ?: "" + + fun setSteamLibraries(context: Context, json: String) { + prefs(context).edit().putString("steamLibraries", json).apply() + } + + fun steamLibraryNextId(context: Context): Int = prefs(context).getInt("steamLibraryNextId", 1) + + fun setSteamLibraryNextId(context: Context, id: Int) { + prefs(context).edit().putInt("steamLibraryNextId", id).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 121491549..82dd9a71b 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,7 +72,10 @@ class SessionService : Service() { private val steamDownloadMonitor = SteamDownloadMonitor() private var downloadMonitorTask: Runnable? = null private var downloadActive = false - @Volatile private var steamLibraryMounts = emptyMap<String, File>() + private var clientInstallActive = false + private var steamLibraryMounts: Map<String, File> + get() = SessionState.steamLibraryMounts + set(value) { SessionState.steamLibraryMounts = value } private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL private var steamDownloadsInBackground = false @@ -89,6 +93,7 @@ class SessionService : Service() { private var screenOn = true private var sessionDisplayId = Display.DEFAULT_DISPLAY private var manualPauseRequested = false + private var manualHold = false private var steamSleepToken: String? = null private var nativeSleepToken: String? = null private var nativeSleepReady = false @@ -102,7 +107,6 @@ class SessionService : Service() { private var freezeCancelled = false private var pendingSteamGameId: String? = null private var pendingSteamGameGeneration = -1 - // Bumped to cancel a running game-exit watch (a new launch, or the session ending). @Volatile private var gameExitWatchToken = 0 private val flushSteamGame = object : Runnable { override fun run() = flushQueuedSteamGame() @@ -272,11 +276,25 @@ class SessionService : Service() { val hold = intent?.getBooleanExtra(EXTRA_HOLD, false) == true if (hold == signInHold) return START_NOT_STICKY signInHold = hold - if (hold) manualPauseRequested = false + if (hold) { + manualPauseRequested = false + manualHold = false + SessionState.manualPause = false + } suspendAttemptFailed = false 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) @@ -292,6 +310,14 @@ class SessionService : Service() { updateSuspendPolicy() return START_NOT_STICKY } + ACTION_PAUSE_NOW -> { + if (!SessionState.running || SessionState.suspended || signInHold) return START_NOT_STICKY + manualHold = true + SessionState.manualPause = true + suspendAttemptFailed = false + updateSuspendPolicy() + return START_NOT_STICKY + } ACTION_RESUME -> { resumeSession() return START_NOT_STICKY @@ -301,7 +327,20 @@ class SessionService : Service() { stopSelf(startId) return START_NOT_STICKY } - startForeground(NOTIFICATION_ID, buildNotification()) + if (Build.VERSION.SDK_INT >= 34) { + var types = android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE or + android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK + if (SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) { + types = types or android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE + } + if (!com.droiddeck.launcher.core.ForegroundServices.start(this, NOTIFICATION_ID, buildNotification(), types)) { + stopSelf(startId) + return START_NOT_STICKY + } + } else if (!com.droiddeck.launcher.core.ForegroundServices.start(this, NOTIFICATION_ID, buildNotification())) { + stopSelf(startId) + return START_NOT_STICKY + } if (SessionState.running) return START_NOT_STICKY if (SessionState.stopRequested) { SessionState.running = true @@ -309,6 +348,7 @@ class SessionService : Service() { return START_NOT_STICKY } SessionState.mode = intent?.getStringExtra(EXTRA_MODE) ?: MODE_STEAM + SessionState.fpsLimit = 0 suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) activityVisible = true @@ -321,19 +361,29 @@ 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 + SessionState.resumeFailed = false + manualHold = false + SessionState.manualPause = false SessionState.pipActive = false 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 @@ -348,6 +398,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 @@ -355,16 +408,17 @@ class SessionService : Service() { acquireLocks() Thread({ OrphanReaper.reap("session starting") + ProtonExtras.awaitReplacement(120_000) runSession(gen) }, "session-start").start() return START_NOT_STICKY } private fun collectSessionArtifacts(dir: File, steamArch: String?) { + SessionLogCapture.stopFor(dir) try { SessionArtifacts.collect(this, dir, "session stopped", steamArch) } finally { - SessionLogCapture.stopFor(dir) SessionPaths.release(this, dir) } } @@ -394,7 +448,7 @@ class SessionService : Service() { private fun runSession(gen: Int) { SessionTerminal.clear() - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice() + com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this) try { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { @@ -407,19 +461,54 @@ 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() - SessionArtifacts.finishAbandoned(this) + SessionArtifacts.finishAbandoned(this, beforeGuestStart = true) VacDiagnostics.arm(this) com.droiddeck.launcher.agent.AgentGuest.reset(this) com.droiddeck.launcher.stores.gog.GogComet.begin() com.droiddeck.launcher.stores.StoreLaunchRequests.start(this) val sessionDir = openSessionFolder() + try { + GameEnvironmentStore.publish(this) + } catch (e: Exception) { + Log.e(TAG, "could not publish the game environment", e) + stopSession(-1) + return + } 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)) @@ -427,16 +516,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) @@ -446,13 +538,16 @@ 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) + guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=100") + guest.add("WINE_OFFSCREEN_CHECK_MS=100") guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) guest.add("BL_LOG=" + sessionLog.path) guest.add("BL_DEBUG_DIR=" + sessionDir.path) @@ -477,7 +572,7 @@ class SessionService : Service() { if (steamHere || noSteamGame) { val cached = com.droiddeck.launcher.frontend.AddedGames.listingFile(this) val listing = if (steamHere && cached.isFile) { - com.droiddeck.launcher.frontend.AddedGamesPublisher.refreshDuringSession(this) + com.droiddeck.launcher.frontend.AddedGamesPublisher.refreshDuringSession(this, stillStarting) Log.i(TAG, "added games: the last listing, refreshed in the background") cached } else { @@ -499,6 +594,7 @@ class SessionService : Service() { add("-c") add("cd \"\$HOME\" && exec /bin/bash -i") } + val desktopGuest = ArrayList(guest) guest.add(LinuxRuntime.SESSION_SCRIPT) guest.add(SessionState.mode) if (SessionState.mode == MODE_STEAM) SessionState.steamUrl?.takeIf { it.startsWith("steam://") }?.let { @@ -549,6 +645,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 @@ -562,6 +661,10 @@ class SessionService : Service() { } if (gen == sessionGen && SessionState.running) { SessionTerminal.prepare(terminalCommand, terminalHostEnvironment.map { (key, value) -> "$key=$value" }.toTypedArray(), root, gen) + val (fastPathName, _) = ProotFastPath.hostEnv("") + BottomDesktop.prepare(desktopGuest, binds, sessionRoot, + hostEnv.asArray().filterNot { it.startsWith("$fastPathName=") }.toTypedArray(), root, sessionDir, gen, + ) { gen == sessionGen && SessionState.running } } if (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP) OfflineMode.apply(this, root) @@ -570,6 +673,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() @@ -591,7 +698,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") @@ -619,7 +726,10 @@ class SessionService : Service() { if (gen == sessionGen && SessionState.running) { suspendController = SessionSuspendController( sessionRoot = { sessionPid }, - helperRoots = { components.mapNotNull { it.suspendPid().takeIf { pid -> pid > 1 } } }, + helperRoots = { + components.mapNotNull { it.suspendPid().takeIf { pid -> pid > 1 } } + + listOfNotNull(BottomDesktop.suspendPid.takeIf { it > 1 }) + }, suspendAudio = { if (!pulse.setSinkSuspended(true)) Log.w(TAG, "could not suspend audio sink") if (!pulse.setMicSuspended(true)) Log.w(TAG, "could not suspend microphone source") @@ -633,6 +743,7 @@ class SessionService : Service() { if (!pulse.setMicSuspended(false)) Log.w(TAG, "could not resume microphone source") }, zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-zram"), + clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-clock"), pagedOut = { processes, unacknowledged, residentKb, swapKb, swapBeforeKb, millis -> Log.i(TAG, "paged out $processes processes ($unacknowledged unacknowledged) in $millis ms: " + "resident ${residentKb / 1024} MB, zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") @@ -643,9 +754,23 @@ class SessionService : Service() { )) } }, + readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, + pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> + if (processes == 0) { + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + } else { + Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") + } + mainHandler.post { + SessionEvents.record("session.paged_in", mapOf( + "processes" to processes, "swapMb" to swapKb / 1024, "swapBeforeMb" to swapBeforeKb / 1024, + "availableMb" to availableKb / 1024, "ms" to millis, + )) + } + }, ) - mainHandler.post { updateSuspendPolicy() } updateDownloadMonitoring() + mainHandler.post { updateSuspendPolicy() } } } @@ -660,16 +785,17 @@ 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)) guest.add("HOME=/root") guest.add("USER=root") - guest.add("PATH=/usr/local/bin:/usr/bin:/bin") + guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") guest.add("TERM=xterm-256color") guest.add("LANG=C.UTF-8") guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( @@ -677,6 +803,7 @@ class SessionService : Service() { com.droiddeck.launcher.core.AppLanguage.system(this).country, )) guest.add("TZ=" + java.util.TimeZone.getDefault().id) + if (SessionState.mode == MODE_STEAM) SessionPrefs.pendingShaderPrecache(this)?.let { guest.add("BL_SHADER_PRECACHE=" + if (it) "1" else "0") } guest.add("XDG_RUNTIME_DIR=" + LinuxRuntime.GUEST_RUNTIME_DIR) guest.add("XDG_SESSION_TYPE=wayland") guest.add("WAYLAND_DISPLAY=wayland-0") @@ -699,7 +826,6 @@ class SessionService : Service() { val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) (tuOverride ?: "sysmem".takeIf { tuDriver || SessionPrefs.tuSysmem(this) })?.let { guest.add("TU_DEBUG=$it") } - com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice()?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } if (SessionPrefs.zinkLazy(this)) { guest.add("ZINK_DESCRIPTORS=lazy") guest.add("ZINK_DEBUG=compact") @@ -707,14 +833,18 @@ class SessionService : Service() { if (SessionPrefs.glThread(this)) guest.add("mesa_glthread=true") if (SessionPrefs.noGlError(this)) guest.add("MESA_NO_ERROR=1") guest.add("MESA_DISK_CACHE_DATABASE=1") + guest.addAll(GpuStatsComponent.guestEnv(LinuxRuntime.rootDir(this))) guest.add("GLIBC_TUNABLES=glibc.pthread.rseq=0:glibc.malloc.top_pad=16777216") if (SessionState.mode == MODE_STEAM) guest.add("BL_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0")) 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")) } @@ -723,11 +853,18 @@ class SessionService : Service() { guest.add("BL_SYNC_FALLBACK=" + (if (SessionPrefs.syncFallback(this)) "1" else "0")) 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 (com.droiddeck.launcher.core.ZramSupport.supported()) guest.add("BL_ZRAM=1") - guest.add("BANNER_AUDIO_DIRECT_DECAY=0") - val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(this) + if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=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("AUDIO_DIRECT_DECAY=0") + 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") } val clientPinned = steamHere && SessionPrefs.clientCpusOverride(this) if (clientPinned) { guest.add("BL_CLIENT_CPUS=" + CpuCores.listOrAll(SessionPrefs.clientCpus(this))) @@ -737,15 +874,16 @@ 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 guest.add("BL_MIC_ENABLED=" + if (wantsMic) "1" else "0") - guest.add("BANNER_AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") + guest.add("AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") val audioDir = File(filesDir, "directaudio").apply { mkdirs() } val relaySocket = File(audioDir, "relay.sock") val micFifo = if (wantsMic) File(audioDir, "mic.fifo") else null @@ -758,13 +896,26 @@ 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) } if (wantsDirectAudio) { guest.add("BL_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR) - guest.add("BANNER_AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + guest.add("AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + val lowLatency = com.droiddeck.launcher.audio.DirectAudioTiming.lowLatencyOutput() + val timing = com.droiddeck.launcher.audio.DirectAudioTiming.environment(lowLatency) + guest.addAll(timing) + Log.i(TAG, "audio: Android output " + (if (lowLatency) "is low-latency; DirectAudio keeps its defaults" else "is not low-latency; DirectAudio uses " + timing.joinToString(" "))) } Log.i(TAG, "audio: client DirectAudio (in-process sink)" + (if (wantsDirectAudio) " + DirectAudio for games" else "") + (if (wantsMic) " + microphone" else "") + @@ -773,7 +924,7 @@ class SessionService : Service() { } private fun addControllerEnvironment(guest: MutableList<String>, fakeInputDir: File, sessionDir: File) { - FakeInputWriter.prepareRingSlots(fakeInputDir, 4) + FakeInputWriter.prepareRingSlots(fakeInputDir, 5) val builtinPad = SessionPrefs.builtinPad(this) val hiddenPad = SessionState.mode == MODE_STEAM && !builtinPad && !com.droiddeck.launcher.input.PadBridge.anyControllerConnected() @@ -800,7 +951,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) { @@ -869,7 +1020,7 @@ class SessionService : Service() { gpuMem.attach(this) components.add(gpuMem) } - val gpuStats = GpuStatsComponent(File(filesDir, "session/sys/kgsl-3d0")) + val gpuStats = GpuStatsComponent(File(filesDir, "session/sys/kgsl-3d0"), LinuxRuntime.rootDir(this)) if (gpuStats.prepare()) { gpuStats.attach(this) components.add(gpuStats) @@ -931,7 +1082,7 @@ class SessionService : Service() { Log.w(TAG, "added games: ${root.host} is not a readable folder this session") } } - for ((host, guest) in com.droiddeck.launcher.stores.StoreInstallRoot.externalRoots(this)) { + for ((host, guest) in com.droiddeck.launcher.stores.StoreInstallRoot.externalRootsForXodus(this)) { if (host.isDirectory && host.canRead()) { File(LinuxRuntime.rootDir(this), guest.removePrefix("/")).mkdirs() binds.add(host.path + ":" + guest) @@ -976,8 +1127,43 @@ class SessionService : Service() { } } } + val addedLibraries = ArrayList<SteamLibraries.Entry>() + val cardPath = storageDiagnosticLibrary?.let { library?.path }?.let { runCatching { File(it).canonicalPath }.getOrDefault(it) } + for (entry in SteamLibraries.list(this)) { + if (cardPath != null && SteamLibraries.overlaps(cardPath, runCatching { entry.host.canonicalPath }.getOrDefault(entry.path))) { + Log.w(TAG, "added steam library: ${entry.path} overlaps the card library; not a library this session") + continue + } + if (!entry.host.isDirectory) { + Log.w(TAG, "added steam library: ${entry.path} is not attached; not a library this session") + continue + } + val problem = GameStorage.prepare(this, entry.path) + if (problem != null) { + Log.w(TAG, "added steam library: $problem") + continue + } + try { + val room = if (ProotFastPath.enabled(this)) { + ProotFastPath.MAX_BINDS - LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds).size + } else Int.MAX_VALUE + val content = SecondaryLibrary.contentPath(entry.host) + val extra = SecondaryLibrary.binds(filesDir, entry.host, listOf(entry.guest), content = content) + if (extra.size > room) { + Log.w(TAG, "added steam library: ${entry.path} needs ${extra.size} binds, $room left for the fast path; not a library this session") + continue + } + File(LinuxRuntime.rootDir(this), entry.guest.removePrefix("/")).mkdirs() + binds.addAll(extra) + libraries.add(entry.guest to entry.label) + steamLibraryMounts = steamLibraryMounts + (entry.guest to content) + addedLibraries.add(entry) + Log.i(TAG, "added steam library: ${content.path} -> ${entry.guest} (\"${entry.label}\")") + } catch (e: Exception) { + Log.w(TAG, "added steam library: ${entry.path} private directories could not be prepared", e) + } + } val x64Libraries = org.json.JSONArray() - // Desktop mode offers the x86-64 client either way; droiddeck-steam-x64 drops library folders it is not given. val x64Here = SessionPrefs.steamClientArch(this) == "x86_64" || (SessionState.mode == MODE_DESKTOP && com.droiddeck.launcher.storage.SteamStorage.x64ClientPresent(SessionPrefs.steamRoot(this, "x86_64"))) @@ -1002,6 +1188,27 @@ class SessionService : Service() { Log.w(TAG, "x86-64 steam library: $x64 private directories could not be prepared", e) } } + if (x64Here) for (entry in addedLibraries) { + val problem = GameStorage.prepare(this, entry.x64Host.path) + if (problem != null) { + Log.w(TAG, "x86-64 steam library: $problem") + continue + } + try { + val room = if (ProotFastPath.enabled(this)) { + ProotFastPath.MAX_BINDS - LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds).size + } else Int.MAX_VALUE + val extra = SecondaryLibrary.binds(filesDir, entry.x64Host, listOf(entry.x64Guest)).drop(1) + if (extra.size > room) { + Log.w(TAG, "x86-64 steam library: ${entry.x64Host} needs ${extra.size} binds, $room left for the fast path; not a library this session") + continue + } + binds.addAll(extra) + x64Libraries.put(org.json.JSONObject().put("path", entry.x64Guest).put("label", entry.label)) + } catch (e: Exception) { + Log.w(TAG, "x86-64 steam library: ${entry.x64Host} private directories could not be prepared", e) + } + } try { val listing = File(filesDir, "session/steam-libraries-x64.json").apply { parentFile?.mkdirs() } listing.writeText(x64Libraries.toString()) @@ -1028,6 +1235,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 @@ -1044,6 +1252,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>>() @@ -1155,13 +1388,6 @@ class SessionService : Service() { Log.i(TAG, "queued Steam game $gameId for the running client") } - /** - * A game launched from the front end (the Games tab, or another launcher's link): once it has - * started and then been gone for [GAME_EXIT_GRACE_MS], ask the client to exit through the - * session script's steam-stop request. The client quits cleanly, finishing its cloud sync, so - * the session ends on its own and the activity returns to where the launch came from instead - * of leaving the player in Big Picture. The grace covers launchers that restart the game. - */ private fun watchGameExit(gameId: String, gen: Int) { if (!SessionPrefs.returnAfterGame(this)) return val token = ++gameExitWatchToken @@ -1176,7 +1402,6 @@ class SessionService : Service() { seen = true goneSince = 0L } else if (!seen) { - // Never started (an install, an update or a failed launch): leave the session be. if (now > startBy) { Log.i(TAG, "game $gameId did not start; not watching for its exit") return@Thread @@ -1202,24 +1427,15 @@ class SessionService : Service() { Log.i(TAG, "game $gameId closed: asking the client to exit and returning to the launcher") } - /** A Steam game is running: the client runs each one under its reaper, and Proton's script - * waits on the game with waitforexitandrun. Read from the command lines, as ComponentsManager does. */ - private fun steamGameRunning(): Boolean { - val procs = File("/proc").listFiles() ?: return false - for (p in procs) { - if (!p.name.all(Char::isDigit)) continue - val cmd = runCatching { File(p, "cmdline").readBytes() }.getOrNull() ?: continue - if (cmd.isEmpty()) continue - val text = String(cmd).replace('\u0000', ' ') - if (text.contains("SteamLaunch AppId=") || text.contains("waitforexitandrun")) return true - } - return false - } + private fun steamGameRunning(): Boolean = SteamGameProcess.running() private fun resumeSession(panelVisible: Boolean = true) { + if (SessionState.suspended) SessionState.resumeRequested = true if (panelVisible) activityVisible = true screenOn = readScreenOn() manualPauseRequested = false + manualHold = false + SessionState.manualPause = false suspendDownloadNow = false if (steamSleepToken == null && (nativeSleepToken == null || nativeSleepFallback || nativeSleepIdle)) requestSteamWake() completeNativeSleep() @@ -1322,6 +1538,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 @@ -1414,18 +1635,19 @@ 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) { + manualPauseRequested = false } val controller = suspendController ?: return - if (downloadsBlockingSuspend) acquireLocks() - val steamPause = SessionState.mode == MODE_STEAM && !downloadsBlockingSuspend && when (suspendPolicy) { + if (downloadsBlockingSuspend && !manualHold) acquireLocks() + val steamPause = SessionState.mode == MODE_STEAM && (manualHold || !downloadsBlockingSuspend && when (suspendPolicy) { SessionPrefs.SUSPEND_AUTO, SessionPrefs.SUSPEND_NATIVE -> hidden SessionPrefs.SUSPEND_MANUAL -> manualPauseRequested else -> false - } + }) if (!steamPause) { completeNativeSleep() } else if (nativeSleepToken == null && steamSleepToken == null && @@ -1433,16 +1655,19 @@ class SessionService : Service() { prepareNativeSleep() } val prepared = SessionState.mode != MODE_STEAM || nativeSleepReady - val shouldSuspend = steamSleepToken != null || when (suspendPolicy) { + val shouldSuspend = steamSleepToken != null || (manualHold && prepared) || when (suspendPolicy) { SessionPrefs.SUSPEND_AUTO -> hidden && prepared && !downloadsBlockingSuspend SessionPrefs.SUSPEND_NATIVE -> hidden && nativeSleepReady && !downloadsBlockingSuspend SessionPrefs.SUSPEND_MANUAL -> manualPauseRequested && prepared && !downloadsBlockingSuspend else -> false } + val quietRumble = !screenOn || shouldSuspend || SessionState.suspended + components.forEach { (it as? RumbleComponent)?.quiet(quietRumble) } if (freezePending && !shouldSuspend && !freezeCancelled) { freezeCancelled = true controller.cancelFreeze() } + if (shouldSuspend && SessionState.suspended && !suspendOperationPending) SessionState.resumeRequested = false if (suspendOperationPending || suspendAttemptFailed || shouldSuspend == SessionState.suspended) return val gen = sessionGen suspendOperationPending = true @@ -1454,6 +1679,7 @@ class SessionService : Service() { )) if (shouldSuspend) { freezePending = true + SessionState.suspending = true freezeCancelled = false val freezeSteamToken = steamSleepToken val freezeNativeToken = nativeSleepToken @@ -1462,10 +1688,12 @@ class SessionService : Service() { ) { success -> mainHandler.post { if (gen != sessionGen || !SessionState.running) return@post + SessionState.suspending = false suspendOperationPending = false freezePending = false if (success) { SessionState.suspended = true + SessionState.resumeFailed = false SessionEvents.transition(SessionPhase.SUSPENDED, "session.suspended") releaseLocks() refreshNotification() @@ -1476,6 +1704,8 @@ class SessionService : Service() { SessionEvents.record("session.suspend_cancelled") } else { suspendAttemptFailed = true + manualHold = false + SessionState.manualPause = false Log.w(TAG, "could not confirm that the session stopped") } } @@ -1484,16 +1714,22 @@ class SessionService : Service() { } } else { acquireLocks() + SessionState.resuming = true controller.resume { success -> mainHandler.post { if (gen != sessionGen || !SessionState.running) return@post suspendOperationPending = false + SessionState.resuming = false + SessionState.resumeRequested = false if (success) { SessionState.suspended = false + SessionState.resumeFailed = false SessionEvents.transition(SessionEvents.resumePhase(), "session.resumed") refreshNotification() } else { suspendAttemptFailed = true + SessionState.resumeFailures++ + SessionState.resumeFailed = true Log.w(TAG, "could not confirm that the session resumed") } updateSuspendPolicy() @@ -1518,7 +1754,7 @@ class SessionService : Service() { } private fun resumeSteamSleepOnReturn() { - if (suspendPolicy in setOf(SessionPrefs.SUSPEND_AUTO, SessionPrefs.SUSPEND_NATIVE) && hasVisibleSurface) { + if (!manualHold && suspendPolicy in setOf(SessionPrefs.SUSPEND_AUTO, SessionPrefs.SUSPEND_NATIVE) && hasVisibleSurface) { if (steamSleepToken == null && (nativeSleepToken == null || nativeSleepFallback || nativeSleepIdle)) requestSteamWake() completeNativeSleep() completeSteamSleep() @@ -1576,37 +1812,48 @@ class SessionService : Service() { }.onFailure { Log.w(TAG, "could not request Steam wake", it) } } - private fun finishSessionStop(status: Int, stoppedGen: Int) { + private fun finishSessionStop(status: Int, stoppedGen: Int, afterStopped: () -> Unit = {}) { mainHandler.post { - if (stoppedGen != sessionGen || SessionState.running) { - Log.i(TAG, "session $stoppedGen finished stopping after a new one started") - return@post + try { + if (stoppedGen != sessionGen || SessionState.running) { + Log.i(TAG, "session $stoppedGen finished stopping after a new one started") + return@post + } + SessionState.suspended = false + SessionState.resumeRequested = false + SessionState.resuming = false + SessionState.resumeFailed = false + manualHold = false + SessionState.manualPause = false + SessionState.pipActive = false + pipTask = false + SessionState.guestPid = -1 + com.droiddeck.launcher.agent.AgentGuest.stop() + com.droiddeck.launcher.stores.StoreLaunchRequests.stop() + Thread({ com.droiddeck.launcher.stores.CloudSaves.uploadAllDirty(applicationContext, "session-end", running = false) }, "cloud-session-end").start() + 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 { + val code = SessionState.failureCode ?: "GUEST_EXIT" + val message = SessionState.failureMessage ?: "Session guest exited with status $status" + val failureStatus = SessionState.failureStatus ?: status + SessionEvents.fail(code, message, failureStatus) + } + SessionState.steamVr = false + com.droiddeck.launcher.glasses.Glasses.cancelSteamVrStart() + com.droiddeck.launcher.glasses.Glasses.setVrActive(false) + com.droiddeck.launcher.glasses.Glasses.set3dForVr(false) + SessionState.notifyEnded(status) + stopForeground(STOP_FOREGROUND_REMOVE) + stopSelf() + } finally { + afterStopped() } - SessionState.suspended = false - SessionState.pipActive = false - pipTask = false - SessionState.guestPid = -1 - com.droiddeck.launcher.agent.AgentGuest.stop() - com.droiddeck.launcher.stores.StoreLaunchRequests.stop() - Thread({ com.droiddeck.launcher.stores.CloudSaves.uploadAllDirty(applicationContext, "session-end", running = false) }, "cloud-session-end").start() - runCatching { com.droiddeck.launcher.agent.AgentEnv.endSession(this) } - .onFailure { Log.w(TAG, "clearing the agent's session environment", it) } - releaseLocks() - if (status == 0) { - SessionEvents.transition(SessionPhase.IDLE, "session.stopped", mapOf("status" to status)) - } else { - val code = SessionState.failureCode ?: "GUEST_EXIT" - val message = SessionState.failureMessage ?: "Session guest exited with status $status" - val failureStatus = SessionState.failureStatus ?: status - SessionEvents.fail(code, message, failureStatus) - } - SessionState.steamVr = false - com.droiddeck.launcher.glasses.Glasses.cancelSteamVrStart() - com.droiddeck.launcher.glasses.Glasses.setVrActive(false) - com.droiddeck.launcher.glasses.Glasses.set3dForVr(false) - SessionState.notifyEnded(status) - stopForeground(STOP_FOREGROUND_REMOVE) - stopSelf() } } @@ -1634,21 +1881,27 @@ 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 + val ended = SessionPaths.take() + if (ended != null) SessionArtifacts.collectionStarted(ended) + ended 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 + SessionState.suspending = false launchWatcher?.stopWatching() launchWatcher = null syncWatcher?.stopWatching() @@ -1659,12 +1912,11 @@ class SessionService : Service() { auxiliaryProcesses.toMap().also { auxiliaryProcesses.clear() } } SessionTerminal.clear(sessionGen) + BottomDesktop.stop(this, stoppedGen) val controller = suspendController suspendController = null if (ended != null) { VacDiagnostics.snapshot(this, ended) - SessionArtifacts.collectionStarted(ended) - Thread({ collectSessionArtifacts(ended, endedArch) }, "session-collect").start() } components.reversed().forEach { try { @@ -1674,6 +1926,9 @@ class SessionService : Service() { } } components.clear() + val collectEnded = { + if (ended != null) Thread({ collectSessionArtifacts(ended, endedArch) }, "session-collect").start() + } FakeInputWriter.releaseAllRingSlots() com.droiddeck.launcher.input.SteamTouchDevice.release() val steamClientMayRun = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP @@ -1685,13 +1940,13 @@ class SessionService : Service() { auxiliary.forEach { (pid, started) -> teardown(pid, started) } if (prootPid > 1) teardown(prootPid) killGuestLeftovers() - finishSessionStop(status, stoppedGen) + finishSessionStop(status, stoppedGen, collectEnded) if (launcherEnded) importLauncherGames() }, "session-teardown").start() } else { Thread({ com.droiddeck.launcher.stores.gog.GogComet.end(stoppedSession) - finishSessionStop(status, stoppedGen) + finishSessionStop(status, stoppedGen, collectEnded) if (launcherEnded) importLauncherGames() }, "gog-session-stop").start() } @@ -1703,9 +1958,15 @@ 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?) { + if (rootIntent?.component?.className in setOf( + com.droiddeck.launcher.ui.DualScreenActivity::class.java.name, + com.droiddeck.launcher.ui.SessionTypingActivity::class.java.name)) return if (pipTask || xrActivityVisible) { Log.i(TAG, "panel task dismissed - retaining the session under its active surface policy") activityVisible = false @@ -1719,7 +1980,7 @@ class SessionService : Service() { override fun onDestroy() { stopSession(0) - GameThreadHints.stop() // also when the session never got as far as running + GameThreadHints.stop() if (screenReceiverRegistered) { unregisterReceiver(screenReceiver) screenReceiverRegistered = false @@ -1815,8 +2076,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 } )) @@ -1824,8 +2084,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), @@ -1845,33 +2104,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) @@ -1912,10 +2188,12 @@ class SessionService : Service() { const val ACTION_STOP = "com.droiddeck.launcher.STOP_SESSION" const val ACTION_RESUME = "com.droiddeck.launcher.RESUME_SESSION" const val ACTION_SUSPEND_NOW = "com.droiddeck.launcher.SUSPEND_NOW" + private const val ACTION_PAUSE_NOW = "com.droiddeck.launcher.PAUSE_NOW" private const val ACTION_PIP_BEGIN = "com.droiddeck.launcher.PIP_BEGIN" 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" @@ -1934,15 +2212,14 @@ 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 private const val DOWNLOAD_POLL_MS = 2_000L private const val STEAM_GAME_REQUEST = "steam-game" private const val GAME_URL_PREFIX = "steam://rungameid/" - /** How long a front-end launch may take to start (downloads, first-run installs) before the exit watch gives up. */ private const val GAME_START_TIMEOUT_MS = 20 * 60_000L - /** How long the game must stay gone before the client is asked to exit: launchers restart games. */ private const val GAME_EXIT_GRACE_MS = 10_000L private const val GAME_EXIT_POLL_MS = 2_000L private const val NO_PAD_SWITCH = "Download/droiddeck-no-pad" @@ -1965,6 +2242,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 @@ -1975,6 +2253,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) } @@ -1982,6 +2261,7 @@ class SessionService : Service() { fun stop(context: Context) { if (!SessionState.running) { SessionState.stopRequested = true + SessionState.installCancellation?.cancel() return } context.startService(Intent(context, SessionService::class.java).setAction(ACTION_STOP)) @@ -2027,8 +2307,13 @@ class SessionService : Service() { context.startService(Intent(context, SessionService::class.java).setAction(ACTION_SIGN_IN_HOLD).putExtra(EXTRA_HOLD, hold)) } + fun pause(context: Context) { + context.startService(Intent(context, SessionService::class.java).setAction(ACTION_PAUSE_NOW)) + } + fun resume(context: Context) { if (!SessionState.running) return + if (SessionState.suspended) SessionState.resumeRequested = true context.startService(Intent(context, SessionService::class.java).setAction(ACTION_RESUME)) } @@ -2045,6 +2330,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 cebc33caa..8e63d05c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import java.io.File import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue @@ -36,6 +37,9 @@ object SessionState { @Volatile var installing: String? = null + @Volatile + var installCancellation: com.droiddeck.launcher.core.Downloader.Cancellation? = null + @Volatile var stopRequested = false @@ -45,20 +49,29 @@ 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) + /** A freeze has begun and has not finished; it already chose which processes it stops. */ + @Volatile var suspending = false + var resumeFailures by mutableIntStateOf(0) + var resumeFailed by mutableStateOf(false) + var manualPause by mutableStateOf(false) @Volatile var pipActive = false @Volatile var program: String? = null @Volatile var programArgs: List<String> = emptyList() @Volatile + var gameId: String? = null + @Volatile var steamUi: String? = null @Volatile var steamUrl: String? = null @Volatile var steamClientArch: String? = null - // A Play SteamVR request can arrive while an existing session is visible. - // Wake the status/launch effect even if no glasses surface has attached yet. var steamVr by mutableStateOf(false) var relaunch: android.content.Intent? = null @JvmStatic var hdr = false @@ -78,6 +91,10 @@ object SessionState { @Volatile var secondScreenMode = com.droiddeck.launcher.input.SecondScreenMode.NONE @Volatile var secondScreenDisplay = -1 + @Volatile var secondScreenAutoOpened = false + @Volatile var secondScreenProvisional = false + + @Volatile var steamLibraryMounts: Map<String, java.io.File> = emptyMap() @Volatile var mode = "steam" @@ -87,6 +104,7 @@ object SessionState { @Volatile var followScreen = false + var followScale = 1f @Volatile var refreshHz: Float = 60f diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index 5d0e32f99..b0a685214 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -3,6 +3,9 @@ package com.droiddeck.launcher.session import android.os.Process import java.io.File import java.io.IOException +import java.io.RandomAccessFile +import java.nio.ByteBuffer +import java.nio.ByteOrder import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.RejectedExecutionException @@ -19,8 +22,13 @@ internal class SessionSuspendController( private val nowMillis: () -> Long = { System.nanoTime() / 1_000_000 }, private val executor: ExecutorService = Executors.newSingleThreadExecutor(), private val zramControl: File? = null, + private val clockControl: File? = null, + private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, + private val readBackAllowed: () -> Boolean = { true }, + private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = + { _, _, _, _, _ -> }, ) { private enum class Role { SESSION_ROOT, SESSION_CHILD, HELPER_ROOT, HELPER_CHILD } @@ -43,6 +51,8 @@ internal class SessionSuspendController( @Volatile private var closing = false @Volatile private var cancelled = false private var frozen = emptyList<ProcessRecord>() + private var frozenSince: Long? = null + private var pagedOutTargets = emptyList<ProcessRecord>() fun freeze(pageOut: Boolean = false, completion: (Boolean) -> Unit) { cancelled = false @@ -93,6 +103,7 @@ internal class SessionSuspendController( } catch (_: Exception) { } finally { frozen = records.values.toList() + if (complete && frozenSince == null) frozenSince = nowNanos() if (!complete) { if (restoreSafely(frozen)) frozen = emptyList() runAudio(resumeAudio) @@ -100,10 +111,10 @@ internal class SessionSuspendController( if (interrupted) Thread.currentThread().interrupt() } completion(complete) + if (!complete && frozen.isEmpty() && !interrupted) readBack() }, { completion(false) }) } - // A freeze still queued or paging out stops before its next SIGSTOP pass and rolls back. fun cancelFreeze() { cancelled = true } @@ -111,16 +122,19 @@ internal class SessionSuspendController( fun resume(completion: (Boolean) -> Unit) { submit({ val records = frozen + advanceClock() runAudio(resumeAudio) val resumed = restoreSafely(records) if (resumed) frozen = emptyList() completion(resumed) + if (resumed) readBack() }, { completion(false) }) } fun closeAndResume(completion: () -> Unit) { closing = true submit({ + advanceClock() if (restoreSafely(frozen)) frozen = emptyList() completion() executor.shutdown() @@ -135,6 +149,23 @@ internal class SessionSuspendController( } } + private fun advanceClock() { + val since = frozenSince ?: return + frozenSince = null + val control = clockControl?.takeIf { it.isFile && it.length() >= Long.SIZE_BYTES } ?: return + try { + RandomAccessFile(control, "rw").use { file -> + val bytes = ByteArray(Long.SIZE_BYTES) + file.readFully(bytes) + val shift = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN).long.coerceAtLeast(0L) + + (nowNanos() - since).coerceAtLeast(0L) + file.seek(0L) + file.write(ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.LITTLE_ENDIAN).putLong(shift).array()) + } + } catch (_: IOException) { + } + } + private fun runAudio(action: () -> Unit) { try { action() @@ -217,7 +248,6 @@ internal class SessionSuspendController( } private fun stoppedSnapshot(records: List<ProcessRecord>, root: ProcessRecord): Map<TaskIdentity, Long>? { - // PRoot can leave the leader stopped while native worker threads keep running. val tasks = LinkedHashMap<TaskIdentity, Long>() var stopped = true for (record in records) { @@ -244,9 +274,6 @@ internal class SessionSuspendController( return tasks.takeIf { stopped && it.isNotEmpty() } } - // A stopped process cannot run libblsession's SIGURG handler, so the page-out has to finish - // before the stop. Android's low-memory killer otherwise finds the frozen game resident in RAM - // with most of zram still free. private fun pageOut(records: MutableMap<Pair<Int, Long>, ProcessRecord>, root: Int, helpers: List<Int>) { val control = zramControl?.takeIf { it.isFile } ?: return try { @@ -263,13 +290,12 @@ internal class SessionSuspendController( } } if (targets.isEmpty()) return + pagedOutTargets = (pagedOutTargets + targets).distinct() val acks = targets.associateWith { File(control.parentFile, "${control.name}.ack.${it.pid}") } acks.values.forEach { it.delete() } val start = nowMillis() val before = memoryKb(targets) for (record in targets) send(record, SIGURG) - // A program can replace libblsession's SIGURG handler (PyInstaller's bootloader, the Go runtime); - // such a process never creates its ack and is not waited for once the start window has passed. val waiting = targets.toMutableList() while (!closing && !cancelled && nowMillis() - start < PAGE_OUT_TIMEOUT_MS) { val started = nowMillis() - start >= PAGE_OUT_START_MS @@ -283,6 +309,57 @@ internal class SessionSuspendController( pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + private fun readBack() { + val targets = pagedOutTargets.filterNot { isGone(it) } + pagedOutTargets = emptyList() + val control = zramControl?.takeIf { it.isFile } ?: return + if (targets.isEmpty() || closing) return + val before = memoryKb(targets).second + val (total, available) = meminfoKb() + if (!readBackAllowed() || !canTake(before, total, available)) { + pagedIn(0, before, before, available, 0) + return + } + try { + control.writeText("0") + } catch (_: IOException) { + return + } + val start = nowMillis() + for (record in targets) send(record, SIGURG) + var swap = before + var unchanged = 0 + try { + while (!closing && nowMillis() - start < READ_BACK_TIMEOUT_MS) { + sleep(READ_BACK_POLL_MS) + val current = memoryKb(targets).second + unchanged = if (current == swap) unchanged + 1 else 0 + swap = current + if (swap == 0L || unchanged >= READ_BACK_STABLE_POLLS) break + } + } catch (_: InterruptedException) { + Thread.currentThread().interrupt() + } + pagedIn(targets.size, swap, before, available, nowMillis() - start) + } + + private fun canTake(swapKb: Long, totalKb: Long, availableKb: Long): Boolean = + availableKb >= swapKb * READ_BACK_AVAILABLE_FACTOR && + availableKb - swapKb >= maxOf(READ_BACK_HEADROOM_KB, totalKb / READ_BACK_TOTAL_SHARE) + + private fun meminfoKb(): Pair<Long, Long> = try { + val values = HashMap<String, Long>() + File(procRoot, "meminfo").forEachLine { line -> + val name = line.substringBefore(':') + if (name == "MemTotal" || name == "MemAvailable") { + line.substringAfter(':').trim().substringBefore(' ').toLongOrNull()?.let { values[name] = it } + } + } + (values["MemTotal"] ?: 0L) to (values["MemAvailable"] ?: 0L) + } catch (_: IOException) { + 0L to 0L + } + private fun isGone(record: ProcessRecord): Boolean = try { readProcess(record.pid)?.started != record.started } catch (_: Exception) { false } @@ -303,9 +380,6 @@ internal class SessionSuspendController( return resident to swap } - // PRoot traces every guest. A stop sent while it runs becomes a group stop that it restarts - // thread by thread; once it is stopped, each thread that takes a SIGSTOP stays parked in its - // signal-delivery stop. So the roots stop first and every guest thread gets its own SIGSTOP. private fun stop(records: List<ProcessRecord>) { for (record in records.filter { it.role == Role.SESSION_ROOT }) send(record, SIGSTOP) for (record in records.filter { it.role == Role.HELPER_ROOT }) send(record, SIGSTOP) @@ -370,7 +444,6 @@ internal class SessionSuspendController( val current = try { readProcess(record.pid) } catch (_: Exception) { return false } if (current == null || current.started != record.started) return true if (current.state == 'T' || current.state == 't') return false - // A traced worker in 't' is usually PRoot handling a system call; 'T' is a job-control stop. return File(procRoot, "${record.pid}/task").listFiles().orEmpty().none { entry -> entry.name.toIntOrNull() != null && try { readStat(File(entry, "stat"))[0].first() == 'T' } catch (_: IOException) { false } @@ -384,6 +457,12 @@ internal class SessionSuspendController( const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L + const val READ_BACK_POLL_MS = 100L + const val READ_BACK_STABLE_POLLS = 5 + const val READ_BACK_TIMEOUT_MS = 5_000L + const val READ_BACK_HEADROOM_KB = 1_048_576L + const val READ_BACK_AVAILABLE_FACTOR = 2L + const val READ_BACK_TOTAL_SHARE = 10L const val RESTORE_CHECKS = 80 const val FREEZE_TIMEOUT_MS = 8_000L const val FREEZE_MAX_PASSES = 256 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 0c430c1c5..73d53d57d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -12,24 +12,25 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", + "dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls", "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", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", + "stretch16x9", "picturePosition", "railLabels", "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", - "guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics", + "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", + "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "storageDiagnostics", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "bootMovieApplyNext", "bootMovieSteamSeen", - "questDefaultsV1", + "questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsDash", "statsSpeedUnit", ) internal val SESSION_PREFIXES = listOf( - "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "suspendPolicy.", + "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", ) private val STEAM_TOUCH_KEYS = listOf("feedback", "autoFade", "gyro", "shake") @@ -37,6 +38,7 @@ object SettingsReset { internal fun isSessionSetting(key: String) = key in SESSION_KEYS || SESSION_PREFIXES.any { key.startsWith(it) } fun resetAll(context: Context, gameProfiles: Boolean, gameScopes: Collection<String> = emptyList()): Boolean { + if (!SessionPrefs.setGameDebugLogsEnabled(context, false)) return false var ok = true val session = context.getSharedPreferences("session", Context.MODE_PRIVATE) session.edit().apply { session.all.keys.filter { isSessionSetting(it) }.forEach { remove(it) } }.commit() diff --git a/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt new file mode 100644 index 000000000..a8857c739 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.session + +enum class StatsStrip(val id: String) { + PANEL("panel"), TILES("tiles"), RINGS("rings"); + + fun next(): StatsStrip = entries[(ordinal + 1) % entries.size] + + companion object { + fun from(id: String?): StatsStrip = entries.firstOrNull { it.id == id } ?: PANEL + } +} + +enum class SpeedUnit(val id: String, val label: String, val perKmh: Float) { + AUTO("auto", "", 1f), KMH("kmh", "km/h", 1f), MPH("mph", "mph", 0.621371f); + + fun resolve(country: String): SpeedUnit = if (this != AUTO) this else if (country.uppercase() in MPH_REGIONS) MPH else KMH + + fun next(): SpeedUnit = entries[(ordinal + 1) % entries.size] + + companion object { + private val MPH_REGIONS = setOf("US", "PR", "GU", "VI", "AS", "MP", "GB", "IM", "JE", "GG", "LR", "BS", "BZ") + + fun from(id: String?): SpeedUnit = entries.firstOrNull { it.id == id } ?: AUTO + } +} + +enum class StatsDash(val id: String) { + AUTO("auto"), SPEEDOMETER("speedometer"), CIRCUIT("circuit"), TRACE("trace"), DIALS("dials"), GLANCE("glance"); + + fun resolve(source: String): StatsDash = if (this != AUTO) this else when (source) { + "Forza" -> CIRCUIT + "OutGauge" -> DIALS + else -> SPEEDOMETER + } + + companion object { + private val DRAWN = listOf(SPEEDOMETER, CIRCUIT, TRACE, DIALS, GLANCE) + + fun from(id: String?): StatsDash = entries.firstOrNull { it.id == id } ?: AUTO + + fun tapped(shown: StatsDash): StatsDash = DRAWN[(DRAWN.indexOf(shown) + 1).mod(DRAWN.size)] + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt index 2a940a96f..9503e8e2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt @@ -7,12 +7,10 @@ import java.net.HttpURLConnection import java.net.URL import java.net.URLEncoder -/** steamdeckrepo.com's public boot video list, the same one its website and its own manager app read. */ object SteamDeckRepo { private const val TAG = "SteamDeckRepo" const val BASE = "https://steamdeckrepo.com" - /** The site shows twelve movies a page. */ const val PAGE_SIZE = 12 const val MAX_DOWNLOAD_BYTES = 120L shl 20 private const val MAX_JSON_BYTES = 1 shl 20 @@ -23,7 +21,6 @@ object SteamDeckRepo { TRENDING("trending"), DOWNLOADS("downloads-desc"), LIKES("likes-desc"), NEWEST("created_at-desc"), } - /** `null` is every device. */ val DEVICES = listOf("steam_deck", "steam_machine") class Post( @@ -36,7 +33,6 @@ object SteamDeckRepo { object Failed : Page() } - /** The text of [key], empty when it is missing or JSON null, which `optString` would turn into the word "null". */ private fun JSONObject.text(key: String): String = if (isNull(key)) "" else optString(key) fun parse(json: String): List<Post>? { @@ -83,10 +79,6 @@ object SteamDeckRepo { return result } - /** - * The number of the last page for a search, found by asking for pages: the site does not say how many there are, but a - * page past the end is empty and the last one is short. Null when the site cannot be reached. - */ fun lastPage(sort: Sort, device: String?, search: String, cap: Int = 512, count: (Int) -> Int? = { p -> (fetch(sort, device, search, p) as? Page.Ok)?.posts?.size }): Int? { @@ -111,7 +103,6 @@ object SteamDeckRepo { return good } - /** Reads [input] to its end, or null as soon as it holds more than [limit] bytes, so a huge answer is never kept whole. */ internal fun readLimited(input: java.io.InputStream, limit: Int): ByteArray? { val out = java.io.ByteArrayOutputStream() val buffer = ByteArray(16 * 1024) @@ -142,7 +133,6 @@ object SteamDeckRepo { } } - /** Fetches a small picture such as a cover; null when it cannot be had. */ fun bytes(url: String, limit: Int = 4 shl 20): ByteArray? { if (!url.startsWith("https://")) return null var connection: HttpURLConnection? = null @@ -161,10 +151,6 @@ object SteamDeckRepo { } } - /** - * Downloads a movie to [target] through the site's own download address, so the site counts it like a download from - * its website, and falls back to the video's address. True when a file was saved. - */ fun download(post: Post, target: File, onProgress: (Int) -> Unit = {}): Boolean { for (url in listOf("$BASE/post/download/${post.id}", post.video)) { if (save(url, target, onProgress)) return true 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 37f7c1fb9..ccc8693c3 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,48 +86,21 @@ 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 && now - lastContentActivityAt <= CONTENT_ACTIVITY_GRACE_MS } - private fun manifests(runtimeRoot: File, mounts: Map<String, File>): List<File> { - val steamRoots = linkedSetOf<File>() - for (home in STEAM_HOMES) { - val primary = File(runtimeRoot, home) - steamRoots += primary - val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") - runCatching { - PATH.findAll(libraryFolders.readText()).forEach { match -> - steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) - } - } - } - return steamRoots.flatMap { root -> - File(root, "steamapps").listFiles { file -> - file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") - }.orEmpty().toList() - } - } - - private fun hostPath(runtimeRoot: File, guest: String, mounts: Map<String, File>): File { - val path = guest.trimEnd('/') - for ((mount, host) in mounts) { - if (path == mount) return host - if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) - } - return File(runtimeRoot, path.removePrefix("/")) - } - private fun read(file: File): ManifestState { val text = runCatching { file.readText() }.getOrDefault("") val flags = value(text, "StateFlags")?.toLongOrNull() ?: 0L @@ -135,16 +109,52 @@ internal class SteamDownloadMonitor { return ManifestState(downloaded, flags != 4L && (total <= 0L || downloaded < total)) } - private fun value(text: String, key: String): String? = - Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + companion object { + fun clientInstallPending(runtimeRoot: File): Boolean { + val home = File(runtimeRoot, "root") + 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 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""") + internal fun manifests(runtimeRoot: File, mounts: Map<String, File>): List<File> { + val steamRoots = linkedSetOf<File>() + for (home in STEAM_HOMES) { + val primary = File(runtimeRoot, home) + steamRoots += primary + val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") + runCatching { + PATH.findAll(libraryFolders.readText()).forEach { match -> + steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) + } + } + } + return steamRoots.flatMap { root -> + File(root, "steamapps").listFiles { file -> + file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") + }.orEmpty().toList() + } + } + + private fun hostPath(runtimeRoot: File, guest: String, mounts: Map<String, File>): File { + val path = guest.trimEnd('/') + for ((mount, host) in mounts) { + if (path == mount) return host + if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) + } + return File(runtimeRoot, path.removePrefix("/")) + } + + internal fun value(text: String, key: String): String? = + Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + + private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L + private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L + private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L + private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") + internal val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") + internal val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") + private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt new file mode 100644 index 000000000..83b101db4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.io.RandomAccessFile + +data class SteamDownload( + val appId: String, + val name: String, + val done: Long, + val total: Long, + val shader: Boolean = false, + val paused: Boolean = false, +) + +object SteamDownloads { + fun read(runtimeRoot: File, mounts: Map<String, File> = emptyMap(), client: String? = null): List<SteamDownload> { + val names = HashMap<String, String>() + val apps = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { file -> + val text = runCatching { file.readText() }.getOrNull() ?: return@mapNotNull null + val id = SteamDownloadMonitor.value(text, "appid") ?: file.name.removePrefix("appmanifest_").removeSuffix(".acf") + val name = SteamDownloadMonitor.value(text, "name") ?: id + names[id] = name + fromManifest(id, name, text) + }.let(::onePerApp) + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val log = homes.map { File(runtimeRoot, "$it/logs/content_log.txt") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + val shaders = log?.let { runningShaderUpdates(tail(it)) }.orEmpty() + .map { SteamDownload(it, names[it] ?: it, 0L, 0L, shader = true) } + return apps + shaders + } + + internal fun onePerApp(downloads: List<SteamDownload>): List<SteamDownload> = + downloads.groupBy { it.appId }.values.map { same -> same.maxBy { it.done } } + + internal fun fromManifest(id: String, name: String, text: String): SteamDownload? { + val flags = SteamDownloadMonitor.value(text, "StateFlags")?.toLongOrNull() ?: 0L + if (flags == FULLY_INSTALLED) return null + val done = SteamDownloadMonitor.value(text, "BytesDownloaded")?.toLongOrNull() ?: 0L + val total = SteamDownloadMonitor.value(text, "BytesToDownload")?.toLongOrNull() ?: 0L + if (total > 0L && done >= total) return null + if ((flags and UPDATE_REQUIRED) == 0L && total <= 0L) return null + return SteamDownload(id, name, done, total, paused = (flags and UPDATE_PAUSED) != 0L) + } + + internal fun runningShaderUpdates(lines: Sequence<String>): List<String> { + val state = LinkedHashMap<String, Boolean>() + for (line in lines) { + if ("Client version:" in line) state.clear() + val match = SteamDownloadMonitor.CONTENT_UPDATE.find(line) ?: continue + if (match.groupValues[2] != "Shader") continue + val running = match.groupValues[3].let { "Running Update" in it && "Stopping" !in it } + state[match.groupValues[1]] = running + } + return state.filterValues { it }.keys.toList() + } + + private fun tail(file: File): Sequence<String> = runCatching { + RandomAccessFile(file, "r").use { raf -> + val start = (raf.length() - TAIL_BYTES).coerceAtLeast(0L) + raf.seek(start) + val bytes = ByteArray((raf.length() - start).toInt()) + raf.readFully(bytes) + String(bytes, Charsets.ISO_8859_1).lineSequence().drop(if (start > 0L) 1 else 0).toList().asSequence() + } + }.getOrDefault(emptySequence()) + + private const val FULLY_INSTALLED = 4L + private const val UPDATE_REQUIRED = 2L + private const val UPDATE_PAUSED = 512L + private const val TAIL_BYTES = 256L * 1024L +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt new file mode 100644 index 000000000..891fb57ca --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.session + +import java.io.File + +object SteamGameProcess { + fun matches(cmdline: ByteArray): Boolean { + val args = String(cmdline).split('\u0000') + for (i in args.indices) { + if (args[i] == "waitforexitandrun") return true + if (args[i] == "SteamLaunch" && args.getOrNull(i + 1)?.startsWith("AppId=") == true) return true + } + return false + } + + fun running(proc: File = File("/proc")): Boolean = proc.listFiles()?.any { p -> + p.name.all(Char::isDigit) && runCatching { File(p, "cmdline").readBytes() }.getOrNull()?.let(::matches) == true + } == true +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt new file mode 100644 index 000000000..736db34d9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import java.io.File + +object SteamImportPrompt { + data class Ask(val token: String, val games: List<String>) + + private fun folder(root: File) = File(root, "root/.cache/droiddeck") + + fun read(root: File): Ask? { + val text = runCatching { File(folder(root), "steam-import.json").readText() }.getOrNull() ?: return null + val json = runCatching { JSONObject(text) }.getOrNull() ?: return null + val token = json.optString("token").takeIf { it.isNotEmpty() } ?: return null + val list = json.optJSONArray("games") + val games = if (list == null) emptyList() else (0 until list.length()).mapNotNull { list.optString(it).takeIf(String::isNotBlank) } + return Ask(token, games) + } + + fun answer(root: File, token: String, now: Boolean): Boolean = runCatching { + val dir = folder(root).apply { mkdirs() } + val temp = File(dir, "steam-import.answer.tmp") + temp.writeText(JSONObject().put("token", token).put("choice", if (now) "now" else "later").toString()) + temp.renameTo(File(dir, "steam-import.answer")) + }.getOrDefault(false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt new file mode 100644 index 000000000..2d1ea267f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -0,0 +1,100 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.storage.StorageManager +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AddedGames +import java.io.File +import org.json.JSONArray +import org.json.JSONObject + +/** Steam libraries the user added beside the internal one and the card library, each a folder of its own. */ +object SteamLibraries { + const val GUEST_ROOT = "/mnt/droiddeck-lib" + // Each library costs a bind per redirected tool and prefix folder; the PRoot fast path holds 256 in all. + const val MAX = 4 + private val lock = Any() + + class Entry(val id: String, val path: String, val label: String) { + val host: File get() = File(path) + val guest: String get() = "$GUEST_ROOT/$id" + val x64Host: File get() = File(path, GameStorage.X64_CARD_DIR) + val x64Guest: String get() = "$guest/${GameStorage.X64_CARD_DIR}" + } + + fun list(context: Context): List<Entry> = parse(SessionPrefs.steamLibraries(context)) + + internal fun parse(json: String): List<Entry> { + if (json.isBlank()) return emptyList() + val array = runCatching { JSONArray(json) }.getOrNull() ?: return emptyList() + return (0 until array.length()).mapNotNull { i -> + val o = array.optJSONObject(i) ?: return@mapNotNull null + val id = o.optString("id") + val path = o.optString("path") + if (!id.matches(Regex("[0-9]{1,6}")) || path.isEmpty()) null else Entry(id, path, clean(o.optString("label")).ifEmpty { File(path).name }) + }.distinctBy { it.id } + } + + private fun save(context: Context, entries: List<Entry>) { + val array = JSONArray() + for (e in entries) array.put(JSONObject().put("id", e.id).put("path", e.path).put("label", e.label)) + SessionPrefs.setSteamLibraries(context, array.toString()) + } + + /** Steam's libraryfolders.vdf stores labels between quotes with no escaping DroidDeck relies on. */ + internal fun clean(label: String): String = label.replace('"', ' ').replace('\\', ' ').replace(Regex("\\s+"), " ").trim() + + sealed class AddResult { + class Added(val entry: Entry) : AddResult() + class Refused(val reason: String) : AddResult() + } + + fun add(context: Context, path: String, label: String = defaultLabel(context, File(path))): AddResult { + val entries = list(context) + if (entries.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + val host = canonical(File(path)) + val taken = entries.map { canonical(it.host) } + listOfNotNull( + GameStorage.effective(context)?.let { canonical(File(it.path)) }, + canonical(SessionPrefs.steamRoot(context, "arm64")), + ) + if (taken.any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + // Adding a Games folder itself is fine; a child of one would make it overlap and hide the rest of that folder. + if (AddedGames.roots(context).any { host.startsWith(canonical(it.host) + "/") }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + GameStorage.prepare(context, path)?.let { return AddResult.Refused(it) } + synchronized(lock) { + val current = list(context) + if (current.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + if (current.any { overlaps(canonical(it.host), host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + // A removed library's mount stays registered with Steam until its next session, so ids are never reused. + val next = maxOf(SessionPrefs.steamLibraryNextId(context), (current.maxOfOrNull { it.id.toInt() } ?: 0) + 1) + val entry = Entry(next.toString(), path, clean(label).ifEmpty { File(path).name }) + save(context, current + entry) + SessionPrefs.setSteamLibraryNextId(context, next + 1) + return AddResult.Added(entry) + } + } + + fun rename(context: Context, id: String, label: String) { + val name = clean(label).takeIf { it.isNotEmpty() } ?: return + synchronized(lock) { save(context, list(context).map { if (it.id == id) Entry(it.id, it.path, name) else it }) } + } + + /** Forgets the library; its folder and games stay where they are. */ + fun remove(context: Context, id: String) { + synchronized(lock) { save(context, list(context).filterNot { it.id == id }) } + } + + fun defaultLabel(context: Context, folder: File): String { + val volume = try { + context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) + } catch (e: Exception) { + null + } + val name = folder.name.ifEmpty { context.getString(R.string.gstore_folder) } + return clean(if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume)) + } + + internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") + + private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt new file mode 100644 index 000000000..356df06f7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.session + +import android.database.sqlite.SQLiteDatabase +import java.io.File +import javax.crypto.Cipher +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.PBEKeySpec +import javax.crypto.spec.SecretKeySpec + +data class WebCookie(val host: String, val header: String) + +object SteamWebLogin { + val HOSTS = listOf("steamcommunity.com", "steam-chat.com") + private const val COOKIES = "config/htmlcache/Default/Cookies" + private const val V10 = "v10" + private const val HOST_HASH_VERSION = 24 + private const val HOST_HASH_BYTES = 32 + + private val key: SecretKeySpec by lazy { + val spec = PBEKeySpec("peanuts".toCharArray(), "saltysalt".toByteArray(), 1, 128) + SecretKeySpec(SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1").generateSecret(spec).encoded, "AES") + } + + internal fun decrypt(encrypted: ByteArray, hostHashed: Boolean): String? = runCatching { + if (encrypted.size <= V10.length || String(encrypted, 0, V10.length, Charsets.US_ASCII) != V10) return null + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(ByteArray(16) { ' '.code.toByte() })) + val plain = cipher.doFinal(encrypted, V10.length, encrypted.size - V10.length) + val value = if (hostHashed && plain.size >= HOST_HASH_BYTES) plain.copyOfRange(HOST_HASH_BYTES, plain.size) else plain + String(value, Charsets.UTF_8) + }.getOrNull() + + internal fun header(name: String, value: String, httpOnly: Boolean): String { + val v = if (name == "steamLoginSecure") value.replace("||", "%7C%7C") else value + return "$name=$v; Path=/; Secure" + if (httpOnly) "; HttpOnly" else "" + } + + fun read(runtimeRoot: File, client: String?, scratch: File): List<WebCookie> { + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val store = homes.map { File(runtimeRoot, "$it/$COOKIES") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + ?: return emptyList() + scratch.deleteRecursively() + if (!scratch.mkdirs()) return emptyList() + return try { + val copy = File(scratch, "Cookies") + store.copyTo(copy, overwrite = true) + File(store.path + "-journal").takeIf { it.length() > 0L }?.copyTo(File(scratch, "Cookies-journal"), overwrite = true) + SQLiteDatabase.openDatabase(copy.path, null, SQLiteDatabase.OPEN_READWRITE).use { db -> + val version = db.rawQuery("SELECT value FROM meta WHERE key = 'version'", null).use { if (it.moveToFirst()) it.getString(0).toIntOrNull() else null } ?: 0 + val marks = HOSTS.joinToString { "?" } + db.rawQuery("SELECT host_key, name, value, encrypted_value, is_httponly FROM cookies WHERE host_key IN ($marks)", HOSTS.toTypedArray()).use { c -> + val out = ArrayList<WebCookie>() + while (c.moveToNext()) { + val name = c.getString(1) + val value = c.getString(2).takeUnless { it.isNullOrEmpty() } + ?: decrypt(c.getBlob(3) ?: continue, version >= HOST_HASH_VERSION) ?: continue + out += WebCookie(c.getString(0), header(name, value, c.getInt(4) != 0)) + } + out + } + } + } catch (_: Exception) { + emptyList() + } finally { + scratch.deleteRecursively() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt new file mode 100644 index 000000000..b3d884148 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.frontend.Library +import java.io.File + +object TelemetryOutput { + data class Game(val name: String, val prefixId: String, val file: File, val on: Boolean) + + data class MenuGame(val name: String, val setting: String, val port: Int) + + val MENU_GAMES: Map<Int, MenuGame> = mapOf( + 1293830 to MenuGame("Forza Horizon 4", "Data Out", GameTelemetry.FORZA_PORT), + 1551360 to MenuGame("Forza Horizon 5", "Data Out", GameTelemetry.FORZA_PORT), + 2440510 to MenuGame("Forza Motorsport", "Data Out", GameTelemetry.FORZA_PORT), + 284160 to MenuGame("BeamNG.drive", "OutGauge", GameTelemetry.OUTGAUGE_PORT), + ) + + internal const val ORIGINAL_SUFFIX = ".droiddeck-original" + private const val MY_GAMES = "pfx/drive_c/users/steamuser/Documents/My Games" + private const val CONFIG = "hardwaresettings/hardware_settings_config.xml" + private const val ADDRESS = "127.0.0.1" + private const val EXTRADATA = "3" + private val TAGS = listOf("udp", "motion") + private val BYTES = Charsets.ISO_8859_1 + + fun scan(compatdata: List<File>): List<Game> = compatdata.asSequence() + .flatMap { root -> root.listFiles { f -> f.isDirectory }.orEmpty().asSequence() } + .flatMap { prefix -> File(prefix, MY_GAMES).listFiles { f -> f.isDirectory }.orEmpty().asSequence().map { prefix to it } } + .mapNotNull { (prefix, game) -> + val file = File(game, CONFIG) + val text = runCatching { file.readText(BYTES) }.getOrNull() ?: return@mapNotNull null + val element = element(text) ?: return@mapNotNull null + Game(game.name, prefix.name, file, pointsHere(element.value)) + } + .sortedBy { it.name.lowercase() } + .toList() + + fun set(game: Game, on: Boolean): Boolean = runCatching { + val file = game.file + val original = File(file.path + ORIGINAL_SUFFIX) + val xml = file.readText(BYTES) + val next = if (on) { + if (!original.exists()) file.copyTo(original) + turnedOn(xml) + } else { + turnedOff(xml, original.takeIf { it.isFile }?.readText(BYTES)) + } + checkNotNull(next) + val tmp = File(file.path + ".droiddeck-tmp") + tmp.writeText(next, BYTES) + check(tmp.renameTo(file)) + if (!on) original.delete() + true + }.getOrDefault(false) + + fun applyAutomatic(context: Context, running: String?) { + if (!SessionPrefs.telemetryAuto(context)) return + automaticTargets(scan(Library.compatdataDirs(context)), SessionPrefs.telemetryOff(context), running).forEach { set(it, true) } + } + + internal fun key(game: Game) = "${game.prefixId}/${game.name}" + + internal fun automaticTargets(games: List<Game>, off: Set<String>, running: String?): List<Game> = + games.filter { !it.on && key(it) !in off && !isRunning(it.prefixId, running) } + + internal fun restoreTargets(games: List<Game>, running: String?): List<Game> = + games.filter { File(it.file.path + ORIGINAL_SUFFIX).isFile && !isRunning(it.prefixId, running) } + + internal fun isRunning(prefixId: String, running: String?): Boolean { + val id = running?.toLongOrNull() ?: return running != null + return prefixId == id.toString() || prefixId == id.toInt().toString() + } + + internal fun element(xml: String): MatchResult? = TAGS.firstNotNullOfOrNull { tag -> tagRegex(tag).find(xml) } + + internal fun pointsHere(element: String): Boolean = + attr(element, "enabled") == "true" && attr(element, "ip") == ADDRESS && + attr(element, "port") == GameTelemetry.CODEMASTERS_PORT.toString() && + (attr(element, "extradata") ?: EXTRADATA) == EXTRADATA + + internal fun turnedOn(xml: String): String? { + val element = element(xml) ?: return null + var on = withAttr(element.value, "enabled", "true") + on = withAttr(on, "ip", ADDRESS) + on = withAttr(on, "port", GameTelemetry.CODEMASTERS_PORT.toString()) + if (attr(on, "extradata") != null) on = withAttr(on, "extradata", EXTRADATA) + return xml.replaceRange(element.range, on) + } + + internal fun turnedOff(xml: String, original: String?): String? { + val element = element(xml) ?: return null + val tag = element.value.drop(1).takeWhile { !it.isWhitespace() } + val before = original?.let { tagRegex(tag).find(it)?.value } + return xml.replaceRange(element.range, before ?: withAttr(element.value, "enabled", "false")) + } + + internal fun attr(element: String, name: String): String? = + Regex("\\s$name=\"([^\"]*)\"").find(element)?.groupValues?.get(1) + + internal fun withAttr(element: String, name: String, value: String): String { + val existing = Regex("(\\s$name=\")[^\"]*\"") + if (existing.containsMatchIn(element)) return existing.replace(element) { it.groupValues[1] + value + "\"" } + val selfClosing = element.endsWith("/>") + val body = element.dropLast(if (selfClosing) 2 else 1).trimEnd() + return "$body $name=\"$value\"" + if (selfClosing) " />" else ">" + } + + private fun tagRegex(tag: String) = Regex("<$tag\\s[^>]*>") +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/UsbLink.kt b/app/src/main/java/com/droiddeck/launcher/session/UsbLink.kt new file mode 100644 index 000000000..fb322838d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/UsbLink.kt @@ -0,0 +1,122 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.storage.StorageManager +import com.droiddeck.launcher.frontend.AddedGames +import java.io.File + +object UsbLink { + data class Link(val device: String, val mbps: Double, val name: String, val portMbps: Double?, val plug: String = "") + + class SlowDrive(val key: String, val name: String, val mbps: Double, val portMbps: Double?) { + val portLimited get() = portMbps != null && portMbps < FAST_MBPS + } + + const val FAST_MBPS = 5000.0 + + fun markShown(context: Context, drive: SlowDrive) = synchronized(this) { + SessionPrefs.setSlowUsbDismissed(context, SessionPrefs.slowUsbDismissed(context) + drive.key) + } + + fun stillDue(context: Context, drive: SlowDrive) = + !SessionPrefs.slowUsbWarningOff(context) && drive.key !in SessionPrefs.slowUsbDismissed(context) + + fun slowLibrary(context: Context): SlowDrive? { + if (SessionPrefs.slowUsbWarningOff(context)) return null + val mounts = runCatching { File("/proc/self/mounts").readText() }.getOrNull() ?: return null + val sm = context.getSystemService(StorageManager::class.java) + val boot = runCatching { android.provider.Settings.Global.getInt(context.contentResolver, android.provider.Settings.Global.BOOT_COUNT) }.getOrDefault(0) + val drives = libraries(context).mapNotNull { path -> + val link = forPath(path, mounts) ?: return@mapNotNull null + if (link.mbps >= FAST_MBPS) return@mapNotNull null + val volume = runCatching { sm?.getStorageVolume(File(path))?.getDescription(context) }.getOrNull() + SlowDrive(dismissKey(boot, link), link.name.ifBlank { volume.orEmpty() }.ifBlank { File(path).name }, link.mbps, link.portMbps) + } + return synchronized(this) { + val dismissed = SessionPrefs.slowUsbDismissed(context) + val current = dismissed.intersect(drives.map { it.key }.toSet()) + if (current != dismissed) SessionPrefs.setSlowUsbDismissed(context, current) + drives.firstOrNull { it.key !in current } + } + } + + internal fun dismissKey(boot: Int, link: Link) = "$boot/${link.plug}/${link.device}@${link.mbps}" + + private fun libraries(context: Context): List<String> { + val pref = SessionPrefs.gameStorage(context) + val storage = when (pref) { + SessionPrefs.GAME_STORAGE_OFF -> null + "" -> GameStorage.effective(context)?.path + else -> pref + } + val folders = runCatching { AddedGames.roots(context).map { it.host.absolutePath } }.getOrDefault(emptyList()) + return (listOfNotNull(storage) + folders).map(::storagePath).filter { external(it) }.distinct() + } + + internal fun storagePath(path: String) = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path + + internal fun external(path: String) = path.startsWith("/storage/") && !path.startsWith("/storage/emulated/") && !path.startsWith("/storage/self/") + + fun forPath(path: String, mounts: String, sys: File = File("/sys")): Link? { + val device = mountDevice(rawPath(path), mounts) ?: return null + val block = blockDir(device, sys) ?: return null + val usb = usbDevice(block, sys) ?: return null + val mbps = readSpeed(usb) ?: return null + val name = listOf("manufacturer", "product").mapNotNull { read(File(usb, it)) }.joinToString(" ").trim() + val plug = listOf("busnum", "devnum").mapNotNull { read(File(usb, it)) }.joinToString("-") + return Link(device, mbps, name, portSpeed(usb, sys), plug) + } + + internal fun rawPath(path: String) = if (external(path)) "/mnt/media_rw/" + path.removePrefix("/storage/") else path + + internal fun mountDevice(path: String, mounts: String): String? { + var best: Pair<String, String>? = null + for (line in mounts.lineSequence()) { + val parts = line.split(' ') + if (parts.size < 2) continue + val point = parts[1].replace("\\040", " ") + if (path != point && !path.startsWith("${point.trimEnd('/')}/")) continue + if (best == null || point.length > best.first.length) best = point to parts[0] + } + val source = best?.second ?: return null + Regex(":(\\d+),(\\d+)$").find(source)?.let { return "${it.groupValues[1]}:${it.groupValues[2]}" } + return if (source.startsWith("/dev/block/") || source.startsWith("/dev/sd")) "name:" + source.substringAfterLast('/') else null + } + + internal fun blockDir(device: String, sys: File): File? { + if (device.startsWith("name:")) return File(sys, "class/block/${device.removePrefix("name:")}").takeIf { it.exists() }?.canonicalFile + File(sys, "dev/block/$device").takeIf { it.exists() }?.let { return it.canonicalFile } + return File(sys, "class/block").listFiles()?.firstOrNull { read(File(it, "dev")) == device }?.canonicalFile + } + + internal fun usbDevice(block: File, sys: File): File? { + val top = sys.canonicalFile + var dir: File? = block + while (dir != null && dir != top) { + if (File(dir, "speed").isFile && File(dir, "idVendor").isFile) return dir + dir = dir.parentFile + } + return null + } + + private fun portSpeed(usb: File, sys: File): Double? { + val bus = read(File(usb, "busnum")) ?: return null + val hub = File(sys, "bus/usb/devices/usb$bus").takeIf { it.exists() }?.canonicalFile ?: return null + val controller = hub.parentFile ?: return null + return controller.listFiles { f -> f.name.matches(Regex("usb\\d+")) }?.mapNotNull { readSpeed(it) }?.maxOrNull() + } + + private fun readSpeed(dir: File) = read(File(dir, "speed"))?.toDoubleOrNull() + + private fun read(file: File) = runCatching { file.readText().trim() }.getOrNull()?.takeIf { it.isNotEmpty() } + + fun generation(mbps: Double) = when { + mbps <= 12 -> "USB 1.1" + mbps < FAST_MBPS -> "USB 2.0" + mbps < 10000 -> "USB 3.2 Gen 1" + mbps < 20000 -> "USB 3.2 Gen 2" + else -> "USB 3.2 Gen 2x2" + } + + fun megabytesPerSecond(mbps: Double) = (mbps / 8 * 0.7).toInt() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt b/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt index 568188209..e38d1c454 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt @@ -10,17 +10,9 @@ import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -/** - * Source games state VAC-secure or insecure only in their console, which reaches a file (console.log in the - * mod folder) only with -condebug. The report quotes the lines it found and says inconclusive rather than guessing. - */ object VacDiagnostics { private const val TAG = "VacDiagnostics" - /** - * Checked by the launch wrapper. Lines: session start (epoch seconds), the Steam client it ran, then - * "length<tab>canonical path" for each console.log already there. - */ private const val MARKER = "root/.droiddeck-vac-diagnostics" private const val LAUNCHES = "root/.droiddeck-vac-launches" @@ -30,7 +22,6 @@ object VacDiagnostics { private const val MAX_QUOTED = 40 private val INSECURE = Regex("insecure mode", RegexOption.IGNORE_CASE) - // "Connecting to" is only an attempt: L4D2 refuses a VAC server with a dialog that never reaches the console. private val CONNECTED = Regex("^Connected to", RegexOption.IGNORE_CASE) private val ATTEMPTED = Regex("^Connecting to", RegexOption.IGNORE_CASE) private val NOTABLE = Regex("\\bVAC\\b|secure|Connected to|Connecting to|Disconnect|challenge|game coordinator", RegexOption.IGNORE_CASE) @@ -45,7 +36,6 @@ object VacDiagnostics { File(root, LAUNCHES).delete() if (enabled(context)) { val arch = SessionPrefs.steamClientArch(context) - // -condebug appends, so each console.log's length now is where this session's lines start. val sizes = consoleLogs(context, arch).joinToString("") { "${it.length()}\t${canonical(it)}\n" } marker.writeText("${System.currentTimeMillis() / 1000}\n$arch\n$sizes") } else marker.delete() @@ -57,7 +47,6 @@ object VacDiagnostics { private const val SNAPSHOT_MARKER = ".vac-marker" private const val SNAPSHOT_LAUNCHES = ".vac-launches" - /** Call when a session stops, before the next [arm] replaces its marker and launch list. */ fun snapshot(context: Context, dir: File) { val root = LinuxRuntime.rootDir(context) try { @@ -68,13 +57,13 @@ object VacDiagnostics { } } - fun collect(context: Context, dir: File) { + fun collect(context: Context, dir: File): Boolean { val root = LinuxRuntime.rootDir(context) val kept = File(dir, SNAPSHOT_MARKER).takeIf { it.isFile } val marker = kept ?: File(root, MARKER) val launchList = if (kept != null) File(dir, SNAPSHOT_LAUNCHES) else File(root, LAUNCHES) - if (!marker.isFile) return - try { + if (!marker.isFile) return true + return try { val armed = marker.readLines().map { it.trim() } val since = (armed.getOrNull(0)?.toLongOrNull() ?: 0L) * 1000 - 5_000 val arch = armed.getOrNull(1)?.takeIf { it.isNotEmpty() } ?: SessionPrefs.steamClientArch(context) @@ -125,8 +114,10 @@ object VacDiagnostics { File(dir, SNAPSHOT_MARKER).delete() File(dir, SNAPSHOT_LAUNCHES).delete() Log.i(TAG, "VAC diagnostics: ${consoles.size} console log(s), ${steamHits.size} client VAC line(s), into $dir") + true } catch (e: Exception) { Log.w(TAG, "collecting VAC diagnostics", e) + false } } @@ -143,7 +134,6 @@ object VacDiagnostics { "Inconclusive - the game never connected to a server. Join a VAC-secured server, then check again." } - /** Source writes <game>/<mod>/console.log, Source 2 <game>/game/<mod>/console.log. */ private fun consoleLogs(context: Context, arch: String): List<File> { val found = LinkedHashMap<String, File>() for (library in libraryRoots(context, arch)) { @@ -174,7 +164,6 @@ object VacDiagnostics { return roots.filter { it.isDirectory }.distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.path) } } - /** Two libraries can hold the same game and mod folder; a repeated name takes a tag from the log's path. */ internal fun consoleNames(logs: List<File>): List<String> { val used = HashSet<String>() return logs.map { log -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt b/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt index 8e4b24730..b7cc20a43 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt @@ -4,7 +4,6 @@ import android.util.Log import com.droiddeck.launcher.core.SessionPart import java.io.File -/** Steam's Remote Play V4L2 encoder in the guest talks to this MediaCodec encoder (venc.c, venc_server.cpp). */ class VideoEncodeBridge(val socket: File) : SessionPart() { override fun start() { socket.parentFile?.mkdirs() 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 2c5a1aa0d..21398bc4c 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,23 @@ object WinComponents { fun cached(context: Context): List<Component>? = runCatching { parse(File(context.filesDir, CATALOG_CACHE).readText()) }.getOrNull() + const val VCREDIST_ARM64 = "vcredist2022_arm64" + + 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 +130,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 } @@ -369,7 +383,6 @@ object WinComponents { val archiveName = archive.optString("name") val url = c.snapshot.substringBeforeLast('/') + "/" + archiveName val file = File(work, "${c.name}.files.tar.xz") - // The snapshot came straight from github.com, so its digest may vouch for a mirror's copy of the archive. val sha = archive.optString("sha256").takeIf { it.matches(Regex("(?i)[0-9a-f]{64}")) } if (!Downloader.downloadFile(url, file, false, sha) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { return null to "download failed: $archiveName" 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 000000000..d80099bdd --- /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/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index e707fd59f..de3648e83 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -28,6 +28,8 @@ object SteamStorage { private val LAST_PLAYED = Regex("^\\s*\"LastPlayed\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) private val MAPPING = Regex("\"(\\d+)\"\\s*\\{\\s*\"name\"\\s*\"([^\"]*)\"") private val COMPAT_NAME = Regex("\"compat_tools\"\\s*\\{\\s*\"([^\"]+)\"") + private val VDF_TOKEN = Regex("\"((?:\\\\.|[^\"\\\\])*)\"|[{}]|//[^\n]*") + private val SHADER_CACHE_OFF = listOf("InstallConfigStore", "Software", "Valve", "Steam", "ShaderCacheManager", "DisableShaderCache") data class Manifest( val file: File, val appId: Int, val name: String, val installDir: String?, @@ -46,7 +48,6 @@ object SteamStorage { ) } - /** The folder alone does not mean installed: Decky's CEF marker creates it. */ fun x64ClientPresent(root: File): Boolean = File(root, "steamrt64/steam").isFile || File(root, "package/droiddeck-installed").isFile || File(root, "steamapps").isDirectory @@ -56,7 +57,6 @@ object SteamStorage { private val PENDING_MANIFEST = Regex("appmanifest_(\\d+)\\.acf\\..+") - // A partial download has no manifest yet, only a temporary one and its staging folder. fun manifests(library: File): Listing? { val apps = File(library, "steamapps") val names = apps.list() ?: return null @@ -89,8 +89,6 @@ object SteamStorage { enum class Kind { ARM_PROTON, REQUIRED, OLD_RUNTIME, X86_PROTON } - // DroidDeck's ARM64 Steam client cannot run Valve's x86 Protons, and its own Proton and FEX tools - // replace the scout and soldier container runtimes. fun kind(m: Manifest): Kind { val dir = m.installDir.orEmpty() return when { @@ -118,11 +116,32 @@ object SteamStorage { return MAPPING.findAll(configVdf.substring(open, end)).associate { it.groupValues[1] to it.groupValues[2] } } + fun shaderPrecache(configVdf: String): Boolean = vdfValue(configVdf, SHADER_CACHE_OFF) != "1" + + private fun vdfValue(text: String, path: List<String>): String? { + val blocks = ArrayList<String>() + var key: String? = null + for (token in VDF_TOKEN.findAll(text)) { + val name = key + when { + token.value.startsWith("//") -> {} + token.value == "{" -> { blocks.add(name.orEmpty()); key = null } + token.value == "}" -> { blocks.removeLastOrNull(); key = null } + name == null -> key = token.groupValues[1] + else -> { + val at = blocks + name + if (at.size == path.size && at.zip(path).all { (a, b) -> a.equals(b, ignoreCase = true) }) return token.groupValues[1] + key = null + } + } + } + return null + } + fun compatToolName(compatibilityToolVdf: String): String? = COMPAT_NAME.find(compatibilityToolVdf)?.groupValues?.get(1) private val ARM_IN_NAME = Regex("arm64|aarch64") - // The x86-64 client ignores tools named for arm64; droiddeck-steam-x64 names its wrappers with a64 instead. fun x64ToolName(name: String): String = name.replace(ARM_IN_NAME, "a64") class ToolUse(val mappings: Map<String, String>, val installed: Set<String>, val x64: Boolean = false) { diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index 71eb79198..9c5fff91a 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -19,7 +19,7 @@ enum class Bucket { GAMES, GAME_DATA, TOOLS, COMPONENTS, STORES, DESKTOP, SYSTEM class GameUsage( val appId: Int, val name: String, val art: File?, val library: String, val internal: Boolean, val lastPlayed: Long, val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDir: File?, - val x64: Boolean = false, + val x64: Boolean = false, val prefixDir: File? = null, ) { val data: Long get() = prefix + shaders + workshop val total: Long get() = game + data @@ -89,7 +89,6 @@ object StorageScan { fun measure(file: File): Long = size(file).also { known[file.path] = it } } - // Proton tools' files live only in the arm64 client's root; the x86-64 client has wrappers of them. fun steamRoot(context: Context) = SessionPrefs.steamRoot(context, "arm64") fun scan(context: Context): StorageReport { @@ -113,7 +112,6 @@ object StorageScan { Library.steamLibraries(context, arch).map { (root, label) -> val internal = canonical(root) == primary val data = if (internal) root else SecondaryLibrary.privateRoot(files, root) - // The x86-64 card folder and its steamapps appear only with that client's first session and library write. val listing = SteamStorage.manifests(root) ?: SteamStorage.Listing(emptyList(), emptySet(), true).takeIf { x64 && (if (internal) !File(root, "steamapps").exists() else !root.exists() && root.parentFile?.isDirectory == true) @@ -127,7 +125,6 @@ object StorageScan { .filter { !SteamStorage.isTool(it) && it.installed }.map { it.appId.toString() }.toSet() val armUse = runCatching { SteamStorage.compatMappings(File(steamRoot, "config/config.vdf").readText()) }.getOrNull() ?.let { SteamStorage.ToolUse(it, installedGames(false)) } - // An x86-64 client without a config.vdf has never mapped a game to anything. val x64Vdf = x64Root?.let { File(it, "config/config.vdf") } val x64Use = if (x64Vdf == null || !x64Vdf.exists()) SteamStorage.ToolUse(emptyMap(), emptySet(), x64 = true) else runCatching { SteamStorage.ToolUse(SteamStorage.compatMappings(x64Vdf.readText()), installedGames(true), x64 = true) }.getOrNull() @@ -175,14 +172,16 @@ object StorageScan { } if (!m.installed) continue val gameBytes = dir?.let { File(lib.root, "steamapps/common/$it") }?.takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 - val prefix = File(lib.data, "steamapps/compatdata/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 + val compatRoot = File(lib.data, "steamapps/compatdata").takeIf { it.isDirectory } ?: File(lib.root, "steamapps/compatdata") + val prefixDir = File(compatRoot, m.appId.toString()).takeIf { it.isDirectory } + val prefix = prefixDir?.let { walker.measure(it) } ?: 0 val shaderDir = File(lib.data, "steamapps/shadercache/${m.appId}").takeIf { it.isDirectory } val shaders = shaderDir?.let { walker.measure(it) } ?: 0 val workshop = File(lib.root, "steamapps/workshop/content/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 val known = art[lib.x64]?.get(m.appId) games.add(GameUsage( m.appId, known?.name ?: m.name, known?.art, lib.label, lib.internal, m.lastPlayed, - gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, + gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, prefixDir, )) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index 0724dd8dd..503e769be 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -115,7 +115,6 @@ object StorageState { }, "storage-remove-tool").start() } - // Every action works from a fresh scan so nothing is deleted on the strength of an older one. private fun act(context: Context, name: String, action: (Context, StorageReport) -> Boolean, onDone: (Long?) -> Unit = {}) { if (cleaning || SessionState.running) { onDone(null); return } val app = context.applicationContext @@ -134,12 +133,18 @@ object StorageState { }, "storage-$name").start() } - // A game can be installed in both Steam clients, and an id can be left over in several libraries. fun clearShaders(context: Context, appId: Int, x64: Boolean = false) = act(context, "shaders-$appId", { _, fresh -> val dir = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDir ?: return@act false FileOps.delete(dir) }) + fun resetPrefix(context: Context, game: GameUsage) = act(context, "prefix-${game.appId}", { _, fresh -> + val dir = fresh.games.firstOrNull { it.appId == game.appId && it.x64 == game.x64 && it.prefixDir?.path == game.prefixDir?.path } + ?.prefixDir ?: error("prefix not found") + check(FileOps.delete(dir)) { "cannot delete $dir" } + true + }) + fun removeLeftover(context: Context, l: Leftover) = act(context, "leftover-${l.appId}", { _, fresh -> val leftover = fresh.leftovers.firstOrNull { it.appId == l.appId && it.prefix?.path == l.prefix?.path && it.shaders?.path == l.shaders?.path } ?: return@act false @@ -197,7 +202,6 @@ object StorageState { } } - // Steam treats an app as installed while its manifest exists, so the manifest goes first. private fun deleteTool(tool: ToolUsage) { tool.manifests.forEach { check(!it.exists() || it.delete()) { "cannot delete $it" } } tool.dirs.forEach { FileOps.delete(it) } 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 194448f0c..2b52fe358 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,24 @@ 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) + + 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 669a13eee..ace330415 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,30 @@ 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 } } + 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 +148,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 +166,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 +188,76 @@ 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) + + 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) + 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() } @@ -148,9 +270,6 @@ object CloudSaves { fun upload(context: Context, store: Store, id: String, force: Boolean = false): Result = sync(context, store, id, "up") { dir, cloud -> upWith(context, store, id, dir, cloud, force) } - fun keepCloud(context: Context, store: Store, id: String): Result = download(context, store, id, force = true) - fun keepLocal(context: Context, store: Store, id: String): Result = upload(context, store, id, force = true) - fun downloadOrDefer(context: Context, store: Store, id: String): Result = downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }) @@ -180,6 +299,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 +309,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 33c34196f..3d46a28da 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,97 @@ 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 } + +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 { +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) +} + +internal fun gogRelativeNames(files: List<CloudFile>, location: String?): Pair<String?, List<CloudFile>> { + val locations = files.mapNotNull { splitGogName(it.name).first }.distinct() + 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 +144,34 @@ 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) + } + + 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 +180,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 aa0748423..89b393654 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,7 @@ import javax.crypto.spec.GCMParameterSpec object CredentialCipher { const val VERSION = 1 + 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 +21,10 @@ object CredentialCipher { fun key(): SecretKey fun existing(): SecretKey = key() + + fun legacy(): SecretKey = existing() + + val version: Int get() = VERSION } class KeyMissing : java.security.GeneralSecurityException("no key") @@ -30,32 +34,30 @@ object CredentialCipher { e is KeyMissing || e is org.json.JSONException || e is IllegalArgumentException 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 +66,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 bf9d5f6dc..79ca0f849 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 2da56ecfb..a21972dba 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -24,14 +24,14 @@ object SteamLiveShortcuts { if (wanted.isEmpty()) return true if (!clientRunning()) return false 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; })() @@ -48,7 +48,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 @@ -94,6 +94,28 @@ object SteamLiveShortcuts { if (evaluate(context, js) != null) Log.i(TAG, "live shortcuts: updated $id") } + fun launchOptions(context: Context, appId: Long): String? { + if (!clientRunning()) return null + val js = """ + new Promise(done => { + let handle = null, answer; + const finish = d => { clearTimeout(timer); try { handle?.unregister(); } catch (e) {} done(d); }; + const timer = setTimeout(() => finish(null), 4000); + handle = SteamClient.Apps.RegisterForAppDetails(${appId and 0xFFFFFFFFL}, d => { answer = d; if (handle) finish(d); }); + if (answer !== undefined) finish(answer); + }).then(d => typeof d?.strLaunchOptions === 'string' ? d.strLaunchOptions : null) + """.trimIndent() + return evaluate(context, js) + } + + fun setLaunchOptions(context: Context, appId: Long, options: String): Boolean { + if (!clientRunning()) return false + val id = appId and 0xFFFFFFFFL + val done = evaluate(context, "(async () => { SteamClient.Apps.SetAppLaunchOptions($id, ${JSONObject.quote(options)}); return 1; })()") != null + if (done) Log.i(TAG, "live: launch options for $id") + return done + } + fun setArt(context: Context, appId: Long, assetType: Int?, file: java.io.File?, iconPath: String? = null) { if (!clientRunning()) return val id = appId and 0xFFFFFFFFL @@ -110,7 +132,6 @@ object SteamLiveShortcuts { if (evaluate(context, js) != null) Log.i(TAG, "live shortcuts: art $assetType for $id") } - /** Moves and resizes a game's logo in the running client; with null the client's default position comes back. */ fun setLogoPosition(context: Context, appId: Long, position: LogoPosition.Value?) { if (!clientRunning()) return val id = appId and 0xFFFFFFFFL @@ -163,12 +184,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 b5e0d1fbf..54476b6e1 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 a740eb088..5de9b5e1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -90,11 +90,11 @@ 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 } } - /** The name the Stores page shows. Xbox shows the gamertag, else the sign-in email with its name part masked. */ fun displayName(context: Context, store: Store): String? { if (store != Store.XBOX) return signedInAs(context, store) val json = read(context, store) ?: return if (isUnavailable(store)) store.label else null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt index 14415fd9c..2b86be8b2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt @@ -29,7 +29,6 @@ object StoreArt { return writeLogo(get(url) ?: return false, dst) } - /** A logo is drawn over the hero, so it stays a PNG with its transparency instead of going through [place]. */ internal fun writeLogo(bytes: ByteArray, dst: File): Boolean { if (dst.isFile && dst.length() > 0) return true val bitmap = runCatching { BitmapFactory.decodeByteArray(bytes, 0, bytes.size) }.getOrNull() ?: return false 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 cfb0ed53d..ad59e511a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -26,7 +26,6 @@ data class CatalogItem( val logoUrl: String? = null, ) { val accessible: Boolean get() = owned || subscription - /** Licensed now, or a supported package the account's subscription can install. */ val installable: Boolean get() = accessible || includedWith.isNotBlank() val isDiscounted: Boolean get() = discountPercent > 0 && originalPrice.isNotBlank() val key: String get() = "${store.id}:$id" @@ -61,36 +60,40 @@ 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. */ fun detailCatalogItem( store: Store, id: String, @@ -109,11 +112,6 @@ fun mergeItems(old: List<CatalogItem>?, new: List<CatalogItem>): List<CatalogIte return if (merged.size == old.size && merged.indices.all { merged[it] === old[it] }) old else merged } -/** - * [patched] over [old] by key, the way a store that fills its cards in one at a time needs it: a card - * already on screen keeps its very object and its place, one the grid does not have yet is added where - * its title belongs. Unlike [mergeItems] the rest of [old] is never dropped. - */ fun patchItems(old: List<CatalogItem>?, patched: List<CatalogItem>): List<CatalogItem> { if (old.isNullOrEmpty()) return patched val byKey = patched.associateBy { it.key } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt index aa42aa75e..e4d828372 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt @@ -63,7 +63,7 @@ class StoreGameSidecar( val file = File(folder, FILE_NAME) val tmp = File(folder, "$FILE_NAME.tmp") tmp.writeText(toJson().toString(2)) - if (!tmp.renameTo(file)) { file.delete(); tmp.renameTo(file) } + if (!tmp.renameTo(file)) java.nio.file.Files.move(tmp.toPath(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING) } companion object { 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 611b7f3db..c26bcd17d 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 @@ -38,7 +39,6 @@ object StoreInstallRoot { } catch (e: Exception) { StoresState.logLine("storage: StatFs failed for store install target (${e.javaClass.simpleName})") try { - // File's zero also means an unavailable measurement; only StatFs establishes zero. usableBytes(existing).takeIf { it > 0L } ?: SPACE_UNKNOWN } catch (fallback: Exception) { StoresState.logLine("storage: usable-space fallback failed for store install target (${fallback.javaClass.simpleName})") @@ -50,19 +50,12 @@ object StoreInstallRoot { @JvmStatic fun insufficientSpace(required: Long, available: Long): Boolean = required > 0L && available >= 0L && available < required - /** - * The catalog size is the known minimum for an install. Epic's actual chunk-cache requirement - * is determined from its manifest before chunk downloads begin. - */ fun estimatedBytesNeeded(item: CatalogItem): Long = StoreSizes.size(item).coerceAtLeast(0L) - /** Pre-install storage check to detect insufficient space before starting. */ fun checkStorage(context: Context, item: CatalogItem, targetRoot: File): StorageCheck { val size = estimatedBytesNeeded(item) val existing = existingFolder(context, item.store, item.id, item.title) val freeTarget = availableBytes(existing ?: targetRoot) - // Backends account for completed files on resume; the catalog cannot describe remaining work. - // Comparing the full catalog size to remaining free space would reject valid resumes. if (item.store == Store.EPIC || existing != null) return StorageCheck(enough = true, requiredBytes = size, availableBytes = freeTarget) if (size <= 0L) return StorageCheck(enough = true, requiredBytes = 0L, availableBytes = freeTarget) if (insufficientSpace(size, freeTarget)) { @@ -76,49 +69,143 @@ 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 + 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 "$base-${pathKey(root)}".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) + } + } + + fun externalRootsForXodus(context: Context): List<Pair<File, String>> { + val roots = externalRoots(context) + val selectedLibrary = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } + ?.takeUnless { isInternal(context, it) } ?: return roots + return withSelectedLibrary(roots, selectedLibrary, guestFor(context, selectedLibrary)) + } + + internal fun withSelectedLibrary(roots: List<Pair<File, String>>, library: File, base: String): List<Pair<File, String>> { + if (roots.any { it.first.absolutePath == library.absolutePath }) return roots + val guest = if (roots.none { it.second == base }) base else "$base-${pathKey(library)}" + return roots + (library to guest) + } + + private fun pathKey(root: File): String = "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + + 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-]"), "") - val key = uuid ?: "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + val key = uuid ?: pathKey(root) return "$GUEST_EXTERNAL/$key" } 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,11 +241,12 @@ 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 { sidecar == null -> Unfinished(store, null, folder) + store == Store.GOG && sidecar.state == StoreGameSidecar.STATE_UPDATING -> null !sidecar.isInstalled -> Unfinished(store, sidecar.id, folder) else -> null } 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 65fdf6e92..c29ea4165 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -19,7 +19,6 @@ object StoreInstalls { StoreGameSidecar(store, id, title, exe = "", cover = cover, hero = hero, state = StoreGameSidecar.STATE_INSTALLING).write(folder) } - /** Epic commits verified files individually, not a whole-game transaction. Keep updates resumable. */ @JvmStatic fun markUpdating(folder: File) { val before = StoreGameSidecar.read(folder) ?: return @@ -30,7 +29,12 @@ object StoreInstalls { it.write(before.copy(state = StoreGameSidecar.STATE_UPDATING, installVersion = "").toJson().toString(2).toByteArray(Charsets.UTF_8)) it.fd.sync() } - Files.move(stage.toPath(), StoreGameSidecar.file(folder).toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING) + val record = StoreGameSidecar.file(folder).toPath() + try { + Files.move(stage.toPath(), record, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING) + } catch (e: java.nio.file.AtomicMoveNotSupportedException) { + Files.move(stage.toPath(), record, StandardCopyOption.REPLACE_EXISTING) + } } finally { stage.delete() } @@ -70,7 +74,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 +102,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/StoreLanguage.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt index bc9afe3c2..c8ab32800 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt @@ -6,18 +6,9 @@ import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONArray import java.util.Locale -/** - * Language for a third-party store install ([Store.GOG], [Store.EPIC]): the app/system locale by - * default, or the code the user picked in the install dialog / store settings. - * - * GOG depots and Epic install tags use overlapping but not identical codes (`en` vs `en-US`, - * `nb` vs `no`). Matching is on the language part plus a few aliases, so a Polish phone selects - * `pl-PL` depots without the user having to know the store's spelling. - */ object StoreLanguage { const val EXTRA = "installLanguage" - /** Codes the settings list and Epic's tag table share; GOG often uses the same with a region. */ val KNOWN: List<String> = listOf( "en", "pl", "de", "fr", "es", "es-419", "pt", "pt-BR", "it", "ru", "uk", "cs", "hu", "nl", "sv", "da", "fi", "nb", "ro", "bg", "el", "tr", "ar", "th", "vi", "ja", "ko", @@ -36,7 +27,6 @@ object StoreLanguage { fun selectable(store: Store): Boolean = store == Store.GOG || store == Store.EPIC - /** Tag actually sent to the store: settings override, else the app/system locale. */ @JvmStatic fun preferredCode(context: Context): String { val chosen = SessionPrefs.storesInstallLanguage(context) @@ -68,10 +58,6 @@ object StoreLanguage { fun fallbackList(store: Store): List<String> = if (selectable(store)) KNOWN else emptyList() - /** - * One code from [available]. An exact normalized code wins (`pl-PL` over `pl`). A base-language - * match is used only when that exact code is not offered, then English, then the first code. - */ @JvmStatic fun pick(available: List<String>, preferred: String): String { if (available.isEmpty()) return preferred @@ -82,11 +68,6 @@ object StoreLanguage { ?: available.first() } - /** - * True when a GOG depot whose `languages` array is [listed] overlaps [chosen], including a - * base-language match (`pl` accepts `pl-PL`). Shared depots (`*`, empty, missing) always match. - * Install selection uses [depotMatchesResolved] after [pick] has chosen a single code. - */ @JvmStatic fun depotAccepted(listed: Array<String>?, chosen: String): Boolean { if (listed.isNullOrEmpty()) return true @@ -97,10 +78,6 @@ object StoreLanguage { } } - /** - * True when [listed] is shared, or contains the one code [resolved] already selected. - * `pl-PL` does not also keep a `pl` depot. - */ @JvmStatic fun depotMatchesResolved(listed: Array<String>?, resolved: String): Boolean { if (listed.isNullOrEmpty()) return true @@ -109,7 +86,6 @@ object StoreLanguage { return listed.any { primary(it) == want } } - /** Normalized code without collapsing to the base language. `pl-PL` stays `pl-pl`. */ internal fun primary(code: String): String? { val raw = code.trim().lowercase().replace('_', '-') if (raw.isEmpty()) return null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt index bd94cfc3b..95cd69ebd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt @@ -26,7 +26,6 @@ object StoreLogFiles { private val CLOCK = SimpleDateFormat("HH:mm:ss.SSS", Locale.US) - /** Appends [text] with a time stamp. Works in any of the app's processes. */ fun stamped(context: Context, text: String) = append(context, "${synchronized(CLOCK) { CLOCK.format(Date()) }} $text") fun append(context: Context, line: String) { 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 1b5c6ccdd..fbf871445 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() @@ -101,6 +102,7 @@ class StoreLoginActivity : ComponentActivity() { if (flow == null) { finish(); return } val chrome = buildChrome() setContentView(chrome) + com.droiddeck.launcher.core.SystemInsets.fit(chrome) if (flooded) { chrome.alpha = 0f chrome.translationY = dp(14).toFloat() @@ -130,7 +132,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() { @@ -182,10 +184,6 @@ class StoreLoginActivity : ComponentActivity() { return root } - /** - * The activity handles density changes itself so that folding between two displays of different - * density keeps the page and the sign-in in progress; the dp-based chrome sizes are applied again. - */ override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) if (!::topBar.isInitialized) return @@ -220,7 +218,6 @@ class StoreLoginActivity : ComponentActivity() { setBackgroundColor(0xFF0A0B0D.toInt()) settings.javaScriptEnabled = true settings.domStorageEnabled = true - // Store sign-in pages are web pages; they never need to read local files or content:// URIs. settings.allowFileAccess = false settings.allowContentAccess = false settings.userAgentString = userAgent 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 454e3d23b..290676c9e 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 317757a8b..cf774f47b 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,22 +78,24 @@ 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) } - } + StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.store == Store.GOG && it.state == StoreGameSidecar.STATE_UPDATING }?.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 engine = version accountsLoaded = true } + com.droiddeck.launcher.stores.gog.GogMaintenance.checkInstalled(app, onDisk) } } } @@ -126,7 +130,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 +143,17 @@ object StoresState { if (force || !shelves.containsKey(store)) backend.loadShelves(app, force) } + private val libraryAsked = java.util.concurrent.ConcurrentHashMap<Store, Long>() + + 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,20 @@ 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() + com.droiddeck.launcher.stores.itch.ItchUpdates.clear(app) + } 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) + var openGameRequest by mutableStateOf<String?>(null) private fun askForNotifications(context: Context) { val activity = context as? android.app.Activity ?: return @@ -194,18 +217,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,10 +276,15 @@ 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 } uninstalling.remove(key) + if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) } }) main.post(onDone) @@ -278,10 +321,6 @@ object StoresState { internal fun post(block: () -> Unit) = main.post(block) - /** - * A worker thread whose failure is logged. An uncaught exception on a plain Thread reaches the crash - * handler, which ends the whole app, and none of these jobs is worth that. - */ private fun background(name: String, onFailure: () -> Unit = {}, block: () -> Unit) { Thread({ try { 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 000000000..0fe38c49d --- /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 000000000..737ba3b4f --- /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 000000000..3fc972ab2 --- /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/DownloadModels.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt index 8683efa06..57f07742c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt @@ -31,6 +31,9 @@ data class DownloadEntry( val stageItemsTotal: Int = 0, val diskBytes: Long = 0L, val stagesPassed: Int = 0, + val interruptible: Boolean = true, + val reusedBytes: Long = 0L, + val appliedBytes: Long = 0L, ) { fun passed(s: DownloadStage): Boolean = state == DownloadState.INSTALLED || (stagesPassed and (1 shl s.ordinal)) != 0 diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index cfb1324f0..379161ebf 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -21,6 +21,11 @@ object DownloadQueue { fun diskSize(bytes: Long) = update(key) { if (bytes > 0) it.copy(diskBytes = bytes) else it } fun progress(bytesDone: Long, bytesTotal: Long, detail: String? = null, @Suppress("UNUSED_PARAMETER") speedBps: Long = -1L) = measure(key, bytesDone, bytesTotal, detail?.let(::stripSpeed)) fun log(line: String) = StoresState.logLine(line) + fun interruptible(value: Boolean) = update(key) { + check(value || !cancelled.get()) { "The operation was paused before installer application" } + it.copy(interruptible = value) + } + fun maintenance(reusedBytes: Long, appliedBytes: Long) = update(key) { it.copy(reusedBytes = reusedBytes, appliedBytes = appliedBytes) } } private fun stripSpeed(s: String): String = s.replace(Regex("\\s+\\S+ [KMG]B/s\\s*$"), "").trimEnd() @@ -137,7 +142,6 @@ object DownloadQueue { advance(app) } - /** Immediately records a failed download (e.g. from pre-flight storage check). */ fun recordFailed(context: Context, entry: DownloadEntry, error: String, retry: (() -> Unit)? = null) { val app = context.applicationContext val now = System.currentTimeMillis() @@ -166,12 +170,13 @@ object DownloadQueue { fun pause(key: String) { val item = synchronized(lock) { items[key] } ?: return synchronized(lock) { + if (!item.entry.interruptible) return if (item.entry.state == DownloadState.QUEUED) { item.entry = item.entry.copy(state = DownloadState.PAUSED, queuePosition = 0); renumber(); publishLocked(); return } if (item.entry.state != DownloadState.RUNNING) return item.pauseRequested = true + item.cancelled.set(true) + item.job?.cancel(deleteFiles = false) } - item.cancelled.set(true) - item.job?.cancel(deleteFiles = false) StoresState.logLine("paused \"${item.entry.name}\"") } @@ -190,7 +195,6 @@ object DownloadQueue { renumber() publishLocked() } - // A preflight retry rechecks storage and enqueues the real backend, never a running placeholder. if (retry != null) { retry(); return } StoresState.logLine("resumed \"${entry(key)?.name}\"") advance(app) @@ -204,17 +208,19 @@ object DownloadQueue { val wasRunning: Boolean synchronized(lock) { item = items[key] ?: return + if (!item.entry.interruptible) return wasRunning = item.entry.state == DownloadState.RUNNING + if (wasRunning) { + item.cancelled.set(true) + item.job?.cancel(deleteFiles = true) + } if (!wasRunning) { item.entry = item.entry.copy(state = DownloadState.CANCELLED, queuePosition = 0, finishedAt = System.currentTimeMillis()) renumber() publishLocked() } } - if (wasRunning) { - item.cancelled.set(true) - item.job?.cancel(deleteFiles = true) - } else { + if (!wasRunning) { Thread({ runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } }, "store-dl-cancel").start() } StoresState.logLine("cancelled \"${item.entry.name}\"") 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 a9a25759e..99d08d6b8 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 @@ -45,7 +45,7 @@ object SavedQueue { val f = File(context.filesDir, FILE) val tmp = File(context.filesDir, "$FILE.tmp") tmp.writeText(out.toString()) - tmp.renameTo(f) + java.nio.file.Files.move(tmp.toPath(), f.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING) }.onFailure { Log.w(TAG, "could not save the queue", it) } } } @@ -68,7 +68,12 @@ object SavedQueue { for ((item, root, paused) in back) { if (DownloadQueue.entry(key(item)) != null) continue if (paused) DownloadQueue.holdPaused(key(item)) - StoresState.install(app, item, root) + if (item.store == Store.GOG && item.extra.containsKey(com.droiddeck.launcher.stores.gog.GogMaintenance.OPERATION)) { + Thread({ + runCatching { com.droiddeck.launcher.stores.gog.GogMaintenance.restore(app, item) } + .onFailure { DownloadQueue.recordFailed(app, DownloadEntry(item.store, item.id, item.title), it.message ?: "GOG recovery failed") } + }, "gog-restore").start() + } else StoresState.install(app, item, root) } } }, "store-queue-restore").start() @@ -79,7 +84,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 +95,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/download/StoreDownloadService.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt index 53a6dcaef..317487e0c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/StoreDownloadService.kt @@ -39,7 +39,10 @@ class StoreDownloadService : Service() { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { instance = this - startForegroundCompat(build()) + if (!startForegroundCompat(build())) { + onTimeout(startId, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) + return START_NOT_STICKY + } val key = intent?.getStringExtra(EXTRA_KEY) when (intent?.action) { ACTION_PAUSE -> key?.let { @@ -155,10 +158,9 @@ class StoreDownloadService : Service() { wakeAt = 0L } - private fun startForegroundCompat(n: Notification) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) startForeground(ID, n, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) - else startForeground(ID, n) - } + private fun startForegroundCompat(n: Notification): Boolean = + com.droiddeck.launcher.core.ForegroundServices.start(this, ID, n, + android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) private fun stopNow() { releaseLocks() 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 316cabb65..394164c4c 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,7 @@ 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 } } + 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 +57,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 7f0e86b14..454d94826 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 8521a90f5..e5ea933d8 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/GogAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt index 8e58fab03..6a1e5f65c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt @@ -33,6 +33,7 @@ object GogAuth { @Synchronized private fun saveAccount(context: Context, accessToken: String, refreshToken: String?, userId: String?) { + GogMaintenance.reset() var username = "" runCatching { val body = StoreNet.get("https://embed.gog.com/userData.json", bearer = accessToken, userAgent = GALAXY_UA) @@ -46,8 +47,6 @@ object GogAuth { Log.i(TAG, "signed in") } - fun storedToken(context: Context): String? = StoreAccounts.read(context, Store.GOG)?.optString("access_token", "")?.ifEmpty { null } - @JvmStatic @Synchronized fun validToken(context: Context): String? { 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 acb7333e8..fe2153193 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 @@ -28,6 +28,7 @@ object GogBackend : StoreBackend { } override fun signOut(context: Context) { + GogMaintenance.reset() GogPrefs.get(context).edit().remove("library_cache").remove("library_cache_v2").remove("library_synced_at").apply() } @@ -41,19 +42,20 @@ object GogBackend : StoreBackend { if (!quiet) StoresState.status[store] = app.getString(com.droiddeck.launcher.R.string.stores_sync_library) } val result = GogLibrary.sync(app, force, onStatus = { line -> if (!quiet) StoresState.post { StoresState.status[store] = line } }, onList = { list -> - // Mapped here, off the main thread: the listing paints the tab before any product is asked about. val items = list.map { GogLibrary.toCatalogItem(app, it) } - // An empty listing is not news: posting it would drop the cards already on screen. if (items.isNotEmpty()) StoresState.post { StoresState.library[store] = com.droiddeck.launcher.stores.mergeItems(StoresState.library[store], items) } }, onItems = { changed -> - // Only the products that came back are touched: a card already on screen keeps its object, and a product the grid has not seen yet is added where its title belongs. val items = changed.map { GogLibrary.toCatalogItem(app, it) } StoresState.post { StoresState.library[store] = com.droiddeck.launcher.stores.patchItems(StoresState.library[store], items) } }) StoresState.post { StoresState.status.remove(store) when (result) { - is GogLibrary.SyncResult.Ok -> { StoresState.library[store] = com.droiddeck.launcher.stores.mergeItems(StoresState.library[store], result.games.map { GogLibrary.toCatalogItem(app, it) }); StoresState.problems.remove(store) } + is GogLibrary.SyncResult.Ok -> { + StoresState.library[store] = com.droiddeck.launcher.stores.mergeItems(StoresState.library[store], result.games.map { GogLibrary.toCatalogItem(app, it) }) + StoresState.problems.remove(store) + GogMaintenance.checkInstalled(app, StoresState.installed) + } is GogLibrary.SyncResult.Failed -> StoresState.problems[store] = result.message GogLibrary.SyncResult.NotLoggedIn -> StoresState.problems[store] = StoresState.notSignedInLine(store) GogLibrary.SyncResult.Busy -> {} @@ -90,7 +92,6 @@ object GogBackend : StoreBackend { private fun fetchLogo(id: String): String? = runCatching { StoreNet.get("https://api.gog.com/v2/games/$id?locale=en-US")?.let { logoOf(JSONObject(it)) } }.getOrNull() - /** `images.logo2x` from the products API is an opaque banner, not a logo; the v2 `logo` link is a transparent PNG. */ internal fun logoOf(v2: JSONObject): String? = GogStoreCatalog.absolutize(v2.optJSONObject("_links")?.optJSONObject("logo")?.optString("href")).takeIf { it.startsWith("https://") } @@ -102,24 +103,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/GogContent.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogContent.kt new file mode 100644 index 000000000..3d86fd585 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogContent.kt @@ -0,0 +1,187 @@ +package com.droiddeck.launcher.stores.gog + +import android.content.Context +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONArray +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.util.zip.GZIPInputStream +import java.util.zip.InflaterInputStream + +internal object GogContent { + const val SYSTEM = "https://content-system.gog.com" + const val CDN = "https://gog-cdn-fastly.gog.com/content-system" + + fun token(context: Context) = GogAuth.validToken(context) ?: error("Sign in to GOG and retry") + + fun builds(id: String, token: String): JSONObject { + val result = json("$SYSTEM/products/$id/os/windows/builds?generation=2", token) + if (result.optJSONArray("items")?.length() != 0) return result + return json("$SYSTEM/products/$id/os/windows/builds?generation=1", token) + } + + fun product(id: String, token: String): JSONObject = json("https://api.gog.com/products/$id?expand=downloads", token) + + fun downloadFilename(url: String): String = java.net.URLDecoder.decode(URL(url).path.substringAfterLast('/').replace("+", "%2B"), "UTF-8") + + fun resolveDownload(download: GogOfflineDownload, token: String): GogOfflineDownload = download.copy(parts = download.parts.map { part -> + val resolved = GogDownloadManager.resolveRedirect(part.url, token) ?: error("The GOG download link is unavailable") + val connection = URL(resolved).openConnection() as HttpURLConnection + try { + connection.requestMethod = "HEAD" + connection.connectTimeout = 20_000; connection.readTimeout = 30_000 + check(connection.responseCode in 200..299) { "GOG download metadata failed (HTTP ${connection.responseCode})" } + val disposition = connection.getHeaderField("Content-Disposition").orEmpty() + val supplied = Regex("filename=\"?([^\";]+)", RegexOption.IGNORE_CASE).find(disposition)?.groupValues?.get(1).orEmpty() + val remote = downloadFilename(resolved).takeIf { it.endsWith(".exe", true) || it.endsWith(".bin", true) }.orEmpty() + val name = part.name.ifBlank { supplied.ifBlank { remote } } + check(name.isNotBlank()) { "GOG did not provide the installer part filename" } + part.copy(name = name, size = connection.contentLengthLong.coerceAtLeast(0)) + } finally { connection.disconnect() } + }) + + fun json(url: String, token: String? = null): JSONObject { + require(URL(url).protocol == "https") { "GOG metadata requires HTTPS" } + val connection = URL(url).openConnection() as HttpURLConnection + try { + connection.connectTimeout = 20_000; connection.readTimeout = 30_000 + connection.setRequestProperty("User-Agent", GogAuth.GALAXY_UA) + if (token != null && URL(url).host.let { it == "gog.com" || it.endsWith(".gog.com") }) connection.setRequestProperty("Authorization", "Bearer $token") + check(connection.responseCode in 200..299) { "GOG metadata request failed (HTTP ${connection.responseCode})" } + val raw = connection.inputStream.readBytes() + val text = when { + raw.size > 1 && raw[0] == 0x78.toByte() -> InflaterInputStream(raw.inputStream()).bufferedReader().use { it.readText() } + raw.size > 1 && raw[0] == 0x1f.toByte() && raw[1] == 0x8b.toByte() -> GZIPInputStream(raw.inputStream()).bufferedReader().use { it.readText() } + else -> raw.toString(Charsets.UTF_8) + } + return JSONObject(text) + } finally { connection.disconnect() } + } + + fun snapshot(old: GogInstallRecord, build: GogBuild, token: String, + metadata: (String, String?) -> JSONObject = ::json): GogInstallRecord { + check(build.link.isNotBlank()) { "GOG build manifest is unavailable" } + val manifest = metadata(build.link, token) + val files = JSONArray() + val depots = if (build.generation == 1) manifest.optJSONObject("product")?.optJSONArray("depots") ?: manifest.optJSONArray("depot") else manifest.optJSONArray("depots") + check(depots != null) { "GOG build has no depot list" } + val resolvedLanguage = StoreLanguage.pick(StoreLanguage.codesFromDepots(depots), old.language) + val selectedBitness = if (depots.objects().any { it.optJSONArray("osBitness")?.strings()?.contains("64") == true }) "64" else "32" + val owned = if (old.products.any { it != old.id }) StoreNet.get("https://embed.gog.com/user/data/games", bearer = token)?.let { JSONObject(it).optJSONArray("owned")?.strings()?.toSet() } else emptySet() + val products = old.products.filter { it == old.id || owned?.contains(it) == true } + check(old.products.all { it == old.id || owned?.contains(it) == true }) { "Could not confirm ownership of installed GOG DLC" } + for (depot in depots.objects()) { + if (depot.has("redist")) continue + val ids = depot.optJSONArray("gameIDs")?.strings() ?: listOf(depot.optString("productId", old.id)) + val product = ids.firstOrNull { it in products } ?: continue + val languages = depot.optJSONArray("languages")?.strings().orEmpty() + if (!languageSelected(languages, resolvedLanguage)) continue + val bitness = depot.optJSONArray("osBitness")?.strings().orEmpty() + if (bitness.isNotEmpty() && selectedBitness !in bitness) continue + val hash = depot.optString("manifest") + val content = when { + hash.isNotEmpty() && build.generation == 2 -> metadata("$CDN/v2/meta/${cdnPath(hash)}", null) + hash.isNotEmpty() -> { + val timestamp = manifest.getJSONObject("product").getString("timestamp") + metadata("$CDN/v1/manifests/$product/windows/$timestamp/$hash", token) + } + depot.has("files") -> JSONObject().put("depot", depot) + else -> error("GOG depot manifest is missing") + } + val entries = content.getJSONObject("depot").optJSONArray(if (build.generation == 2) "items" else "files") ?: error("GOG depot files are missing") + for (entry in entries.objects()) { + val type = entry.optString("type") + check(type != "DepotLink") { "This GOG build contains unsupported file links" } + val support = depot.optBoolean("support") || entry.optBoolean("support") || entry.optJSONArray("flags")?.strings()?.contains("support") == true + val relative = entry.getString("path").replace('\\', '/').trimEnd('/').let { if (build.generation == 1) it.trimStart('/') else it } + val path = if (support) (if (build.generation == 1) "support/$relative" else "support/$product/$relative") else relative + val directory = type == "DepotDirectory" || entry.has("directory") + val chunks = entry.optJSONArray("chunks") ?: JSONArray() + val size = if (build.generation == 2) chunks.objects().sumOf { it.optLong("size") } else entry.optLong("size") + files.put(JSONObject().put("path", path).put("size", size).put("directory", directory) + .put("md5", entry.optString("md5").ifBlank { entry.optString("hash") }.takeIf { it.matches(Regex("[a-fA-F0-9]{32}")) }.orEmpty()) + .put("sha256", entry.optString("sha256")).put("chunks", chunks).put("product", product) + .put("offset", entry.optLong("offset")).put("remotePath", entry.optString("url").substringBefore('?'))) + } + } + check(files.length() > 0) { "GOG build contains no matching files" } + return old.copy(source = "depot", generation = build.generation, build = build.id, version = build.version, + branch = build.branch, language = resolvedLanguage, manifest = sanitize(manifest), files = files, products = products, verified = true) + } + + fun languageSelected(list: List<String>, selected: String): Boolean = list.any { it.equals("Neutral", true) } || StoreLanguage.depotMatchesResolved(list.toTypedArray(), selected) + + fun cdnPath(hash: String): String { + require(hash.matches(Regex("[a-fA-F0-9]{32,64}"))) { "Invalid GOG content hash" } + return "${hash.take(2)}/${hash.substring(2, 4)}/$hash" + } + + fun links(record: GogInstallRecord, token: String, patches: Boolean = false): JSONObject { + val out = JSONObject() + for (id in record.products) { + val path = if (record.generation == 1) "/windows/${record.manifest.optJSONObject("product")?.optString("timestamp")}/" else "/" + val query = "_version=2&" + (if (record.generation == 1) "type=depot" else "generation=2") + "&path=${java.net.URLEncoder.encode(path, "UTF-8")}" + if (patches) "&root=%2Fpatches%2Fstore" else "" + val response = json("$SYSTEM/products/$id/secure_link?$query", token) + val bases = response.optJSONArray("urls")?.objects().orEmpty().mapNotNull { item -> + val params = item.optJSONObject("parameters") + var url = item.optString("url_format") + params?.keys()?.forEach { key -> url = url.replace("{$key}", params.getString(key)) } + url.takeIf { it.startsWith("https://") } + } + check(bases.isNotEmpty()) { "GOG refused a download link" } + out.put(id, JSONArray(bases)) + } + return out + } + + fun patches(old: GogInstallRecord, target: GogInstallRecord, token: String): JSONArray { + if (old.generation != 2 || target.generation != 2 || old.build.isBlank() || old.build == target.build) return JSONArray() + return runCatching { + val index = json("$SYSTEM/products/${old.id}/patches?_version=4&from_build_id=${old.build}&to_build_id=${target.build}", token) + val meta = json(index.getString("link"), token) + if (meta.optString("algorithm") != "xdelta3") return@runCatching JSONArray() + val result = JSONArray() + for (depot in meta.getJSONArray("depots").objects()) { + if (depot.optString("productId") !in target.products || !languageSelected(depot.optJSONArray("languages")?.strings().orEmpty(), target.language)) continue + val data = json("$CDN/v2/patches/meta/${cdnPath(depot.getString("manifest"))}") + for (item in data.getJSONObject("depot").getJSONArray("items").objects()) if (item.optString("type") == "DepotDiff") + result.put(JSONObject(item.toString()).put("product", depot.getString("productId"))) + } + result + }.getOrElse { JSONArray() } + } + + fun setupFiles(record: GogInstallRecord, token: String): Pair<JSONArray, JSONObject>? { + if (!record.manifest.optBoolean("scriptInterpreter")) return null + if (record.files.objects().none { file -> record.products.any { file.optString("path").substringAfterLast('/') == "goggame-$it.script" } }) return null + val index = json("$SYSTEM/dependencies/repository?generation=2") + val repository = json(index.getString("repository_manifest")) + val depot = repository.getJSONArray("depots").objects().firstOrNull { it.optString("dependencyId") == "ISI" } + ?: error("GOG setup interpreter is unavailable") + val content = json("$CDN/v2/dependencies/meta/${cdnPath(depot.getString("manifest"))}") + val files = JSONArray() + for (entry in content.getJSONObject("depot").getJSONArray("items").objects()) { + if (entry.optString("type") != "DepotFile") continue + val chunks = entry.getJSONArray("chunks") + files.put(JSONObject().put("path", "support/" + entry.getString("path").replace('\\', '/')) + .put("size", chunks.objects().sumOf { it.getLong("size") }).put("md5", entry.optString("md5")) + .put("chunks", chunks).put("product", "redist")) + } + val response = json("$SYSTEM/open_link?generation=2&_version=2&path=%2Fdependencies%2Fstore%2F", token) + val bases = GogDownloadManager.parseCdnUrls(response.toString()) + check(bases.isNotEmpty()) { "GOG setup download links are unavailable" } + return files to JSONObject().put("redist", JSONArray(bases)) + } + + fun sanitize(value: JSONObject): JSONObject { + val result = JSONObject() + for (key in value.keys()) { + if (key.lowercase() in setOf("clientsecret", "access_token", "refresh_token", "link", "urls", "url")) continue + val v = value.get(key) + result.put(key, when (v) { is JSONObject -> sanitize(v); is JSONArray -> JSONArray((0 until v.length()).map { i -> v.get(i).let { if (it is JSONObject) sanitize(it) else it } }); else -> v }) + } + return result + } +} 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 05b182df7..0dafce41c 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; @@ -58,15 +62,18 @@ public final class GogDownloadManager { public final long bytes; public List<String> dependencies = new ArrayList<>(); public boolean dependenciesRead = false; - /** Language actually written, after the manifest's depot list resolved the request. Null for builds that have no language depots. */ public String language; 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); } } + 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 { @@ -97,7 +104,7 @@ public final class GogDownloadManager { String builds1Json = httpGet(builds1Url, null); if (builds1Json == null) builds1Json = httpGet(builds1Url, token); if (builds1Json == null) throw new InstallException("No builds available for this game"); - Gen1Outcome one = runGen1(ctx, game, token, builds1Json, installPath, cb, cancelled); + Gen1Outcome one = runGen1(ctx, game, token, builds1Json, installPath, cb, cancelled, lang); if (one.result != null || cancelled.get()) return one.result; if (!"NO_CS_BUILDS".equals(one.error)) throw new InstallException("Download failed: " + one.error); cb.onProgress("No Galaxy builds; fetching the installer…", 12); @@ -241,6 +248,11 @@ public final class GogDownloadManager { if (anyFailed.get()) { out.error = "one or more chunks failed to download"; return out; } cb.onProgress("Finishing…", 96); + try { + GogMaintenance.captureDepot(game.gameId, installPath, gm.buildId, buildsJson, manifest, new JSONArray(depotJsons), resolved); + } catch (Exception e) { + cb.onLog("gog: maintenance inventory not recorded: " + e.getMessage()); + } writeFile(new File(installPath, MARKER), ("{\"gameId\":\"" + game.gameId + "\",\"buildId\":\"" + gm.buildId + "\"}").getBytes("UTF-8")); deleteCounted(new File(installPath, ".gog_chunks"), cb); String clientId = manifest.optString("clientId", null); @@ -270,7 +282,7 @@ public final class GogDownloadManager { String buildId = null, manifestUrl = null; for (int i = 0; i < items.length(); i++) { JSONObject item = items.getJSONObject(i); - if ("windows".equals(item.optString("os"))) { + if ("windows".equals(item.optString("os")) && (item.isNull("branch") || item.optString("branch").isEmpty())) { buildId = item.optString("build_id"); manifestUrl = item.optString("link"); if (manifestUrl == null || manifestUrl.isEmpty()) manifestUrl = item.optString("meta_url"); @@ -297,7 +309,6 @@ public final class GogDownloadManager { return StoreLanguage.depotMatchesResolved(listed, resolved); } - /** Language codes listed on this product's Windows gen2 depots, excluding `*`. */ public static List<String> listLanguages(Context ctx, String gameId) { try { String token = GogAuth.validToken(ctx); @@ -319,7 +330,7 @@ public final class GogDownloadManager { private static final class Gen1Outcome { Result result; String error; } - private static Gen1Outcome runGen1(Context ctx, GogGame game, String token, String buildsJson, File installPath, Callback cb, AtomicBoolean cancelled) { + private static Gen1Outcome runGen1(Context ctx, GogGame game, String token, String buildsJson, File installPath, Callback cb, AtomicBoolean cancelled, String language) { Gen1Outcome out = new Gen1Outcome(); try { JSONObject builds = new JSONObject(buildsJson); @@ -337,6 +348,15 @@ public final class GogDownloadManager { String manifestStr = decompressBytes(raw); if (manifestStr == null) { out.error = "manifest decompress failed"; return out; } JSONObject manifest = new JSONObject(manifestStr); + if (manifest.has("product")) { + try { + out.result = GogMaintenance.installContent(ctx, game, installPath, builds, language, cb, cancelled); + if (out.result == null && !cancelled.get()) out.error = "no usable public Windows build"; + } catch (Exception e) { + out.error = e.getMessage() == null ? e.getClass().getSimpleName() : e.getMessage(); + } + return out; + } JSONArray depots = manifest.optJSONArray("depot"); if (depots == null) { out.error = "no depot array"; return out; } List<Gen1File> files = new ArrayList<>(); @@ -424,48 +444,146 @@ 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); + GogMaintenance.captureOffline(game.gameId, installPath, downloads); + 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()); } } - private static String resolveRedirect(String url, String token) { + 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; } + } + + 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; + } + + static String resolveRedirect(String url, String token) { try { if (url.startsWith("/")) url = "https://www.gog.com" + url; for (int hop = 0; hop < 5; hop++) { HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(TIMEOUT); conn.setReadTimeout(TIMEOUT); conn.setInstanceFollowRedirects(false); - if (token != null) conn.setRequestProperty("Authorization", "Bearer " + token); + if (token != null && (new URL(url).getHost().equals("gog.com") || new URL(url).getHost().endsWith(".gog.com"))) conn.setRequestProperty("Authorization", "Bearer " + token); int code = conn.getResponseCode(); String location = conn.getHeaderField("Location"); if (code == 301 || code == 302 || code == 303 || code == 307 || code == 308) { @@ -491,7 +609,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 +625,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); } @@ -565,6 +687,7 @@ public final class GogDownloadManager { cb.onBytes(shown, planned, speedBps.get()); } @Override public void onLog(String line) { cb.onLog(line); } + @Override public void onMaintenance(long networkBytes, long reusedBytes, long appliedBytes) {} @Override public void onComplete(boolean success, boolean wasCancelled, boolean linkExpiry, String error, long bytesWritten, int filesDone) { okRef.set(success); linkExpiryRef.set(linkExpiry); errRef.set(error == null ? "" : error); latch.countDown(); } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogEstimate.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogEstimate.kt new file mode 100644 index 000000000..2374ff8c5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogEstimate.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.stores.gog + +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.io.RandomAccessFile +import java.security.MessageDigest + +internal object GogEstimate { + data class Size(val download: Long, val required: Long) + private data class Chunk(val file: File, val offset: Long) + + fun range(file: File, offset: Long, size: Long, md5: String): Boolean { + if (!file.isFile || offset < 0 || size < 0 || file.length() < offset + size || !md5.matches(Regex("[a-fA-F0-9]{32}"))) return false + return runCatching { + RandomAccessFile(file, "r").use { input -> + input.seek(offset) + val digest = MessageDigest.getInstance("MD5"); val buffer = ByteArray(64 * 1024); var left = size + while (left > 0) { val n = input.read(buffer, 0, minOf(left, buffer.size.toLong()).toInt()); check(n > 0); digest.update(buffer, 0, n); left -= n } + digest.digest().joinToString("") { "%02x".format(it) }.equals(md5, true) + } + }.getOrDefault(false) + } + + fun calculate(folder: File, old: GogInstallRecord, target: GogInstallRecord, patches: JSONArray, reuseChunks: Boolean = true): Size { + val reusable = HashMap<Pair<String, Long>, MutableList<Chunk>>() + for (file in old.files.objects()) { + val source = GogFiles.inside(folder, file.getString("path")); var offset = 0L + for (chunk in file.optJSONArray("chunks")?.objects().orEmpty()) { + reusable.getOrPut(chunk.optString("md5").lowercase() to chunk.optLong("size")) { ArrayList() }.add(Chunk(source, offset)) + offset += chunk.optLong("size") + } + } + var download = 0L; var required = 0L + for (file in target.files.objects()) { + if (file.optBoolean("directory") || GogFiles.matches(folder, file)) continue + val chunks = file.optJSONArray("chunks")?.objects().orEmpty() + val stamp = MessageDigest.getInstance("MD5").digest(file.getString("path").toByteArray()).joinToString("") { "%02x".format(it) } + val stage = File(GogFiles.dir(folder), "stage/$stamp") + var offset = 0L + var cost = if (chunks.isEmpty()) file.getLong("size") else chunks.sumOf { chunk -> + val size = chunk.getLong("size"); val hash = chunk.getString("md5") + val exists = reuseChunks && (range(stage, offset, size, hash) || reusable[hash.lowercase() to size].orEmpty().any { range(it.file, it.offset, size, hash) }) + offset += size + if (exists) 0L else chunk.optLong("compressedSize") + } + val patch = patches.objects().firstOrNull { it.optString("path_target").replace('\\', '/') == file.getString("path") } + if (reuseChunks && patch != null) { + val source = GogFiles.inside(folder, patch.getString("path_source").replace('\\', '/')) + val delta = patch.getJSONArray("chunks").objects().sumOf { it.optLong("compressedSize") } + if (delta < cost && source.isFile && GogFiles.hash(source).equals(patch.getString("md5_source"), true)) cost = delta + } + download = Math.addExact(download, cost) + required = Math.addExact(required, maxOf(0, file.getLong("size") - stage.length()) + cost) + } + return Size(download, required) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogFallback.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogFallback.kt new file mode 100644 index 000000000..0f2d5b9d6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogFallback.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.stores.gog + +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.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.atomic.AtomicBoolean +import java.util.zip.InflaterInputStream + +internal object GogFallback { + fun transfer(folder: File, plan: JSONObject, handle: DownloadQueue.JobHandle?, stop: AtomicBoolean, + callback: GogDownloadManager.Callback? = null) { + val stageRoot = File(GogFiles.dir(folder), "stage").apply { mkdirs() } + val files = plan.getJSONArray("files") + GogFiles.validate(files, folder) + var wire = 0L + fun progress(n: Int) { wire += n; handle?.progress(wire, plan.optLong("downloadBytes").coerceAtLeast(wire)); callback?.onBytes(wire, plan.optLong("downloadBytes").coerceAtLeast(wire), 0) } + for ((index, item) in files.objects().withIndex()) { + if (stop.get()) return + val destination = GogFiles.inside(folder, item.getString("path")) + if (item.optBoolean("directory")) { java.nio.file.Files.createDirectories(destination.toPath()); continue } + if (GogFiles.matches(folder, item)) continue + val stage = File(stageRoot, java.security.MessageDigest.getInstance("MD5").digest(item.getString("path").toByteArray()).joinToString("") { "%02x".format(it) }) + val chunks = item.optJSONArray("chunks")?.objects().orEmpty() + FileOutputStream(stage).use { output -> + if (chunks.isNotEmpty()) { + for (chunk in chunks) { + if (stop.get()) return + val packed = File(stageRoot, "${stage.name}.packed") + val urls = endpoints(plan.getJSONObject("links"), item.getString("product"), GogContent.cdnPath(chunk.getString("compressedMd5"))) + download(urls, packed, chunk.getLong("compressedSize"), stop, ::progress) + check(GogFiles.hash(packed).equals(chunk.getString("compressedMd5"), true)) { "GOG compressed chunk checksum mismatch" } + val digest = java.security.MessageDigest.getInstance("MD5") + var count = 0L + packed.inputStream().buffered().use { raw -> + raw.mark(2); val first = raw.read(); raw.reset() + val stored = chunk.getLong("size") == chunk.getLong("compressedSize") && chunk.getString("md5").equals(chunk.getString("compressedMd5"), true) + val input = if (!stored && first == 0x78) InflaterInputStream(raw) else raw + val buffer = ByteArray(64 * 1024) + while (true) { + if (stop.get()) return + val n = input.read(buffer); if (n < 0) break + count += n; check(count <= chunk.getLong("size")) { "GOG chunk exceeds expected size" } + digest.update(buffer, 0, n); output.write(buffer, 0, n) + } + } + check(count == chunk.getLong("size") && digest.digest().joinToString("") { "%02x".format(it) }.equals(chunk.getString("md5"), true)) { "GOG chunk checksum mismatch" } + packed.delete() + } + } else if (item.getLong("size") > 0) { + val remote = item.getString("remotePath") + val urls = if (remote.startsWith("https://")) listOf(remote) else endpoints(plan.getJSONObject("links"), item.getString("product"), remote.trimStart('/')) + val range = item.getLong("offset") + val raw = File(stageRoot, "${stage.name}.range") + download(urls, raw, item.getLong("size"), stop, ::progress, range) + raw.inputStream().use { it.copyTo(output) }; raw.delete() + } + output.fd.sync() + } + if (stop.get()) return + check(stage.length() == item.getLong("size")) { "GOG file size mismatch" } + if (item.optString("md5").isNotBlank()) check(GogFiles.hash(stage).equals(item.getString("md5"), true)) { "GOG file checksum mismatch" } + if (item.optString("sha256").isNotBlank()) check(GogFiles.hash(stage, "SHA-256").equals(item.getString("sha256"), true)) { "GOG file checksum mismatch" } + destination.parentFile!!.mkdirs() + GogFiles.inside(folder, item.getString("path")) + GogFiles.replace(stage, destination) + handle?.stage(DownloadStage.INSTALL); handle?.stageProgress((index + 1).toLong(), files.length().toLong()) + callback?.onProgress("Downloading: ${destination.name}", ((index + 1) * 100 / files.length())) + } + val targetPaths = files.objects().mapTo(HashSet()) { it.getString("path").lowercase(java.util.Locale.ROOT) } + for (old in plan.optJSONArray("oldFiles")?.objects().orEmpty()) { + if (stop.get()) return + if (old.getString("path").lowercase(java.util.Locale.ROOT) !in targetPaths && GogFiles.matches(folder, old)) + check(GogFiles.inside(folder, old.getString("path")).delete()) { "Could not remove obsolete GOG file" } + } + } + + fun endpoints(links: JSONObject, product: String, path: String): List<String> = links.getJSONArray(product).strings().map { base -> + if (base.contains("{GALAXY_PATH}")) base.replace("{GALAXY_PATH}", path) + else base.substringBefore('?').trimEnd('/') + "/" + path + if ('?' in base) "?" + base.substringAfter('?') else "" + } + + fun download(urls: List<String>, destination: File, size: Long, stop: AtomicBoolean, progress: (Int) -> Unit, range: Long? = null) { + var failure: Throwable? = null + for (attempt in 0..2) for (url in urls) { + if (stop.get()) return + val connection = URL(url).openConnection() as HttpURLConnection + try { + check(URL(url).protocol == "https" || URL(url).host in setOf("127.0.0.1", "localhost")) + connection.connectTimeout = 20_000; connection.readTimeout = 30_000 + if (range != null) connection.setRequestProperty("Range", "bytes=$range-${range + size - 1}") + check(connection.responseCode == if (range == null) 200 else 206) { "GOG download failed (HTTP ${connection.responseCode})" } + FileOutputStream(destination).use { output -> + connection.inputStream.use { input -> + val buffer = ByteArray(64 * 1024); var count = 0L + while (true) { + if (stop.get()) return + val n = input.read(buffer); if (n < 0) break + count += n; check(size <= 0 || count <= size) { "GOG response exceeds expected size" } + output.write(buffer, 0, n); progress(n) + } + check(size <= 0 || count == size) { "Incomplete GOG download" } + } + output.fd.sync() + } + return + } catch (e: Exception) { failure = e } + finally { connection.disconnect() } + } + throw failure ?: IllegalStateException("No GOG download URL") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt new file mode 100644 index 000000000..df0799102 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt @@ -0,0 +1,176 @@ +package com.droiddeck.launcher.stores.gog + +import com.droiddeck.launcher.stores.StoreGameSidecar +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.io.FileOutputStream +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.StandardCopyOption +import java.security.MessageDigest +import java.util.Locale + +internal enum class GogOperation { UPDATE, REPAIR, PATCH, REFRESH } + +internal data class GogInstallRecord( + val id: String, + val source: String, + val generation: Int = 0, + val build: String = "", + val version: String = "", + val branch: String = "", + val language: String = "en-US", + val products: List<String> = listOf(id), + val manifest: JSONObject = JSONObject(), + val files: JSONArray = JSONArray(), + val verified: Boolean = true, +) { + fun json() = JSONObject().put("schema", 1).put("id", id).put("source", source) + .put("generation", generation).put("build", build).put("version", version).put("branch", branch) + .put("language", language).put("products", JSONArray(products)).put("manifest", manifest) + .put("files", files).put("verified", verified) + + fun write(folder: File) = GogFiles.write(File(GogFiles.dir(folder), "installed.json"), json()) + + companion object { + fun parse(o: JSONObject): GogInstallRecord { + require(o.optInt("schema") == 1) { "Unsupported GOG installation record" } + return GogInstallRecord(o.getString("id"), o.getString("source"), o.optInt("generation"), + o.optString("build"), o.optString("version"), o.optString("branch"), o.optString("language", "en-US"), + o.optJSONArray("products")?.strings().orEmpty().ifEmpty { listOf(o.getString("id")) }, + o.optJSONObject("manifest") ?: JSONObject(), o.optJSONArray("files") ?: JSONArray(), o.optBoolean("verified", true)) + } + + fun read(folder: File): GogInstallRecord? = GogFiles.read(File(GogFiles.dir(folder), "installed.json"))?.let(::parse) + + fun authenticBuild(folder: File, id: String): String = GogFiles.read(File(folder, "goggame-$id.id"))?.optString("buildId").orEmpty() + .ifBlank { GogFiles.read(File(folder, "goggame-$id.info"))?.optString("buildId").orEmpty() } + + fun migrate(folder: File, sidecar: StoreGameSidecar): GogInstallRecord { + read(folder)?.let { require(it.id == sidecar.id); return it } + val legacy = GogFiles.read(File(folder, "_gog_manifest.json")) + val info = GogFiles.read(File(folder, "goggame-${sidecar.id}.info")) + val build = authenticBuild(folder, sidecar.id).ifBlank { legacy?.optString("buildId").orEmpty().ifBlank { sidecar.installVersion } } + val ids = folder.listFiles().orEmpty().mapNotNull { Regex("goggame-([0-9]+)\\.info").matchEntire(it.name)?.groupValues?.get(1) } + return GogInstallRecord(sidecar.id, if (legacy != null || sidecar.installVersion.isNotBlank()) "depot" else "offline", + legacy?.optInt("generation", if (build.isNotBlank()) 2 else 0) ?: if (build.isNotBlank()) 2 else 0, + build, info?.optString("versionName").orEmpty(), language = sidecar.extra[com.droiddeck.launcher.stores.StoreLanguage.EXTRA] ?: "en-US", + products = (listOf(sidecar.id) + ids).distinct()).also { it.write(folder) } + } + } +} + +internal object GogFiles { + fun dir(folder: File): File = inside(folder, ".droiddeck-gog").apply { mkdirs() } + fun journal(folder: File): File = File(dir(folder), "operation.json") + + fun inside(root: File, raw: String): File { + val path = raw.replace('\\', '/') + require(path.isNotBlank() && !path.startsWith('/') && ':' !in path && '\u0000' !in path && + path.split('/').none { it.isEmpty() || it == "." || it == ".." }) { "Invalid GOG path: $raw" } + val base = root.canonicalFile + var out = base + for (part in path.split('/')) { + out = File(out, part) + require(!Files.isSymbolicLink(out.toPath())) { "GOG path is a symbolic link: $raw" } + } + require(out.canonicalFile.toPath().startsWith(base.toPath())) { "GOG path leaves installation" } + return out + } + + fun read(file: File): JSONObject? { + require(!Files.isSymbolicLink(file.toPath())) { "GOG metadata is a symbolic link" } + return if (!file.exists()) null else JSONObject(file.readText()) + } + + fun write(file: File, value: JSONObject) { + require(!Files.isSymbolicLink(file.toPath())) + file.parentFile!!.mkdirs() + val tmp = File.createTempFile(".gog-", ".stage", file.parentFile) + try { + FileOutputStream(tmp).use { it.write(value.toString().toByteArray(Charsets.UTF_8)); it.fd.sync() } + replace(tmp, file) + } finally { tmp.delete() } + } + + fun replace(from: File, to: File) { + require(!Files.isSymbolicLink(to.toPath())) + try { Files.move(from.toPath(), to.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING) } + catch (_: java.nio.file.AtomicMoveNotSupportedException) { Files.move(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING) } + } + + fun hash(file: File, algorithm: String = "MD5"): String { + val digest = MessageDigest.getInstance(algorithm) + file.inputStream().use { input -> val buffer = ByteArray(128 * 1024); while (true) { val n = input.read(buffer); if (n < 0) break; digest.update(buffer, 0, n) } } + return digest.digest().joinToString("") { "%02x".format(it) } + } + + fun matches(folder: File, file: JSONObject): Boolean { + val f = inside(folder, file.getString("path")) + if (!Files.isRegularFile(f.toPath(), LinkOption.NOFOLLOW_LINKS) || f.length() != file.getLong("size")) return false + val md5 = file.optString("md5") + if (md5.matches(Regex("[a-fA-F0-9]{32}"))) return hash(f).equals(md5, true) + val sha = file.optString("sha256") + if (sha.isNotBlank()) return hash(f, "SHA-256").equals(sha, true) + val chunks = file.optJSONArray("chunks")?.objects().orEmpty() + var offset = 0L + return chunks.isNotEmpty() && chunks.all { chunk -> + val result = GogEstimate.range(f, offset, chunk.getLong("size"), chunk.getString("md5")) + offset += chunk.getLong("size"); result + } || f.length() == 0L + } + + fun validate(files: JSONArray, folder: File) { + val paths = HashSet<String>() + val components = HashMap<String, String>() + for (file in files.objects()) { + val path = file.getString("path").replace('\\', '/') + inside(folder, path) + require(!path.startsWith(".droiddeck-", true) && path != StoreGameSidecar.FILE_NAME) { "GOG content overlaps launcher metadata" } + require(paths.add(path.lowercase(Locale.ROOT))) { "GOG paths differ only by case: $path" } + var parent = folder + var relative = "" + for (part in path.split('/')) { + relative = if (relative.isEmpty()) part else "$relative/$part" + val previous = components.putIfAbsent(relative.lowercase(Locale.ROOT), relative) + require(previous == null || previous == relative) { "GOG directory paths differ only by case: $path" } + require(parent.list()?.none { it != part && it.equals(part, true) } != false) { "An existing path differs only by case: $path" } + parent = File(parent, part) + } + } + } +} + +internal fun JSONArray.objects(): List<JSONObject> = (0 until length()).map { getJSONObject(it) } +internal fun JSONArray.strings(): List<String> = (0 until length()).map { optString(it) } + +internal data class GogBuild(val id: String, val version: String, val generation: Int, val branch: String, val link: String) { + companion object { + fun select(builds: JSONObject, pinned: String = "", branch: String = ""): GogBuild? { + val items = builds.optJSONArray("items")?.objects().orEmpty().filter { it.optString("os", "windows") == "windows" } + val item = if (pinned.isNotBlank()) items.firstOrNull { it.optString("build_id") == pinned || it.optString("legacy_build_id") == pinned } + else items.firstOrNull { it.optString("branch").let { b -> (if (b == "null") "" else b) == branch } } + return item?.let { GogBuild(it.optString("build_id"), it.optString("version_name"), it.optInt("generation", 2), + it.optString("branch").let { b -> if (b == "null") "" else b }, + it.optString("link").ifBlank { it.optString("meta_url").ifBlank { it.optJSONArray("urls")?.optJSONObject(0)?.optString("url").orEmpty() } }) } + } + } +} + +internal data class GogOfflinePart(val id: String, val name: String, val url: String, val size: Long, val md5: String) +internal data class GogOfflineDownload(val id: String, val name: String, val version: String, val language: String, val parts: List<GogOfflinePart>) { + val size: Long get() = parts.sumOf { it.size } + companion object { + fun parse(downloads: JSONObject, kind: String): List<GogOfflineDownload> = downloads.optJSONArray(kind)?.objects().orEmpty() + .filter { it.optString("os") == "windows" }.mapNotNull { entry -> + val files = entry.optJSONArray("files")?.objects().orEmpty() + val parts = files.mapNotNull { f -> + val url = f.optString("downlink").ifBlank { f.optString("manualUrl") } + if (url.isBlank()) null else GogOfflinePart(f.optString("id"), f.optString("filename"), url, f.optLong("size"), f.optString("md5")) + } + if (parts.isEmpty()) null else GogOfflineDownload(entry.optString("id").ifBlank { parts.first().id }, + entry.optString("name", "GOG download"), entry.optString("version"), entry.optString("language"), parts) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt index 0e76d2fab..8f48740ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt @@ -21,13 +21,9 @@ object GogLibrary { private const val LAST_SYNC_KEY = "library_synced_at" private const val SKIPPED_KEY = "library_skipped" private const val THROTTLE_MS = 6L * 60L * 60L * 1000L - // mediaType=1 leaves the movies and soundtracks out, hiddenFlag=0 the hidden ones. private const val LIST_URL = "https://embed.gog.com/account/getFilteredProducts?mediaType=1&hiddenFlag=0&sortBy=title" private const val LIST_MAX_PAGES = 100 - // The listing's image is a bare hash, and the CDN serves it only through Galaxy's own formatters: the - // vertical cover is the one card art it carries. The wide background only the per-game fetch knows. private const val COVER_SUFFIX = "_glx_vertical_cover.webp" - // The older account endpoint: owned ids only. The fallback for a listing that cannot be read. private const val OWNED_URL = "https://embed.gog.com/user/data/games" private val syncing = AtomicBoolean(false) @@ -62,28 +58,22 @@ object GogLibrary { val token = GogAuth.validToken(app) ?: return SyncResult.NotLoggedIn onStatus(app.getString(R.string.stores_sync_game_list)) val listing = ownedListing(token) - // The listing is the only source of titles: without it the owned ids still sync, just without the early paint. val listed: List<GogGame> = listing?.games ?: ownedIds(token)?.map { GogGame(it, "", "", "", "", "", 1, null, "", "") } ?: return SyncResult.Failed(app.getString(R.string.stores_sync_gog_unreachable)) val named = listing != null StoresState.logLine(if (named) "GOG: listing ${listed.size} games" else "GOG: listing unreadable, ${listed.size} owned ids") - // A page that failed leaves games unnamed: they are still owned, so their cards and cached details stay. val ownedSet = listing?.owned ?: listed.mapTo(HashSet()) { it.gameId } val cachedList = cached(app) val stale = System.currentTimeMillis() - p.getLong(LAST_SYNC_KEY, 0L) >= THROTTLE_MS val heavy = force || cachedList.isEmpty() || stale val cachedIds = cachedList.mapTo(HashSet()) { it.gameId } - // A product the last sync found uninstallable stays out of the list while it is re-checked. val skipped = java.util.Collections.newSetFromMap(java.util.concurrent.ConcurrentHashMap<String, Boolean>()) skipped.addAll(p.getStringSet(SKIPPED_KEY, emptySet()).orEmpty()) val idsToFetch = if (heavy) ownedSet.toList() else ownedSet.filter { it !in cachedIds && it !in skipped } val merged = LinkedHashMap<String, GogGame>() - // The cache's own entry stays even when the game is re-fetched: its details beat the listing's. for (g in cachedList) if (g.gameId in ownedSet && g.gameId !in skipped) merged[g.gameId] = g - // A game the sync has not reached keeps the listing's entry, so its card is there from the start. for (g in listed) if (g.gameId !in merged && g.gameId !in skipped) merged[g.gameId] = g - // Only products that were asked about are cached: a bare listing entry is asked about again. val detailed = HashSet(cachedIds) if (named) onList(sorted(merged)) if (idsToFetch.isEmpty()) { @@ -101,15 +91,12 @@ object GogLibrary { for ((idx, f) in futures.withIndex()) { val g = runCatching { f.get() }.getOrNull() if (g != null) { - // The cover the card already shows stays, so the wide art lands over it instead of over a gap. val filled = g.withCover(merged[g.gameId]?.verticalCover) merged[g.gameId] = filled; detailed.add(g.gameId); fetched++; skipped.remove(g.gameId); onItems(listOf(filled)) } if ((idx + 1) % 5 == 0) onStatus(app.getString(R.string.stores_sync_progress, idx + 1, futures.size)) - // Saved as it goes: a sync the user closes the app on still leaves a library to paint next launch. if ((idx + 1) % 20 == 0) saveCache(p, merged.values.filter { it.gameId in detailed }) } - // A product this round found uninstallable leaves when the round is over, not in the middle of it. for (id in skipped) merged.remove(id) val finalList = merged.values.toList() saveCache(p, finalList.filter { it.gameId in detailed }) @@ -132,11 +119,9 @@ object GogLibrary { var page = 1 var pages = 1 while (page <= pages && page <= LIST_MAX_PAGES) { - // A page that cannot be read ends the listing; the pages already read still name most of the library. val listed = StoreNet.get("$LIST_URL&page=$page", bearer = token, userAgent = GogAuth.GALAXY_UA)?.let { parseListing(it) } if (listed == null) { StoresState.logLine("GOG: listing page $page of $pages unreadable") - // The unread pages hold games too: without their ids those games would leave the library and the cache. owned.addAll(ownedIds(token) ?: return null) break } @@ -145,7 +130,6 @@ object GogLibrary { pages = listed.totalPages page++ } - // Not one page read: the caller falls back to the owned ids. return all.ifEmpty { null }?.let { Listing(it, owned) } } @@ -166,7 +150,6 @@ object GogLibrary { val games = ArrayList<GogGame>(arr.length()) for (i in 0 until arr.length()) { val o = arr.optJSONObject(i) ?: continue - // 1801418160 is GOG's own "Galaxy" entry, in every library. val id = o.optLong("id", 0L).toString() if (id == "0" || id == "1801418160") continue if (o.optBoolean("isMovie", false) || !o.optBoolean("isGame", true)) continue diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt new file mode 100644 index 000000000..796e0dbcb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt @@ -0,0 +1,415 @@ +package com.droiddeck.launcher.stores.gog + +import android.content.Context +import androidx.compose.runtime.mutableStateMapOf +import com.droiddeck.launcher.agent.AgentGuest +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.* +import com.droiddeck.launcher.stores.download.* +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.io.RandomAccessFile +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +internal object GogMaintenance { + enum class State { UNKNOWN, CHECKING, CURRENT, AVAILABLE, FAILED } + data class Check(val state: State, val version: String = "", val reason: String = "") + data class Proposal(val folder: File, val before: GogInstallRecord, val target: GogInstallRecord, + val operation: GogOperation, val downloadBytes: Long, val diskBytes: Long, val patch: GogOfflineDownload? = null, val deltas: JSONArray = JSONArray(), val fullFiles: Boolean = false) + + val checks = mutableStateMapOf<String, Check>() + private val workers = Executors.newFixedThreadPool(2) + private val checkedAt = java.util.concurrent.ConcurrentHashMap<String, Long>() + private val inFlight = java.util.concurrent.ConcurrentHashMap.newKeySet<String>() + @Volatile private var account = "" + private val revision = java.util.concurrent.atomic.AtomicLong() + private const val HELPER = "/usr/local/bin/droiddeck-gog-maintenance" + const val OPERATION = "gogOperation" + const val FOLDER = "gogFolder" + + fun reset() { + revision.incrementAndGet() + account = ""; checkedAt.clear() + StoresState.post { checks.clear() } + } + + fun checkInstalled(context: Context, games: List<InstalledStoreGame>) { + val user = StoreAccounts.displayName(context, Store.GOG).orEmpty() + if (user != account) { reset(); account = user } + if (user.isBlank()) return + games.filter { it.sidecar.store == Store.GOG && it.sidecar.isInstalled }.forEach { check(context, it) } + } + + fun check(context: Context, game: InstalledStoreGame, force: Boolean = false) { + val key = game.folder.absolutePath + if (!force && System.currentTimeMillis() - (checkedAt[key] ?: 0) < 30 * 60_000) return + if (!inFlight.add(key)) return + val owner = revision.get() + StoresState.post { checks[game.sidecar.id] = Check(State.CHECKING) } + workers.execute { + val result = runCatching { + var old = GogInstallRecord.migrate(game.folder, game.sidecar) + if (!old.verified || GogFiles.journal(game.folder).exists()) Check(State.UNKNOWN, reason = "Finish or recover the GOG maintenance operation first") + else { + val token = GogContent.token(context) + if (old.source == "depot") { + val builds = GogContent.builds(old.id, token) + if (old.files.length() == 0 && old.build.isNotBlank()) GogBuild.select(builds, pinned = old.build)?.let { old = old.copy(branch = it.branch, generation = it.generation) } + val latest = GogBuild.select(builds, branch = old.branch) + when { latest == null -> Check(State.UNKNOWN, reason = "No build is available on the installed branch") + old.build.isBlank() -> Check(State.UNKNOWN, latest.version, "The installed build is unknown") + latest.id == old.build -> Check(State.CURRENT, old.version) + else -> Check(State.AVAILABLE, latest.version) } + } else { + val downloads = GogContent.product(old.id, token).getJSONObject("downloads") + val installer = offlineInstaller(downloads, old.language) + if (old.version.isBlank()) Check(State.UNKNOWN, installer.version, "The installed version is unknown") + else Check(if (old.version == installer.version) State.CURRENT else State.AVAILABLE, installer.version) + } + } + }.getOrElse { Check(State.FAILED, reason = it.message ?: "GOG update check failed") } + if (revision.get() == owner && (result.state == State.CURRENT || result.state == State.AVAILABLE)) checkedAt[key] = System.currentTimeMillis() + inFlight.remove(key) + StoresState.post { if (revision.get() == owner) checks[game.sidecar.id] = result } + } + } + + fun offlinePatches(context: Context, game: InstalledStoreGame): List<GogOfflineDownload> = + GogOfflineDownload.parse(GogContent.product(game.sidecar.id, GogContent.token(context)).getJSONObject("downloads"), "patches") + + internal fun offlineInstaller(downloads: JSONObject, language: String): GogOfflineDownload { + val installers = GogOfflineDownload.parse(downloads, "installers") + return installers.firstOrNull { it.language.equals(language, true) } + ?: installers.firstOrNull { !it.language.equals("Neutral", true) && StoreLanguage.depotAccepted(arrayOf(it.language), language) } + ?: installers.firstOrNull { it.language.equals("Neutral", true) } + ?: error("No Windows offline installer is available for the installed language ($language)") + } + + fun prepare(context: Context, game: InstalledStoreGame, operation: GogOperation, patch: GogOfflineDownload? = null, resume: Boolean = false): Proposal { + val folder = game.folder.canonicalFile + var old = GogInstallRecord.migrate(folder, game.sidecar) + val journal = GogFiles.read(GogFiles.journal(folder)) + require(journal == null || journal.optString("folder") == folder.path) { "GOG recovery folder does not match" } + if (journal != null && journal.optString("phase") in setOf("patch-starting", "patch-applying", "patch-uncertain") && operation != GogOperation.REFRESH) error("The patch was interrupted. Inspect the installer result or use a full offline refresh; it will not be rerun automatically.") + require(journal == null || operation == GogOperation.REFRESH || journal.optString("operation") == operation.name) { "Resume the existing GOG operation or select a full offline refresh" } + val token = GogContent.token(context) + if (operation == GogOperation.PATCH) { + if (old.source == "depot" && old.manifest.length() == 0 && old.build.isNotBlank()) { + val exact = GogBuild.select(GogContent.builds(old.id, token), pinned = old.build) + ?: error("The installed GOG setup manifest is unavailable; use a full offline refresh") + old = GogContent.snapshot(old, exact, token) + } + check(patch != null) { "Select a GOG patch" } + if (resume) require(journal?.optString("downloadVersion") == patch.version) { "The selected patch changed; select it again in Offline patches" } + val selected = GogContent.resolveDownload(patch, token) + return Proposal(folder, old, old.copy(source = "offline", version = selected.version, verified = false), operation, selected.size, + selected.size + folder.walkTopDown().onEnter { !java.nio.file.Files.isSymbolicLink(it.toPath()) && it.name != ".droiddeck-gog" }.filter { it.isFile }.sumOf { it.length() }, selected) + } + if (operation == GogOperation.REFRESH || old.source != "depot") { + require(operation != GogOperation.REPAIR) { "This offline installation has no depot manifest. Use a full offline refresh to restore its files." } + val download = GogContent.resolveDownload(offlineInstaller(GogContent.product(old.id, token).getJSONObject("downloads"), old.language), token) + if (resume) require(journal?.optString("downloadId") == download.id && journal.optString("downloadVersion") == download.version) { "The previous offline installer is no longer available; select a new full offline refresh" } + if (old.products.any { it != old.id }) { + val pinned = journal?.optJSONObject("target")?.optString("build").orEmpty() + val build = GogBuild.select(GogContent.builds(old.id, token), pinned = pinned, branch = old.branch) + ?: error("No depot build is available to preserve installed DLC during this refresh. Use Update instead.") + val target = GogContent.snapshot(old, build, token) + GogFiles.validate(target.files, folder) + val native = GogNative.isAvailable() + val remaining = GogEstimate.calculate(folder, old, target, JSONArray(), reuseChunks = native) + return Proposal(folder, old, target, GogOperation.REFRESH, Math.addExact(download.size, remaining.download), + Math.addExact(Math.multiplyExact(download.size, 3), remaining.required), download, fullFiles = !native) + } + val target = old.copy(source = "offline", build = "", generation = 0, version = download.version, manifest = JSONObject(), files = JSONArray(), verified = true) + return Proposal(folder, old, target, GogOperation.REFRESH, download.size, download.size * 3, download) + } + require(old.verified || operation != GogOperation.REPAIR) { "The patched installation must be reconciled before repair" } + val pinned = journal?.optJSONObject("target")?.let(GogInstallRecord::parse) + val builds = GogContent.builds(old.id, token) + if (old.files.length() == 0 && old.build.isNotBlank()) GogBuild.select(builds, pinned = old.build)?.let { old = old.copy(branch = it.branch, generation = it.generation) } + val build = GogBuild.select(builds, + pinned = pinned?.build ?: if (operation == GogOperation.REPAIR) old.build.ifBlank { error("The installed GOG build is unknown; update it first") } else "", + branch = pinned?.branch ?: old.branch) ?: error("The requested GOG build is no longer available") + val target = GogContent.snapshot(old, build, token) + GogFiles.validate(target.files, folder) + var before = journal?.optJSONObject("before")?.let(GogInstallRecord::parse) ?: old + if (before.files.length() == 0 && before.build.isNotBlank()) { + val historical = GogBuild.select(builds, pinned = before.build) + if (historical != null) before = runCatching { GogContent.snapshot(before, historical, token) }.getOrDefault(before) + } + val deltas = GogContent.patches(before, target, token) + val native = GogNative.isAvailable() + val size = GogEstimate.calculate(folder, before, target, deltas, reuseChunks = native) + return Proposal(folder, before, target, operation, size.download, size.required, deltas = deltas, fullFiles = !native) + } + + fun resume(context: Context, game: InstalledStoreGame): Proposal { + val journal = GogFiles.read(GogFiles.journal(game.folder)) ?: error("GOG operation journal is missing") + val operation = GogOperation.valueOf(journal.getString("operation")) + val patch = if (operation == GogOperation.PATCH) offlinePatches(context, game) + .firstOrNull { it.id == journal.optString("downloadId") } ?: error("The selected GOG patch is no longer available") else null + return prepare(context, game, operation, patch, resume = true) + } + + fun recoverPatch(context: Context, game: InstalledStoreGame) { + val folder = game.folder.canonicalFile + check(!DownloadQueue.isActive(game.key)) { "Wait for the GOG operation to finish" } + val journal = GogFiles.read(GogFiles.journal(folder)) ?: error("GOG patch journal is missing") + require(journal.optString("folder") == folder.path && journal.optString("operation") == GogOperation.PATCH.name) + require(journal.optString("phase") in setOf("patch-starting", "patch-applying", "patch-uncertain")) + RandomAccessFile(GogFiles.inside(folder, ".droiddeck-gog/lease"), "rw").use { lease -> + val lock = runCatching { lease.channel.tryLock() }.getOrNull() ?: error("Close the patch installer before verifying its result") + lock.use { + ensureIdle(context, folder) + val before = GogInstallRecord.parse(journal.getJSONObject("before")) + val buildId = GogInstallRecord.authenticBuild(folder, before.id).ifBlank { before.build } + check(buildId.isNotBlank()) { "The resulting build is unknown. Use a full offline refresh." } + val token = GogContent.token(context) + val build = GogBuild.select(GogContent.builds(before.id, token), pinned = buildId) + ?: error("The resulting build manifest is unavailable. Use a full offline refresh.") + val target = GogContent.snapshot(before, build, token) + GogFiles.validate(target.files, folder) + check(target.files.objects().all { it.optBoolean("directory") || GogFiles.matches(folder, it) }) { + "The files do not match the reported build. Use a full offline refresh to recover." + } + val sidecar = StoreGameSidecar.parse(journal.getJSONObject("sidecar").toString()) ?: error("The original GOG settings are missing") + target.write(folder) + StoreInstalls.complete(context, folder, sidecar.copy(installVersion = target.build, state = StoreGameSidecar.STATE_INSTALLED)) + check(GogFiles.journal(folder).delete()) { "Could not finish the GOG recovery record" } + } + } + checkedAt.remove(folder.path) + DownloadQueue.dismiss(game.key) + StoresState.notifyLibraryChanged(context) + StoresState.post { checks.remove(game.sidecar.id) } + } + + fun enqueue(context: Context, game: InstalledStoreGame, proposal: Proposal) { + val app = context.applicationContext + require(game.folder.canonicalFile == proposal.folder) + check(!DownloadQueue.isActive("gog:${game.sidecar.id}")) { "GOG maintenance is already queued" } + check(!StoreInstallRoot.insufficientSpace(proposal.diskBytes, StoreInstallRoot.availableBytes(proposal.folder))) { "Not enough free space for GOG maintenance" } + val journal = JSONObject().put("schema", 1).put("folder", proposal.folder.path).put("operation", proposal.operation.name) + .put("before", proposal.before.json()).put("target", proposal.target.json()).put("sidecar", game.sidecar.toJson()).put("phase", "download") + proposal.patch?.let { journal.put("downloadId", it.id).put("downloadVersion", it.version) } + GogFiles.write(GogFiles.journal(proposal.folder), journal) + val item = CatalogItem(Store.GOG, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, + extra = mapOf(OPERATION to proposal.operation.name, FOLDER to proposal.folder.path)) + SavedQueue.remember(app, item, null) + enqueueJob(app, item, proposal) + } + + private fun enqueueJob(context: Context, item: CatalogItem, proposal: Proposal) { + DownloadQueue.enqueue(context, DownloadEntry(Store.GOG, item.id, item.title, cover = item.tallImageUrl, + bytesTotal = proposal.downloadBytes, location = StoreInstallRoot.labelFor(context, proposal.folder))) { Job(context, proposal) } + } + + fun restore(context: Context, item: CatalogItem) { + val folder = File(item.extra[FOLDER] ?: error("Missing GOG recovery folder")).canonicalFile + require(StoreInstallRoot.gameFolders(context).any { it.canonicalFile == folder }) { "GOG recovery folder is unavailable" } + val sidecar = StoreGameSidecar.read(folder) ?: error("GOG installation record is missing") + require(sidecar.store == Store.GOG && sidecar.id == item.id) + val journal = GogFiles.read(GogFiles.journal(folder)) ?: error("GOG operation journal is missing") + val operation = GogOperation.valueOf(journal.getString("operation")) + if (journal.optString("phase") in setOf("patch-starting", "patch-applying", "patch-uncertain")) { + DownloadQueue.recordFailed(context, DownloadEntry(Store.GOG, item.id, item.title), "The patch result needs recovery; open Offline patches") + return + } + val game = InstalledStoreGame(sidecar, folder) + SavedQueue.remember(context, item, null) + enqueueJob(context, item, resume(context, game)) + } + + private class Job(val app: Context, val proposal: Proposal) : DownloadQueue.DownloadJob { + val cancelled = AtomicBoolean(false) + @Volatile var applyingPatch = false + @Volatile private var running = false + @Volatile private var deleteCaches = false + override fun cancel(deleteFiles: Boolean) { + if (applyingPatch) return + deleteCaches = deleteCaches || deleteFiles + cancelled.set(true) + if (!running && deleteCaches) cleanCaches() + } + + override fun run(handle: DownloadQueue.JobHandle): String? { + running = true + try { return perform(handle) } + finally { + running = false; applyingPatch = false; handle.interruptible(true) + if (deleteCaches) cleanCaches() + } + } + + private fun cleanCaches() { + for (name in listOf("stage", "downloads", "extracted")) { + val root = GogFiles.inside(proposal.folder, ".droiddeck-gog/$name") + if (root.exists()) java.nio.file.Files.walk(root.toPath()).use { paths -> + paths.sorted(java.util.Comparator.reverseOrder()).forEach { java.nio.file.Files.deleteIfExists(it) } + } + } + } + + private fun perform(handle: DownloadQueue.JobHandle): String? { + val folder = proposal.folder + val journal = GogFiles.read(GogFiles.journal(folder)) ?: error("GOG operation journal is missing") + val sidecar = StoreGameSidecar.parse(journal.getJSONObject("sidecar").toString()) ?: error("GOG previous installation is missing") + if (proposal.operation == GogOperation.PATCH) { + val result = GogOffline.apply(app, proposal, handle, cancelled, onApplying = { applyingPatch = true; handle.interruptible(false) }) + applyingPatch = false; handle.interruptible(true) + if (!result || cancelled.get()) return null + } else { + RandomAccessFile(GogFiles.inside(folder, ".droiddeck-gog/lease"), "rw").use { lease -> + val lock = runCatching { lease.channel.tryLock() }.getOrNull() ?: error("Close the GOG game before updating it") + lock.use { + ensureIdle(app, folder) + sidecar.copy(state = StoreGameSidecar.STATE_UPDATING).write(folder) + GogFiles.write(GogFiles.journal(folder), journal.put("phase", "applying")) + if (proposal.operation == GogOperation.REFRESH) { + GogOffline.refresh(app, proposal, handle, cancelled) + if (!cancelled.get() && proposal.target.source == "depot") transfer(app, proposal, handle, cancelled) + } else transfer(app, proposal, handle, cancelled) + if (cancelled.get()) return null + } + } + } + if (cancelled.get()) return null + val target = GogInstallRecord.read(folder)?.takeIf { proposal.operation == GogOperation.PATCH || proposal.operation == GogOperation.REFRESH && proposal.target.source != "depot" } ?: proposal.target + check(target.verified) { "The patch completed, but its resulting version could not be verified. Inspect the game or use a full offline refresh." } + target.write(folder) + StoreInstalls.complete(app, folder, sidecar.copy(installVersion = target.build.ifBlank { target.version }, state = StoreGameSidecar.STATE_INSTALLED)) + check(GogFiles.journal(folder).delete()) { "Could not finish the GOG recovery record" } + runCatching { cleanCaches() }.onFailure { handle.log("gog: completed; could not remove expendable cache: ${it.message}") } + checkedAt.remove(folder.path) + StoresState.post { checks.remove(sidecar.id) } + return folder.path + } + } + + private fun ensureIdle(context: Context, folder: File) { + val game = AddedGames.single(context, folder.path) ?: return + check(SessionState.gameId != (game.appId and 0xffffffffL).toString()) { "Close the GOG game before maintenance" } + if (SessionState.running) { + val id = (game.steamAppId?.toLong() ?: game.appId) and 0xffffffffL + val guest = AddedGames.guestPath(context, folder) ?: error("The GOG folder is unavailable to Linux") + if (SessionState.suspended || AgentGuest.hello(context) == null) { + val root = AddedGames.guestPath(context, SessionPrefs.activeSteamRoot(context)) ?: error("The Steam folder is unavailable to Linux") + val rc = GuestCommand.run(context, listOf("/usr/bin/env", "STEAM_COMPAT_CLIENT_INSTALL_PATH=$root", HELPER, "idle", guest, id.toString(), game.guestExe), + extraBinds = StoreInstallRoot.externalBindSpecs(context), logName = "gog-idle", onLine = StoresState::logLine) + check(rc == 0) { "Close the GOG game before maintenance" } + return + } + val request = JSONObject().put("kind", "exec").put("argv", JSONArray(listOf(HELPER, "idle", guest, id.toString(), game.guestExe))).put("timeout", 15) + val result = AgentGuest.call(context, request, 20_000, trusted = true) + check(result.optBoolean("ok") && result.optInt("exitCode", -1) == 0) { "Close the GOG game before maintenance" } + } + } + + private fun transfer(context: Context, proposal: Proposal, handle: DownloadQueue.JobHandle?, stop: AtomicBoolean, callback: GogDownloadManager.Callback? = null) { + val token = GogContent.token(context) + var patches = proposal.deltas + var previousWire = 0L + for (attempt in 0..4) { + if (stop.get()) return + val links = GogContent.links(proposal.target, GogContent.token(context)) + val patchLinks = if (patches.length() > 0) runCatching { GogContent.links(proposal.target, token, patches = true) }.getOrElse { patches = JSONArray(); JSONObject() } else JSONObject() + val plan = JSONObject().put("files", proposal.target.files).put("oldFiles", proposal.before.files) + .put("patches", patches).put("links", links).put("patchLinks", patchLinks).put("downloadBytes", proposal.downloadBytes) + val optimized = GogNative.isAvailable() + val remaining = GogEstimate.calculate(proposal.folder, proposal.before, proposal.target, patches, reuseChunks = optimized).required + check(!StoreInstallRoot.insufficientSpace(remaining, StoreInstallRoot.availableBytes(proposal.folder))) { "Not enough free space for remaining GOG maintenance" } + handle?.diskSize(remaining) + if (!optimized) { + try { GogFallback.transfer(proposal.folder, plan, handle, stop, callback); return } + catch (e: Exception) { + if (stop.get()) return + if (attempt == 4 || Regex("HTTP (401|403|404|500)").find(e.message.orEmpty()) == null) throw e + handle?.log("gog: refreshing file-download links; verified replacements are retained") + continue + } + } + val latch = CountDownLatch(1) + var runWire = 0L + var success = false; var expired = false; var failure = "GOG download failed" + val listener = object : GogNative.Listener { + override fun onProgress(bytesDone: Long, bytesTotal: Long, filesDone: Int, filesTotal: Int, file: String, fileBytes: Long, verified: Boolean) { + handle?.stage(if (verified) DownloadStage.VERIFY else DownloadStage.INSTALL) + handle?.stageProgress(filesDone.toLong(), filesTotal.toLong(), filesDone, filesTotal) + callback?.onStage(if (verified) "verify" else "install", filesDone.toLong(), filesTotal.toLong(), filesDone, filesTotal) + } + override fun onBytes(bytesDone: Long, bytesTotal: Long) { + runWire = bytesDone + handle?.progress(previousWire + bytesDone, (previousWire + bytesTotal).coerceAtLeast(previousWire + bytesDone)) + callback?.onBytes(previousWire + bytesDone, (previousWire + bytesTotal).coerceAtLeast(previousWire + bytesDone), 0) + } + override fun onLog(line: String) { handle?.log(line); callback?.onLog(line) } + override fun onMaintenance(networkBytes: Long, reusedBytes: Long, appliedBytes: Long) { handle?.maintenance(reusedBytes, appliedBytes) } + override fun onComplete(ok: Boolean, cancelled: Boolean, linkExpiry: Boolean, error: String, bytesWritten: Long, filesDone: Int) { + success = ok; expired = linkExpiry; failure = error; latch.countDown() + } + } + val native = GogNative.start(2, arrayOf(plan.toString()), emptyArray(), proposal.folder.path, emptyArray(), "", 1, 1, false, "gog maintenance", listener) + check(native != 0L) { "GOG native engine could not start" } + try { while (!latch.await(200, TimeUnit.MILLISECONDS)) if (stop.get()) GogNative.cancel(native) } + finally { GogNative.release(native) } + if (stop.get()) return + if (success) { + for (file in proposal.target.files.objects()) if (!file.optBoolean("directory") && file.optString("md5").isBlank() && file.optString("sha256").isBlank()) + file.put("sha256", GogFiles.hash(GogFiles.inside(proposal.folder, file.getString("path")), "SHA-256")) + return + } + if (!expired || attempt == 4) error(failure) + previousWire += runWire + handle?.log("gog: refreshing expired download links; validated files and chunks are retained") + } + } + + @JvmStatic + fun installContent(context: Context, game: GogGame, folder: File, builds: JSONObject, language: String, + callback: GogDownloadManager.Callback, cancelled: AtomicBoolean): GogDownloadManager.Result? { + val build = GogBuild.select(builds) ?: return null + folder.mkdirs() + val old = GogInstallRecord(game.gameId, "depot", language = language) + val target = GogContent.snapshot(old, build, GogContent.token(context)) + GogFiles.validate(target.files, folder) + val bytes = target.files.objects().sumOf { it.optJSONArray("chunks")?.objects()?.sumOf { c -> c.optLong("compressedSize") }?.takeIf { n -> n > 0 } ?: it.optLong("size") } + val disk = target.files.objects().sumOf { it.optLong("size") } + check(!StoreInstallRoot.insufficientSpace(disk, StoreInstallRoot.availableBytes(folder))) { "Not enough free space for GOG installation" } + callback.onSizes(bytes, disk) + transfer(context, Proposal(folder, old, target, GogOperation.UPDATE, bytes, disk), null, cancelled, callback) + if (cancelled.get()) return null + target.write(folder) + val result = GogDownloadManager.Result(GogDownloadManager.pickExe(folder, null, game.title), build.id, disk) + result.language = target.language + result.dependencies = target.manifest.optJSONArray("dependencies")?.strings().orEmpty() + result.dependenciesRead = true + return result + } + + @JvmStatic + fun captureDepot(id: String, folder: File, build: String, buildsJson: String, manifest: JSONObject, depots: JSONArray, language: String) { + val selected = GogBuild.select(JSONObject(buildsJson), pinned = build) + val files = JSONArray() + for (depot in depots.strings()) for (item in JSONObject(depot).getJSONObject("depot").getJSONArray("items").objects()) { + val chunks = item.optJSONArray("chunks") ?: continue + files.put(JSONObject().put("path", item.getString("path").replace('\\', '/')).put("size", chunks.objects().sumOf { it.optLong("size") }) + .put("md5", item.optString("md5")).put("chunks", chunks).put("product", id)) + } + GogFiles.validate(files, folder) + GogInstallRecord(id, "depot", 2, build, selected?.version.orEmpty(), selected?.branch.orEmpty(), language, + manifest = GogContent.sanitize(manifest), files = files).write(folder) + } + + @JvmStatic + fun captureOffline(id: String, folder: File, downloads: JSONObject) { + val selected = GogOfflineDownload.parse(downloads, "installers").firstOrNull() ?: return + GogInstallRecord(id, "offline", version = selected.version, language = selected.language).write(folder) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogNative.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogNative.kt index f8ab86b14..80024ab6a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogNative.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogNative.kt @@ -15,6 +15,8 @@ object GogNative { fun onBytes(bytesDone: Long, bytesTotal: Long) + fun onMaintenance(networkBytes: Long, reusedBytes: Long, appliedBytes: Long) + fun onLog(line: String) fun onComplete(success: Boolean, cancelled: Boolean, linkExpiry: Boolean, error: String, bytesWritten: Long, filesDone: Int) @@ -26,7 +28,7 @@ object GogNative { fun isAvailable(): Boolean { available?.let { return it } val ok = try { - StoresNative.ensureLoaded() && nativeProbe() == 1 + StoresNative.ensureLoaded() && nativeProbe() == 2 } catch (t: Throwable) { Log.w(TAG, "native GOG engine unavailable: ${t.javaClass.simpleName}: ${t.message}") false diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogOffline.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogOffline.kt new file mode 100644 index 000000000..02ff54f26 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogOffline.kt @@ -0,0 +1,200 @@ +package com.droiddeck.launcher.stores.gog + +import android.content.Context +import com.droiddeck.launcher.agent.AgentGuest +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.atomic.AtomicBoolean + +internal object GogOffline { + private const val HELPER = "/usr/local/bin/droiddeck-gog-maintenance" + + internal data class Layout(val source: File, val prefix: String) + + internal fun layout(extracted: File, installed: File, id: String, executable: String): Layout { + val nested = executable.startsWith("app/", true) && !File(installed, "goggame-$id.info").isFile + return Layout(extracted, if (nested) "app/" else "") + } + + internal fun validateDepotInstaller(extracted: File, target: GogInstallRecord) { + if (target.source != "depot") return + val builds = listOf(extracted, File(extracted, "app")).map { GogInstallRecord.authenticBuild(it, target.id) }.filter { it.isNotBlank() } + require(builds.isNotEmpty() && builds.all { it == target.build } && target.build.isNotBlank()) { + "The offline installer does not identify the selected depot build. Use Update to preserve installed DLC." + } + } + + private fun download(context: Context, proposal: GogMaintenance.Proposal, handle: DownloadQueue.JobHandle, stop: AtomicBoolean): File { + val patch = proposal.patch ?: error("GOG download selection is missing") + val root = File(GogFiles.dir(proposal.folder), "downloads").apply { mkdirs() } + var first: File? = null; var bytes = 0L + for ((index, part) in patch.parts.withIndex()) { + if (stop.get()) return first ?: File(root, "cancelled") + val resolved = GogDownloadManager.resolveRedirect(part.url, GogContent.token(context)) ?: error("The GOG download link is unavailable") + val serverName = GogContent.downloadFilename(resolved).takeIf { it.endsWith(".exe", true) || it.endsWith(".bin", true) } + val name = part.name.ifBlank { serverName ?: error("GOG did not provide the installer part filename") } + require('/' !in name && '\\' !in name && name !in setOf(".", "..")) { "Invalid GOG installer filename" } + val file = GogFiles.inside(root, name) + val receipt = File(root, "part-$index.json") + val saved = GogFiles.read(receipt) + val complete = file.isFile && (part.size <= 0 || file.length() == part.size) && when { + part.md5.isNotBlank() -> GogFiles.hash(file).equals(part.md5, true) + saved?.optString("id") == part.id && saved.optString("filename") == name -> GogFiles.hash(file, "SHA-256") == saved.optString("sha256") + else -> false + } + if (!complete) { + val staging = GogFiles.inside(root, "$name.partial") + GogFallback.download(listOf(resolved), staging, part.size, stop, { n -> bytes += n; handle.progress(bytes, proposal.downloadBytes.coerceAtLeast(bytes)) }) + if (stop.get()) return first ?: file + if (part.md5.isNotBlank()) check(GogFiles.hash(staging).equals(part.md5, true)) { "GOG installer checksum mismatch" } + GogFiles.replace(staging, file) + GogFiles.write(receipt, JSONObject().put("id", part.id).put("filename", name).put("sha256", GogFiles.hash(file, "SHA-256"))) + } + if (index == 0) { check(file.extension.equals("exe", true)) { "GOG patch has no setup executable" }; first = file } + } + return first ?: error("GOG download has no files") + } + + fun refresh(context: Context, proposal: GogMaintenance.Proposal, handle: DownloadQueue.JobHandle, stop: AtomicBoolean) { + val installer = download(context, proposal, handle, stop) + if (stop.get()) return + val extracted = File(GogFiles.dir(proposal.folder), "extracted").apply { mkdirs() } + val source = AddedGames.guestPath(context, installer) ?: error("The GOG installer is not visible to Linux") + val target = AddedGames.guestPath(context, extracted) ?: error("The GOG staging folder is not visible to Linux") + handle.stage(DownloadStage.INSTALL, "Extracting the full offline installer") + val rc = GuestCommand.run(context, listOf("/usr/local/bin/droiddeck-innoextract", "--gog", "--silent", "-d", target, source), + extraBinds = StoreInstallRoot.externalBindSpecs(context), cancelled = stop, logName = "gog-refresh", onLine = handle::log) + if (stop.get()) return + check(rc == 0) { "GOG installer extraction failed (exit $rc)" } + applyRefresh(proposal, extracted, handle, stop) + } + + internal fun applyRefresh(proposal: GogMaintenance.Proposal, extracted: File, handle: DownloadQueue.JobHandle?, stop: AtomicBoolean) { + validateDepotInstaller(extracted, proposal.target) + val sidecar = StoreGameSidecar.read(proposal.folder) ?: error("The original GOG settings are missing") + val layout = layout(extracted, proposal.folder, proposal.before.id, sidecar.exe) + val files = layout.source.walkTopDown().onEnter { directory -> + check(!java.nio.file.Files.isSymbolicLink(directory.toPath())) { "GOG installer contains a symbolic link" } + directory.parentFile != extracted || directory.name !in setOf("tmp", "commonappdata", "userappdata", "localappdata") + }.filter { it != layout.source && it != File(extracted, "app") }.map { file -> + check(!java.nio.file.Files.isSymbolicLink(file.toPath())) + val relative = file.relativeTo(layout.source).invariantSeparatorsPath.removePrefix("app/") + JSONObject().put("path", layout.prefix + relative) + .put("size", if (file.isDirectory) 0 else file.length()).put("directory", file.isDirectory) + .put("md5", if (file.isDirectory) "" else GogFiles.hash(file)).put("product", proposal.before.id) to file + }.toList().groupBy { it.first.getString("path") }.map { (_, entries) -> + check(entries.size == 1 || entries.all { it.first.getBoolean("directory") }) { "GOG installer has conflicting file locations" } + entries.first() + } + check(files.any { !it.first.getBoolean("directory") }) { "GOG installer contained no game files" } + val inventory = JSONArray(files.map { it.first }) + GogFiles.validate(inventory, proposal.folder) + val executable = sidecar.exe.replace('\\', '/') + check(files.any { !it.first.getBoolean("directory") && it.first.getString("path").equals(executable, true) } || + proposal.before.verified && proposal.before.files.length() > 0 && + proposal.before.files.objects().none { it.getString("path").equals(executable, true) } && GogFiles.inside(proposal.folder, executable).isFile) { + "The offline installer did not extract the game's executable. No installed files were changed." + } + val installed = proposal.target.copy(files = inventory) + GogFiles.write(File(GogFiles.dir(proposal.folder), "refresh-target.json"), installed.json()) + for ((index, entry) in files.withIndex()) { + if (stop.get()) return + val (file, sourceFile) = entry + val destination = GogFiles.inside(proposal.folder, file.getString("path")) + if (file.getBoolean("directory")) java.nio.file.Files.createDirectories(destination.toPath()) else { + destination.parentFile!!.mkdirs() + GogFiles.replace(sourceFile, destination) + } + handle?.stageProgress((index + 1).toLong(), files.size.toLong()) + } + if (proposal.target.source != "depot") { + val targetPaths = files.mapTo(HashSet()) { it.first.getString("path").lowercase(java.util.Locale.ROOT) } + for (old in proposal.before.files.objects()) if (old.getString("path").lowercase(java.util.Locale.ROOT) !in targetPaths && GogFiles.matches(proposal.folder, old)) + check(GogFiles.inside(proposal.folder, old.getString("path")).delete()) + installed.write(proposal.folder) + } + } + + fun apply(context: Context, proposal: GogMaintenance.Proposal, handle: DownloadQueue.JobHandle, stop: AtomicBoolean, onApplying: () -> Unit): Boolean { + check(GogFiles.read(GogFiles.journal(proposal.folder))?.optString("phase") in setOf("download", "patch-ready")) { + "The patch result needs recovery. Inspect the installer or use a full offline refresh; the patch will not be run again." + } + val installer = download(context, proposal, handle, stop) + if (stop.get()) return false + val setup = GogContent.setupFiles(proposal.before, GogContent.token(context)) + if (setup != null) { + GogFallback.transfer(proposal.folder, JSONObject().put("files", setup.first).put("links", setup.second) + .put("downloadBytes", setup.first.objects().sumOf { it.getJSONArray("chunks").objects().sumOf { chunk -> chunk.getLong("compressedSize") } }), handle, stop) + if (stop.get()) return false + } + val added = AddedGames.single(context, proposal.folder.path) ?: error("The GOG game shortcut is unavailable") + val id = (added.steamAppId?.toLong() ?: added.appId) and 0xffffffffL + val folder = AddedGames.guestPath(context, proposal.folder) ?: error("The GOG folder is unavailable to Linux") + val executable = AddedGames.guestPath(context, installer) ?: error("The GOG patch is unavailable to Linux") + context.startActivity(android.content.Intent(context, com.droiddeck.launcher.SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, if (SessionState.running) SessionState.mode else SessionService.MODE_DESKTOP) + .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK or android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP or android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP)) + val deadline = System.currentTimeMillis() + 120_000 + while (AgentGuest.hello(context) == null && System.currentTimeMillis() < deadline) { if (stop.get()) return false; Thread.sleep(250) } + check(AgentGuest.hello(context) != null) { "The Linux session did not become ready; open it and retry" } + val journal = GogFiles.read(GogFiles.journal(proposal.folder)) ?: error("GOG patch journal is missing") + journal.put("phase", "patch-ready") + File(GogFiles.dir(proposal.folder), "patch-status.json").delete() + GogFiles.write(GogFiles.journal(proposal.folder), journal) + val request = JSONObject().put("kind", "exec").put("timeout", 15) + .put("env", JSONObject().put("DROIDDECK_GOG_DESKTOP", if (SessionState.mode == SessionService.MODE_DESKTOP) "1" else "0")) + .put("argv", JSONArray(listOf(HELPER, "start", folder, id.toString(), executable, added.guestExe))) + if (stop.get()) return false + onApplying() + val response = AgentGuest.call(context, request, 20_000, trusted = true) + check(response.optBoolean("ok") && response.optInt("exitCode", -1) == 0) { "The GOG patch installer could not start; inspect the GOG log" } + handle.stage(DownloadStage.INSTALL, "Use the Linux session to finish or cancel the patch installer") + var nextStatus = System.currentTimeMillis() + 5_000 + while (true) { + val status = GogFiles.read(File(GogFiles.dir(proposal.folder), "patch-status.json")) + if (status?.optString("state") in setOf("done", "failed", "uncertain")) { + check(status?.optString("state") == "done") { status?.optString("reason") ?: "GOG patch failed" } + break + } + check(SessionState.running) { "The patch session ended. Its result needs recovery; the patch will not be rerun automatically." } + check(!SessionState.suspended) { "The patch session was suspended. Resume it and verify recovery before retrying." } + if (System.currentTimeMillis() >= nextStatus) { + val query = JSONObject().put("kind", "exec").put("timeout", 5).put("argv", JSONArray(listOf(HELPER, "status", folder))) + val answer = AgentGuest.call(context, query, 10_000, trusted = true) + check(answer.optBoolean("ok") && answer.optInt("exitCode", -1) == 0) { "The patch helper could not be reached. Resume the Linux session and verify recovery." } + nextStatus = System.currentTimeMillis() + 5_000 + } + Thread.sleep(500) + } + val info = GogFiles.read(File(proposal.folder, "goggame-${proposal.before.id}.info")) + val version = info?.optString("versionName").orEmpty() + val build = GogInstallRecord.authenticBuild(proposal.folder, proposal.before.id) + var record = proposal.target.copy(build = build, version = version, files = JSONArray(), manifest = JSONObject(), verified = false) + record.write(proposal.folder) + if (build.isNotBlank()) { + record = runCatching { + val token = GogContent.token(context) + val target = GogBuild.select(GogContent.builds(record.id, token), pinned = build) + val snapshot = target?.let { GogContent.snapshot(record, it, token) } + snapshot?.takeIf { it.files.objects().all { f -> f.optBoolean("directory") || GogFiles.matches(proposal.folder, f) } } ?: record + }.getOrDefault(record) + } + record.write(proposal.folder) + if (!record.verified) { + val before = StoreGameSidecar.read(proposal.folder) ?: error("The GOG installation record is missing") + before.copy(installVersion = "", state = StoreGameSidecar.STATE_UPDATING).write(proposal.folder) + val operation = GogFiles.read(GogFiles.journal(proposal.folder))!! + GogFiles.write(GogFiles.journal(proposal.folder), operation.put("phase", "patch-uncertain")) + } + return true + } +} 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 92635630d..293a59c46 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/ItchArchives.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchArchives.kt new file mode 100644 index 000000000..fd08c9d6b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchArchives.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.stores.itch + +import java.io.File +import java.io.FileInputStream +import java.nio.file.Files + +internal object ItchArchives { + private val PACKED = setOf("zip", "7z", "rar", "tar", "gz", "bz2", "xz") + + fun kind(file: File, filename: String): String { + val extension = filename.substringAfterLast('.', "").lowercase() + if (extension == "exe") return "exe" + return signature(file) ?: extension + } + + private fun signature(file: File): String? { + val head = runCatching { FileInputStream(file).use { input -> ByteArray(300).also { input.read(it) } } }.getOrNull() + ?: return null + fun at(i: Int, vararg bytes: Int) = bytes.indices.all { head.getOrNull(i + it) == bytes[it].toByte() } + return when { + at(0, 0x50, 0x4B) -> "zip" + at(0, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> "7z" + at(0, 0x52, 0x61, 0x72, 0x21) -> "rar" + at(0, 0x1F, 0x8B) -> "gz" + at(0, 0x42, 0x5A, 0x68) -> "bz2" + at(0, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) -> "xz" + at(257, 0x75, 0x73, 0x74, 0x61, 0x72) -> "tar" + else -> null + } + } + + fun inner(folder: File): File? { + val found = ArrayList<File>() + fun walk(dir: File, depth: Int) { + val files = dir.listFiles() ?: return + for (file in files) { + if (Files.isSymbolicLink(file.toPath())) continue + if (file.isFile && signature(file) in PACKED) found.add(file) + else if (file.isDirectory && depth < 2 && !file.name.startsWith(".")) walk(file, depth + 1) + } + } + walk(folder, 0) + return found.maxByOrNull { it.length() } + } +} 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 b1bf834c1..66ca72602 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 000000000..d430d1143 --- /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/ItchBuilds.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBuilds.kt new file mode 100644 index 000000000..95712037d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBuilds.kt @@ -0,0 +1,114 @@ +package com.droiddeck.launcher.stores.itch + +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.io.FileOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.atomic.AtomicBoolean + +internal object ItchBuilds { + private const val BASE = "https://api.itch.io" + private const val MAX_STEPS = 4 + + class Step(val buildId: Long, val patchFile: Long, val patchSize: Long, val signatureFile: Long) + + fun buildId(upload: JSONObject): String { + val value = upload.opt("build_id") ?: upload.opt("buildId") + return when (value) { + is Number -> value.toLong().takeIf { it > 0 }?.toString().orEmpty() + is String -> value.takeIf { it.all(Char::isDigit) }?.toLongOrNull()?.takeIf { it > 0 }?.toString().orEmpty() + else -> "" + } + } + + fun path(key: String, from: String, to: String, downloadKeyId: String): List<Step>? { + val fromId = from.toLongOrNull() ?: return null + val toId = to.toLongOrNull() ?: return null + val reply = ItchApi.get("/builds/$fromId/upgrade-paths/$toId" + keyQuery(downloadKeyId), key) ?: return null + return steps(reply, fromId, toId) { filesOf(key, it, downloadKeyId) } + } + + fun steps(reply: JSONObject, fromId: Long, toId: Long, filesFor: (JSONObject) -> JSONArray?): List<Step>? { + val builds = (reply.optJSONObject("upgrade_path") ?: reply.optJSONObject("upgradePath"))?.optJSONArray("builds") ?: return null + val ids = (0 until builds.length()).mapNotNull { builds.optJSONObject(it) } + val after = ids.filter { it.optLong("id") != fromId } + if (after.isEmpty() || after.size > MAX_STEPS || after.last().optLong("id") != toId) return null + val steps = after.map { build -> + val files = filesFor(build) ?: return null + val patch = pick(files, "patch") ?: return null + val signature = pick(files, "signature") + Step(build.optLong("id"), patch.optLong("id"), patch.optLong("size"), signature?.optLong("id") ?: 0L) + } + return steps.takeIf { it.last().signatureFile > 0 } + } + + fun fileUrl(buildId: Long, fileId: Long, downloadKeyId: String): String = + "$BASE/wharf/builds/$buildId/files/$fileId/download" + keyQuery(downloadKeyId) + + fun download(url: String, key: String, target: File, cancelled: AtomicBoolean, progress: (Long) -> Unit): Boolean { + val first = open(url, key) + try { + val code = first.responseCode + val location = first.getHeaderField("Location") + if (code in 300..399 && location != null) { + first.disconnect() + val next = URL(URL(url), location).toString() + if (!next.startsWith("https://")) return false + return save(open(next, null), target, cancelled, progress) + } + return save(first, target, cancelled, progress) + } finally { + runCatching { first.disconnect() } + } + } + + private fun save(conn: HttpURLConnection, target: File, cancelled: AtomicBoolean, progress: (Long) -> Unit): Boolean { + try { + if (conn.responseCode !in 200..299) return false + var done = 0L + val buffer = ByteArray(128 * 1024) + conn.inputStream.use { input -> + FileOutputStream(target).use { out -> + while (true) { + if (cancelled.get()) return false + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + done += read + progress(done) + } + } + } + return true + } finally { + runCatching { conn.disconnect() } + } + } + + private fun open(url: String, key: String?): HttpURLConnection = + (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 30_000 + readTimeout = 60_000 + instanceFollowRedirects = false + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "*/*") + if (key != null) setRequestProperty("Authorization", "Bearer $key") + } + + private fun filesOf(key: String, build: JSONObject, downloadKeyId: String): JSONArray? = + build.optJSONArray("files") + ?: ItchApi.get("/builds/${build.optLong("id")}" + keyQuery(downloadKeyId), key)?.optJSONObject("build")?.optJSONArray("files") + + private fun pick(files: JSONArray, type: String): JSONObject? { + val all = (0 until files.length()).mapNotNull { files.optJSONObject(it) } + .filter { it.optString("type") == type && it.optString("state", "uploaded") == "uploaded" } + return all.firstOrNull { subType(it) == "optimized" } ?: all.firstOrNull { subType(it) == "default" } + } + + private fun subType(file: JSONObject): String = file.optString("sub_type", file.optString("subType", "default")) + + private fun keyQuery(downloadKeyId: String): String = if (downloadKeyId.isBlank()) "" else "?download_key_id=$downloadKeyId" +} 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 000000000..30e216f10 --- /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 000000000..39b69ea3f --- /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 96ec0ae35..3896091e3 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 @@ -13,6 +13,7 @@ import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoreNet import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadStage +import org.apache.commons.compress.MemoryLimitException import org.apache.commons.compress.archivers.sevenz.SevenZFile import org.apache.commons.compress.archivers.tar.TarArchiveInputStream import org.apache.commons.compress.archivers.zip.ZipFile @@ -25,6 +26,7 @@ import java.io.FileInputStream import java.io.FileOutputStream import java.net.HttpURLConnection import java.net.URL +import java.nio.file.Files import java.util.concurrent.atomic.AtomicBoolean internal class ItchInstaller( @@ -33,16 +35,26 @@ internal class ItchInstaller( private val folder: File, ) : DownloadQueue.DownloadJob { private val cancelled = AtomicBoolean(false) + private var work: File = folder + private var updating = false + private var previous: StoreGameSidecar? = null + private val commit = Any() override fun run(handle: DownloadQueue.JobHandle): String? { 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 before = StoreGameSidecar.read(folder) + previous = before + updating = before != null && (before.isInstalled || before.state == StoreGameSidecar.STATE_UPDATING) + val resuming = before?.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) @@ -50,19 +62,38 @@ internal class ItchInstaller( val scratch = StoreInstallRoot.scratchDir(app, Store.ITCH, item.id) scratch.mkdirs() val archive = File(scratch, filename.ifBlank { "download.bin" }) + val buildId = ItchBuilds.buildId(upload) val exe = try { - handle.stage(DownloadStage.DOWNLOAD) - 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) + var patched = updating && !resuming && previous?.isInstalled == true && + patch(key, downloadKeyId, uploadId, buildId, size, scratch, handle) + if (cancelled.get()) { + if (patched) dropCaches(scratch) + return null + } + var picked: String? = null + if (patched) { + picked = install(archive, filename, handle, resuming, true) + if (picked == null) { + if (cancelled.get()) return null + handle.log("itch.io: the patched copy of ${item.title} has no exe, doing a full update") + patched = false + } + } + if (!patched) { + handle.stage(DownloadStage.DOWNLOAD) + download(key, downloadKeyId, uploadId, upload.optString("updated_at", upload.optString("updatedAt")), archive, size, handle) + if (cancelled.get()) return null + handle.stage(DownloadStage.INSTALL) + picked = install(archive, filename, handle, resuming, false) + } + picked } catch (t: Throwable) { - if (!cancelled.get()) StoreInstalls.discard(app, folder, listOf(scratch)) + if (!cancelled.get()) dropCaches(scratch) throw t } if (exe == null) { if (cancelled.get()) return null - StoreInstalls.discard(app, folder, listOf(scratch)) + dropCaches(scratch) throw IllegalStateException(app.getString(R.string.stores_itch_no_exe)) } archive.delete() @@ -72,25 +103,38 @@ internal class ItchInstaller( id = item.id, title = item.title, exe = exe, + args = previous?.args.orEmpty(), + env = previous?.env.orEmpty(), installVersion = upload.optString("updated_at", upload.optString("updatedAt")), installedAt = System.currentTimeMillis(), cover = item.imageUrl, hero = item.imageUrl, - extra = mapOf("gameId" to gameId, "downloadKeyId" to downloadKeyId, "uploadId" to uploadId), + extra = mapOf("gameId" to gameId, "downloadKeyId" to downloadKeyId, "uploadId" to uploadId, "buildId" to buildId), cloud = false, ) StoreInstalls.complete(app, folder, sidecar) { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) } + ItchUpdates.applied(app, item.key) return folder.path } override fun cancel(deleteFiles: Boolean) { cancelled.set(true) - if (deleteFiles) StoreInstalls.discard(app, folder, listOf(StoreInstallRoot.scratchDir(app, Store.ITCH, item.id))) + if (deleteFiles) dropCaches(StoreInstallRoot.scratchDir(app, Store.ITCH, item.id)) + } + + private fun dropCaches(scratch: File) { + if (!updating) { + StoreInstalls.discard(app, folder, listOf(scratch)) + return + } + synchronized(commit) { + StoreInstalls.deleteTree(scratch) + ItchStaging.delete(File(folder, ItchStaging.DIR)) + } } private fun download(key: String, downloadKeyId: String, uploadId: String, version: String, target: File, expected: Long, handle: DownloadQueue.JobHandle) { - // A partial file is only resumed when it came from this exact upload build. val origin = File(target.path + ".from") val stamp = "$uploadId $version $expected" if (!target.isFile || runCatching { origin.readText() }.getOrNull() != stamp) { @@ -124,7 +168,6 @@ internal class ItchInstaller( if (have > 0) handle.log(if (append) "itch.io: resuming at ${have} bytes" else "itch.io: server ignored the resume, starting over") var done = if (append) have else 0L val total = conn.contentLengthLong.takeIf { it > 0 }?.let { if (append) it + have else it } ?: expected - // The first report is the queue's speed baseline, so resumed bytes don't read as instant throughput. handle.progress(done, total) val buffer = ByteArray(128 * 1024) conn.inputStream.use { input -> @@ -147,65 +190,120 @@ internal class ItchInstaller( } } - private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle): String? { - folder.mkdirs() - when (val kind = sniff(archive, filename)) { - "zip" -> unzip(archive, handle) - "7z" -> sevenZip(archive, handle) - "rar" -> unrar(archive, handle) - "exe" -> copy(archive, File(folder, filename.ifBlank { "game.exe" })) - "tar" -> untar(archive, null, handle) - "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) - else -> copy(archive, File(folder, filename.ifBlank { "game" })) + 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 patch(key: String, downloadKeyId: String, uploadId: String, buildId: String, fullSize: Long, scratch: File, handle: DownloadQueue.JobHandle): Boolean { + val installed = previous?.extra.orEmpty() + val from = installed["buildId"].orEmpty() + if (installed["uploadId"] != uploadId || from.isBlank() || buildId.isBlank() || from == buildId) return false + val out = File(folder, ItchStaging.DIR) + ItchStaging.delete(out) + scratch.mkdirs() + val outcome = try { + ItchPatch.run(app, key, downloadKeyId, from, buildId, fullSize, folder, out, scratch, handle, cancelled) + } catch (t: Exception) { + ItchPatch.Outcome.Failed("${t.javaClass.simpleName} ${t.message}") + } + when (outcome) { + ItchPatch.Outcome.Applied -> { + handle.log("itch.io: patched ${item.title} from build $from to $buildId") + return true + } + ItchPatch.Outcome.Cancelled -> Unit + is ItchPatch.Outcome.Failed -> handle.log("itch.io: no patch for ${item.title}, doing a full update (${outcome.reason})") + } + ItchStaging.delete(out) + return false + } + + private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean, patched: Boolean = false): String? { + work = if (updating) File(folder, ItchStaging.DIR) else folder + if (updating && !patched) ItchStaging.delete(work) + work.mkdirs() + if (resuming) clearPartialInstall() + val exe = try { + if (!patched) unpack(archive, filename, handle) + val hint = filename.substringBeforeLast('.') + var picked = StoreExe.pick(work, hint.ifBlank { null }, item.title) + var passes = 0 + while (picked.isBlank() && passes < 2 && !cancelled.get()) { + val inner = ItchArchives.inner(work) ?: break + handle.log("itch.io: no exe yet, unpacking ${inner.name}") + unpack(inner, inner.name, handle) + if (cancelled.get()) break + inner.delete() + picked = StoreExe.pick(work, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }, item.title) + passes++ + } + picked + } catch (t: Throwable) { + if (updating) ItchStaging.delete(work) + throw t } - val hint = filename.substringBeforeLast('.') - val exe = StoreExe.pick(folder, hint.ifBlank { null }, item.title) if (exe.isBlank()) { handle.log("itch.io: no exe found in ${folder.name}") + if (updating) ItchStaging.delete(work) return null } + if (updating) synchronized(commit) { + if (cancelled.get()) { + ItchStaging.delete(work) + return null + } + try { + StoreInstalls.markUpdating(folder) + } catch (t: Throwable) { + ItchStaging.delete(work) + throw t + } + ItchStaging.merge(work, folder) + ItchStaging.delete(work) + } return exe } - private fun sniff(file: File, filename: String): String { - val extension = filename.substringAfterLast('.', "").lowercase() - if (extension == "exe") return "exe" - val head = runCatching { FileInputStream(file).use { input -> ByteArray(300).also { input.read(it) } } }.getOrNull() - ?: return extension - fun at(i: Int, vararg bytes: Int) = bytes.indices.all { head.getOrNull(i + it) == bytes[it].toByte() } - return when { - at(0, 0x50, 0x4B) -> "zip" - at(0, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> "7z" - at(0, 0x52, 0x61, 0x72, 0x21) -> "rar" - at(0, 0x1F, 0x8B) -> "gz" - at(0, 0x42, 0x5A, 0x68) -> "bz2" - at(0, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) -> "xz" - at(257, 0x75, 0x73, 0x74, 0x61, 0x72) -> "tar" - else -> extension + private fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { + when (val kind = ItchArchives.kind(archive, filename)) { + "zip" -> unzip(archive, handle) + "7z" -> try { + sevenZip(archive, handle) + } catch (e: MemoryLimitException) { + handle.log("itch.io: ${archive.name} needs more memory than the app has, unpacking it in the runtime") + unrar(archive, handle, kind) + } + "rar" -> unrar(archive, handle, kind) + "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) + "tar" -> untar(archive, null, handle) + "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) + else -> copy(archive, File(work, filename.ifBlank { "game" })) } } private fun target(name: String): File? { - val file = File(folder, name.replace('\\', '/')) - val root = folder.canonicalPath + val file = File(work, name.replace('\\', '/')) + val root = work.canonicalPath val path = file.canonicalPath return if (path == root || path.startsWith(root + File.separator)) file else null } - // No JVM library reads RAR5; the runtime's bsdtar (libarchive) does. - private fun unrar(archive: File, handle: DownloadQueue.JobHandle) { - if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.stores_itch_archive, "rar")) - val binds = if (listOf(app.filesDir, app.cacheDir).any { folder.absolutePath.startsWith(it.absolutePath + "/") }) null - else listOf(folder.absolutePath) + private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.stores_itch_archive, kind)) + val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null + else listOf(work.absolutePath) fun bsdtar(args: List<String>, onLine: (String) -> Unit) = - GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = "itch-unrar", extraBinds = binds, fastPath = true) { line -> + GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = "itch-unrar", extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> if (!line.startsWith("proot ")) onLine(line) } var entries = 0L bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } var done = 0L val tail = ArrayDeque<String>() - val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", folder.absolutePath)) { line -> + val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { if (tail.size == 5) tail.removeFirst() tail.addLast(line) @@ -222,28 +320,31 @@ internal class ItchInstaller( val total = archive.length() var written = 0L val buffer = ByteArray(64 * 1024) - SevenZFile.builder().setFile(archive).get().use { seven -> - while (true) { - if (cancelled.get()) return - val entry = seven.nextEntry ?: break - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = seven.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) + val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() + Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> + while (true) { + if (cancelled.get()) return + val entry = seven.nextEntry ?: break + val file = target(entry.name) + if (file == null) { + handle.log("itch.io: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = seven.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } } } } @@ -333,8 +434,6 @@ internal class ItchInstaller( FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } } - // Streaming readers stop silently on zips whose data descriptors disagree with the local headers; - // the central directory is authoritative. private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { val total = archive.length() var written = 0L diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchPatch.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchPatch.kt new file mode 100644 index 000000000..9feebb10d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchPatch.kt @@ -0,0 +1,124 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import com.droiddeck.launcher.core.AddonPack +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import java.io.File +import java.util.concurrent.atomic.AtomicBoolean + +internal object ItchPatch { + private const val DIR = "/usr/local/lib/droiddeck-butler" + + sealed interface Outcome { + data object Applied : Outcome + data object Cancelled : Outcome + data class Failed(val reason: String) : Outcome + } + + fun ready(context: Context): Boolean { + if (!AddonPack.BUTLER.available || !LinuxRuntime.isInstalled(context)) return false + if (!AddonPack.BUTLER.installed(context)) { + AddonPack.BUTLER.ensure(context) + return false + } + return stage(context) + } + + private val stageLock = Any() + + private fun stage(context: Context): Boolean = synchronized(stageLock) { stageLocked(context) } + + private fun stageLocked(context: Context): Boolean { + val pack = AddonPack.BUTLER.dir(context) + val root = File(LinuxRuntime.rootDir(context), DIR.removePrefix("/")) + val packaged = File(pack, "version").readText() + if (runCatching { File(root, "version").readText() }.getOrNull() == packaged && File(root, "butler").isFile) return true + root.mkdirs() + pack.listFiles().orEmpty().filter { it.isFile && it.name != "version" && it.name != AddonPack.COMPLETE }.forEach { source -> + val staged = File(root, source.name + ".staged") + source.inputStream().use { input -> staged.outputStream().use { input.copyTo(it) } } + staged.setExecutable(true, false) + check(staged.renameTo(File(root, source.name))) + } + File(root, "version").writeText(packaged) + return true + } + + fun run( + app: Context, key: String, downloadKeyId: String, from: String, to: String, fullSize: Long, installed: File, out: File, scratch: File, + handle: DownloadQueue.JobHandle, cancelled: AtomicBoolean, + ): Outcome { + if (!ready(app)) return Outcome.Failed("the patch tool is not ready") + val steps = ItchBuilds.path(key, from, to, downloadKeyId) ?: return Outcome.Failed("no patch path from build $from to $to") + if (fullSize > 0 && steps.sumOf { it.patchSize } > fullSize) return Outcome.Failed("the patches are larger than a full download") + val dir = File(scratch, "patches").apply { deleteRecursively(); mkdirs() } + try { + handle.stage(DownloadStage.DOWNLOAD) + val total = steps.sumOf { it.patchSize } + var finished = 0L + val patches = steps.mapIndexed { index, step -> + val file = File(dir, "$index.pwr") + val base = finished + val ok = ItchBuilds.download(ItchBuilds.fileUrl(step.buildId, step.patchFile, downloadKeyId), key, file, cancelled) { + handle.progress(base + it, total) + } + if (cancelled.get()) return Outcome.Cancelled + if (!ok) return Outcome.Failed("build ${step.buildId}: the patch did not download") + finished += step.patchSize + file + } + val last = steps.last() + val signature = File(dir, "final.sig") + val got = ItchBuilds.download(ItchBuilds.fileUrl(last.buildId, last.signatureFile, downloadKeyId), key, signature, cancelled) {} + if (cancelled.get()) return Outcome.Cancelled + if (!got) return Outcome.Failed("build ${last.buildId}: the signature did not download") + handle.stage(DownloadStage.INSTALL) + return apply(app, patches, signature, installed, out, scratch, cancelled) + } finally { + StoreInstalls.deleteTree(dir) + } + } + + private fun apply(app: Context, patches: List<File>, signature: File, installed: File, out: File, scratch: File, cancelled: AtomicBoolean): Outcome { + var source = installed + var intermediate: File? = null + try { + patches.forEachIndexed { index, patch -> + val finalStep = index == patches.lastIndex + val target = if (finalStep) out else File(scratch, "patched-$index") + ItchStaging.delete(target) + target.mkdirs() + val staging = File(scratch, "butler-staging-$index").apply { deleteRecursively(); mkdirs() } + val args = mutableListOf("$DIR/butler", "apply", "--assume-yes", "--staging-dir", staging.absolutePath, "-d", target.absolutePath) + if (finalStep) args += listOf("--signature", signature.absolutePath) + args += listOf(patch.absolutePath, source.absolutePath) + val binds = listOf(installed, out, scratch).map { it.absolutePath } + .filter { path -> listOf(app.filesDir, app.cacheDir).none { path.startsWith(it.absolutePath + "/") } } + .distinct().takeIf { it.isNotEmpty() } + val tail = ArrayDeque<String>() + val code = try { + GuestCommand.run(app, args, logName = "itch-butler", extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> + if (!line.startsWith("proot ")) { + if (tail.size == 4) tail.removeFirst() + tail.addLast(line) + } + } + } finally { + StoreInstalls.deleteTree(staging) + } + if (cancelled.get()) return Outcome.Cancelled + if (code != 0) return Outcome.Failed("butler exited $code: ${tail.joinToString(" | ")}") + intermediate?.let { StoreInstalls.deleteTree(it) } + intermediate = if (finalStep) null else target + source = target + } + return Outcome.Applied + } finally { + intermediate?.let { StoreInstalls.deleteTree(it) } + } + } +} 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 0fd783ed6..acf332431 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/ItchStaging.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchStaging.kt new file mode 100644 index 000000000..73e8f8596 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchStaging.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.stores.itch + +import java.io.File +import java.nio.file.Files + +internal object ItchStaging { + const val DIR = ".droiddeck-update" + const val RECORD = ".droiddeck-store.json" + + fun merge(from: File, to: File, top: Boolean = true) { + for (child in from.listFiles().orEmpty()) { + if (top && child.name == RECORD) continue + val dest = File(to, child.name) + val destPath = dest.toPath() + if (child.isDirectory && !Files.isSymbolicLink(child.toPath()) && dest.isDirectory && !Files.isSymbolicLink(destPath)) { + merge(child, dest, false) + continue + } + if (Files.isSymbolicLink(destPath) || dest.exists()) { + delete(dest) + } + Files.move(child.toPath(), destPath) + } + } + + fun delete(file: File) { + if (!Files.isSymbolicLink(file.toPath()) && file.isDirectory) file.listFiles().orEmpty().forEach { delete(it) } + file.delete() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUpdates.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUpdates.kt new file mode 100644 index 000000000..2a1d105ed --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUpdates.kt @@ -0,0 +1,187 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import android.widget.Toast +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.util.concurrent.atomic.AtomicBoolean + +internal class ItchUpdate(val uploadId: String, val updatedAt: String, val filename: String, val replaced: Boolean) + +internal object ItchUpdates { + private const val KEY_AT = "updates_checked_at" + private const val KEY_FOUND = "updates_found" + private const val THROTTLE_MS = 6 * 60 * 60 * 1000L + private const val GAP_MS = 1_000L + + val available = mutableStateMapOf<String, ItchUpdate>() + var checkingKey by mutableStateOf<String?>(null) + private set + + private val running = AtomicBoolean(false) + private val restored = AtomicBoolean(false) + @Volatile private var generation = 0 + + internal fun evaluate(uploads: JSONArray?, uploadId: String, version: String): ItchUpdate? { + if (uploads == null || version.isBlank()) return null + val current = ItchUploads.byId(uploads, uploadId) + if (current != null) { + val stamp = ItchUploads.updatedAt(current) + return if (stamp > version) ItchUpdate(uploadId, stamp, ItchUploads.filename(current), false) else null + } + val next = ItchUploads.newestWindows(uploads) ?: return null + val stamp = ItchUploads.updatedAt(next) + if (uploadId.isBlank() && stamp <= version) return null + return ItchUpdate(next.optString("id"), stamp, ItchUploads.filename(next), uploadId.isNotBlank()) + } + + internal fun encode(found: Map<String, ItchUpdate>): String = JSONObject().also { out -> + for ((key, u) in found) out.put(key, JSONObject().put("uploadId", u.uploadId).put("updatedAt", u.updatedAt).put("filename", u.filename).put("replaced", u.replaced)) + }.toString() + + internal fun decode(raw: String?): Map<String, ItchUpdate> { + val json = runCatching { JSONObject(raw.orEmpty()) }.getOrNull() ?: return emptyMap() + val out = LinkedHashMap<String, ItchUpdate>() + for (key in json.keys()) { + val u = json.optJSONObject(key) ?: continue + val id = u.optString("uploadId") + if (id.isBlank()) continue + out[key] = ItchUpdate(id, u.optString("updatedAt"), u.optString("filename"), u.optBoolean("replaced")) + } + return out + } + + private fun restore(app: Context) { + if (!restored.compareAndSet(false, true)) return + val started = generation + val saved = decode(ItchPrefs.get(app).getString(KEY_FOUND, null)) + StoresState.post { + if (started != generation) return@post + for ((k, v) in saved) if (k !in available) available[k] = v + } + } + + private fun save(app: Context) { + ItchPrefs.get(app).edit().putString(KEY_FOUND, encode(available.toMap())).apply() + } + + fun check(context: Context) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + val started = generation + Thread({ + try { + restore(app) + val prefs = ItchPrefs.get(app) + if (System.currentTimeMillis() - prefs.getLong(KEY_AT, 0L) < THROTTLE_MS) return@Thread + val key = ItchAuth.key(app) + if (key.isBlank()) return@Thread + val games = StoresState.installed.toList().filter { it.sidecar.store == Store.ITCH && it.sidecar.isInstalled } + val found = LinkedHashMap<String, ItchUpdate>() + val answered = HashSet<String>() + val snapshot = HashMap<String, Pair<String, String>>() + var failed = false + games.forEachIndexed { i, game -> + if (i > 0) Thread.sleep(GAP_MS) + val extra = game.sidecar.extra + snapshot[game.key] = game.sidecar.installVersion to extra["uploadId"].orEmpty() + val gameId = extra["gameId"].orEmpty() + if (gameId.isNotEmpty()) { + val uploads = ItchApi.uploads(key, gameId, extra["downloadKeyId"].orEmpty()) + if (uploads == null) failed = true + else { + answered += game.key + evaluate(uploads, extra["uploadId"].orEmpty(), game.sidecar.installVersion)?.let { found[game.key] = it } + } + } else failed = true + } + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + for (k in answered) { + val now = StoresState.installed.firstOrNull { it.key == k } ?: continue + if (snapshot[k] != now.sidecar.installVersion to now.sidecar.extra["uploadId"].orEmpty()) continue + val u = found[k] + if (u != null) available[k] = u else available.remove(k) + } + save(app) + } + if (!failed && started == generation) prefs.edit().putLong(KEY_AT, System.currentTimeMillis()).apply() + StoresState.logLine("itch.io: checked ${games.size} installed games, ${found.size} with updates") + } finally { + running.set(false) + } + }, "itch-updates").start() + } + + fun checkGame(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + if (checkingKey != null) return + checkingKey = game.key + val started = generation + val version = game.sidecar.installVersion + val uploadId = game.sidecar.extra["uploadId"].orEmpty() + Thread({ + try { + val key = ItchAuth.key(app) + val extra = game.sidecar.extra + val gameId = extra["gameId"].orEmpty() + val uploads = if (key.isBlank() || gameId.isEmpty()) null else ItchApi.uploads(key, gameId, extra["downloadKeyId"].orEmpty()) + val found = evaluate(uploads, uploadId, version) + StoresState.post { + if (started != generation) return@post + val now = StoresState.installed.firstOrNull { it.key == game.key } + if (uploads != null && now != null && now.sidecar.installVersion == version && now.sidecar.extra["uploadId"].orEmpty() == uploadId) { + if (found != null) available[game.key] = found else available.remove(game.key) + save(app) + } + val text = when { + uploads == null -> app.getString(R.string.stores_sync_failed) + found != null -> app.getString(R.string.stores_itch_updates_found, 1) + else -> app.getString(R.string.upd_current_status) + } + Toast.makeText(app, text, Toast.LENGTH_SHORT).show() + } + StoresState.logLine("itch.io: checked ${game.sidecar.title}, ${if (found != null) "update available" else "up to date"}") + } finally { + StoresState.post { checkingKey = null } + } + }, "itch-update-check").start() + } + + fun start(context: Context, game: InstalledStoreGame, update: ItchUpdate) { + val app = context.applicationContext + if (StoresState.uninstalling.containsKey(game.key)) return + val root = game.folder.parentFile?.parentFile ?: return + val extra = game.sidecar.extra + ("uploadId" to update.uploadId) + val item = CatalogItem( + Store.ITCH, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, + isFree = extra["downloadKeyId"].isNullOrBlank(), owned = true, extra = extra, + ) + StoresState.install(app, item, root) + } + + fun applied(context: Context, key: String) { + val app = context.applicationContext + StoresState.post { + available.remove(key) + save(app) + } + } + + fun clear(context: Context) { + val app = context.applicationContext + generation++ + ItchPrefs.get(app).edit().remove(KEY_AT).remove(KEY_FOUND).apply() + StoresState.post { available.clear() } + } +} 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 773ad22c3..208c11169 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 @@ -18,6 +18,14 @@ internal object ItchUploads { return candidates.maxWithOrNull(compareBy({ it.optString("updated_at", it.optString("updatedAt")) }, { it.optLong("id") })) } + fun newestWindows(uploads: JSONArray?): JSONObject? { + if (uploads == null) return null + val windows = (0 until uploads.length()).mapNotNull { uploads.optJSONObject(it) } + .filter { it.optString("storage") != "external" && !it.optBoolean("demo") && windows(it) } + val games = windows.filter { it.optString("type") in GAME_TYPES } + return games.ifEmpty { windows }.maxWithOrNull(compareBy({ updatedAt(it) }, { it.optLong("id") })) + } + fun windows(upload: JSONObject): Boolean { val platforms = upload.optJSONObject("platforms") if (platforms != null) { @@ -30,6 +38,30 @@ 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 updatedAt(upload: JSONObject): String = upload.optString("updated_at", upload.optString("updatedAt")) + 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 9121a35c9..d678a2f41 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 100371b06..6f50a0303 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,6 @@ 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. */ private val pcPlans = mapOf( "CFQ7TTC0KGQ8" to "PC Game Pass", "CFQ7TTC0KHS0" to "Game Pass Ultimate", @@ -61,7 +60,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 +97,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 +106,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 +128,55 @@ 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" + + 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 + +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 000000000..16392fd34 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt @@ -0,0 +1,182 @@ +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 + +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", "RestrictedApi") + 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) + } + 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 + + 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() + } + + @android.annotation.SuppressLint("RestrictedApi") + 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 000000000..1f8dd66e6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt @@ -0,0 +1,127 @@ +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 + +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()) + + 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) + + 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() + } + + 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)) + } + + 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 000000000..ebe79a3ae --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt @@ -0,0 +1,393 @@ +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 + +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 + @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) + 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 + + 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) + } + + @android.annotation.SuppressLint("RestrictedApi") + 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 + } + 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) + + 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 000000000..835a55166 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt @@ -0,0 +1,114 @@ +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 + +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 + + @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 } + + 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 000000000..247b1b033 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt @@ -0,0 +1,106 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import org.json.JSONObject + +data class XboxCloudSettings( + val resolution: String = "1080p", + val region: String = "", + val language: String = "", + val codec: String = "default", + val bitrateMbps: Int = 0, + val preventDrops: Boolean = false, + val statsLevel: Int = 0, + val statsLayout: String = "horizontal", + val statsCorner: String = "right", + val volume: Int = 100, + val rumble: Int = 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", + val deband: Int = 0, + val fxaa: Boolean = false, + val toon: Boolean = false, + val crt: Boolean = false, + val ntsc: Boolean = false, + val playerEngine: String = "web", + val frameGen: String = "ddfg", + val fpsLimit: Int = 0, + val fpsCustomOn: Boolean = false, + val fpsCustom: Int = 60, + val instantInput: Boolean = true, + val smallBuffer: Boolean = false, + val fastDecoder: Boolean = true, + val zeroCopy: Boolean = false, +) { + val fpsTarget get() = if (fpsCustomOn) fpsCustom else fpsLimit + + 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 000000000..3fb7539c9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt @@ -0,0 +1,63 @@ +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.systemBarsPadding +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().systemBarsPadding().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 000000000..b4f9ab9cb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt @@ -0,0 +1,301 @@ +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 + +@Composable +fun XboxCloudSettingsPanel( + settings: XboxCloudSettings, + regions: List<String>, + live: Boolean, + section: String? = null, + restoreRow: Int? = null, + onRowFocused: (Int) -> Unit = {}, + 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() } + } +} + +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, +) { + 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)) + } + 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)) } + } + + 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() + } +} + +@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() + .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("+") } + } +} + +@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)) +} + +@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 000000000..8488de6e9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.stores.xbox + +import org.json.JSONArray +import org.json.JSONObject + +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) + + 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 000000000..1568406ed --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt @@ -0,0 +1,69 @@ +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 + +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 + + 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 ffe4b9de6..c8b126519 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,10 @@ 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) + 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 @@ -33,7 +37,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str return false } - /** Also written to the stores log: sign-in runs in its own process, where only that file reaches a shared log. */ private fun note(text: String) { android.util.Log.w("XboxCredentials", text) com.droiddeck.launcher.stores.StoreLogFiles.stamped(app, "Xbox credentials: $text") @@ -79,33 +82,119 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } } } - init { + 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() + + 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 { + 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 +207,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/XboxGamertag.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt index b065e8baf..c6e62596b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt @@ -4,15 +4,12 @@ import android.content.Context import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreAccounts import com.droiddeck.launcher.stores.StoresState -/** Keeps the account's Xbox gamertag in its record so the Stores page can show it instead of the sign-in email. */ internal object XboxGamertag { - /** `xodus-cli profile` allows itself 45 s, and starting it through PRoot adds to that. */ private const val TIMEOUT_SECONDS = 75L private val triedGeneration = java.util.concurrent.atomic.AtomicReference<String?>(null) internal fun valid(value: String): Boolean = value.isNotEmpty() && value.length <= 64 && value.none { it.isISOControl() } - /** Reads the gamertag with `xodus-cli profile` and stores it; false when Xbox didn't return one. */ fun refresh(app: Context, credentialGeneration: String? = null): Boolean = try { val gamertag = Xodus.run(app, listOf("profile", "--json"), timeout = TIMEOUT_SECONDS, credentialGeneration = credentialGeneration) .optString("gamertag").trim() @@ -29,7 +26,6 @@ internal object XboxGamertag { false } - /** Fetches a missing gamertag once per signed-in account, on its own thread so it never holds up a library sync. */ fun ensure(app: Context) { Thread({ runCatching { 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 44e9ceff3..3d02e4db5 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 bf9e7ee70..5de1abcac 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 000000000..3e3e001d7 --- /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 bdfb27d09..d5809249d 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,15 +31,18 @@ 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) host.addView(Button(this).apply { text = getString(com.droiddeck.launcher.R.string.stores_login_close); setOnClickListener { finish() } }) setContentView(host) + com.droiddeck.launcher.core.SystemInsets.fit(host) if (android.os.Build.VERSION.SDK_INT < 28 || !WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER) || !WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) { status.text = "Update Android System WebView to sign in to Xbox." @@ -53,6 +56,12 @@ class XboxLoginActivity : ComponentActivity() { Thread({ if (closed) return@Thread try { + 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 -> @@ -63,8 +72,10 @@ class XboxLoginActivity : ComponentActivity() { Xodus.start(applicationContext, listOf("--external-webview-stdio", "login"), credentialGeneration = accountGeneration).use { process -> 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 +151,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() @@ -150,7 +162,6 @@ class XboxLoginActivity : ComponentActivity() { private fun progress(name: String, text: String) { step = name; show(text) } - /** Written to the stores log, which the shared log zip carries; the main process's log helpers don't run in this process. */ private fun logStep(line: String) { val text = StoreLog.redactLine("Xbox sign-in: $line") Log.i(TAG, text) @@ -216,7 +227,6 @@ class XboxLoginActivity : ComponentActivity() { companion object { private const val TAG = "XboxLogin" - /** Our own check messages are safe to show; anything else is named by its type, never its text, which may hold sign-in data. */ internal fun failure(e: Exception): String { val message = e.message.orEmpty() return if (e is IllegalStateException && message.isNotBlank() && message != "Check failed." && message.length <= 160) message 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 000000000..e42c2ebaf --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.stores.xbox + +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent + +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) { + 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 + @Volatile var onChanged: (() -> Unit)? = null + + @Volatile var overrideButtons = 0 + + fun snapshot() = State(buttons or hatButtons or overrideButtons, lx, ly, rx, ry, lt, rt) + + 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 + 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 + } + + 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 000000000..797f7b989 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt @@ -0,0 +1,777 @@ +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 + +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 + @Volatile private var connectedOnce = false + @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>() + private var startedWith: XboxCloudSettings? = null + @Volatile private var zeroCopy = false + 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 + 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 + 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) + } + + private fun showNotice(title: String, text: String, webPlayer: Boolean) = runOnUiThread { + if (notice != null || isFinishing || isDestroyed) return@runOnUiThread + closeMenu() + show("") + 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)) + } + + override fun onStop() { + super.onStop() + if (closed || isChangingConfigurations || signalling == null || endedInBackground) 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() } + } + + 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 + 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…") + 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) { + 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 + } + + 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 + } + + 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() + if (track is VideoTrack && !videoAttached) { videoAttached = true; video?.let { track.addSink(it) }; log("video track") } + } + + 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))) + } + + 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) + } + + @android.annotation.SuppressLint("RestrictedApi") + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (menu != null) { + 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) + } + 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) + } + + 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)) } + } + + @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 + + 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 } + } + } + 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 + 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 } + } + } + + 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) { + 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 + 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() + } + + 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() + } + + 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 + 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 + } + + 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()) } + } + + 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) + } + + 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() } + + 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 { + 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) + + 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 000000000..cb44b43fe --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt @@ -0,0 +1,174 @@ +// The xCloud data-channel protocol is ported from Greenlight by UnknownSKL (Jim Kroon), MIT; see tools/xcloud-player/NOTICE.md. +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 + +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") + send(control, JSONObject().put("message", "authorizationRequest").put("accessKey", "4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E").toString()) + gamepadChanged(0, true); gamepadChanged(0, false) + startInput() + sendConfig() + 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() + } + "/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() { + send(input, header(8, 15).apply { put(1.toByte()); flip() }) + loop = timer.scheduleWithFixedDelay({ runCatching { tick() } }, 16, 16, TimeUnit.MILLISECONDS) + } + + fun inputChanged() { + if (handshakeDone && loop != null && System.nanoTime() - lastSentAt > 4_000_000L) timer.execute { runCatching { tick() } } + } + + @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()) + put(0.toByte()) + 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) + order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_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 + 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 000000000..62a65d24b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt @@ -0,0 +1,164 @@ +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 + +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" + } + 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 + 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 + @Volatile private var fpsTarget = 0 + private var nextDueNs = 0L + @Volatile var frames = 0L + private set + + 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() } + 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() + } + + 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") + } + + fun setFpsTarget(fps: Int) { + fpsTarget = fps + synchronized(lock) { if (attached) applyFrameGen() } + } + + fun setFrameGeneration(mode: String) { + frameGen = mode + synchronized(lock) { if (attached) applyFrameGen() } + } + + override fun onFrame(frame: VideoFrame) { + if (android.os.Build.VERSION.SDK_INT < 29) return + val w = frame.rotatedWidth; val h = frame.rotatedHeight + synchronized(lock) { if (w != readerW || h != readerH) startReader(w, h) } + egl.onFrame(frame) + } + + @androidx.annotation.RequiresApi(29) + 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") + } + + @androidx.annotation.RequiresApi(29) + private fun onImage(r: ImageReader) { + val image = runCatching { r.acquireLatestImage() }.getOrNull() ?: return + synchronized(lock) { + if (r !== reader) { image.close(); return } + val buffer = image.hardwareBuffer + 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() { + 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)" } ?: "")) + } + + 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 28d6c12d9..d1ba4a52e 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 fde5b0650..f803d0641 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,12 @@ internal object Xodus { } } - /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ + const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\." + 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/sync/SyncPrefs.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncPrefs.kt new file mode 100644 index 000000000..a0b1a63ce --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncPrefs.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.sync + +import android.content.Context +import java.security.SecureRandom + +object SyncPrefs { + const val RUN_WHILE_OPEN = "open" + const val RUN_BACKGROUND = "background" + + private fun prefs(context: Context) = context.getSharedPreferences("syncthing", Context.MODE_PRIVATE) + + fun enabled(context: Context): Boolean = prefs(context).getBoolean("enabled", false) + fun setEnabled(context: Context, on: Boolean) { prefs(context).edit().putBoolean("enabled", on).apply() } + + fun runMode(context: Context): String = + prefs(context).getString("run", RUN_WHILE_OPEN).takeIf { it == RUN_BACKGROUND } ?: RUN_WHILE_OPEN + fun setRunMode(context: Context, mode: String) { prefs(context).edit().putString("run", mode).apply() } + + fun wifiOnly(context: Context): Boolean = prefs(context).getBoolean("wifi-only", false) + fun setWifiOnly(context: Context, on: Boolean) { prefs(context).edit().putBoolean("wifi-only", on).apply() } + + fun pauseInGames(context: Context): Boolean = prefs(context).getBoolean("pause-in-games", false) + fun setPauseInGames(context: Context, on: Boolean) { prefs(context).edit().putBoolean("pause-in-games", on).apply() } + + fun userPaused(context: Context): Boolean = prefs(context).getBoolean("paused", false) + fun setUserPaused(context: Context, on: Boolean) { prefs(context).edit().putBoolean("paused", on).apply() } + + fun pauseApplied(context: Context): Boolean = prefs(context).getBoolean("pause-applied", false) + fun setPauseApplied(context: Context, on: Boolean) { prefs(context).edit().putBoolean("pause-applied", on).apply() } + + fun guiPassword(context: Context): String = prefs(context).getString("gui-password", null) ?: randomToken().also { + prefs(context).edit().putString("gui-password", it).apply() + } + + fun clearIdentity(context: Context) { prefs(context).edit().remove("gui-password").apply() } + + internal fun randomToken(length: Int = 32): String { + val alphabet = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789" + val random = SecureRandom() + return String(CharArray(length) { alphabet[random.nextInt(alphabet.length)] }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt b/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt new file mode 100644 index 000000000..6d3a81882 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt @@ -0,0 +1,544 @@ +package com.droiddeck.launcher.sync + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.Base64 +import android.util.Log +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper +import com.droiddeck.launcher.session.SessionState +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.security.SecureRandom +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger + +object Syncthing { + enum class Phase { OFF, STARTING, RUNNING, STOPPING, FAILED } + enum class AutoPause { WIFI, GAME } + + const val FAILURE_MISSING = "binary-missing" + private const val FAILURE_POLICY = "Stopped because a folder outside DroidDeck's storage could not be paused" + private const val FAILURE_PAUSE = "Stopped because Syncthing could not be paused" + private const val FAILURE_STILL_RUNNING = "The previous Syncthing process did not exit" + private const val TAG = "Syncthing" + private const val GRACE_MS = 60_000L + private const val ENFORCE_ATTEMPTS = 3 + private const val LOG_LIMIT = 4L shl 20 + private const val FOLDER_ID_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789" + + var enabled by mutableStateOf(false); private set + var phase by mutableStateOf(Phase.OFF); private set + var snapshot by mutableStateOf<SyncSnapshot?>(null); private set + var failure by mutableStateOf<String?>(null); private set + var ports by mutableStateOf<SyncthingPorts?>(null); private set + var apiKeyTail by mutableStateOf<String?>(null); private set + var userPaused by mutableStateOf(false); private set + var autoPause by mutableStateOf<AutoPause?>(null); private set + var devicesPaused by mutableStateOf(false); private set + val pauseRequested get() = userPaused || autoPause != null + var openRequests by mutableStateOf(0) + private set + var openPending = false + + fun requestOpen() { + openPending = true + openRequests++ + } + + val needsAttention get() = phase == Phase.FAILED || snapshot?.needsAttention == true + + @Volatile var onChange: (() -> Unit)? = null + + private val main = Handler(Looper.getMainLooper()) + private val worker = Executors.newSingleThreadExecutor { Thread(it, "syncthing") } + private lateinit var app: Context + @Volatile private var process: Process? = null + @Volatile private var api: SyncthingApi? = null + @Volatile private var generation = 0 + @Volatile private var onWifi = true + private var visible = 0 + private var foreground = false + private var backgroundBudgetAvailable = true + private val watchers = AtomicInteger() + private val pauseFailures = AtomicInteger() + private val pauseLock = Any() + private val leaveForeground = Runnable { foreground = false; evaluate() } + + fun home(context: Context) = File(context.filesDir, "syncthing") + fun folderRoot(context: Context) = File(context.getExternalFilesDir(null) ?: context.filesDir, "Sync") + fun logFile(context: Context) = File(home(context), "syncthing.log") + private fun config(context: Context) = File(home(context), "config.xml") + private fun guiSocket(context: Context) = File(home(context), "gui.sock") + private fun binary(context: Context) = File(context.applicationInfo.nativeLibraryDir, "libsyncthingnative.so") + + fun storageRoots(context: Context): List<File> = + listOf(context.dataDir) + context.getExternalFilesDirs(null).filterNotNull().mapNotNull { it.parentFile } + + fun guard(context: Context) = SyncthingGuard(folderRoot(context), storageRoots(context), listOf(home(context))) + + fun init(application: Application) { + app = application.applicationContext + userPaused = SyncPrefs.userPaused(app) + enabled = SyncPrefs.enabled(app) + val previous = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler { thread, error -> + runCatching { process?.destroyForcibly() } + previous?.uncaughtException(thread, error) ?: Runtime.getRuntime().halt(2) + } + application.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityStarted(activity: Activity) { + visible++ + main.removeCallbacks(leaveForeground) + val resume = !foreground || !backgroundBudgetAvailable + backgroundBudgetAvailable = true + foreground = true + if (resume) evaluate() + } + override fun onActivityStopped(activity: Activity) { + visible = (visible - 1).coerceAtLeast(0) + if (visible == 0) main.postDelayed(leaveForeground, GRACE_MS) + } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {} + override fun onActivityResumed(activity: Activity) {} + override fun onActivityPaused(activity: Activity) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + override fun onActivityDestroyed(activity: Activity) {} + }) + val connectivity = app.getSystemService(ConnectivityManager::class.java) + onWifi = connectivity?.activeNetwork?.let { connectivity.getNetworkCapabilities(it) }?.let(::isWifi) ?: false + runCatching { + connectivity?.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() { + override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) { networkChanged(isWifi(caps)) } + override fun onLost(network: Network) { networkChanged(false) } + }) + } + evaluate() + } + + private fun isWifi(caps: NetworkCapabilities) = + caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || caps.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + + private fun networkChanged(wifi: Boolean) { + if (wifi == onWifi) return + onWifi = wifi + worker.execute { api?.let { applyPause(it) } } + } + + fun evaluate() { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { evaluate() }; return } + val enabled = SyncPrefs.enabled(app) + val background = SyncPrefs.runMode(app) == SyncPrefs.RUN_BACKGROUND && backgroundBudgetAvailable + if (enabled && background) SyncthingService.start(app) else SyncthingService.stop(app) + if (enabled && (foreground || background && backgroundBudgetAvailable)) start() else stop() + } + + fun backgroundServiceUnavailable() { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { backgroundServiceUnavailable() }; return } + backgroundBudgetAvailable = false + evaluate() + } + + fun setEnabled(context: Context, on: Boolean, forget: Boolean = false) { + if (on && !LinuxRuntime.isInstalled(context)) return + SyncPrefs.setEnabled(context, on) + enabled = on + if (on && phase == Phase.FAILED) phase = Phase.OFF + evaluate() + if (!on && forget) worker.execute { + if (process != null) return@execute + home(context).deleteRecursively() + SyncPrefs.clearIdentity(context) + SyncPrefs.setPauseApplied(context, false) + } + } + + fun setPaused(context: Context, paused: Boolean) { + SyncPrefs.setUserPaused(context, paused) + userPaused = paused + changed() + worker.execute { api?.let { applyPause(it) } } + } + + fun settingsChanged() { + evaluate() + worker.execute { api?.let { applyPause(it) } } + } + + fun restart() { + stop() + evaluate() + } + + fun reset(context: Context) { + stop() + worker.execute { + if (process != null) return@execute + home(context).deleteRecursively() + SyncPrefs.clearIdentity(context) + SyncPrefs.setPauseApplied(context, false) + main.post { evaluate() } + } + } + + fun regenerateApiKey() { + worker.execute { + val current = api ?: return@execute + val key = SyncPrefs.randomToken() + runCatching { current.setApiKey(key) }.onSuccess { + api = SyncthingApi(current.socket, key) + main.post { apiKeyTail = key.takeLast(4); changed() } + }.onFailure { Log.w(TAG, "API key change failed", it) } + } + } + + fun addFolder(context: Context, path: File, label: String, devices: List<String>, id: String = newFolderId(), onDone: (Boolean) -> Unit) { + worker.execute { + val ok = runCatching { + val client = api ?: error("Syncthing is not running") + check(guard(context).allows(path.path)) { "${path.path} is outside DroidDeck's storage" } + path.mkdirs() + client.addFolder(client.defaultFolder().apply { + put("id", id) + put("label", label) + put("path", path.path) + put("devices", JSONArray(devices.map { JSONObject().put("deviceID", it) })) + }) + }.onFailure { Log.w(TAG, "add folder failed", it) }.isSuccess + main.post { onDone(ok) } + } + } + + private fun newFolderId(): String { + val random = SecureRandom() + fun part() = (1..5).map { FOLDER_ID_CHARS[random.nextInt(FOLDER_ID_CHARS.length)] }.joinToString("") + return "${part()}-${part()}" + } + + fun removeFolder(id: String) { + worker.execute { api?.let { a -> runCatching { a.removeFolder(id) }.onFailure { Log.w(TAG, "remove $id failed", it) } } } + } + + fun webUiProxy(context: Context): SyncthingProxy? { + if (phase != Phase.RUNNING) return null + val token = Base64.encodeToString("${SyncthingConfig.GUI_USER}:${SyncPrefs.guiPassword(context)}".toByteArray(), Base64.NO_WRAP) + return runCatching { SyncthingProxy(guiSocket(context), "Basic $token") }.onFailure { Log.w(TAG, "web UI proxy failed", it) }.getOrNull() + } + + fun watch(): () -> Unit { + watchers.incrementAndGet() + return { watchers.decrementAndGet() } + } + + private fun start() { + if (phase == Phase.STARTING || phase == Phase.RUNNING) return + if (phase == Phase.FAILED && failure == FAILURE_MISSING) return + val gen = ++generation + phase = Phase.STARTING + failure = null + changed() + worker.execute { launch(gen) } + } + + private fun stop() { + if (phase == Phase.OFF) return + val gen = ++generation + phase = if (process != null || phase == Phase.STARTING) Phase.STOPPING else Phase.OFF + changed() + worker.execute { + shutdown() + val stopped = process == null + main.post { + if (gen != generation) return@post + if (stopped) { phase = Phase.OFF; snapshot = null; ports = null } else { phase = Phase.FAILED; failure = FAILURE_STILL_RUNNING } + changed() + } + } + } + + private fun launch(gen: Int) { + val context = app + try { + if (!binary(context).isFile) throw SyncthingFailure(FAILURE_MISSING) + if (process != null) throw SyncthingFailure(FAILURE_STILL_RUNNING) + val name = binary(context).name + OrphanReaper.reap("stale Syncthing") { it.substringAfterLast('/') == name } + home(context).mkdirs() + folderRoot(context).mkdirs() + if (!config(context).isFile) generate(context) + val picked = SyncthingPortPicker.pick() + val guard = guard(context) + val paused = SyncPrefs.userPaused(context) || autoPauseReason() != null + SyncthingConfig.apply(config(context), picked, guiSocket(context), folderRoot(context), paused, guard::allows) + if (paused) SyncPrefs.setPauseApplied(context, true) + val key = SyncthingConfig.apiKey(config(context)) ?: throw SyncthingFailure("config.xml has no API key") + if (gen != generation) return + rotateLog(context) + val child = ProcessBuilder(binary(context).path, "serve", "--no-browser", "--no-restart") + .redirectErrorStream(true) + .also { environment(context, it.environment()) } + .start() + process = child + OrphanReaper.keep(HostProcess.pidOf(child)) + pump(gen, child, logFile(context)) + pauseFailures.set(0) + val client = SyncthingApi(guiSocket(context), key) + val deadline = System.currentTimeMillis() + 60_000 + while (!client.ping()) { + if (gen != generation) return + if (!child.isAlive) throw SyncthingFailure("Syncthing exited during start (${child.exitValue()})") + if (System.currentTimeMillis() > deadline) throw SyncthingFailure("Syncthing did not answer on ${guiSocket(context).name}") + Thread.sleep(250) + } + api = client + main.post { + if (gen == generation) { ports = picked; apiKeyTail = key.takeLast(4); devicesPaused = paused; phase = Phase.RUNNING; changed() } + } + Thread({ poll(gen, guard) }, "syncthing-status").start() + Thread({ enforce(gen, guard) }, "syncthing-guard").start() + } catch (e: Exception) { + Log.w(TAG, "start failed", e) + shutdown() + val reason = (e as? SyncthingFailure)?.message ?: e.toString() + main.post { if (gen == generation) { phase = Phase.FAILED; failure = reason; changed() } } + } + } + + private fun generate(context: Context) { + val output = File(home(context), "generate.log") + val child = ProcessBuilder(binary(context).path, "generate", "--gui-user", SyncthingConfig.GUI_USER, "--gui-password", "-") + .redirectErrorStream(true) + .redirectOutput(output) + .also { environment(context, it.environment()) } + .start() + val pid = HostProcess.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.bufferedWriter().use { it.write(SyncPrefs.guiPassword(context) + "\n") } + if (!child.waitFor(60, TimeUnit.SECONDS) || child.exitValue() != 0 || !config(context).isFile) { + child.destroy() + val last = runCatching { output.readLines().lastOrNull { it.isNotBlank() } }.getOrNull().orEmpty() + throw SyncthingFailure("syncthing generate failed: $last") + } + } finally { + output.delete() + OrphanReaper.release(pid) + } + } + + private fun environment(context: Context, env: MutableMap<String, String>) { + listOf("LD_PRELOAD", "LD_AUDIT", "LD_LIBRARY_PATH").forEach { env.remove(it) } + env["STHOMEDIR"] = home(context).path + env["HOME"] = folderRoot(context).path + env["STNOUPGRADE"] = "1" + env["STNODEFAULTFOLDER"] = "1" + env["STMONITORED"] = "1" + env["SQLITE_TMPDIR"] = context.cacheDir.path + env["STVERSIONEXTRA"] = "DroidDeck" + } + + private fun rotateLog(context: Context) { + val log = logFile(context) + if (log.length() > 0) log.renameTo(File(log.parentFile, "syncthing.old.log")) + } + + private fun pump(gen: Int, child: Process, log: File) { + Thread({ + var last = "" + runCatching { + log.appendText("") + child.inputStream.bufferedReader().useLines { lines -> + lines.forEach { line -> + if (line.isNotBlank()) last = line + if (log.length() < LOG_LIMIT) log.appendText(line + "\n") + } + } + } + val code = runCatching { child.waitFor() }.getOrDefault(-1) + OrphanReaper.release(HostProcess.pidOf(child)) + main.post { + if (process !== child) return@post + process = null + if (gen == generation && phase == Phase.RUNNING) { + api = null + phase = Phase.FAILED; failure = "Syncthing stopped ($code): $last"; snapshot = null; changed() + } + } + }, "syncthing-output").start() + } + + private fun shutdown() { + val child = process ?: return + api?.let { runCatching { it.shutdown() } } + api = null + if (!child.waitFor(10, TimeUnit.SECONDS)) { + child.destroy() + if (!child.waitFor(3, TimeUnit.SECONDS)) { + child.destroyForcibly() + child.waitFor(3, TimeUnit.SECONDS) + } + } + if (child.isAlive) { + Log.w(TAG, "Syncthing did not exit") + return + } + process = null + } + + private fun poll(gen: Int, guard: SyncthingGuard) { + var previous: Pair<Long, Pair<Long, Long>>? = null + var myId: String? = null + while (gen == generation) { + val client = api ?: return + applyPause(client) + try { + val id = myId ?: client.myId().also { myId = it } + val connections = client.connections() + val total = connections.optJSONObject("total") + val now = System.currentTimeMillis() + val bytes = (total?.optLong("inBytesTotal") ?: 0L) to (total?.optLong("outBytesTotal") ?: 0L) + val rates = previous?.let { (at, was) -> + val seconds = ((now - at) / 1000.0).coerceAtLeast(0.5) + ((bytes.first - was.first).coerceAtLeast(0) / seconds).toLong() to ((bytes.second - was.second).coerceAtLeast(0) / seconds).toLong() + } ?: (0L to 0L) + previous = now to bytes + val snap = collect(client, guard, id, connections, rates) + main.post { if (gen == generation) { snapshot = snap; changed() } } + } catch (e: PolicyFailure) { + failClosed(gen, e) + return + } catch (e: Exception) { + Log.d(TAG, "status poll failed: $e") + } + Thread.sleep(if (watchers.get() > 0) 2_000 else 10_000) + } + } + + private fun collect(client: SyncthingApi, guard: SyncthingGuard, myId: String, connections: org.json.JSONObject, rates: Pair<Long, Long>): SyncSnapshot { + val names = SyncthingParse.deviceNames(client.devices(), myId) + val config = client.folders() + val folders = (0 until config.length()).map { config.getJSONObject(it) }.map { f -> + val id = f.getString("id") + val path = f.optString("path") + val blocked = !guard.allows(path) + if (blocked && !f.optBoolean("paused")) pauseFolder(client, id) + val paused = blocked || f.optBoolean("paused") + val status = if (paused) null else runCatching { client.folderStatus(id) }.getOrElse { SyncthingParse.unreadableStatus() } + SyncthingParse.folder(f, status, blocked, names) + } + val conns = connections.optJSONObject("connections") + val stats = runCatching { client.deviceStats() }.getOrNull() + val devices = names.map { (id, name) -> + val c = conns?.optJSONObject(id) + val seen = stats?.optJSONObject(id)?.optString("lastSeen")?.let(::parseTime) + SyncDevice(id, name, c?.optBoolean("connected") == true, c?.optString("address")?.takeIf { it.isNotEmpty() }, seen) + } + return SyncSnapshot( + myId, folders, devices, + runCatching { SyncthingParse.pendingFolders(client.pendingFolders(), names) }.getOrDefault(emptyList()), + runCatching { SyncthingParse.pendingDevices(client.pendingDevices()) }.getOrDefault(emptyList()), + rates.first, rates.second, + ) + } + + private fun parseTime(s: String): Long? = runCatching { + java.time.OffsetDateTime.parse(s).toInstant().toEpochMilli().takeIf { it > 86_400_000L } + }.getOrNull() + + private fun enforce(gen: Int, guard: SyncthingGuard) { + var since = 0L + var pending = true + var failures = 0 + while (gen == generation) { + val client = api ?: return + try { + if (!pending) { + val (last, saved) = client.waitForConfigSaved(since, 60) + since = last + pending = saved + } + if (pending && gen == generation) { + applyPause(client) + val folders = client.folders() + for (i in 0 until folders.length()) { + val f = folders.getJSONObject(i) + if (!f.optBoolean("paused") && !guard.allows(f.optString("path"))) pauseFolder(client, f.getString("id")) + } + pending = false + } + failures = 0 + } catch (e: PolicyFailure) { + failClosed(gen, e) + return + } catch (e: Exception) { + if (pending && ++failures >= ENFORCE_ATTEMPTS) { + failClosed(gen, PolicyFailure(e)) + return + } + Thread.sleep(2_000) + } + } + } + + private fun pauseFolder(client: SyncthingApi, id: String) { + try { + client.pauseFolder(id) + } catch (e: Exception) { + throw PolicyFailure(e) + } + } + + private fun failClosed(gen: Int, cause: Exception, reason: String = FAILURE_POLICY) { + Log.w(TAG, reason, cause) + worker.execute { + if (gen != generation) return@execute + shutdown() + main.post { if (gen == generation) { phase = Phase.FAILED; failure = reason; snapshot = null; changed() } } + } + } + + private fun applyPause(client: SyncthingApi) = synchronized(pauseLock) { + val context = app + val auto = autoPauseReason() + val want = SyncPrefs.userPaused(context) || auto != null + var held = SyncPrefs.pauseApplied(context) && !(want && hasUnpausedPeer(client)) + if (want != held) { + runCatching { if (want) client.pauseAll() else client.resumeAll() } + .onSuccess { SyncPrefs.setPauseApplied(context, want); held = want; pauseFailures.set(0) } + .onFailure { Log.w(TAG, "pause change failed", it); if (want) pauseFailures.incrementAndGet() } + } + if (auto != autoPause || held != devicesPaused) main.post { autoPause = auto; devicesPaused = held; changed() } + if (want && !held && pauseFailures.get() >= ENFORCE_ATTEMPTS) failClosed(generation, IllegalStateException(FAILURE_PAUSE), FAILURE_PAUSE) + } + + private fun hasUnpausedPeer(client: SyncthingApi): Boolean = runCatching { + val myId = client.myId() + val devices = client.devices() + (0 until devices.length()).map { devices.getJSONObject(it) } + .any { it.getString("deviceID") != myId && !it.optBoolean("paused") } + }.getOrDefault(true) + + private fun autoPauseReason(): AutoPause? = when { + SyncPrefs.wifiOnly(app) && !onWifi -> AutoPause.WIFI + SyncPrefs.pauseInGames(app) && SessionState.running -> AutoPause.GAME + else -> null + } + + private fun changed() { onChange?.invoke() } + + private class SyncthingFailure(message: String) : Exception(message) + private class PolicyFailure(cause: Exception) : Exception(cause) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt new file mode 100644 index 000000000..7a7eaab24 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt @@ -0,0 +1,57 @@ +package com.droiddeck.launcher.sync + +import android.net.LocalSocket +import android.net.LocalSocketAddress +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.net.URLEncoder + +class SyncthingApi(val socket: File, private val apiKey: String) { + fun ping(): Boolean = runCatching { get("/rest/system/ping").optString("ping") == "pong" }.getOrDefault(false) + fun myId(): String = get("/rest/system/status").getString("myID") + fun folders(): JSONArray = getArray("/rest/config/folders") + fun devices(): JSONArray = getArray("/rest/config/devices") + fun folderStatus(id: String): JSONObject = get("/rest/db/status?folder=${enc(id)}") + fun connections(): JSONObject = get("/rest/system/connections") + fun deviceStats(): JSONObject = get("/rest/stats/device") + fun pendingDevices(): JSONObject = get("/rest/cluster/pending/devices") + fun pendingFolders(): JSONObject = get("/rest/cluster/pending/folders") + + fun defaultFolder(): JSONObject = get("/rest/config/defaults/folder") + fun addFolder(folder: JSONObject) = send("POST", "/rest/config/folders", folder) + fun pauseFolder(id: String) = merge("/rest/config/folders/${enc(id)}") { put("paused", true) } + fun removeFolder(id: String) { send("DELETE", "/rest/config/folders/${enc(id)}", null) } + fun pauseAll() { send("POST", "/rest/system/pause", null) } + fun resumeAll() { send("POST", "/rest/system/resume", null) } + fun setApiKey(key: String) = merge("/rest/config/gui") { put("apiKey", key) } + fun shutdown() { send("POST", "/rest/system/shutdown", null) } + + private fun merge(path: String, change: JSONObject.() -> Unit) = send("PUT", path, get(path).apply(change)) + + fun waitForConfigSaved(since: Long, timeoutSeconds: Int): Pair<Long, Boolean> { + val events = JSONArray(request("GET", "/rest/events?events=ConfigSaved&since=$since&timeout=$timeoutSeconds", null, (timeoutSeconds + 10) * 1000)) + if (events.length() == 0) return since to false + return events.getJSONObject(events.length() - 1).getLong("id") to true + } + + private fun get(path: String) = JSONObject(request("GET", path, null, TIMEOUT_MS)) + private fun getArray(path: String) = JSONArray(request("GET", path, null, TIMEOUT_MS)) + private fun send(method: String, path: String, body: JSONObject?) { request(method, path, body, TIMEOUT_MS) } + + private fun request(method: String, path: String, body: JSONObject?, timeoutMs: Int): String = LocalSocket().use { s -> + s.connect(LocalSocketAddress(socket.path, LocalSocketAddress.Namespace.FILESYSTEM)) + s.soTimeout = timeoutMs + val headers = listOf("X-API-Key" to apiKey) + if (body != null) listOf("Content-Type" to "application/json") else emptyList() + SyncthingHttp.writeRequest(s.outputStream, method, path, headers, body?.toString()?.toByteArray()) + val (code, text) = SyncthingHttp.readResponse(s.inputStream.buffered()) + if (code !in 200..299) throw SyncthingApiException(code, text) + text + } + + private fun enc(s: String) = URLEncoder.encode(s, "UTF-8") + + companion object { private const val TIMEOUT_MS = 5_000 } +} + +class SyncthingApiException(val code: Int, message: String) : Exception("HTTP $code: $message") diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt new file mode 100644 index 000000000..b367d5908 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt @@ -0,0 +1,81 @@ +package com.droiddeck.launcher.sync + +import org.w3c.dom.Document +import org.w3c.dom.Element +import java.io.File +import java.io.IOException +import java.io.StringReader +import java.io.StringWriter +import javax.xml.parsers.DocumentBuilderFactory +import javax.xml.transform.OutputKeys +import javax.xml.transform.TransformerFactory +import javax.xml.transform.dom.DOMSource +import javax.xml.transform.stream.StreamResult +import org.xml.sax.InputSource + +object SyncthingConfig { + const val GUI_USER = "droiddeck" + private const val RELAYS = "dynamic+https://relays.syncthing.net/endpoint" + + fun apiKey(file: File): String? = runCatching { apiKey(file.readText()) }.getOrNull() + + internal fun apiKey(xml: String): String? = + parse(xml).documentElement.child("gui")?.child("apikey")?.textContent?.trim()?.takeIf { it.isNotEmpty() } + + fun apply(file: File, ports: SyncthingPorts, guiSocket: File, folderRoot: File, pauseDevices: Boolean, allows: (String) -> Boolean) { + val staged = File(file.parentFile, "${file.name}.tmp") + try { + staged.writeText(apply(file.readText(), ports, guiSocket.path, folderRoot.path, pauseDevices, allows)) + if (!staged.renameTo(file)) throw IOException("could not replace ${file.name}") + } finally { + staged.delete() + } + } + + internal fun apply(xml: String, ports: SyncthingPorts, guiSocket: String, folderRoot: String, pauseDevices: Boolean = false, allows: (String) -> Boolean): String { + val doc = parse(xml) + val root = doc.documentElement + val gui = root.child("gui") ?: doc.createElement("gui").also { root.appendChild(it) } + gui.setAttribute("tls", "false") + gui.set("address", guiSocket) + gui.set("unixSocketPermissions", "600") + val options = root.child("options") ?: doc.createElement("options").also { root.appendChild(it) } + options.setList("listenAddress", listOf("tcp://:${ports.sync}", "quic://:${ports.sync}", RELAYS)) + options.set("localAnnouncePort", ports.discovery.toString()) + options.set("urAccepted", "-1") + options.set("crashReportingEnabled", "false") + options.set("autoUpgradeIntervalH", "0") + options.set("startBrowser", "false") + val defaults = root.child("defaults") ?: doc.createElement("defaults").also { root.appendChild(it) } + val folder = defaults.child("folder") ?: doc.createElement("folder").also { defaults.appendChild(it) } + folder.setAttribute("path", folderRoot) + root.children("folder").filter { !allows(it.getAttribute("path")) }.forEach { it.set("paused", "true") } + if (pauseDevices) root.children("device").forEach { it.set("paused", "true") } + return write(doc) + } + + private fun parse(xml: String): Document = + DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(InputSource(StringReader(xml))) + + private fun write(doc: Document): String = StringWriter().also { + TransformerFactory.newInstance().newTransformer().apply { setOutputProperty(OutputKeys.INDENT, "no") } + .transform(DOMSource(doc), StreamResult(it)) + }.toString() + + private fun Element.children(name: String): List<Element> = + (0 until childNodes.length).map { childNodes.item(it) }.filterIsInstance<Element>().filter { it.tagName == name } + + private fun Element.child(name: String): Element? = children(name).firstOrNull() + + private fun Element.set(name: String, value: String) = setList(name, listOf(value)) + + private fun Element.setList(name: String, values: List<String>) { + val existing = children(name) + val anchor = existing.lastOrNull()?.nextSibling + existing.forEach { removeChild(it) } + values.forEach { value -> + val e = ownerDocument.createElement(name).apply { textContent = value } + if (anchor != null) insertBefore(e, anchor) else appendChild(e) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt new file mode 100644 index 000000000..ae27645f6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.sync + +import java.io.File + +class SyncthingGuard(private val home: File, roots: List<File>, forbidden: List<File>) { + private val roots = roots.map { it.canonicalFile } + private val forbidden = forbidden.map { it.canonicalFile } + + fun allows(path: String): Boolean { + val trimmed = path.trim() + if (trimmed.isEmpty()) return false + val expanded = when { + trimmed == "~" -> home + trimmed.startsWith("~/") -> File(home, trimmed.removePrefix("~/")) + else -> File(trimmed) + } + if (!expanded.isAbsolute) return false + val target = runCatching { expanded.canonicalFile }.getOrNull() ?: return false + return roots.any { within(target, it) } && forbidden.none { within(target, it) || within(it, target) } + } + + fun browsable(dir: File): Boolean { + val target = runCatching { dir.canonicalFile }.getOrNull() ?: return false + return roots.any { within(target, it) } && forbidden.none { within(target, it) } + } + + private fun within(target: File, root: File) = target == root || target.path.startsWith(root.path + File.separator) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt new file mode 100644 index 000000000..b2ebcb3c9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt @@ -0,0 +1,80 @@ +package com.droiddeck.launcher.sync + +import java.io.ByteArrayOutputStream +import java.io.IOException +import java.io.InputStream +import java.io.OutputStream + +internal object SyncthingHttp { + private const val LINE_LIMIT = 16 shl 10 + private const val HEADER_LIMIT = 100 + + fun writeRequest(out: OutputStream, method: String, path: String, headers: List<Pair<String, String>>, body: ByteArray?) { + val head = StringBuilder("$method $path HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n") + headers.forEach { (name, value) -> head.append(name).append(": ").append(value).append("\r\n") } + head.append("Content-Length: ").append(body?.size ?: 0).append("\r\n\r\n") + out.write(head.toString().toByteArray(Charsets.ISO_8859_1)) + body?.let(out::write) + out.flush() + } + + fun readResponse(input: InputStream): Pair<Int, String> { + val status = readLine(input) ?: throw IOException("no response") + val code = status.split(' ').getOrNull(1)?.toIntOrNull() ?: throw IOException("bad status line: $status") + val headers = readHeaders(input) + fun header(name: String) = headers.lastOrNull { it.first.equals(name, ignoreCase = true) }?.second + val body = when { + header("Transfer-Encoding")?.contains("chunked", ignoreCase = true) == true -> chunked(input) + header("Content-Length") != null -> exactly(input, header("Content-Length")!!.trim().toInt()) + else -> input.readBytes() + } + return code to String(body, Charsets.UTF_8) + } + + fun readLine(input: InputStream): String? { + val line = ByteArrayOutputStream() + while (true) { + val b = input.read() + if (b == -1) return if (line.size() == 0) null else throw IOException("truncated line") + if (b == '\n'.code) break + if (line.size() >= LINE_LIMIT) throw IOException("line too long") + line.write(b) + } + return line.toString("ISO-8859-1").removeSuffix("\r") + } + + fun readHeaders(input: InputStream): List<Pair<String, String>> { + val headers = mutableListOf<Pair<String, String>>() + while (true) { + val line = readLine(input) ?: throw IOException("truncated headers") + if (line.isEmpty()) return headers + if (headers.size >= HEADER_LIMIT) throw IOException("too many headers") + val colon = line.indexOf(':') + if (colon <= 0) throw IOException("bad header: $line") + headers += line.substring(0, colon).trim() to line.substring(colon + 1).trim() + } + } + + private fun chunked(input: InputStream): ByteArray { + val out = ByteArrayOutputStream() + while (true) { + val size = readLine(input)?.substringBefore(';')?.trim()?.toIntOrNull(16) ?: throw IOException("bad chunk size") + if (size == 0) break + out.write(exactly(input, size)) + readLine(input) + } + while (readLine(input)?.isNotEmpty() == true) Unit + return out.toByteArray() + } + + private fun exactly(input: InputStream, size: Int): ByteArray { + val bytes = ByteArray(size) + var read = 0 + while (read < size) { + val n = input.read(bytes, read, size - read) + if (n == -1) throw IOException("truncated body") + read += n + } + return bytes + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt new file mode 100644 index 000000000..671a98d0b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt @@ -0,0 +1,29 @@ +package com.droiddeck.launcher.sync + +import java.net.DatagramSocket +import java.net.InetSocketAddress +import java.net.ServerSocket + +data class SyncthingPorts(val sync: Int, val discovery: Int) + +object SyncthingPortPicker { + internal val RESERVED = setOf(8384, 8385, 22000, 22001, 21027, 21028) + internal const val SYNC = 22100 + internal const val DISCOVERY = 21127 + private const val SPAN = 50 + + fun pick(): SyncthingPorts = pick(::syncFree, ::udpFree) + + internal fun pick(syncFree: (Int) -> Boolean, discoveryFree: (Int) -> Boolean) = + SyncthingPorts(first(SYNC, syncFree), first(DISCOVERY, discoveryFree)) + + private fun first(base: Int, free: (Int) -> Boolean): Int = + (base until base + SPAN).firstOrNull { it !in RESERVED && free(it) } ?: error("no free port in $base..${base + SPAN - 1}") + + private fun tcpFree(port: Int): Boolean = runCatching { + ServerSocket().use { it.reuseAddress = false; it.bind(InetSocketAddress(port)) } + }.isSuccess + + private fun udpFree(port: Int) = runCatching { DatagramSocket(port).close() }.isSuccess + private fun syncFree(port: Int) = tcpFree(port) && udpFree(port) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt new file mode 100644 index 000000000..e4487f1e9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.sync + +import android.net.LocalSocket +import android.net.LocalSocketAddress +import java.io.Closeable +import java.io.File +import java.io.FilterInputStream +import java.io.InputStream +import java.net.InetAddress +import java.net.ServerSocket +import java.net.Socket +import java.net.SocketTimeoutException +import java.security.MessageDigest +import java.util.Collections +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.Semaphore + +class SyncthingProxy(private val socket: File, private val auth: String) : Closeable { + private val server = ServerSocket(0, 16, InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))) + private val token = SyncPrefs.randomToken() + val url = "http://127.0.0.1:${server.localPort}/" + val cookie = "$COOKIE=$token" + private val workers = Semaphore(MAX_WORKERS) + private val open: MutableSet<Closeable> = Collections.newSetFromMap(ConcurrentHashMap()) + + init { + Thread(::accept, "syncthing-proxy").apply { isDaemon = true }.start() + } + + override fun close() { + runCatching { server.close() } + open.forEach { runCatching { it.close() } } + } + + private fun track(c: Closeable) { + open += c + if (server.isClosed) runCatching { c.close() } + } + + private fun accept() { + while (true) { + val client = runCatching { server.accept() }.getOrNull() ?: return + if (!workers.tryAcquire()) { + runCatching { client.close() } + continue + } + val worker = runCatching { + track(client) + Thread({ try { serve(client) } finally { open -= client; workers.release() } }, "syncthing-proxy-request").apply { isDaemon = true }.start() + } + if (worker.isFailure) { open -= client; workers.release(); runCatching { client.close() } } + } + } + + private fun serve(client: Socket) = client.use { + runCatching { + val deadline = HeadDeadline(client, client.getInputStream(), System.nanoTime() + HEAD_TIMEOUT_MS * 1_000_000L) + val input = deadline.buffered() + val request = SyncthingHttp.readLine(input) ?: return@runCatching + val headers = SyncthingHttp.readHeaders(input) + if (!authorized(headers)) { + client.getOutputStream().write(FORBIDDEN) + return@runCatching + } + deadline.lift() + LocalSocket().use { upstream -> + track(upstream) + try { relay(client, input, request, headers, upstream) } finally { open -= upstream } + } + } + } + + private fun relay(client: Socket, input: InputStream, request: String, headers: List<Pair<String, String>>, upstream: LocalSocket) { + upstream.connect(LocalSocketAddress(socket.path, LocalSocketAddress.Namespace.FILESYSTEM)) + val head = StringBuilder(request).append("\r\n") + headers.filter { it.first.lowercase() !in DROPPED }.forEach { (name, value) -> + val kept = if (name.equals("Cookie", ignoreCase = true)) withoutToken(value) else value + if (kept.isNotEmpty()) head.append(name).append(": ").append(kept).append("\r\n") + } + head.append("Authorization: ").append(auth).append("\r\nConnection: close\r\n\r\n") + upstream.outputStream.write(head.toString().toByteArray(Charsets.ISO_8859_1)) + Thread({ runCatching { input.copyTo(upstream.outputStream) } }, "syncthing-proxy-body").apply { isDaemon = true }.start() + upstream.inputStream.copyTo(client.getOutputStream()) + } + + private fun cookies(header: String) = header.split(';').map { it.trim() } + + private fun authorized(headers: List<Pair<String, String>>): Boolean = headers + .filter { it.first.equals("Cookie", ignoreCase = true) } + .flatMap { cookies(it.second) } + .any { MessageDigest.isEqual(it.toByteArray(), cookie.toByteArray()) } + + private fun withoutToken(header: String) = cookies(header).filter { !it.startsWith("$COOKIE=") }.joinToString("; ") + + private class HeadDeadline(private val client: Socket, input: InputStream, private val until: Long) : FilterInputStream(input) { + @Volatile private var lifted = false + + fun lift() { + lifted = true + client.soTimeout = 0 + } + + override fun read(): Int { arm(); return super.read() } + override fun read(b: ByteArray, off: Int, len: Int): Int { arm(); return super.read(b, off, len) } + + private fun arm() { + if (lifted) return + val left = (until - System.nanoTime()) / 1_000_000L + if (left <= 0) throw SocketTimeoutException("request head took too long") + client.soTimeout = left.toInt() + } + } + + private companion object { + const val COOKIE = "droiddeck-proxy" + const val HEAD_TIMEOUT_MS = 10_000 + const val MAX_WORKERS = 16 + val DROPPED = setOf("authorization", "x-api-key", "connection", "proxy-connection", "keep-alive", "upgrade") + val FORBIDDEN = "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\nConnection: close\r\n\r\n".toByteArray() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt new file mode 100644 index 000000000..e1f58dca6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt @@ -0,0 +1,117 @@ +package com.droiddeck.launcher.sync + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.Service +import android.content.Context +import android.content.Intent +import android.os.Build +import android.os.IBinder +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.download.StoreDownloadService + +class SyncthingService : Service() { + override fun onBind(intent: Intent?): IBinder? = null + + override fun onTimeout(startId: Int, fgsType: Int) { + running = false + Syncthing.backgroundServiceUnavailable() + stopForeground(STOP_FOREGROUND_REMOVE) + stopSelf() + } + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + when (intent?.action) { + ACTION_PAUSE -> Syncthing.setPaused(this, !Syncthing.userPaused) + ACTION_OFF -> { Syncthing.setEnabled(this, false); return START_NOT_STICKY } + } + if (!SyncPrefs.enabled(this) || SyncPrefs.runMode(this) != SyncPrefs.RUN_BACKGROUND) { + stopSelf() + return START_NOT_STICKY + } + val n = notification() + if (!com.droiddeck.launcher.core.ForegroundServices.start(this, ID, n, + android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)) { + running = false + Syncthing.backgroundServiceUnavailable() + stopSelf() + return START_NOT_STICKY + } + Syncthing.onChange = { getSystemService(NotificationManager::class.java)?.notify(ID, notification()) } + Syncthing.evaluate() + return START_NOT_STICKY + } + + override fun onDestroy() { + running = false + Syncthing.onChange = null + super.onDestroy() + } + + private fun notification(): Notification { + channel(this) + val snap = Syncthing.snapshot + val title = getString(when { + Syncthing.phase == Syncthing.Phase.FAILED -> R.string.sync_status_failed + Syncthing.phase != Syncthing.Phase.RUNNING -> R.string.sync_status_starting + Syncthing.pauseRequested && Syncthing.devicesPaused -> R.string.sync_status_paused + Syncthing.pauseRequested -> R.string.sync_status_pausing + Syncthing.devicesPaused -> R.string.sync_status_resuming + snap?.needsAttention == true -> R.string.sync_status_attention + snap?.syncing == true -> R.string.sync_status_syncing + else -> R.string.sync_status_up_to_date + }) + val text = snap?.let { + getString(R.string.sync_summary, it.folders.size, it.devices.count { d -> d.connected }, it.devices.size) + }.orEmpty() + val open = PendingIntent.getActivity(this, 0, Intent(this, FrontEndActivity::class.java) + .putExtra(StoreDownloadService.EXTRA_NAV, NAV).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) Notification.Builder(this, CHANNEL) else @Suppress("DEPRECATION") Notification.Builder(this) + return builder.setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(open) + .setOngoing(true) + .setOnlyAlertOnce(true) + .addAction(Notification.Action.Builder(null, getString(if (Syncthing.userPaused) R.string.sync_resume else R.string.sync_pause), action(ACTION_PAUSE, 1)).build()) + .addAction(Notification.Action.Builder(null, getString(R.string.sync_turn_off), action(ACTION_OFF, 2)).build()) + .build() + } + + private fun action(name: String, code: Int) = PendingIntent.getService(this, code, + Intent(this, SyncthingService::class.java).setAction(name), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + + companion object { + const val NAV = "setup:sync" + private const val CHANNEL = "syncthing" + private const val ID = 9203 + private const val ACTION_PAUSE = "droiddeck.sync.PAUSE" + private const val ACTION_OFF = "droiddeck.sync.OFF" + @Volatile private var running = false + + private fun channel(context: Context) { + val nm = context.getSystemService(NotificationManager::class.java) ?: return + if (nm.getNotificationChannel(CHANNEL) == null) { + nm.createNotificationChannel(NotificationChannel(CHANNEL, context.getString(R.string.sync_notification_channel), NotificationManager.IMPORTANCE_LOW).apply { + setShowBadge(false) + }) + } + } + + fun start(context: Context) { + if (running) return + running = true + runCatching { context.startForegroundService(Intent(context, SyncthingService::class.java)) }.onFailure { running = false; Syncthing.backgroundServiceUnavailable() } + } + + fun stop(context: Context) { + if (!running) return + running = false + context.stopService(Intent(context, SyncthingService::class.java)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt new file mode 100644 index 000000000..c07439e0e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.sync + +import org.json.JSONArray +import org.json.JSONObject + +data class SyncFolder( + val id: String, val label: String, val path: String, val paused: Boolean, val blocked: Boolean, + val state: String, val globalBytes: Long, val needBytes: Long, val errors: Int, val sharedWith: List<String>, +) { + val syncing get() = !paused && !blocked && state in ACTIVE && needBytes > 0 + val outOfSync get() = !paused && !blocked && (errors > 0 || state == "error" || (state == "idle" && needBytes > 0)) + + companion object { private val ACTIVE = setOf("syncing", "sync-preparing", "sync-waiting") } +} + +data class SyncDevice(val id: String, val name: String, val connected: Boolean, val address: String?, val lastSeen: Long?) + +data class SyncPendingFolder(val id: String, val label: String, val offeredBy: String, val deviceId: String) + +data class SyncSnapshot( + val myId: String, + val folders: List<SyncFolder>, + val devices: List<SyncDevice>, + val pendingFolders: List<SyncPendingFolder>, + val pendingDevices: List<String>, + val inBytesPerSecond: Long, + val outBytesPerSecond: Long, +) { + val blocked get() = folders.filter { it.blocked } + val needsAttention get() = blocked.isNotEmpty() || pendingFolders.isNotEmpty() || pendingDevices.isNotEmpty() || folders.any { it.outOfSync } + val syncing get() = folders.any { it.syncing } + val needBytes get() = folders.filter { it.syncing }.sumOf { it.needBytes } + + val percent: Int get() { + val active = folders.filter { it.syncing } + val global = active.sumOf { it.globalBytes } + if (global <= 0) return 0 + return (((global - active.sumOf { it.needBytes }).coerceAtLeast(0) * 100) / global).toInt().coerceIn(0, 99) + } +} + +internal object SyncthingParse { + fun unreadableStatus(): JSONObject = JSONObject().put("state", "error").put("errors", 1) + + fun folder(config: JSONObject, status: JSONObject?, blocked: Boolean, names: Map<String, String>): SyncFolder { + val id = config.getString("id") + val shared = config.optJSONArray("devices")?.let { d -> (0 until d.length()).mapNotNull { names[d.getJSONObject(it).optString("deviceID")] } }.orEmpty() + return SyncFolder( + id, config.optString("label").ifEmpty { id }, config.optString("path"), blocked || config.optBoolean("paused"), blocked, + status?.optString("state").orEmpty(), status?.optLong("globalBytes") ?: 0, status?.optLong("needBytes") ?: 0, + (status?.optInt("errors") ?: 0) + (status?.optInt("pullErrors") ?: 0), shared, + ) + } + + fun deviceNames(devices: JSONArray, myId: String): Map<String, String> = (0 until devices.length()) + .map { devices.getJSONObject(it) } + .filter { it.getString("deviceID") != myId } + .associate { it.getString("deviceID") to it.optString("name").ifEmpty { it.getString("deviceID").take(7) } } + + fun pendingDevices(json: JSONObject): List<String> = + json.keys().asSequence().map { id -> json.optJSONObject(id)?.optString("name").orEmpty().ifEmpty { id.take(7) } }.toList() + + fun pendingFolders(json: JSONObject, names: Map<String, String>): List<SyncPendingFolder> = + json.keys().asSequence().flatMap { folderId -> + val offeredBy = json.getJSONObject(folderId).optJSONObject("offeredBy") ?: JSONObject() + offeredBy.keys().asSequence().map { device -> + val label = offeredBy.getJSONObject(device).optString("label").ifEmpty { folderId } + SyncPendingFolder(folderId, label, names[device] ?: device.take(7), device) + } + }.toList() +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt new file mode 100644 index 000000000..ab78fff8b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt @@ -0,0 +1,137 @@ +package com.droiddeck.launcher.sync + +import android.annotation.SuppressLint +import android.net.Uri +import android.os.Bundle +import android.webkit.CookieManager +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.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.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.ui.BackLink +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.SecondaryButton + +class SyncthingWebActivity : ComponentActivity() { + private var web: WebView? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Screen() } } + } + + override fun onDestroy() { + web?.destroy() + web = null + super.onDestroy() + } + + @Composable + private fun Screen() { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val running = Syncthing.phase == Syncthing.Phase.RUNNING + val target = remember(running) { if (running) Syncthing.webUiProxy(this) else null } + DisposableEffect(target) { onDispose { target?.close() } } + LaunchedEffect(Syncthing.phase) { if (Syncthing.phase == Syncthing.Phase.OFF) finish() } + BackHandler { web?.takeIf { it.canGoBack() }?.goBack() ?: finish() } + Column(Modifier.fillMaxSize().systemBarsPadding().background(colors.background)) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().background(colors.surface).padding(horizontal = 16.dp, vertical = 8.dp), + ) { + BackLink(stringResource(R.string.mode_back), compact = true) { finish() } + Text(stringResource(R.string.sync_web_title), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Box(Modifier.weight(1f)) + target?.let { Text(Uri.parse(it.url).authority.orEmpty(), fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) } + SecondaryButton(stringResource(R.string.sync_web_reload), compact = true) { web?.reload() } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + if (target == null) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.sync_not_running), fontSize = 14.sp, color = colors.onSurfaceVariant) + } + } else { + val view = remember(target) { webView(target.url, target.cookie) } + AndroidView({ view }, Modifier.fillMaxSize()) + } + } + } + + @SuppressLint("SetJavaScriptEnabled") + private fun webView(url: String, cookie: String): WebView = WebView(this).apply { + web?.destroy() + web = this + setBackgroundColor(0xFF0A0B0D.toInt()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + settings.allowFileAccess = false + settings.allowContentAccess = false + val cookies = CookieManager.getInstance() + cookies.setAcceptCookie(true) + val origin = Uri.parse(url).authority + webViewClient = object : WebViewClient() { + override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? = + if (request.url.authority == origin) null else WebResourceResponse("text/plain", "utf-8", 403, "Forbidden", emptyMap(), null) + + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + request.url.authority != origin + + override fun onPageFinished(view: WebView, url: String) { + view.evaluateJavascript(lockFolderPath(getString(R.string.sync_web_path_locked)), null) + } + } + cookies.setCookie(url, "$cookie; HttpOnly; SameSite=Strict") { loadUrl(url) } + } +} + +private fun lockFolderPath(note: String) = """ + (function (note) { + if (window.droiddeckPathLock) return; + window.droiddeckPathLock = true; + function lock() { + var input = document.getElementById('folderPath'); + if (!input) return; + if (!input.readOnly) input.readOnly = true; + if (input.hasAttribute('list')) input.removeAttribute('list'); + if (!document.getElementById('droiddeck-path-note')) { + var p = document.createElement('p'); + p.id = 'droiddeck-path-note'; + p.className = 'help-block'; + p.textContent = note; + input.parentNode.insertBefore(p, input.nextSibling); + } + } + new MutationObserver(lock).observe(document.documentElement, { subtree: true, childList: true, attributes: true, attributeFilter: ['readonly'] }); + lock(); + })(${org.json.JSONObject.quote(note)}); +""".trimIndent() 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 5e63d7b0f..660e0723c 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 @@ -308,6 +308,7 @@ internal fun AppDialog( width: Dp? = null, fitContent: Boolean = false, back: (() -> Unit)? = null, scrollable: Boolean = true, + scrollState: androidx.compose.foundation.ScrollState = rememberScrollState(), content: @Composable ColumnScope.() -> Unit, ) { val pal = LocalPalette.current @@ -345,7 +346,7 @@ internal fun AppDialog( .blockTouches() .controllerBack(back ?: close) .then(modifier) - .then(if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier) + .then(if (scrollable) Modifier.verticalScroll(scrollState) else Modifier) .padding(horizontal = 18.dp, vertical = 16.dp), content = content, ) 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 3d86510f7..7e0103ec8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -68,6 +68,7 @@ import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.LogoPosition import com.droiddeck.launcher.frontend.SteamGameArt import com.droiddeck.launcher.frontend.SteamGridDb +import com.droiddeck.launcher.frontend.SteamLaunchOptions import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -191,7 +192,7 @@ internal fun SteamGameArtEditor( game: com.droiddeck.launcher.frontend.Library.SteamGame, onClose: () -> Unit, onChanged: () -> Unit, ) { val target = remember(game.appId) { ArtTarget.of(game) } - ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) + ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged, launchAppId = game.appId) } @Composable @@ -207,18 +208,25 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List<AddedGameArt.SlotState>, - onClose: () -> Unit, onChanged: () -> Unit, + onClose: () -> Unit, onChanged: () -> Unit, launchAppId: Int? = null, ) { val app = LocalContext.current.applicationContext val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() val shown = rememberShown(onClose) val close = { shown.targetState = false } var version by remember { mutableIntStateOf(0) } var arts by remember { mutableStateOf<List<AddedGameArt.SlotState>>(emptyList()) } var artSlot by remember { mutableStateOf<AddedGameArt.Slot?>(null) } var logoOpen by remember { mutableStateOf(false) } + var launchOptions by remember { mutableStateOf<String?>(null) } + var launchVersion by remember { mutableIntStateOf(0) } + var editingLaunch by remember { mutableStateOf<String?>(null) } + var launchSaving by remember { mutableStateOf(false) } + var launchError by remember { mutableStateOf<Int?>(null) } val position = rememberLogoPosition(target, version) LaunchedEffect(version, refresh) { if (target != null) arts = withContext(Dispatchers.IO) { describe(app) } } + LaunchedEffect(launchAppId, launchVersion) { if (launchAppId != null) launchOptions = withContext(Dispatchers.IO) { SteamLaunchOptions.current(app, launchAppId) } } val first = remember { FocusRequester() } LaunchedEffect(Unit) { focusWithinFrames({ false }) { first } } AppDialog(shown, close, "artEditor", wide = false, maxWidth = 460.dp) { @@ -228,10 +236,19 @@ private fun ArtOnlyEditor( verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { - Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) + if (launchAppId != null) { + FieldRow(stringResource(R.string.edit_launch_options), focus = first, onClick = { if (!launchSaving) launchOptions?.let { editingLaunch = it } }) { + val options = launchOptions + if (options == null || launchSaving) Loading() else ValueText(options.ifEmpty { "—" }, muted = options.isEmpty()) + } + val error = launchError + if (error != null) Text(stringResource(error), fontSize = 12.sp, color = colors.error, modifier = Modifier.padding(start = 4.dp)) + else Text(stringResource(R.string.edit_launch_options_steam_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp)) + } + Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = if (launchAppId != null) 8.dp else 2.dp)) for (slot in AddedGameArt.Slot.values()) key(slot) { val state = arts.firstOrNull { it.slot == slot } - FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { + FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER && launchAppId == null) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { SlotThumb(slot, state?.file) if (state != null) ValueText(artSourceLabel(state.source), muted = true) else Loading() @@ -241,6 +258,27 @@ private fun ArtOnlyEditor( PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } + val before = editingLaunch + if (before != null && launchAppId != null) TextEntryDialog(stringResource(R.string.edit_launch_options), before, onDismiss = { editingLaunch = null }) { value -> + if (launchSaving || value == before.trim()) return@TextEntryDialog + launchSaving = true + scope.launch { + try { + val saved = withContext(Dispatchers.IO) { SteamLaunchOptions.set(app, launchAppId, value, before) } + launchError = when (saved) { + SteamLaunchOptions.Saved.YES -> null + SteamLaunchOptions.Saved.DESKTOP -> R.string.edit_launch_options_desktop + SteamLaunchOptions.Saved.NO -> R.string.edit_launch_options_not_saved + } + if (saved == SteamLaunchOptions.Saved.YES) launchOptions = value else { + launchOptions = null + launchVersion++ + } + } finally { + launchSaving = false + } + } + } val chosen = target ?: return artSlot?.let { slot -> ArtChooserDialog(chosen, slot, arts.firstOrNull { it.slot == slot }, onBack = { artSlot = null }, onCloseAll = { artSlot = null; close() }) { version++; onChanged() } @@ -249,7 +287,6 @@ private fun ArtOnlyEditor( if (logoOpen && loaded != null) LogoPositionHost(chosen, arts, loaded, onBack = { logoOpen = false }, onCloseAll = { logoOpen = false; close() }) { version++; onChanged() } } -/** The position as last read; null until it has been read, so the screen never opens on a guess and saves it over the real one. */ private class LoadedPosition(val value: LogoPosition.Value?) @Composable @@ -262,7 +299,6 @@ private fun rememberLogoPosition(target: ArtTarget?, version: Int): LoadedPositi return position } -/** The "Adjust logo" screen for [target], over the game's background and logo as they are now. */ @Composable private fun LogoPositionHost( target: ArtTarget, arts: List<AddedGameArt.SlotState>, start: LoadedPosition, @@ -475,7 +511,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 +680,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/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt new file mode 100644 index 000000000..fdd0fdd8c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -0,0 +1,959 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.view.KeyEvent +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.scaleOut +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.Image +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown +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.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +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.imePadding +import androidx.compose.foundation.layout.offset +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.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +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.lazy.grid.rememberLazyGridState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.FilterAlt +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.filled.Widgets +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.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +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.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +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 androidx.compose.ui.viewinterop.AndroidView +import androidx.compose.ui.zIndex +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.HomeFolders +import com.droiddeck.launcher.HomeHidden +import com.droiddeck.launcher.HomePins +import android.content.pm.ShortcutInfo +import android.graphics.Bitmap +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import com.droiddeck.launcher.HomeWidgets +import com.droiddeck.launcher.R +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +private sealed interface AppEntry : AppEntryKey { + val key: String + + class App(val app: HomeApp.LaunchableApp) : AppEntry { + override val label get() = app.label + override val key get() = "app:" + app.key + override val installedAt get() = app.installedAt + override val updatedAt get() = app.updatedAt + } + + class Folder(val folder: HomeFolders.Folder, val apps: List<HomeApp.LaunchableApp>) : AppEntry { + override val label get() = folder.name + override val key get() = "folder:" + folder.id + override val installedAt get() = apps.maxOf { it.installedAt } + override val updatedAt get() = apps.maxOf { it.updatedAt } + } + + class Shortcut(val pinned: HomePins.Pinned) : AppEntry { + override val label get() = pinned.label + override val key get() = pinned.key + override val installedAt get() = 0L + override val updatedAt get() = 0L + } +} + +private fun indexLetter(label: String): String { + val c = label.trim().firstOrNull()?.uppercaseChar() ?: return "#" + return if (c in 'A'..'Z') c.toString() else if (c.isLetter()) c.toString() else "#" +} + +private fun searchRank(label: String, q: String): Int? { + if (label.startsWith(q, ignoreCase = true)) return 0 + if (label.split(' ', '-', '_', '.').any { it.startsWith(q, ignoreCase = true) }) return 1 + if (label.contains(q, ignoreCase = true)) return 2 + return null +} + +internal fun Context.findActivity(): Activity? { + var c: Context? = this + while (c is ContextWrapper) { + if (c is Activity) return c + c = c.baseContext + } + return null +} + +private fun Modifier.menuKey(onMenu: () -> Unit): Modifier = onPreviewKeyEvent { event -> + val k = event.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y && k.keyCode != KeyEvent.KEYCODE_MENU) false + else { + if (k.action == KeyEvent.ACTION_DOWN && k.repeatCount == 0) onMenu() + true + } +} + +internal object AppsView { + const val ALL = "all" + const val GAMES = "games" + const val DOWNLOADED = "downloaded" + const val SYSTEM = "system" + const val HIDDEN = "hidden" + val FILTERS = listOf(ALL, GAMES, DOWNLOADED, SYSTEM, HIDDEN) + const val NAME_ASC = "nameAsc" + const val NAME_DESC = "nameDesc" + const val INSTALLED = "installed" + const val UPDATED = "updated" + val SORTS = listOf(NAME_ASC, NAME_DESC, INSTALLED, UPDATED) + + var filter by mutableStateOf(ALL) + var sort by mutableStateOf(NAME_ASC) + private var loaded = false + + private fun prefs(context: Context) = context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE) + + fun load(context: Context) { + if (loaded) return + loaded = true + val p = prefs(context) + filter = p.getString("filter", ALL)?.takeIf { it in FILTERS } ?: ALL + sort = p.getString("sort", NAME_ASC)?.takeIf { it in SORTS } ?: NAME_ASC + } + + fun setFilter(context: Context, value: String) { + filter = value + prefs(context).edit().putString("filter", value).apply() + } + + fun setSort(context: Context, value: String) { + sort = value + prefs(context).edit().putString("sort", value).apply() + } + + fun keeps(app: HomeApp.LaunchableApp): Boolean { + val hidden = app.key in HomeHidden.keys + return when (filter) { + HIDDEN -> hidden + GAMES -> !hidden && app.game + DOWNLOADED -> !hidden && !app.system + SYSTEM -> !hidden && app.system + else -> !hidden + } + } + + fun comparator(): Comparator<AppEntryKey> = when (sort) { + NAME_DESC -> compareBy<AppEntryKey, String>(String.CASE_INSENSITIVE_ORDER) { it.label }.reversed() + INSTALLED -> compareByDescending<AppEntryKey> { it.installedAt }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.label } + UPDATED -> compareByDescending<AppEntryKey> { it.updatedAt }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.label } + else -> compareBy(String.CASE_INSENSITIVE_ORDER) { it.label } + } +} + +internal interface AppEntryKey { + val label: String + val installedAt: Long + val updatedAt: Long +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { + val ctx = LocalContext.current + remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); true } + val colors = MaterialTheme.colorScheme + val narrow = LocalNarrowPane.current + val padH = if (narrow) 16.dp else 22.dp + var query by rememberSaveable { mutableStateOf("") } + var openFolder by rememberSaveable { mutableStateOf<String?>(null) } + var renameOnOpen by rememberSaveable { mutableStateOf(false) } + var picking by rememberSaveable { mutableStateOf(false) } + val folders = HomeFolders.folders + val byKey = remember(s.androidApps) { s.androidApps.associateBy { it.key } } + val byPkg = remember(s.androidApps) { s.androidApps.filterNot { it.work }.groupBy { it.packageName }.mapNotNull { (pkg, apps) -> apps.singleOrNull()?.let { pkg to it } }.toMap() } + LaunchedEffect(byPkg) { if (byPkg.isNotEmpty()) HomeFolders.migrateMembers(ctx) { byPkg[it]?.key } } + val member: (String) -> HomeApp.LaunchableApp? = { byKey[it] ?: byPkg[it] } + val pins = HomePins.pinned + val hidden = HomeHidden.keys + val q = query.trim() + val filter = AppsView.filter + val sort = AppsView.sort + val entries: List<AppEntry> = remember(s.androidApps, folders, q, filter, sort, pins, hidden) { + val kept = s.androidApps.filter { AppsView.keeps(it) } + val shortcuts = if (filter == AppsView.ALL) pins.map { AppEntry.Shortcut(it) } else emptyList() + if (q.isNotEmpty()) { + (kept.map { AppEntry.App(it) } + shortcuts).mapNotNull { e -> searchRank(e.label, q)?.let { it to e } } + .sortedWith(compareBy<Pair<Int, AppEntry>> { it.first }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.second.label }) + .map { it.second } + } else if (filter != AppsView.ALL) { + kept.map { AppEntry.App(it) }.sortedWith(AppsView.comparator()) + } else { + val folderEntries = folders.mapNotNull { f -> + val apps = f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + if (apps.isEmpty()) null else AppEntry.Folder(f, apps) + } + val grouped = folderEntries.flatMap { f -> f.apps.map { it.key } }.toSet() + (folderEntries + kept.filter { it.key !in grouped }.map { AppEntry.App(it) } + shortcuts).sortedWith(AppsView.comparator()) + } + } + val grid = rememberLazyGridState() + LaunchedEffect(q, filter, sort) { grid.scrollToItem(0) } + val widgetsShown = q.isEmpty() && filter == AppsView.ALL && HomeWidgets.widgets.isNotEmpty() + val leadItems = if (widgetsShown) 1 else 0 + val byName = sort == AppsView.NAME_ASC || sort == AppsView.NAME_DESC + val newFolder: (HomeApp.LaunchableApp) -> Unit = { app -> + val f = HomeFolders.create(ctx, ctx.getString(R.string.apps_folder_default), app.key) + renameOnOpen = true + openFolder = f.id + } + + Box(modifier) { + Column(Modifier.fillMaxSize().imePadding()) { + Box(Modifier.fillMaxWidth().padding(start = padH, end = padH, top = if (narrow) 8.dp else 12.dp)) { + ModeHeader( + stringResource(R.string.content_android_apps), query, { query = it }, + placeholder = stringResource(R.string.apps_search_hint), + clearSearchFocus = openFolder != null || picking, + lead = { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { + Text(stringResource(R.string.content_android_apps), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + val shownCount = s.androidApps.count { AppsView.keeps(it) } + if (filter == AppsView.ALL) pins.size else 0 + Text(androidx.compose.ui.res.pluralStringResource(R.plurals.apps_count, shownCount, shownCount), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + }, + ) { + AppsFilterButton() + AppsSortButton() + HeaderIconButton(stringResource(R.string.apps_add_widget), Icons.Filled.Widgets, "add-widget") { + HomeWidgets.loadProviders(ctx) + picking = true + } + } + } + Box(Modifier.weight(1f).fillMaxWidth()) { + val scroller = q.isEmpty() && byName && entries.size > 16 + LazyVerticalGrid( + columns = GridCells.Adaptive(if (narrow) 84.dp else 96.dp), + state = grid, + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + contentPadding = PaddingValues(start = padH, end = if (scroller) padH + 22.dp else padH, top = 12.dp, bottom = 16.dp), + modifier = Modifier.fillMaxSize(), + ) { + if (widgetsShown) item(key = "widgets", span = { GridItemSpan(maxLineSpan) }) { + BoxWithConstraints(Modifier.fillMaxWidth()) { + val maxW = maxWidth + FlowRow( + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), + ) { + for (w in HomeWidgets.widgets) key(w.id) { WidgetCard(w, maxW.value.toInt()) } + } + } + } + if (entries.isEmpty()) item(key = "empty", span = { GridItemSpan(maxLineSpan) }) { + Note( + when { + q.isNotEmpty() -> stringResource(R.string.apps_no_match, q) + filter == AppsView.HIDDEN -> stringResource(R.string.apps_hidden_none) + else -> stringResource(R.string.content_no_android_apps) + }, + ) + } + items(entries, key = { it.key }) { entry -> + when (entry) { + is AppEntry.App -> AppTile( + entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, + first = entry === entries.first(), + ) + is AppEntry.Shortcut -> PinnedTile(entry.pinned, first = entry === entries.first()) + is AppEntry.Folder -> FolderTile(entry, first = entry === entries.first(), onOpen = { renameOnOpen = false; openFolder = entry.folder.id }) { + renameOnOpen = true + openFolder = entry.folder.id + } + } + } + } + if (scroller) AlphabetScroller(entries, grid, leadItems, Modifier.align(Alignment.CenterEnd).fillMaxHeight().padding(end = 4.dp, top = 8.dp, bottom = 8.dp)) + } + } + + val folder = folders.firstOrNull { it.id == openFolder } + LaunchedEffect(folder == null, openFolder) { if (folder == null && openFolder != null) openFolder = null } + AnimatedVisibility( + folder != null, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(2f), + ) { + var last by remember { mutableStateOf(folder) } + if (folder != null) last = folder + last?.let { f -> + FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder) { + openFolder = null + renameOnOpen = false + } + } + } + AnimatedVisibility( + picking, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(3f), + ) { WidgetPicker(padH) { picking = false } } + } +} + +@Composable +private fun SwipeLock() { + DisposableEffect(Unit) { + PageSwipe.locks++ + onDispose { PageSwipe.locks-- } + } +} + +@Composable +private fun appsFilterLabel(filter: String): String = stringResource( + when (filter) { + AppsView.GAMES -> R.string.apps_filter_games + AppsView.DOWNLOADED -> R.string.apps_filter_downloaded + AppsView.SYSTEM -> R.string.apps_filter_system + AppsView.HIDDEN -> R.string.apps_filter_hidden + else -> R.string.apps_filter_all + }, +) + +@Composable +private fun appsSortLabel(sort: String): String = stringResource( + when (sort) { + AppsView.NAME_DESC -> R.string.apps_sort_name_desc + AppsView.INSTALLED -> R.string.apps_sort_installed + AppsView.UPDATED -> R.string.apps_sort_updated + else -> R.string.apps_sort_name_asc + }, +) + +@Composable +private fun AppsFilterButton() = HeaderChoiceButton( + stringResource(R.string.apps_filter), Icons.Filled.FilterAlt, "apps-filter", + AppsView.FILTERS, AppsView.filter, { appsFilterLabel(it) }, AppsView::setFilter, +) + +@Composable +private fun AppsSortButton() = HeaderChoiceButton( + stringResource(R.string.stores_sort), Icons.Filled.Sort, "apps-sort", + AppsView.SORTS, AppsView.sort, { appsSortLabel(it) }, AppsView::setSort, +) + +@Composable +private fun HeaderChoiceButton( + title: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, + options: List<String>, current: String, label: @Composable (String) -> String, onPick: (Context, String) -> Unit, +) { + val pal = LocalPalette.current + val ctx = LocalContext.current + var at by remember { mutableStateOf<androidx.compose.ui.geometry.Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton("$title · ${label(current)}", icon, key) { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = options.size, + handle = { Icon(icon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + options.forEachIndexed { i, option -> + StepChoice( + label(option), selected = option == current, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (option == current) Modifier.focusRequester(first) else Modifier), + ) { + onPick(ctx, option) + Steps.fold() + } + } + } + }) + } + } +} + +@Composable +private fun AlphabetScroller(entries: List<AppEntry>, grid: LazyGridState, leadItems: Int, modifier: Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val scope = rememberCoroutineScope() + val firstAt = remember(entries) { + val map = LinkedHashMap<String, Int>() + entries.forEachIndexed { i, e -> map.putIfAbsent(indexLetter(e.label), i) } + map + } + val letters = remember(firstAt) { firstAt.keys.toList() } + var dragging by remember { mutableStateOf<String?>(null) } + val current by remember(entries, leadItems) { + derivedStateOf { + val i = (grid.firstVisibleItemIndex - leadItems).coerceIn(0, (entries.size - 1).coerceAtLeast(0)) + entries.getOrNull(i)?.let { indexLetter(it.label) } + } + } + var height by remember { mutableIntStateOf(1) } + val jump: (Float) -> Unit = { y -> + val i = ((y / height) * letters.size).toInt().coerceIn(0, letters.size - 1) + val letter = letters[i] + if (letter != dragging) { + dragging = letter + val at = firstAt[letter] ?: 0 + scope.launch { grid.scrollToItem(if (at == 0) 0 else leadItems + at) } + } + } + Box(modifier.width(22.dp)) { + Column( + verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxSize() + .clip(RoundedCornerShape(11.dp)) + .background(if (dragging != null) colors.surface.copy(alpha = 0.85f) else Color.Transparent) + .onSizeChanged { height = it.height.coerceAtLeast(1) } + .pointerInput(letters) { + awaitEachGesture { + val down = awaitFirstDown() + down.consume() + jump(down.position.y) + while (true) { + val event = awaitPointerEvent() + val c = event.changes.firstOrNull { it.id == down.id } ?: break + if (!c.pressed) break + c.consume() + jump(c.position.y) + } + dragging = null + } + }, + ) { + for (l in letters) { + val on = l == (dragging ?: current) + Text( + l, fontSize = 10.sp, lineHeight = 11.sp, fontWeight = if (on) FontWeight.Bold else FontWeight.Medium, + color = if (on) pal.signal else colors.onSurfaceVariant, textAlign = TextAlign.Center, + ) + } + } + dragging?.let { l -> + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.align(Alignment.Center).offset { IntOffset(-64.dp.roundToPx(), 0) }.size(56.dp) + .clip(CircleShape).background(pal.signal), + ) { Text(l, fontSize = 26.sp, fontWeight = FontWeight.Bold, color = pal.onPrimary) } + } + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +private fun TileFrame( + id: String, first: Boolean, onClick: () -> Unit, onMenu: () -> Unit, + content: @Composable (hot: Boolean) -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val pressed by src.collectIsPressedAsState() + val scale by animateFloatAsState(if (pressed) 0.95f else if (hot) 1.04f else 1f, Motion.sp(0.55f, Spring.StiffnessMedium), label = "appScale") + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxWidth() + .paneItem("tile:$id").then(if (first) Modifier.firstTile().paneEntry() else Modifier) + .graphicsLayer { scaleX = scale; scaleY = scale } + .clip(Shape12) + .background(if (hot) colors.surface else colors.surface.copy(alpha = 0.55f)) + .glideBorder(hot, Shape12, pal.signal, hotWidth = 2.5.dp) + .hoverable(src) + .combinedClickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onLongClick = onMenu, onClick = onClick) + .controllerConfirm(onClick = onClick) + .menuKey(onMenu) + .padding(horizontal = 6.dp, vertical = 10.dp), + ) { content(hot) } +} + +@Composable +private fun TileLabel(text: String) = Text( + text, fontSize = 12.sp, lineHeight = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp), +) + +@Composable +private fun AppIcon(app: HomeApp.LaunchableApp, size: androidx.compose.ui.unit.Dp) { + val icon = app.icon + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(size)) + else Box(Modifier.size(size).clip(CircleShape).background(artBrush(hueOf(app.label)))) +} + +@Composable +private fun AppTile( + app: HomeApp.LaunchableApp, folderId: String?, first: Boolean, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, +) { + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(app.key, first, onClick = { onLaunch(app) }, onMenu = { menu = true }) { + AppIcon(app, 52.dp) + TileLabel(app.label) + } + AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder) + } +} + +@Composable +private fun AppMenu( + app: HomeApp.LaunchableApp, folderId: String?, open: Boolean, + onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, +) { + val ctx = LocalContext.current + var choosing by remember { mutableStateOf(false) } + var shortcuts by remember { mutableStateOf<List<Pair<ShortcutInfo, Bitmap?>>>(emptyList()) } + LaunchedEffect(open) { + if (!open) { + choosing = false + return@LaunchedEffect + } + shortcuts = withContext(Dispatchers.IO) { + HomeApp.shortcuts(ctx, app).map { it to HomeApp.shortcutIcon(ctx, it, 64) } + } + } + val isHidden = app.key in HomeHidden.keys + AnchoredMenu(open, onDismiss = onDismiss, title = app.label, compact = true, minWidth = 200.dp) { first -> + if (choosing) { + val others = HomeFolders.folders.filter { it.id != folderId } + var firstUsed = false + for (f in others) key(f.id) { + MenuItem(f.name, checked = false, focusRequester = if (!firstUsed) first.also { firstUsed = true } else null) { + HomeFolders.add(ctx, f.id, app.key) + onDismiss() + } + } + MenuItem(stringResource(R.string.apps_new_folder), checked = false, focusRequester = if (others.isEmpty()) first else null) { + onDismiss() + onNewFolder(app) + } + } else { + shortcuts.forEachIndexed { i, (info, icon) -> + key(info.id) { + MenuItem( + info.shortLabel?.toString().orEmpty(), checked = false, + focusRequester = if (i == 0) first else null, + leading = { MenuIcon(icon) }, + ) { + onDismiss() + runCatching { HomeApp.startShortcut(ctx, info) } + } + } + } + if (shortcuts.isNotEmpty()) Box(Modifier.fillMaxWidth().padding(vertical = 4.dp).height(1.dp).background(LocalPalette.current.line)) + if (!isHidden) MenuItem(stringResource(R.string.apps_add_to_folder), checked = false, focusRequester = if (shortcuts.isEmpty()) first else null) { choosing = true } + if (folderId != null) MenuItem(stringResource(R.string.apps_remove_from_folder), checked = false) { + HomeFolders.remove(ctx, app.key) + onDismiss() + } + MenuItem(stringResource(if (isHidden) R.string.apps_unhide else R.string.apps_hide), checked = false, + focusRequester = if (isHidden && shortcuts.isEmpty()) first else null) { + onDismiss() + HomeHidden.set(ctx, app.key, !isHidden) + } + MenuItem(stringResource(R.string.apps_app_info), checked = false) { + onDismiss() + runCatching { HomeApp.openAppInfo(ctx, app) } + } + if (HomeApp.canUninstall(app)) MenuItem(stringResource(R.string.apps_uninstall), checked = false) { + onDismiss() + runCatching { HomeApp.uninstall(ctx, app) } + } + } + } +} + +@Composable +private fun MenuIcon(icon: Bitmap?) { + if (icon != null) Image(icon.asImageBitmap(), null, modifier = Modifier.size(20.dp)) + else Spacer(Modifier.size(20.dp)) +} + +@Composable +private fun PinnedTile(pinned: HomePins.Pinned, first: Boolean) { + val ctx = LocalContext.current + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(pinned.key, first, onClick = { runCatching { HomeApp.startShortcut(ctx, pinned.info) } }, onMenu = { menu = true }) { + Box { + val icon = pinned.icon + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) + else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) + } + TileLabel(pinned.label) + } + AnchoredMenu(menu, onDismiss = { menu = false }, title = pinned.label, compact = true, minWidth = 180.dp) { firstItem -> + MenuItem(stringResource(R.string.apps_shortcut_remove), checked = false, detail = pinned.appLabel, focusRequester = firstItem) { + menu = false + HomePins.unpin(ctx, pinned) + } + } + } +} + +@Composable +private fun FolderIcon(apps: List<HomeApp.LaunchableApp>, size: androidx.compose.ui.unit.Dp) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val cell = (size - 14.dp) / 2 + Box( + Modifier.size(size).clip(RoundedCornerShape(size / 3.5f)).background(colors.surfaceVariant) + .glideBorder(false, RoundedCornerShape(size / 3.5f), pal.signal, pal.line2) + .padding(5.dp), + ) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + for (row in apps.take(4).chunked(2)) Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { + for (a in row) AppIcon(a, cell) + } + } + } +} + +@Composable +private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Unit, onRename: () -> Unit) { + val ctx = LocalContext.current + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(entry.key, first, onClick = onOpen, onMenu = { menu = true }) { + FolderIcon(entry.apps, 52.dp) + TileLabel(entry.folder.name) + } + AnchoredMenu(menu, onDismiss = { menu = false }, title = entry.folder.name, compact = true, minWidth = 160.dp) { firstItem -> + MenuItem(stringResource(R.string.apps_folder_rename), checked = false, focusRequester = firstItem) { + menu = false + onRename() + } + MenuItem(stringResource(R.string.apps_folder_ungroup), checked = false) { + menu = false + HomeFolders.delete(ctx, entry.folder.id) + } + } + } +} + +@Composable +private fun FolderSheet( + folder: HomeFolders.Folder, apps: List<HomeApp.LaunchableApp>, renameFirst: Boolean, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, +) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var renaming by remember(folder.id) { mutableStateOf(renameFirst) } + var name by remember(folder.id) { mutableStateOf(if (renameFirst) "" else folder.name) } + val commit = { + val n = name.trim() + if (n.isNotEmpty() && n != folder.name) HomeFolders.rename(ctx, folder.id, n) + renaming = false + } + val close = { if (renaming) commit(); onClose() } + BackHandler { close() } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.55f)) + .pointerInput(Unit) { awaitEachGesture { val d = awaitFirstDown(); d.consume(); close() } }, + ) { + val shown = remember { androidx.compose.animation.core.MutableTransitionState(false) }.apply { targetState = true } + AnimatedVisibility(shown, enter = scaleIn(Motion.sp(0.75f), initialScale = 0.92f) + fadeIn(Motion.tw(160)), exit = scaleOut(Motion.tw(140)) + fadeOut(Motion.tw(140))) { + Column( + modifier = Modifier.widthIn(max = 620.dp).fillMaxWidth(0.9f).heightIn(max = 520.dp) + .clip(Shape16).background(pal.surfaceVariant.copy(alpha = 0.97f)) + .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } + .controllerBack(close) + .padding(16.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { + if (renaming) Box(Modifier.weight(1f)) { + AdbTextField( + value = name, onValueChange = { name = it.take(40) }, label = stringResource(R.string.apps_folder_name), + keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, compact = true, showLabel = false, + placeholder = folder.name, focusOnShow = true, onDone = { commit() }, + ) + } else { + Text(folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + SmallIconButton(Icons.Filled.Edit, stringResource(R.string.apps_folder_rename), tint = colors.onSurfaceVariant) { renaming = true } + Spacer(Modifier.weight(1f)) + } + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant) { close() } + } + LazyVerticalGrid( + columns = GridCells.Adaptive(92.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + ) { + items(apps, key = { it.key }) { app -> + AppTile(app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder) + } + } + } + } + } +} + +@Composable +private fun WidgetCard(w: HomeWidgets.Placed, maxWidthDp: Int) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var menu by remember { mutableStateOf(false) } + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val width = w.widthDp.coerceAtMost(maxWidthDp) + val activity = remember(ctx) { ctx.findActivity() } + Box { + Box( + Modifier.size(width.dp, w.heightDp.dp) + .clip(Shape16) + .background(colors.surface.copy(alpha = 0.35f)) + .glideBorder(hot || menu, Shape16, pal.signal) + .hoverable(src).focusable(interactionSource = src) + .controllerConfirm { menu = true } + .menuKey { menu = true }, + ) { + AndroidView( + factory = { c -> + (HomeWidgets.createView(c, w.id) ?: android.view.View(c)).apply { + val radius = 16 * c.resources.displayMetrics.density + outlineProvider = object : android.view.ViewOutlineProvider() { + override fun getOutline(view: android.view.View, outline: android.graphics.Outline) = + outline.setRoundRect(0, 0, view.width, view.height, radius) + } + clipToOutline = true + } + }, + update = { v -> + if (v is HomeWidgets.HomeWidgetView) { + v.onLongPress = { menu = true } + HomeWidgets.applySize(v, width, w.heightDp) + } + }, + modifier = Modifier.fillMaxSize(), + ) + } + val (minW, minH) = remember(w.id) { HomeWidgets.minSize(ctx, w.id) } + val index = HomeWidgets.widgets.indexOfFirst { it.id == w.id } + val label = remember(w.id) { HomeWidgets.info(ctx, w.id)?.loadLabel(ctx.packageManager) ?: "" } + AnchoredMenu(menu, onDismiss = { menu = false }, title = label, compact = true, minWidth = 180.dp) { first -> + val step = 48 + MenuItem(stringResource(R.string.apps_widget_wider), checked = false, enabled = width < maxWidthDp, focusRequester = first) { + HomeWidgets.resize(ctx, w.id, (width + step).coerceAtMost(maxWidthDp), w.heightDp) + } + MenuItem(stringResource(R.string.apps_widget_narrower), checked = false, enabled = width > minW) { + HomeWidgets.resize(ctx, w.id, (width - step).coerceAtLeast(minW), w.heightDp) + } + MenuItem(stringResource(R.string.apps_widget_taller), checked = false, enabled = w.heightDp < 480) { + HomeWidgets.resize(ctx, w.id, width, (w.heightDp + step).coerceAtMost(480)) + } + MenuItem(stringResource(R.string.apps_widget_shorter), checked = false, enabled = w.heightDp > minH) { + HomeWidgets.resize(ctx, w.id, width, (w.heightDp - step).coerceAtLeast(minH)) + } + if (index > 0) MenuItem(stringResource(R.string.apps_widget_move_earlier), checked = false) { HomeWidgets.move(ctx, w.id, -1) } + if (index in 0 until HomeWidgets.widgets.size - 1) MenuItem(stringResource(R.string.apps_widget_move_later), checked = false) { HomeWidgets.move(ctx, w.id, 1) } + if (activity != null && HomeWidgets.canReconfigure(ctx, w.id)) MenuItem(stringResource(R.string.apps_widget_configure), checked = false) { + menu = false + HomeWidgets.reconfigure(activity, w.id) + } + MenuItem(stringResource(R.string.apps_widget_remove), checked = false) { + menu = false + HomeWidgets.remove(ctx, w.id) + } + } + } +} + +@Composable +private fun WidgetPicker(padH: androidx.compose.ui.unit.Dp, onClose: () -> Unit) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val activity = remember(ctx) { ctx.findActivity() } + BackHandler { onClose() } + val providers = HomeWidgets.providers + Column(Modifier.fillMaxSize().background(colors.background).pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false) } }) { + LazyVerticalGrid( + columns = GridCells.Adaptive(150.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + contentPadding = PaddingValues(horizontal = padH, vertical = 14.dp), + modifier = Modifier.fillMaxSize(), + ) { + item(key = "back", span = { GridItemSpan(maxLineSpan) }) { + Column { + Box(Modifier.padding(bottom = 10.dp)) { BackLink(stringResource(R.string.rail_apps), compact = true, onClick = onClose) } + PageHeader(stringResource(R.string.apps_add_widget)) { + if (providers != null) Chip(providers.size.toString(), ok = false) + } + } + } + when { + providers == null -> item(key = "loading", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_widgets_loading)) } + providers.isEmpty() -> item(key = "none", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_widgets_none)) } + else -> items(providers, key = { it.info.provider.flattenToString() }) { p -> + ProviderCard(p, first = p === providers.first()) { + onClose() + if (activity != null) HomeWidgets.add(activity, p) + } + } + } + } + } +} + +@Composable +private fun ProviderCard(p: HomeWidgets.Provider, first: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Column( + modifier = Modifier.fillMaxWidth().paneItem("widget:" + p.info.provider.flattenToString()).then(if (first) Modifier.firstTile() else Modifier) + .clip(Shape12).background(colors.surface) + .glideBorder(hot, Shape12, pal.signal, hotWidth = 2.5.dp) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxWidth().aspectRatio(1.6f).background(colors.surfaceVariant).padding(10.dp), + ) { + val preview = p.preview + if (preview != null) Image(preview.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) + } + Column(Modifier.padding(horizontal = 10.dp, vertical = 8.dp)) { + Text(p.label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + val cells = "${(p.widthDp / 80f).roundToInt().coerceAtLeast(1)} × ${(p.heightDp / 80f).roundToInt().coerceAtLeast(1)}" + Text(if (p.appLabel == p.label) cells else "${p.appLabel} · $cells", fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} + +@Composable +fun PinRequestPrompt(label: String, appLabel: String, icon: Bitmap?, wide: Boolean, onAdd: () -> Unit, onCancel: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + BackHandler { onCancel() } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.55f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume(); onCancel() } }, + ) { + val shown = remember { androidx.compose.animation.core.MutableTransitionState(false) }.apply { targetState = true } + AnimatedVisibility(shown, enter = scaleIn(Motion.sp(0.75f), initialScale = 0.92f) + fadeIn(Motion.tw(160))) { + Column( + verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.widthIn(min = 280.dp, max = 420.dp) + .clip(Shape16).background(pal.surfaceVariant.copy(alpha = 0.97f)) + .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } + .controllerBack(onCancel) + .padding(18.dp), + ) { + Text( + stringResource(R.string.apps_pin_title).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, + letterSpacing = 1.5.sp, color = colors.onSurfaceVariant, + ) + if (wide && icon != null) Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxWidth().heightIn(max = 180.dp).clip(Shape12).background(MaterialTheme.colorScheme.surface).padding(10.dp), + ) { Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxWidth()) } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) { + if (!wide) { + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) + else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(label)))) + } + Column(Modifier.weight(1f)) { + Text(label, fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(appLabel, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), onClick = onCancel) + PrimaryButton(stringResource(R.string.apps_pin_add), onClick = onAdd) + } + } + } + } +} 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 a4227d4c2..8e84ae4cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -91,16 +91,12 @@ import java.io.File private enum class MovieTab { INSTALLED, IMPORT, REPO, SOUND } -/** Downloads run here rather than in a tab, so switching tabs or closing the settings does not cancel one halfway. */ private val installScope = CoroutineScope(SupervisorJob() + Dispatchers.Main) -/** The downloads under way, by post id and percent; kept here so they are still known when the tab or the settings come back. */ private val installProgress = mutableStateMapOf<String, Int>() -/** What the movie list looks like right now: every movie and the one Steam will play. */ private class MovieSnapshot(val entries: List<BootMovieLibrary.Entry>, val selected: String) -/** The movie list, read again every couple of seconds so a movie picked, added or removed inside Steam shows up here too. */ @Composable private fun rememberMovies(refresh: Int, onSelectionChanged: () -> Unit): MovieSnapshot? { val app = LocalContext.current.applicationContext @@ -143,7 +139,6 @@ private fun TabChip(label: String, selected: Boolean, modifier: Modifier = Modif } } -/** The "Boot movie" settings group: Installed movies, Import your own movies, SteamDeckRepo and Sound. */ @Composable internal fun BootMovieGroup(s: ModeSettings, a: ModeSettingsActions, host: MenuHost) { var tab by rememberSaveable { mutableStateOf(MovieTab.INSTALLED) } @@ -179,7 +174,6 @@ private fun InstalledTab(a: ModeSettingsActions) { val app = LocalContext.current.applicationContext val scope = rememberCoroutineScope() var saving by remember { mutableStateOf(false) } - // The report is for bug reports, so it shows only while Debugging tools is on (read each time this tab opens). val debugging = remember { com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(app) } if (debugging) { SettingsRow(stringResource(R.string.boot_movie_report), stringResource(R.string.boot_movie_report_hint)) { @@ -222,7 +216,6 @@ private fun movieSourceLabel(source: String): String = stringResource( }, ) -/** The installed movies as a list with covers; the one Steam plays is highlighted, and the list follows changes made in Steam. */ @Composable private fun InstalledMoviesDialog(a: ModeSettingsActions, onDismiss: () -> Unit) { val app = LocalContext.current.applicationContext @@ -308,12 +301,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)) } }, ) } @@ -497,10 +490,8 @@ private fun RepoTab(a: ModeSettingsActions) { } } -/** Downloads [post] and puts it among the installed movies; returns a message when it failed, null when it worked. */ private fun install(app: android.content.Context, post: SteamDeckRepo.Post, onProgress: (Int) -> Unit): String? { val folder = File(app.cacheDir, "boot-movie-download").apply { mkdirs() } - // Leftovers of a download that was cut short are cleared, and every download has a file of its own. folder.listFiles()?.forEach { if (System.currentTimeMillis() - it.lastModified() > 60 * 60 * 1000L) it.delete() } val file = File.createTempFile("movie-", ".webm", folder) return try { @@ -563,7 +554,6 @@ private const val AFTER_OPEN = 3 private const val AFTER_INSTALL = 1 private const val AFTER_USE = 2 -/** Install and Use are different buttons in turn, and the button is disabled while installing; it takes focus back for the controller. */ @Composable private fun RepoAction( installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, modifier: Modifier, onInstall: () -> Unit, onUse: () -> Unit, @@ -593,7 +583,6 @@ private fun RepoAction( ) } -/** A movie from SteamDeckRepo played straight from the site, so it can be checked before it is installed. */ @Composable private fun PreviewDialog( post: SteamDeckRepo.Post, installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, @@ -674,16 +663,16 @@ 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, @@ -696,7 +685,6 @@ private fun TextEntryDialog( } } -/** Page buttons around the current page, which opens a box to type another page into; first and last page show their numbers. */ @OptIn(ExperimentalLayoutApi::class) @Composable private fun RepoPager(page: Int, last: Int?, hasMore: Boolean, onPage: (Int) -> Unit, onJump: () -> Unit) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt new file mode 100644 index 000000000..8fee83eb9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher.ui + +import android.annotation.SuppressLint +import android.content.Context +import android.media.AudioManager +import android.view.ViewGroup +import android.webkit.CookieManager +import android.webkit.RenderProcessGoneDetail +import android.webkit.WebResourceRequest +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamWebLogin +import com.droiddeck.launcher.runtime.LinuxRuntime +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext +import java.io.File +import kotlin.coroutines.resume +import kotlin.math.roundToInt + +private const val STEAM_CHAT = "https://steamcommunity.com/chat" +private const val CHAT_PAGE_SCALE = 0.75f +private val STEAM_HOSTS = listOf("steamcommunity.com", "steam-chat.com", "steampowered.com", "steamstatic.com", "steamcontent.com") + +internal fun steamChatAllows(host: String?): Boolean = + host != null && STEAM_HOSTS.any { host == it || host.endsWith(".$it") } + +internal fun desktopUserAgent(webView: String?): String { + val chrome = webView?.let { Regex("Chrome/[\\d.]+").find(it)?.value } ?: "Chrome/127.0.6533.103" + return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) $chrome Safari/537.36" +} + +internal fun steamChatFitScript(cssWidth: Int, scale: Float): String { + val zoom = "%.2f".format(java.util.Locale.US, scale) + return "(function(){var m=document.querySelector('meta[name=viewport]');" + + "if(!m){m=document.createElement('meta');m.name='viewport';document.head.appendChild(m);}" + + "m.content='width=$cssWidth, initial-scale=$zoom';" + + "if(!document.getElementById('dd-chat-fit')){var s=document.createElement('style');s.id='dd-chat-fit';" + + "s.textContent='$STEAM_CHAT_FIT_CSS';document.head.appendChild(s);}" + + "window.dispatchEvent(new Event('resize'));})()" +} + +internal const val STEAM_CHAT_FIT_CSS = ".chat_main>:has(~.chat_main_flex){display:none!important}" + + ".ChatRoomList_Empty{display:none!important}" + + ".chatRoomListContainer{height:auto!important;max-height:25vh!important}" + +@Composable +fun BottomChatPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var chatOpen by remember { mutableStateOf(true) } + var stopped by remember { mutableStateOf(false) } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_RESUME && stopped) { + stopped = false + chatOpen = true + } + } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + var fromSteam by remember { mutableStateOf<Boolean?>(null) } + LaunchedEffect(chatOpen) { + if (!chatOpen) { + fromSteam = null + return@LaunchedEffect + } + val cookies = withContext(Dispatchers.IO) { + SteamWebLogin.read(LinuxRuntime.rootDir(context), SessionState.steamClientArch, File(context.cacheDir, "steam-web-login")) + } + val manager = CookieManager.getInstance() + for (c in cookies) suspendCancellableCoroutine { cont -> manager.setCookie("https://${c.host}", c.header) { cont.resume(Unit) } } + manager.flush() + fromSteam = cookies.any { it.header.startsWith("steamLoginSecure=") } + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (!chatOpen) { + VoiceRow(context) + Column(Modifier.weight(1f).fillMaxWidth().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + if (stopped) Text(stringResource(R.string.bottom_chat_stopped), fontSize = 13.sp, color = colors.onSurfaceVariant, textAlign = TextAlign.Center) + Text(stringResource(R.string.bottom_chat_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_chat_open), "bottom-chat-open") { + stopped = false + chatOpen = true + } + } + } else { + VoiceRow(context, onClose = { chatOpen = false }, + note = if (fromSteam == false) stringResource(R.string.bottom_chat_not_signed_in) else "") + Box(Modifier.weight(1f).fillMaxWidth().clip(RoundedCornerShape(14.dp))) { + if (fromSteam != null) SteamChatView(onStopped = { + stopped = true + chatOpen = false + }) + } + } + } +} + +@Composable +private fun VoiceRow(context: Context, onClose: (() -> Unit)? = null, note: String = "") { + val colors = MaterialTheme.colorScheme + val audio = remember { context.getSystemService(Context.AUDIO_SERVICE) as AudioManager } + val max = remember { audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) } + var volume by remember { mutableIntStateOf(audio.getStreamVolume(AudioManager.STREAM_MUSIC)) } + fun step(direction: Int) { + audio.adjustStreamVolume(AudioManager.STREAM_MUSIC, direction, 0) + volume = audio.getStreamVolume(AudioManager.STREAM_MUSIC) + } + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (onClose != null) BottomPillButton(stringResource(R.string.bottom_chat_close), "bottom-chat-close", onClose) + if (SessionState.micAvailable) { + val on = SessionState.micEnabled + BottomPillButton(stringResource(if (on) R.string.bottom_chat_mic_on else R.string.bottom_chat_mic_off), "bottom-chat-mic") { + SessionService.setMicEnabled(context, !on) + } + } + val hint = if (onClose == null && !SessionState.micAvailable) stringResource(R.string.bottom_chat_mic_unavailable) else note + Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 3, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.bottom_chat_volume, volume * 100 / max), fontSize = 14.sp, color = colors.onSurfaceVariant) + BottomPillButton("−", "bottom-chat-volume-down") { step(AudioManager.ADJUST_LOWER) } + BottomPillButton("+", "bottom-chat-volume-up") { step(AudioManager.ADJUST_RAISE) } + } +} + +@SuppressLint("SetJavaScriptEnabled") +@Composable +private fun SteamChatView(onStopped: () -> Unit) { + AndroidView(factory = { ctx -> + WebView(ctx).apply { + layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + setBackgroundColor(0xFF0A0B0D.toInt()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + settings.allowFileAccess = false + settings.allowContentAccess = false + settings.useWideViewPort = true + settings.loadWithOverviewMode = true + settings.userAgentString = desktopUserAgent(runCatching { WebSettings.getDefaultUserAgent(ctx) }.getOrNull()) + CookieManager.getInstance().setAcceptCookie(true) + webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + !steamChatAllows(request.url.host) + + override fun onPageFinished(view: WebView, url: String) { + val scale = view.resources.displayMetrics.density * CHAT_PAGE_SCALE + if (view.width > 0) view.evaluateJavascript(steamChatFitScript((view.width / scale).roundToInt(), CHAT_PAGE_SCALE), null) + } + + override fun onRenderProcessGone(view: WebView, detail: RenderProcessGoneDetail): Boolean { + onStopped() + return true + } + } + loadUrl(STEAM_CHAT) + } + }, modifier = Modifier.fillMaxSize(), onRelease = { view -> + CookieManager.getInstance().flush() + view.destroy() + }) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt new file mode 100644 index 000000000..25fd17149 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -0,0 +1,154 @@ +package com.droiddeck.launcher.ui + +import androidx.annotation.StringRes +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +class BottomPage( + val id: String, + @StringRes val label: Int, + val icon: ImageVector, + val content: @Composable () -> Unit, +) + +internal fun pickBottomPage(remembered: String?, ids: List<String>): String? = + ids.firstOrNull { it == remembered } ?: ids.firstOrNull { it == DEFAULT_PAGE } ?: ids.firstOrNull() + +internal object SessionBottomTab { + private var session: String? = null + private var tab: String? = null + + @Synchronized + fun picked(sessionId: String?): String? = tab.takeIf { sessionId != null && sessionId == session } + + @Synchronized + fun pick(sessionId: String?, id: String) { + session = sessionId + tab = id + } +} + +internal fun pageForGameStart(ids: List<String>): String? = GAME_PAGE.takeIf { it in ids } + +private const val DEFAULT_PAGE = "chat" +private const val GAME_PAGE = "telemetry" + +internal fun bottomTabsWithLabels(widthDp: Float, tabs: Int): Boolean = tabs * TAB_WIDTH + 2 * BAR_BUTTON <= widthDp + +private const val TAB_WIDTH = 132f +private const val BAR_BUTTON = 56f + +@Composable +fun BottomDashboard( + pages: List<BottomPage>, + remembered: String?, + onPage: (String) -> Unit, + onClose: () -> Unit, + onMenu: (() -> Unit)?, + gameStarts: Int = 0, +) { + val colors = MaterialTheme.colorScheme + var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } + val startsWhenOpened = remember { gameStarts } + LaunchedEffect(gameStarts) { + if (gameStarts != startsWhenOpened) pageForGameStart(pages.map { it.id })?.let { current = it } + } + val page = pages.firstOrNull { it.id == current } ?: pages.firstOrNull() + BoxWithConstraints(Modifier.fillMaxSize().background(colors.background)) { + val labels = bottomTabsWithLabels(maxWidth.value, pages.size) + Column(Modifier.fillMaxSize().padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(Modifier.fillMaxWidth().height(48.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) + Row(Modifier.weight(1f).horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + pages.forEach { p -> + PageTab(p, p.id == page?.id, labels) { + current = p.id + onPage(p.id) + } + } + } + if (onMenu != null) BarButton(Icons.Outlined.Menu, stringResource(R.string.touch_droiddeck_menu), "bottom-menu", onMenu) + } + Box(Modifier.weight(1f).fillMaxWidth()) { + if (page != null) page.content() + else Text(stringResource(R.string.bottom_dashboard_empty), fontSize = 15.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.Center)) + } + } + } +} + +@Composable +private fun BarButton(icon: ImageVector, label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.size(44.dp).clip(RoundedCornerShape(22.dp)).background(pal.surface).border(1.dp, pal.line, RoundedCornerShape(22.dp)) + .semantics { contentDescription = label }.clickable(role = Role.Button, onClick = onClick).testTag(tag), + contentAlignment = Alignment.Center, + ) { + Icon(icon, contentDescription = null, tint = MaterialTheme.colorScheme.onBackground, modifier = Modifier.size(22.dp)) + } +} + +@Composable +private fun PageTab(page: BottomPage, selected: Boolean, label: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(20.dp) + val name = stringResource(page.label) + Row( + Modifier.height(44.dp).clip(shape) + .background(if (selected) pal.signal else Color.Transparent) + .border(1.dp, if (selected) pal.signal else pal.line, shape) + .semantics { contentDescription = name } + .clickable(role = Role.Tab, onClick = onClick).testTag("bottom-page-${page.id}") + .padding(horizontal = 14.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + val tint = if (selected) colors.background else colors.onBackground + Icon(page.icon, contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) + if (label || selected) Text(name, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = tint, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt new file mode 100644 index 000000000..d6b80ac81 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -0,0 +1,345 @@ +package com.droiddeck.launcher.ui + +import android.annotation.SuppressLint +import android.content.Context +import android.content.res.Configuration +import android.graphics.Color +import android.os.SystemClock +import android.graphics.Typeface +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewConfiguration +import android.graphics.RectF +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.platform.ComposeView +import android.widget.FrameLayout +import android.widget.LinearLayout +import android.widget.ImageView +import android.widget.TextView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.GuestKeys +import com.droiddeck.launcher.input.InputSpace +import com.droiddeck.launcher.input.KeyboardHost +import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.input.PointerGestures +import com.droiddeck.launcher.input.TouchpadGestures +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.BottomDesktop + +@SuppressLint("ViewConstructor") +class BottomDesktopPanel( + context: Context, + onClose: () -> Unit, + onMenu: (() -> Unit)?, + steamButtons: Pair<() -> Unit, () -> Unit>?, +) : LinearLayout(context), SurfaceHolder.Callback { + private lateinit var surfaceView: SurfaceView + private val area = FrameLayout(context).apply { clipChildren = true } + private val state = mutableStateOf(BottomDesktop.state) + private val status = ComposeView(context).apply { + setContent { DroidDeckTheme { BottomDesktopStatus(state.value, ::startAgain) } } + } + private val keyboardHost = KeyboardHost(context) { event -> sendKey(event) } + private var directTouch = SessionPrefs.bottomDesktopDirectTouch(context) + private lateinit var touchButton: ImageView + private lateinit var title: TextView + private val trackpad = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), TrackpadInput()).apply { + desktop = true + } + private var attached = false + /** The surface was given to a compositor process; a new process cannot connect to it again. */ + private var surfaceUsed = false + private var fullWidth = 0 + private var fullHeight = 0 + private var lastTouchY = 0f + private var lastPressMs = 0L + private var scrollRestX = 0f + private var scrollRestY = 0f + private val stateListener: () -> Unit = { showState() } + + init { + orientation = VERTICAL + setBackgroundColor(Color.BLACK) + isFocusable = true + isFocusableInTouchMode = true + addView(bar(onClose, onMenu, steamButtons), LayoutParams(-1, -2)) + area.addView(keyboardHost) + addSurface() + area.addView(status, FrameLayout.LayoutParams(-1, -1)) + addView(area, LayoutParams(-1, 0, 1f)) + keyboardHost.onImeChanged = { pan() } + showTouchMode() + } + + private fun addSurface() { + surfaceView = SurfaceView(context) + surfaceView.holder.addCallback(this) + @Suppress("ClickableViewAccessibility") + surfaceView.setOnTouchListener { _, event -> onSurfaceTouch(event) } + area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) + } + + private fun bar(onClose: () -> Unit, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?): View { + val bar = LinearLayout(context).apply { + orientation = HORIZONTAL + gravity = Gravity.CENTER_VERTICAL + setPadding(dp(8), dp(6), dp(8), dp(6)) + setBackgroundColor(Color.BLACK) + } + fun gap() = View(context).apply { layoutParams = LayoutParams(dp(6), 1) } + bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) + title = TextView(context).apply { + textSize = 14f + typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) + setTextColor(Color.rgb(0x7A, 0x80, 0x8A)) + setPadding(dp(12), 0, dp(6), 0) + isSingleLine = true + ellipsize = android.text.TextUtils.TruncateAt.END + } + bar.addView(title, LayoutParams(0, -2, 1f)) + touchButton = DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_mouse, "") { setDirectTouch(!directTouch) } + bar.addView(touchButton) + bar.addView(gap()) + bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_keyboard, + context.getString(R.string.second_show_keyboard)) { keyboardHost.toggle() }) + onMenu?.let { + bar.addView(gap()) + bar.addView(DeckControlsPanel.menuButton(context, it)) + } + steamButtons?.let { (steam, qam) -> + bar.addView(gap()) + bar.addView(DeckControlsPanel.roundButton(context, "STEAM", context.getString(R.string.deck_open_steam_menu), steam, wide = true)) + bar.addView(gap()) + bar.addView(DeckControlsPanel.roundButton(context, "•••", context.getString(R.string.drawer_open_qam), qam, wide = true)) + } + return bar + } + + private fun setDirectTouch(on: Boolean) { + trackpad.cancel() + BottomDesktop.sendTouch(3, -1, 0, 0) + directTouch = on + SessionPrefs.setBottomDesktopDirectTouch(context, on) + showTouchMode() + } + + private fun showTouchMode() { + touchButton.setImageResource(if (directTouch) R.drawable.ic_bottom_touch else R.drawable.ic_bottom_mouse) + touchButton.contentDescription = context.getString( + if (directTouch) R.string.bottom_desktop_direct_touch else R.string.bottom_desktop_trackpad) + title.text = context.getString(R.string.bottom_desktop_title, + context.getString(if (directTouch) R.string.bottom_desktop_mode_touch else R.string.bottom_desktop_mode_trackpad)) + BottomDesktop.showCursor(!directTouch) + if (!directTouch && surfaceView.width > 0) { + trackpad.bounds = RectF(0f, 0f, surfaceView.width.toFloat(), surfaceView.height.toFloat()) + trackpad.place(surfaceView.width / 2f, surfaceView.height / 2f) + movePointer(trackpad.x, trackpad.y) + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + BottomDesktop.addListener(stateListener) + BottomDesktop.setTextInputListener { focused -> + val tapped = SystemClock.uptimeMillis() - lastPressMs < TEXT_FIELD_TAP_MS + val hardKeyboard = resources.configuration.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO + if (focused && tapped && !hardKeyboard && !keyboardHost.shown) keyboardHost.show() + else if (!focused && keyboardHost.shown) keyboardHost.hide() + } + showState() + post { if (!keyboardHost.shown) requestFocus() } + } + + override fun onDetachedFromWindow() { + BottomDesktop.removeListener(stateListener) + BottomDesktop.setTextInputListener(null) + keyboardHost.takeIf { it.shown }?.hide() + trackpad.cancel() + status.disposeComposition() + super.onDetachedFromWindow() + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + if (BottomDesktop.state == BottomDesktop.State.RUNNING && !PadBridge.isControllerKeyEvent(event) && + event.keyCode != KeyEvent.KEYCODE_BACK && sendKey(event)) true + else super.dispatchKeyEvent(event) + + private fun sendKey(event: KeyEvent): Boolean { + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount > 0) return true + if (GuestKeys.send(event, BottomDesktop::sendKey)) return true + val ch = event.unicodeChar + if (event.action == KeyEvent.ACTION_DOWN && ch > 0) { + BottomDesktop.sendText(String(Character.toChars(ch))) + return true + } + return false + } + + private fun startAgain() { + if (surfaceUsed && !BottomDesktop.connected) { + attached = false + surfaceUsed = false + area.removeView(surfaceView) + addSurface() + return + } + if (attached) attach(surfaceView.holder) + } + + private fun showState() { + state.value = BottomDesktop.state + status.visibility = if (state.value == BottomDesktop.State.RUNNING) View.GONE else View.VISIBLE + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + post { holdSurfaceSize() } + } + + // The keyboard shrinks the window; the desktop keeps its size and slides up under it instead of being squeezed. + private fun holdSurfaceSize() { + val w = area.width + val h = area.height + if (w <= 0 || h <= 0) return + if (w != fullWidth || h > fullHeight || !keyboardHost.shown) { + fullWidth = w + fullHeight = h + surfaceView.layoutParams = FrameLayout.LayoutParams(w, h) + } + pan() + } + + private fun pan() { + val visible = area.height + val hidden = (fullHeight - visible).coerceAtLeast(0) + val anchor = if (directTouch) lastTouchY else trackpad.y + surfaceView.translationY = if (hidden == 0 || !keyboardHost.shown) 0f + else -(anchor - visible * 0.4f).coerceIn(0f, hidden.toFloat()) + } + + override fun surfaceCreated(holder: SurfaceHolder) = Unit + + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { + if (!attached) attach(holder) + } + + override fun surfaceDestroyed(holder: SurfaceHolder) { + if (holder !== surfaceView.holder) return + attached = false + surfaceUsed = false + BottomDesktop.detach() + } + + private fun attach(holder: SurfaceHolder) { + val frame = holder.surfaceFrame + val (width, height) = BottomDesktop.outputSizeFor(fullWidth.takeIf { it > 0 } ?: frame.width(), + fullHeight.takeIf { it > 0 } ?: frame.height()) + if (width <= 0 || height <= 0) return + if (frame.width() != width || frame.height() != height) { + holder.setFixedSize(width, height) + return + } + attached = true + surfaceUsed = true + BottomDesktop.attach(context, holder.surface, width, height, display?.refreshRate ?: 60f) + showTouchMode() + } + + private fun onSurfaceTouch(event: MotionEvent): Boolean { + val w = surfaceView.width + val h = surfaceView.height + if (w <= 0 || h <= 0 || BottomDesktop.state != BottomDesktop.State.RUNNING) return true + if (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_UP) + lastPressMs = SystemClock.uptimeMillis() + if (directTouch) return forwardTouch(event, w, h) + val bounds = RectF(0f, 0f, w.toFloat(), h.toFloat()) + if (trackpad.bounds != bounds) { + trackpad.bounds = bounds + trackpad.place(trackpad.x, trackpad.y) + } + return trackpad.onTouch(event) + } + + private fun forwardTouch(event: MotionEvent, w: Int, h: Int): Boolean { + val action = when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> 0 + MotionEvent.ACTION_MOVE -> 1 + MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> 2 + MotionEvent.ACTION_CANCEL -> { BottomDesktop.sendTouch(3, -1, 0, 0); return true } + else -> return true + } + if (event.actionMasked == MotionEvent.ACTION_DOWN) lastTouchY = event.y + if (action == 1) { + for (i in 0 until event.pointerCount) send(1, event.getPointerId(i), event.getX(i), event.getY(i), w, h) + } else { + val i = event.actionIndex + send(action, event.getPointerId(i), event.getX(i), event.getY(i), w, h) + } + return true + } + + private fun send(action: Int, id: Int, x: Float, y: Float, w: Int, h: Int) = + BottomDesktop.sendTouch(action, id, InputSpace.x(x, w), InputSpace.y(y, h)) + + private fun movePointer(x: Float, y: Float) = + BottomDesktop.sendPointer(InputSpace.x(x, surfaceView.width), InputSpace.y(y, surfaceView.height)) + + private inner class TrackpadInput : PointerGestures.Listener { + override fun onMove(x: Float, y: Float) = movePointer(x, y) + + override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { + movePointer(x, y) + BottomDesktop.sendScene(SCENE_BUTTON, button, if (pressed) 1 else 0) + } + + override fun onWheel(steps: Int) = BottomDesktop.sendScene(SCENE_WHEEL, steps) + + override fun onScroll(dx: Float, dy: Float) { + val (outW, outH) = BottomDesktop.outputSizeFor(surfaceView.width, surfaceView.height) + scrollRestX += dx * outW / surfaceView.width.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL + scrollRestY += dy * outH / surfaceView.height.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL + val h = scrollRestX.toInt() + val v = scrollRestY.toInt() + if (h == 0 && v == 0) return + scrollRestX -= h + scrollRestY -= v + BottomDesktop.sendScene(SCENE_AXIS, v, h) + } + + override fun onScrollEnd() { + scrollRestX = 0f + scrollRestY = 0f + BottomDesktop.sendScene(SCENE_AXIS, 0, 0) + } + + override fun onZoom(steps: Int) { + BottomDesktop.sendKey(KEY_LEFTCTRL, true) + BottomDesktop.sendScene(SCENE_WHEEL, steps) + BottomDesktop.sendKey(KEY_LEFTCTRL, false) + } + + override fun onThreeFingerTap(): Boolean { + post { keyboardHost.toggle() } + return true + } + + override fun onLongPress() { + performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS) + } + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() + + private companion object { + const val SCENE_BUTTON = 3 + const val SCENE_WHEEL = 4 + const val SCENE_AXIS = 12 + const val KEY_LEFTCTRL = 29 + const val AXIS_UNITS_PER_PIXEL = 3f + const val TEXT_FIELD_TAP_MS = 1_000L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt new file mode 100644 index 000000000..88bd56776 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.BottomDesktop + +/** What the bottom screen shows while the desktop is not drawing: the session loading screen's throbber and a line of text. */ +@Composable +internal fun BottomDesktopStatus(state: BottomDesktop.State, onStart: () -> Unit) { + val colors = MaterialTheme.colorScheme + val starting = state == BottomDesktop.State.STARTING + Box(Modifier.fillMaxSize().background(colors.background).blockTouches(), contentAlignment = Alignment.Center) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + modifier = Modifier.padding(horizontal = 32.dp), + ) { + LogoThrobber(Modifier.width(if (starting) 96.dp else 76.dp), running = starting) + Spacer(Modifier.height(24.dp)) + Text( + stringResource(when (state) { + BottomDesktop.State.ENDED -> R.string.bottom_desktop_ended + BottomDesktop.State.FAILED -> R.string.bottom_desktop_failed + BottomDesktop.State.OFF -> R.string.bottom_desktop_off + else -> R.string.bottom_desktop_starting + }), + fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 420.dp), + ) + if (!starting) { + Spacer(Modifier.height(20.dp)) + PrimaryButton(stringResource(R.string.bottom_desktop_start), main = true, onClick = onStart) + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt new file mode 100644 index 000000000..7ad576f95 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt @@ -0,0 +1,125 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamDownload +import com.droiddeck.launcher.session.SteamDownloads +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.formatSpeed +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +internal fun downloadRate(previousDone: Long, previousAt: Long, done: Long, at: Long): Long = + if (previousDone < 0L || done <= previousDone || at <= previousAt) 0L else (done - previousDone) * 1000L / (at - previousAt) + +private const val STEAM_POLL_MS = 2_000L + +private class SteamRow(val download: SteamDownload, val rate: Long) + +@Composable +fun BottomDownloadsPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var steam by remember { mutableStateOf<List<SteamRow>>(emptyList()) } + LaunchedEffect(Unit) { + var last = emptyMap<String, Pair<Long, Long>>() + while (true) { + val now = System.currentTimeMillis() + val read = withContext(Dispatchers.IO) { + runCatching { + SteamDownloads.read(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts, SessionState.steamClientArch) + }.getOrDefault(emptyList()) + } + steam = read.map { d -> + val before = last[d.appId] + SteamRow(d, if (before == null) 0L else downloadRate(before.first, before.second, d.done, now)) + } + last = read.associate { it.appId to (it.done to now) } + delay(STEAM_POLL_MS) + } + } + val store = StoresState.downloads.filter { it.isActive } + if (steam.isEmpty() && store.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_downloads_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + LazyColumn(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(steam, key = { "steam:${it.download.appId}:${it.download.shader}" }) { row -> + val d = row.download + val detail = when { + d.shader -> stringResource(R.string.bottom_downloads_shader) + d.paused -> stringResource(R.string.bottom_downloads_paused) + d.total <= 0L -> stringResource(R.string.bottom_downloads_queued) + else -> listOf("${formatBytes(d.done)} / ${formatBytes(d.total)}", formatSpeed(row.rate)).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(d.name, stringResource(R.string.bottom_downloads_steam), detail, + if (d.total > 0L) (d.done.toFloat() / d.total).coerceIn(0f, 1f) else null) + } + items(store, key = { "store:${it.key}" }) { entry -> + val e = StoresState.download(entry.key) ?: entry + val detail = when (e.state) { + DownloadState.PAUSED -> stringResource(R.string.bottom_downloads_paused) + DownloadState.QUEUED -> stringResource(R.string.bottom_downloads_queued) + else -> listOf( + if (e.bytesTotal > 0L) "${formatBytes(e.bytesDone)} / ${formatBytes(e.bytesTotal)}" else "", + formatSpeed(e.speedBps), + ).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(e.name, e.store.label, detail, e.stageFraction.takeIf { it >= 0f }) + } + } +} + +@Composable +private fun BottomDownloadRow(name: String, source: String, detail: String, fraction: Float?) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(source, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(start = 8.dp)) + } + if (fraction != null) LinearProgressIndicator(progress = { fraction }, modifier = Modifier.fillMaxWidth(), color = pal.signal) + else LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), color = pal.signal) + if (detail.isNotEmpty()) Text(detail, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt new file mode 100644 index 000000000..266cb5a59 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.ui + +import android.content.Intent +import android.provider.Settings +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.BottomNotifications +import kotlinx.coroutines.delay + +internal fun notificationAccessIntent(context: android.content.Context): Intent = + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { + Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS).putExtra( + Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, + android.content.ComponentName(context, com.droiddeck.launcher.session.BottomNotificationListener::class.java).flattenToString(), + ) + } else Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS) + +@Composable +fun BottomNotificationsPage(openSettings: ((Intent, () -> Boolean) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var granted by remember { mutableStateOf(BottomNotifications.granted(context)) } + LaunchedEffect(Unit) { + while (true) { + granted = BottomNotifications.granted(context) + delay(2_000L) + } + } + if (!granted) { + Column(Modifier.fillMaxSize().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + Text(stringResource(R.string.bottom_notifications_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_notifications_allow), "bottom-notifications-allow") { + val intent = notificationAccessIntent(context) + if (openSettings != null) openSettings(intent) { BottomNotifications.granted(context) } + else runCatching { context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + return + } + val shown = BottomNotifications.items + if (shown.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_notifications_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + val timeFormat = remember { android.text.format.DateFormat.getTimeFormat(context) } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.bottom_notifications_count, shown.size), fontSize = 13.sp, color = colors.onSurfaceVariant, + modifier = Modifier.weight(1f)) + BottomPillButton(stringResource(R.string.bottom_notifications_clear), "bottom-notifications-clear") { BottomNotifications.clear() } + } + LazyColumn(Modifier.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shown.toList(), key = { it.key }) { n -> + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(n.app, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(timeFormat.format(java.util.Date(n.postedAt)), fontSize = 12.sp, color = colors.onSurfaceVariant) + } + if (n.title.isNotBlank()) Text(n.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + if (n.text.isNotBlank()) Text(n.text, fontSize = 14.sp, color = colors.onBackground, maxLines = 4, overflow = TextOverflow.Ellipsis) + } + } + } + } +} + +@Composable +internal fun BottomPillButton(label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.height(40.dp).clip(RoundedCornerShape(20.dp)).background(pal.signal.copy(alpha = 0.16f)) + .clickable(role = Role.Button, onClick = onClick).testTag(tag).padding(horizontal = 16.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt new file mode 100644 index 000000000..ffe71e400 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Download +import androidx.compose.material.icons.outlined.Forum +import androidx.compose.material.icons.outlined.Speed +import androidx.compose.material.icons.outlined.Notifications +import androidx.compose.material.icons.outlined.PhotoLibrary +import com.droiddeck.launcher.R + +class BottomPageActions( + val takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)? = null, + val fps: () -> Float? = { null }, + val openSettings: ((intent: android.content.Intent, done: () -> Boolean) -> Unit)? = null, + val runningGame: () -> String? = { null }, +) + +fun sessionBottomPages(actions: BottomPageActions): List<BottomPage> = listOf( + BottomPage("telemetry", R.string.bottom_page_telemetry, Icons.Outlined.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, + BottomPage("downloads", R.string.bottom_page_downloads, Icons.Outlined.Download) { BottomDownloadsPage() }, + BottomPage("notifications", R.string.bottom_page_notifications, Icons.Outlined.Notifications) { BottomNotificationsPage(actions.openSettings) }, + BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Outlined.PhotoLibrary) { BottomScreenshotsPage(actions.takeScreenshot) }, + BottomPage("chat", R.string.bottom_page_chat, Icons.Outlined.Forum) { BottomChatPage() }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt new file mode 100644 index 000000000..50f62b8cf --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenTyping.kt @@ -0,0 +1,158 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +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.runtime.staticCompositionLocalOf +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.CommitTextCommand +import androidx.compose.ui.text.input.DeleteAllCommand +import androidx.compose.ui.text.input.EditCommand +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.ImeOptions +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.PlatformTextInputService +import androidx.compose.ui.text.input.SetSelectionCommand +import androidx.compose.ui.text.input.TextFieldValue +import androidx.compose.ui.text.input.TextInputService +import androidx.compose.ui.text.input.TextInputSession +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +class TypingRequest( + initial: TextFieldValue, + val imeOptions: ImeOptions, + private val onValue: (TextFieldValue) -> Unit, + private val onImeAction: (ImeAction) -> Unit, + private val onClose: () -> Unit = {}, +) { + var value by mutableStateOf(initial) + + fun send(next: TextFieldValue) { + value = next + onValue(next) + } + + fun action() = onImeAction(imeOptions.imeAction) + + fun close() = onClose() + + companion object { + internal fun editsFor(next: TextFieldValue): List<EditCommand> = listOf( + DeleteAllCommand(), + CommitTextCommand(next.text, 1), + SetSelectionCommand(next.selection.start, next.selection.end), + ) + } +} + +internal val LocalBottomTyping = staticCompositionLocalOf { false } + +internal class BottomScreenTextInput(private val fallback: TextInputService) : PlatformTextInputService { + private var session: TextInputSession? = null + + override fun startInput( + value: TextFieldValue, imeOptions: ImeOptions, + onEditCommand: (List<EditCommand>) -> Unit, onImeActionPerformed: (ImeAction) -> Unit, + ) { + session?.let { fallback.stopInput(it) } + session = null + if (DualScreenPanel.attached) DualScreenPanel.startTyping(TypingRequest(value, imeOptions, { onEditCommand(TypingRequest.editsFor(it)) }, onImeActionPerformed)) + else session = fallback.startInput(value, imeOptions, onEditCommand, onImeActionPerformed) + } + + override fun stopInput() { + session?.let { fallback.stopInput(it) } + session = null + DualScreenPanel.stopTyping() + } + + override fun showSoftwareKeyboard() { + val active = session + if (active != null) active.showSoftwareKeyboard() else DualScreenPanel.showTyping() + } + + override fun hideSoftwareKeyboard() { + val active = session + if (active != null) active.hideSoftwareKeyboard() else DualScreenPanel.hideTyping() + } + + override fun updateState(oldValue: TextFieldValue?, newValue: TextFieldValue) { + val active = session + if (active != null) active.updateState(oldValue, newValue) else DualScreenPanel.updateTyping(newValue) + } +} + +@Composable +internal fun TypingPanel(request: TypingRequest, onDone: () -> Unit) { + val colors = MaterialTheme.colorScheme + var field by remember(request) { mutableStateOf(request.value) } + LaunchedEffect(request.value) { + if (request.value.text != field.text) field = request.value + } + val focus = remember { FocusRequester() } + val keyboard = LocalSoftwareKeyboardController.current + LaunchedEffect(request) { + kotlinx.coroutines.delay(120) + runCatching { focus.requestFocus() } + keyboard?.show() + } + val options = request.imeOptions + val secret = options.keyboardType == KeyboardType.Password || options.keyboardType == KeyboardType.NumberPassword + Column( + Modifier.fillMaxSize().background(colors.background).padding(horizontal = 20.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + ) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.dual_typing_title), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, + color = colors.onSurfaceVariant, modifier = Modifier.weight(1f)) + Button(onClick = onDone, modifier = Modifier.testTag("dual-typing-done")) { Text(stringResource(R.string.dual_typing_done)) } + } + OutlinedTextField( + value = field, + onValueChange = { next -> + field = next + request.send(next) + }, + singleLine = options.singleLine, + maxLines = if (options.singleLine) 1 else 4, + textStyle = MaterialTheme.typography.titleLarge, + visualTransformation = if (secret) PasswordVisualTransformation() else VisualTransformation.None, + keyboardOptions = KeyboardOptions( + capitalization = options.capitalization, autoCorrect = options.autoCorrect, + keyboardType = options.keyboardType, imeAction = options.imeAction, + ), + keyboardActions = KeyboardActions(onAny = { + request.action() + onDone() + }), + modifier = Modifier.fillMaxWidth().focusRequester(focus).testTag("dual-typing-field"), + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt new file mode 100644 index 000000000..e854016fb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import coil.request.ImageRequest +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.BottomScreenshots +import com.droiddeck.launcher.session.BottomShot +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +private const val SHOTS_POLL_MS = 5_000L + +@Composable +fun BottomScreenshotsPage(takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var shots by remember { mutableStateOf<List<BottomShot>>(emptyList()) } + var refresh by remember { mutableIntStateOf(0) } + var open by remember { mutableStateOf<BottomShot?>(null) } + var status by remember { mutableStateOf<Int?>(null) } + var busy by remember { mutableStateOf(false) } + LaunchedEffect(refresh) { + while (true) { + shots = withContext(Dispatchers.IO) { BottomScreenshots.list(context, LinuxRuntime.rootDir(context)) } + delay(SHOTS_POLL_MS) + } + } + LaunchedEffect(status) { + if (status != null) { + delay(3_000L) + status = null + } + } + open?.let { shot -> + Box(Modifier.fillMaxSize().clip(RoundedCornerShape(14.dp)).background(androidx.compose.ui.graphics.Color.Black) + .clickable(role = Role.Button) { open = null }.testTag("bottom-shot-full")) { + AsyncImage(ImageRequest.Builder(context).data(shot.model).build(), contentDescription = null, + contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) + } + return + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(status?.let { stringResource(it) } ?: stringResource(R.string.bottom_shots_where), fontSize = 13.sp, + color = colors.onSurfaceVariant, maxLines = 2, modifier = Modifier.weight(1f).padding(end = 8.dp)) + if (takeScreenshot != null) BottomPillButton(stringResource(R.string.bottom_shots_take), "bottom-shots-take") { + if (!busy) { + busy = true + takeScreenshot { ok -> + busy = false + status = if (ok) R.string.bottom_shots_saved else R.string.bottom_shots_failed + refresh++ + } + } + } + } + if (shots.isEmpty()) { + Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_shots_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + } else { + LazyVerticalGrid(GridCells.Adaptive(150.dp), Modifier.weight(1f).fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shots, key = { it.model.toString() }) { shot -> + AsyncImage( + ImageRequest.Builder(context).data(shot.model).size(480, 270).build(), contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(RoundedCornerShape(10.dp)) + .background(LocalPalette.current.surface).clickable(role = Role.Button) { open = shot }, + ) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt new file mode 100644 index 000000000..fc1a992ad --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -0,0 +1,400 @@ +package com.droiddeck.launcher.ui + +import android.content.res.Resources +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.clickable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.SwitchDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.hud.MangoReadings +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.input.SteamTouchConfig +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.StatsStrip +import com.droiddeck.launcher.session.Telemetry +import com.droiddeck.launcher.session.TelemetryOutput +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.net.DatagramPacket +import java.net.DatagramSocket +import java.net.HttpURLConnection +import java.net.InetSocketAddress +import java.net.SocketTimeoutException +import java.net.URL +import java.util.concurrent.atomic.AtomicReference + +private const val DRAW_MS = 66L +private const val TELEMETRY_STALE_MS = 3_000L +private const val METRICS_MS = 1_000L +private const val THUNDER_MS = 500L +private const val THUNDER_RETRY_MS = 3_000L +private const val ELITE_MS = 1_000L +private const val ELITE_SEARCH_MS = 10_000L +private const val OUTPUT_SCAN_MS = 3_000L +private const val PERF_N = 30 + +private class PortTraffic { + @Volatile var packets = 0L + @Volatile var length = 0 + @Volatile var readable = true +} + +private data class UnknownTraffic(val port: Int, val packets: Long, val length: Int) + +@Composable +fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null }) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() + var outputs by remember { mutableStateOf<List<TelemetryOutput.Game>>(emptyList()) } + var menuGames by remember { mutableStateOf<List<TelemetryOutput.MenuGame>>(emptyList()) } + var running by remember { mutableStateOf<String?>(null) } + var gameName by remember { mutableStateOf<String?>(null) } + val steamClient = remember { if (SessionState.mode == SessionService.MODE_STEAM) SessionPrefs.activeSteamClientArch(context) else null } + var outputFailed by remember { mutableStateOf<String?>(null) } + var rescan by remember { mutableIntStateOf(0) } + var auto by remember { mutableStateOf(SessionPrefs.telemetryAuto(context)) } + val latest = remember { AtomicReference<Pair<Long, Telemetry>?>(null) } + var race by remember { mutableStateOf<Telemetry?>(null) } + var fpsNow by remember { mutableStateOf<Float?>(null) } + var device by remember { mutableStateOf<HudMetrics.Snapshot?>(null) } + var thunder by remember { mutableStateOf<List<Pair<String, String>>>(emptyList()) } + var elite by remember { mutableStateOf<GameStatusFiles.Elite?>(null) } + var busyPorts by remember { mutableStateOf<Set<Int>>(emptySet()) } + val traffic = remember { GameTelemetry.PORTS.associateWith { PortTraffic() } } + var unknown by remember { mutableStateOf<List<UnknownTraffic>>(emptyList()) } + var strip by remember { mutableStateOf(StatsStrip.from(SessionPrefs.statsStrip(context))) } + var dash by remember { mutableStateOf(StatsDash.from(SessionPrefs.statsDash(context))) } + var speedUnit by remember { mutableStateOf(SpeedUnit.from(SessionPrefs.statsSpeedUnit(context))) } + val shownUnit = speedUnit.resolve(Resources.getSystem().configuration.locales[0].country) + val fpsHistory = remember { History(PERF_N) } + val cpuHistory = remember { History(PERF_N) } + val gpuHistory = remember { History(PERF_N) } + val wattsHistory = remember { History(PERF_N) } + val throttleTrace = remember { History(TRACE_N) } + val brakeTrace = remember { History(TRACE_N) } + val speedTrace = remember { History(TRACE_N) } + var perfTick by remember { mutableIntStateOf(0) } + var traceTick by remember { mutableIntStateOf(0) } + var clock by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + for (port in GameTelemetry.PORTS) launch(Dispatchers.IO) { + val socket = runCatching { + DatagramSocket(null).apply { + reuseAddress = true + soTimeout = 500 + bind(InetSocketAddress(GameTelemetry.LISTEN_ADDRESS, port)) + } + }.getOrNull() + if (socket == null) { + withContext(Dispatchers.Main) { busyPorts = busyPorts + port } + return@launch + } + val seen = traffic.getValue(port) + socket.use { + val data = ByteArray(2048) + val packet = DatagramPacket(data, data.size) + while (isActive) { + try { + packet.length = data.size + it.receive(packet) + val t = GameTelemetry.parse(port, data, packet.length) + seen.packets++ + seen.length = packet.length + seen.readable = t != null + if (t != null) latest.set(System.currentTimeMillis() to t) + } catch (_: SocketTimeoutException) { + } catch (_: java.io.IOException) { + break + } + } + } + } + while (isActive) { + val reading = latest.get() + race = reading?.takeIf { System.currentTimeMillis() - it.first < TELEMETRY_STALE_MS }?.second + race?.let { r -> + throttleTrace.add(r.throttle ?: 0f) + brakeTrace.add(r.brake ?: 0f) + speedTrace.add(r.speedKmh ?: 0f) + traceTick++ + } + fpsNow = fps() + unknown = traffic.filter { (_, t) -> t.packets > 0 && !t.readable }.map { (port, t) -> UnknownTraffic(port, t.packets, t.length) } + delay(DRAW_MS) + } + } + LaunchedEffect(Unit) { + val metrics = HudMetrics(context).apply { setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) } + while (isActive) { + device = withContext(Dispatchers.IO) { runCatching { metrics.snapshot() }.getOrNull() } + fps()?.takeIf { it > 0f }?.let { fpsHistory.add(it) } + device?.let { s -> + s.cpuPercent?.let { cpuHistory.add(it.toFloat()) } + s.gpuPercent?.let { gpuHistory.add(it.toFloat()) } + s.battery?.watts?.takeIf { it > 0f }?.let { wattsHistory.add(it) } + } + clock = java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT).format(java.util.Date()) + perfTick++ + delay(METRICS_MS) + } + } + LaunchedEffect(Unit) { + while (isActive) { + val rows = withContext(Dispatchers.IO) { runCatching { GameStatusFiles.warThunder(httpGet(GameStatusFiles.WAR_THUNDER_STATE)) }.getOrNull() } + thunder = rows.orEmpty() + delay(if (rows == null) THUNDER_RETRY_MS else THUNDER_MS) + } + } + LaunchedEffect(Unit) { + var file: File? = null + var searchedAt = 0L + while (isActive) { + val now = System.currentTimeMillis() + if (file == null && now - searchedAt > ELITE_SEARCH_MS) { + searchedAt = now + file = withContext(Dispatchers.IO) { + runCatching { GameStatusFiles.eliteStatusFile(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts) }.getOrNull() + } + } + val f = file + elite = if (f != null && now - f.lastModified() < 60_000L) { + withContext(Dispatchers.IO) { runCatching { GameStatusFiles.elite(f.readText()) }.getOrNull() } + } else null + delay(ELITE_MS) + } + } + LaunchedEffect(Unit) { + menuGames = withContext(Dispatchers.IO) { + runCatching { Library.steamGames(context).mapNotNull { TelemetryOutput.MENU_GAMES[it.appId] }.distinct() }.getOrDefault(emptyList()) + } + } + LaunchedEffect(running) { + val id = running?.toLongOrNull() + gameName = if (id == null) null + else withContext(Dispatchers.IO) { runCatching { SteamTouchConfig.gameName(context, id.toInt()) }.getOrNull() } + } + LaunchedEffect(rescan) { + while (isActive) { + outputs = withContext(Dispatchers.IO) { runCatching { TelemetryOutput.scan(Library.compatdataDirs(context)) }.getOrDefault(emptyList()) } + running = runningGame() + delay(OUTPUT_SCAN_MS) + } + } + + Column(Modifier.fillMaxSize().verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(10.dp)) { + perfTick.let { + StatsStripView(strip, StripData(fpsNow, device, fpsHistory.snapshot(), cpuHistory.snapshot(), gpuHistory.snapshot(), wattsHistory.snapshot(), clock, + if (running != null) gameName else steamClient?.let { stringResource(steamClientLabel(it)) })) { + strip = strip.next() + SessionPrefs.setStatsStrip(context, strip.id) + } + } + race?.let { r -> + val shown = dash.resolve(r.source) + traceTick.let { + RaceDashView(shown, r, TraceData(throttleTrace.snapshot(), brakeTrace.snapshot(), speedTrace.snapshot()), shownUnit) { + dash = StatsDash.tapped(shown) + SessionPrefs.setStatsDash(context, dash.id) + } + } + } + if (thunder.isNotEmpty()) { + if (FlightLabels.drawable(thunder)) FlightDash(thunder) + else TelemetryCard(stringResource(R.string.bottom_telemetry_war_thunder)) { ValueGrid(thunder.take(GameStatusFiles.WAR_THUNDER_ROWS)) } + } + elite?.let { e -> + if (e.pips != null || e.fuelMain != null) ShipDash(e) + else TelemetryCard(stringResource(R.string.bottom_telemetry_elite)) { + ValueGrid(listOfNotNull( + e.fuelMain?.let { stringResource(R.string.bottom_telemetry_fuel) to "%.1f t".format(it) }, + e.cargo?.let { stringResource(R.string.bottom_telemetry_cargo) to "%.0f t".format(it) }, + e.pips?.takeIf { it.size == 3 }?.let { p -> + stringResource(R.string.bottom_telemetry_pips) to p.joinToString(" · ") { "%.1f".format(it / 2f) } + }, + e.legal?.let { stringResource(R.string.bottom_telemetry_legal) to it }, + e.balance?.let { stringResource(R.string.bottom_telemetry_balance) to "%,d CR".format(it) }, + )) + } + } + if (race == null && thunder.isEmpty() && elite == null) { + Text(stringResource(R.string.bottom_telemetry_help), + fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) + } + if (outputs.isNotEmpty() || menuGames.isNotEmpty()) TelemetryCard(stringResource(R.string.bottom_telemetry_send_title)) { + if (outputs.isNotEmpty()) SwitchRow(stringResource(R.string.bottom_telemetry_send_auto), stringResource(R.string.bottom_telemetry_send_auto_hint), auto, true) { want -> + scope.launch { + withContext(Dispatchers.IO) { + SessionPrefs.setTelemetryAuto(context, want) + if (want) TelemetryOutput.applyAutomatic(context, running) + else TelemetryOutput.restoreTargets(outputs, running).forEach { TelemetryOutput.set(it, false) } + } + auto = want + rescan++ + } + } + for (game in outputs) { + val locked = TelemetryOutput.isRunning(game.prefixId, running) + val hint = if (locked) stringResource(R.string.bottom_telemetry_send_close, game.name) else null + SwitchRow(game.name, hint, game.on, !locked) { want -> + scope.launch { + val ok = withContext(Dispatchers.IO) { + val key = TelemetryOutput.key(game) + val off = SessionPrefs.telemetryOff(context) + SessionPrefs.setTelemetryOff(context, if (want) off - key else off + key) + TelemetryOutput.set(game, want) + } + outputFailed = if (ok) null else game.name + rescan++ + } + } + } + for (game in menuGames) { + Text(stringResource(R.string.bottom_telemetry_send_menu, game.name, game.setting, game.port), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + if (outputs.isNotEmpty()) Text(stringResource(R.string.bottom_telemetry_send_note), fontSize = 12.sp, color = colors.onSurfaceVariant) + outputFailed?.let { Text(stringResource(R.string.bottom_telemetry_send_failed, it), fontSize = 12.sp, color = colors.error) } + } + for (u in unknown) { + Text(stringResource(R.string.bottom_telemetry_unknown_format, u.port, u.packets, u.length), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + if (busyPorts.isNotEmpty()) { + Text(stringResource(R.string.bottom_telemetry_port_busy, busyPorts.sorted().joinToString()), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + ChoiceRow(stringResource(R.string.stats_speed_units), + if (speedUnit == SpeedUnit.AUTO) stringResource(R.string.stats_speed_units_auto, shownUnit.label) else speedUnit.label) { + speedUnit = speedUnit.next() + SessionPrefs.setStatsSpeedUnit(context, speedUnit.id) + } + Text(stringResource(R.string.stats_tap_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) + } +} + +private fun httpGet(url: String): String { + val c = URL(url).openConnection() as HttpURLConnection + c.connectTimeout = 300 + c.readTimeout = 500 + return try { + c.inputStream.bufferedReader().use { it.readText() } + } finally { + c.disconnect() + } +} + + +internal fun steamClientLabel(arch: String): Int = if (arch == "x86_64") R.string.stats_steam_client_x86 else R.string.stats_steam_client_arm + +@Composable +private fun ChoiceRow(title: String, value: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().clickable(role = Role.Button, onClick = onClick).padding(horizontal = 4.dp, vertical = 6.dp), + verticalAlignment = Alignment.CenterVertically) { + Text(title, fontSize = 15.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = LocalPalette.current.primary) + } +} + +@Composable +private fun SwitchRow(title: String, hint: String?, checked: Boolean, enabled: Boolean, onChange: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + Row( + Modifier.fillMaxWidth().toggleable(checked, enabled = enabled, role = Role.Switch, onValueChange = onChange).padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f).padding(end = 12.dp)) { + Text(title, fontSize = 15.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (hint != null) Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant) + } + val pal = LocalPalette.current + Switch(checked, null, enabled = enabled, colors = SwitchDefaults.colors( + disabledCheckedTrackColor = pal.primary.copy(alpha = 0.45f), + disabledCheckedThumbColor = colors.background, + disabledCheckedBorderColor = pal.primary.copy(alpha = 0.45f), + )) + } +} + + +@Composable +private fun TelemetryCard(title: String, content: @Composable () -> Unit) { + val pal = LocalPalette.current + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(title, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = pal.signal) + content() + } +} + +@Composable +private fun ValueGrid(rows: List<Pair<String, String>>) { + val colors = MaterialTheme.colorScheme + rows.chunked(2).forEach { pair -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + pair.forEach { (k, v) -> + Row(Modifier.weight(1f)) { + Text(k, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(v, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + } + } + if (pair.size == 1) Box(Modifier.weight(1f)) + } + } +} + +internal fun lapTime(seconds: Float): String { + val total = kotlin.math.round(seconds * 1000.0).toLong() + return "%d:%02d.%03d".format(total / 60_000, total / 1000 % 60, total % 1000) +} + + + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt new file mode 100644 index 000000000..648d754aa --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -0,0 +1,112 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Typeface +import android.os.Bundle +import android.text.TextPaint +import android.text.TextUtils +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.QuestXrActivity + +object BuildWatermark { + private const val TITLE_LIMIT = 80 + + fun lines( + pr: Int = BuildConfig.PR_NUMBER, + ci: Boolean = BuildConfig.CI_BUILD, + commit: String = BuildConfig.SOURCE_COMMIT, + title: String = BuildConfig.PR_TITLE, + branch: String = BuildConfig.BUILD_BRANCH, + ): List<String>? { + if (ci && pr <= 0) return null + val hash = commit.take(7).ifEmpty { "unknown" } + val head = if (pr > 0) "PR-$pr | $hash" else "LOCAL | $hash" + val detail = (if (pr > 0) title else branch).trim() + return if (detail.isEmpty()) listOf(head) else listOf(head, truncate(detail)) + } + + private fun truncate(text: String) = + if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" + + fun install(app: Application) { + val lines = lines() ?: return + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag<View>(TAG) != null) return + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, lines).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private const val TAG = "build-watermark" + + private class MarkView(context: Context, private val lines: List<String>) : View(context) { + private var shown = lines + private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply { + color = 0xE6FFFFFF.toInt() + typeface = Typeface.MONOSPACE + textSize = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, 9f, context.resources.displayMetrics, + ) + setShadowLayer(1.5f * context.resources.displayMetrics.density, 0f, 0f, 0xFF000000.toInt()) + textAlign = Paint.Align.RIGHT + } + private val backdrop = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0x66303030 } + private val lineHeight get() = paint.fontSpacing + + init { + isClickable = false + isFocusable = false + importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO + setLayerType(LAYER_TYPE_SOFTWARE, null) + } + + override fun onMeasure(widthSpec: Int, heightSpec: Int) { + val pad = paddingForShadow() * 2 + val limit = if (MeasureSpec.getMode(widthSpec) == MeasureSpec.UNSPECIFIED) Float.MAX_VALUE + else (MeasureSpec.getSize(widthSpec) - pad).coerceAtLeast(0).toFloat() + shown = lines.map { TextUtils.ellipsize(it, paint, limit, TextUtils.TruncateAt.END).toString() } + val width = shown.maxOf { paint.measureText(it) }.toInt() + pad + setMeasuredDimension(width, (lineHeight * shown.size).toInt() + pad) + } + + override fun onDraw(canvas: Canvas) { + val pad = paddingForShadow() + val radius = 3f * resources.displayMetrics.density + canvas.drawRoundRect(0f, 0f, width.toFloat(), height.toFloat(), radius, radius, backdrop) + shown.forEachIndexed { i, line -> + canvas.drawText(line, width - pad.toFloat(), pad - paint.ascent() + lineHeight * i, paint) + } + } + + override fun onTouchEvent(event: android.view.MotionEvent) = false + + private fun paddingForShadow() = (3 * resources.displayMetrics.density).toInt() + } +} 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 000000000..2a50f3c35 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt @@ -0,0 +1,160 @@ +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 androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.Constraints +import androidx.compose.ui.layout.layout +import kotlinx.coroutines.delay +import androidx.compose.runtime.setValue +import androidx.compose.runtime.getValue + +internal val LocalDetailFloor = compositionLocalOf<() -> Float> { { Float.MAX_VALUE } } + +internal class DetailInset(val horizontal: Dp, val top: Dp) +internal val LocalDetailInset = compositionLocalOf { DetailInset(0.dp, 0.dp) } + +private fun Modifier.bleed(horizontal: Dp, top: Dp): Modifier = + if (horizontal == 0.dp && top == 0.dp) this else layout { measurable, constraints -> + val h = horizontal.roundToPx() + val t = top.roundToPx() + val placeable = measurable.measure( + Constraints.fixed(constraints.maxWidth + h * 2, if (constraints.hasBoundedHeight) constraints.maxHeight + t else constraints.minHeight), + ) + layout(constraints.maxWidth, placeable.height - t) { placeable.place(-h, -t) } + } + +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) +@Composable +internal fun CardDetailHost( + open: String?, + detailScroll: ScrollState, + gridScrolled: () -> Boolean, + onDetailFocus: (Boolean) -> Unit, + modifier: Modifier = Modifier, + bleedHorizontal: Dp = 0.dp, + bleedTop: Dp = 0.dp, + 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.bleed(bleedHorizontal, bleedTop).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().padding(horizontal = bleedHorizontal).padding(top = bleedTop) + .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(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, LocalDetailInset provides DetailInset(bleedHorizontal, bleedTop + 4.dp)) { 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 000000000..ade8c967f --- /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/ColorPickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt index e94f193e9..d8b3c61a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -42,7 +43,6 @@ import kotlin.math.atan2 import kotlin.math.hypot import kotlin.math.min -/** A small colour square; pressing it opens the colour picker. */ @Composable internal fun ColorCube(color: Color, description: String, focus: FocusRequester? = null, onClick: () -> Unit) { val pal = LocalPalette.current @@ -58,7 +58,6 @@ internal fun ColorCube(color: Color, description: String, focus: FocusRequester? ) } -/** Colour wheel (touch), hue / saturation / brightness sliders (controller and touch) and a hex box for one colour. */ @Composable internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Unit, onApply: (Int) -> Unit) { val shown = rememberShown(onDismiss) @@ -70,12 +69,15 @@ internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Uni var hexText by remember { mutableStateOf(ThemeColors.hex(initial)) } val current = ThemeColors.fromHsv(hue, sat, value) val first = remember { FocusRequester() } + val scroll = rememberScrollState() + var typingHex by remember { mutableStateOf(false) } LaunchedEffect(Unit) { focusSoon { first } } + LaunchedEffect(typingHex, scroll.maxValue) { if (typingHex) scroll.animateScrollTo(scroll.maxValue) } fun picked(h: Float = hue, s: Float = sat, v: Float = value) { hue = h.coerceIn(0f, 360f); sat = s.coerceIn(0f, 1f); value = v.coerceIn(0f, 1f) hexText = ThemeColors.hex(ThemeColors.fromHsv(hue, sat, value)) } - AppDialog(shown, close, "colorPicker", wide = false, maxWidth = 460.dp) { + AppDialog(shown, close, "colorPicker", wide = false, maxWidth = 460.dp, scrollState = scroll) { DialogTitleRow(title, close) Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { ColorWheel(hue, sat, value) { h, s -> picked(h = h, s = s) } @@ -95,6 +97,7 @@ internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Uni ThemeColors.parseHex(text)?.let { argb -> ThemeColors.toHsv(argb).let { hsv -> hue = hsv.h; sat = hsv.s; value = hsv.v } } }, label = "", keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Done, placeholder = stringResource(R.string.theme_color_hex), + onFocusChange = { typingHex = it }, onDone = { ThemeColors.parseHex(hexText)?.let { onApply(it); close() } }, ) Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { @@ -112,7 +115,6 @@ private fun Swatch(color: Color) { Box(Modifier.size(48.dp).clip(shape).background(color).border(1.dp, LocalPalette.current.line2, shape)) } -/** Hue around the circle and saturation out from the middle, at full brightness; brightness has its own slider. */ @Composable private fun ColorWheel(hue: Float, sat: Float, value: Float, onPick: (hue: Float, sat: Float) -> Unit) { val rim = MaterialTheme.colorScheme.onBackground 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 0e99b6e71..a28326a4b 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 @@ -699,7 +699,7 @@ fun ComponentsPage( Box(Modifier.fillMaxSize().onGloballyPositioned { pageAt = it.positionInRoot() }.onFocusChanged { pageFocused = it.hasFocus }) { Column( - Modifier.fillMaxSize().padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp) + Modifier.fillMaxSize().padding(horizontal = if (narrow) 16.dp else 22.dp).padding(top = if (narrow) 12.dp else 18.dp) .then(if (selectedGame == null) Modifier.bumpers( onPrevious = { pick(layerStep(layer, -1)) }, onNext = { pick(layerStep(layer, 1)) }, @@ -930,7 +930,6 @@ private fun availableFor(l: String, catalog: List<CatalogItem>, snapshot: Snapsh return catalog.filter { it.comp == l && ComponentsManager.safeName(it.file) !in stored } } -// The rows to show: each stable row carries its paired nightly (if any), and a paired nightly has no row of its own. private fun availableRows(l: String, catalog: List<CatalogItem>, snapshot: Snapshot?): List<Pair<CatalogItem, CatalogItem?>> { val available = availableFor(l, catalog, snapshot) val pairs = ComponentsManager.nightlyPairs(available) @@ -972,7 +971,7 @@ private fun Stack( onFocus = { onFocus(l) }, onClick = { onOpen(l) }, ) } - Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(3.dp)) { + Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = 16.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) { StackHeading(stringResource(R.string.comp_this_device)) card(GPU_TAB) Spacer(Modifier.height(6.dp)) @@ -1456,7 +1455,6 @@ private fun GetLine( Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } -// Stable | Nightly in the same box as SmallButton: one focus stop, A (or a tap) flips it. @Composable private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt index ff39fb00f..0fab26798 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt @@ -93,6 +93,9 @@ fun ControllerMappingPage(mapping: Map<String, String>, onPick: (String, String) lede = stringResource(R.string.ctrl_mapping_lede), onBack = onBack, ) { + SettingsGroup(stringResource(R.string.shortcuts_title)) { + PhysicalShortcutRows() + } SettingsGroup(stringResource(R.string.ctrl_onscreen_buttons)) { val targets = ControllerPrefs.targets.map { (id, label) -> id to stringResource(label) } for ((id, name) in ControllerPrefs.mappable) { 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 0a603d5a5..45862d8ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -37,10 +37,13 @@ class DeckControlsPanel( private val onSteamMenu: () -> Unit, private val onQam: () -> Unit, private val pad: PadBridge? = null, + private val portraitDock: Boolean = false, + private val onMenu: (() -> Unit)? = null, ) : 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 content = FrameLayout(context) + val deckControls = pad == null || SessionState.deckPad private val tabViews = HashMap<Tab, TextView>() private val topBar: View by lazy { topBar() } @@ -49,7 +52,7 @@ class DeckControlsPanel( setBackgroundColor(Color.BLACK) addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(64))) addView(content, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) - select(if (pad != null) selectedWithPad else selected) + select(if (pad != null && !deckControls) Tab.GAMEPAD else if (pad != null) selectedWithPad else selected) } override fun onDetachedFromWindow() { @@ -67,6 +70,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) @@ -87,6 +91,10 @@ class DeckControlsPanel( addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44))) } addView(centre, LayoutParams(0, LayoutParams.MATCH_PARENT, 1f)) + onMenu?.let { + addView(menuButton(context, it)) + addView(space(dp(8))) + } if (SessionState.mode == SessionService.MODE_STEAM) { addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) addView(space(dp(8))) @@ -170,7 +178,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) @@ -186,14 +194,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 @@ -206,6 +222,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() @@ -233,39 +254,32 @@ class DeckControlsPanel( show() } - private fun roundButton(label: String, description: String, onClick: () -> Unit, wide: Boolean = false) = - TextView(context).apply { - text = label - contentDescription = description - textSize = if (wide) 13f else 20f - typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) - letterSpacing = if (wide) 0.08f else 0f - gravity = Gravity.CENTER - setTextColor(TEXT) - background = outline(CORNER_PILL, SURFACE) - setPadding(if (wide) dp(16) else 0, 0, if (wide) dp(16) else 0, 0) - minWidth = dp(44) - layoutParams = LayoutParams(if (wide) LayoutParams.WRAP_CONTENT else dp(44), dp(44)) - setOnClickListener { - performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) - onClick() - } + fun takesTouchAt(x: Float, y: Float): Boolean = controlUnder(this, x, y) + + private fun controlUnder(view: View, x: Float, y: Float): Boolean { + if (view.visibility != VISIBLE || x < 0f || y < 0f || x >= view.width || y >= view.height) return false + if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad || view is FaceButtons) return true + val group = view as? ViewGroup ?: return false + return (group.childCount - 1 downTo 0).any { i -> + val child = group.getChildAt(i) + controlUnder(child, x + group.scrollX - child.x, y + group.scrollY - child.y) } + } + + private fun roundButton(label: String, description: String, onClick: () -> Unit, wide: Boolean = false) = + roundButton(context, label, description, onClick, wide) private fun space(width: Int) = View(context).apply { layoutParams = LayoutParams(width, 1) } - private fun outline(radius: Float, fill: Int) = GradientDrawable().apply { - cornerRadius = radius * resources.displayMetrics.density - setColor(fill) - setStroke(dp(1), LINE) - } + private fun outline(radius: Float, fill: Int) = outline(context, radius, fill) private fun filled(radius: Float, fill: Int) = GradientDrawable().apply { cornerRadius = radius * resources.displayMetrics.density setColor(fill) } - private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() + private fun dp(value: Int): Int = dp(context, value) + private abstract class Surface(context: Context) : View(context) { protected val density = resources.displayMetrics.density @@ -617,7 +631,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) { @@ -625,7 +639,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) @@ -670,5 +684,50 @@ class DeckControlsPanel( private val TEXT = Color.rgb(0xF2, 0xF4, 0xF7) private val TEXT_DIM = Color.rgb(0x7A, 0x80, 0x8A) private val KNOB = Color.rgb(0x2A, 0x2D, 0x33) + + internal fun dp(context: Context, value: Int): Int = (value * context.resources.displayMetrics.density + 0.5f).toInt() + + internal fun outline(context: Context, radius: Float, fill: Int) = GradientDrawable().apply { + cornerRadius = radius * context.resources.displayMetrics.density + setColor(fill) + setStroke(dp(context, 1), LINE) + } + + internal fun roundButton(context: Context, label: String, description: String, onClick: () -> Unit, wide: Boolean = false) = + TextView(context).apply { + text = label + contentDescription = description + textSize = if (wide) 13f else 20f + typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) + letterSpacing = if (wide) 0.08f else 0f + gravity = Gravity.CENTER + setTextColor(TEXT) + background = outline(context, CORNER_PILL, SURFACE) + setPadding(if (wide) dp(context, 16) else 0, 0, if (wide) dp(context, 16) else 0, 0) + minWidth = dp(context, 44) + layoutParams = LinearLayout.LayoutParams(if (wide) LinearLayout.LayoutParams.WRAP_CONTENT else dp(context, 44), dp(context, 44)) + setOnClickListener { + performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) + onClick() + } + } + + internal fun menuButton(context: Context, onClick: () -> Unit) = + iconButton(context, R.drawable.ic_stat_session, context.getString(R.string.touch_droiddeck_menu), onClick) + + internal fun iconButton(context: Context, icon: Int, description: String, onClick: () -> Unit) = android.widget.ImageView(context).apply { + setImageResource(icon) + setColorFilter(TEXT) + contentDescription = description + scaleType = android.widget.ImageView.ScaleType.CENTER_INSIDE + val pad = dp(context, 11) + setPadding(pad, pad, pad, pad) + background = outline(context, CORNER_PILL, SURFACE) + layoutParams = LinearLayout.LayoutParams(dp(context, 44), dp(context, 44)) + setOnClickListener { + performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) + onClick() + } + } } } 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 f6ce824ea..28768454c 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>, @@ -168,7 +174,7 @@ private fun DesktopDock( val pal = LocalPalette.current val narrow = LocalNarrowPane.current val available = s.emulators.filter { !it.installed } - val flatpaks = com.droiddeck.launcher.store.StoreState.installed + val flatpaks = com.droiddeck.launcher.store.StoreState.installed.filter { f -> apps.none { it.key == "flatpak:${f.id}" } } val keys = installed.map { "emu:${it.id}" } + apps.map { "user:${it.key}" } + flatpaks.map { "flatpak:${it.id}" } var lastAt by remember { mutableStateOf<Rect?>(null) } var dockAt by remember { mutableStateOf<Rect?>(null) } @@ -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 2a22c0a15..067ff06ec 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/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt new file mode 100644 index 000000000..821fc9af2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -0,0 +1,132 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.DroidDeckHudSize + +@Composable +internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { + val cfg = a.hudConfig + fun on(key: String) = cfg[key] == "1" + fun int(key: String, fallback: Int) = cfg[key]?.toIntOrNull() ?: fallback + + SettingsGroup(stringResource(R.string.drawer_hud)) { + ToggleRow(host, "hud", stringResource(R.string.drawer_hud), null, a.hudOn, chipModifier = track("hud"), onChange = a.onHud) + if (!a.hudOn) return@SettingsGroup + val size = DroidDeckHudSize.from(cfg["hudSize"]) + ChoiceRow(host, "hud-size", stringResource(R.string.hud_size), stringResource(R.string.hud_size_hint), + listOf( + DroidDeckHudSize.FULL to stringResource(R.string.hud_size_full), + DroidDeckHudSize.TILES to stringResource(R.string.hud_size_tiles), + DroidDeckHudSize.PILL to stringResource(R.string.hud_size_pill), + DroidDeckHudSize.MINIMAL to stringResource(R.string.hud_size_minimal), + DroidDeckHudSize.MEGA to stringResource(R.string.hud_size_mega), + DroidDeckHudSize.STRIP to stringResource(R.string.hud_size_strip), + ), + size, chipModifier = track("hud-size")) { a.onHudSetting("hudSize", it.token) } + ToggleRow(host, "hud-locked", stringResource(R.string.hud_locked), stringResource(R.string.hud_locked_hint), on("hudLocked"), + chipModifier = track("hud-locked")) { a.onHudSetting("hudLocked", flag(it)) } + ToggleRow(host, "hud-snap", stringResource(R.string.hud_snap), stringResource(R.string.hud_snap_hint), on("hudSnap"), + chipModifier = track("hud-snap")) { a.onHudSetting("hudSnap", flag(it)) } + } + if (!a.hudOn) return + + SettingsGroup(stringResource(R.string.hud_group_look)) { + SliderRow(stringResource(R.string.hud_scale), null, int("hudScale", 100), 50..150, step = 5, format = { "$it%" }, + modifier = track("hud-scale")) { a.onHudSetting("hudScale", it.toString()) } + SliderRow(stringResource(R.string.drawer_hud_opacity), null, int("hudOpacity", 80), 0..100, step = 5, format = { "$it%" }, + modifier = track("hud-opacity")) { a.onHudSetting("hudOpacity", it.toString()) } + ChoiceRow(host, "hud-color", stringResource(R.string.drawer_hud_color), null, + listOf("soft" to stringResource(R.string.hud_color_soft), "mid" to stringResource(R.string.hud_color_mid), + "vivid" to stringResource(R.string.hud_color_vivid)), + cfg["hudColor"] ?: "mid", chipModifier = track("hud-color")) { a.onHudSetting("hudColor", it) } + SliderRow(stringResource(R.string.hud_outline), null, int("hudOutline", 40), 0..100, step = 10, + modifier = track("hud-outline")) { a.onHudSetting("hudOutline", it.toString()) } + ChoiceRow(host, "hud-outline-color", stringResource(R.string.hud_outline_color), null, + listOf("0" to stringResource(R.string.hud_outline_gray), "1" to stringResource(R.string.hud_outline_theme)), + if (cfg["hudOutlineAccent"] == "0") "0" else "1", chipModifier = track("hud-outline-color")) { a.onHudSetting("hudOutlineAccent", it) } + } + + val size = DroidDeckHudSize.from(cfg["hudSize"]) + val chips = size.supportedChips() + EXTRA[size].orEmpty() + SettingsGroup(stringResource(R.string.hud_group_metrics)) { + for (metric in METRICS) { + if (metric.chip !in chips || metric.chip in HIDDEN[size].orEmpty()) continue + ToggleRow(host, "hud-${metric.key}", stringResource(metric.label), null, on(metric.key), + chipModifier = track("hud-${metric.key}")) { a.onHudSetting(metric.key, flag(it)) } + } + } + + val tempsShown = ("Temp" in chips && on("showTemp")) || ("GPU temp" in chips && on("showGpuTemp")) + if (tempsShown) SettingsGroup(stringResource(R.string.hud_group_temps)) { + ChoiceRow(host, "hud-temp-unit", stringResource(R.string.hud_temp_unit), null, + listOf("c" to "°C", "f" to "°F"), if (cfg["tempUnit"].equals("f", true)) "f" else "c", + chipModifier = track("hud-temp-unit")) { a.onHudSetting("tempUnit", it) } + val bands = when { + cfg["tempBands"] == "0" -> "0" + cfg["tempAuto"] == "0" -> "2" + else -> "1" + } + ChoiceRow(host, "hud-temp-bands", stringResource(R.string.hud_temp_bands), stringResource(R.string.hud_temp_bands_hint), + listOf("0" to stringResource(R.string.hud_temp_bands_off), "1" to stringResource(R.string.hud_temp_bands_auto), + "2" to stringResource(R.string.hud_temp_bands_manual)), + bands, chipModifier = track("hud-temp-bands")) { + a.onHudSetting("tempBands", if (it == "0") "0" else "1") + a.onHudSetting("tempAuto", if (it == "2") "0" else "1") + } + if (bands == "2") { + SliderRow(stringResource(R.string.hud_temp_red_cpu), null, int("tempRedCpu", 90), 50..110, format = { "$it°C" }, + modifier = track("hud-red-cpu")) { a.onHudSetting("tempRedCpu", it.toString()) } + SliderRow(stringResource(R.string.hud_temp_red_gpu), null, int("tempRedGpu", 90), 50..110, format = { "$it°C" }, + modifier = track("hud-red-gpu")) { a.onHudSetting("tempRedGpu", it.toString()) } + SliderRow(stringResource(R.string.hud_temp_red_battery), null, int("tempRedBat", 48), 35..60, format = { "$it°C" }, + modifier = track("hud-red-battery")) { a.onHudSetting("tempRedBat", it.toString()) } + } + } + + SettingsGroup(stringResource(R.string.hud_group_more)) { + ActionRow(stringResource(R.string.hud_export), stringResource(R.string.hud_export_hint), + stringResource(R.string.hud_export_button), onClick = a.onHudExport, modifier = track("hud-export")) + ActionRow(stringResource(R.string.hud_reset), null, stringResource(R.string.hud_reset_button), + onClick = a.onHudReset, modifier = track("hud-reset")) + } +} + +private fun flag(on: Boolean) = if (on) "1" else "0" + +private val EXTRA = mapOf(DroidDeckHudSize.PILL to setOf("Temp", "Power")) + +private class HudMetric(val chip: String, val key: String, val label: Int) + +private val METRICS = listOf( + HudMetric("FPS", "showFPS", R.string.drawer_hud_fps), + HudMetric("FPS graph", "showFPSGraph", R.string.hud_metric_graph), + HudMetric("FPS .1", "fpsDecimal", R.string.hud_metric_decimal), + HudMetric("0.01% low", "showLow001", R.string.hud_metric_low001), + HudMetric("Engine", "showEngine", R.string.hud_metric_engine), + HudMetric("GPU model", "showGpuModel", R.string.hud_metric_gpu_model), + HudMetric("GPU", "showGPULoad", R.string.hud_metric_gpu), + HudMetric("GPU temp", "showGpuTemp", R.string.hud_metric_gpu_temp), + HudMetric("CPU", "showCPUUsage", R.string.hud_metric_cpu), + HudMetric("Per-core", "showPerCore", R.string.hud_metric_per_core), + HudMetric("Temp", "showTemp", R.string.hud_metric_temp), + HudMetric("RAM", "showRAM", R.string.hud_metric_ram), + HudMetric("VRAM", "showVram", R.string.hud_metric_vram), + HudMetric("Swap", "showSwap", R.string.hud_metric_swap), + HudMetric("Battery", "showBattery", R.string.hud_metric_battery), + HudMetric("Power", "showPower", R.string.hud_metric_power), + HudMetric("Network", "showNet", R.string.hud_metric_network), + HudMetric("Resolution", "showResolution", R.string.hud_metric_resolution), + HudMetric("Proton", "showProton", R.string.hud_metric_proton), + HudMetric("Session", "showSession", R.string.hud_metric_session), + HudMetric("Clock", "showClock", R.string.hud_metric_clock), +) + +private val HIDDEN = mapOf( + DroidDeckHudSize.PILL to setOf("FPS", "FPS graph"), + DroidDeckHudSize.MINIMAL to setOf("FPS"), + DroidDeckHudSize.TILES to setOf("FPS graph", "0.01% low"), + DroidDeckHudSize.STRIP to setOf("FPS"), +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt new file mode 100644 index 000000000..7d3230f93 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -0,0 +1,418 @@ +package com.droiddeck.launcher.ui + +import android.app.ActivityOptions +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +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.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.TextFieldValue +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +class DualPanelModel( + val keys: List<String>, + val selected: String, + val badges: Set<String>, + val storeDownloads: Int, + val running: String?, + val theme: String, + val appScale: Int, + val onSelect: (String) -> Unit, + val onResume: () -> Unit, +) + +object DualScreenPanel { + var model by mutableStateOf<DualPanelModel?>(null) + private var displayId = -1 + private var presentation: DualScreenPresentation? = null + set(value) { field = value; available = value != null || activity != null || launching } + private var activity: DualScreenActivity? = null + set(value) { field = value; available = value != null || presentation != null || launching } + private var launching = false + set(value) { field = value; available = value || activity != null || presentation != null } + private var ownerTask = -1 + private var ownerYielded = false + private var ownerPaused = false + + var typing by mutableStateOf<TypingRequest?>(null) + private set + var typingShown by mutableStateOf(false) + private set + + val shownOn: Int get() = if (presentation != null || activity != null || launching) displayId else -1 + val attached: Boolean get() = presentation != null || activity != null + var available by mutableStateOf(false) + private set + + fun startTyping(request: TypingRequest) { + typing = request + typingShown = true + } + + fun stopTyping() { + typing = null + typingShown = false + } + + fun stopTyping(request: TypingRequest) { + if (typing === request) stopTyping() + } + + fun showTyping() { + if (typing != null) typingShown = true + } + + fun finishTyping() { + val request = typing + hideTyping() + request?.close() + } + + fun hideTyping() { + typingShown = false + } + + fun updateTyping(value: TextFieldValue) { + val request = typing ?: return + if (request.value != value) request.value = value + } + + fun show(context: Context, display: Int, task: Int) { + if (shownOn == display) { ownerTask = task; return } + hide() + displayId = display + ownerTask = task + ownerYielded = false + ownerPaused = false + launching = true + val host = context as? ComponentActivity + val target = host?.getSystemService(Context.DISPLAY_SERVICE) + ?.let { (it as android.hardware.display.DisplayManager).getDisplay(display) } + if (host != null && target != null) { + val shown = runCatching { DualScreenPresentation(host, target).also { it.show() } } + if (shown.isSuccess) { + presentation = shown.getOrThrow() + launching = false + return + } + android.util.Log.w("DualScreenPanel", "bottom panel presentation failed; falling back to an activity", shown.exceptionOrNull()) + } + val intent = Intent(context, DualScreenActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) + runCatching { + context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle()) + }.onFailure { launching = false; displayId = -1 } + } + + fun hide() { + stopTyping() + launching = false + displayId = -1 + presentation?.dismiss() + presentation = null + activity?.finishAndRemoveTask() + activity = null + } + + fun hide(task: Int) { + if (ownerTask == task || ownerTask < 0) hide() + } + + internal fun attach(host: DualScreenActivity): Boolean { + if (!launching && activity == null) return false + presentation?.dismiss() + presentation = null + if (activity !== host) activity?.finishAndRemoveTask() + activity = host + launching = false + return true + } + + fun yieldTo(task: Int, app: Boolean) { + if (ownerTask == task) ownerYielded = app + } + + fun opensOutside(own: String, target: String?): Boolean = target != null && target != own + + fun ownerPaused(task: Int, paused: Boolean) { + if (ownerTask == task) ownerPaused = paused + } + + internal fun focusTask(fromPanel: Boolean): Int? { + if (ownerYielded || (ownerPaused && !fromPanel)) return null + return ownerTask.takeIf { it >= 0 } + } + + internal fun returnFocus(context: Context, fromPanel: Boolean = false) { + val task = focusTask(fromPanel) ?: return + runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(task, 0) } + } + + internal fun reclaimFocus(context: Context) { + val task = focusTask(true) ?: return + val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager + runCatching { + manager.appTasks.firstOrNull { + @Suppress("DEPRECATION") + it.taskInfo?.let { info -> if (android.os.Build.VERSION.SDK_INT >= 29) info.taskId else info.persistentId } == task + }?.moveToFront() ?: manager.moveTaskToFront(task, 0) + } + } + + internal fun detach(host: DualScreenActivity) { + if (activity === host) { + activity = null + displayId = -1 + } + } + + internal fun detach(host: DualScreenPresentation) { + if (presentation === host) { + presentation = null + displayId = -1 + } + } +} + +class DualScreenActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (!DualScreenPanel.attach(this)) { + finishAndRemoveTask() + return + } + onBackPressedDispatcher.addCallback(this, object : androidx.activity.OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + if (DualScreenPanel.typingShown) DualScreenPanel.finishTyping() + } + }) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + applyImmersiveMode() + setContent { + val model = DualScreenPanel.model + val request = DualScreenPanel.typing + val typingOn = request != null && DualScreenPanel.typingShown + LaunchedEffect(typingOn) { acceptFocus(typingOn) } + DroidDeckTheme(model?.theme, appScale = model?.appScale ?: com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { + if (request != null && typingOn) TypingPanel(request) { if (DualScreenPanel.typing === request) DualScreenPanel.finishTyping() } + else if (model != null) DualPanelContent(model) + } + } + } + } + + private fun acceptFocus(on: Boolean) { + if (on) { + unfocusPending = false + window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + runCatching { (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(taskId, 0) } + } else { + unfocusPending = true + DualScreenPanel.returnFocus(this, fromPanel = true) + window.decorView.postDelayed({ + if (!unfocusPending || DualScreenPanel.typingShown) return@postDelayed + if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this, fromPanel = true) else dropFocus() + }, 400) + } + } + + private var unfocusPending = false + + private fun dropFocus() { + unfocusPending = false + } + + override fun onResume() { + super.onResume() + if (!DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this) + } + + private var topResumed = false + + override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { + super.onTopResumedActivityChanged(isTopResumedActivity) + topResumed = isTopResumedActivity + if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) + } + + override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { + if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN && topResumed && !DualScreenPanel.typingShown) { + DualScreenPanel.returnFocus(this, fromPanel = true) + } + return super.dispatchTouchEvent(event) + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) { + applyImmersiveMode() + if (!DualScreenPanel.typingShown) DualScreenPanel.reclaimFocus(this) + } else if (unfocusPending && !DualScreenPanel.typingShown) dropFocus() + } + + @android.annotation.SuppressLint("RestrictedApi") + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (DualScreenPanel.typingShown && event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() + return true + } + if (topResumed && !DualScreenPanel.typingShown && event.action == KeyEvent.ACTION_DOWN) DualScreenPanel.returnFocus(this, fromPanel = true) + return super.dispatchKeyEvent(event) + } + + override fun onDestroy() { + DualScreenPanel.detach(this) + super.onDestroy() + } + + private fun applyImmersiveMode() { + @Suppress("DEPRECATION") + window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } +} + +@Composable +internal fun DualPanelContent(model: DualPanelModel) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(Modifier.fillMaxSize().padding(horizontal = 20.dp, vertical = 16.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.app_name), fontSize = 15.sp, fontWeight = FontWeight.Bold, color = pal.signal) + Spacer(Modifier.size(12.dp)) + val (label, _) = railLabelIcon(model.selected) + Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis) + PanelClock() + } + BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { + val columns = if (model.keys.size > 6) 4 else 3 + val rows = (model.keys.size + columns - 1) / columns + val gap = 12.dp + val tileHeight = ((maxHeight - gap * (rows - 1)) / rows).coerceAtLeast(64.dp) + Column(verticalArrangement = Arrangement.spacedBy(gap)) { + for (row in model.keys.chunked(columns)) { + Row(Modifier.fillMaxWidth().height(tileHeight), horizontalArrangement = Arrangement.spacedBy(gap)) { + for (key in row) PanelTile(key, key == model.selected, key in model.badges, + if (key == "stores") model.storeDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } + repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } + } + } + } + } + if (model.running != null) { + Row( + Modifier.fillMaxWidth().height(56.dp).clip(RoundedCornerShape(16.dp)).background(pal.good.copy(alpha = 0.18f)) + .clickable(role = Role.Button, onClick = model.onResume).testTag("dual-resume").padding(horizontal = 18.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Box(Modifier.size(10.dp).clip(CircleShape).background(pal.good)) + Spacer(Modifier.size(12.dp)) + Text(stringResource(R.string.rail_resume_named, model.running), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, + color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + } +} + +@Composable +private fun PanelTile(key: String, current: Boolean, badge: Boolean, count: Int, modifier: Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (label, icon) = railLabelIcon(key) + val shape = RoundedCornerShape(18.dp) + Box( + modifier.fillMaxSize().clip(shape) + .background(if (current) pal.signal.copy(alpha = 0.16f) else colors.surface) + .border(if (current) 2.dp else 1.dp, if (current) pal.signal else Color.White.copy(alpha = 0.06f), shape) + .clickable(role = Role.Tab, onClick = onClick).testTag("dual-rail-$key"), + contentAlignment = Alignment.Center, + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(icon, contentDescription = null, tint = if (current) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(34.dp)) + Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, + color = if (current) pal.signal else colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(horizontal = 6.dp)) + } + if (badge) Box(Modifier.align(Alignment.TopEnd).padding(12.dp).size(10.dp).clip(CircleShape).background(AttentionAmber)) + if (count > 0) Text( + if (count > 9) "9+" else count.toString(), fontSize = 12.sp, fontWeight = FontWeight.Bold, color = pal.onSignal, + modifier = Modifier.align(Alignment.TopEnd).padding(10.dp).clip(RoundedCornerShape(8.dp)).background(pal.signal) + .padding(horizontal = 6.dp, vertical = 1.dp), + ) + } +} + +@Composable +private fun PanelClock() { + val context = LocalContext.current + var now by remember { mutableStateOf(System.currentTimeMillis()) } + LaunchedEffect(Unit) { + while (true) { + now = System.currentTimeMillis() + kotlinx.coroutines.delay(60_000L - now % 60_000L) + } + } + Text(android.text.format.DateFormat.getTimeFormat(context).format(java.util.Date(now)), fontSize = 15.sp, + fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onSurfaceVariant) +} + +@Composable +internal fun DualPanelPublisher(s: FrontEndState, selected: String, onSelect: (String) -> Unit, a: FrontEndActions) { + val badges = buildSet { + if (setupNeedsAttention(s)) add("setup") + if (s.updates.hasUpdate) add("updates") + } + val model = DualPanelModel(navigationKeys(s), selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume) + androidx.compose.runtime.SideEffect { DualScreenPanel.model = model } + androidx.compose.runtime.DisposableEffect(Unit) { onDispose { DualScreenPanel.model = null } } +} + +internal fun dualPageStep(event: android.view.KeyEvent): Int? = when (event.keyCode) { + android.view.KeyEvent.KEYCODE_BUTTON_L2 -> -1 + android.view.KeyEvent.KEYCODE_BUTTON_R2 -> 1 + else -> null +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt new file mode 100644 index 000000000..c3809d3b5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.ui + +import android.app.Presentation +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.setViewTreeOnBackPressedDispatcherOwner +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.ComposeView +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.lifecycle.setViewTreeViewModelStoreOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner +import com.droiddeck.launcher.core.AppUiPrefs + +internal class DualScreenPresentation( + private val host: ComponentActivity, + display: Display, +) : Presentation(host, display) { + private var content: ComposeView? = null + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + setOnDismissListener { DualScreenPanel.detach(this) } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + applyImmersiveMode() + val decor = window?.decorView ?: return + decor.setViewTreeLifecycleOwner(host) + decor.setViewTreeViewModelStoreOwner(host) + decor.setViewTreeSavedStateRegistryOwner(host) + decor.setViewTreeOnBackPressedDispatcherOwner(host) + val view = ComposeView(context) + content = view + view.setContent { + val model = DualScreenPanel.model + val request = DualScreenPanel.typing + val typingOn = request != null && DualScreenPanel.typingShown + LaunchedEffect(typingOn) { acceptFocus(typingOn) } + DroidDeckTheme(model?.theme, appScale = model?.appScale ?: AppUiPrefs.DEFAULT_SCALE) { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { + if (request != null && typingOn) TypingPanel(request) { + if (DualScreenPanel.typing === request) DualScreenPanel.finishTyping() + } else if (model != null) DualPanelContent(model) + } + } + } + setContentView(view) + } + + private fun acceptFocus(on: Boolean) { + val window = window ?: return + if (on) { + window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + content?.requestFocus() + } else { + window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + host.window?.decorView?.requestFocus() + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) applyImmersiveMode() + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onBackPressed() { + if (DualScreenPanel.typingShown) DualScreenPanel.finishTyping() + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (DualScreenPanel.typingShown && event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() + return true + } + return super.dispatchKeyEvent(event) + } + + private fun applyImmersiveMode() { + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt index 901bf6485..9fd363155 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt @@ -27,6 +27,8 @@ import androidx.compose.material.icons.outlined.Image import androidx.compose.material.icons.outlined.InsertDriveFile import androidx.compose.material.icons.outlined.SdCard import androidx.compose.material.icons.outlined.Smartphone +import androidx.compose.material.icons.outlined.Visibility +import androidx.compose.material.icons.outlined.VisibilityOff import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -81,8 +83,8 @@ internal class PickFolder(val dir: File, val readable: Boolean) internal class PickListing(val folders: List<PickFolder>, val files: List<File>) -internal fun pickListing(dir: File, kind: PickKind): PickListing { - val all = dir.listFiles()?.filter { !it.name.startsWith(".") }.orEmpty().sortedBy { it.name.lowercase() } +internal fun pickListing(dir: File, kind: PickKind, showHidden: Boolean = false): PickListing { + val all = dir.listFiles()?.filter { showHidden || !it.name.startsWith(".") }.orEmpty().sortedBy { it.name.lowercase() } return PickListing( all.filter { it.isDirectory }.map { PickFolder(it, it.canRead() && it.list() != null) }, all.filter { it.isFile && it.extension.lowercase() in kind.extensions }, @@ -92,11 +94,13 @@ internal fun pickListing(dir: File, kind: PickKind): PickListing { @Composable internal fun ExePickerDialog( title: String, kind: PickKind = PickKind.EXE, start: File? = null, - onAddAll: ((File) -> Unit)? = null, onPick: (File) -> Unit, onDismiss: () -> Unit, + onAddAll: ((File, Boolean) -> Unit)? = null, onPick: (File) -> Unit, onDismiss: () -> Unit, ) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme val density = LocalDensity.current + val prefs = remember(ctx) { ctx.getSharedPreferences("game_picker", Context.MODE_PRIVATE) } + var showHidden by remember { mutableStateOf(prefs.getBoolean("show_hidden", false)) } val shown = rememberShown(onDismiss) val close = { shown.targetState = false } val volumes = remember { pickVolumes(ctx) } @@ -107,14 +111,23 @@ internal fun ExePickerDialog( val back = { if (dir == null) close() else up() } val first = remember(dir) { FocusRequester() } LaunchedEffect(dir) { focusWithinFrames({ false }) { first } } - val listing = remember(dir) { dir?.let { pickListing(it, kind) } } + val listing = remember(dir, showHidden) { dir?.let { pickListing(it, kind, showHidden) } } var locked by remember { mutableStateOf<Dp?>(null) } AppDialog( shown, close, "filePicker", wide = false, maxWidth = 520.dp, width = locked, fitContent = locked == null, back = back, modifier = Modifier.onSizeChanged { if (locked == null && it.width > 0) locked = with(density) { it.width.toDp() } }, ) { Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { - DialogTitleRow(title, onClose = close) + DialogTitleRow(title, onClose = close, leading = { + SmallIconButton( + if (showHidden) Icons.Outlined.VisibilityOff else Icons.Outlined.Visibility, + stringResource(if (showHidden) R.string.fm_hide_hidden else R.string.fm_show_hidden), + if (showHidden) colors.primary else colors.onSurfaceVariant, + ) { + showHidden = !showHidden + prefs.edit().putBoolean("show_hidden", showHidden).apply() + } + }) if (dir != null && volume != null) { val crumbs = listOf(volume.label) + dir!!.path.removePrefix(volume.root.path).split('/').filter { it.isNotEmpty() } Text(crumbs.joinToString(" › "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) @@ -135,7 +148,7 @@ internal fun ExePickerDialog( val shownListing = listing ?: PickListing(emptyList(), emptyList()) PickerRow(Icons.AutoMirrored.Outlined.ArrowBack, "..", null, focus = first, onClick = up) if (onAddAll != null && shownListing.folders.any { it.readable }) { - PickerRow(Icons.Filled.Add, stringResource(R.string.games_add_all), null, accent = true) { onAddAll(dir!!); close() } + PickerRow(Icons.Filled.Add, stringResource(R.string.games_add_all), null, accent = true) { onAddAll(dir!!, showHidden); close() } } for (f in shownListing.folders) key(f.dir.path) { PickerRow(Icons.Outlined.Folder, f.dir.name, null, enabled = f.readable) { dir = f.dir } 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 0bc1ccc47..92a6d0b36 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,20 @@ 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 { + 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) @@ -81,7 +93,12 @@ internal class FocusGlide(val view: View) { internal val LocalFocusGlide = staticCompositionLocalOf<FocusGlide?> { null } internal object RingVeil { - var count by mutableIntStateOf(0) + private var state = mutableIntStateOf(0) + var count: Int + get() = state.intValue + set(value) { state.intValue = value } + + internal fun reset() { state = mutableIntStateOf(0) } } @Composable @@ -107,15 +124,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 +159,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 +205,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 +384,7 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable } } - Box( - modifier + return this .onGloballyPositioned { glide.host = it } .drawWithContent { drawContent() @@ -359,15 +403,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 db6850226..1c4536fc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -10,6 +10,8 @@ import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.snap import androidx.compose.animation.core.tween import androidx.compose.animation.scaleIn +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.scaleOut import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.rememberUpdatedState @@ -105,7 +107,7 @@ import java.io.File internal fun Pane( s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier, onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, - onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, onPairWirelessDebugging: () -> Unit, ) { BoxWithConstraints(modifier = modifier) { CompositionLocalProvider(LocalNarrowPane provides (maxWidth < NarrowPaneWidth)) { @@ -138,12 +140,19 @@ internal fun Pane( before[0] = target val targetNow by rememberUpdatedState(target) val leave = if (Hops.linking) PageLeave.Link else PageLeave.Ordinary - LaunchedEffect(target) { Hops.linking = false } + LaunchedEffect(target) { + Hops.linking = false + PageSwipe.direction = 0 + } AnimatedContent( targetState = target, modifier = Modifier.onGloballyPositioned { paneAt[0] = it.positionInRoot() }, transitionSpec = { + val swipe = PageSwipe.direction when { + swipe != 0 -> (fadeIn(Motion.tw(260, 40)) + slideInHorizontally(Motion.tw(360)) { it * swipe / 8 }) + .togetherWith(fadeOut(Motion.tw(160)) + slideOutHorizontally(Motion.tw(220)) { -it * swipe / 8 }) + .apply { targetContentZIndex = 1f } targetState in origins -> (fadeIn(Motion.tw(120))) .togetherWith(fadeOut(Motion.tw(320, 80)) + scaleOut(Motion.tw(480), targetScale = 0.95f)) .apply { targetContentZIndex = 1f } @@ -162,7 +171,7 @@ internal fun Pane( label = "pane", ) { key -> val drawn = (if (page != null && key == s.pageKey) page else pages[key]) - ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb) } + ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } val hopSink by androidx.compose.animation.core.animateFloatAsState( if (Hops.sinking == key) 1f else 0f, Motion.tw(260), label = "hopSink", ) @@ -223,7 +232,7 @@ private fun romFor(s: FrontEndState, selected: String): Pair<Library.Emulator, L private fun Content( s: FrontEndState, selected: String, a: FrontEndActions, modifier: Modifier, onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, - onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, onPairWirelessDebugging: () -> Unit, ) { val colors = MaterialTheme.colorScheme val detailPosterWidth = if (LocalConfiguration.current.screenHeightDp < 600) 72.dp else 120.dp @@ -232,13 +241,13 @@ private fun Content( val padH = if (narrow) 16.dp else 22.dp val padV = if (narrow) 12.dp else 18.dp if (selected == "setup") { - Column(modifier = modifier.padding(horizontal = padH, vertical = padV)) { - SetupPanel(s, a, onOpenDeveloperOptions, onRequestWirelessAdb) + Column(modifier = modifier.padding(horizontal = padH).padding(top = padV)) { + SetupPanel(s, a, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } return } if (selected == "updates") { - UpdatesPage(s, a, modifier.padding(horizontal = padH, vertical = padV)) + UpdatesPage(s, a, modifier.padding(horizontal = padH).padding(top = padV)) return } if (selected == "steam") { @@ -254,31 +263,19 @@ 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") { DesktopPage(s, a, modifier, onSelect) return } + if (selected == "android-apps" && s.isHomeApp) { + AndroidAppsPage(s, modifier, onAndroidAppClick) + return + } Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = padH, vertical = padV)) { when { - selected == "android-apps" && s.isHomeApp -> { - Rise(0) { PageHeader(stringResource(R.string.content_android_apps)) { Chip(stringResource(R.string.content_apps_count, s.androidApps.size), ok = false) } } - if (s.androidApps.isEmpty()) Rise(3) { Note(stringResource(R.string.content_no_android_apps)) } - else Rise(3, Modifier.fillMaxWidth()) { - ArtGrid(s.androidApps.map { app -> - Tile( - app.label, - null, - null, - "android:${app.packageName}", - onClick = { onAndroidAppClick(app) }, - iconBitmap = app.icon, - ) - }) - } - } selected.startsWith("user:") -> { val app = UserAppsState.items.firstOrNull { "user:${it.key}" == selected } if (app == null) Note(stringResource(R.string.user_apps_gone)) else UserAppPage(app, s, a, onSelect) @@ -468,7 +465,8 @@ private fun UserAppPage(app: UserApps.App, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current val narrow = LocalNarrowPane.current var editing by rememberSaveable(app.key) { mutableStateOf(false) } - val x86 = (app.arch == "x86_64" || app.arch == "i386") && app.fex != com.droiddeck.launcher.runtime.LinuxFex.OFF + val x86 = (app.arch == "x86_64" || app.arch == "i386") && app.fex != com.droiddeck.launcher.runtime.LinuxFex.OFF && + app.kind != UserApps.Kind.FLATPAK val fexReady by produceState<Boolean?>(null, app.key, x86, s.sessionRunning) { value = if (x86) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.runtime.LinuxFex.ready(ctx) } else true } 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 c7b78ee05..45ef20fe8 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,72 +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 { r.conflicts > 0 -> context.getString(R.string.cloud_conflict_files, r.conflicts) @@ -285,125 +89,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,13 +104,13 @@ 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 if (st.adding) ExePickerDialog( stringResource(R.string.games_add_title), - onAddAll = { dir -> + onAddAll = { dir, showHidden -> st.summary = emptyList<com.droiddeck.launcher.frontend.AddedGames.Game>() to 0 st.checking = dir.name scope.launch { @@ -433,6 +119,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List<Library.SteamGame>) { ctx.applicationContext, dir, onGame = { g -> scope.launch { st.summary?.let { (list, n) -> st.summary = (list + g) to n } } }, onChecking = { name -> scope.launch { st.checking = name } }, + showHidden = showHidden, ) } st.checking = null @@ -471,68 +158,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() } @@ -552,48 +178,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( @@ -617,16 +201,11 @@ internal fun BusyChip(s: FrontEndState) { internal fun RuntimeChip(s: FrontEndState) = when { s.busy -> Chip(if (s.percent >= 0) stringResource(R.string.setup_runtime_progress, s.stage, s.percent) else s.stage, ok = false) s.removalPending -> Chip(stringResource(R.string.runtime_removal_incomplete), ok = false) - !s.ready -> Chip(stringResource(R.string.games_runtime_first_play), ok = false) s.available != null && s.available != s.installed -> Chip(stringResource(R.string.games_runtime_update), ok = false) 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, @@ -634,37 +213,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 7136ac7f0..ecc597c93 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 @@ -63,6 +66,8 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import com.droiddeck.launcher.session.SessionPrefs +import androidx.compose.ui.platform.LocalContext import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -81,12 +86,62 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.layout.boundsInParent import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.LayoutCoordinates import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onPlaced 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) + val content = remember { arrayOfNulls<LayoutCoordinates>(1) } + 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()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], 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 { item -> content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) }; Hops.railBounds[key] = item.boundsInRoot() } }, + onSelect = onSelect, onFocusSelect = onFocusSelect) + } + } + } + if (s.running != null) ResumeRailItem(s.running, compact = true, iconOnly = true, a.onResume) + } +} + +internal 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") +} + +internal object RailLabels { + var shown by mutableStateOf(true) + private set + + fun load(context: android.content.Context) { + shown = SessionPrefs.railLabels(context) + } + + fun set(context: android.content.Context, show: Boolean) { + shown = show + SessionPrefs.setRailLabels(context, show) + } +} + @Composable internal fun SideRail( s: FrontEndState, selected: String, @@ -94,9 +149,9 @@ 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) + val railContext = LocalContext.current + remember { RailLabels.load(railContext) } + val iconOnly = isNarrowScreen() || !RailLabels.shown 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,38 +160,24 @@ 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) } - Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onGloballyPositioned { railAt = it.boundsInRoot().topLeft }) { - if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-railAt), tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) + val content = remember { arrayOfNulls<LayoutCoordinates>(1) } + Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) Column( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth().selectableGroup(), ) { val place: (String) -> Modifier = { key -> - Modifier.onGloballyPositioned { - bounds[key] = it.boundsInRoot() - Hops.railBounds[key] = it.boundsInRoot() + Modifier.onGloballyPositioned { item -> + content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) } + Hops.railBounds[key] = item.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) } } } @@ -150,9 +191,41 @@ internal fun SideRail( } } +internal fun railLabelIcon(key: String): Pair<Int, ImageVector> = 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 +} + +internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || + PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention + @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 = setupNeedsAttention(s) + for (key in navigationKeys(s)) { + val (label, icon) = railLabelIcon(key) + 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 +254,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 +264,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 1a2fc56df..6f320c5ce 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 @@ -68,6 +69,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.layout.onGloballyPositioned @@ -98,10 +102,17 @@ class FrontEndState( val frameGenLabel: String, val romsDir: String?, val logsEnabled: Boolean, + val gameDebugLogsEnabled: Boolean = false, + val gameDebugLogsNeedsRestart: Boolean = false, val vacDiagnostics: Boolean = false, val agentCommands: Boolean = false, val bluetoothAllowed: Boolean? = null, val allFilesAllowed: Boolean? = null, + val localNetworkAllowed: Boolean? = null, + 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>, @@ -118,14 +129,22 @@ 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 dualScreen: Boolean = false, + val dualScreenDevice: Boolean = false, + val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, + val dualScreenLauncher: Boolean = true, + val dualScreenControls: Boolean = true, val packages: List<PackageRow>? = null, val packageCatalogLoading: Boolean = false, val packageBusyId: String? = null, 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, @@ -134,22 +153,23 @@ class FrontEndState( val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, - val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, + 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, val storesShowMature: Boolean = false, val storesSort: String = SessionPrefs.STORES_SORTS.first(), - val storesView: String = SessionPrefs.STORES_VIEWS.first(), + val storesView: String = SessionPrefs.DEFAULT_STORES_VIEW, val storeDownloadsActive: Int = 0, val updates: UpdatesState = UpdatesState(), ) @@ -178,6 +198,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,10 +221,15 @@ class FrontEndActions( val onFiles: () -> Unit, val onBrowseFiles: (File) -> Unit = {}, val onLogs: () -> Unit, + val onGameDebugLogs: () -> Unit = {}, val onVacDiagnostics: () -> Unit = {}, val onAgentCommands: () -> Unit = {}, val onBluetoothAllowed: () -> Unit = {}, val onAllFilesAllowed: () -> Unit = {}, + val onLocalNetworkAllowed: () -> Unit = {}, + val onClearCachedApps: (Boolean) -> Unit = {}, + val onMemoryHud: (String) -> Unit = {}, + val onBackgroundAppLimit: (Int) -> Unit = {}, val onShareLogs: () -> Unit = {}, val onClearLogs: () -> Unit = {}, val onResetSettings: () -> Unit = {}, @@ -214,14 +240,18 @@ 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 onDualScreenMode: (String) -> Unit = {}, + val onDualScreenLauncher: (Boolean) -> Unit = {}, + val onDualScreenControls: (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 = {}, @@ -229,6 +259,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 = {}, @@ -240,6 +275,8 @@ class FrontEndActions( val onCopyPhantomCommand: (Boolean) -> Unit = {}, val onDismissPhantomGate: () -> Unit = {}, val onStartWirelessAdbPairing: () -> Unit = {}, + val onStartPairingGuide: (Int?, Boolean) -> Boolean = { _, _ -> false }, + val onShowPhantomGate: () -> Unit = {}, val onOpenNotificationSettings: () -> Unit = {}, val controller: ControllerActions? = null, val updates: UpdatesActions = UpdatesActions(), @@ -260,8 +297,6 @@ internal object Motion { if (scale == 0f) snap() else spring(damping, stiffness) } -private val Shape10 = RoundedCornerShape(10.dp) - internal val Shape12 = RoundedCornerShape(12.dp) internal fun hueOf(name: String) = (name.hashCode().toUInt() % 360u).toFloat() @@ -281,13 +316,6 @@ internal fun Rise(i: Int, modifier: Modifier = Modifier, content: @Composable () ) { content() } } -@Composable -private fun Modifier.staggerIn(i: Int): Modifier { - val t = remember { Animatable(0f) } - LaunchedEffect(Unit) { t.animateTo(1f, Motion.tw(360, i * 30)) } - return graphicsLayer { alpha = t.value; translationY = (1f - t.value) * 10.dp.toPx() } -} - @Composable internal fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier { val x = remember { Animatable(-1f) } @@ -381,7 +409,16 @@ 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) } + val textInput = androidx.compose.ui.platform.LocalTextInputService.current + val bottomTextInput = remember(textInput) { textInput?.let { androidx.compose.ui.text.input.TextInputService(BottomScreenTextInput(it)) } } + androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize()) { + CompositionLocalProvider( + LocalFrontFocus provides frontFocus, + LocalNarrowPane provides (maxWidth < NarrowPaneWidth), + androidx.compose.ui.platform.LocalTextInputService provides (if (s.dualScreen) bottomTextInput else textInput), + LocalBottomTyping provides s.dualScreen, + ) { FrontEndScreenBody(s, a, page, frontFocus) } + } } @OptIn(ExperimentalComposeUiApi::class) @@ -395,12 +432,19 @@ 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" } + com.droiddeck.launcher.sync.SyncthingService.NAV -> com.droiddeck.launcher.sync.Syncthing.requestOpen() + "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 developerChoiceGuided by rememberSaveable { mutableStateOf(false) } + var developerChoiceToggle by rememberSaveable { mutableStateOf(false) } var wirelessAdbDesiredEnabled by rememberSaveable { mutableStateOf(false) } var appToChooseDisplay by remember { mutableStateOf<HomeApp.LaunchableApp?>(null) } val colors = MaterialTheme.colorScheme @@ -409,9 +453,49 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val phantomGateVisible = s.showPhantomGate && PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) val processSettingsPageVisible = phantomGateVisible || showWirelessAdbFix || showDeveloperDisplayChoice val requestDeveloperOptions = { + developerChoiceGuided = false + developerChoiceToggle = false if (s.secondScreenDisplays.isEmpty()) a.onOpenDeveloperOptions(null) else showDeveloperDisplayChoice = true } + val openDeveloperOptionsOn: (Int?) -> Unit = { displayId -> + if (developerChoiceGuided) a.onStartWirelessAdbPairing() + val guided = developerChoiceGuided || developerChoiceToggle + if (!guided || !a.onStartPairingGuide(displayId, developerChoiceToggle)) a.onOpenDeveloperOptions(displayId) + developerChoiceGuided = false + developerChoiceToggle = false + } + val requestChildProcessToggle = { + if (!PhantomProcessLimit.hasDeveloperToggle() || com.droiddeck.launcher.core.GlobalSettings.developerOptionsOn(ctx)) { + requestDeveloperOptions() + } else { + developerChoiceGuided = false + developerChoiceToggle = true + if (s.secondScreenDisplays.isEmpty()) openDeveloperOptionsOn(null) + else showDeveloperDisplayChoice = true + } + } + val startGuidedPairing = { + if (!com.droiddeck.launcher.core.WirelessAdbPairingService.notificationsEnabled(ctx)) { + wirelessAdbDesiredEnabled = false + showWirelessAdbFix = true + } else { + developerChoiceGuided = true + if (s.secondScreenDisplays.isEmpty()) openDeveloperOptionsOn(null) + else showDeveloperDisplayChoice = true + } + } + var applyingSavedPairing by remember { mutableStateOf(false) } + val fixPhantomLimit = { + if (!s.adbPaired || !com.droiddeck.launcher.core.GlobalSettings.wirelessDebuggingOn(ctx)) startGuidedPairing() + else if (!applyingSavedPairing) { + applyingSavedPairing = true + a.onSetPhantomProcessLimit(false) { error -> + applyingSavedPairing = false + if (error != null) startGuidedPairing() + } + } + } val requestWirelessAdbFix: (Boolean) -> Unit = { enabled -> wirelessAdbDesiredEnabled = enabled showWirelessAdbFix = true @@ -441,7 +525,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 } @@ -453,6 +537,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } + val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> if (key == "components") a.onComponents(focusContent) @@ -467,6 +552,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(com.droiddeck.launcher.storage.StorageState.openRequests) { if (com.droiddeck.launcher.storage.StorageState.openPending) showRailPage("setup", true) } + LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { + if (com.droiddeck.launcher.sync.Syncthing.openPending) showRailPage("setup", true) + } val onRailFocus: (String) -> Unit = { key -> if (key != railSelection) showRailPage(key, false) } @@ -478,16 +566,30 @@ 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( + val paneRequester = remember { FocusRequester() } + val focusManager = androidx.compose.ui.platform.LocalFocusManager.current + suspend fun focusDualPane() { + repeat(30) { + withFrameNanos { } + if (anyFocused) return + runCatching { paneRequester.requestFocus() } + if (anyFocused) return + focusManager.moveFocus(FocusDirection.Down) + if (anyFocused) return + } + } + 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 } if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) - focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) } + if (s.dualScreen && frontFocus.primaryAttached == 0) focusDualPane() + else focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) } } var openPage by remember { mutableStateOf<String?>(null) } LaunchedEffect(s.pageKey) { @@ -509,20 +611,35 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com return@LaunchedEffect } if (anyFocused) return@LaunchedEffect - focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) } + if (s.dualScreen && frontFocus.primaryAttached == 0) focusDualPane() + else focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) } } LaunchedEffect(railPicks) { if (railPicks == 0 || processSettingsPageVisible) return@LaunchedEffect kotlinx.coroutines.delay(Motion.ms(PAGE_EXIT_MS).toLong()) if (inputModeManager.inputMode != InputMode.Keyboard) return@LaunchedEffect - withTimeoutOrNull(1_000) { snapshotFlow { frontFocus.primaryAttached > 0 }.first { it } } ?: return@LaunchedEffect + val entry = withTimeoutOrNull(1_000) { snapshotFlow { frontFocus.primaryAttached > 0 }.first { it } } + if (entry == null) { + if (s.dualScreen) focusDualPane() + return@LaunchedEffect + } focusWithinFrames({ frontFocus.focusedRail == null && anyFocused }) { frontFocus.paneEntry() } } val paneFocus = Modifier - .focusProperties { enter = { frontFocus.paneEntry() } } + .focusRequester(paneRequester) + .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 @@ -535,25 +652,61 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.last == r.control && anyFocused }) { frontFocus.items[r.control] ?: frontFocus.paneEntry() } } var screenAt by remember { mutableStateOf(Offset.Zero) } + if (s.dualScreen) DualPanelPublisher(s, railSelection, { key -> + if (processSettingsPageVisible) return@DualPanelPublisher + if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) + focusManager.clearFocus(force = true) + onRailSelect(key) + }, a) 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 && !s.dualScreen, pal.line, + Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() } + .then(if (s.dualScreen) Modifier.onKeyEvent { event -> + val step = dualPageStep(event.nativeKeyEvent) ?: return@onKeyEvent false + if (event.type == KeyEventType.KeyDown && !processSettingsPageVisible) { + val keys = navigationKeys(s) + val at = keys.indexOf(railSelectionNow.value) + keys.getOrNull(at + step)?.let { key -> + PageSwipe.direction = step + onRailSelect(key) + } + } + true + } else Modifier), + navigation = { + if (s.dualScreen) Unit + else 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).pageSwipe({ !processSettingsPageVisible && appToChooseDisplay == null }) { dir -> + val keys = navigationKeys(s) + val at = keys.indexOf(railSelectionNow.value) + if (at >= 0) keys.getOrNull(at + dir)?.let { key -> + PageSwipe.direction = dir + showRailPage(key, false) + } + }, + { selected = it }, onAndroidAppClick = { app -> if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null) else appToChooseDisplay = app }, - onOpenDeveloperOptions = requestDeveloperOptions, + onOpenDeveloperOptions = requestChildProcessToggle, onRequestWirelessAdb = requestWirelessAdbFix, + onPairWirelessDebugging = startGuidedPairing, ) - } } } 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 -> @@ -577,11 +730,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com PhantomProcessGatePage( status = s.phantomProcessStatus, onDismiss = a.onDismissPhantomGate, - onOpenDeveloperOptions = requestDeveloperOptions, - onFixWithWirelessDebugging = { - a.onStartWirelessAdbPairing() - requestDeveloperOptions() - }, + onOpenDeveloperOptions = requestChildProcessToggle, + applyingSavedPairing = applyingSavedPairing, + onFixWithWirelessDebugging = fixPhantomLimit, onEnterAddressManually = { requestWirelessAdbFix(false) }, onCopyCommand = { a.onCopyPhantomCommand(false) }, onOpenNotificationSettings = a.onOpenNotificationSettings, @@ -607,13 +758,17 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com }, onMainScreen = { showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(null) + openDeveloperOptionsOn(null) }, onSecondaryScreen = { displayId -> showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(displayId) + openDeveloperOptionsOn(displayId) + }, + onDismiss = { + showDeveloperDisplayChoice = false + developerChoiceGuided = false + developerChoiceToggle = false }, - onDismiss = { showDeveloperDisplayChoice = false }, ) } } 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 17983d708..66ee57181 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,8 +91,10 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var openOverview = false } -private const val GLASSES_TAB = 5 +private const val GLASSES_TAB = 6 +private const val SYNC_TAB = 4 @Composable private fun CheckRow(state: CheckState, title: String, detail: String?, divider: Boolean = true, action: (@Composable () -> Unit)? = null) { @@ -139,6 +142,7 @@ internal fun SetupPanel( a: FrontEndActions, onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onPairWirelessDebugging: () -> Unit, ) { val host = rememberMenuHost() val ctx = LocalContext.current @@ -174,6 +178,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 +186,15 @@ internal fun SetupPanel( onDismiss = { editDownloadPrefix = false }, onSave = { a.onDownloadPrefix(it); editDownloadPrefix = 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)) + 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_sync), 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 } @@ -194,13 +205,30 @@ internal fun SetupPanel( tab = STORAGE_TAB } } + LaunchedEffect(Unit) { + while (true) { + kotlinx.coroutines.delay(2_000) + a.onRefreshPhantomStatus() + } + } + LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { + if (com.droiddeck.launcher.sync.Syncthing.openPending) { + com.droiddeck.launcher.sync.Syncthing.openPending = false + tab = SYNC_TAB + } + } + var syncAdvanced by rememberSaveable { mutableStateOf(false) } + if (syncAdvanced) { + androidx.activity.compose.BackHandler { syncAdvanced = false } + SyncAdvancedPage(host) { syncAdvanced = false } + return + } LaunchedEffect(tab) { if (tabTurned && inputModeManager.inputMode == InputMode.Keyboard) { androidx.compose.runtime.withFrameNanos { } 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 } @@ -271,7 +299,7 @@ internal fun SetupPanel( }, divider = divider && !showLimitDetails, ) { - if (limitBlocks) PrimaryButton(if (showLimitDetails) stringResource(R.string.common_hide) else stringResource(R.string.setup_fix_it), compact = true) { showLimitDetails = !showLimitDetails } + if (limitBlocks) PrimaryButton(stringResource(R.string.setup_fix_it), compact = true, onClick = a.onShowPhantomGate) else if (s.phantomProcessStatus != PhantomProcessStatus.NOT_APPLICABLE) { SecondaryButton(if (showLimitDetails) stringResource(R.string.common_hide) else stringResource(R.string.setup_details), compact = true) { showLimitDetails = !showLimitDetails } } @@ -284,11 +312,7 @@ internal fun SetupPanel( fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(vertical = 4.dp), ) Actions { - if (limitBlocks) { - PrimaryButton(stringResource(R.string.setup_dev_options), compact = true, onClick = onOpenDeveloperOptions) - SecondaryButton(stringResource(R.string.setup_use_wireless), compact = true, enabled = !processLimitBusy) { setProcessLimit(false) } - SecondaryButton(stringResource(R.string.setup_check_again), compact = true, onClick = a.onRefreshPhantomStatus) - } else if (s.phantomProcessStatus == PhantomProcessStatus.DISABLED) { + if (s.phantomProcessStatus == PhantomProcessStatus.DISABLED) { SecondaryButton(stringResource(R.string.setup_limit_turn_on), compact = true, enabled = !processLimitBusy) { setProcessLimit(true) } } } @@ -335,6 +359,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 @@ -359,6 +384,7 @@ internal fun SetupPanel( } } } + if (s.theme == Themes.INNER_GAMER) RgbSpeedRow() if (s.theme == Themes.GRADIENT) GradientColorRows() ChoiceRow( host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint), @@ -376,6 +402,9 @@ internal fun SetupPanel( ) ToggleRow(host, "launcher-animations", stringResource(R.string.setup_animations), null, s.animationsEnabled, onChange = a.onAnimationsEnabled) + val railContext = androidx.compose.ui.platform.LocalContext.current + remember { RailLabels.load(railContext) } + ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) } @@ -391,7 +420,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, ) @@ -400,6 +434,23 @@ internal fun SetupPanel( if (s.launcherFullscreen) stringResource(R.string.setup_fullscreen_on) else stringResource(R.string.setup_fullscreen_off), s.launcherFullscreen, ) { a.onLauncherFullscreen(it) } + if (s.dualScreenDevice) { + ChoiceRow( + host, "dual-screen", stringResource(R.string.setup_dual_screen), stringResource(R.string.setup_dual_screen_hint), + listOf( + com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), + com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), + com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), + ), + s.dualScreenMode, onPick = a.onDualScreenMode, + ) + } + if (s.dualScreenDevice && s.dualScreenMode != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { + ToggleRow(host, "dual-screen-menu", stringResource(R.string.setup_dual_screen_menu), + stringResource(R.string.setup_dual_screen_menu_hint), s.dualScreenLauncher) { a.onDualScreenLauncher(it) } + ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), + stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + } } } val art: @Composable () -> Unit = { @@ -438,24 +489,42 @@ 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 -> { + SYNC_TAB -> SyncPanel(host, runtimeOk) { syncAdvanced = true } + 5 -> { SettingsGroup(stringResource(R.string.setup_tab_diagnostics)) { ToggleRow(host, "logs", stringResource(R.string.setup_logs), stringResource(R.string.setup_logs_hint), s.logsEnabled) { a.onLogs() } + ToggleRow( + host, "game-debug-logs", stringResource(R.string.setup_game_debug_logs), + stringResource(if (s.gameDebugLogsNeedsRestart) R.string.setup_game_debug_logs_restart else R.string.setup_game_debug_logs_hint), + s.gameDebugLogsEnabled, + enabled = s.logsEnabled, + ) { a.onGameDebugLogs() } ToggleRow(host, "vacdiag", stringResource(R.string.setup_vac_diag), stringResource(R.string.setup_vac_diag_hint), s.vacDiagnostics) { a.onVacDiagnostics() } ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } s.allFilesAllowed?.let { on -> - ToggleRow(host, "all-files", stringResource(R.string.setup_all_files), stringResource(R.string.setup_all_files_hint), on) { a.onAllFilesAllowed() } + ToggleRow(host, "all-files", stringResource(R.string.setup_all_files), null, on) { a.onAllFilesAllowed() } + } + s.localNetworkAllowed?.let { on -> + ToggleRow(host, "local-network", stringResource(R.string.setup_local_network), null, on) { a.onLocalNetworkAllowed() } } s.bluetoothAllowed?.let { on -> - ToggleRow(host, "bluetooth", stringResource(R.string.setup_bluetooth), stringResource(R.string.setup_bluetooth_hint), on) { a.onBluetoothAllowed() } + ToggleRow(host, "bluetooth", stringResource(R.string.mode_controller_steam), null, on) { a.onBluetoothAllowed() } } ActionRow(stringResource(R.string.setup_latest_logs), stringResource(R.string.drawer_logs_hint), stringResource(R.string.drawer_share_logs), a.onShareLogs, progress = com.droiddeck.launcher.session.SessionLogShare.progress) @@ -463,6 +532,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), onPairWirelessDebugging, + ) + } } GLASSES_TAB -> GlassesSetupPanel() } @@ -513,7 +614,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 @@ -532,7 +633,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 -> @@ -575,18 +676,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 @@ -600,7 +694,36 @@ 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) +} + +@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( @@ -614,9 +737,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) { @@ -691,6 +811,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 @@ -761,9 +883,8 @@ private fun SettingCard(label: String, value: String, id: String, modifier: Modi verticalArrangement = Arrangement.spacedBy(3.dp), modifier = modifier.paneItem(id) .graphicsLayer { scaleX = scale; scaleY = scale } - .clip(Shape14) - .background(if (hot) pal.signal.copy(alpha = 0.10f) else colors.surface) - .glideBorder(hot, Shape14, pal.signal, pal.line2) + .then(if (LocalGlass.current != null) Modifier.glass(Shape14, if (hot) 0.04f else 0f) else Modifier.clip(Shape14).background(if (hot) pal.signal.copy(alpha = 0.10f) else colors.surface)) + .glideBorder(hot, Shape14, pal.signal, if (LocalGlass.current != null) Color.Transparent else pal.line2) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) .controllerConfirm(onClick = onClick) .padding(horizontal = 14.dp, vertical = 12.dp), @@ -798,7 +919,12 @@ private fun LanguageRow(host: MenuHost, chosen: String, onPick: (String) -> Unit } } -/** The two colours of the Gradient theme, each a small square that opens the colour picker. */ +@Composable +private fun RgbSpeedRow() { + val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext + SliderRow(stringResource(R.string.theme_rgb_speed), stringResource(R.string.theme_rgb_speed_hint), Themes.rgbSpeed, 1..Themes.RGB_SPEEDS) { Themes.setRgbSpeed(ctx, it) } +} + @Composable private fun GradientColorRows() { val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext 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 fb7d20485..2ec816eb1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -32,6 +32,7 @@ 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.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Settings @@ -163,6 +164,8 @@ internal fun PrimaryButton( ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current + val pillMode = LocalPillButtons.current + val btnShape = if (pillMode) CircleShape else Shape12 val frontFocus = if (main) LocalFrontFocus.current else null if (frontFocus != null) DisposableEffect(Unit) { frontFocus.primaryAttached++ @@ -180,22 +183,22 @@ internal fun PrimaryButton( horizontalArrangement = if (fill) Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally) else Arrangement.spacedBy(8.dp), modifier = modifier.then(track) .onGloballyPositioned { placed[0] = it } - .heightIn(min = if (compact) 44.dp else 48.dp) + .heightIn(min = if (pillMode) 40.dp else if (compact) 44.dp else 48.dp) .then(if (frontFocus != null) Modifier.focusRequester(frontFocus.primary).onFocusChanged { if (it.isFocused) frontFocus.last = FrontFocus.PRIMARY } else Modifier) - .graphicsLayer { alpha = if (LaunchOrigin.flooding === placed) 0f else 1f; scaleX = scale; scaleY = scale; shadowElevation = if (enabled) lift.dp.toPx() else 0f; shape = Shape12; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } - .clip(Shape12) + .graphicsLayer { alpha = if (LaunchOrigin.flooding === placed) 0f else 1f; scaleX = scale; scaleY = scale; shadowElevation = if (enabled) lift.dp.toPx() else 0f; shape = btnShape; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } + .clip(btnShape) .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) + .then(if (enabled) Modifier else Modifier.border(1.dp, pal.line2, btnShape)) + .glideBorder(hot, btnShape, 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() } .padding( - start = if (fill) 12.dp else if (large) 20.dp else if (compact) 10.dp else if (icon != null) 14.dp else 18.dp, - end = if (fill) 12.dp else if (large) 26.dp else if (compact) 10.dp else 18.dp, - top = if (large) 16.dp else if (compact) 7.dp else 11.dp, - bottom = if (large) 16.dp else if (compact) 7.dp else 11.dp, + start = if (fill) 12.dp else if (large) 20.dp else if (pillMode) 18.dp else if (compact) 10.dp else if (icon != null) 14.dp else 18.dp, + end = if (fill) 12.dp else if (large) 26.dp else if (pillMode) 20.dp else if (compact) 10.dp else 18.dp, + top = if (large) 16.dp else if (pillMode) 8.dp else if (compact) 7.dp else 11.dp, + bottom = if (large) 16.dp else if (pillMode) 8.dp else if (compact) 7.dp else 11.dp, ), ) { val fg = if (enabled) colors.onPrimary else colors.onSurfaceVariant @@ -240,42 +243,24 @@ internal fun ProgressLabel(label: @Composable (Modifier) -> Unit, progress: Floa @Composable internal fun SecondaryButton(text: String, enabled: Boolean = true, compact: Boolean = false, modifier: Modifier = Modifier, progress: Float? = null, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme + val pill = LocalPillButtons.current + val shape = if (pill) CircleShape else Shape12 val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled val pressed by src.collectIsPressedAsState() val scale by animateFloatAsState(if (pressed) 0.955f else if (hot) 1.02f else 1f, Motion.sp(0.5f, Spring.StiffnessMedium), label = "secScale") val pal = LocalPalette.current - val fill by animateColorAsState(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f), Motion.tw(250), label = "secFill") + val fill by animateColorAsState(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = if (pill) 0.09f else 0.03f), Motion.tw(250), label = "secFill") Box( contentAlignment = Alignment.Center, - modifier = modifier.paneItem("btn:$text").downToFirstTile().heightIn(min = if (compact) 44.dp else 48.dp).graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).glideBorder(hot, Shape12, pal.signal, pal.line2) + modifier = modifier.paneItem("btn:$text").downToFirstTile().heightIn(min = if (pill) 40.dp else if (compact) 44.dp else 48.dp).graphicsLayer { scaleX = scale; scaleY = scale }.clip(shape).background(fill).glideBorder(hot, shape, pal.signal, if (pill) Color.White.copy(alpha = 0.14f) else pal.line2) .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 = if (compact) 10.dp else 16.dp, vertical = if (compact) 7.dp else 11.dp), + .padding(horizontal = if (pill) 16.dp else if (compact) 10.dp else 16.dp, vertical = if (pill) 8.dp else if (compact) 7.dp else 11.dp), ) { - ProgressLabel({ m -> Text(text, fontSize = if (compact) 12.sp else 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1, modifier = m) }, - progress, fontSize = if (compact) 12.sp else 15.sp) + ProgressLabel({ m -> Text(text, fontSize = if (compact || pill) 13.sp else 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1, modifier = m) }, + progress, fontSize = if (compact || pill) 13.sp else 15.sp) } } -@Composable -internal fun Cog(size: androidx.compose.ui.unit.Dp = 48.dp, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - var spins by remember { mutableIntStateOf(0) } - val rot by animateFloatAsState((if (hot) 90f else 0f) + spins * 180f, Motion.sp(0.55f), label = "cog") - val pal = LocalPalette.current - val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } - val cornerPx = with(androidx.compose.ui.platform.LocalDensity.current) { (if (size > 48.dp) 14.dp else 12.dp).toPx() } - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("cog").downToFirstTile().size(size).onGloballyPositioned { placed[0] = it }.clip(if (size > 48.dp) Shape14 else Shape12).background(Color.White.copy(alpha = 0.03f)).glideBorder(hot, if (size > 48.dp) Shape14 else Shape12, pal.signal, pal.line2) - .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current) { - placed[0]?.takeIf { it.isAttached }?.let { PageOrigin.mark(Origin(it.boundsInRoot(), cornerPx)) } - spins++ - onClick() - }, - ) { Icon(Icons.Filled.Settings, stringResource(R.string.drawer_page_settings), tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(if (size > 48.dp) 20.dp else 18.dp).rotate(rot)) } -} 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 000000000..f2f7d5ee9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -0,0 +1,979 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.ui.semantics.Role +import androidx.compose.runtime.CompositionLocalProvider +import com.droiddeck.launcher.stores.GameFacts +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.graphics.Shadow +import androidx.compose.foundation.shape.CircleShape +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.material.icons.outlined.VideogameAsset +import androidx.compose.material.icons.filled.Check +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 + +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 || (!s.shortcutPicker && title.isNotBlank() && title != id)) 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) } + 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] + } + val art: Any? = game?.hero ?: item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover + val artModel: Any? = if (art is String) cardArtRequest(art, item?.tallImageUrl) else art + val inSteam = !s.shortcutPicker && source != Library.SOURCE_STEAM && (game != null || installed != null) && !(game?.library == Library.XBOX_CLOUD && installed == null) + val inset = LocalDetailInset.current + GameBackdrop(artModel, art ?: game?.art, hueOf(title), fadeTop = inset.top < 8.dp, onArtPlaced = { StoresMotion.heroAt = it }) { + Column(Modifier.fillMaxWidth().padding(horizontal = inset.horizontal).padding(top = inset.top).onFocusChanged { inPage = it.hasFocus }.bumpers(onPrevious = { cycle(-1) }, onNext = { cycle(1) })) { + Rise(0) { + Row(Modifier.fillMaxWidth().padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.glass(CircleShape)) { BackLink(backLabel, compact = true, onClick = onBack) } + Spacer(Modifier.weight(1f)) + if (!s.shortcutPicker) CompositionLocalProvider(LocalPillButtons provides true) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (installed != null && installed.sidecar.store == Store.ITCH) ItchCheckButton(installed) + RemoveButton(title, game, installed, a) + } + } + } + } + val header: @Composable () -> Unit = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + GameStatusLine(source, game, item, installed, download?.location ?: failed?.location, inSteam) + GameTitle(title, game?.logo ?: item?.logoUrl, if (narrow) 30.sp else 40.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(2.dp)) + GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked) } + } + } + if (StoresMotion.heroLands) header() else Rise(1) { header() } + if (tab != null) Rise(2) { + Column(Modifier.fillMaxWidth().padding(top = 14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + val labels = tabs.map { t -> + when (t) { + GameTab.ABOUT -> stringResource(R.string.game_tab_about) + GameTab.ACHIEVEMENTS -> achievementState?.list?.takeIf { it.isNotEmpty() && !stacked }?.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) + } + } + GameTabBar( + labels, tabs.indexOf(tab), { picked = tabs[it] }, Modifier.onFocusChanged { onStrip = it.hasFocus }, + focusRequesters = tabs.map { tabFocus.getValue(it) }, bumpers = tabs.size > 1, compact = stacked, + ) + 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) { + if (!s.shortcutPicker) GameResourcesRow(title.takeUnless { it == id }.orEmpty(), game) + } + 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 SourceBadge(source: String) { + val c = sourceColours(source) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), + modifier = Modifier.glass(CircleShape, 0.06f).padding(horizontal = 10.dp, vertical = 4.dp), + ) { + Box(Modifier.size(8.dp).clip(CircleShape).background(c.dot)) + Text(sourceLabel(source), fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.8.sp, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun GameStatusLine(source: String, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, downloadAt: String?, inSteam: Boolean) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + 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(" · ").replaceFirstChar { it.uppercase() } + val muted = colors.onBackground.copy(alpha = 0.78f) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + SourceBadge(source) + Text(line, fontSize = 12.sp, color = muted, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + if (inSteam) { + Text("·", fontSize = 12.sp, color = muted.copy(alpha = 0.5f)) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) { + Icon(Icons.Outlined.VideogameAsset, contentDescription = null, tint = muted, modifier = Modifier.size(15.dp)) + Text(stringResource(R.string.stores_in_steam_label), fontSize = 12.sp, color = muted, maxLines = 1) + Icon(Icons.Filled.Check, contentDescription = null, tint = pal.good, modifier = Modifier.size(14.dp)) + } + } + } +} + +@Composable +private fun GameCapsule(scores: GameScores?, actions: @Composable () -> Unit) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().glass(RoundedCornerShape(30.dp)).padding(6.dp), + ) { + CompositionLocalProvider(LocalPillButtons provides true) { Box(Modifier.weight(1f)) { actions() } } + if (scores != null) CapsuleScores(scores, Modifier.padding(start = 8.dp, end = 10.dp)) + } +} + +@Composable +private fun GameTabBar( + tabs: List<String>, selected: Int, onSelect: (Int) -> Unit, + modifier: Modifier = Modifier, focusRequesters: List<FocusRequester>? = null, + bumpers: Boolean = true, compact: Boolean = false, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row(modifier.fillMaxWidth().glass(CircleShape).padding(4.dp), verticalAlignment = Alignment.CenterVertically) { + if (bumpers) BumperKey("LB", stringResource(R.string.widgets_prev_tab)) { onSelect((selected + tabs.size - 1) % tabs.size) } + tabs.forEachIndexed { i, label -> + val on = i == selected + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val pick = { onSelect(i) } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.weight(1f) + .testTag("tab-$i") + .then(focusRequesters?.getOrNull(i)?.let { Modifier.focusRequester(it) } ?: Modifier) + .clip(CircleShape) + .background(if (on) pal.signal.copy(alpha = 0.3f) else if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, CircleShape, pal.signal, if (on) pal.signal.copy(alpha = 0.5f) else Color.Transparent) + .hoverable(src).selectable(selected = on, interactionSource = src, indication = null, role = Role.Tab, onClick = pick) + .controllerConfirm(onClick = pick) + .padding(horizontal = 6.dp, vertical = if (compact) 8.dp else 10.dp), + ) { + Text( + label, fontSize = if (compact) 13.sp else 14.sp, fontWeight = if (on) FontWeight.Bold else FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = if (on || hot) colors.onBackground else colors.onSurfaceVariant, + ) + } + } + if (bumpers) BumperKey("RB", stringResource(R.string.widgets_next_tab)) { onSelect((selected + 1) % tabs.size) } + } +} + +@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 * 1.5f).dp).widthIn(max = (titleSize.value * 7f).dp).clip(RoundedCornerShape(10.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, + style = TextStyle(shadow = Shadow(Color.Black.copy(alpha = 0.55f), blurRadius = 24f)), + ) +} + +@Composable +internal fun GameActions( + store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, + s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, +) { + 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 && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + 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 != null) { + if (compactMenu) GameMoreMenu(game, a) else { + FileButtons(game, a) + GameShortcutMenu(game, a) + EditArtButton(game) + } + } + if (store == Store.ITCH && installed != null) ItchUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GOG && installed != null) GogMaintenanceActions(installed) + 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) + } +} + +@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) } + 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) } + } + } +} + +@Composable +private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { + val ctx = LocalContext.current + val folder = g.gameFiles + return 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 + } +} + +@Composable +private fun EditArtButton(g: Library.SteamGame) { + val open = rememberEditArt(g) ?: return + IconAction(Icons.Outlined.Edit, stringResource(R.string.game_edit_art), "game:edit", onClick = open) +} + +@Composable +private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { + var open by remember(g.gameId) { mutableStateOf(false) } + val edit = rememberEditArt(g) + Box { + SecondaryButton(stringResource(R.string.game_more)) { open = !open } + AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_more), compact = true) { first -> + var lead: FocusRequester? = first + fun take(): FocusRequester? = lead.also { lead = null } + g.gameFiles?.takeIf { it.isDirectory }?.let { dir -> MenuItem(stringResource(R.string.games_files), checked = false, focusRequester = take()) { open = false; a.onBrowseFiles(dir) } } + g.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> MenuItem(stringResource(R.string.games_prefix), checked = false, focusRequester = take()) { open = false; a.onBrowseFiles(dir) } } + MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = take()) { 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) } + edit?.let { run -> MenuItem(stringResource(R.string.game_edit_art), checked = false) { open = false; run() } } + } + } +} + +@Composable +internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, id: String, danger: Boolean = false, enabled: Boolean = true, frosted: Boolean = false, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pill = LocalPillButtons.current + val shape = if (pill) CircleShape else Shape12 + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && enabled + val accent = if (danger) colors.error else pal.signal + val fill = when { + hot -> accent.copy(alpha = if (danger) 0.22f else 0.14f) + pill -> Color.White.copy(alpha = 0.09f) + danger -> Color.Black.copy(alpha = 0.34f) + else -> Color.White.copy(alpha = 0.03f) + } + val button: @Composable () -> Unit = { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem(id).downToFirstTile().size(if (pill) 40.dp else 44.dp).clip(shape) + .background(fill) + .glideBorder(hot, shape, accent, if (pill) Color.White.copy(alpha = 0.14f) else 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 && !pill) Color.White else colors.onBackground, modifier = Modifier.size(18.dp)) + } + } + if (frosted) Box(Modifier.glass(CircleShape)) { button() } else button() +} + +@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(40.dp).glass(CircleShape).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, frosted = true) { + 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, frosted = 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() + } + } +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun AboutTab(developer: String, publisher: String, releaseDate: String, description: String, scores: GameScores?, stacked: Boolean, resources: @Composable () -> Unit) { + val aboutText: @Composable () -> Unit = { + 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)) + } + } + if (stacked) Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().tabPanel()) { + val released = GameFacts.releaseLabel(releaseDate).orEmpty() + val credits = listOf(developer, publisher, released).filter { it.isNotBlank() }.distinct() + if (credits.isNotEmpty()) FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.readable()) { + credits.forEachIndexed { i, part -> + Text( + part, fontSize = 13.sp, fontWeight = if (i == 0 && part == developer) FontWeight.SemiBold else FontWeight.Normal, + color = if (i == 0 && part == developer) MaterialTheme.colorScheme.onBackground else MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, + modifier = Modifier.clip(CircleShape).background(Color.White.copy(alpha = 0.07f)).border(1.dp, Color.White.copy(alpha = 0.12f), CircleShape).padding(horizontal = 12.dp, vertical = 6.dp), + ) + } + } + aboutText() + resources() + } else Row(horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.Top, modifier = Modifier.fillMaxWidth()) { + if (description.isNotBlank()) Column(Modifier.weight(1.3f).tabPanel()) { aboutText() } + Column((if (description.isNotBlank()) Modifier.weight(1f) else Modifier.fillMaxWidth()).tabPanel(), verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(headingUppercase(stringResource(R.string.store_details)), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) + if (scores != null) StoreDetailRows(developer, publisher, releaseDate, scores) else StoreDetailRows(developer, publisher, releaseDate, GameScores(Lookup.None, Lookup.None)) + Box(Modifier.padding(top = 8.dp)) { resources() } + } + } +} + +private val AboutHeight = 260.dp + +@Composable +internal fun Modifier.tabPanel(): Modifier { + if (LocalGlass.current != null) return glass(RoundedCornerShape(22.dp), 0.22f).padding(horizontal = 18.dp, vertical = 14.dp) + 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, if (LocalGlass.current != null) colors.background.copy(alpha = 0.72f) else 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) + } +} + +@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 +internal fun FactRow(label: String, value: String, labelWidth: androidx.compose.ui.unit.Dp = 150.dp) { + 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(labelWidth)) + Text(value, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f), maxLines = 2, overflow = TextOverflow.Ellipsis) + } +} + +@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 f8f50a5eb..8055f0864 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/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt new file mode 100644 index 000000000..a2660d1b4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -0,0 +1,265 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.BiasAlignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.geometry.isSpecified +import androidx.compose.ui.graphics.BlendMode +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.ColorMatrix +import androidx.compose.ui.graphics.CompositingStrategy +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Paint +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.clipRect +import androidx.compose.ui.graphics.drawscope.translate +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.LayoutCoordinates +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.dp +import coil.compose.AsyncImage +import coil.imageLoader +import coil.compose.rememberAsyncImagePainter +import coil.request.ImageRequest +import coil.size.Precision +import kotlin.math.max + +internal val LocalPillButtons = compositionLocalOf { false } + +internal class GlassBackdrop { + var painter: Painter? = null + var coords: LayoutCoordinates? = null + var light: Boolean = false + var ready by mutableStateOf(false) + + fun offsetOf(surface: LayoutCoordinates?): Offset? { + val base = coords?.takeIf { it.isAttached } ?: return null + val at = surface?.takeIf { it.isAttached } ?: return null + return base.localPositionOf(at, Offset.Zero) + } + + fun paint(scope: DrawScope, size: Size) { + val art = painter ?: return + scope.drawCover(art, size, if (light) LightAmbient else DarkAmbient) + } + + fun fadeBottom(scope: DrawScope, size: Size) { + val fade = minOf(size.height * 0.5f, with(scope) { 240.dp.toPx() }) + if (size.height <= 0f) return + scope.drawRect(Brush.verticalGradient((1f - fade / size.height) to Color.Black, 1f to Color.Transparent), size = size, blendMode = BlendMode.DstIn) + } +} + +internal val LocalGlass = compositionLocalOf<GlassBackdrop?> { null } + +private val DarkAmbient = ColorFilter.colorMatrix( + ColorMatrix().apply { + setToSaturation(1.3f) + timesAssign(ColorMatrix(floatArrayOf(0.55f, 0f, 0f, 0f, 0f, 0f, 0.55f, 0f, 0f, 0f, 0f, 0f, 0.55f, 0f, 0f, 0f, 0f, 0f, 1f, 0f))) + }, +) +private val LightAmbient = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(1.1f) }) + +private fun DrawScope.drawCover(painter: Painter, into: Size, filter: ColorFilter) { + val intrinsic = painter.intrinsicSize + if (!intrinsic.isSpecified) return + val iw = intrinsic.width + val ih = intrinsic.height + if (iw <= 0f || ih <= 0f || into.width <= 0f || into.height <= 0f) return + val scale = max(into.width / iw, into.height / ih) + val w = iw * scale + val h = ih * scale + clipRect(0f, 0f, into.width, into.height) { + translate((into.width - w) * AmbientBiasX, (into.height - h) * AmbientBiasY) { + with(painter) { draw(Size(w, h), colorFilter = filter) } + } + } +} + +private const val AmbientBiasX = 0.6f +private const val AmbientBiasY = 0.05f + +private fun ambientRequest(ctx: android.content.Context, model: Any?): ImageRequest? = + model?.let { ImageRequest.Builder(ctx).data(it).size(AmbientPixels, AmbientPixels).precision(Precision.EXACT).memoryCacheKey("wash:$it").build() } + +private const val AmbientPixels = 6 + +@Composable +private fun rememberArtBrightness(model: Any?): Float { + val ctx = LocalContext.current + val data = (model as? ImageRequest)?.data ?: model + val brightness by produceState(0.3f, data) { + if (data == null) return@produceState + val request = ImageRequest.Builder(ctx).data(data).size(SamplePixels, SamplePixels).precision(Precision.EXACT) + .allowHardware(false).memoryCacheKey("lum:$data").build() + val bitmap = (ctx.imageLoader.execute(request).drawable as? android.graphics.drawable.BitmapDrawable)?.bitmap ?: return@produceState + var light = 0.0 + var saturation = 0.0 + for (y in 0 until bitmap.height) for (x in 0 until bitmap.width) { + val pixel = Color(bitmap.getPixel(x, y)) + val top = maxOf(pixel.red, pixel.green, pixel.blue) + light += pixel.luminance() + if (top > 0f) saturation += (top - minOf(pixel.red, pixel.green, pixel.blue)) / top + } + val count = bitmap.width * bitmap.height + value = ((light - SaturationWeight * saturation) / count).toFloat().coerceAtLeast(0f) + } + return brightness +} + +private const val SamplePixels = 8 +private const val SaturationWeight = 0.6 + +@Composable +internal fun GameBackdrop( + art: Any?, ambient: Any?, fallbackHue: Float, + fadeTop: Boolean, + modifier: Modifier = Modifier, + onArtPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit = {}, + content: @Composable () -> Unit, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val glass = remember { GlassBackdrop() } + glass.light = colors.background.luminance() > 0.5f + val wash = rememberAsyncImagePainter(remember(ambient) { ambientRequest(ctx, ambient ?: art) }) + glass.painter = if (ambient != null || art != null) wash else null + val edge = 24.dp + val artMin = with(LocalDensity.current) { ArtMin.toPx() } + Box( + modifier.fillMaxWidth().onGloballyPositioned { + glass.coords = it + if (!glass.ready) glass.ready = true + if (art == null) { + val at = it.boundsInRoot() + onArtPlaced(Rect(at.left, at.top, at.right, at.top + artMin)) + } + }, + ) { + DisposableEffect(art == null) { onDispose { if (art == null) onArtPlaced(null) } } + Box( + Modifier.matchParentSize() + .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen } + .drawWithContent { + if (glass.painter == null) drawRect(artBrush(fallbackHue), alpha = 0.55f) else glass.paint(this, size) + drawRect(colors.background.copy(alpha = if (glass.light) 0.7f else 0.58f)) + if (fadeTop) drawRect(Brush.verticalGradient(0f to Color.Transparent, (edge.toPx() / size.height).coerceAtMost(0.5f) to Color.Black), blendMode = BlendMode.DstIn) + glass.fadeBottom(this, size) + }, + ) + if (art != null) ArtLayer(art, ambient ?: art, fadeTop, onArtPlaced) + CompositionLocalProvider(LocalGlass provides glass) { content() } + } +} + +@Composable +private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { + val colors = MaterialTheme.colorScheme + val light = colors.background.luminance() > 0.5f + val pale = ((rememberArtBrightness(sample) - 0.28f) / 0.5f).coerceIn(0f, 1f) + val dim = if (light) 1f else 1f - 0.4f * pale + val artFilter = remember(dim) { ColorFilter.colorMatrix(ColorMatrix(floatArrayOf(dim, 0f, 0f, 0f, 0f, 0f, dim, 0f, 0f, 0f, 0f, 0f, dim, 0f, 0f, 0f, 0f, 0f, 1f, 0f))) } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val height = (maxWidth * 0.4f).coerceIn(ArtMin, ArtMax) + DisposableEffect(Unit) { onDispose { onPlaced(null) } } + Box( + Modifier.fillMaxWidth().height(height) + .onGloballyPositioned { onPlaced(it.boundsInRoot()) } + .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen } + .drawWithContent { + drawContent() + drawRect(Brush.horizontalGradient(0.08f to Color.Transparent, 0.55f to Color.Black), blendMode = BlendMode.DstIn) + drawRect(Brush.verticalGradient(0.55f to Color.Black, 1f to Color.Transparent), blendMode = BlendMode.DstIn) + if (fadeTop) drawRect(Brush.verticalGradient(0f to Color.Transparent, (24.dp.toPx() / size.height) to Color.Black), blendMode = BlendMode.DstIn) + }, + ) { + AsyncImage( + model = model, contentDescription = null, contentScale = ContentScale.Crop, + alignment = BiasAlignment(0.45f, -0.35f), + colorFilter = artFilter, + modifier = Modifier.matchParentSize(), + ) + Box( + Modifier.matchParentSize().drawBehind { + drawRect(colors.background.copy(alpha = if (light) 0.1f else 0.12f + 0.3f * pale)) + drawRect( + Brush.radialGradient( + 0f to colors.background.copy(alpha = if (light) 0.5f else 0.66f), + 0.55f to colors.background.copy(alpha = if (light) 0.2f else 0.3f), + 1f to Color.Transparent, + center = Offset(size.width * 0.22f, size.height * 0.55f), radius = size.width * 0.55f, + ), + ) + }, + ) + } + } +} + +private val ArtMin = 220.dp +private val ArtMax = 340.dp + +@Composable +internal fun Modifier.glass(shape: Shape, lift: Float = 0f): Modifier { + val g = LocalGlass.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + if (g == null) return clip(shape).background(colors.surface).border(1.dp, pal.line2, shape) + val light = g.light + val tint = colors.background.copy(alpha = if (light) 0.62f else 0.46f + lift) + val rim = if (light) Color.Black.copy(alpha = 0.1f) else Color.White.copy(alpha = 0.12f + lift) + val self = remember { arrayOfNulls<LayoutCoordinates>(1) } + var placed by remember { mutableIntStateOf(0) } + val last = remember { longArrayOf(Long.MIN_VALUE) } + return clip(shape) + .onGloballyPositioned { c -> + self[0] = c + val at = g.offsetOf(c) ?: return@onGloballyPositioned + val key = (at.x.toLong() shl 32) xor (at.y.toLong() and 0xffffffffL) + if (key != last[0]) { last[0] = key; placed++ } + } + .drawBehind { + val base = g.coords?.size + if (placed >= 0 && g.ready && base != null) g.offsetOf(self[0])?.let { at -> + val wash = Size(base.width.toFloat(), base.height.toFloat()) + drawIntoCanvas { canvas -> + canvas.saveLayer(Rect(0f, 0f, size.width, size.height), Paint()) + translate(-at.x, -at.y) { g.paint(this, wash); g.fadeBottom(this, wash) } + canvas.restore() + } + } + drawRect(tint) + } + .border(1.dp, rim, shape) +} 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 000000000..3eb42902b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt @@ -0,0 +1,92 @@ +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.MaterialTheme +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 glass = LocalGlass.current != null + val shape = if (glass) RoundedCornerShape(99.dp) else 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.14f) else if (glass) Color.White.copy(alpha = 0.07f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, restColor = if (glass) Color.White.copy(alpha = 0.12f) else Color.Transparent) + .semantics { contentDescription = description } + .hoverable(source).clickable(interactionSource = source, indication = LocalIndication.current, role = Role.Button, onClick = open) + .controllerConfirm(onClick = open).padding(horizontal = if (glass) 14.dp else 8.dp), + ) { + Text(label, fontSize = if (glass) 13.sp else 12.sp, fontWeight = FontWeight.Medium, color = if (glass && !hot) MaterialTheme.colorScheme.onBackground else 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 466d57aec..2b369c20a 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/GestureActions.kt b/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt index 56643effe..2ada3923e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt @@ -41,7 +41,6 @@ internal fun filterGestureActions(actions: List<GestureAction>, query: String, g action.title.contains(word, ignoreCase = true) || action.id.removePrefix("key_").replace('_', ' ').contains(word, ignoreCase = true) } }.sortedWith(compareBy<GestureAction> { it.group.ordinal }.thenComparator { a, b -> - // Function keys follow their numeric sequence; names use the UI locale. if (a.group == GestureActionGroup.FUNCTION) { a.id.removePrefix("key_F").toInt().compareTo(b.id.removePrefix("key_F").toInt()) } else collator.compare(a.title, b.title) 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 1f53c272d..c2dde844e 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 92e0aef3b..877cad924 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/GlassesPhonePanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt index 625c30efb..f5e9138bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt @@ -28,7 +28,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R -/** Actions for the phone while the picture is on the glasses. Null hides the button. */ internal class GlassesPhoneActions( val onRecenter: (() -> Unit)?, val onRecenterJoyCons: (() -> Unit)?, 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 000000000..dd362fe52 --- /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/GogMaintenanceUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt new file mode 100644 index 000000000..57f692339 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt @@ -0,0 +1,193 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Row +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.foundation.background +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Build +import androidx.compose.material3.Text +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.Alignment +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.gog.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +@Composable +internal fun GogMaintenanceActions(game: InstalledStoreGame) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() + var menu by remember { mutableStateOf(false) } + var patches by remember { mutableStateOf<List<GogOfflineDownload>?>(null) } + var proposal by remember { mutableStateOf<GogMaintenance.Proposal?>(null) } + var error by remember { mutableStateOf<String?>(null) } + var busy by remember { mutableStateOf(false) } + var recoverablePatch by remember { mutableStateOf(false) } + val key = "gog:${game.sidecar.id}" + val download = com.droiddeck.launcher.stores.StoresState.download(key) + val active = download?.isActive == true + val check = GogMaintenance.checks[game.sidecar.id] + LaunchedEffect(game.folder.path) { GogMaintenance.check(ctx, game) } + LaunchedEffect(menu, active) { + if (menu) { + recoverablePatch = false + val result = withContext(Dispatchers.IO) { runCatching { + GogFiles.read(GogFiles.journal(game.folder))?.let { + it.optString("operation") == GogOperation.PATCH.name && it.optString("phase") in setOf("patch-starting", "patch-applying", "patch-uncertain") + } == true + } } + result.onSuccess { recoverablePatch = it }.onFailure { error = it.message } + } + } + fun prepare(operation: GogOperation, patch: GogOfflineDownload? = null) { + menu = false; patches = null; busy = true; error = null + scope.launch { + runCatching { withContext(Dispatchers.IO) { GogMaintenance.prepare(ctx, game, operation, patch) } } + .onSuccess { proposal = it }.onFailure { error = it.message } + busy = false + } + } + if (active) { + ActionChip(downloadLabel(download!!), ok = false) + if (download.interruptible) { + SecondaryButton(stringResource(if (download.state == DownloadState.PAUSED) R.string.stores_dl_resume else R.string.stores_dl_pause)) { + if (download.state == DownloadState.PAUSED) DownloadQueue.resume(ctx, key) else DownloadQueue.pause(key) + } + } else Text(stringResource(R.string.gog_patch_in_session), color = MaterialTheme.colorScheme.onSurfaceVariant) + } else if (!game.sidecar.isInstalled || GogFiles.journal(game.folder).exists()) { + SecondaryButton(stringResource(R.string.gog_resume), modifier = Modifier.testTag("gog-resume")) { + busy = true + scope.launch { + runCatching { + withContext(Dispatchers.IO) { + GogMaintenance.resume(ctx, game) + } + }.onSuccess { proposal = it }.onFailure { error = it.message } + busy = false + } + } + } else if (check?.state == GogMaintenance.State.AVAILABLE) { + SecondaryButton(stringResource(R.string.gog_update, check.version.ifBlank { game.sidecar.title }), enabled = !busy, modifier = Modifier.testTag("gog-update")) { prepare(GogOperation.UPDATE) } + } + androidx.compose.foundation.layout.Box { + val manageLabel = stringResource(if (busy) R.string.common_checking else R.string.gog_maintenance) + if (LocalPillButtons.current) androidx.compose.foundation.layout.Box(Modifier.testTag("gog-maintenance")) { + IconAction(Icons.Outlined.Build, manageLabel, "game:gog-maintenance", enabled = !busy && !active) { menu = !menu } + } else SecondaryButton(manageLabel, enabled = !busy && !active, modifier = Modifier.testTag("gog-maintenance")) { menu = !menu } + AnchoredMenu(menu, { menu = false }, title = stringResource(R.string.gog_maintenance), compact = true) { first -> + MenuItem(stringResource(R.string.common_update), checked = false) { prepare(GogOperation.UPDATE) } + MenuItem(stringResource(R.string.gog_check), checked = false, focusRequester = first) { menu = false; GogMaintenance.check(ctx, game, true) } + MenuItem(stringResource(R.string.gog_repair), checked = false, modifier = Modifier.testTag("gog-repair")) { prepare(GogOperation.REPAIR) } + MenuItem(stringResource(R.string.gog_patches), checked = false, modifier = Modifier.testTag("gog-patches")) { + menu = false; busy = true + scope.launch { + runCatching { withContext(Dispatchers.IO) { GogMaintenance.offlinePatches(ctx, game) } } + .onSuccess { patches = it }.onFailure { error = it.message } + busy = false + } + } + MenuItem(stringResource(R.string.gog_refresh), checked = false) { prepare(GogOperation.REFRESH) } + if (recoverablePatch) MenuItem(stringResource(R.string.gog_recover), checked = false, modifier = Modifier.testTag("gog-recover")) { + menu = false; busy = true + scope.launch { + runCatching { withContext(Dispatchers.IO) { GogMaintenance.recoverPatch(ctx, game) } }.onFailure { error = it.message } + busy = false + } + } + } + } + if (check?.state == GogMaintenance.State.FAILED || check?.state == GogMaintenance.State.UNKNOWN) { + if (check.reason.isNotBlank()) Text(check.reason, fontSize = 12.sp, color = colors.onSurfaceVariant) + } + patches?.let { list -> + val shown = rememberShown { patches = null } + val close = { shown.targetState = false } + AppDialog(shown, close, "gogPatches", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.gog_patches), close) + Text(game.sidecar.title, fontSize = 12.sp, lineHeight = 16.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(stringResource(R.string.gog_patch_requirements), fontSize = 12.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant) + if (list.isEmpty()) Text(stringResource(R.string.gog_no_patches), fontSize = 13.sp, color = colors.onSurfaceVariant) + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + list.forEach { patch -> + ListRow(onClick = { close(); prepare(GogOperation.PATCH, patch) }) { + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(patch.name, fontSize = 13.sp, lineHeight = 18.sp, fontWeight = FontWeight.Medium, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(listOf(StoreLanguage.displayName(patch.language).ifBlank { patch.language }, patch.version, formatBytes(patch.size)).filter { it.isNotBlank() }.joinToString(" · "), + fontSize = 11.sp, lineHeight = 15.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Text(stringResource(R.string.gog_select_patch), fontSize = 12.sp, color = LocalPalette.current.signal) + } + } + } + SecondaryButton(stringResource(R.string.gog_refresh)) { prepare(GogOperation.REFRESH) } + } + } + proposal?.let { selected -> + val shown = rememberShown { proposal = null } + val close = { shown.targetState = false } + val action = when (selected.operation) { + GogOperation.UPDATE -> R.string.common_update + GogOperation.REPAIR -> R.string.gog_repair_action + GogOperation.PATCH -> R.string.gog_open_patch + GogOperation.REFRESH -> R.string.gog_refresh_action + } + AppDialog(shown, close, "gogMaintenance", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(action), close) + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(listOf(game.sidecar.title, selected.before.version).filter { it.isNotBlank() }.joinToString(" · "), fontSize = 12.sp, lineHeight = 16.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (selected.operation != GogOperation.REPAIR) Text(selected.patch?.name ?: selected.target.version.ifBlank { selected.target.build }, fontSize = 15.sp, lineHeight = 20.sp, fontWeight = FontWeight.SemiBold, + color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis) + } + Row(horizontalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier.fillMaxWidth().clip(Shape12).background(colors.surface.copy(alpha = 0.65f)).padding(12.dp)) { + GogMetric(stringResource(R.string.gog_download_label), formatBytes(selected.downloadBytes), Modifier.weight(1f)) + GogMetric(stringResource(if (selected.operation == GogOperation.PATCH || selected.operation == GogOperation.REFRESH) R.string.gog_space_estimate_label else R.string.gog_space_label), + formatBytes(selected.diskBytes), Modifier.weight(1f)) + } + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text(stringResource(R.string.gog_managed_files), fontSize = 12.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant) + if (selected.fullFiles) Text(stringResource(R.string.gog_full_files), fontSize = 12.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant) + if (selected.operation == GogOperation.PATCH) Text(stringResource(R.string.gog_patch_installer_note), fontSize = 12.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant) + } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { + PrimaryButton(stringResource(action), enabled = !busy, modifier = Modifier.testTag("gog-apply")) { + busy = true + close() + scope.launch { + runCatching { withContext(Dispatchers.IO) { GogMaintenance.enqueue(ctx, game, selected) } }.onFailure { error = it.message } + busy = false + } + } + SecondaryButton(stringResource(R.string.common_cancel), onClick = close) + } + } + } + error?.let { Text(it, fontSize = 12.sp, color = colors.error) } +} + +@Composable +private fun GogMetric(label: String, value: String, modifier: Modifier) { + Column(modifier, verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(label, fontSize = 11.sp, lineHeight = 15.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(value, fontSize = 15.sp, lineHeight = 20.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) + } +} 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 47905485d..69936548c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import com.droiddeck.launcher.gpu.DeviceInfo +import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.compose.ui.res.stringResource @@ -47,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 @@ -128,6 +129,8 @@ class GpuDriversState( val runtime: DriverSlot = DriverSlot(), val canRestart: Boolean = true, val checkedAt: Long = 0L, + val tpUbwcMode: String? = null, + val tpUbwcRestartRequired: Boolean = false, ) { val activePair: PairRow? get() = pairs.firstOrNull { it.active } } @@ -147,6 +150,7 @@ class GpuDriversActions( val onRestoreBundled: () -> Unit = {}, val onMode: (String) -> Unit = {}, val onRestart: () -> Unit = {}, + val onTpUbwcMode: (String) -> Unit = {}, ) @Composable @@ -221,7 +225,6 @@ internal fun GpuDriversBody( val scroll = rememberScrollState() val scope = rememberCoroutineScope() val placed = remember { arrayOfNulls<LayoutCoordinates>(2) } - // Focusing the top mode shows as much of the in-use card above it as fits, without hiding the mode itself. val revealCard = { val (viewport, top) = placed if (viewport != null && top != null && viewport.isAttached && top.isAttached) scope.launch { @@ -259,6 +262,27 @@ internal fun GpuDriversBody( GPU_MODE_PAIR -> PairBody(gpu, actions) else -> MixBody(single, actions, slotFocus, onOpenSlot) } + gpu.tpUbwcMode?.let { selected -> + var advanced by rememberSaveable { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.gpu_advanced) + if (advanced) " ▴" else " ▾", modifier = Modifier.fillMaxWidth()) { advanced = !advanced } + AnimatedVisibility(advanced) { + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + ChoiceRow( + rememberMenuHost(), "tp-ubwc", stringResource(R.string.gpu_ubwc_title), + stringResource(R.string.gpu_ubwc_hint), + listOf( + SessionPrefs.TP_UBWC_AUTO to stringResource(R.string.common_auto), + SessionPrefs.TP_UBWC_ON to stringResource(R.string.widgets_on), + SessionPrefs.TP_UBWC_OFF to stringResource(R.string.widgets_off), + ), selected, onPick = actions.onTpUbwcMode, + ) + if (gpu.tpUbwcRestartRequired) { + Text(stringResource(R.string.gpu_ubwc_restart), fontSize = 13.sp, color = AttentionAmber) + if (gpu.canRestart) SecondaryButton(stringResource(R.string.gpu_restart_now), onClick = actions.onRestart) + } + } + } + } } } 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 3aae52a76..50f6a9d45 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 000000000..276d131fe --- /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 000000000..09c6d08f3 --- /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 cfeeeb8c4..0a0f0a813 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/ItchUpdateButton.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchUpdateButton.kt new file mode 100644 index 000000000..d916af32b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchUpdateButton.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.MaterialTheme +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.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.itch.ItchUpdate +import com.droiddeck.launcher.stores.itch.ItchUpdates + +@Composable +internal fun ItchCheckButton(installed: InstalledStoreGame) { + val ctx = LocalContext.current + IconAction(Icons.Filled.Refresh, stringResource(R.string.store_check_updates), "game:check-updates", enabled = ItchUpdates.checkingKey == null, frosted = true) { + ItchUpdates.checkGame(ctx, installed) + } +} + +@Composable +internal fun ItchUpdateButton(installed: InstalledStoreGame, enabled: Boolean) { + val ctx = LocalContext.current + val update = ItchUpdates.available[installed.key] ?: return + var asking by remember { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.common_update), enabled = enabled) { + if (update.replaced) asking = true else ItchUpdates.start(ctx, installed, update) + } + if (asking) ReplacedDialog(installed, update) { asking = false } +} + +@Composable +private fun ReplacedDialog(installed: InstalledStoreGame, update: ItchUpdate, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "itchUpdate", wide = false, maxWidth = 460.dp) { + DialogTitleRow(installed.sidecar.title, close) + Text( + stringResource(R.string.stores_itch_update_replaced, update.filename.ifBlank { update.uploadId }), + fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + PrimaryButton(stringResource(R.string.common_update)) { + close() + ItchUpdates.start(ctx, installed, update) + } + SecondaryButton(stringResource(R.string.common_cancel)) { close() } + } + } +} 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 9777ee83b..a002b10a2 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 nav = children[2].measure(Constraints( + minWidth = if (bottomNavigation) width else 0, maxWidth = width, + minHeight = if (bottomNavigation) 0 else height, maxHeight = height, + )) + val line = if ((if (bottomNavigation) nav.height else nav.width) == 0) 0 else 1.dp.roundToPx() + 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 000000000..482aeb5a6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -0,0 +1,984 @@ +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.tween +import androidx.compose.animation.core.FastOutSlowInEasing +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.BoxScope +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.aspectRatio +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.gestures.animateScrollBy +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.Add +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.Remove +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.filled.Visibility +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.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.geometry.Rect +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.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.download.DownloadStage +import com.droiddeck.launcher.stores.download.DownloadState +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.itch.ItchUpdates +import com.droiddeck.launcher.stores.gog.GogMaintenance +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 + +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" } +} + +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 } } + +internal object LibraryDisplay { + val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) + var level by mutableIntStateOf(2) + private set + var title by mutableStateOf(true) + private set + var size by mutableStateOf(true) + private set + + fun load(context: android.content.Context) { + level = SessionPrefs.libraryCardLevel(context).coerceIn(0, scales.lastIndex) + title = SessionPrefs.libraryShowTitle(context) + size = SessionPrefs.libraryShowSize(context) + } + + fun step(context: android.content.Context, by: Int) { + level = (level + by).coerceIn(0, scales.lastIndex) + SessionPrefs.setLibraryCardLevel(context, level) + } + + fun toggleTitle(context: android.content.Context) { + title = !title + SessionPrefs.setLibraryShowTitle(context, title) + } + + fun toggleSize(context: android.content.Context) { + size = !size + SessionPrefs.setLibraryShowSize(context, size) + } +} + +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) } + remember { LibraryDisplay.load(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) + ItchUpdates.check(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).padding(top = if (narrow) 10.dp else 14.dp), + bleedHorizontal = if (narrow) 14.dp else 22.dp, bleedTop = 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 { !s.shortcutPicker },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 if (listMode) CardWidth else LibraryCardWidth) * LibraryDisplay.scales[LibraryDisplay.level] + 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 currentIndex = headerItems + index + if (split == 0) 0 else if (index < 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 { + launch { grid.revealRow(currentIndex, targetIndex, direction, with(density) { 10.dp.toPx() }) } + 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, showSource = source == LIBRARY_ALL) + } + 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) + } + } +} + +internal suspend fun LazyGridState.revealRow(currentIndex: Int, targetIndex: Int, direction: Int, gapPx: Float) { + val current = layoutInfo.visibleItemsInfo.firstOrNull { it.index == currentIndex } + if (current != null) { + val row = current.size.height + gapPx + val delta = if (direction > 0) { + current.offset.y + 2 * row - gapPx - (layoutInfo.viewportSize.height - layoutInfo.afterContentPadding) + } else { + current.offset.y - row - layoutInfo.beforeContentPadding + } + if (direction > 0 && delta > 0f || direction < 0 && delta < 0f) animateScrollBy(delta, tween(durationMillis = 160, easing = FastOutSlowInEasing)) + } + if (layoutInfo.visibleItemsInfo.none { it.index == targetIndex }) scrollToItem(targetIndex) +} + +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, inlineWhenStacked = true, + 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() + } + }, + ) { + DisplayButton() + 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, showSource: Boolean) { + 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), + ) { + LibraryArt(e, wide, tall, download, hot, capsule, showSource) + } +} + +internal val LibraryCardWidth = 150.dp + +internal fun libraryTileWidth() = LibraryCardWidth * LibraryDisplay.scales[LibraryDisplay.level] + +@Composable +private fun LibraryArt(e: LibraryEntry, wide: Any?, tall: Any?, download: DownloadEntry?, hot: Boolean, capsule: Boolean, showSource: Boolean) { + val chip = when { + download != null -> "${download.percent}%" + e.item != null && StoresState.isUnfinished(e.item) -> stringResource(R.string.stores_resume) + e.installed && libraryUpdateAvailable(e) -> stringResource(R.string.common_update) + else -> null + } + ArtCard( + e.title, wide, tall, download, hot, capsule, chip, + badge = if (showSource) ({ SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) }) else null, + ) { LibrarySize(e) } +} + +@Composable +internal fun ArtCard( + title: String, wide: Any?, tall: Any?, download: DownloadEntry?, hot: Boolean, capsule: Boolean, chip: String?, + badge: (@Composable BoxScope.() -> Unit)? = null, detail: @Composable () -> Unit, +) { + val url = if (capsule) tall ?: wide else wide ?: tall + val art = cardArtRequest(url, tall) + val ratio = if (capsule) 5f / 7f else 16f / 9f + var offRatio by remember(url) { mutableStateOf(false) } + var trim by remember(url) { mutableStateOf(false) } + val blurs = android.os.Build.VERSION.SDK_INT >= 31 + Box( + Modifier.fillMaxWidth().aspectRatio(ratio).background(Color(0xFF101318)) + .then(if (url == null) Modifier.background(artBrush(hueOf(title))) else Modifier), + ) { + if (art != null && offRatio) { + AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize().blur(32.dp)) + Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = if (blurs) 0.18f else 0.6f))) + } + if (art != null) AsyncImage( + model = art, contentDescription = null, contentScale = if (trim) ContentScale.Crop else ContentScale.Fit, modifier = Modifier.matchParentSize(), + onSuccess = { r -> + val d = r.result.drawable + if (d.intrinsicWidth > 0 && d.intrinsicHeight > 0) { + val shape = d.intrinsicWidth.toFloat() / d.intrinsicHeight + trim = !capsule && shape > ratio * 1.25f + offRatio = !trim && kotlin.math.abs(shape / ratio - 1f) > 0.03f + } + }, + ) + badge?.invoke(this) + if (chip != null) Box(Modifier.align(Alignment.TopEnd).padding(6.dp)) { StateChip(chip, ChipTone.BUSY, small = true) } + val showName = LibraryDisplay.title || hot + val showDetail = LibraryDisplay.size || hot + if (showName || showDetail) Column( + verticalArrangement = Arrangement.spacedBy(1.dp), + modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth() + .background(Brush.verticalGradient(0f to Color.Transparent, 0.6f to Color.Black.copy(alpha = 0.78f), 1f to Color.Black.copy(alpha = 0.92f))) + .padding(start = 8.dp, end = 8.dp, top = 20.dp, bottom = if (download != null) 14.dp else 6.dp), + ) { + if (showName) Text(title, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = if (hot) 2 else 1, overflow = TextOverflow.Ellipsis, lineHeight = 13.sp) + if (showDetail) detail() + } + if (download != null) Box(Modifier.align(Alignment.BottomCenter).padding(start = 6.dp, end = 6.dp, bottom = 5.dp)) { + ProgressBarThin(download.fraction, paused = download.state == DownloadState.PAUSED, verify = download.stage == DownloadStage.VERIFY) + } + } +} + +@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) } +} + +private fun librarySize(e: LibraryEntry): Long? = 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 } + +@Composable +private fun LibrarySize(e: LibraryEntry) { + val size = librarySize(e)?.takeIf { it > 0 } ?: return + Text(formatBytes(size), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) +} + +@Composable +internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?, showDownload: Boolean = true) { + val pal = LocalPalette.current + val size = librarySize(e) + 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 (e.installed && libraryUpdateAvailable(e)) Text(stringResource(R.string.common_update), fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + if (size != null && size > 0) Text(formatBytes(size), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) + if (!e.installed && showDownload) Icon(Icons.Outlined.Download, stringResource(R.string.stores_section_not_installed), tint = Color.White, modifier = Modifier.size(12.dp)) + } + } +} + +private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available } == true || + e.source == Store.GOG.id && (e.item?.id ?: e.game?.storeId)?.let { GogMaintenance.checks[it]?.state } == GogMaintenance.State.AVAILABLE + +@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 && libraryUpdateAvailable(e) -> stringResource(R.string.common_update) + !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 +internal 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)) } +} + +@Composable +internal 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 +internal fun DisplayButton() { + val pal = LocalPalette.current + val ctx = LocalContext.current + val title = stringResource(R.string.library_display) + var at by remember { mutableStateOf<Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.Visibility, "display") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 4, + handle = { Icon(Icons.Filled.Visibility, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + val last = LibraryDisplay.scales.lastIndex + StepChoice( + stringResource(R.string.library_display_larger), icon = Icons.Filled.Add, enabled = open && LibraryDisplay.level < last, + trailing = "${LibraryDisplay.level + 1}/${last + 1}", + modifier = Modifier.fillMaxWidth().stepItem(0).focusRequester(first), + ) { LibraryDisplay.step(ctx, 1) } + StepChoice( + stringResource(R.string.library_display_smaller), icon = Icons.Filled.Remove, enabled = open && LibraryDisplay.level > 0, + modifier = Modifier.fillMaxWidth().stepItem(1), + ) { LibraryDisplay.step(ctx, -1) } + StepChoice( + stringResource(R.string.library_display_title), selected = LibraryDisplay.title, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(2), + ) { LibraryDisplay.toggleTitle(ctx) } + StepChoice( + stringResource(R.string.library_display_size), selected = LibraryDisplay.size, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(3), + ) { LibraryDisplay.toggleSize(ctx) } + } + }) + } + } +} + +@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/LogoPositionDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt index 2ddbdbe28..a6501dacf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt @@ -57,10 +57,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File -/** Steam's library hero is 3840 x 1240, so the preview keeps that shape. */ private const val HERO_RATIO = 3840f / 1240f -/** The gap Steam leaves between the pinned logo and the edge of the hero, as a share of the hero's width. */ private const val EDGE = 0.03f @Composable @@ -86,10 +84,6 @@ private fun LogoPosition.Pin.alignment(): Alignment = when (this) { internal fun logoPositionSummary(value: LogoPosition.Value?): String = if (value == null) stringResource(R.string.logo_pos_default) else "${value.pin.label()} · ${value.widthPct}%" -/** - * Where a game's logo sits on its background in Steam's library: the logo box is [Value.widthPct] x [Value.heightPct] of the - * background, pinned to one of five places, and the logo is drawn as large as fits in it. - */ @Composable private fun LogoPreview(hero: File?, logo: File?, value: LogoPosition.Value) { val shape = RoundedCornerShape(10.dp) @@ -130,7 +124,6 @@ private fun PinChip(label: String, selected: Boolean, focus: FocusRequester?, on } } -/** The "Adjust logo" screen: the game's background with its logo on it, where to pin the logo and how large to draw it. */ @OptIn(ExperimentalLayoutApi::class) @Composable internal fun LogoPositionDialog( 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 0f4483c0a..aa2b6da6c 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 a444f3711..63508ba42 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, @@ -68,11 +68,13 @@ class ModeSettings( val pipSupported: Boolean = false, val pipAutoEnter: Boolean = false, val oscMode: String?, + val backHold: Boolean = true, val backActionsInverted: Boolean = false, val directAudio: Boolean?, val mic: Boolean?, val gameStorage: String? = null, val storageOptions: List<com.droiddeck.launcher.session.GameStorage.Option> = emptyList(), + val steamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Entry> = emptyList(), val storageDiagnostics: Boolean = false, val fexPreset: String? = null, val forceSsbs: Boolean = false, @@ -80,8 +82,8 @@ class ModeSettings( val picturePosition: String? = null, val stretch16x9: Boolean? = null, val steamClientArch: String? = null, - /** Steam only: a game launched from the front end returns there when it closes; null hides the row. */ val returnAfterGame: Boolean? = null, + val shaderPrecache: Boolean? = null, val steamRepairQueued: Boolean = false, val mangoapp: Boolean = true, val steamController: String? = null, @@ -93,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, @@ -113,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, @@ -121,12 +118,16 @@ class ModeSettingsActions( val onSteamDownloadsInBackground: (Boolean) -> Unit = {}, val onPipAutoEnter: (Boolean) -> Unit = {}, val onOsc: (String) -> Unit, + val onBackHold: (Boolean) -> Unit = {}, val onBackActionsInverted: (Boolean) -> Unit = {}, val onDirectAudio: (Boolean) -> Unit, val onMic: (Boolean) -> Unit, val onGameStorage: (path: String, label: String) -> Unit = { _, _ -> }, val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, + val onAddSteamLibrary: () -> Unit = {}, + val onRenameSteamLibrary: (id: String, label: String) -> Unit = { _, _ -> }, + val onRemoveSteamLibrary: (id: String) -> Unit = {}, val onFexPreset: (String) -> Unit = {}, val onForceSsbs: (Boolean) -> Unit = {}, val onSyncBackend: (String) -> Unit = {}, @@ -136,6 +137,7 @@ class ModeSettingsActions( val onSteamClientArch: (String) -> Unit = {}, val onMangoapp: (Boolean) -> Unit = {}, val onReturnAfterGame: (Boolean) -> Unit = {}, + val onShaderPrecache: (Boolean) -> Unit = {}, val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, @@ -144,8 +146,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 = {}, @@ -155,22 +158,19 @@ 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. */ internal fun fexVersionOf(script: String): String? = Regex("""(?m)^FEX_TAG=(fex-\d+-r\d+)\s*$""").find(script)?.let { fexVersionOfTag(it.groupValues[1]) } -/** "2610 r5" from a tag such as fex-2610-r5. */ internal fun fexVersionOfTag(tag: String): String? = Regex("""fex-(\d+)-r(\d+)""").matchEntire(tag.trim())?.let { "${it.groupValues[1]} r${it.groupValues[2]}" } -/** The build installed in the runtime, else the one fex.json names, else the one the launcher pins. */ @Composable private fun x64FexVersion(context: android.content.Context): String? = remember { val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) 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() } @@ -204,11 +204,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), @@ -218,7 +224,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 = !com.droiddeck.launcher.session.SessionDisplay.isFollow(s.resolution) && + 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)), @@ -236,10 +243,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), @@ -294,6 +297,10 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.unfolded_controls_with_controller_hint), s.unfoldedControlsWithController, onChange = a.onUnfoldedControlsWithController, ) + if (steam) ToggleRow( + host, "back-hold", stringResource(R.string.back_hold), + stringResource(R.string.back_hold_hint), s.backHold, onChange = a.onBackHold, + ) if (steam) ChoiceRow( host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( @@ -301,6 +308,10 @@ 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.backHold && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } + PhysicalShortcutRows() } } if (tab == SheetTab.AUDIO && steam) { @@ -395,6 +406,34 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: onChange = a.onStorageDiagnostics, ) } + if (s.gameStorage != null) SettingsGroup(stringResource(R.string.libraries_title), detail = stringResource(R.string.libraries_applies_next)) { + var renaming by remember { mutableStateOf<com.droiddeck.launcher.session.SteamLibraries.Entry?>(null) } + for (library in s.steamLibraries) { + val attached = library.host.isDirectory + SettingsRow(library.label, if (attached) library.path else stringResource(R.string.libraries_missing, library.path)) { + Row(horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(6.dp)) { + SecondaryButton(stringResource(R.string.libraries_rename), compact = true) { renaming = library } + SecondaryButton(stringResource(R.string.edit_remove), compact = true) { a.onRemoveSteamLibrary(library.id) } + } + } + } + SettingsRow( + stringResource(R.string.libraries_add), + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) stringResource(R.string.libraries_hint) + else stringResource(R.string.libraries_full, com.droiddeck.launcher.session.SteamLibraries.MAX), + ) { + SecondaryButton( + stringResource(R.string.mode_choose_folder), + enabled = s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX, + onClick = a.onAddSteamLibrary, + ) + } + renaming?.let { library -> + TextEntryDialog(stringResource(R.string.libraries_rename_title), library.label, onDismiss = { renaming = null }) { name -> + a.onRenameSteamLibrary(library.id, name) + } + } + } } if (tab == SheetTab.STEAM && steam) { extras.account(host) @@ -478,6 +517,11 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.mode_return_after_game_hint), s.returnAfterGame, onChange = a.onReturnAfterGame, ) + if (s.shaderPrecache != null) ToggleRow( + host, "shaderprecache", stringResource(R.string.mode_shader_precache), + stringResource(R.string.mode_shader_precache_hint), + s.shaderPrecache, onChange = a.onShaderPrecache, + ) SettingsRow( stringResource(R.string.mode_steam_repair), stringResource(if (s.steamRepairQueued) R.string.mode_steam_repair_queued else R.string.mode_steam_repair_hint), @@ -492,39 +536,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 @@ -569,14 +583,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)) } }, ) } @@ -611,7 +625,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 = { @@ -619,14 +633,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)) } } }, ) @@ -638,7 +652,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 = { @@ -654,12 +668,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( @@ -670,6 +684,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(), ) } } @@ -679,7 +694,27 @@ 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)) } }, + ) +} + +@Composable +internal fun CustomFollowScaleDialog(initial: Float?, onSave: (Float) -> Unit, onDismiss: () -> Unit) { + var text by remember { mutableStateOf(initial?.let(com.droiddeck.launcher.session.SessionDisplay::formatScale) ?: "") } + val parsed = com.droiddeck.launcher.session.SessionDisplay.parseFollowScale(text) + com.droiddeck.launcher.ui.GlideAlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.display_follow_screen_scaled, "…")) }, + text = { + androidx.compose.material3.OutlinedTextField( + text, { v -> text = v.filter { it.isDigit() || it == '.' || it == ',' }.take(4) }, + label = { Text("÷") }, singleLine = true, isError = parsed == null && text.isNotEmpty(), + keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Decimal), + modifier = Modifier.focusGlide(), + ) + }, + 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/PageSwipe.kt b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt new file mode 100644 index 000000000..3e4b57fb2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt @@ -0,0 +1,59 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.input.pointer.util.VelocityTracker +import androidx.compose.ui.input.pointer.util.addPointerInputChange +import androidx.compose.ui.unit.dp +import kotlin.math.abs + +internal object PageSwipe { + var locks by mutableIntStateOf(0) + var direction by mutableIntStateOf(0) +} + +@Composable +internal fun Modifier.pageSwipe(enabled: () -> Boolean, onSwipe: (Int) -> Unit): Modifier { + val enabledNow by rememberUpdatedState(enabled) + val onSwipeNow by rememberUpdatedState(onSwipe) + return pointerInput(Unit) { + val distance = 72.dp.toPx() + val flingDistance = 32.dp.toPx() + val flingVelocity = 900.dp.toPx() + val slop = viewConfiguration.touchSlop + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Final) + if (!enabledNow() || PageSwipe.locks > 0) return@awaitEachGesture + val tracker = VelocityTracker() + tracker.addPointerInputChange(down) + var total = Offset.Zero + var mine = false + while (true) { + val event = awaitPointerEvent(PointerEventPass.Final) + if (event.changes.size > 1) return@awaitEachGesture + val change = event.changes.firstOrNull { it.id == down.id } ?: return@awaitEachGesture + if (!change.pressed) break + if (!mine && change.isConsumed) return@awaitEachGesture + total += change.position - change.previousPosition + tracker.addPointerInputChange(change) + if (!mine && abs(total.x) > slop && abs(total.x) > abs(total.y) * 2f) mine = true + if (mine) change.consume() + } + if (!mine || PageSwipe.locks > 0) return@awaitEachGesture + val vx = tracker.calculateVelocity().x + val horizontal = abs(total.x) > abs(total.y) * 1.5f + val far = abs(total.x) > distance + val flung = abs(total.x) > flingDistance && abs(vx) > flingVelocity && (vx > 0) == (total.x > 0) + if (horizontal && (far || flung)) onSwipeNow(if (total.x < 0) 1 else -1) + } + } +} 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 0fc576277..6c68c9cfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R -import androidx.annotation.StringRes +import com.droiddeck.launcher.input.PC_KEY_ROWS +import com.droiddeck.launcher.input.PC_MODIFIERS +import com.droiddeck.launcher.input.PcKey import androidx.compose.ui.res.stringResource import android.view.KeyEvent import androidx.compose.animation.animateColorAsState @@ -54,46 +56,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -private data class PcKey(val label: String, val code: Int, val weight: Float = 1f, val shifted: String? = null, @StringRes val labelRes: Int = 0) - -private fun k(label: String, code: Int, weight: Float = 1f, shifted: String? = null) = PcKey(label, code, weight, shifted) - -private fun k(@StringRes labelRes: Int, code: Int, weight: Float = 1f) = PcKey("", code, weight, null, labelRes) - -private val ROWS: List<List<PcKey>> = listOf( - listOf( - k(R.string.pckb_key_esc, 1), k("F1", 59), k("F2", 60), k("F3", 61), k("F4", 62), k("F5", 63), k("F6", 64), - k("F7", 65), k("F8", 66), k("F9", 67), k("F10", 68), k("F11", 87), k("F12", 88), - k(R.string.pckb_key_ins, 110), k(R.string.pckb_key_del, 111), k(R.string.pckb_key_home, 102), k(R.string.pckb_key_end, 107), k(R.string.pckb_key_pgup, 104), k(R.string.pckb_key_pgdn, 109), - ), - listOf( - k("`", 41, shifted = "~"), k("1", 2, shifted = "!"), k("2", 3, shifted = "@"), k("3", 4, shifted = "#"), - k("4", 5, shifted = "$"), k("5", 6, shifted = "%"), k("6", 7, shifted = "^"), k("7", 8, shifted = "&"), - k("8", 9, shifted = "*"), k("9", 10, shifted = "("), k("0", 11, shifted = ")"), k("-", 12, shifted = "_"), - k("=", 13, shifted = "+"), k(R.string.pckb_key_backspace, 14, 2f), - ), - listOf( - k(R.string.pckb_key_tab, 15, 1.5f), k("q", 16), k("w", 17), k("e", 18), k("r", 19), k("t", 20), k("y", 21), - k("u", 22), k("i", 23), k("o", 24), k("p", 25), k("[", 26, shifted = "{"), k("]", 27, shifted = "}"), - k("\\", 43, 1.5f, shifted = "|"), - ), - listOf( - k(R.string.pckb_key_caps, 58, 1.75f), k("a", 30), k("s", 31), k("d", 32), k("f", 33), k("g", 34), k("h", 35), - k("j", 36), k("k", 37), k("l", 38), k(";", 39, shifted = ":"), k("'", 40, shifted = "\""), - k(R.string.pckb_key_enter, 28, 2.25f), - ), - listOf( - k(R.string.pckb_key_shift, 42, 2.25f), k("z", 44), k("x", 45), k("c", 46), k("v", 47), k("b", 48), k("n", 49), - k("m", 50), k(",", 51, shifted = "<"), k(".", 52, shifted = ">"), k("/", 53, shifted = "?"), - k(R.string.pckb_key_shift, 54, 1.75f), k("↑", 103), - ), - listOf( - k(R.string.pckb_key_ctrl, 29, 1.5f), k(R.string.pckb_key_super, 125, 1.25f), k(R.string.pckb_key_alt, 56, 1.25f), k(R.string.pckb_key_space, 57, 6.25f), - k(R.string.pckb_key_altgr, 100, 1.25f), k(R.string.pckb_key_ctrl, 97, 1.25f), k("←", 105), k("↓", 108), k("→", 106), - ), -) - -private val MODIFIERS = setOf(42, 54, 29, 97, 56, 100, 125) private const val MOD_OFF = 0 private const val MOD_ONCE = 1 private const val MOD_LOCKED = 2 @@ -115,7 +77,7 @@ fun PcKeyboard( for ((code, state) in mods.toMap()) if (state == MOD_ONCE) { sendKey(code, false); mods[code] = MOD_OFF } } fun press(key: PcKey) { - if (key.code in MODIFIERS) { + if (key.code in PC_MODIFIERS) { when (mods[key.code] ?: MOD_OFF) { MOD_OFF -> { sendKey(key.code, true); mods[key.code] = MOD_ONCE } MOD_ONCE -> mods[key.code] = MOD_LOCKED @@ -126,7 +88,7 @@ fun PcKeyboard( sendKey(key.code, true) } fun release(key: PcKey) { - if (key.code in MODIFIERS) return + if (key.code in PC_MODIFIERS) return sendKey(key.code, false) if (key.code == 58) capsOn = !capsOn releaseOnceModifiers() @@ -153,7 +115,7 @@ fun PcKeyboard( Spacer(Modifier.width(8.dp)) HeaderButton(stringResource(R.string.pckb_hide), onClose) } - ROWS.forEachIndexed { r, row -> + PC_KEY_ROWS.forEachIndexed { r, row -> Row(horizontalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.fillMaxWidth().height(rowHeight)) { row.forEachIndexed { i, key -> val state = mods[key.code] ?: MOD_OFF 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 b46133463..2c0927bc8 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,8 +46,14 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, + ramCapMb: Int, + zramClient: Boolean, + vramCapMb: Int, + deviceRamMb: Int, + ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, + cursorComposite: Boolean, guestHostname: String, phantomWarning: String?, onClientOverride: (Boolean) -> Unit, @@ -59,8 +67,12 @@ 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, onGuestHostname: (String) -> Unit, onClientCore: (Int, Boolean) -> Unit, onGameCore: (Int, Boolean) -> Unit, @@ -121,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), @@ -158,6 +191,11 @@ fun PerformancePage( else stringResource(R.string.perf_fastpath_hint), prootFastPath && !prootNoSeccomp, enabled = !prootNoSeccomp, onChange = onProotFastPath, ) + ToggleRow( + host, "cursorcomposite", stringResource(R.string.perf_cursor_composite), + stringResource(R.string.perf_cursor_composite_hint), + cursorComposite, onChange = onCursorComposite, + ) } SettingsGroup(stringResource(R.string.perf_identity)) { var draft by remember(guestHostname) { mutableStateOf(guestHostname) } @@ -174,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 10b6c00c8..60b4223f0 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 @@ -44,6 +45,7 @@ import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage @Composable fun PhantomProcessGatePage( status: PhantomProcessStatus, + applyingSavedPairing: Boolean, onDismiss: () -> Unit, onOpenDeveloperOptions: () -> Unit, onFixWithWirelessDebugging: () -> Unit, @@ -76,7 +78,7 @@ fun PhantomProcessGatePage( BoxWithConstraints(Modifier.fillMaxWidth()) { val wide = maxWidth >= 620.dp val fix: @Composable ColumnScope.() -> Unit = { - FixGroup(hasToggle, stage, environment, compact, onOpenDeveloperOptions, onFixWithWirelessDebugging, + FixGroup(hasToggle, stage, environment, compact, applyingSavedPairing, onOpenDeveloperOptions, onFixWithWirelessDebugging, onOpenNotificationSettings, onCancel = { WirelessAdbPairingService.cancel(context) }) } val side: @Composable ColumnScope.() -> Unit = { @@ -118,6 +120,7 @@ private fun FixGroup( stage: Stage, environment: GateEnvironment, compact: Boolean, + applyingSavedPairing: Boolean, onOpenDeveloperOptions: () -> Unit, onFixWithWirelessDebugging: () -> Unit, onOpenNotificationSettings: () -> Unit, @@ -130,6 +133,10 @@ private fun FixGroup( verticalArrangement = Arrangement.spacedBy(8.dp), ) { when { + applyingSavedPairing -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) + Body(stringResource(R.string.adbpair_applying)) + } pairing -> PairingProgress(stage, onCancel) hasToggle -> { Body(stringResource(R.string.gate_toggle_steps)) @@ -276,12 +283,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/PhysicalShortcutsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt new file mode 100644 index 000000000..7331d49fb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.ui + +import android.util.Log +import android.view.KeyEvent +import android.view.Window +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import androidx.compose.ui.window.DialogWindowProvider +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PhysicalShortcuts + +@Composable +internal fun PhysicalShortcutRows( + onChanged: () -> Unit = {}, + modifierFor: (PhysicalShortcuts.Action) -> Modifier = { Modifier }, +) { + val context = LocalContext.current + var bindings by remember { mutableStateOf(PhysicalShortcuts.read(context)) } + var editing by remember { mutableStateOf<PhysicalShortcuts.Action?>(null) } + Column { + for (action in PhysicalShortcuts.Action.entries) { + val assigned = bindings.filter { it.action == action } + SettingsRow( + stringResource(action.label), + assigned.joinToString { "${it.button.label} · ${it.button.name}" }.ifEmpty { null }, + ) { + SecondaryButton( + stringResource(if (assigned.isEmpty()) R.string.game_settings_default else R.string.ctrl_custom), + compact = true, + modifier = modifierFor(action).width(LocalChipMinWidth.current) + .testTag("shortcuts-assign-${action.name}"), + ) { editing = action } + } + } + } + editing?.let { action -> + PhysicalShortcutsDialog(action, onDismiss = { editing = null }, onChanged = { + bindings = PhysicalShortcuts.read(context) + onChanged() + }) + } +} + +@Composable +internal fun PhysicalShortcutsDialog( + action: PhysicalShortcuts.Action, + onDismiss: () -> Unit, + onChanged: () -> Unit = {}, +) { + val context = LocalContext.current + val bindings = remember { PhysicalShortcuts.read(context) } + var candidate by remember { mutableStateOf<PhysicalShortcuts.Button?>(null) } + var listening by remember { mutableStateOf(true) } + var capturedDevice by remember { mutableStateOf(-1) } + Dialog( + onDismissRequest = onDismiss, + properties = DialogProperties(dismissOnBackPress = !listening, usePlatformDefaultWidth = false), + ) { + CaptureShortcutKeys { event -> + if (listening && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0 && + (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B)) { + listening = false + onDismiss() + true + } else if (!listening || PhysicalShortcuts.isVolumeKey(event)) { + false + } else { + if (candidate == null && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + PhysicalShortcuts.button(event)?.let { button -> + candidate = button + capturedDevice = event.deviceId + Log.i("PhysicalShortcuts", "capture device=${button.name} key=${event.keyCode} " + + "scan=${event.scanCode} source=0x${event.source.toString(16)}") + } + } else if (event.action == KeyEvent.ACTION_UP && event.deviceId == capturedDevice && + candidate?.matches(event) == true) { + listening = false + candidate?.let { button -> + if (bindings.none { it.button.sameInput(button) && it.action != action }) { + PhysicalShortcuts.assign(context, button, action) + onChanged() + onDismiss() + } + } + } + true + } + } + CompositionLocalProvider(LocalFrontFocus provides null) { + Surface( + shape = RoundedCornerShape(16.dp), + modifier = Modifier.padding(12.dp).widthIn(max = 560.dp).fillMaxWidth() + .heightIn(max = (LocalConfiguration.current.screenHeightDp - 24).dp), + ) { + Column( + Modifier.verticalScroll(rememberScrollState()).padding(18.dp).controllerBack(onDismiss), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Text(stringResource(R.string.shortcuts_capture, stringResource(action.label)), + style = MaterialTheme.typography.titleLarge) + val button = candidate + if (button == null) { + Text(stringResource(R.string.shortcuts_press)) + } else { + Text(stringResource(R.string.shortcuts_detected, button.name, button.label)) + if (listening) { + Text(stringResource(R.string.shortcuts_release)) + } else { + val replacements = bindings.filter { + it.button.sameInput(button) || (it.button.device == button.device && it.action == action) + } + for (conflict in replacements) { + Text("${conflict.button.label} · ${conflict.button.name}") + Text(stringResource(R.string.shortcuts_conflict, stringResource(conflict.action.label))) + } + SecondaryButton(stringResource(R.string.shortcuts_save), modifier = Modifier.testTag("shortcuts-save")) { + PhysicalShortcuts.assign(context, button, action) + onChanged() + onDismiss() + } + } + SecondaryButton(stringResource(R.string.shortcuts_retry), modifier = Modifier.testTag("shortcuts-retry")) { + candidate = null + capturedDevice = -1 + listening = true + } + } + Text(stringResource(R.string.shortcuts_limitations), style = MaterialTheme.typography.bodySmall) + for (binding in bindings.filter { it.action == action }) { + ActionRow( + stringResource(R.string.shortcuts_detected, binding.button.name, binding.button.label), + null, stringResource(R.string.ctrl_reset), { + PhysicalShortcuts.remove(context, binding) + onChanged() + onDismiss() + }, + modifier = Modifier.testTag("shortcuts-remove"), + ) + } + SecondaryButton(stringResource(R.string.common_close), modifier = Modifier.testTag("shortcuts-cancel"), + onClick = onDismiss) + } + } + } + } +} + +@Composable +private fun CaptureShortcutKeys(onKey: (KeyEvent) -> Boolean) { + val currentOnKey by rememberUpdatedState(onKey) + val window = (LocalView.current.parent as DialogWindowProvider).window + DisposableEffect(window) { + val previous = window.callback + window.callback = object : Window.Callback by previous { + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + currentOnKey(event) || previous.dispatchKeyEvent(event) + } + onDispose { window.callback = previous } + } +} 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 5a0b88daa..7112d4f39 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -14,27 +14,40 @@ 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 + val customFollow = SessionDisplay.isFollow(choice) && choice !in choices + val selected = if (SessionDisplay.isFollow(choice)) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } + var editFollow 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 (SessionDisplay.isFollow(value)) stringResource(R.string.display_follow_screen_scaled, + SessionDisplay.formatScale(SessionDisplay.followScale(value) ?: 1f)) + " (${dimensions.first}×${dimensions.second})" else if (value == SessionDisplay.DEFAULT_RESOLUTION) stringResource(R.string.mode_res_default, "${dimensions.first}×${dimensions.second}") else "${dimensions.first}×${dimensions.second}" - } + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) + } + listOf(SessionDisplay.FOLLOW_CUSTOM to stringResource(R.string.display_follow_screen_scaled, + if (customFollow) SessionDisplay.formatScale(SessionDisplay.followScale(choice) ?: 1f) else "…" + ) + if (customFollow) " (${size.first}×${size.second})" else "") + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, size.first, size.second)) ChoiceRow(host, "resolution", stringResource(R.string.display_resolution), stringResource(R.string.common_applies_next_session), - options, if (selected in choices) selected else custom, chipModifier = chipModifier, - onPick = { value -> if (value == custom) editCustom = true else onPick(value) }) + options, if (selected in choices) selected else if (customFollow) SessionDisplay.FOLLOW_CUSTOM else custom, chipModifier = chipModifier, + onPick = { value -> + if (value == custom) editCustom = true + else if (value == SessionDisplay.FOLLOW_CUSTOM) editFollow = true + else onPick(value) }) if (editCustom) CustomResolutionDialog(size, onSave = { value -> editCustom = false; onPick("${value.first}x${value.second}") }, onDismiss = { editCustom = false }) + if (editFollow) CustomFollowScaleDialog(SessionDisplay.followScale(choice)?.takeIf { it > 1f }, + onSave = { value -> editFollow = false; onPick(SessionDisplay.followScaled(value)) }, + onDismiss = { editFollow = false }) } 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 0417c5e09..2504a2eee 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 000000000..94e1a5ff2 --- /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 000000000..e70249eef --- /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 000000000..7bc78f710 --- /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/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 04809ea5c..df4182e0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -6,6 +6,7 @@ import android.content.ClipboardManager import android.content.Context import android.graphics.Canvas import android.graphics.Color +import android.os.Build import android.os.Bundle import android.util.Log import android.view.Display @@ -15,6 +16,7 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.view.ViewConfiguration +import android.view.WindowInsets import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.Button @@ -22,12 +24,17 @@ import android.widget.FrameLayout import android.widget.HorizontalScrollView import android.widget.LinearLayout import android.widget.TextView +import androidx.activity.setViewTreeOnBackPressedDispatcherOwner +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.lifecycle.setViewTreeViewModelStoreOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner import com.droiddeck.launcher.input.KeyboardHost import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.input.TouchpadGestures import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.BottomDesktop import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionTerminal @@ -47,7 +54,16 @@ class SecondScreenPresentation( private val onQam: () -> Unit, private val onClose: () -> Unit, private val pad: PadBridge? = null, + private val onKeyboardClosed: () -> Unit = {}, + private val onMenu: (() -> Unit)? = null, + private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, ) : Presentation(sessionActivity, display) { + private val frame = FrameLayout(context) + private var menuView: androidx.compose.ui.platform.ComposeView? = null + private var dashboardView: androidx.compose.ui.platform.ComposeView? = null + var menuShown = false + private set private val root = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL setBackgroundColor(Color.rgb(15, 18, 22)) @@ -55,6 +71,10 @@ class SecondScreenPresentation( } private var currentMode = SecondScreenMode.NONE private var keyboardHost: KeyboardHost? = null + private var keyboardButton: TextView? = null + private var keyboardPending = false + private var imeSeen = false + private var fieldKeyboard = false private var terminalSession: TerminalSession? = null private var terminalView: TerminalView? = null private var terminalPid = -1 @@ -73,18 +93,106 @@ class SecondScreenPresentation( created = true window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) - setContentView(root) + frame.addView(root, FrameLayout.LayoutParams(-1, -1)) + setContentView(frame) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + root.setOnApplyWindowInsetsListener { view, insets -> + if (insets.isVisible(WindowInsets.Type.ime())) imeSeen = true + else if (imeSeen) keyboardClosed() + view.onApplyWindowInsets(insets) + } + } applyImmersiveMode() renderMode() } + fun requestKeyboard(forField: Boolean = false) { + if (!showsKeyboard || keyboardHost == null) return + if (forField) fieldKeyboard = true + keyboardPending = true + if (window?.decorView?.hasWindowFocus() == true) showPendingKeyboard() + } + + private fun showPendingKeyboard() { + keyboardPending = false + keyboardButton?.text = context.getString(R.string.second_hide_keyboard) + for (delay in longArrayOf(150L, 450L)) root.postDelayed({ + val host = keyboardHost + if (host != null && !imeSeen && showsKeyboard) host.show() + }, delay) + } + + val fieldKeyboardOpen: Boolean get() = fieldKeyboard + + fun closeFieldKeyboard() { + if (!fieldKeyboard) return + keyboardPending = false + keyboardClosed() + } + + private fun keyboardClosed() { + fieldKeyboard = false + imeSeen = false + keyboardHost?.takeIf { it.shown }?.hide() + keyboardButton?.text = context.getString(R.string.second_show_keyboard) + onKeyboardClosed() + } + fun showMode(mode: SecondScreenMode) { if (currentMode == mode && isShowing) return currentMode = mode if (created) renderMode() } + fun retryTerminal() { + if (created && isShowing && currentMode == SecondScreenMode.TERMINAL && terminalSession == null) renderMode() + } + + val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.KEYBOARD_TRACKPAD + + val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE + + fun showMenu(on: Boolean) { + if (on == menuShown) return + val content = menu ?: return + menuShown = on + if (on) { + keyboardHost?.takeIf { it.shown }?.hide() + ownComposeViews() + val view = menuView ?: androidx.compose.ui.platform.ComposeView(context).apply { + isFocusable = true + isFocusableInTouchMode = true + defaultFocusHighlightEnabled = false + setContent { content() } + frame.addView(this, FrameLayout.LayoutParams(-1, -1)) + menuView = this + } + view.visibility = View.VISIBLE + root.visibility = View.INVISIBLE + view.requestFocus() + } else { + menuView?.let { frame.removeView(it); it.disposeComposition() } + menuView = null + root.visibility = View.VISIBLE + } + } + + private fun ownComposeViews() { + window?.decorView?.let { decor -> + decor.setViewTreeLifecycleOwner(sessionActivity) + decor.setViewTreeViewModelStoreOwner(sessionActivity) + decor.setViewTreeSavedStateRegistryOwner(sessionActivity) + decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity) + } + } + + fun focusMenu(): Boolean = menuView?.requestFocus() == true + + fun dispatchMenuKey(event: KeyEvent): Boolean = menuView?.dispatchKeyEvent(event) == true + fun closeControls() { + showMenu(false) + closeDashboard() closeTerminal() keyboardHost?.hide() keyboardHost = null @@ -92,86 +200,119 @@ class SecondScreenPresentation( } override fun dispatchKeyEvent(event: KeyEvent): Boolean { - if (currentMode == SecondScreenMode.KEYBOARD_TRACKPAD) { - if (sessionActivity.dispatchKeyEvent(event)) return true - } + val ownKeys = currentMode == SecondScreenMode.TERMINAL || currentMode == SecondScreenMode.DASHBOARD || + currentMode == SecondScreenMode.DESKTOP + val forward = menuShown || !ownKeys || PadBridge.isControllerKeyEvent(event) + if (forward && sessionActivity.dispatchKeyEvent(event)) return true return super.dispatchKeyEvent(event) } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { + if (PadBridge.isControllerMotionEvent(event) && sessionActivity.dispatchGenericMotionEvent(event)) return true + return super.dispatchGenericMotionEvent(event) + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) if (hasFocus) { applyImmersiveMode() sessionActivity.refreshClipboard() + if (keyboardPending) showPendingKeyboard() } } private fun renderMode() { + fieldKeyboard = false keyboardHost?.hide() keyboardHost = null + keyboardButton = null + keyboardPending = false closeTerminal() + closeDashboard() root.removeAllViews() - val mode = if (currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) SecondScreenMode.NONE - else currentMode + val mode = when { + currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad -> SecondScreenMode.NONE + currentMode == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE + currentMode == SecondScreenMode.DESKTOP && !BottomDesktop.available() -> SecondScreenMode.NONE + else -> currentMode + } if (mode == SecondScreenMode.NONE) return when (mode) { SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad() SecondScreenMode.TERMINAL -> renderTerminal() - SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad), weightParams()) + SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu), weightParams()) + SecondScreenMode.DASHBOARD -> renderDashboard() + SecondScreenMode.DESKTOP -> { + ownComposeViews() + root.addView(BottomDesktopPanel(context, onClose, onMenu, + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }), weightParams()) + } SecondScreenMode.NONE -> Unit } } + private fun renderDashboard() { + val content = dashboard ?: return + ownComposeViews() + val view = androidx.compose.ui.platform.ComposeView(context).apply { setContent { content() } } + dashboardView = view + root.addView(view, weightParams()) + } + + private fun closeDashboard() { + dashboardView?.disposeComposition() + dashboardView = null + } + private fun renderKeyboardAndTrackpad() { val panel = FrameLayout(context) panel.addView(trackpadView(), FrameLayout.LayoutParams(-1, -1)) val controls = LinearLayout(context).apply { gravity = Gravity.CENTER_VERTICAL orientation = LinearLayout.HORIZONTAL - setPadding(dp(12), dp(8), dp(12), dp(8)) - setBackgroundColor(0xE6191E24.toInt()) + setPadding(dp(12), dp(10), dp(12), dp(6)) + setBackgroundColor(Color.BLACK) } - controls.addView(Button(context).apply { - text = "×" - contentDescription = context.getString(R.string.deck_close) - minWidth = dp(48) - setOnClickListener { onClose() } - }) + fun gap() = View(context).apply { layoutParams = LinearLayout.LayoutParams(dp(8), 1) } + controls.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) controls.addView(TextView(context).apply { text = context.getString(R.string.second_trackpad) textSize = 14f - setTextColor(Color.WHITE) + typeface = android.graphics.Typeface.create(android.graphics.Typeface.DEFAULT, android.graphics.Typeface.BOLD) + setTextColor(Color.rgb(0x7A, 0x80, 0x8A)) + setPadding(dp(14), 0, dp(8), 0) + isSingleLine = true }, LinearLayout.LayoutParams(0, -2, 1f)) - val keyboardButton = Button(context).apply { - text = context.getString(R.string.second_show_keyboard) - setOnClickListener { - val host = keyboardHost ?: return@setOnClickListener - if (host.shown) { - host.hide() - text = context.getString(R.string.second_show_keyboard) - } else { - host.show() - text = context.getString(R.string.second_hide_keyboard) + lateinit var keyboardButton: TextView + keyboardButton = DeckControlsPanel.roundButton(context, context.getString(R.string.second_show_keyboard), + context.getString(R.string.second_show_keyboard), { + val host = keyboardHost + if (host != null) { + host.toggle() + keyboardButton.text = context.getString(if (host.shown) R.string.second_hide_keyboard else R.string.second_show_keyboard) } - } - } + }, wide = true) controls.addView(keyboardButton) + this.keyboardButton = keyboardButton + onMenu?.let { + controls.addView(gap()) + controls.addView(DeckControlsPanel.menuButton(context, it)) + } if (SessionState.mode == SessionService.MODE_STEAM) { - controls.addView(Button(context).apply { - text = "STEAM" - contentDescription = context.getString(R.string.deck_open_steam_menu) - setOnClickListener { onSteamMenu() } - }) - controls.addView(Button(context).apply { - text = "…" - contentDescription = context.getString(R.string.drawer_open_qam) - setOnClickListener { onQam() } - }) + controls.addView(gap()) + controls.addView(DeckControlsPanel.roundButton(context, "STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) + controls.addView(gap()) + controls.addView(DeckControlsPanel.roundButton(context, "•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) } panel.addView(controls, FrameLayout.LayoutParams(-1, -2, Gravity.TOP)) root.addView(panel, weightParams()) - val host = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) } + val host = KeyboardHost(context) { event -> + val handled = sessionActivity.dispatchKeyEvent(event) + if (fieldKeyboard && event.action == KeyEvent.ACTION_UP && + (event.keyCode == KeyEvent.KEYCODE_ENTER || event.keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) root.post { closeFieldKeyboard() } + handled + } keyboardHost = host root.addView(host, ViewGroup.LayoutParams(1, 1)) } @@ -329,8 +470,22 @@ class SecondScreenPresentation( if (oldw == 0 || oldh == 0) gestures.place(w / 2f, h / 2f) } + private val surface = android.graphics.RectF() + private val fill = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(0x0A, 0x0B, 0x0D) } + private val edge = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { + style = android.graphics.Paint.Style.STROKE + color = Color.rgb(0x26, 0x29, 0x2E) + strokeWidth = resources.displayMetrics.density + } + override fun onDraw(canvas: Canvas) { canvas.drawColor(Color.BLACK) + val inset = dp(12).toFloat() + surface.set(inset, dp(72).toFloat(), width - inset, height - inset) + if (surface.height() <= inset) return + val radius = dp(20).toFloat() + canvas.drawRoundRect(surface, radius, radius, fill) + canvas.drawRoundRect(surface, radius, radius, edge) } override fun onTouchEvent(event: MotionEvent): Boolean = gestures.onTouch(event) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index fb123fbd8..e7db9c561 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -4,7 +4,8 @@ internal enum class SessionDrawerPage(val firstControl: String) { CONTROLLER("touch"), GLASSES("glasses-game"), SECOND_SCREEN("second-screen:none"), - DISPLAY("hud"), + DISPLAY("fg"), + HUD("hud"), EFFECTS("look"), VR("steamvr"), GAMES("anisotropy"), 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 4a0adea2d..85a146294 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -24,7 +24,6 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.tween import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn -import androidx.compose.material.icons.filled.Pause import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.Icon import androidx.compose.foundation.Canvas @@ -81,8 +80,8 @@ import androidx.compose.ui.text.style.TextOverflow @Composable -fun HudText(text: String, graph: FloatArray = FloatArray(0), color: String = "mint", opacity: Int = 70) { - if (text.isEmpty() && graph.size < 2) return +fun HudText(text: String, color: String = "mint", opacity: Int = 70) { + if (text.isEmpty()) return val accent = hudInk(color) val wash = (opacity.coerceIn(30, 100) / 100f) val ink = accent.copy(alpha = (0.5f + wash * 0.5f).coerceIn(0.62f, 1f)) @@ -99,49 +98,13 @@ fun HudText(text: String, graph: FloatArray = FloatArray(0), color: String = "mi ) .padding(horizontal = 8.dp, vertical = 5.dp), ) { - if (text.isNotEmpty()) Text( + Text( text, fontFamily = FontFamily.Monospace, fontSize = 12.sp, color = ink, textAlign = TextAlign.End, ) - if (graph.size >= 2) { - if (text.isNotEmpty()) Spacer(Modifier.height(4.dp)) - HudGraph(graph, accent, wash) - } - } - } -} - -@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 step = size.width / (samples.size - 1) - fun yOf(ms: Float) = size.height * (1f - (ms / maxMs).coerceIn(0f, 1f)) - val fillAlpha = wash * 0.5f - val fill = Path().apply { - moveTo(0f, size.height) - samples.forEachIndexed { i, ms -> lineTo(i * step, yOf(ms)) } - lineTo(size.width, size.height) - close() - } - drawPath( - fill, - Brush.verticalGradient(listOf(HUD_SLOW.copy(alpha = fillAlpha), accent.copy(alpha = fillAlpha * 0.45f))), - ) - val guide = yOf(16.7f) - drawLine(Color.White.copy(alpha = 0.32f), Offset(0f, guide), Offset(size.width, guide), strokeWidth = 1f) - for (i in 0 until samples.lastIndex) { - val tone = ((samples[i] - 8f) / 25f).coerceIn(0f, 1f) - drawLine( - mix(accent, HUD_SLOW, tone).copy(alpha = 0.55f + wash * 0.4f), - Offset(i * step, yOf(samples[i])), - Offset((i + 1) * step, yOf(samples[i + 1])), - strokeWidth = 2.5f, - cap = StrokeCap.Round, - ) } } } @@ -156,17 +119,6 @@ private fun hudInk(color: String): Color = Color( }.toInt(), ) -private fun mix(from: Color, to: Color, t: Float): Color { - val u = t.coerceIn(0f, 1f) - return Color( - red = from.red + (to.red - from.red) * u, - green = from.green + (to.green - from.green) * u, - blue = from.blue + (to.blue - from.blue) * u, - alpha = 1f, - ) -} - -private val HUD_SLOW = Color(0xFFFF5C6C.toInt()) private class LoadStage(@androidx.annotation.StringRes val label: Int, @androidx.annotation.StringRes val detail: Int) @@ -332,6 +284,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), ) { @@ -345,37 +298,3 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { Text(stringResource(R.string.common_cancel), fontSize = 13.sp, color = colors.onSurfaceVariant) } } - -@Composable -fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paused), onResume: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val resumeFocus = remember { FocusRequester() } - LaunchedEffect(Unit) { - androidx.compose.runtime.withFrameNanos { } - runCatching { resumeFocus.requestFocus() } - } - Box( - modifier = Modifier - .fillMaxSize() - .background(pal.background.copy(alpha = 0.94f)) - .blockTouches(), - contentAlignment = Alignment.Center, - ) { - Column( - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(10.dp), - modifier = Modifier.widthIn(max = 440.dp).padding(32.dp), - ) { - Box(contentAlignment = Alignment.Center, modifier = Modifier.padding(bottom = 6.dp).size(64.dp).border(2.dp, pal.line2, CircleShape)) { - Icon(Icons.Filled.Pause, contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(30.dp)) - } - Text(title, fontSize = 28.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center) - PrimaryButton( - stringResource(R.string.resume_session), - modifier = Modifier.padding(top = 14.dp).focusRequester(resumeFocus).controllerConfirm(onClick = onResume), - onClick = onResume, - ) - } - } -} 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 58b4c11ee..81c084d6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -29,6 +29,11 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Terminal +import androidx.compose.material.icons.outlined.Dashboard +import androidx.compose.material.icons.outlined.DesktopWindows +import androidx.compose.material.icons.outlined.Keyboard import androidx.compose.material.icons.outlined.AutoFixHigh import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.Home @@ -38,9 +43,11 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.ScreenShare +import androidx.compose.material.icons.outlined.Pause import androidx.compose.material.icons.outlined.PictureInPictureAlt import androidx.compose.material.icons.automirrored.outlined.ExitToApp import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material.icons.outlined.Speed import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material3.Icon import androidx.compose.material3.RadioButton @@ -72,6 +79,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 @@ -146,6 +155,9 @@ import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_CLICK +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_HOLD +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_NONE import kotlinx.coroutines.flow.collect import java.util.Locale @@ -154,6 +166,7 @@ private val SessionDrawerPage.title: Int get() = when (this) { SessionDrawerPage.GLASSES -> R.string.drawer_page_glasses SessionDrawerPage.SECOND_SCREEN -> R.string.drawer_second_screen SessionDrawerPage.DISPLAY -> R.string.drawer_page_display + SessionDrawerPage.HUD -> R.string.drawer_hud SessionDrawerPage.VR -> R.string.vr_title SessionDrawerPage.EFFECTS -> R.string.drawer_page_effects SessionDrawerPage.GAMES -> R.string.game_settings_title @@ -165,6 +178,7 @@ private val SessionDrawerPage.icon get() = when (this) { SessionDrawerPage.GLASSES -> GlassesIcon SessionDrawerPage.SECOND_SCREEN -> Icons.Outlined.ScreenShare SessionDrawerPage.DISPLAY -> Icons.Outlined.DesktopWindows + SessionDrawerPage.HUD -> Icons.Outlined.Speed SessionDrawerPage.VR -> VrHeadsetIcon SessionDrawerPage.EFFECTS -> Icons.Outlined.AutoFixHigh SessionDrawerPage.GAMES -> Icons.Outlined.Layers @@ -193,22 +207,26 @@ private class DrawerFocus { class DrawerActions( val steam: Boolean, + val direct: Boolean = false, val title: String? = null, val isHomeApp: Boolean, val androidApps: List<HomeApp.LaunchableApp>, val hudOn: Boolean, - val hudFps: Boolean = true, - val hudBattery: Boolean = true, - val hudGraph: Boolean = true, - val hudColor: String = SessionPrefs.HUD_COLOR_MINT, - val hudOpacity: Int = SessionPrefs.HUD_OPACITY_DEFAULT, + val hudConfig: Map<String, String> = emptyMap(), val frameGen: FrameGen.Mode, val lossless: Lossless.State, val oscMode: String, val onScreenButtonsVisible: Boolean, val suspendPolicy: String, val steamDownloadsInBackground: Boolean = false, + val micAvailable: Boolean = false, + val micEnabled: Boolean = false, + val onMicEnabled: (Boolean) -> Unit = {}, + val backHold: Boolean = true, + val onBackHold: (Boolean) -> Unit = {}, val backActionsInverted: Boolean, + val backDoubleTapMs: Int = 500, + val onBackDoubleTapMs: (Int) -> Unit = {}, val padType: String? = null, val onPadType: (String) -> Unit = {}, val touchMode: String, @@ -226,15 +244,17 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val dashboardAvailable: Boolean = false, + val desktopAvailable: Boolean = false, val secondScreenDisplays: List<SecondScreenDisplay>, val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, - val onHudFps: (Boolean) -> Unit = {}, - val onHudBattery: (Boolean) -> Unit = {}, - val onHudGraph: (Boolean) -> Unit = {}, - val onHudColor: (String) -> Unit = {}, - val onHudOpacity: (Int) -> Unit = {}, + val onHudSetting: (String, String) -> Unit = { _, _ -> }, + val onHudReset: () -> Unit = {}, + val onHudExport: () -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, + val fpsLimit: Int = 0, + val onFpsLimit: (Int) -> Unit = {}, val onImportLossless: () -> Unit, val onKeyboard: () -> Unit, val onHardwareKeyboard: () -> Unit, @@ -252,12 +272,21 @@ 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 evdevMouse: Boolean = false, + val onEvdevMouse: (Boolean) -> Unit = {}, + val directCursor: Boolean = false, + val onDirectCursor: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, val onGestureSettings: () -> Unit = {}, + val touchActive: String = "", + val directHoldBehavior: String = MOUSE_BEHAVIOR_CLICK, + val onDirectHoldBehavior: (String) -> 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 = {}, @@ -275,6 +304,7 @@ class DrawerActions( val pipSupported: Boolean = false, val pipAutoEnter: Boolean = false, val onPip: () -> Unit = {}, + val onPause: () -> Unit = {}, val onPipAutoEnter: (Boolean) -> Unit = {}, val unfoldedControls: Boolean? = null, val onUnfoldedControls: (Boolean) -> Unit = {}, @@ -314,7 +344,8 @@ class DrawerActions( @OptIn(ExperimentalComposeUiApi::class) @Composable -internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions) { +internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions, docked: Boolean = false, + backRequest: Int = 0, onLayerChange: (Boolean) -> Unit = {}) { val pages = sessionDrawerPages(a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) } @@ -344,6 +375,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (host.open != null) host.open = null else a.onClose() } BackHandler(enabled = open && confirmStop) { confirmStop = false } + val layerOpen = open && (host.open != null || appToChooseDisplay != null || confirmStop) + LaunchedEffect(layerOpen) { onLayerChange(layerOpen) } + var seenBackRequest by remember { mutableStateOf(backRequest) } + LaunchedEffect(backRequest) { + if (backRequest == seenBackRequest) return@LaunchedEffect + seenBackRequest = backRequest + when { + confirmStop -> confirmStop = false + appToChooseDisplay != null -> appToChooseDisplay = null + host.open != null -> host.open = null + } + } LaunchedEffect(page) { host.open = null; appToChooseDisplay = null } LaunchedEffect(a.selectedGameProfileId) { if (host.open == "fex") host.open = null @@ -374,6 +417,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val first = when { page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab" page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps" + page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:${a.secondScreenMode.id}" else -> page.firstControl } if (turned) focus.forget(page) @@ -385,9 +429,14 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } focus.forget(page) focus.request(first) + if (first != page.firstControl) repeat(4) { + androidx.compose.runtime.withFrameNanos { } + if (focus.focused == first) return@LaunchedEffect + focus.request(page.firstControl) + } } } - if (open || veil > 0.01f) { + if (!docked && (open || veil > 0.01f)) { val closeLabel = stringResource(R.string.common_close) Box( modifier = Modifier.fillMaxSize() @@ -398,32 +447,45 @@ 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 sheetWidth = if (docked) maxWidth else 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)), - exit = slideOutHorizontally(Motion.tw(240)) { it } + fadeOut(Motion.tw(200)), + enter = if (docked) fadeIn(Motion.tw(160)) else slideInHorizontally(Motion.sp(0.8f, Spring.StiffnessLow)) { it } + fadeIn(Motion.tw(220)), + exit = if (docked) fadeOut(Motion.tw(140)) else slideOutHorizontally(Motion.tw(240)) { it } + fadeOut(Motion.tw(200)), ) { FocusGlideHost(Modifier.fillMaxHeight().width(sheetWidth)) { Box(Modifier.fillMaxSize().onGloballyPositioned { sheetCoords = it }) { Column( modifier = Modifier .fillMaxSize() - .background(pal.background.copy(alpha = 0.97f)) + .background(if (docked) pal.background else pal.background.copy(alpha = 0.97f)) .blockTouches() .focusGroup() .controllerBack { if (host.open != null) host.open = null else a.onClose() } - .padding(if (short) 12.dp else 16.dp), + .padding(12.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, - color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - if (a.onSteamMenu != null && a.onQam != null) { + if (docked) { + SteamActionPill( + stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), + ) { host.open = null; a.onClose() } + Spacer(Modifier.width(4.dp)) + BottomScreenModes(a, focus.track(page, "bottom-modes")) { host.open = null } + } + Spacer(Modifier.weight(1f)) + SteamActionPill( + stringResource(R.string.stores_dl_pause), Icons.Outlined.Pause, focus.track(page, "pause"), + ) { host.open = null; a.onPause() } + 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) { @@ -435,13 +497,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 @@ -459,12 +521,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)) } @@ -475,37 +537,13 @@ 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.HUD -> DroidDeckHudSettings(host, a) { key -> focus.track(page, key) } SessionDrawerPage.DISPLAY -> { SettingsGroup(stringResource(R.string.drawer_page_display)) { - ToggleRow(host, "hud", stringResource(R.string.drawer_hud), null, a.hudOn, - chipModifier = focus.track(page, "hud"), onChange = a.onHud) - if (a.hudOn) { - ToggleRow(host, "hud-fps", stringResource(R.string.drawer_hud_fps), null, a.hudFps, - chipModifier = focus.track(page, "hud-fps"), onChange = a.onHudFps) - ToggleRow(host, "hud-battery", stringResource(R.string.drawer_hud_battery), null, a.hudBattery, - chipModifier = focus.track(page, "hud-battery"), onChange = a.onHudBattery) - ToggleRow(host, "hud-graph", stringResource(R.string.drawer_hud_graph), null, a.hudGraph, - chipModifier = focus.track(page, "hud-graph"), onChange = a.onHudGraph) - ChoiceRow( - host, "hud-color", stringResource(R.string.drawer_hud_color), null, - listOf( - SessionPrefs.HUD_COLOR_MINT to stringResource(R.string.drawer_hud_color_mint), - "white" to stringResource(R.string.drawer_hud_color_white), - "sky" to stringResource(R.string.drawer_hud_color_sky), - "amber" to stringResource(R.string.drawer_hud_color_amber), - "violet" to stringResource(R.string.drawer_hud_color_violet), - ), - a.hudColor, chipModifier = focus.track(page, "hud-color"), onPick = a.onHudColor, - ) - SliderRow( - stringResource(R.string.drawer_hud_opacity), null, a.hudOpacity, - SessionPrefs.HUD_OPACITY_RANGE, step = 10, format = { "$it%" }, - modifier = focus.track(page, "hud-opacity"), onChange = a.onHudOpacity, - ) - } val fgOpen = host.open == "fg" + val offLabel = stringResource(R.string.frame_gen_off) val fgLabel = FrameGen.label(LocalContext.current, a.frameGen) SettingsRow(stringResource(R.string.frame_gen_title), null, highlighted = fgOpen) { Box { @@ -513,6 +551,13 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont FrameGenMenu(host, a.frameGen, a.lossless, a.onFrameGenPick, a.onImportLossless) } } + if (a.direct) SliderRow( + stringResource(R.string.drawer_frame_limit), stringResource(R.string.drawer_frame_limit_note), + a.fpsLimit.takeIf { it > 0 } ?: SessionPrefs.FPS_LIMIT_OFF, + SessionPrefs.FPS_LIMIT_OFF..SessionPrefs.FPS_LIMIT_MAX, step = 5, + format = { if (it <= SessionPrefs.FPS_LIMIT_OFF) offLabel else it.toString() }, + modifier = focus.track(page, "fps-limit"), + onChange = { a.onFpsLimit(if (it <= SessionPrefs.FPS_LIMIT_OFF) 0 else it) }) } SettingsGroup(stringResource(R.string.display_image_scaling)) { ChoiceRow(host, "upscaler", stringResource(R.string.display_filter), null, @@ -546,9 +591,38 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null, listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) - 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.touchActive == SessionPrefs.TOUCH_DIRECT) + ToggleRow(host, "direct-cursor", stringResource(R.string.drawer_direct_cursor), + null, a.directCursor, + chipModifier = focus.track(page, "direct-cursor"), onChange = a.onDirectCursor) + when (a.touchActive) { + SessionPrefs.TOUCH_GESTURES -> ActionRow(stringResource(R.string.gesture_settings), null, + stringResource(R.string.ctrl_edit), a.onGestureSettings, + modifier = focus.track(page, "gesture-settings")) + SessionPrefs.TOUCH_DIRECT -> ChoiceRow(host, "long-press", stringResource(R.string.gesture_long_press), null, + listOf(MOUSE_BEHAVIOR_NONE to stringResource(R.string.gesture_hold_left), + MOUSE_BEHAVIOR_CLICK to stringResource(R.string.gesture_right_click), + MOUSE_BEHAVIOR_HOLD to stringResource(R.string.gesture_hold_right)), + a.directHoldBehavior, chipModifier = focus.track(page, "long-press"), + onPick = a.onDirectHoldBehavior) + } + 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)), @@ -571,9 +645,16 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton) } } + if (a.steam) ToggleRow(host, "back-hold", stringResource(R.string.back_hold), + stringResource(R.string.back_hold_hint), a.backHold, + chipModifier = focus.track(page, "back-hold"), onChange = a.onBackHold) 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) + PhysicalShortcutRows(modifierFor = { focus.track(page, "physical-shortcut-${it.name}") }) 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) @@ -584,12 +665,12 @@ 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) + ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), + null, a.evdevMouse, + chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { @@ -613,11 +694,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( @@ -669,6 +750,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, @@ -705,8 +789,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() } } @@ -778,10 +860,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) } } @@ -794,6 +876,8 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") val shape = RoundedCornerShape(20.dp) val stopDescription = stringResource(R.string.stop_session) + val stopLabel = stringResource(R.string.drawer_stop) + var iconOnly by remember(stopLabel, androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp) { mutableStateOf(false) } Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier.heightIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") @@ -803,7 +887,58 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit .padding(start = 12.dp, end = 14.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - Text(stringResource(R.string.drawer_stop), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error) + if (!iconOnly) Text( + stopLabel, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, + maxLines = 1, softWrap = false, onTextLayout = { if (it.hasVisualOverflow) iconOnly = true }, + ) + } +} + +@Composable +private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () -> Unit) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val modes = buildList { + if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports) + add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard) + add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal) + if (a.dashboardAvailable) add(SecondScreenMode.DASHBOARD to Icons.Outlined.Dashboard) + if (a.desktopAvailable) add(SecondScreenMode.DESKTOP to Icons.Outlined.DesktopWindows) + } + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + modifier = modifier.focusGroup().clip(RoundedCornerShape(26.dp)).border(1.dp, pal.line, RoundedCornerShape(26.dp)).padding(4.dp), + ) { + modes.forEach { (mode, icon) -> + val selected = a.secondScreenMode == mode + val source = remember { MutableInteractionSource() } + val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value + val shape = RoundedCornerShape(20.dp) + val pick = { onPick(); a.onSecondScreenMode(mode) } + val label = stringResource(mode.label) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(width = 52.dp, height = 40.dp).semantics { contentDescription = label } + .clip(shape) + .background(when { + selected -> pal.signal + hot -> pal.signal.copy(alpha = 0.14f) + else -> Color.Transparent + }) + .glideBorder(hot, shape, pal.signal) + .hoverable(source) + .selectable(selected, interactionSource = source, indication = LocalIndication.current, role = Role.Tab, onClick = pick) + .controllerConfirm(onClick = pick), + ) { + Icon(icon, contentDescription = null, modifier = Modifier.size(22.dp), + tint = when { + selected -> colors.background + hot -> pal.signal + else -> colors.onBackground + }) + } + } } } @@ -812,6 +947,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 @@ -820,7 +956,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) @@ -828,6 +964,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), + ) } } @@ -867,16 +1007,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") @@ -884,7 +1030,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)) @@ -904,6 +1050,9 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag } } } + } + if (scrolling) Row(Modifier.fillMaxWidth().horizontalScroll(scroll), horizontalArrangement = Arrangement.spacedBy(4.dp)) { tabs() } + else tabs() } } @@ -1052,7 +1201,9 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val modes = listOf(SecondScreenMode.NONE, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL) + - if (com.droiddeck.launcher.session.SessionState.deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList() + (if (com.droiddeck.launcher.session.SessionState.deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList()) + + (if (a.dashboardAvailable) listOf(SecondScreenMode.DASHBOARD) else emptyList()) + + (if (a.desktopAvailable) listOf(SecondScreenMode.DESKTOP) else emptyList()) SettingsGroup(stringResource(R.string.drawer_second_screen_mode)) { Column(Modifier.fillMaxWidth().selectableGroup()) { modes.forEach { mode -> @@ -1353,6 +1504,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), @@ -1453,7 +1605,6 @@ internal fun ComponentDownloadsDrawerGroup( } AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = ComponentsManager.LABEL.getValue(comp)) { firstItemFocus -> - // A nightly paired with a stable build rides on that row; Stable/Nightly tabs beside the row pick which one. val pairs = ComponentsManager.nightlyPairs(items) val rows = items.filter { it !in pairs.values } fun shown(row: ComponentsManager.CatalogItem) = pairs[row]?.takeIf { nightlyPicked[row.file] == true } ?: row @@ -1623,11 +1774,19 @@ private fun StopConfirm( content = null } } + LaunchedEffect(open, controllerActive) { + if (!open || !controllerActive || stopFocused || cancelFocused) return@LaunchedEffect + delay(Motion.ms(300).toLong()) + withFrameNanos { } + if (stopFocused || cancelFocused) return@LaunchedEffect + runCatching { cancelFocus.requestFocus() } + } val p = pill ?: return 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() } @@ -1649,7 +1808,7 @@ private fun StopConfirm( .padding(start = 12.dp, end = 14.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - Text(stringResource(R.string.drawer_stop), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error) + Text(stringResource(R.string.drawer_stop), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, maxLines = 1, softWrap = false) } val maxW = with(density) { StepBoxMaxWidth.toPx() }.coerceAtMost(p.right) Column( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt new file mode 100644 index 000000000..3e5551ab3 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -0,0 +1,292 @@ +package com.droiddeck.launcher.ui + +import android.os.Build +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.FastOutLinearInEasing +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.LinearOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.keyframes +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +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 +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.PlayArrow +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.State +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.snapshotFlow +import androidx.compose.runtime.setValue +import androidx.compose.runtime.withFrameNanos +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.ColorMatrix +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.rotate +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalDensity +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.unit.IntOffset +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import kotlinx.coroutines.withTimeoutOrNull + +class PausedFrame(val image: ImageBitmap, val bounds: android.graphics.Rect) + +private const val CARD_SCALE = 0.82f +private const val FRAME_WAIT_MS = 600L +private val PopEasing = CubicBezierEasing(0.3f, 1.5f, 0.4f, 1f) + +private fun tone(saturation: Float, brightness: Float): ColorMatrix = + ColorMatrix().apply { + setToSaturation(saturation) + timesAssign(ColorMatrix().apply { setToScale(brightness, brightness, brightness, 1f) }) + } + +@Composable +fun SessionPausedOverlay( + suspended: Boolean, + engaged: Boolean, + failures: Int, + frame: PausedFrame?, + animateIn: Boolean, + title: String, + onResume: () -> Unit, + onFrameNeeded: () -> Unit, + onHidden: () -> Unit, +) { + val currentFrame by rememberUpdatedState(frame) + var shown by remember { mutableStateOf(suspended) } + val lift = remember { Animatable(if (suspended) 1f else 0f) } + val orb = remember { Animatable(if (suspended) 1f else 0f) } + val press = remember { Animatable(1f) } + val ring = remember { Animatable(0f) } + val shake = remember { Animatable(0f) } + + LaunchedEffect(suspended, engaged) { + when { + suspended && !engaged -> { + if (!shown && animateIn) { + if (currentFrame == null) { + onFrameNeeded() + withTimeoutOrNull(FRAME_WAIT_MS) { snapshotFlow { currentFrame }.first { it != null } } + } + shown = true + launch { press.animateTo(1f, Motion.sp(0.5f, Spring.StiffnessMedium)) } + launch { ring.animateTo(0f, Motion.tw(200)) } + launch { lift.animateTo(1f, Motion.tw(520)) } + orb.animateTo(1f, Motion.tw(380, delay = if (orb.value < 0.5f) 260 else 0, easing = PopEasing)) + return@LaunchedEffect + } + if (!shown) { + if (currentFrame == null) { + onFrameNeeded() + withTimeoutOrNull(FRAME_WAIT_MS) { snapshotFlow { currentFrame }.first { it != null } } + } + press.snapTo(1f) + ring.snapTo(0f) + lift.snapTo(1f) + orb.snapTo(1f) + shown = true + return@LaunchedEffect + } + launch { press.animateTo(1f, Motion.sp(0.5f, Spring.StiffnessMedium)) } + launch { ring.animateTo(0f, Motion.tw(200)) } + orb.animateTo(1f, Motion.tw(200)) + } + suspended -> { + if (!shown) return@LaunchedEffect + launch { orb.animateTo(1f, Motion.tw(200)) } + launch { press.animateTo(0.92f, Motion.tw(140)) } + ring.animateTo(0.25f, Motion.tw(140)) + ring.animateTo(0.8f, Motion.tw(650, easing = CubicBezierEasing(0.1f, 0.6f, 0.3f, 1f))) + ring.animateTo(0.92f, Motion.tw(2000, easing = LinearOutSlowInEasing)) + } + shown -> { + ring.animateTo(1f, Motion.tw(110)) + coroutineScope { + launch { orb.animateTo(0f, Motion.tw(220, easing = FastOutLinearInEasing)) } + lift.animateTo(0f, Motion.sp(0.62f, 380f)) + } + shown = false + ring.snapTo(0f) + press.snapTo(1f) + onHidden() + } + } + } + + val seenFailures = remember { mutableIntStateOf(failures) } + LaunchedEffect(failures) { + if (failures == seenFailures.intValue) return@LaunchedEffect + seenFailures.intValue = failures + if (!shown || Motion.scale == 0f) return@LaunchedEffect + shake.animateTo(0f, keyframes { + durationMillis = Motion.ms(360) + 10f at Motion.ms(60) + -8f at Motion.ms(140) + 5f at Motion.ms(220) + -2f at Motion.ms(300) + }) + } + + if (!shown) return + + val presence = lift.value.coerceIn(0f, 1f) + val idle = suspended && !engaged + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { + withFrameNanos { } + 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 + .fillMaxSize() + .semantics { contentDescription = title } + .focusRequester(focus) + .controllerConfirm(enabled = idle, onClick = onResume) + .clickable( + interactionSource = source, + indication = null, + role = Role.Button, + onClickLabel = resumeLabel, + ) { if (idle) onResume() }, + ) { + if (frame != null) { + PausedCard(frame, lift.value, presence) + } else { + Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black.copy(alpha = 0.55f))) + } + ResumeOrb(orb.value, press.value, ring.value, shake.value, idle, focused) + } +} + +@Composable +private fun BoxScope.PausedCard(frame: PausedFrame, lift: Float, presence: Float) { + val density = LocalDensity.current + val bounds = frame.bounds + val ambient = remember { ColorFilter.colorMatrix(tone(0.1f, 0.3f)) } + Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black)) { + Image( + frame.image, contentDescription = null, contentScale = ContentScale.Crop, colorFilter = ambient, + modifier = Modifier.fillMaxSize().then(if (Build.VERSION.SDK_INT >= 31) Modifier.blur(32.dp) else Modifier), + ) + } + Image( + frame.image, contentDescription = null, contentScale = ContentScale.FillBounds, + colorFilter = ColorFilter.colorMatrix(tone(1f - 0.92f * presence, 1f - 0.45f * presence)), + modifier = Modifier + .align(Alignment.TopStart) + .offset { IntOffset(bounds.left, bounds.top) } + .size(with(density) { bounds.width().toDp() }, with(density) { bounds.height().toDp() }) + .graphicsLayer { + val scale = 1f - (1f - CARD_SCALE) * lift + scaleX = scale + scaleY = scale + shape = RoundedCornerShape((20f * presence).dp) + clip = true + shadowElevation = 24.dp.toPx() * presence + }, + ) +} + +@Composable +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( + 0f, 360f, infiniteRepeatable(tween(Motion.ms(3600), easing = LinearEasing)), label = "glintAngle", + ) + } else null + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .size(96.dp) + .graphicsLayer { + val scale = press * (0.4f + 0.6f * presence) + scaleX = scale + scaleY = scale + alpha = presence.coerceIn(0f, 1f) + translationX = shake.dp.toPx() + } + .drawBehind { + val halo = size.minDimension * 0.8f + drawCircle(Brush.radialGradient(0.6f to Color.Black.copy(alpha = 0.35f), 1f to Color.Transparent, radius = halo), radius = halo) + } + .clip(CircleShape) + .background(Color.White.copy(alpha = 0.08f)) + .glideBorder(focused, CircleShape, Color.White, hotFillAlpha = 0f) + .drawWithContent { + drawContent() + val stroke = 2.5.dp.toPx() + val radius = size.minDimension / 2f * 0.92f + if (glint != null && glintAlpha > 0f) { + rotate(glint.value) { + drawCircle( + Brush.sweepGradient( + 0f to Color.Transparent, + 0.083f to Color.White.copy(alpha = 0.4f * glintAlpha), + 0.166f to Color.Transparent, + 1f to Color.Transparent, + ), + radius = radius, style = Stroke(stroke), + ) + } + } + if (ring > 0f) { + drawArc( + Color.White, startAngle = -90f, sweepAngle = 360f * ring.coerceAtMost(1f), useCenter = false, + topLeft = Offset(center.x - radius, center.y - radius), size = Size(radius * 2f, radius * 2f), + style = Stroke(stroke, cap = StrokeCap.Round), + ) + } + }, + ) { + Icon(Icons.Rounded.PlayArrow, contentDescription = null, tint = Color.White, modifier = Modifier.size(48.dp)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionTypingActivity.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionTypingActivity.kt new file mode 100644 index 000000000..5efb7a2f5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionTypingActivity.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.ActivityManager +import android.app.ActivityOptions +import android.content.Context +import android.content.Intent +import android.os.Bundle + +object SessionTyping { + private var activity: SessionTypingActivity? = null + private var launching = false + + fun focusDisplay(context: Context, displayId: Int) { + if (activity != null || launching) return + launching = true + val intent = Intent(context, SessionTypingActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) + runCatching { + context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle()) + }.onFailure { launching = false } + } + + fun returnFocus(context: Context, task: Int) { + close() + if (task < 0) return + runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).moveTaskToFront(task, 0) } + } + + fun close() { + launching = false + activity?.finish() + activity = null + } + + internal fun attach(host: SessionTypingActivity): Boolean { + if (!launching) return false + launching = false + activity = host + return true + } + + internal fun detach(host: SessionTypingActivity) { + if (activity === host) activity = null + } +} + +class SessionTypingActivity : Activity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (!SessionTyping.attach(this)) finish() + } + + override fun onStop() { + super.onStop() + if (!isFinishing) finish() + } + + override fun onDestroy() { + SessionTyping.detach(this) + super.onDestroy() + } +} 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 0d8909d82..b389992cf 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 @@ -210,7 +210,7 @@ internal fun TabStrip( } @Composable -private fun BumperKey(label: String, description: String, onClick: () -> Unit) { +internal fun BumperKey(label: String, description: String, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val cap = RoundedCornerShape(7.dp) @@ -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), @@ -467,10 +489,11 @@ fun <T> ChoiceRow( options: List<Pair<T, String>>, selected: T, enabled: Boolean = true, note: String? = null, chipModifier: Modifier = Modifier, hintLines: Int? = null, + stacked: Boolean = false, onPick: (T) -> Unit, ) { val open = host.open == key - SettingsRow(label, hint, highlighted = open, hintLines = hintLines) { + SettingsRow(label, hint, highlighted = open, hintLines = hintLines, stacked = stacked) { Box { ValueChip(options.firstOrNull { it.first == selected }?.second ?: "-", open, enabled, modifier = chipModifier.testTag("setting-$key")) { host.open = if (open) null else key } AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus -> @@ -560,6 +583,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 +604,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 +633,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/SlowUsbDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt new file mode 100644 index 000000000..6ba15e324 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SlowUsbDialog.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.ui + +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.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Usb +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.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.UsbLink + +@Composable +internal fun SlowUsbDialog(drive: UsbLink.SlowDrive, never: Boolean, onNever: (Boolean) -> Unit, onDismiss: () -> Unit) { + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { focus.requestFocus() } } + val speed = if (drive.mbps % 1.0 == 0.0) drive.mbps.toLong().toString() else drive.mbps.toString() + val message = if (drive.portLimited) R.string.slow_usb_port else R.string.slow_usb_cable + AppDialog(shown, close, "slowUsb", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.slow_usb_title), close) { + Icon(Icons.Filled.Usb, null, tint = LocalPalette.current.signal, modifier = Modifier.size(20.dp)) + } + Text( + stringResource(message, drive.name, UsbLink.generation(drive.mbps), speed, UsbLink.megabytesPerSecond(drive.mbps)), + fontSize = 13.sp, lineHeight = 18.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val flip = { onNever(!never) } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .border(if (hot) 2.dp else 1.dp, if (hot) pal.signal else pal.line, Shape12) + .hoverable(src) + .clickable(interactionSource = src, indication = null, role = Role.Switch, onClick = flip) + .controllerConfirm(onClick = flip) + .padding(start = 14.dp, end = 4.dp), + ) { + Text(stringResource(R.string.slow_usb_never), fontSize = 14.sp, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f)) + ToggleSwitch(never, label = stringResource(R.string.slow_usb_never), modifier = Modifier.focusProperties { canFocus = false }) { onNever(it) } + } + Row(horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxWidth()) { + PrimaryButton(stringResource(R.string.slow_usb_dismiss), modifier = Modifier.focusRequester(focus), onClick = close) + } + } +} 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 3b77e09f0..a3dc1f4d6 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/StatsDashes.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt new file mode 100644 index 000000000..fc7679943 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt @@ -0,0 +1,583 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextMeasurer +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.rememberTextMeasurer +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.Telemetry +import kotlin.math.abs +import kotlin.math.cos +import kotlin.math.floor +import kotlin.math.max +import kotlin.math.min +import kotlin.math.roundToInt +import kotlin.math.sin + +private val DASH_H = 290.dp +internal const val TRACE_N = 150 + +internal class TraceData(val throttle: List<Float>, val brake: List<Float>, val speed: List<Float>) + +@Composable +internal fun RaceDashView(style: StatsDash, t: Telemetry, trace: TraceData, unit: SpeedUnit, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsDash.AUTO, StatsDash.SPEEDOMETER -> SpeedometerDash(t, unit) + StatsDash.CIRCUIT -> CircuitDash(t, unit) + StatsDash.TRACE -> TraceDash(t, trace, unit) + StatsDash.DIALS -> DialsDash(t, unit) + StatsDash.GLANCE -> GlanceDash(t, unit) + } + } +} + +private fun polar(cx: Float, cy: Float, r: Float, deg: Float): Offset { + val a = Math.toRadians((deg - 90f).toDouble()) + return Offset(cx + r * cos(a).toFloat(), cy + r * sin(a).toFloat()) +} + +private const val DIAL_START = -125f +private const val DIAL_SWEEP = 250f + +private fun dialAngle(v: Float, max: Float) = DIAL_START + DIAL_SWEEP * (v / max).coerceIn(0f, 1f) + +private fun DrawScope.dialFace( + cx: Float, cy: Float, r: Float, max: Float, major: Float, label: (Float) -> String, + measurer: TextMeasurer, labelStyle: TextStyle, tick: Color, minor: Color, track: Color, red: Float?, redColor: Color, +) { + val box = Size(2 * r, 2 * r) + val tl = Offset(cx - r, cy - r) + drawArc(track, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(6.dp.toPx(), cap = StrokeCap.Round)) + if (red != null && red < max) { + drawArc(redColor, dialAngle(red, max) - 90f, dialAngle(max, max) - dialAngle(red, max), false, topLeft = tl, size = box, style = Stroke(6.dp.toPx())) + } + val steps = (max / (major / 2f)).roundToInt() + for (i in 0..steps) { + val v = i * major / 2f + val isMajor = i % 2 == 0 + val deg = dialAngle(v, max) + drawLine(if (isMajor) tick else minor, polar(cx, cy, r - (if (isMajor) 14.dp else 7.dp).toPx(), deg), polar(cx, cy, r - 2.dp.toPx(), deg), + strokeWidth = (if (isMajor) 2.5f else 1.2f).dp.toPx()) + if (isMajor) { + val layout = measurer.measure(label(v), labelStyle) + val p = polar(cx, cy, r - 27.dp.toPx(), deg) + drawText(layout, topLeft = Offset(p.x - layout.size.width / 2f, p.y - layout.size.height / 2f)) + } + } +} + +private fun DrawScope.needle(cx: Float, cy: Float, len: Float, deg: Float, color: Color, hub: Color) { + drawLine(color, Offset(cx, cy), polar(cx, cy, len, deg), strokeWidth = 4.dp.toPx(), cap = StrokeCap.Round) + drawCircle(hub, radius = 7.dp.toPx(), center = Offset(cx, cy)) +} + +private fun speedValue(t: Telemetry, unit: SpeedUnit): Float = (t.speedKmh ?: 0f) * unit.perKmh + +private fun speedScale(speed: Float, unit: SpeedUnit): Float = + if (unit == SpeedUnit.MPH) (if (speed > 130f) 200f else 140f) else (if (speed > 210f) 320f else 220f) + +private fun rpmScale(t: Telemetry): Float = max(t.maxRpm ?: 9000f, t.rpm ?: 0f) + +private fun speedText(t: Telemetry, unit: SpeedUnit) = t.speedKmh?.let { "%.0f".format(it * unit.perKmh) } ?: "–" + +@Composable +private fun unitAndGear(t: Telemetry, unit: SpeedUnit) = "${unit.label} · ${stringResource(R.string.stats_gear)} ${t.gear ?: "–"}" + +@Composable +private fun SpeedometerDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_speed), Modifier.weight(1.55f).fillMaxHeight()) { + Box(Modifier.fillMaxWidth().weight(1f)) { + SpeedDial(t, unit, Modifier.fillMaxSize()) + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(speedText(t, unit), fontSize = 44.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 16.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { "%,.0f rpm".format(it) } ?: "", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_pedals), Modifier.fillMaxWidth().weight(1f)) { Pedals(t, Modifier.fillMaxWidth().weight(1f)) } + if (t.gLat != null && t.gLon != null) { + StatsCard(stringResource(R.string.stats_gforce), Modifier.fillMaxWidth().weight(1f)) { GForce(t, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun SpeedDial(t: Telemetry, unit: SpeedUnit, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val speed = speedValue(t, unit) + val vmax = speedScale(speed, unit) + val rpmFraction = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Canvas(modifier) { + val r = min(size.width * 0.42f, size.height * 0.47f) + val cx = size.width / 2f + val cy = r + 12.dp.toPx() + dialFace(cx, cy, r, vmax, 20f, { "%.0f".format(it) }, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, null, StatsColors.brake) + val rr = r + 9.dp.toPx() + val box = Size(2 * rr, 2 * rr) + val tl = Offset(cx - rr, cy - rr) + drawArc(pal.line, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + if (rpmFraction > 0f) drawArc(if (rpmFraction > 0.9f) StatsColors.brake else pal.primary, DIAL_START - 90f, DIAL_SWEEP * rpmFraction, false, + topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + needle(cx, cy, r - 16.dp.toPx(), dialAngle(speed, vmax), colors.onBackground, pal.primary) + } +} + +@Composable +private fun Pedals(t: Telemetry, modifier: Modifier) { + Row(modifier, horizontalArrangement = Arrangement.SpaceEvenly) { + PedalBar("THR", t.throttle, StatsColors.throttle) + PedalBar("BRK", t.brake, StatsColors.brake) + } +} + +@Composable +private fun PedalBar(label: String, value: Float?, color: Color) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxHeight(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(value?.let { "${(it * 100).roundToInt()}%" } ?: "–", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Box(Modifier.weight(1f).width(26.dp).clip(RoundedCornerShape(6.dp)).background(pal.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant) + } +} + +@Composable +private fun GForce(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val g = kotlin.math.hypot(t.gLat ?: 0f, t.gLon ?: 0f) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val steerH = if (t.steer != null) 10.dp.toPx() else 0f + val r = min(size.width / 2f, (size.height - steerH) / 2f) - 2.dp.toPx() + val cx = size.width / 2f + val cy = (size.height - steerH) / 2f + for (k in listOf(1f, 0.62f, 0.24f)) drawCircle(pal.line, radius = r * k, center = Offset(cx, cy), style = Stroke(1.dp.toPx())) + drawLine(pal.line, Offset(cx - r, cy), Offset(cx + r, cy), strokeWidth = 1.dp.toPx()) + drawLine(pal.line, Offset(cx, cy - r), Offset(cx, cy + r), strokeWidth = 1.dp.toPx()) + val gx = (t.gLat ?: 0f).coerceIn(-2f, 2f) / 2f * r + val gy = (t.gLon ?: 0f).coerceIn(-2f, 2f) / 2f * r + drawCircle(colors.onBackground, radius = 6.dp.toPx(), center = Offset(cx + gx, cy - gy)) + t.steer?.let { s -> + val y = size.height - 3.dp.toPx() + drawLine(pal.line, Offset(cx - r, y), Offset(cx + r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + drawLine(pal.primary, Offset(cx, y), Offset(cx + s * r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + } + } + Text("%.1f G".format(g), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, modifier = Modifier.align(Alignment.TopEnd)) + } +} + +@Composable +private fun CircuitDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(null, Modifier.fillMaxWidth()) { ShiftLights(t, Modifier.fillMaxWidth().height(20.dp)) } + Row(Modifier.fillMaxWidth().height(DASH_H - 48.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_timing), Modifier.weight(1f).fillMaxHeight()) { + KvRow(stringResource(R.string.bottom_telemetry_lap), t.lap?.let { lap -> t.laps?.let { "$lap / $it" } ?: "$lap" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_position), t.position?.let { "P$it" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_this_lap), t.currentLapS?.let { lapTime(it) } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_last_lap), t.lastLapS?.let { lapTime(it) } ?: "–") + t.bestLapS?.let { KvRow(stringResource(R.string.stats_best_lap), lapTime(it), accent) } + } + StatsCard("", Modifier.weight(1.2f).fillMaxHeight()) { + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 72.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 24.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { rpm -> t.maxRpm?.let { "%,.0f / %,.0f rpm".format(rpm, it) } ?: "%,.0f rpm".format(rpm) } ?: "", + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + val fuel = t.fuel + val tires = t.tireTempsC?.takeIf { it.size == 4 } + if (fuel != null || tires != null) Column(Modifier.weight(0.9f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (fuel != null) StatsCard(stringResource(R.string.bottom_telemetry_fuel), Modifier.fillMaxWidth().weight(1f)) { + Bar(fuel, colors.onBackground, Modifier.fillMaxWidth().height(14.dp)) + Text("${(fuel * 100).roundToInt()}%", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + if (tires != null) StatsCard(stringResource(R.string.stats_tires), Modifier.fillMaxWidth().weight(1.3f)) { Tires(tires, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun ShiftLights(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + val lit = (((ratio - 0.6f) / 0.35f).coerceIn(0f, 1f) * 15).roundToInt() + val flash = ratio > 0.95f && (System.currentTimeMillis() / 120) % 2 == 0L + Canvas(modifier) { + val step = size.width / 15f + val r = min(size.height / 2f, step / 2f - 2.dp.toPx()) + for (i in 0 until 15) { + val c = when { + flash -> pal.primary + i >= lit -> pal.line + i < 5 -> StatsColors.shiftGreen + i < 10 -> StatsColors.warn + i < 13 -> StatsColors.brake + else -> pal.primary + } + drawCircle(c, radius = r, center = Offset(step * i + step / 2f, size.height / 2f)) + } + } +} + +@Composable +private fun KvRow(label: String, value: String, valueColor: Color = MaterialTheme.colorScheme.onBackground) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.weight(1f), maxLines = 1) + Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = valueColor, maxLines = 1) + } +} + +@Composable +private fun Bar(fraction: Float, color: Color, modifier: Modifier) { + Box(modifier.clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).fillMaxHeight().background(color)) + } +} + +@Composable +private fun Tires(tires: List<Float>, modifier: Modifier) { + Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[0], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[1], Modifier.weight(1f).fillMaxHeight()) + } + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[2], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[3], Modifier.weight(1f).fillMaxHeight()) + } + } +} + +@Composable +private fun TireBox(c: Float, modifier: Modifier) { + val bg = when { + c > 100f -> Color(0xFF5A2A2C) + c < 70f -> Color(0xFF1D3550) + else -> Color(0xFF23352B) + } + Box(modifier.clip(RoundedCornerShape(6.dp)).background(bg), contentAlignment = Alignment.Center) { + Text("%.0f".format(c), fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground) + } +} + +@Composable +private fun TraceDash(t: Telemetry, trace: TraceData, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_trace), Modifier.fillMaxWidth().height(168.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.throttle, "${stringResource(R.string.stats_throttle)} ${t.throttle?.let { (it * 100).roundToInt() } ?: 0}%") + Legend(StatsColors.brake, "${stringResource(R.string.stats_brake)} ${t.brake?.let { (it * 100).roundToInt() } ?: 0}%") + } + TraceChart(listOf(trace.throttle to StatsColors.throttle, trace.brake to StatsColors.brake), 1f, Modifier.fillMaxWidth().weight(1f)) + } + val speeds = trace.speed.map { it * unit.perKmh } + val top = max(if (unit == SpeedUnit.MPH) 125f else 200f, (speeds.maxOrNull() ?: 0f) * 1.1f) + StatsCard(stringResource(R.string.stats_speed_chart, unit.label), Modifier.fillMaxWidth().height(114.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.speed, "${stringResource(R.string.stats_speed)} ${speedText(t, unit)}") + Text("0 – %.0f".format(top), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + TraceChart(listOf(speeds to StatsColors.speed), top, Modifier.fillMaxWidth().weight(1f)) + } + } +} + +@Composable +private fun Legend(color: Color, text: String) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) { + Box(Modifier.size(8.dp).clip(CircleShape).background(color)) + Text(text, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TraceChart(series: List<Pair<List<Float>, Color>>, max: Float, modifier: Modifier) { + val pal = LocalPalette.current + Canvas(modifier) { + for (k in listOf(0f, 0.5f, 1f)) { + val y = size.height - k * size.height + drawLine(pal.line, Offset(0f, y), Offset(size.width, y), strokeWidth = 1.dp.toPx()) + } + for ((values, color) in series) { + if (values.size < 2) continue + val path = Path() + val offset = TRACE_N - values.size + values.forEachIndexed { i, v -> + val x = (i + offset) / (TRACE_N - 1f) * size.width + val y = size.height - (v / max).coerceIn(0f, 1f) * size.height + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } + } +} + +@Composable +private fun DialsDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val rpmMax = (rpmScale(t) / 1000f).let { kotlin.math.ceil(it) * 1000f } + val hasExtras = t.lights != null || t.turboBar != null || t.engineTempC != null || t.oilTempC != null + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth().height(if (hasExtras) DASH_H - 56.dp else DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + val speed = speedValue(t, unit) + ArcDial(speed, speedScale(speed, unit), if (unit == SpeedUnit.MPH) 20f else 40f, { "%.0f".format(it) }, null, + speedText(t, unit), unit.label, Modifier.fillMaxWidth().weight(1f)) + } + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + ArcDial(t.rpm ?: 0f, rpmMax, 1000f, { "%.0f".format(it / 1000f) }, t.maxRpm?.let { it * 0.9f }, + t.rpm?.let { "%,.0f".format(it) } ?: "–", "rpm × 1000 · ${t.gear ?: "–"}", Modifier.fillMaxWidth().weight(1f)) + } + } + if (hasExtras) StatsCard(stringResource(R.string.stats_lights), Modifier.fillMaxWidth()) { + Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + t.lights?.let { on -> + Lamp(stringResource(R.string.stats_lamp_shift), on and GameTelemetry.DL_SHIFT != 0, LocalPalette.current.primary) + Lamp(stringResource(R.string.stats_lamp_handbrake), on and GameTelemetry.DL_HANDBRAKE != 0, StatsColors.brake) + Lamp(stringResource(R.string.stats_lamp_pit), on and GameTelemetry.DL_PITSPEED != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_tc), on and GameTelemetry.DL_TC != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_abs), on and GameTelemetry.DL_ABS != 0, StatsColors.warn) + } + t.turboBar?.let { Lamp(stringResource(R.string.stats_turbo, "%.1f".format(it)), false, colors.onBackground) } + t.engineTempC?.let { Lamp(stringResource(R.string.stats_engine_temp, "%.0f".format(it)), false, colors.onBackground) } + t.oilTempC?.let { Lamp(stringResource(R.string.stats_oil_temp, "%.0f".format(it)), false, colors.onBackground) } + } + } + } +} + +@Composable +private fun ArcDial(value: Float, max: Float, major: Float, label: (Float) -> String, red: Float?, readout: String, unit: String, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val r = min(size.width * 0.46f, size.height * 0.5f) + val cx = size.width / 2f + val cy = r + 6.dp.toPx() + dialFace(cx, cy, r, max, major, label, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, red, StatsColors.brake) + needle(cx, cy, r - 18.dp.toPx(), dialAngle(value, max), colors.onBackground, pal.primary) + } + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(readout, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(unit, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + } +} + +@Composable +private fun Lamp(label: String, on: Boolean, color: Color) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + Text(label, fontSize = 12.sp, fontFamily = FontFamily.Monospace, fontWeight = if (on) FontWeight.Bold else FontWeight.Normal, + color = if (on) MaterialTheme.colorScheme.background else MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, + modifier = Modifier.clip(shape).background(if (on) color else Color.Transparent).border(1.dp, if (on) color else pal.line, shape) + .padding(horizontal = 10.dp, vertical = 4.dp)) +} + +@Composable +private fun GlanceDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + EdgeBar(t.throttle, StatsColors.throttle) + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + Bar(ratio, if (ratio > 0.9f) StatsColors.brake else accent, Modifier.fillMaxWidth().height(14.dp)) + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 110.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, lineHeight = 112.sp) + Text(unitAndGear(t, unit), fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + } + } + EdgeBar(t.brake, StatsColors.brake) + } +} + +@Composable +private fun EdgeBar(value: Float?, color: Color) { + Box(Modifier.width(14.dp).fillMaxHeight().clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } +} + +internal object FlightLabels { + const val IAS = "IAS, km/h" + const val ALTITUDE = "H, m" + const val G = "Ny" + const val FUEL = "Mfuel, kg" + const val THROTTLE = "throttle 1, %" + + fun drawable(rows: List<Pair<String, String>>): Boolean = rows.any { it.first == IAS || it.first == ALTITUDE } +} + +@Composable +internal fun FlightDash(rows: List<Pair<String, String>>) { + val colors = MaterialTheme.colorScheme + val v = rows.toMap() + fun num(key: String) = v[key]?.toFloatOrNull() + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.IAS, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.IAS)?.let { Tape(it, 10f, 50f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1.3f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.THROTTLE, Modifier.fillMaxWidth().weight(1f)) { + val thr = num(FlightLabels.THROTTLE) + Bar((thr ?: 0f) / 110f, StatsColors.throttle, Modifier.fillMaxWidth().height(16.dp)) + Text(thr?.let { "%.0f%%".format(it) } ?: "–", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + StatsCard(FlightLabels.G, Modifier.fillMaxWidth().weight(1f)) { + Text(num(FlightLabels.G)?.let { "%.1f".format(it) } ?: "–", fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, + color = colors.onBackground) + num(FlightLabels.FUEL)?.let { Text("${FlightLabels.FUEL} %.0f".format(it), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + } + StatsCard(FlightLabels.ALTITUDE, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.ALTITUDE)?.let { Tape(it, 100f, 500f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun Tape(value: Float, step: Float, every: Float, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val small = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val big = TextStyle(color = colors.onBackground, fontSize = 18.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace) + Canvas(modifier) { + val cy = size.height / 2f + val px = (size.height / 2f) / (step * 4f) + val boxH = 32.dp.toPx() + var m = floor((value - step * 5f) / step) * step + while (m < value + step * 6f) { + val y = cy - (m - value) * px + if (y in 0f..size.height) { + val labelled = abs((m / every).roundToInt() * every - m) < 0.01f + drawLine(colors.onSurfaceVariant, Offset(size.width * 0.74f, y), Offset(size.width, y), strokeWidth = (if (labelled) 2.5f else 1f).dp.toPx()) + if (labelled && abs(y - cy) > boxH * 0.75f) { + val layout = measurer.measure("%.0f".format(m), small) + drawText(layout, topLeft = Offset(size.width * 0.70f - layout.size.width, y - layout.size.height / 2f)) + } + } + m += step + } + drawRoundRect(pal.primary, topLeft = Offset(1.dp.toPx(), cy - boxH / 2f), size = Size(size.width - 2.dp.toPx(), boxH), + cornerRadius = CornerRadius(8.dp.toPx()), style = Stroke(2.dp.toPx())) + val layout = measurer.measure("%.0f".format(value), big) + drawText(layout, topLeft = Offset(size.width / 2f - layout.size.width / 2f, cy - layout.size.height / 2f)) + } +} + +@Composable +internal fun ShipDash(e: GameStatusFiles.Elite) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().height(210.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_power), Modifier.weight(1.2f).fillMaxHeight()) { + e.pips?.takeIf { it.size == 3 }?.let { Pips(it, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_fuel_t), Modifier.fillMaxWidth().weight(1f)) { + e.fuelMain?.let { Text(stringResource(R.string.stats_fuel_main, "%.1f".format(it)), fontSize = 15.sp, fontWeight = FontWeight.Bold, + fontFamily = FontFamily.Monospace, color = colors.onBackground) } + e.fuelReserve?.let { Text(stringResource(R.string.stats_fuel_reserve, "%.2f".format(it)), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + StatsCard("", Modifier.fillMaxWidth().weight(1f)) { + e.cargo?.let { KvRow(stringResource(R.string.bottom_telemetry_cargo), "%.0f t".format(it)) } + e.legal?.let { KvRow(stringResource(R.string.bottom_telemetry_legal), it, if (it == "Clean") StatsColors.gpu else StatsColors.warn) } + e.balance?.let { KvRow(stringResource(R.string.bottom_telemetry_balance), "%,d CR".format(it)) } + } + } + } +} + +@Composable +private fun Pips(pips: List<Int>, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val style = TextStyle(color = colors.onSurfaceVariant, fontSize = 12.sp, fontWeight = FontWeight.Bold) + val names = listOf("SYS", "ENG", "WEP") + Canvas(modifier) { + val colW = size.width / 3f + val pipW = colW * 0.62f + val labelH = 18.dp.toPx() + val pipH = (size.height - labelH) / 4f - 4.dp.toPx() + for (col in 0 until 3) { + val x = col * colW + (colW - pipW) / 2f + val value = pips[col] / 2f + for (i in 0 until 4) { + val y = size.height - labelH - (i + 1) * (pipH + 4.dp.toPx()) + drawRoundRect(pal.line, topLeft = Offset(x, y), size = Size(pipW, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + val fill = (value - i).coerceIn(0f, 1f) + if (fill > 0f) drawRoundRect(pal.primary, topLeft = Offset(x, y), size = Size(pipW * fill, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + } + val layout = measurer.measure(names[col], style) + drawText(layout, topLeft = Offset(col * colW + colW / 2f - layout.size.width / 2f, size.height - layout.size.height)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt new file mode 100644 index 000000000..02bfee49d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -0,0 +1,285 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.DroidDeckMark +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.session.StatsStrip +import kotlin.math.max +import kotlin.math.roundToInt + +internal object StatsColors { + val cpu = Color(0xFF58A6FF) + val gpu = Color(0xFF5EE08A) + val ram = Color(0xFFFF7BC0) + val bat = Color(0xFFFFAB5E) + val throttle = Color(0xFF14A39A) + val brake = Color(0xFFE5484D) + val speed = Color(0xFF2E8FD6) + val warn = Color(0xFFF2C94C) + val shiftGreen = Color(0xFF2FB36A) + val badge = Color(0xFF0B0D10) +} + +internal class History(private val capacity: Int) { + private val values = ArrayDeque<Float>(capacity) + fun add(v: Float) { + if (values.size == capacity) values.removeFirst() + values.addLast(v) + } + fun snapshot(): List<Float> = values.toList() +} + +private val MARK_RATIO = DroidDeckMark.widthFor(1f) + +@Composable +internal fun DroidDeckLogo(height: Dp, modifier: Modifier = Modifier, body: Color = Color.White, orb: Color = LocalPalette.current.primary) { + Canvas(modifier.size(height * MARK_RATIO, height)) { + val b = body.toArgb() + val o = orb.toArgb() + drawIntoCanvas { DroidDeckMark.draw(it.nativeCanvas, 0f, 0f, size.height, b, o) } + } +} + +@Composable +private fun LogoBadge(size: Dp) { + val shape = RoundedCornerShape(size * 0.22f) + Box(Modifier.size(size).clip(shape).background(StatsColors.badge).border(2.dp, LocalPalette.current.primary, shape), contentAlignment = Alignment.Center) { + DroidDeckLogo(size * 0.62f) + } +} + +@Composable +private fun LogoHeader(clock: String, game: String?) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DroidDeckLogo(16.dp) + Text("DroidDeck", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } +} + +@Composable +internal fun Sparkline(values: List<Float>, min: Float, max: Float, color: Color, modifier: Modifier) { + Canvas(modifier) { + if (values.size < 2 || max <= min) return@Canvas + val path = Path() + values.forEachIndexed { i, v -> + val x = i / (values.size - 1f) * size.width + val y = size.height - ((v - min) / (max - min)).coerceIn(0f, 1f) * (size.height - 2f) - 1f + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } +} + +@Composable +internal fun StatsCard(title: String?, modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(14.dp) + Column( + modifier.clip(shape).background(pal.surface).border(1.dp, pal.primary.copy(alpha = 0.22f), shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + if (title != null) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DroidDeckLogo(12.dp, body = MaterialTheme.colorScheme.onSurfaceVariant) + if (title.isNotEmpty()) Text(title.uppercase(), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, letterSpacing = 0.6.sp, + maxLines = 1, overflow = TextOverflow.Ellipsis) + } + content() + } +} + +internal class StripData( + val fps: Float?, + val device: HudMetrics.Snapshot?, + val fpsHistory: List<Float>, + val cpuHistory: List<Float>, + val gpuHistory: List<Float>, + val wattsHistory: List<Float>, + val clock: String, + val game: String? = null, +) + +private fun percentTemp(percent: Int?, temp: Int?): String = + listOfNotNull(percent?.let { "$it%" }, temp?.let { "$it°" }).joinToString(" · ").ifEmpty { "–" } + +private fun batteryText(s: HudMetrics.Snapshot?): String = + listOfNotNull(s?.battery?.percent?.let { "$it%" }, s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) }).joinToString(" · ").ifEmpty { "–" } + +private fun fpsText(fps: Float?): String = fps?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–" + +@Composable +internal fun StatsStripView(style: StatsStrip, d: StripData, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsStrip.PANEL -> PanelStrip(d) + StatsStrip.TILES -> TilesStrip(d) + StatsStrip.RINGS -> RingsStrip(d) + } + } +} + +@Composable +private fun PanelStrip(d: StripData) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val accent = pal.primary + val shape = RoundedCornerShape(18.dp) + Row( + Modifier.fillMaxWidth().clip(shape).background(pal.surface).border(2.dp, accent, shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + LogoBadge(40.dp) + Column(Modifier.widthIn(min = 84.dp)) { + Row(verticalAlignment = Alignment.Bottom) { + Text(fpsText(d.fps), fontSize = 30.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, maxLines = 1) + Text(" fps", fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 4.dp)) + } + Text(d.fps?.takeIf { it > 0f }?.let { "%.1f ms".format(1000f / it) } ?: stringResource(R.string.stats_fps_needs_hud), + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 1) + } + Sparkline(d.fpsHistory.map { 1000f / max(it, 1f) }, 8f, 34f, lerp(accent, Color.White, 0.3f), Modifier.weight(1f).height(44.dp)) + Column(verticalArrangement = Arrangement.spacedBy(1.dp)) { + MetricRow("CPU", percentTemp(d.device?.cpuPercent, d.device?.cpuTempC), StatsColors.cpu) + MetricRow("GPU", percentTemp(d.device?.gpuPercent, d.device?.gpuTempC), StatsColors.gpu) + MetricRow("RAM", d.device?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", StatsColors.ram) + MetricRow("BAT", batteryText(d.device), StatsColors.bat) + } + } +} + +@Composable +private fun MetricRow(label: String, value: String, color: Color) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = color, modifier = Modifier.width(36.dp)) + Text(value, fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TilesStrip(d: StripData) { + val accent = LocalPalette.current.primary + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + HistoryTile("FPS", accent, fpsText(d.fps), "fps", d.fpsHistory, 75f) + HistoryTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it°" } ?: "", d.cpuHistory, 100f) + HistoryTile("GPU", StatsColors.gpu, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it°" } ?: "" else "", d.gpuHistory, 100f) + HistoryTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { "$it%" } ?: "–", + s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1fW".format(it) } ?: "", d.wattsHistory, 10f) + } + } +} + +@Composable +private fun RowScope.HistoryTile(label: String, color: Color, value: String, unit: String, history: List<Float>, max: Float) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface) + .drawBehind { drawRect(color, topLeft = Offset.Zero, size = Size(size.width, 3.dp.toPx())) } + .padding(start = 10.dp, end = 10.dp, top = 9.dp, bottom = 6.dp), + ) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + Row(verticalAlignment = Alignment.Bottom) { + Text(value, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + if (unit.isNotEmpty()) Text(" $unit", fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(bottom = 3.dp)) + } + Sparkline(history, 0f, max, color, Modifier.fillMaxWidth().height(24.dp)) + } +} + +@Composable +private fun RingsStrip(d: StripData) { + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + RingTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { it / 100f }, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it °C" } ?: "") + RingTile("GPU", StatsColors.gpu, gpuPercent?.let { it / 100f }, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it °C" } ?: "" else "") + RingTile("RAM", StatsColors.ram, s?.ramPercent?.let { it / 100f }, s?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", + s?.let { "%.1f of %.1f GB".format(it.ramUsedBytes / 1e9, it.ramTotalBytes / 1e9) } ?: "") + RingTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { it / 100f }, + s?.battery?.percent?.let { "$it%" } ?: "–", s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) } ?: "") + } + } +} + +@Composable +private fun RowScope.RingTile(label: String, color: Color, fraction: Float?, center: String, sub: String) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Row( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface).padding(8.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Box(Modifier.size(52.dp), contentAlignment = Alignment.Center) { + Canvas(Modifier.fillMaxSize()) { + val w = 6.dp.toPx() + val tl = Offset(w / 2, w / 2) + val sz = Size(size.width - w, size.height - w) + drawArc(pal.line, 0f, 360f, false, topLeft = tl, size = sz, style = Stroke(width = w)) + if (fraction != null) drawArc(color, -90f, (fraction.coerceIn(0f, 1f) * 360f).coerceAtLeast(1f), false, topLeft = tl, size = sz, + style = Stroke(width = w, cap = StrokeCap.Round)) + } + Text(center, fontSize = 12.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + } + Column { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + if (sub.isNotEmpty()) Text(sub, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index dfb6d2525..671bcabe1 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.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/SteamImportDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamImportDialog.kt new file mode 100644 index 000000000..b262504dd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamImportDialog.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.RestartAlt +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.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +@Composable +internal fun SteamImportDialog(games: List<String>, onAnswer: (Boolean) -> Unit) { + val now = remember { booleanArrayOf(false) } + val shown = rememberShown { onAnswer(now[0]) } + val close = { shown.targetState = false } + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { focus.requestFocus() } } + val names = if (games.size <= 3) games.joinToString(", ") + else stringResource(R.string.steam_import_names_more, games.take(3).joinToString(", "), games.size - 3) + AppDialog(shown, close, "steamImport", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.steam_import_title), close) { + Icon(Icons.Filled.RestartAlt, null, tint = LocalPalette.current.signal, modifier = Modifier.size(20.dp)) + } + Text( + stringResource(R.string.steam_import_body, names), + fontSize = 13.sp, lineHeight = 18.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.steam_import_later)) { now[0] = false; close() } + PrimaryButton(stringResource(R.string.steam_import_now), modifier = Modifier.focusRequester(focus), onClick = { now[0] = true; close() }) + } + } +} 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 000000000..8e2380e94 --- /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.common_close) + 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/StepOut.kt b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt index 3791fb782..73e68986d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt @@ -124,6 +124,18 @@ internal enum class StepSide { Right, } +internal fun fitStepSide(preferred: StepSide, pill: Rect, hostWidth: Float, wanted: Float): StepSide { + val leftRoom = pill.right + val rightRoom = hostWidth - pill.left + val room = if (preferred == StepSide.Left) leftRoom else rightRoom + val other = if (preferred == StepSide.Left) rightRoom else leftRoom + return if (room >= wanted || other <= room) preferred else if (preferred == StepSide.Left) StepSide.Right else StepSide.Left +} + +internal fun stepReach(side: StepSide, pill: Rect, hostWidth: Float, width: Int): Pair<Float, Float> = + if (side == StepSide.Left) pill.left to (pill.right - width).coerceAtLeast(0f) + else pill.right to (pill.left + width).coerceAtMost(hostWidth) + internal class StepOutScope(private val items: List<Animatable<Float, AnimationVector1D>>, val first: FocusRequester, val open: Boolean, val maxHeight: Dp) { fun Modifier.stepItem(i: Int): Modifier = graphicsLayer { val v = items[i.coerceIn(0, items.lastIndex)].value @@ -141,7 +153,7 @@ private val OutFillet = 10.dp internal fun StepOut( open: Boolean, pill: Rect, - side: StepSide, + preferredSide: StepSide, accent: Color, onDismiss: () -> Unit, onClosed: () -> Unit, @@ -166,6 +178,7 @@ internal fun StepOut( val opener = remember { arrayOfNulls<GlideSource>(1) } val openNow = androidx.compose.runtime.rememberUpdatedState(open) var moving by remember { mutableStateOf(false) } + val placed = remember { arrayOfNulls<Any>(3) } if (moving) VeilRing() val pull = with(density) { OutPull.toPx() } val corner = pillCorner?.let { with(density) { it.toPx() } } ?: minOf(pill.height, pill.width) / 2f @@ -177,13 +190,18 @@ internal fun StepOut( maxOf(hostHeight - pill.bottom - pull, pill.top - pull).coerceAtLeast(44.dp.toPx()).toDp() } val up = measured?.let { pill.bottom + pull + it.height > hostHeight && pill.top - pull - it.height >= 0f } ?: false + val wantedW = with(density) { maxWidth.toPx() } + val side = fitStepSide(preferredSide, pill, hostWidth, wantedW) val room = if (side == StepSide.Left) pill.right else hostWidth - pill.left - val maxW = with(density) { maxWidth.toPx() }.coerceAtMost(room).coerceAtLeast(pill.width) - LaunchedEffect(open, measured) { - if (!open && !grown) { onClosed(); return@LaunchedEffect } + val maxW = wantedW.coerceAtMost(room).coerceAtLeast(pill.width) + LaunchedEffect(open, measured, side, pill, hostWidth) { + val moved = placed[0] == open && placed[1] == measured + val flipped = placed[2] != null && placed[2] != side + placed[0] = open; placed[1] = measured; placed[2] = side + if (!open && !grown) { if (!moved) onClosed(); return@LaunchedEffect } val c = measured ?: return@LaunchedEffect - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) + if (grown && flipped) edge.snapTo(if (open) out else rest) val boxBottom = pill.bottom + pull + c.height if (open) { if (!grown) { @@ -202,11 +220,6 @@ internal fun StepOut( pieces.forEachIndexed { i, a -> launch { delay(Motion.ms(260 + i * 55).toLong()); a.animateTo(1f, Motion.tw(220)) } } - if (inputMode.inputMode == InputMode.Keyboard) launch { - delay(Motion.ms(300).toLong()) - withFrameNanos { } - runCatching { first.requestFocus() } - } } } else { opener[0]?.let { o -> if (inputMode.inputMode == InputMode.Keyboard) runCatching { o.requester.requestFocus() } } @@ -225,6 +238,13 @@ internal fun StepOut( } } + LaunchedEffect(open, measured) { + if (!open || measured == null || inputMode.inputMode != InputMode.Keyboard) return@LaunchedEffect + delay(Motion.ms(300).toLong()) + withFrameNanos { } + runCatching { first.requestFocus() } + } + LaunchedEffect(open, grown, inputMode.inputMode) { if (open && grown && inputMode.inputMode == InputMode.Keyboard) { withFrameNanos { }; runCatching { first.requestFocus() } } } @@ -245,8 +265,7 @@ internal fun StepOut( else stepPathRight(path, pill, edge.value, bottom.value, pill.bottom + pull, boxCorner, fillet, corner) if (up) path.transform(Matrix().apply { this[1, 1] = -1f; this[3, 1] = pill.top + pill.bottom }) val a = measured?.let { c -> - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) val down = pill.bottom + pull + c.height - pill.bottom val across = kotlin.math.abs(out - rest) val fd = if (down < 1f) 1f else (bottom.value - pill.bottom) / down diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt index 18a4b9703..9adfb00db 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt @@ -39,7 +39,7 @@ internal fun StepsLayer(origin: Offset) { androidx.activity.compose.BackHandler(enabled = Steps.open) { Steps.fold() } key(ask) { StepOut( - open = Steps.open, pill = ask.anchor.translate(-origin), side = ask.side, accent = ask.accent, + open = Steps.open, pill = ask.anchor.translate(-origin), preferredSide = ask.side, accent = ask.accent, onDismiss = { Steps.fold() }, onClosed = { Steps.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) 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 8b1ec5340..acf6753bf 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) { @@ -154,13 +270,10 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: val safe = StorageState.safeBytes(report) val low = report.free < StorageState.LOW_SPACE_BYTES ActionStatus() - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), - modifier = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14) - .padding(horizontal = 18.dp, vertical = 14.dp), - ) { - Column(Modifier.weight(1f)) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + val summary = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14) + .padding(horizontal = 18.dp, vertical = 14.dp) + val usage: @Composable (Modifier) -> Unit = { m -> Column(m) { + FlowRow(verticalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { Text(stringResource(R.string.storage_internal), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) Text("· " + stringResource(R.string.storage_used_of, gb(used), gb(report.total)), fontSize = 15.sp, color = colors.onSurfaceVariant) Pill(stringResource(R.string.storage_free, gb(report.free)), if (low) AttentionAmber else pal.good) @@ -176,19 +289,27 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: Bucket.entries.forEach { Legend(BucketColors.getValue(it), bucketLabel(it)) } Legend(OtherApps, stringResource(R.string.storage_other_apps)) } - } + } } + val freeable: @Composable (Modifier) -> Unit = { m -> Column(m) { + Text(stringResource(R.string.storage_safe_now), fontSize = 13.sp, color = colors.onSurfaceVariant) + Text(gb(safe), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = if (safe > 0) pal.good else colors.onBackground) + Text(stringResource(R.string.storage_safe_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 10.dp)) + PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.cleaning, compact = true, onClick = onCleanUp) + } } + if (wide) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), modifier = summary) { + usage(Modifier.weight(1f)) Box(Modifier.width(1.dp).height(120.dp).background(pal.line)) - Column(Modifier.widthIn(min = 170.dp, max = 210.dp)) { - Text(stringResource(R.string.storage_safe_now), fontSize = 13.sp, color = colors.onSurfaceVariant) - Text(gb(safe), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = if (safe > 0) pal.good else colors.onBackground) - Text(stringResource(R.string.storage_safe_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 10.dp)) - PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.cleaning, compact = true, onClick = onCleanUp) - } + freeable(Modifier.widthIn(min = 170.dp, max = 210.dp)) + } else Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = summary) { + usage(Modifier.fillMaxWidth()) + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + freeable(Modifier.fillMaxWidth()) } if (sessionRunning) { 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>( @@ -500,7 +621,6 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Spacer(Modifier.height(8.dp)) Note(stringResource(R.string.storage_games_note)) confirm?.let { g -> - // steam://uninstall reaches only the session's client, the selected one. val otherClient = g.x64 != (SessionPrefs.steamClientArch(LocalContext.current) == "x86_64") if (otherClient) AlertDialog( onDismissRequest = { confirm = null }, @@ -729,17 +849,23 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: val ctx = LocalContext.current val busy = sessionRunning || StorageState.cleaning var confirm by remember { mutableStateOf<com.droiddeck.launcher.storage.Leftover?>(null) } + var confirmPrefix by remember { mutableStateOf<com.droiddeck.launcher.storage.GameUsage?>(null) } SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) ActionStatus() if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } - val games = report.games.filter { it.data >= ONE_MB }.sortedByDescending { it.data } + val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } SectionTitle(stringResource(R.string.storage_data_installed), gb(games.sumOf { it.data })) ListCard { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> ItemRow( gameName(g), stringResource(R.string.storage_data_parts, gb(g.prefix), gb(g.shaders), gb(g.workshop)), g.data, i == games.lastIndex, - action = { SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } }, + action = { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } + SecondaryButton(stringResource(R.string.storage_reset_prefix), compact = true, enabled = !busy && g.prefixDir != null) { confirmPrefix = g } + } + }, ) } } @@ -771,6 +897,13 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: SectionTitle(stringResource(R.string.storage_data_other), null) ListCard { ItemRow(stringResource(R.string.storage_data_other_title), stringResource(R.string.storage_data_other_detail), report.otherPrefixes, true) } } + confirmPrefix?.let { g -> + ConfirmDialog( + stringResource(R.string.storage_reset_prefix_title, gameName(g)), + stringResource(R.string.storage_reset_prefix_confirm, gb(g.prefix), g.library), stringResource(R.string.storage_reset_prefix), + onConfirm = { StorageState.resetPrefix(ctx, g) }, onDismiss = { confirmPrefix = null }, + ) + } confirm?.let { l -> ConfirmDialog( stringResource(R.string.storage_remove_title, stringResource(R.string.storage_steam_app, l.appId)), 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 1492362f1..5d9adf2cb 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 @@ -204,22 +204,6 @@ internal fun AchievementRow(a: Achievement, compact: Boolean, modifier: Modifier } } -@Composable -internal fun StoreAchievementsCard(game: StoreAchievements.Game, title: String, modifier: Modifier = Modifier) { - val label = StoreAchievements.forSource(game.source)?.label ?: return - val state = rememberAchievements(game) ?: return - var open by remember { mutableStateOf(false) } - StoreAchievementsCardContent(label, state, modifier) { open = true } - if (open) { - VeilRing() - Dialog(onDismissRequest = { open = false }, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) { - CompositionLocalProvider(LocalFrontFocus provides null) { - SessionAchievementsPanel(label, state, title, veil = Color.Transparent, floating = true, onClose = { open = false }) - } - } - } -} - @Composable internal fun StoreAchievementsCardContent(label: String, state: AchievementsState, modifier: Modifier = Modifier, onOpen: () -> Unit) { val colors = MaterialTheme.colorScheme @@ -270,6 +254,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 e913dc6af..40bfd22c4 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/StoreGameFacts.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt index 5a770942a..90d6d4ac1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt @@ -177,6 +177,58 @@ internal fun StoreGameFacts(developer: String, publisher: String, releaseDate: S } } +@Composable +internal fun CapsuleScores(scores: GameScores, modifier: Modifier = Modifier) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = modifier) { + Looked(scores.metacritic, exit = fadeOut()) { lookup -> + val found = (lookup as? Lookup.Found)?.value + CapsuleStat(stringResource(R.string.stores_fact_metacritic), found?.url, showLabel = false) { + if (found != null) MetacriticBadge(found.score, small = true) else Placeholder(28.dp) + } + } + Looked(scores.hltb, exit = fadeOut()) { lookup -> + val found = (lookup as? Lookup.Found)?.value + val lead = found?.let { hltbRuns(it).firstOrNull() } + CapsuleStat(lead?.second ?: stringResource(R.string.stores_hltb_main), found?.url) { + if (lead != null) Text(hltbTime(lead.first), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + else Placeholder(40.dp) + } + } + } +} + +@Composable +private fun CapsuleStat(label: String, link: String?, showLabel: Boolean = true, value: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val src = remember { MutableInteractionSource() } + val hot = link != null && rememberHot(src) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), + modifier = Modifier.then(linkSurface(label, link, src, hot, CapsuleStatShape)).padding(horizontal = 10.dp, vertical = 6.dp), + ) { + value() + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(3.dp)) { + val tint = colors.onSurfaceVariant.copy(alpha = if (hot) 1f else 0.85f) + if (showLabel) Text(label.uppercase(), fontSize = 10.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, color = tint, maxLines = 1) + if (link != null) Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = if (showLabel) null else label, tint = tint, modifier = Modifier.size(10.dp)) + } + } +} + +@Composable +internal fun StoreDetailRows(developer: String, publisher: String, releaseDate: String, scores: GameScores) { + val released = remember(releaseDate) { GameFacts.releaseLabel(releaseDate) } + val publishedBy = publisher.takeUnless { it.isBlank() || it.trim().equals(developer.trim(), ignoreCase = true) } + val credits = listOf( + stringResource(R.string.stores_fact_developer) to developer, + stringResource(R.string.stores_fact_publisher) to publishedBy.orEmpty(), + stringResource(R.string.stores_fact_released) to released.orEmpty(), + ).filter { it.second.isNotBlank() } + val runs = ((scores.hltb as? Lookup.Found)?.value)?.let { hltbRuns(it) }.orEmpty() + credits.forEach { (label, value) -> FactRow(label, value, labelWidth = 96.dp) } + runs.forEach { (secs, what) -> FactRow(what, hltbTime(secs), labelWidth = 96.dp) } +} + @Composable private fun LineLink(label: String, link: String, content: @Composable () -> Unit) { val pal = LocalPalette.current @@ -202,6 +254,7 @@ private fun <T> Looked(lookup: Lookup<T>, exit: ExitTransition, content: @Compos } private val StatShape = RoundedCornerShape(12.dp) +private val CapsuleStatShape = RoundedCornerShape(99.dp) private val LinkShape = RoundedCornerShape(10.dp) private val BadgeHeight = 32.dp diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt index 3996d3042..8cba37f91 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.ui -// `split` is the size of a leading section that starts its own rows; 0 means one continuous grid. internal fun storeGridNeighbor(index: Int, count: Int, columns: Int, direction: Int, split: Int = 0): Int? { if (index !in 0 until count || columns < 1 || direction !in listOf(-1, 1)) return null if (split !in 1 until count) return (index + columns * direction).takeIf { it in 0 until count } 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 0facc0c07..e3724dd83 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt @@ -157,7 +157,7 @@ private fun FlathubHero(s: FrontEndState, ring: Int) { StoreState.sections.values.flatten().mapNotNull { it.icon }.distinct().take(48).takeIf { it.size >= 8 }.orEmpty() } val busy = StoreState.busy == "setup" - BoxWithConstraints(Modifier.fillMaxSize().padding(horizontal = if (narrow) 14.dp else 22.dp, vertical = if (narrow) 10.dp else 14.dp)) { + BoxWithConstraints(Modifier.fillMaxSize().padding(horizontal = if (narrow) 14.dp else 22.dp).padding(top = if (narrow) 10.dp else 14.dp)) { val shape = RoundedCornerShape(20.dp) Box(Modifier.fillMaxWidth().height(maxHeight.coerceAtLeast(320.dp)).clip(shape).background(colors.background).border(1.dp, pal.line, shape)) { androidx.compose.animation.Crossfade(icons, animationSpec = Motion.tw(600), label = "flathubWall") { tiles -> @@ -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), ) { @@ -316,7 +316,7 @@ internal fun Storefront(s: FrontEndState, a: FrontEndActions) { } Column( - Modifier.fillMaxSize().padding(horizontal = padH, vertical = if (narrow) 10.dp else 14.dp) + Modifier.fillMaxSize().padding(horizontal = padH).padding(top = if (narrow) 10.dp else 14.dp) .bumpers( onPrevious = { if (openApp == null) mode = modes[(modes.indexOf(mode) + modes.size - 1) % modes.size] }, onNext = { if (openApp == null) mode = modes[(modes.indexOf(mode) + 1) % modes.size] }, 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 b377f02ec..000000000 --- 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 2bf7dcac0..bd6898e68 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) } } } } @@ -360,8 +360,10 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { when (d.state) { DownloadState.RUNNING, DownloadState.QUEUED -> { - RoundAction(Icons.Filled.Pause, stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(d.key) } - CancelAction { DownloadQueue.cancel(ctx, d.key) } + if (d.interruptible) { + RoundAction(Icons.Filled.Pause, stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(d.key) } + CancelAction { DownloadQueue.cancel(ctx, d.key) } + } } DownloadState.PAUSED -> { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.resume(ctx, d.key) } @@ -372,7 +374,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 +500,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 662e8236f..c5dd008ed 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 175cbecd8..35c21173e 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,35 +231,39 @@ 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) { val ids = tabs.filter { it.shown }.map { it.store.id } if (ids.isEmpty()) return val at = ids.indexOf(chip) - pickChip(ids[if (at < 0) (if (step > 0) 0 else ids.size - 1) else (at + step + ids.size) % ids.size]) + val id = ids[if (at < 0) (if (step > 0) 0 else ids.size - 1) else (at + step + ids.size) % ids.size] + chip = id; openGame = null; query = "" + move("item:storechip:$id") } fun openModes(st: Store) { if (chip != st.id) pickChip(st.id) else move("first") } BackHandler(enabled = openGame != null) { closeGame() } BackHandler(enabled = arranging) { arranging = false } + var contentFocused by remember { mutableStateOf(false) } + BackHandler(enabled = contentFocused && openGame == null && !arranging) { move("item:storechip:$chip") } LaunchedEffect(arranging) { val focus = ff ?: return@LaunchedEffect if (!arranging || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect @@ -319,8 +275,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 +311,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( + modifier = Modifier.fillMaxSize().padding(horizontal = padH).padding(top = if (narrow) 10.dp else 14.dp) + .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,109 +343,59 @@ 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).onFocusChanged { contentFocused = it.hasFocus }.onSizeChanged { viewportH = with(density) { it.height.toDp() } }, + bleedHorizontal = padH, + 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 -> key(ask) { StepOut( - open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), side = ask.side, accent = ask.accent, + open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), preferredSide = ask.side, accent = ask.accent, onDismiss = { StoresMotion.fold() }, onClosed = { StoresMotion.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) @@ -538,11 +411,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 +429,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 +459,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 +589,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 +599,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 +608,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) } } @@ -924,107 +808,60 @@ private fun SignInButton(store: Store, large: Boolean = false) { } } -@Composable -internal fun StoreLogo(store: Store, size: Dp) { - val c = sourceColours(store.id) - Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size).clip(Shape14).background(c.fill).border(1.dp, c.dot.copy(alpha = 0.5f), Shape14)) { - Text(store.shortLabel, fontSize = (size.value / 4).sp, fontWeight = FontWeight.Black, color = c.ink, maxLines = 1) - } -} - @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 var columns by remember { mutableIntStateOf(1) } val density = androidx.compose.ui.platform.LocalDensity.current + val displayContext = LocalContext.current + remember { LibraryDisplay.load(displayContext) } + val tileWidth = libraryTileWidth() 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 + 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,18 +869,18 @@ 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 { - grid.scrollToItem(targetIndex) + launch { grid.revealRow(headerItems + index, targetIndex, direction, with(density) { 10.dp.toPx() }) } focusWithinFrames({ focus.last == target }) { focus.items[target] ?: androidx.compose.ui.focus.FocusRequester.Default } } } @@ -1051,159 +888,258 @@ 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(tileWidth), 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) { 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(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, inlineWhenStacked = true) { DisplayButton() } } } 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, - lead: (@Composable () -> Unit)? = null, trailing: @Composable () -> Unit, + clearSearchFocus: Boolean = false, + lead: (@Composable () -> Unit)? = null, inlineWhenStacked: Boolean = false, trailing: @Composable () -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current 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 + val inline = stacked && inlineWhenStacked && maxWidth >= 440.dp + Column(Modifier.fillMaxWidth()) { + if (inline && !(searching || open > 0.01f)) Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp), + ) { + heading() + Box(Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.horizontalScroll(rememberScrollState()), + ) { + searchButton() + trailing() + } + } + } else 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 +1147,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 +1181,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 +1213,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 +1249,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) } } + for (item in items.take(24)) key(item.key) { Box(Modifier.width(libraryTileWidth())) { 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 +1264,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 +1283,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 +1301,23 @@ 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) } + val chip = when { + download != null -> "${download.percent}%" + item.accessible && StoresState.isUnfinished(item) -> stringResource(R.string.stores_resume) + item.store == Store.GOG && installed && com.droiddeck.launcher.stores.gog.GogMaintenance.checks[item.id]?.state == com.droiddeck.launcher.stores.gog.GogMaintenance.State.AVAILABLE -> stringResource(R.string.common_update) + else -> null + } + val priced = installed || item.isFree || item.isDiscounted || item.hasPrice + val pill: (@Composable BoxScope.() -> Unit)? = if (priced && !LibraryDisplay.size && !hot) ({ + Box(Modifier.align(Alignment.TopStart).padding(6.dp).clip(RoundedCornerShape(6.dp)).background(Color.Black.copy(alpha = 0.82f)).padding(horizontal = 6.dp, vertical = 2.dp)) { + CardMarker(item, installed, download, compact = true, status = false) + } + }) else null + ArtCard(item.title, item.imageUrl, item.tallImageUrl, download, hot, capsule = false, chip = chip, badge = pill) { CardMarker(item, installed, download, status = false) } } } -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 +1325,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 @@ -1507,74 +1335,24 @@ 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() } } } -@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, -) { - val url = if (capsule) item.tallImageUrl ?: item.imageUrl else item.imageUrl ?: item.tallImageUrl - val art = cardArtRequest(url, item.tallImageUrl) - 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)) { - 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(), - onSuccess = { r -> - val drawn = r.result.drawable - if (capsule && drawn.intrinsicWidth > 0 && drawn.intrinsicHeight > 0) landscape = drawn.intrinsicWidth > drawn.intrinsicHeight * 0.95f - }, - ) - Box(Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(CardStrip).clipToBounds()) { - if (art != null) AsyncImage( - model = art, contentDescription = null, contentScale = ContentScale.Crop, - modifier = Modifier.fillMaxWidth().wrapContentHeight(Alignment.Bottom, unbounded = true).height(total).blur(24.dp), - ) - Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = if (blurs) 0.45f else 0.7f))) - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.matchParentSize().padding(horizontal = 8.dp), - ) { - Text( - item.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), - ) - marker() - } - } - Spacer(Modifier.align(Alignment.BottomCenter).padding(bottom = CardStrip).fillMaxWidth().height(14.dp).background(Brush.verticalGradient(0f to Color.Transparent, 1f to Color.Black.copy(alpha = 0.35f)))) - 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) - } - } - } -} - -@Composable -private fun CardMarker(item: CatalogItem, installed: Boolean, download: com.droiddeck.launcher.stores.download.DownloadEntry?, compact: Boolean = false) { +private fun CardMarker(item: CatalogItem, installed: Boolean, download: com.droiddeck.launcher.stores.download.DownloadEntry?, compact: Boolean = false, status: Boolean = true) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val small = 10.sp when { + status && item.store == Store.GOG && download != null -> Text("${download.percent}%", fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + status && item.store == Store.GOG && installed && com.droiddeck.launcher.stores.gog.GogMaintenance.checks[item.id]?.state == com.droiddeck.launcher.stores.gog.GogMaintenance.State.AVAILABLE -> + Text(stringResource(R.string.common_update), fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) installed -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(3.dp)) { val ctx = LocalContext.current val game = StoresState.installedGame(item.store, item.id) @@ -1582,8 +1360,8 @@ private fun CardMarker(item: CatalogItem, installed: Boolean, download: com.droi if (!compact) com.droiddeck.launcher.stores.StoreSizes.onDisk[item.key]?.let { Text(formatBytes(it), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) } Icon(Icons.Filled.Check, stringResource(R.string.stores_installed_chip), tint = pal.good, modifier = Modifier.size(11.dp)) } - download != null -> Text("${download.percent}%", fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) - item.accessible && StoresState.isUnfinished(item) -> Text(stringResource(R.string.stores_resume), fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + status && download != null -> Text("${download.percent}%", fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + status && item.accessible && StoresState.isUnfinished(item) -> Text(stringResource(R.string.stores_resume), fontSize = small, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) item.accessible && compact -> Unit item.accessible -> com.droiddeck.launcher.stores.StoreSizes.size(item).takeIf { it > 0 }?.let { Text(formatBytes(it), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) } item.isFree -> Text(stringResource(R.string.stores_free), fontSize = small, fontWeight = FontWeight.Bold, color = pal.good, maxLines = 1) @@ -1595,18 +1373,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 +1396,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) @@ -1644,15 +1414,6 @@ internal fun ConfirmButton(label: String, confirm: String, compact: Boolean = fa SecondaryButton(if (armed) confirm else label, compact = compact) { if (!armed) armed = true else { armed = false; onConfirm() } } } -@Composable -internal fun stageLabel(stage: DownloadStage): String = when (stage) { - DownloadStage.MANIFEST -> stringResource(R.string.stores_stage_manifest) - DownloadStage.DOWNLOAD -> stringResource(R.string.stores_stage_download) - DownloadStage.VERIFY -> stringResource(R.string.stores_stage_verify) - DownloadStage.INSTALL -> stringResource(R.string.stores_stage_install) - DownloadStage.DONE -> stringResource(R.string.stores_stage_done) -} - internal fun openStoreUrl(ctx: android.content.Context, item: CatalogItem) = openUrl(ctx, item.storeUrl) internal fun openUrl(ctx: android.content.Context, url: String) { @@ -1663,7 +1424,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 +1432,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/SyncAdvancedPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncAdvancedPage.kt new file mode 100644 index 000000000..332be2b0d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncAdvancedPage.kt @@ -0,0 +1,109 @@ +package com.droiddeck.launcher.ui + +import android.content.ClipData +import android.content.Context +import android.content.Intent +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.MaterialTheme +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.saveable.rememberSaveable +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.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.content.FileProvider +import com.droiddeck.launcher.R +import com.droiddeck.launcher.sync.SyncPrefs +import com.droiddeck.launcher.sync.Syncthing +import java.io.File + +@Composable +internal fun SyncAdvancedPage(host: MenuHost, onBack: () -> Unit) { + val ctx = LocalContext.current + var runMode by remember { mutableStateOf(SyncPrefs.runMode(ctx)) } + var wifiOnly by remember { mutableStateOf(SyncPrefs.wifiOnly(ctx)) } + var pauseInGames by remember { mutableStateOf(SyncPrefs.pauseInGames(ctx)) } + var confirmReset by rememberSaveable { mutableStateOf(false) } + if (confirmReset) ResetDialog(onDismiss = { confirmReset = false }) { Syncthing.reset(ctx) } + val ports = Syncthing.ports + SettingsPage(host, stringResource(R.string.sync_advanced), onBack, eyebrow = stringResource(R.string.setup_tab_sync)) { + PairedColumns( + { + SettingsGroup(stringResource(R.string.sync_ports)) { + PortRow(stringResource(R.string.sync_port_sync), ports?.sync?.toString()) + PortRow(stringResource(R.string.sync_port_discovery), ports?.discovery?.toString()) + ActionRow(stringResource(R.string.sync_repick), stringResource(R.string.sync_repick_hint), stringResource(R.string.sync_repick_button), onClick = { Syncthing.restart() }) + } + }, + { + SettingsGroup(stringResource(R.string.sync_running_group)) { + ChoiceRow( + host, "sync-run", stringResource(R.string.sync_run), null, + listOf(SyncPrefs.RUN_WHILE_OPEN to stringResource(R.string.sync_run_open), SyncPrefs.RUN_BACKGROUND to stringResource(R.string.sync_run_background)), + runMode, stacked = true, + ) { SyncPrefs.setRunMode(ctx, it); runMode = it; Syncthing.settingsChanged() } + ToggleRow(host, "sync-wifi", stringResource(R.string.sync_wifi_only), null, wifiOnly) { + SyncPrefs.setWifiOnly(ctx, it); wifiOnly = it; Syncthing.settingsChanged() + } + ToggleRow(host, "sync-games", stringResource(R.string.sync_pause_games), null, pauseInGames) { + SyncPrefs.setPauseInGames(ctx, it); pauseInGames = it; Syncthing.settingsChanged() + } + ActionRow(stringResource(R.string.sync_logs), stringResource(R.string.sync_logs_hint), stringResource(R.string.sync_logs_share), onClick = { shareLog(ctx) }) + } + }, + ) + SettingsGroup(stringResource(R.string.sync_reset_group)) { + SettingsRow(stringResource(R.string.sync_api_key), Syncthing.apiKeyTail?.let { "••••••••••••••••••••$it" }) { + SecondaryButton(stringResource(R.string.sync_regenerate), enabled = Syncthing.phase == Syncthing.Phase.RUNNING, compact = true) { Syncthing.regenerateApiKey() } + } + ActionRow(stringResource(R.string.sync_reset), stringResource(R.string.sync_reset_hint), stringResource(R.string.sync_reset_button), onClick = { confirmReset = true }) + } + } +} + +@Composable +private fun PortRow(label: String, value: String?) { + val colors = MaterialTheme.colorScheme + SettingsRow(label, null) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(value ?: "—", fontSize = 14.sp, fontWeight = FontWeight.SemiBold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(stringResource(R.string.common_auto).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun ResetDialog(onDismiss: () -> Unit, onReset: () -> Unit) { + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "syncReset", wide = false, maxWidth = 480.dp) { + DialogTitleRow(stringResource(R.string.sync_reset_confirm_title), onClose = close) + Text(stringResource(R.string.sync_reset_hint), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_reset_button), compact = true) { onReset(); close() } + } + } +} + +private fun shareLog(context: Context) { + val log = Syncthing.logFile(context).takeIf { it.isFile } ?: return + val out = File(File(context.cacheDir, "share").apply { mkdirs() }, "syncthing-log.txt") + log.copyTo(out, overwrite = true) + val uri = FileProvider.getUriForFile(context, context.packageName + ".logs", out) + val send = Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_STREAM, uri).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + send.clipData = ClipData.newRawUri(out.name, uri) + context.startActivity(Intent.createChooser(send, context.getString(R.string.logshare_chooser)).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt new file mode 100644 index 000000000..092b69615 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt @@ -0,0 +1,130 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.ArrowBack +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.outlined.CreateNewFolder +import androidx.compose.material.icons.outlined.Folder +import androidx.compose.material.icons.outlined.FolderSpecial +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.SdCard +import androidx.compose.material.icons.outlined.Smartphone +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.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.layout.onSizeChanged +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.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.sync.Syncthing +import java.io.File + +internal class SyncLocation(val root: File, val label: String, val icon: ImageVector) + +internal fun containerHome(context: Context) = File(LinuxRuntime.rootDir(context), "root") + +internal fun syncLocations(context: Context): List<SyncLocation> { + val volumes = pickVolumes(context) + val roots = Syncthing.storageRoots(context) + val shared = roots.drop(1).mapIndexed { i, root -> + val volume = volumes.firstOrNull { root.path.startsWith(it.root.path + "/") } + if (i == 0) SyncLocation(root, context.getString(R.string.sync_location_shared), Icons.Outlined.Smartphone) + else SyncLocation(root, context.getString(R.string.sync_location_card, volume?.label ?: root.path), Icons.Outlined.SdCard) + } + val home = containerHome(context).takeIf { it.isDirectory }?.let { SyncLocation(it, context.getString(R.string.sync_location_home), Icons.Outlined.Home) } + return listOfNotNull(home, SyncLocation(Syncthing.folderRoot(context), context.getString(R.string.sync_location_sync), Icons.Outlined.FolderSpecial)) + + shared + SyncLocation(roots.first(), context.getString(R.string.sync_location_app), Icons.Outlined.Folder) +} + +@Composable +internal fun SyncFolderPicker(title: String, suggestedName: String?, onDismiss: () -> Unit, onPick: (File) -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val density = LocalDensity.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val locations = remember { syncLocations(ctx) } + val guard = remember { Syncthing.guard(ctx) } + fun locationOf(d: File) = locations.filter { d.path == it.root.path || d.path.startsWith(it.root.path + "/") }.maxByOrNull { it.root.path.length } + var dir by remember { mutableStateOf<File?>(containerHome(ctx).takeIf { it.isDirectory } ?: Syncthing.folderRoot(ctx).also { it.mkdirs() }) } + var refresh by remember { mutableIntStateOf(0) } + var naming by remember { mutableStateOf(false) } + val location = dir?.let { locationOf(it) } + val up = { dir = dir?.let { d -> if (location == null || d.path == location.root.path) null else d.parentFile } } + val back = { if (dir == null) close() else up() } + val first = remember(dir) { FocusRequester() } + LaunchedEffect(dir) { focusWithinFrames({ false }) { first } } + val folders = remember(dir, refresh) { + dir?.listFiles()?.filter { it.isDirectory && it.canRead() && guard.browsable(it) } + ?.sortedBy { it.name.lowercase() }.orEmpty() + } + var locked by remember { mutableStateOf<Dp?>(null) } + if (naming) { + TextEntryDialog(stringResource(R.string.sync_new_folder), suggestedName.orEmpty(), onDismiss = { naming = false }) { name -> + val parent = dir + if (parent != null && validName(name)) { + val created = File(parent, name) + if (created.isDirectory || created.mkdirs()) { dir = created; refresh++ } + } + } + } + AppDialog( + shown, close, "syncFolderPicker", wide = false, maxWidth = 520.dp, width = locked, fitContent = locked == null, back = back, + modifier = Modifier.onSizeChanged { if (locked == null && it.width > 0) locked = with(density) { it.width.toDp() } }, + ) { + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { + DialogTitleRow(title, onClose = close) + if (dir != null && location != null) { + val crumbs = listOf(location.label) + dir!!.path.removePrefix(location.root.path).split('/').filter { it.isNotEmpty() } + Text(crumbs.joinToString(" › "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val maxHeight = (LocalConfiguration.current.screenHeightDp * 0.7f).dp + Column( + verticalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()).padding(top = 4.dp), + ) { + if (dir == null) { + locations.forEachIndexed { i, l -> + key(l.root.path) { PickerRow(l.icon, l.label, null, tall = true, focus = if (i == 0) first else null) { dir = l.root.also { it.mkdirs() } } } + } + } else { + PickerRow(Icons.AutoMirrored.Outlined.ArrowBack, "..", null, focus = first, onClick = up) + PickerRow(Icons.Filled.Check, stringResource(R.string.sync_use_folder), null, accent = true, enabled = guard.allows(dir!!.path)) { + onPick(dir!!); close() + } + PickerRow(Icons.Outlined.CreateNewFolder, stringResource(R.string.sync_new_folder), null) { naming = true } + for (f in folders) key(f.path) { + PickerRow(Icons.Outlined.Folder, f.name, null) { dir = f } + } + } + } + } + } +} + +private fun validName(name: String) = name.isNotBlank() && '/' !in name && name != "." && name != ".." diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt new file mode 100644 index 000000000..e6073d710 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt @@ -0,0 +1,436 @@ +package com.droiddeck.launcher.ui + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.text.format.DateUtils +import android.text.format.Formatter +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.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.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Block +import androidx.compose.material.icons.outlined.Sync +import androidx.compose.material.icons.outlined.WarningAmber +import androidx.compose.material3.Checkbox +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +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.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.FilterQuality +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.sync.SyncDevice +import com.droiddeck.launcher.sync.SyncFolder +import com.droiddeck.launcher.sync.SyncPendingFolder +import com.droiddeck.launcher.sync.SyncSnapshot +import com.droiddeck.launcher.sync.Syncthing +import com.droiddeck.launcher.sync.SyncthingWebActivity +import java.io.File + +@Composable +internal fun SyncPanel(host: MenuHost, runtimeReady: Boolean, onAdvanced: () -> Unit) { + val ctx = LocalContext.current + DisposableEffect(Unit) { val release = Syncthing.watch(); onDispose { release() } } + var showId by rememberSaveable { mutableStateOf(false) } + var confirmOff by rememberSaveable { mutableStateOf(false) } + val snap = Syncthing.snapshot + if (showId && snap != null) DeviceIdDialog(snap.myId) { showId = false } + if (confirmOff) TurnOffDialog(onDismiss = { confirmOff = false }) { forget -> + Syncthing.setEnabled(ctx, false, forget) + } + val phase = Syncthing.phase + when { + phase == Syncthing.Phase.FAILED -> SyncFailed( + if (Syncthing.failure == Syncthing.FAILURE_MISSING) stringResource(R.string.sync_missing) else Syncthing.failure.orEmpty(), + onRetry = { Syncthing.restart() }, onAdvanced = onAdvanced, onOff = { confirmOff = true }) + !Syncthing.enabled -> SyncOff(host, runtimeReady) { Syncthing.setEnabled(ctx, true) } + phase != Syncthing.Phase.RUNNING || snap == null -> SyncStarting() + else -> SyncRunning(snap, onShowId = { showId = true }, onAdvanced = onAdvanced, onOff = { confirmOff = true }) + } +} + +@Composable +private fun SyncOff(host: MenuHost, runtimeReady: Boolean, onEnable: () -> Unit) { + val missing = Syncthing.failure == Syncthing.FAILURE_MISSING + val hint = when { + missing -> R.string.sync_missing + !runtimeReady -> R.string.sync_needs_runtime + else -> R.string.sync_enable_hint + } + SettingsGroup(stringResource(R.string.sync_group)) { + ToggleRow( + host, "sync-enable", stringResource(R.string.sync_enable), stringResource(hint), false, enabled = !missing && runtimeReady, + ) { if (it) onEnable() } + } +} + +@Composable +private fun SyncStarting() { + val colors = MaterialTheme.colorScheme + Column( + horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxWidth().padding(vertical = 96.dp), + ) { + CircularProgressIndicator(strokeWidth = 3.dp, color = LocalPalette.current.signal, modifier = Modifier.size(40.dp)) + Text(stringResource(R.string.sync_starting), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant) + } +} + +@Composable +private fun SyncFailed(reason: String, onRetry: () -> Unit, onAdvanced: () -> Unit, onOff: () -> Unit) { + SettingsGroup(stringResource(R.string.sync_group)) { + SettingsRow(stringResource(R.string.sync_status_failed), reason) { + SecondaryButton(stringResource(R.string.sync_failed_retry), compact = true, onClick = onRetry) + } + SettingsRow(stringResource(R.string.sync_advanced), stringResource(R.string.sync_advanced_hint)) { + SecondaryButton(stringResource(R.string.sync_open), compact = true, onClick = onAdvanced) + } + SettingsRow(stringResource(R.string.sync_running), stringResource(R.string.sync_running_hint)) { + ToggleSwitch(true, label = stringResource(R.string.sync_running)) { if (!it) onOff() } + } + } +} + +@Composable +private fun SyncRunning(snap: SyncSnapshot, onShowId: () -> Unit, onAdvanced: () -> Unit, onOff: () -> Unit) { + PairedColumns( + { + SettingsGroup(stringResource(R.string.sync_group)) { + StatusCard(snap) + SettingsRow(stringResource(R.string.sync_running), stringResource(R.string.sync_running_hint)) { + ToggleSwitch(true, label = stringResource(R.string.sync_running)) { if (!it) onOff() } + } + } + SettingsGroup(stringResource(R.string.sync_this_device)) { + SettingsRow(stringResource(R.string.sync_device_id), shortId(snap.myId)) { + SecondaryButton(stringResource(R.string.sync_show_qr), compact = true, onClick = onShowId) + } + SettingsRow(stringResource(R.string.sync_advanced), stringResource(R.string.sync_advanced_hint)) { + SecondaryButton(stringResource(R.string.sync_open), compact = true, onClick = onAdvanced) + } + } + }, + { + Waiting(snap) + SettingsGroup(stringResource(R.string.sync_folders)) { + if (snap.folders.isEmpty()) SettingsRow(stringResource(R.string.sync_no_folders), null) {} + snap.folders.sortedByDescending { it.blocked }.forEach { FolderRow(it) } + AddFolderRow(snap.devices) + } + SettingsGroup(stringResource(R.string.sync_devices)) { + if (snap.devices.isEmpty()) SettingsRow(stringResource(R.string.sync_no_devices), null) {} + snap.devices.forEach { DeviceRow(it) } + } + }, + ) +} + +@Composable +internal fun PairedColumns(left: @Composable ColumnScope.() -> Unit, right: @Composable ColumnScope.() -> Unit) { + if (LocalNarrowPane.current) { + Column { left(); right() } + return + } + Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.Top, modifier = Modifier.fillMaxWidth()) { + Column(Modifier.weight(1f)) { left() } + Column(Modifier.weight(1f)) { right() } + } +} + +@Composable +private fun StatusCard(snap: SyncSnapshot) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val paused = Syncthing.pauseRequested || Syncthing.devicesPaused + val (headline, tint) = when { + Syncthing.pauseRequested && Syncthing.devicesPaused -> stringResource(R.string.sync_status_paused) to colors.onSurfaceVariant + Syncthing.pauseRequested -> stringResource(R.string.sync_status_pausing) to colors.onSurfaceVariant + Syncthing.devicesPaused -> stringResource(R.string.sync_status_resuming) to colors.onSurfaceVariant + snap.needsAttention -> stringResource(R.string.sync_status_attention) to AttentionAmber + snap.syncing -> stringResource(R.string.sync_status_syncing) to pal.signal + else -> stringResource(R.string.sync_status_up_to_date) to pal.good + } + val detail = when (Syncthing.autoPause) { + Syncthing.AutoPause.WIFI -> stringResource(R.string.sync_paused_wifi) + Syncthing.AutoPause.GAME -> stringResource(R.string.sync_paused_game) + null -> if (snap.syncing && !paused) stringResource(R.string.sync_left, Formatter.formatShortFileSize(ctx, snap.needBytes)) + else stringResource(R.string.sync_summary, snap.folders.size, snap.devices.count { it.connected }, snap.devices.size) + } + Column(Modifier.fillMaxWidth().padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + when { + snap.syncing && !paused -> Icon(Icons.Outlined.Sync, null, tint = tint, modifier = Modifier.size(22.dp)) + snap.needsAttention && !paused -> Icon(Icons.Outlined.WarningAmber, null, tint = tint, modifier = Modifier.size(22.dp)) + else -> Box(Modifier.size(12.dp).clip(CircleShape).background(tint)) + } + Text(headline, fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, modifier = Modifier.weight(1f)) + if (snap.syncing && !paused) Text("${snap.percent}%", fontSize = 22.sp, fontWeight = FontWeight.Bold, color = pal.signal) + } + if (snap.syncing && !paused) LinearProgressIndicator( + progress = { snap.percent / 100f }, color = pal.signal, trackColor = pal.line, modifier = Modifier.fillMaxWidth().height(4.dp).clip(CircleShape), + ) + Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + Text("↓ ${rate(ctx, snap.inBytesPerSecond)}", fontSize = 13.sp, color = colors.onSurfaceVariant) + Text("↑ ${rate(ctx, snap.outBytesPerSecond)}", fontSize = 13.sp, color = colors.onSurfaceVariant) + } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { + PrimaryButton(stringResource(R.string.sync_open_web_ui), compact = true, modifier = Modifier.weight(1f)) { openWebUi(ctx) } + SecondaryButton(stringResource(if (Syncthing.userPaused) R.string.sync_resume else R.string.sync_pause), compact = true) { + Syncthing.setPaused(ctx, !Syncthing.userPaused) + } + } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun Waiting(snap: SyncSnapshot) { + if (snap.pendingFolders.isEmpty() && snap.pendingDevices.isEmpty()) return + val ctx = LocalContext.current + var accepting by remember { mutableStateOf<SyncPendingFolder?>(null) } + accepting?.let { f -> + SyncFolderPicker(stringResource(R.string.sync_accept_title, f.label), f.label, onDismiss = { accepting = null }) { dir -> + Syncthing.addFolder(ctx, dir, f.label, listOf(f.deviceId), f.id) { ok -> if (!ok) addFailed(ctx) } + } + } + SettingsGroup(stringResource(R.string.sync_waiting)) { + snap.pendingDevices.forEach { name -> + SettingsRow(stringResource(R.string.sync_pending_device, name), null, highlighted = true) { + SecondaryButton(stringResource(R.string.sync_review), compact = true) { openWebUi(ctx) } + } + } + snap.pendingFolders.forEach { f -> + SettingsRow(stringResource(R.string.sync_pending_folder, f.offeredBy, f.label), stringResource(R.string.sync_pending_folder_hint), highlighted = true) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + SecondaryButton(stringResource(R.string.sync_review), compact = true) { openWebUi(ctx) } + PrimaryButton(stringResource(R.string.sync_accept), compact = true) { accepting = f } + } + } + } + } +} + +@Composable +private fun AddFolderRow(devices: List<SyncDevice>) { + val ctx = LocalContext.current + var picking by remember { mutableStateOf(false) } + var picked by remember { mutableStateOf<File?>(null) } + if (picking) SyncFolderPicker(stringResource(R.string.sync_add_folder), null, onDismiss = { picking = false }) { picked = it } + picked?.let { dir -> + ShareFolderDialog(dir, devices, onDismiss = { picked = null }) { chosen -> + Syncthing.addFolder(ctx, dir, dir.name, chosen) { ok -> if (!ok) addFailed(ctx) } + } + } + SettingsRow(stringResource(R.string.sync_add_folder), stringResource(R.string.sync_add_folder_hint)) { + SecondaryButton(stringResource(R.string.sync_choose), compact = true) { picking = true } + } +} + +@Composable +private fun ShareFolderDialog(folder: File, devices: List<SyncDevice>, onDismiss: () -> Unit, onAdd: (List<String>) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val chosen = remember { mutableStateListOf<String>() } + AppDialog(shown, close, "syncShareFolder", wide = false, maxWidth = 520.dp) { + DialogTitleRow(folder.name, onClose = close) + Text(folder.path, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) + if (devices.isEmpty()) { + Text(stringResource(R.string.sync_share_none), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + } else { + Text(stringResource(R.string.sync_share_with), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + devices.forEach { d -> + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().clip(Shape12).border(1.dp, pal.line, Shape12).background(colors.background).padding(end = 12.dp), + ) { + Checkbox(d.id in chosen, { if (it) chosen.add(d.id) else chosen.remove(d.id) }) + Text(d.name, fontSize = 14.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_add), compact = true) { onAdd(chosen.toList()); close() } + } + } +} + +private fun addFailed(context: Context) { + android.widget.Toast.makeText(context, R.string.sync_add_failed, android.widget.Toast.LENGTH_LONG).show() +} + +@Composable +private fun FolderRow(f: SyncFolder) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + if (f.blocked) { + Column(Modifier.fillMaxWidth().background(colors.error.copy(alpha = 0.06f)).padding(horizontal = 14.dp, vertical = 12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Icon(Icons.Outlined.Block, null, tint = colors.error, modifier = Modifier.size(18.dp)) + Text(f.label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.sync_folder_blocked), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.error) + } + Text(f.path, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(stringResource(R.string.sync_folder_blocked_hint), fontSize = 12.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 4.dp)) { + SecondaryButton(stringResource(R.string.sync_remove_folder), compact = true) { Syncthing.removeFolder(f.id) } + SecondaryButton(stringResource(R.string.sync_open_web_ui), compact = true) { openWebUi(ctx) } + } + Text(stringResource(R.string.sync_remove_folder_hint), fontSize = 12.sp, color = colors.onSurfaceVariant) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + return + } + val (state, tint) = when { + f.paused -> stringResource(R.string.sync_folder_paused) to colors.onSurfaceVariant + f.syncing -> stringResource(R.string.sync_folder_syncing, percent(f)) to pal.signal + f.outOfSync -> stringResource(R.string.sync_folder_out_of_sync) to AttentionAmber + f.state == "scanning" || f.state == "scan-waiting" -> stringResource(R.string.sync_folder_scanning) to colors.onSurfaceVariant + else -> stringResource(R.string.sync_folder_up_to_date) to pal.good + } + val detail = when { + f.errors > 0 -> stringResource(R.string.sync_folder_errors, f.errors) + f.sharedWith.isEmpty() -> Formatter.formatShortFileSize(ctx, f.globalBytes) + else -> stringResource(R.string.sync_folder_detail, Formatter.formatShortFileSize(ctx, f.globalBytes), f.sharedWith.joinToString(", ")) + } + SettingsRow(f.label, detail) { StateLabel(state, tint) } +} + +@Composable +private fun DeviceRow(d: SyncDevice) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val detail = when { + d.connected -> d.address?.substringAfter("://") + d.lastSeen != null -> stringResource(R.string.sync_last_seen, DateUtils.getRelativeTimeSpanString(d.lastSeen).toString()) + else -> null + } + SettingsRow(d.name, detail) { + if (d.connected) StateLabel(stringResource(R.string.sync_connected), pal.good) + else StateLabel(stringResource(R.string.sync_offline), colors.onSurfaceVariant) + } +} + +@Composable +private fun StateLabel(text: String, tint: Color) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp)) { + Box(Modifier.size(9.dp).clip(CircleShape).background(tint)) + Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = tint, maxLines = 1) + } +} + +@Composable +private fun DeviceIdDialog(id: String, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val qr = remember(id) { qrBitmap(id) } + AppDialog(shown, close, "syncDeviceId", wide = true, maxWidth = 640.dp) { + DialogTitleRow(stringResource(R.string.sync_device_id_title), onClose = close) + Row(horizontalArrangement = Arrangement.spacedBy(22.dp), verticalAlignment = Alignment.CenterVertically) { + Image(qr, stringResource(R.string.sync_device_id), filterQuality = FilterQuality.None, + modifier = Modifier.size(208.dp).clip(Shape14).background(Color.White).padding(10.dp)) + Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.weight(1f)) { + Text(id.chunked(32).joinToString("\n"), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, fontFamily = FontFamily.Monospace, + color = colors.onBackground, lineHeight = 26.sp) + Text(stringResource(R.string.sync_device_id_hint), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.sync_copy), compact = true) { + ctx.getSystemService(ClipboardManager::class.java)?.setPrimaryClip(ClipData.newPlainText("Syncthing device ID", id)) + } + SecondaryButton(stringResource(R.string.sync_share), compact = true) { + ctx.startActivity(Intent.createChooser(Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_TEXT, id), null)) + } + PrimaryButton(stringResource(R.string.sync_done), compact = true, onClick = close) + } + } +} + +@Composable +private fun TurnOffDialog(onDismiss: () -> Unit, onTurnOff: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var forget by remember { mutableStateOf(false) } + AppDialog(shown, close, "syncTurnOff", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.sync_off_title), onClose = close) + Text(stringResource(R.string.sync_off_body), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + Row( + verticalAlignment = Alignment.Top, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().clip(Shape12).border(1.dp, pal.line, Shape12).background(colors.background).padding(end = 12.dp, top = 2.dp, bottom = 8.dp), + ) { + Checkbox(forget, { forget = it }) + Column(Modifier.padding(top = 12.dp)) { + Text(stringResource(R.string.sync_off_forget), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(stringResource(R.string.sync_off_forget_hint), fontSize = 12.5.sp, color = colors.onSurfaceVariant) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_turn_off), compact = true) { onTurnOff(forget); close() } + } + } +} + +internal fun openWebUi(context: Context) { + context.startActivity(Intent(context, SyncthingWebActivity::class.java)) +} + +private fun shortId(id: String) = if (id.length > 16) "${id.take(7)}-…-${id.takeLast(7)}" else id + +private fun rate(context: Context, bytesPerSecond: Long) = Formatter.formatShortFileSize(context, bytesPerSecond) + "/s" + +private fun percent(f: SyncFolder): Int = + if (f.globalBytes <= 0) 0 else (((f.globalBytes - f.needBytes).coerceAtLeast(0) * 100) / f.globalBytes).toInt().coerceIn(0, 99) + +private fun qrBitmap(text: String): ImageBitmap { + val matrix = com.google.zxing.qrcode.QRCodeWriter().encode(text, com.google.zxing.BarcodeFormat.QR_CODE, 0, 0) + val bitmap = android.graphics.Bitmap.createBitmap(matrix.width, matrix.height, android.graphics.Bitmap.Config.ARGB_8888) + for (x in 0 until matrix.width) for (y in 0 until matrix.height) { + bitmap.setPixel(x, y, if (matrix[x, y]) android.graphics.Color.BLACK else android.graphics.Color.WHITE) + } + return bitmap.asImageBitmap() +} 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 0f3843fca..cb6d5ed22 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -2,8 +2,20 @@ 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 +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween import androidx.compose.runtime.Composable +import androidx.compose.runtime.key +import androidx.compose.runtime.SideEffect import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.runtime.getValue @@ -13,6 +25,7 @@ import android.content.Context import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import com.droiddeck.launcher.R import androidx.compose.ui.platform.LocalConfiguration @@ -33,28 +46,55 @@ object Themes { const val PAPER = "paper" const val ICON_BLUE = "blue" const val ELECTRIC = "electric" + const val INNER_GAMER = "inner_gamer" const val GRADIENT = "gradient" const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt() const val DEFAULT_SECONDARY = 0xFF22D3EE.toInt() - /** The two colours of the custom Gradient theme: primary, then secondary. Changing them restyles the app at once. */ var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY) private set + const val RGB_SPEEDS = 10 + const val DEFAULT_RGB_SPEED = 3 + const val RGB_HUE_STEP = 3f + + var rgbSpeed by mutableStateOf(DEFAULT_RGB_SPEED) + private set + + var rgbHue by mutableStateOf(0f) + private set + + fun moveRgbHue(hue: Float) { + rgbHue = hue + } + + fun setRgbSpeed(context: Context, speed: Int) { + val value = speed.coerceIn(1, RGB_SPEEDS) + SessionPrefs.setRgbSpeed(context, value) + rgbSpeed = value + } + + fun rgbCycleMillis(speed: Int): Int = 30_000 / speed.coerceIn(1, RGB_SPEEDS) + fun loadGradient(context: Context) { gradientColors = SessionPrefs.gradientColors(context) + rgbSpeed = SessionPrefs.rgbSpeed(context) } + fun innerGamer(hue: Float): Palette = ThemeColors.palette( + Color.hsv(hue % 360f, 0.9f, 1f).toArgb(), Color.hsv((hue + 60f) % 360f, 0.9f, 1f).toArgb(), + R.string.theme_inner_gamer, R.string.theme_inner_gamer_detail, INNER_GAMER, + ) + fun setGradient(context: Context, primary: Int, secondary: Int) { SessionPrefs.setGradientColors(context, primary, secondary) gradientColors = primary to secondary } - /** The theme the person chose, with the custom colours read first; for code that is not in a composition. */ fun current(context: Context): Palette { val id = SessionPrefs.theme(context) - if (id == GRADIENT) loadGradient(context) + if (id == GRADIENT || id == INNER_GAMER) loadGradient(context) return byId(id) } @@ -87,10 +127,12 @@ object Themes { primary = Color(0xFF2E86FF), primary2 = Color(0xFF2684FF), onPrimary = Color(0xFF03111F), signal = Color(0xFF2E86FF), good = Color(0xFF4CD37F), ), + innerGamer(0f), ThemeColors.palette(DEFAULT_PRIMARY, DEFAULT_SECONDARY, R.string.theme_gradient, R.string.theme_gradient_detail), ) fun byId(id: String): Palette { + if (id == INNER_GAMER) return innerGamer(rgbHue) if (id == GRADIENT) return ThemeColors.palette(gradientColors.first, gradientColors.second, R.string.theme_gradient, R.string.theme_gradient_detail) return all.firstOrNull { it.id == id } ?: all[0] } @@ -103,6 +145,7 @@ val Palette.onSignal: Color get() = if (signal.luminance() > 0.18f) Color(0xFF03 @Composable fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCALE, content: @Composable () -> Unit) { val id = theme ?: SessionPrefs.theme(LocalContext.current) + if (id == Themes.INNER_GAMER) InnerGamerHue(Themes.rgbSpeed) val p = Themes.byId(id) val scheme = darkColorScheme( primary = p.primary, onPrimary = p.onPrimary, secondary = p.onSurfaceVariant, @@ -119,5 +162,36 @@ 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(), + ) +} + +@Composable +private fun InnerGamerHue(speed: Int) { + if (Motion.scale == 0f) return + key(speed) { InnerGamerCycle(speed) } +} + +@Composable +private fun InnerGamerCycle(speed: Int) { + val start = remember { Themes.rgbHue } + val hue by rememberInfiniteTransition(label = "innerGamer").animateFloat( + start, start + 360f, infiniteRepeatable(tween(Themes.rgbCycleMillis(speed).coerceAtLeast(1), easing = LinearEasing), RepeatMode.Restart), label = "hue", + ) + val stepped = ((hue % 360f) / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + SideEffect { Themes.moveRgbHue(stepped) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt index b4b57737e..938d2ef90 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt @@ -7,9 +7,7 @@ import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt -/** Colour maths for the custom gradient theme: hue, saturation and brightness in, a readable palette out. */ internal object ThemeColors { - /** Hue 0..360, saturation and brightness 0..1. */ class Hsv(val h: Float, val s: Float, val v: Float) fun toHsv(argb: Int): Hsv { @@ -32,7 +30,6 @@ internal object ThemeColors { fun hex(argb: Int): String = "#%06X".format(argb and 0xFFFFFF) - /** `#RRGGBB`, `RRGGBB` or `#RGB`; null for anything else. */ fun parseHex(text: String): Int? { val digits = text.trim().removePrefix("#") if (!digits.all { it in '0'..'9' || it in 'a'..'f' || it in 'A'..'F' }) return null @@ -46,7 +43,6 @@ internal object ThemeColors { private const val MIN_LUMINANCE = 0.10f - /** The colour, made brighter (then paler, for a deep blue that brightness alone cannot lift) when it is too dark to show on the dark background. */ fun readable(argb: Int): Int { if (Color(argb).luminance() >= MIN_LUMINANCE) return argb or 0xFF000000.toInt() val hsv = toHsv(argb) @@ -64,7 +60,6 @@ internal object ThemeColors { return out } - /** A dark neutral tinted with the primary's hue; plain greys stay grey. */ fun tint(primary: Int, saturation: Float, brightness: Float): Color { val hsv = toHsv(primary) val strength = (hsv.s / 0.35f).coerceIn(0f, 1f) @@ -79,7 +74,6 @@ internal object ThemeColors { return (max(x, y) + 0.05f) / (min(x, y) + 0.05f) } - /** Dark or white text, whichever reads better on the worse of the two gradient colours. */ internal fun inkFor(first: Int, second: Int): Color { fun worst(ink: Color) = min(contrast(ink, Color(first)), contrast(ink, Color(second))) return if (worst(DARK_INK) >= worst(Color.White)) DARK_INK else Color.White @@ -87,7 +81,6 @@ internal object ThemeColors { private const val MIN_CONTRAST = 4.5f - /** The colour nudged just enough, lighter for dark text and darker for white text, to give [ink] a readable contrast on it. */ private fun fitTo(ink: Color, argb: Int): Int { fun short(color: Int) = contrast(ink, Color(color)) < MIN_CONTRAST if (!short(argb)) return argb @@ -132,7 +125,7 @@ internal object ThemeColors { } } - fun palette(primary: Int, secondary: Int, label: Int, detail: Int): Palette { + fun palette(primary: Int, secondary: Int, label: Int, detail: Int, id: String = Themes.GRADIENT): Palette { val seen = readable(primary) val seenSecond = readable(secondary) val ink = inkFor(seen, seenSecond) @@ -146,7 +139,7 @@ internal object ThemeColors { second = nextSecond } return Palette( - Themes.GRADIENT, label, detail, + id, label, detail, background = tint(first, 0.50f, 0.045f), surface = tint(first, 0.45f, 0.075f), surfaceVariant = tint(first, 0.42f, 0.115f), line = tint(first, 0.40f, 0.16f), line2 = tint(first, 0.36f, 0.22f), onBackground = tint(first, 0.05f, 0.97f), onSurfaceVariant = tint(first, 0.16f, 0.68f), 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 db975a199..96502bb79 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 @@ -54,7 +55,6 @@ import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_DRAG_MOVE @Composable fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit) { val context = LocalContext.current - // Keep an open editor attached to the game it was opened for. val targetGame = remember { game } val initialDefaults = remember { GesturePrefs.read(context) } val initialGame = remember { targetGame?.takeIf { GesturePrefs.hasOverride(context, it) }?.let { GesturePrefs.read(context, it) } } @@ -72,7 +72,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 +80,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 +96,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 +151,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)) } } } } @@ -168,7 +168,6 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit private fun GestureDialogFrame(onDismiss: () -> Unit, footer: @Composable () -> Unit = {}, content: @Composable ColumnScope.() -> Unit) { val p = LocalPalette.current - // The app window does not opt into RTL, so these dialogs follow their resource locale explicitly. val direction = if (LocalConfiguration.current.layoutDirection == android.view.View.LAYOUT_DIRECTION_RTL) LayoutDirection.Rtl else LayoutDirection.Ltr Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) { CompositionLocalProvider(LocalLayoutDirection provides direction) { @@ -177,7 +176,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 +200,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 +216,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 +238,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 +261,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 +288,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 +313,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 +325,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 a44f5ca19..dd73939a7 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( @@ -109,7 +115,7 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie } BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { val stacked = LocalNarrowPane.current || maxWidth < 600.dp - Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(bottom = 8.dp)) { + Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(bottom = 16.dp)) { if (stacked) { StatusPanel(s, u, ua, me) Box(Modifier.height(18.dp)) @@ -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 155c6e9b2..235f2f98b 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 8117c3ee5..8ebfb5ad6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -28,6 +28,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.saveable.rememberSaveable @@ -40,10 +41,13 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.ImeOptions import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import com.droiddeck.launcher.core.PhantomProcessLimit @@ -356,9 +360,11 @@ internal fun AdbTextField( placeholder: String? = null, compact: Boolean = false, onFocusChange: (Boolean) -> Unit = {}, + clearFocus: Boolean = false, onNext: (() -> Unit)? = null, onDone: (() -> Unit)? = null, focusOnShow: Boolean = false, + showLabel: Boolean = true, ) { val context = LocalContext.current val focusAsked = remember { booleanArrayOf(false) } @@ -371,9 +377,34 @@ internal fun AdbTextField( val shape = RoundedCornerShape(8.dp) val inputHeight = if (compact) 44.dp else 52.dp val colors = MaterialTheme.colorScheme + val bottomTyping = LocalBottomTyping.current + val bottomTypingLatest = rememberUpdatedState(bottomTyping) + val typingRequest = remember { arrayOfNulls<TypingRequest>(1) } + + fun typeOnBottom(editText: EditText): Boolean { + if (!bottomTypingLatest.value || !DualScreenPanel.attached) return false + val text = editText.text.toString() + val request = TypingRequest( + TextFieldValue(text, TextRange(editText.selectionStart.coerceIn(0, text.length), editText.selectionEnd.coerceIn(0, text.length))), + ImeOptions(singleLine = true, keyboardType = keyboardType, imeAction = imeAction), + { next -> + if (editText.text.toString() != next.text) editText.setText(next.text) + editText.setSelection(next.selection.start.coerceIn(0, next.text.length), next.selection.end.coerceIn(0, next.text.length)) + }, + { action -> editText.onEditorAction(imeActionFlag(action)) }, + { editText.post { editText.clearFocus() } }, + ) + typingRequest[0] = request + DualScreenPanel.startTyping(request) + return true + } + + DisposableEffect(Unit) { + onDispose { typingRequest[0]?.let { DualScreenPanel.stopTyping(it) } } + } Column(modifier = modifier.fillMaxWidth()) { - Text( + if (showLabel) Text( label, style = MaterialTheme.typography.labelSmall, fontWeight = FontWeight.Medium, @@ -422,8 +453,12 @@ internal fun AdbTextField( else -> false } } + showSoftInputOnFocus = !bottomTyping + setOnClickListener { if (hasFocus() && !typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) } setOnFocusChangeListener { _, hasFocus -> focused = hasFocus + if (hasFocus) { if (!typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) } + else typingRequest[0]?.let { DualScreenPanel.stopTyping(it) } onFocusChangeLatest.value(hasFocus) } addTextChangedListener(object : TextWatcher { @@ -436,14 +471,20 @@ internal fun AdbTextField( } }, update = { editText -> + editText.showSoftInputOnFocus = !bottomTyping if (focusOnShow && !focusAsked[0]) { focusAsked[0] = true editText.post { editText.requestFocus() - (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + if (!bottomTypingLatest.value) (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) ?.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 @@ -541,6 +582,11 @@ private fun parseAdbAddress(value: String): AdbEndpoint? { private fun formatAddressHost(host: String): String = if (':' in host) "[$host]" else host private fun formatAdbAddress(host: String, port: Int): String = "${formatAddressHost(host)}:$port" +private fun showKeyboardHere(editText: EditText) { + (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.showSoftInput(editText, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT) +} + private fun imeActionFlag(action: ImeAction): Int = when (action) { ImeAction.Next -> EditorInfo.IME_ACTION_NEXT ImeAction.Done -> EditorInfo.IME_ACTION_DONE 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 000000000..c2e4f3025 --- /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/AppUpdates.kt b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt index 222d30859..1bbeb18e2 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt @@ -200,18 +200,27 @@ object AppUpdates { fun message(context: Context): String = context.getString(text, *args) } - fun follow(context: Context, catalog: Catalog?): Follow { + fun follow(context: Context, catalog: Catalog?): Follow = follow(context, catalog, installed()) + + internal fun follow(context: Context, catalog: Catalog?, me: Installed): Follow { stored(context)?.let { return it } - val me = installed() - val inferred = when { - me.pr != 0 -> Follow(Channel.TEST, me.pr) - catalog == null -> return Follow(Channel.STABLE) - catalog.stable != null && isRunning(catalog.stable, me) -> Follow(Channel.STABLE) - me.updatable -> Follow(Channel.NIGHTLY) - else -> Follow(Channel.STABLE) - } - setFollow(context, inferred) - return inferred + val guess = guessFollow(catalog, me) + if (guess.certain) setFollow(context, guess.follow) + return guess.follow + } + + internal class Guess(val follow: Follow, val certain: Boolean) + + internal fun guessFollow(catalog: Catalog?, me: Installed): Guess { + if (me.pr != 0) return Guess(Follow(Channel.TEST, me.pr), true) + val stable = catalog?.stable + if (stable != null && isRunning(stable, me)) return Guess(Follow(Channel.STABLE), true) + val publishedPreview = catalog != null && me.updatable && ( + catalog.preview?.let { isRunning(it, me) } == true || + catalog.recentPreviews.any { matchesInstalledCommit(it.commit, me.commit) } + ) + if (stable?.version?.let { compareVersions(me.version, it) < 0 } == true) return Guess(Follow(Channel.STABLE), !publishedPreview) + return Guess(Follow(if (publishedPreview) Channel.NIGHTLY else Channel.STABLE), false) } fun setFollow(context: Context, follow: Follow) { 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 4ba3a20cc..5d1d33455 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -57,7 +57,6 @@ object SelfInstaller { } @Suppress("DEPRECATION") val flags = if (Build.VERSION.SDK_INT >= 28) { - // Android 9 and 10 only collect an archive's certificates when GET_SIGNATURES is set. PackageManager.GET_SIGNING_CERTIFICATES or PackageManager.GET_SIGNATURES } else { PackageManager.GET_SIGNATURES @@ -91,7 +90,7 @@ object SelfInstaller { } } - fun install(context: Context, apk: File) { + 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 +107,22 @@ 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) } } + 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/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt new file mode 100644 index 000000000..59c182dd3 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -0,0 +1,117 @@ +package com.droiddeck.launcher.wayland + +import android.app.Service +import android.content.Intent +import android.os.Handler +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import android.util.Log +import android.view.Surface +import com.droiddeck.launcher.core.FileUtils +import java.io.File + +/** + * The bottom-screen desktop's compositor. The compositor's native state is one per process, so the + * desktop gets a process of its own while the session's compositor keeps the top screen. + */ +class BottomDesktopCompositorService : Service() { + private var client: Messenger? = null + /** Echoed in every reply, so the session process can tell replies to an earlier attach apart. */ + @Volatile private var attachTag = 0 + + private val handler = object : Handler(Looper.getMainLooper()) { + override fun handleMessage(msg: Message) { + when (msg.what) { + MSG_ATTACH -> attach(msg) + MSG_DETACH -> CompositorHost.detach(null) + MSG_TOUCH -> WaylandCompositor.nativeSendTouch(msg.arg1 and 0xff, msg.arg1 shr 8, + msg.arg2 ushr 16, msg.arg2 and 0xffff) + MSG_KEY -> WaylandCompositor.nativeSendKey(msg.arg1, msg.arg2) + MSG_POINTER -> WaylandCompositor.nativeSendPointer(1, msg.arg1, msg.arg2) + MSG_SCENE -> WaylandCompositor.nativeSendSceneInput(msg.arg1, msg.arg2, msg.peekData()?.getInt(KEY_B) ?: 0) + MSG_CURSOR -> if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(msg.arg1 != 0) + MSG_NEW_GUEST -> WaylandCompositor.nativeResetFirstFrame() + MSG_TEXT -> msg.data?.getString(KEY_TEXT)?.let { WaylandCompositor.textInputCommit(it) } + MSG_STOP -> { + Log.i(TAG, "bottom-screen desktop closed; ending its compositor process") + // A producer that dies still connected keeps the panel's surface from taking another one. + CompositorHost.detach(null) + postDelayed({ android.os.Process.killProcess(android.os.Process.myPid()) }, 300) + } + else -> super.handleMessage(msg) + } + } + } + + private val messenger = Messenger(handler) + + override fun onBind(intent: Intent?): IBinder = messenger.binder + + override fun onUnbind(intent: Intent?): Boolean { + // The session process went away without saying so; nothing is left to draw for. + android.os.Process.killProcess(android.os.Process.myPid()) + return false + } + + private fun attach(msg: Message) { + val surface = msg.obj as? Surface ?: return + val data = msg.data ?: return + client = msg.replyTo + attachTag = msg.arg1 + val runtimeDir = File(data.getString(KEY_RUNTIME_DIR) ?: return).apply { mkdirs() } + val width = data.getInt(KEY_WIDTH) + val height = data.getInt(KEY_HEIGHT) + if (!CompositorHost.isStarted) { + FileUtils.copyAsset(this, "wayland/keymap.xkb", File(runtimeDir, "keymap.xkb")) + data.getString(KEY_LOG)?.let { path -> + WaylandCompositor.setSessionLogFile(File(path)) + runCatching { android.system.Os.setenv("BL_WAYLAND_LOG", path, true) } + .onFailure { Log.w(TAG, "could not point the compositor's log at $path", it) } + } + WaylandCompositor.setFirstFrameListener { reply(MSG_FIRST_FRAME) } + WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + } + val turnip = com.droiddeck.launcher.gpu.TurnipDriver(this) + val driverId = if (CompositorHost.isStarted) null else turnip.install() + val started = CompositorHost.startOrAttach( + this, surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, + applicationInfo.nativeLibraryDir, + width, height, data.getFloat(KEY_REFRESH, 60f), 0, + ) + Log.i(TAG, (if (started) "compositor started" else "compositor attached") + " at ${width}x$height in ${runtimeDir.path}") + reply(MSG_ATTACHED) + } + + private fun reply(what: Int) { + val target = client ?: return + runCatching { target.send(Message.obtain(null, what, attachTag, 0)) } + .onFailure { Log.w(TAG, "the session process did not take message $what", it) } + } + + companion object { + private const val TAG = "BottomDesktopComp" + const val MSG_ATTACH = 1 + const val MSG_DETACH = 2 + const val MSG_TOUCH = 3 + const val MSG_KEY = 4 + const val MSG_TEXT = 5 + const val MSG_STOP = 6 + const val MSG_NEW_GUEST = 7 + const val MSG_POINTER = 8 + const val MSG_SCENE = 9 + const val MSG_CURSOR = 10 + const val MSG_ATTACHED = 101 + const val MSG_FIRST_FRAME = 102 + const val KEY_RUNTIME_DIR = "runtimeDir" + const val KEY_WIDTH = "width" + const val KEY_HEIGHT = "height" + const val KEY_REFRESH = "refresh" + const val KEY_LOG = "log" + const val KEY_TEXT = "text" + const val KEY_B = "b" + private const val SCALE_FIT = 1 + private const val ALIGN_CENTER = 0 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index bb466c133..716644002 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -1,7 +1,11 @@ package com.droiddeck.launcher.wayland +import android.os.Handler +import android.os.HandlerThread +import android.os.Process import android.view.Choreographer import android.view.Surface +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionState object CompositorHost { @@ -14,8 +18,20 @@ object CompositorHost { @Volatile private var vsyncRunning = false - private val vsync = object : Choreographer.FrameCallback { + @Volatile + private var ownVsyncThread = true + + private val vsyncThread: HandlerThread by lazy { + HandlerThread("droiddeck-vsync", Process.THREAD_PRIORITY_DISPLAY).apply { start() } + } + private val vsyncHandler: Handler by lazy { Handler(vsyncThread.looper) } + + @Volatile + private var vsyncGeneration = 0 + + private fun vsyncCallback(generation: Int) = object : Choreographer.FrameCallback { override fun doFrame(frameTimeNanos: Long) { + if (generation != vsyncGeneration) return WaylandCompositor.nativeVsync(frameTimeNanos) if (vsyncRunning) Choreographer.getInstance().postFrameCallback(this) } @@ -23,6 +39,7 @@ object CompositorHost { @Synchronized fun startOrAttach( + context: android.content.Context, surface: Surface, xdgRuntimeDir: String, driverPath: String?, @@ -33,6 +50,8 @@ object CompositorHost { refreshHz: Float, fpsLimit: Int, ): Boolean { + ownVsyncThread = SessionPrefs.vsyncThread(context) + WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) pace(refreshHz, fpsLimit) if (!SessionState.running) WaylandCompositor.nativeSetOutputSize(outputWidth, outputHeight) if (started) { @@ -41,7 +60,7 @@ object CompositorHost { resumeVsync() return false } - com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess() + com.droiddeck.launcher.gpu.TpUbwcHint.applyToProcess(context) WaylandCompositor.nativeStartWithSurface( surface, xdgRuntimeDir, driverPath, libraryName, nativeLibDir, ) @@ -102,8 +121,14 @@ object CompositorHost { private fun resumeVsync() { if (vsyncRunning) return + val callback = vsyncCallback(++vsyncGeneration) vsyncRunning = true - Choreographer.getInstance().postFrameCallback(vsync) + WaylandCompositor.nativeLog("screen", if (ownVsyncThread) "screen tick runs on its own display-priority thread" else "screen tick runs on the main thread") + if (!ownVsyncThread) { + Choreographer.getInstance().postFrameCallback(callback) + return + } + vsyncHandler.post { Choreographer.getInstance().postFrameCallback(callback) } } private fun pauseVsync() { 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 48d9b3576..8fd329ce2 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -45,9 +45,8 @@ public final class WaylandCompositor { private static volatile long lastFrameNanos; private static volatile long frameIntervalNanos; - private static volatile long gameFrames; // written by the compositor thread only + private static volatile long gameFrames; - /** Frames the game has presented since the app started; the rate is the difference over time. */ public static long gameFrameCount() { return gameFrames; } public static long recentFrameIntervalMs() { @@ -148,6 +147,10 @@ public final class WaylandCompositor { public static native void nativeStart(String xdgRuntimeDir); + /** Nanoseconds of the compositor's own GPU work while timing is on, or -1 when it is not timed. */ + public static native long nativeGpuBusyNs(); + public static native void nativeSetGpuTiming(boolean on); + public static native void nativeStartWithSurface(Surface surface, String xdgRuntimeDir, String driverPath, String libraryName, String nativeLibDir); @@ -163,10 +166,16 @@ public final class WaylandCompositor { public static native int nativeCursorSerial(); + public static native void nativeSetCursorComposite(boolean on); + public static final int CURSOR_BUF_INTS = 6 + 256 * 256; public static native void nativeSendKey(int evdev, int state); + public static native boolean nativeFocusTakesTouch(); + + public static native boolean nativeCursorInputPos(int[] out); + public static native void nativeVsync(long frameTimeNanos); public static native int nativeCompositorTid(); @@ -284,6 +293,8 @@ public final class WaylandCompositor { public static native void nativeSetFpsLimit(int fps); + public static native void nativeSetRenderOnCommit(boolean on); + public static native void nativeSetGpuTurbo(boolean on); public static native int nativeRaisePriority(int tid, int nice); @@ -307,14 +318,29 @@ public final class WaylandCompositor { public static native float[] nativeFrameGenStats(); + public static native long nativeHudFrameTimes(float[] out); + + 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); } + private static float pendingDeltaX, pendingDeltaY; + public static void sendPointerDelta(float dx, float dy) { - int x = Math.round(dx * 256f), y = Math.round(dy * 256f); + pendingDeltaX += dx * 256f; + pendingDeltaY += dy * 256f; + int x = (int) Math.floor(pendingDeltaX); + int y = (int) Math.floor(pendingDeltaY); if (x == 0 && y == 0) return; + pendingDeltaX -= x; + pendingDeltaY -= y; nativeSendSceneInput(6, x, y); } } 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 000000000..c26b295e8 --- /dev/null +++ b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java @@ -0,0 +1,226 @@ +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; + +public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { + public interface FrameCounter { void onFrameShown(); } + + private final HardwareVideoDecoderFactory hardware; + private final EglBase.Context sharedContext; + private final boolean lowLatency; + private volatile boolean zeroCopy; + private volatile Surface zeroCopySurface; + 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; + } + + public synchronized void setZeroCopySurface(Surface surface) { + if (!zeroCopy) return; + moveTo(surface != null ? surface : standInSurface(), surface != null ? "the screen" : "a stand-in"); + } + + 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(); + } + + public String videoSize() { + return width > 0 ? width + "x" + height : null; + } + + 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)); + } + } + + private class Wrapper implements MediaCodecWrapper { + final MediaCodec raw; + 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)); + } + + @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/drawable/ic_bottom_keyboard.xml b/app/src/main/res/drawable/ic_bottom_keyboard.xml new file mode 100644 index 000000000..ff8aa7500 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_keyboard.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M20,5H4c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2V8zM11,11h2v2h-2v-2zM8,8h2v2H8V8zM8,11h2v2H8v-2zM7,13H5v-2h2v2zM7,10H5V8h2v2zM16,17H8v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2V8h2v2zM19,13h-2v-2h2v2zM19,10h-2V8h2v2z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_bottom_mouse.xml b/app/src/main/res/drawable/ic_bottom_mouse.xml new file mode 100644 index 000000000..7a5584985 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_mouse.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M13,1.07V9h7c0,-4.08 -3.05,-7.44 -7,-7.93zM4,15c0,4.42 3.58,8 8,8s8,-3.58 8,-8v-4H4v4zM11,1.07C7.05,1.56 4,4.92 4,9h7V1.07z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_bottom_touch.xml b/app/src/main/res/drawable/ic_bottom_touch.xml new file mode 100644 index 000000000..ff90202a8 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_touch.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M9,11.24V7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11H13v-6C13,6.67 12.33,6 11.5,6S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z" /> +</vector> diff --git a/app/src/main/res/values-ar/gestures.xml b/app/src/main/res/values-ar/gestures.xml index 6e4aa5468..3c16961dc 100644 --- a/app/src/main/res/values-ar/gestures.xml +++ b/app/src/main/res/values-ar/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">الإيماءات</string> <string name="gesture_settings">إعدادات إيماءات اللمس</string> - <string name="gesture_settings_hint">خصّص إيماءات الفأرة ولوحة المفاتيح. اختر الإيماءات كوضع للمس لاستخدامها.</string> <string name="gesture_tap">نقرة</string> <string name="gesture_drag">سحب بإصبع واحد</string> <string name="gesture_long_press">ضغط مطوّل</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">ضغط مستمر بثلاثة أصابع</string> <string name="gesture_pinch">ضمّ الإصبعين أو إبعادهما للتكبير والتصغير</string> <string name="gesture_hold_button">إبقاء الزر مضغوطًا</string> + <string name="gesture_hold_left">إبقاء الزر الأيسر مضغوطًا</string> + <string name="gesture_hold_right">إبقاء الزر الأيمن مضغوطًا</string> <string name="gesture_click_once">النقر مرة واحدة</string> <string name="gesture_hold_delay">مهلة الضغط المستمر</string> <string name="gesture_double_delay">الفاصل بين النقرتين</string> diff --git a/app/src/main/res/values-ar/shortcuts.xml b/app/src/main/res/values-ar/shortcuts.xml new file mode 100644 index 000000000..cc08ebc31 --- /dev/null +++ b/app/src/main/res/values-ar/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">اختصارات الأزرار الفعلية</string> + <string name="shortcuts_dd_menu">قائمة DroidDeck</string> + <string name="shortcuts_capture">تعيين: %1$s</string> + <string name="shortcuts_press">اضغط على زر ثم حرره. يُحفظ التعيين تلقائيًا.</string> + <string name="shortcuts_release">أفلت الزر للمتابعة.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">هذا الزر معيّن بالفعل إلى: %1$s</string> + <string name="shortcuts_save">إعادة تعيين</string> + <string name="shortcuts_retry">تجربة زر آخر</string> + <string name="shortcuts_limitations">قد لا يتوفر زر الشاشة الرئيسية وبعض الأزرار الإضافية.</string> +</resources> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7001fa916..18f0c0884 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">خيارات VKD3D لـ D3D12. يعطّل nodxr تتبع الأشعة؛ استخدمه فقط للعبة تحتاج إليه.</string> <string name="game_env_proton_log">اضبطه على 1 للحصول على سجل تشخيص Proton. قد يقلل التسجيل من الأداء ويستهلك مساحة التخزين.</string> <string name="game_env_wined3d">اضبطه على 1 لاستخدام WineD3D المعتمد على OpenGL بدلًا من DXVK لاختبار توافق D3D9–11.</string> + <string name="game_env_wined3d_renderer">أداة العرض لـ DirectDraw وDirect3D 1-7 والألعاب التي تعمل عبر WineD3D. يتخطّى Vulkan مسار OpenGL عبر Zink، وهو أسرع بكثير لألعاب DirectDraw وDirect3D 7 القديمة على Adreno.</string> + <string name="game_env_dxvk_d3d8">اضبطه على 1 لتشغيل Direct3D 8 عبر DXVK بدلًا من WineD3D. أسرع في اختبار Direct3D 8 ضمن AIO Graphics Test على Adreno.</string> <string name="game_env_no_ntsync">اضبطه على 1 لإبعاد هذه اللعبة عن ntsync (droiddeck-ntsync أو برنامج تشغيل في النواة)؛ فتستخدم droiddeck-esync حيث تتوفر حزمة، وإلا droiddeck-fsync.</string> <string name="game_env_no_esync">اضبطه على 1 لإيقاف droiddeck-esync لهذه اللعبة؛ فتستخدم droiddeck-fsync بدلًا منه، أو droiddeck-ntsync إذا كان fsync متوقفًا أيضًا.</string> <string name="game_env_no_fsync">اضبطه على 1 لإبعاد هذه اللعبة عن droiddeck-fsync؛ فتستخدم droiddeck-esync حيث تتوفر حزمة، وإلا droiddeck-ntsync.</string> <string name="game_env_fsync_first">اضبطه على 1 لتشغيل هذه اللعبة على droiddeck-fsync، أو على 0 لتقديم droiddeck-esync حيث تتوفر حزمة تناسب إصدار Proton الخاص بها.</string> <string name="game_env_xalia">اضبطه على 0 لتعطيل مساعد التنقل بوحدة التحكم في Proton لهذه اللعبة.</string> + <string name="game_env_anticheat_offline">مفعَّل افتراضيًا. يشغّل لعبة Easy Anti-Cheat دون مكافحة الغش عندما تدعم اللعبة اللعب بلا اتصال. أوقفه للتشغيل عبر Easy Anti-Cheat كالمعتاد. تبقى الأوضاع عبر الإنترنت التي تتطلب Easy Anti-Cheat غير متاحة.</string> <string name="game_env_hud">تراكب DXVK لـ D3D9–11. القيمة fps تعرض معدل الإطارات، وتركه دون تعيين يخفيه.</string> <string name="game_env_dxvk_config">إعدادات DXVK مفصولة بفواصل منقوطة. تستخدم الإصدارات الحديثة dxvk.maxFrameRate لتحديد الإطارات؛ يُفضَّل استخدام محدِّد الإطارات الخاص بالجلسة للعب العادي.</string> + <string name="game_env_cores">أنوية CPU لهذه اللعبة، مثل 0-4 أو 0,2,4، بدلًا من أنوية الألعاب في الجلسة. عدد أقل من الأنوية يعني حرارة أقل.</string> <string name="game_env_vkd3d_limit">حد معدل الإطارات في D3D12. القيمة 0 تلغي الحد.</string> <string name="game_env_glthread">تعدد مؤشرات الترابط في OpenGL ضمن Mesa. قد تساعد القيمة true ألعاب OpenGL المقيدة بأداء CPU؛ جرّبها لكل لعبة.</string> <string name="sync_backend_title">مزامنة Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">يشغّل FEX برامج Linux المخصصة لـ x86 على جهاز ARM64 هذا. يستخدمه الخيار «تلقائي» عندما يكون البرنامج مبنيًا لـ x86.</string> <string name="app_fex_x86">%1$s عبر FEX</string> <string name="app_fex_not_ready">هذا البرنامج مبني لأجهزة كمبيوتر %1$s ويعمل عبر FEX، الذي لم يتم إعداده بعد. افتح Steam مرة واحدة أثناء تسجيل الدخول: سيجعله DroidDeck يُنزّل FEX وSteam Linux Runtime اللازمة، ثم يُفتح هذا البرنامج.</string> + <string name="session_proot_missing">تعذّر تنزيل proot الخاص بـ DroidDeck. تحقّق من الاتصال وحاول مرة أخرى. لم تبدأ الجلسة لأن proot الاحتياطي أبطأ من أن يصلح للعب.</string> + <string name="session_directaudio_missing">تعذّر تنزيل DirectAudio، لذا يستخدم صوت الألعاب المسار الأبطأ في هذه الجلسة.</string> <string name="session_end_program">هذا البرنامج</string> <string name="session_end_steam_download">تعذّر تنزيل عميل Steam. قد تكون شبكتك أو VPN تحظر خوادم Steam؛ تحقّق من الاتصال وحاول مرة أخرى.</string> <string name="session_end_steam_setup">تعذّر إعداد عميل Steam. تحقّق من الاتصال والمساحة الفارغة، ثم حاول مرة أخرى.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">وحدة تحكم Xbox 360</string> <string name="mode_controller_note">Deck: زر «الوصول السريع» والجيروسكوب. Steam Controller: الشيء نفسه، مع استشعار القبضة على الأزرار الخلفية. DualShock 4 وDualSense: الجيروسكوب، ولوحتا التتبع كلوحة اللمس الخاصة بها. Xbox 360: افتح «الوصول السريع» باستخدام Guide+A.</string> <string name="mode_back">زر الرجوع</string> + <string name="back_hold">الضغط المطوّل على الرجوع لاختصارات Steam</string> + <string name="back_hold_hint">الضغط المطوّل على الرجوع يفتح الوصول السريع أو ينشئ اختصارات Steam مع أزرار أخرى. أوقفه لتجاهل الضغط المطوّل؛ النقر والنقر المزدوج يبقيان يعملان.</string> + <string name="back_native_qam_hint">اضغط مطوّلًا على زر الرجوع لمدة 700 ملّي ثانية، أو اضغط عليه مطوّلًا مع زر آخر لاختصارات Steam.</string> + <string name="back_double_tap_window">مهلة النقر المزدوج</string> + <string name="back_tap_ms">%1$d ملّي ثانية</string> + <string name="brightness_permission_title">السماح بالتحكّم في السطوع</string> + <string name="brightness_permission_text">اضبط التحكّم في السطوع في DroidDeck.</string> <string name="back_menu_then_qam">القائمة ← الوصول السريع</string> <string name="back_qam_then_menu">الوصول السريع ← القائمة</string> <string name="mode_session">الجلسة</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">محدَّث · %1$s</string> <string name="mode_decky_loader">المُحمِّل</string> <string name="mode_decky_install_latest">تثبيت أحدث إصدار</string> + <string name="decky_channel">قناة التحديث</string> + <string name="decky_channel_hint">إصدارات Decky Loader التي تُثبَّت. يستخدم مُحدِّث Decky نفسه القناة ذاتها.</string> + <string name="decky_channel_stable">مستقرة</string> + <string name="decky_channel_prerelease">إصدار تجريبي مسبق</string> + <string name="decky_channel_testing">اختبار</string> + <string name="decky_channel_failed">تعذّر حفظ قناة تحديث Decky</string> <string name="mode_decky_on">يبدأ مع Steam. أثناء تفعيله، قد تتمكن التطبيقات الأخرى على هذا الجهاز من التحكم في Steam.</string> <string name="mode_decky_off">متوقف. يبقى منفذ تصحيح الأخطاء عن بُعد في Steam مغلقًا.</string> <string name="mode_decky_remove_title">هل تريد إلغاء تثبيت Decky Loader؟</string> @@ -307,6 +342,10 @@ <string name="mode_client">العميل</string> <string name="mode_mangoapp">تراكب الأداء</string> <string name="mode_mangoapp_hint">أوقفه إذا تعطلت الألعاب أو أصبحت شاشتها سوداء في وضع Deck. يُطبَّق في الجلسة التالية.</string> + <string name="mode_return_after_game">العودة إلى DroidDeck بعد اللعبة</string> + <string name="mode_return_after_game_hint">عند إغلاق لعبة بدأتها من DroidDeck أو من مشغّل آخر، يُغلَق Steam بشكل سليم (بعد اكتمال الحفظ السحابي) وتعود إلى هناك. عند الإيقاف: تبقى في Steam.</string> + <string name="mode_shader_precache">التخزين المسبق للمظلِّلات</string> + <string name="mode_shader_precache_hint">ينزّل Steam مظلِّلات مُعدّة مسبقًا لألعابك ويعالجها في الخلفية، فتقلّ التقطّعات في الألعاب. يوفّر الإيقاف البيانات والتخزين والبطارية، وتبني الألعاب المظلِّلات أثناء اللعب بدلًا من ذلك. هو الإعداد نفسه في Steam ضمن التنزيلات > التخزين المسبق للمظلِّلات. يُطبَّق في الجلسة التالية.</string> <string name="mode_steam_repair">إصلاح عميل Steam</string> <string name="mode_steam_repair_hint">يُنزّل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam. استخدمه إذا بقي Steam على شاشة التحميل. يتم الاحتفاظ بالألعاب وتسجيل الدخول والإعدادات.</string> <string name="mode_steam_repair_queued">سيتم تنزيل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam.</string> @@ -378,6 +417,8 @@ <string name="mode_directaudio_hint">يتجاوز PulseAudio لتقليل زمن الاستجابة.</string> <string name="mode_mic">الميكروفون</string> <string name="mode_mic_hint">للدردشة الصوتية.</string> + <string name="drawer_mic_hint">شغّل التقاط الميكروفون أو أوقفه لهذه الجلسة.</string> + <string name="drawer_mic_failed">تعذّر تغيير الميكروفون. يُرجى المحاولة مرة أخرى.</string> <string name="mode_network">الشبكة</string> <string name="mode_wifi_discovery">اكتشاف Wi-Fi</string> <string name="mode_wifi_discovery_hint">عرض أسماء شبكات Wi-Fi والشبكات القريبة في Steam.</string> @@ -543,14 +584,24 @@ <string name="perf_gsrealtime">gamescope: طابور GPU بأولوية الوقت الفعلي</string> <string name="perf_gsrealtime_hint">يعطي الأولوية لعمل GPU الخاص بالمُركِّب. قد يحسّن انتظام الإطارات على حساب أداء الألعاب قليلًا.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">الذاكرة</string> + <string name="perf_cap_off">إيقاف</string> + <string name="perf_cap_auto">افتراضي برنامج التشغيل</string> + <string name="perf_zram_client">ضغط Steam أثناء تشغيل لعبة</string> + <string name="perf_zram_client_hint">بعد 20 ثانية من بدء اللعبة، يُضغط عميل Steam في zRAM لترك ذاكرة أكبر للعبة، ثم يُقرأ مجددًا عند إغلاقها. أوقف هذا الخيار إذا كانت الجلسة تُغلَق بعد بدء الألعاب بقليل. يظل حد RAM أعلاه يضغط Steam عندما تتجاوزه الجلسة.</string> + <string name="perf_ram_cap">حد RAM</string> + <string name="perf_ram_cap_hint">يُطبَّق أثناء تشغيل عميل Steam، في جلسة Steam أو من سطح المكتب. عندما تستخدم الجلسة أكثر من هذا الحد، يُضغط Steam ثم عمليات الجلسة المدعومة الأخرى في zRAM. حد مرن: لا يُغلَق شيء، لكن قد تتقطّع الألعاب أثناء استعادة الصفحات.</string> + <string name="perf_ram_cap_unavailable">يتطلب مساحة تبديل zRAM، وهي غير متوفرة على هذا الجهاز.</string> + <string name="perf_vram_cap">حد VRAM</string> + <string name="perf_vram_cap_hint">ذاكرة الفيديو التي يُبلغ بها DXVK ألعاب Direct3D، فتخصّص للأنسجة مساحة أقل. تظل إعدادات DXVK الخاصة باللعبة هي الأولى. يسري في الجلسة التالية.</string> <string name="perf_gpuclock">تثبيت GPU على أعلى تردد له</string> <string name="perf_gpuclock_hint">لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة.</string> <string name="perf_fixes">إصلاحات الجلسة</string> <string name="perf_sysmem">Turnip: التصيير عبر sysmem</string> <string name="perf_sysmem_hint">أسرع لعميل Steam؛ في الألعاب يختار برنامج التشغيل بين العرض المقسّم إلى مربعات والعرض في ذاكرة النظام لكل مرحلة. مطلوب على Adreno 710/720/722.</string> <string name="perf_xalia">تجاوز مساعد xalia في Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (تجريبي)</string> - <string name="perf_fastsync_hint">بديل في مساحة المستخدم لبرنامج تشغيل ntsync في Linux، للاختبار. أثناء تفعيله، يستخدمه Proton بدلًا من droiddeck-esync وdroiddeck-fsync. يعمل مع Proton Experimental ARM64 وGE-Proton وproton-cachyos. يُطبَّق في الجلسة التالية.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">بديل في مساحة المستخدم لبرنامج تشغيل ntsync في Linux. أثناء تفعيله، يستخدمه Proton بدلًا من droiddeck-esync وdroiddeck-fsync. يعمل مع Proton Experimental ARM64 وGE-Proton وproton-cachyos. يُطبَّق في الجلسة التالية.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync أولًا</string> <string name="perf_fsync_hint">يشغّل خاصية fsync المدمجة في Proton على ملفات Proton الأصلية، مع توفير futex_waitv في مساحة المستخدم، فلا يحتاج إلى حزمة ويستمر في العمل لحظة تحديث Steam لـ Proton. أثناء تفعيله، تستخدمه الألعاب قبل droiddeck-esync، باستثناء القليل الذي يبقيه Proton معطّلًا لـ fsync. يُطبَّق في الجلسة التالية.</string> @@ -561,6 +612,8 @@ <string name="perf_fastpath">مسار proot السريع</string> <string name="perf_fastpath_needs_seccomp">يحتاج إلى مرشّح seccomp في proot.</string> <string name="perf_fastpath_hint">عمليات بحث أسرع عن الملفات وتقطّع أقل. أوقفه إذا تعذّر على برنامج العثور على ملفاته.</string> + <string name="perf_cursor_composite">رسم المؤشر داخل gamescope</string> + <string name="perf_cursor_composite_hint">يرسم Gamescope المؤشر بنفسه بدلًا من تسليمه إلى Android. فعّله لمؤشر تتحكّم فيه وحدة التحكم. الإيقاف أسرع على الهاتف. يُطبَّق في الجلسة التالية.</string> <string name="perf_identity">هوية الجلسة</string> <string name="perf_hostname">اسم المضيف</string> <string name="perf_hostname_hint">الاسم الذي يراه Steam لهذا الجهاز. اتركه خاليًا للاستعادة إلى %1$s.</string> @@ -575,6 +628,8 @@ <string name="driver_delete_plain">تُزال ملفاته من التطبيق.</string> <string name="driver_delete_in_use">تُزال ملفاته. إنه قيد الاستخدام، فيتولى الافتراضي مكانه.</string> <string name="drawer_page_display">العرض</string> + <string name="drawer_frame_limit">حد الإطارات</string> + <string name="drawer_frame_limit_note">يحدّ هذه اللعبة. تنتقل الشاشة إلى معدل تحديث يقبل القسمة على الحد إن وُجد، وقد تبدو الحدود الأخرى غير منتظمة. تستخدم ألعاب Steam حد الإطارات في Steam ضمن قائمة الوصول السريع.</string> <string name="drawer_page_effects">المؤثرات</string> <string name="drawer_page_controls">عناصر التحكم</string> <string name="drawer_page_components">المكوّنات</string> @@ -599,6 +654,66 @@ <string name="drawer_hud_color_amber">كهرماني</string> <string name="drawer_hud_color_violet">بنفسجي</string> <string name="drawer_hud_opacity">العتامة</string> + <string name="hud_size">الحجم</string> + <string name="hud_size_hint">النقر على HUD يغيّر حجمه أيضًا.</string> + <string name="hud_size_full">كامل</string> + <string name="hud_size_tiles">مربعات</string> + <string name="hud_size_pill">كبسولة</string> + <string name="hud_size_minimal">مصغّر</string> + <string name="hud_size_mega">ضخم</string> + <string name="hud_size_strip">شريط</string> + <string name="hud_locked">تثبيت في مكانه</string> + <string name="hud_locked_hint">اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل.</string> + <string name="hud_snap">الالتصاق بالجانبين</string> + <string name="hud_snap_hint">اترك الواجهة لتنتقل إلى أقرب جانب من الشاشة. اسحبها بسرعة لترميها في ذلك الاتجاه.</string> + <string name="hud_group_look">المظهر</string> + <string name="hud_scale">الحجم على الشاشة</string> + <string name="hud_color_soft">هادئ</string> + <string name="hud_color_mid">متوسط</string> + <string name="hud_color_vivid">زاهٍ</string> + <string name="hud_outline">الحد الخارجي</string> + <string name="hud_outline_color">لون الحد الخارجي</string> + <string name="hud_outline_gray">رمادي</string> + <string name="hud_outline_theme">لون المظهر</string> + <string name="hud_group_metrics">القراءات</string> + <string name="hud_metric_graph">مخطط زمن الإطار</string> + <string name="hud_metric_decimal">معدل الإطارات بخانة عشرية</string> + <string name="hud_metric_low001" formatted="false">أدنى 0.01%</string> + <string name="hud_metric_engine">محرك الرسومات</string> + <string name="hud_metric_gpu_model">اسم GPU</string> + <string name="hud_metric_gpu">حمل GPU</string> + <string name="hud_metric_gpu_temp">درجة حرارة GPU</string> + <string name="hud_metric_cpu">حمل CPU</string> + <string name="hud_metric_per_core">CPU لكل نواة</string> + <string name="hud_metric_temp">درجات الحرارة</string> + <string name="hud_metric_ram">الذاكرة</string> + <string name="hud_metric_vram">ذاكرة الرسومات</string> + <string name="hud_metric_swap">ذاكرة التبديل</string> + <string name="hud_metric_battery">مستوى البطارية</string> + <string name="hud_metric_power">استهلاك الطاقة</string> + <string name="hud_metric_network">الشبكة</string> + <string name="hud_metric_resolution">الدقة</string> + <string name="hud_metric_proton">إصدار Proton</string> + <string name="hud_metric_session">مدة الجلسة</string> + <string name="hud_metric_clock">الساعة</string> + <string name="hud_group_temps">درجات الحرارة</string> + <string name="hud_temp_unit">الوحدة</string> + <string name="hud_temp_bands">ألوان التحذير</string> + <string name="hud_temp_bands_hint">تتحول درجات الحرارة إلى الكهرماني ثم الأحمر كلما اقتربت من الحد.</string> + <string name="hud_temp_bands_off">إيقاف</string> + <string name="hud_temp_bands_auto">تلقائي</string> + <string name="hud_temp_bands_manual">يدوي</string> + <string name="hud_temp_red_cpu">CPU بالأحمر عند</string> + <string name="hud_temp_red_gpu">GPU بالأحمر عند</string> + <string name="hud_temp_red_battery">البطارية بالأحمر عند</string> + <string name="hud_group_more">المزيد</string> + <string name="hud_export">تشخيص HUD</string> + <string name="hud_export_hint">يحفظ تقريرًا عن كل مستشعر يقرؤه HUD في Downloads/DroidDeck.</string> + <string name="hud_export_button">حفظ</string> + <string name="hud_export_done">تم الحفظ في %1$s</string> + <string name="hud_export_failed">تعذّر حفظ تقرير HUD.</string> + <string name="hud_reset">إعادة ضبط إعدادات HUD</string> + <string name="hud_reset_button">إعادة ضبط</string> <string name="drawer_scaling">وضع التحجيم</string> <string name="drawer_scaling_sharpness">حدة التحجيم</string> <string name="drawer_effects">مؤثرات الشاشة</string> @@ -633,10 +748,14 @@ <string name="drawer_touch_auto">تلقائي (%1$s)</string> <string name="drawer_keyboard">لوحة المفاتيح</string> <string name="drawer_latency">زمن الاستجابة</string> + <string name="drawer_low_latency">وضع زمن الاستجابة المنخفض</string> + <string name="drawer_low_latency_hint">يزيد استهلاك CPU والبطارية</string> <string name="drawer_low_latency_controller">وحدة تحكم بزمن استجابة منخفض</string> <string name="drawer_low_latency_controller_hint">تبلغ وحدة التحكم بمعدل 1000 هرتز بدلًا من 250 هرتز. استهلاك معالج أعلى قليلًا.</string> <string name="drawer_low_latency_touch">لمس بزمن استجابة منخفض</string> <string name="drawer_low_latency_touch_hint">تتجاوز اللمسات تجميع الإطارات، فيعمل اللمس في Steam بمعدل 1000 هرتز. استهلاك معالج أعلى قليلًا.</string> + <string name="drawer_evdev_mouse">قناة فأرة خام</string> + <string name="drawer_direct_cursor">المؤشر</string> <string name="drawer_pc_keyboard">لوحة مفاتيح الكمبيوتر</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">الشاشة الثانية</string> @@ -727,6 +846,10 @@ <string name="setup_session">الجلسة</string> <string name="setup_logs">سجلات الجلسة</string> <string name="setup_logs_hint">تُحفَظ بعد كل جلسة</string> + <string name="setup_game_debug_logs">سجلات تصحيح الألعاب</string> + <string name="setup_game_debug_logs_hint">تضمين بيانات تشخيص Proton وWine والرسومات عند تشغيل اللعبة التالية. قد يقلّل الأداء ويستهلك مساحة تخزين أكبر.</string> + <string name="setup_game_debug_logs_restart">أعِد تشغيل هذه الجلسة لحفظ سجلات تصحيح الألعاب</string> + <string name="setup_logging_update_failed">تعذّر تحديث التسجيل. تحقّق من المفتاح وحاول مرة أخرى.</string> <string name="setup_agent_commands">أدوات تصحيح الأخطاء</string> <string name="setup_latest_logs">أحدث سجلات الجلسة</string> <string name="setup_saved_logs">سجلات الجلسة المحفوظة</string> @@ -759,12 +882,28 @@ <string name="setup_home_on">يمكن أن يكون DroidDeck تطبيق الشاشة الرئيسية</string> <string name="setup_home_off">لا يُعرَض DroidDeck أبدًا كتطبيق للشاشة الرئيسية</string> <string name="setup_orientation">الاتجاه</string> + <string name="setup_launcher_orientation">اتجاه المشغّل</string> + <string name="setup_launcher_orientation_auto">اتّباع تدوير الجهاز</string> + <string name="setup_orientation_portrait">عمودي</string> + <string name="setup_session_orientation">اتجاه الجلسة</string> + <string name="setup_session_orientation_hint">يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، ويبقى العرض والارتفاع المخصّصان كما أُدخلا.</string> <string name="setup_orientation_auto">أفقي تلقائي</string> <string name="setup_orientation_landscape">أفقي</string> <string name="setup_orientation_reverse">أفقي معكوس</string> <string name="setup_fullscreen">ملء الشاشة</string> <string name="setup_fullscreen_on">يخفي شريطي الحالة والتنقّل في Android</string> <string name="setup_fullscreen_off">يعرض شريطي الحالة والتنقّل في Android</string> + <string name="setup_dual_screen">الشاشة المزدوجة</string> + <string name="setup_dual_screen_hint">يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة.</string> + <string name="setup_dual_screen_auto">تلقائي</string> + <string name="setup_dual_screen_on">تشغيل</string> + <string name="setup_dual_screen_off">إيقاف</string> + <string name="setup_dual_screen_menu">قائمة الشاشة السفلية</string> + <string name="setup_dual_screen_menu_hint">ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام.</string> + <string name="setup_dual_screen_controls">عناصر تحكم الشاشة السفلية في الألعاب</string> + <string name="setup_dual_screen_controls_hint">يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة.</string> + <string name="dual_typing_title">الكتابة على الشاشة العلوية</string> + <string name="dual_typing_done">تم</string> <string name="setup_default_home">تطبيق الشاشة الرئيسية الافتراضي</string> <string name="setup_choose_home">اختيار تطبيق للشاشة الرئيسية</string> <string name="setup_choose">اختيار</string> @@ -924,6 +1063,14 @@ <string name="gate_step1">افتح الإعدادات ← خيارات المطوّرين ← تصحيح الأخطاء اللاسلكي وفعِّله</string> <string name="gate_step2">اضغط على «إقران جهاز برمز إقران»</string> <string name="gate_step3">أدخل الرمز في إشعار DroidDeck</string> + <string name="pairguide_build_number">في «لمحة عن الهاتف»، انقر على «رقم الإصدار» 7 مرات</string> + <string name="pairguide_wireless">فعّل «تصحيح الأخطاء اللاسلكي»</string> + <string name="pairguide_pair">افتح «تصحيح الأخطاء اللاسلكي»، ثم انقر على «إقران الجهاز باستخدام رمز الإقران»</string> + <string name="pairguide_child_process">فعّل «إيقاف قيود العمليات الفرعية»</string> + <string name="pairguide_row_child_process">إيقاف قيود العمليات الفرعية</string> + <string name="pairguide_row_build_number">رقم الإصدار</string> + <string name="pairguide_row_wireless">تصحيح الأخطاء اللاسلكي</string> + <string name="pairguide_row_pair">إقران الجهاز باستخدام رمز الإقران</string> <string name="gate_waiting">في انتظار نافذة الإقران المنبثقة…</string> <string name="gate_code_needed">تم العثور على النافذة المنبثقة. أدخل رمزها في الإشعار.</string> <string name="gate_status">الحالة</string> @@ -1047,8 +1194,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 +1201,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> @@ -1065,10 +1209,8 @@ <string name="games_never_played">لم يتم تشغيلها أبدًا</string> <string name="games_runtime_busy_percent">بيئة التشغيل مشغولة · %1$d%%</string> <string name="games_runtime_busy">بيئة التشغيل مشغولة</string> - <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> @@ -1083,6 +1225,9 @@ <string name="gpu_hide_other">إخفاء برامج التشغيل لوحدات GPU الأخرى</string> <string name="gpu_show_other">إظهار برامج التشغيل لوحدات GPU الأخرى</string> <string name="gpu_advanced">متقدّم</string> + <string name="gpu_ubwc_title">توافق UBWC</string> + <string name="gpu_ubwc_hint">جرّب التشغيل أو الإيقاف إذا ظهرت خطوط أو وميض في Steam أو Android. يُطبَّق على برنامجَي التشغيل كليهما بعد إعادة تشغيل DroidDeck.</string> + <string name="gpu_ubwc_restart">أعِد تشغيل DroidDeck للتطبيق.</string> <string name="gpu_set_with_display">يُضبَط مع برنامج تشغيل العرض معًا: يحمل %1$s كلاهما.</string> <string name="gpu_set_with_runtime">يُضبَط مع برنامج تشغيل بيئة التشغيل معًا: يحمل %1$s كلاهما.</string> <string name="gpu_runtime_hint">يُستخدَم في الألعاب وسطح المكتب.</string> @@ -1137,7 +1282,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> @@ -1191,10 +1336,15 @@ <string name="pip_auto">الدخول تلقائيًا إلى وضع نافذة ضمن النافذة</string> <string name="unfolded_controls">عناصر التحكّم على الشاشة غير المطوية</string> <string name="unfolded_controls_hint">عند فتح الجهاز، تظهر اللعبة فوق لوحتَي اللمس والمقابض الخلفية بأسلوب Steam Deck. وعند طيّه، تُعرض اللعبة بملء الشاشة.</string> + <string name="unfolded_controls_with_controller">إبقاؤها مع وحدة التحكم</string> + <string name="unfolded_controls_with_controller_hint">إظهار عناصر التحكّم باللمس هذه أيضًا أثناء توصيل وحدة تحكم.</string> <string name="pip_suspended">معلَّقة</string> <string name="pip_not_ready">تتوفّر ميزة نافذة ضمن النافذة عندما تصبح الجلسة جاهزة.</string> <string name="pip_permission">اسمح بميزة نافذة ضمن النافذة لتطبيق DroidDeck في إعدادات Android.</string> <string name="pip_unavailable">تعذّر على Android فتح نافذة ضمن النافذة.</string> + <string name="game_more">المزيد</string> + <string name="game_edit_art">تعديل الصور</string> + <string name="stores_in_steam_label">في Steam</string> <string name="game_shortcut">اختصار</string> <string name="game_shortcut_add">إضافة إلى الشاشة الرئيسية</string> <string name="game_shortcut_choose">اختيار لعبة</string> @@ -1218,6 +1368,10 @@ <string name="main_wait_runtime">انتظر حتى تنتهي عملية بيئة التشغيل</string> <string name="main_wait_proton_install">انتظر حتى ينتهي تثبيت أداة التوافق</string> + <string name="load_compat_title">جارٍ تجهيز أدوات التوافق</string> + <string name="load_compat_wait">في انتظار اكتمال إعداد التوافق</string> + <string name="load_compat_hint">ستبدأ جلستك عند اكتمال الإعداد.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">انتظر حتى ينتهي تثبيت تطبيق سطح المكتب</string> <string name="main_wait_install_game">انتظر حتى ينتهي التثبيت قبل تشغيل لعبة</string> <string name="main_saves_close_session">أغلِق جلسة Steam أولاً حتى لا تحفظ اللعبة فوق الملفات المستورَدة</string> @@ -1270,6 +1424,9 @@ <string name="main_install_anyway">التثبيت على أي حال</string> <string name="main_remove_runtime_title">إزالة بيئة تشغيل Linux</string> <string name="main_remove_runtime_text">سيؤدي هذا إلى حذف بيئة التشغيل وعميل Steam بداخلها وكل لعبة مثبَّتة فيها.</string> + <string name="runtime_actions_title">بيئة تشغيل Linux</string> + <string name="runtime_actions_text">يعيد الإصلاح تثبيت ملفات النظام في بيئة التشغيل ويحتفظ بـ Steam وألعابك وإعداداتك. تُثبَّت الإضافات مثل سطح المكتب مجددًا عند استخدامها لاحقًا. أما الإزالة فتحذف كل شيء.</string> + <string name="runtime_repair">إصلاح بيئة التشغيل</string> <string name="main_applied">تم التطبيق: %1$s</string> <string name="android_app_open_failed_primary">تعذّر فتح %1$s على الشاشة الأساسية</string> <string name="android_app_open_failed_on">تعذّر فتح %1$s على %2$s</string> @@ -1411,6 +1568,15 @@ <string name="session_runtime_catalog_unreachable">تعذّر الوصول إلى كتالوج بيئة التشغيل. تحقَّق من الاتصال واضغط على «تشغيل» مرة أخرى.</string> <string name="session_runtime_install_failed">لم يتم تثبيت بيئة تشغيل Linux. تحقَّق من بيئة التشغيل في «الإعداد» واضغط على «تشغيل» مرة أخرى.</string> <string name="session_desktop_install_failed">لم يتم تثبيت سطح المكتب (%1$s). تحقَّق من الاتصال واضغط على «سطح المكتب» مرة أخرى.</string> + <string name="session_package_resume_failed">تعذّر إكمال تثبيت توقّف قبل انتهائه (%1$s). تحقّق من الاتصال والمساحة، ثم حاول مرة أخرى.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="zero">بيئة تشغيل Linux تالفة: %1$d رابط مكتبة يشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="one">بيئة تشغيل Linux تالفة: رابط مكتبة واحد يشير إلى ملف مفقود (%2$s)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="two">بيئة تشغيل Linux تالفة: رابطا مكتبة يشيران إلى ملفات مفقودة (%2$s وغيره)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="few">بيئة تشغيل Linux تالفة: %1$d روابط مكتبات تشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="many">بيئة تشغيل Linux تالفة: %1$d رابطًا لمكتبات تشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="other">بيئة تشغيل Linux تالفة: %1$d رابط مكتبة يشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + </plurals> <string name="session_ended_named">توقّف %1$s بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> <string name="session_ended_program">توقّف البرنامج بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> <string name="session_ended_desktop">توقّف سطح المكتب بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> @@ -1429,6 +1595,17 @@ <string name="mode_decky_plugins_hint">ثبِّت ملف ZIP لإضافة في جلسة Steam التالية.</string> <string name="mode_decky_plugin_downloading">جارٍ التنزيل…</string> <string name="mode_decky_plugin_install_zip">التثبيت من ملف ZIP</string> + <string name="decky_zip_warning_title">تثبيت إضافة من جهة خارجية</string> + <string name="decky_zip_warning_text">لم يراجع فريق Decky Loader هذه الإضافة. قد تحتوي على برامج ضارة، مثل برامج لسرقة حساب Steam الخاص بك أو إلحاق الضرر بجهازك. بتثبيت هذه الإضافة، فإنك توافق على تحمّل جميع المخاطر على جهازك.</string> + <string name="decky_zip_warning_continue">متابعة</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="zero">يُرجى الانتظار %1$d ثانية</item> + <item quantity="one">يُرجى الانتظار ثانية واحدة</item> + <item quantity="two">يُرجى الانتظار ثانيتين</item> + <item quantity="few">يُرجى الانتظار %1$d ثوانٍ</item> + <item quantity="many">يُرجى الانتظار %1$d ثانية</item> + <item quantity="other">يُرجى الانتظار %1$d ثانية</item> + </plurals> <string name="store_cat_games">الألعاب</string> <string name="store_cat_audio_video">الصوت والفيديو</string> <string name="store_cat_graphics">الرسومات</string> @@ -1457,6 +1634,10 @@ <string name="theme_icon_blue_detail">خلفية سوداء ونص أبيض، والأزرق لكل عنصر محدَّد أو مُركَّز عليه أو مضغوط.</string> <string name="theme_electric">كحلي كهربائي</string> <string name="theme_electric_detail">أزرق أكثر سطوعًا، على أسطح تميل إلى الكحلي بدلاً من الرمادي.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">ألوان تتدرّج عبر ألوان قوس قزح. تتبع إعدادات الرسوم المتحركة في Android.</string> + <string name="theme_rgb_speed">السرعة</string> + <string name="theme_rgb_speed_hint">مدى سرعة تغيّر الألوان.</string> <string name="theme_gradient">تدرج لوني</string> <string name="theme_gradient_detail">لونك الأساسي والثانوي، ممزوجان على الأزرار وعناصر التمييز.</string> <string name="theme_gradient_primary">الأساسي</string> @@ -1598,7 +1779,16 @@ <string name="fm_conflict_skip">تخطّي</string> <string name="fm_select_this_folder">اختيار هذا المجلد</string> <string name="fm_back">رجوع</string> + <string name="fm_exit">خروج</string> + <string name="fm_return_to_start">العودة إلى المجلد الأول</string> + <string name="fm_start_unavailable">لم يعد المجلد الأول متاحًا</string> + <string name="fm_cancel_operation_title">إلغاء العملية؟</string> + <string name="fm_cancel_operation_confirmation">سيتم إلغاء العملية. هل أنت متأكد؟</string> + <string name="fm_accept">موافق</string> + <string name="fm_decline">رفض</string> <string name="fm_drive_not_readable">تم تركيب %1$s لكن تتعذّر قراءته حاليًا</string> + <string name="fm_drive_access_title">السماح بالوصول إلى %1$s</string> + <string name="fm_drive_access_text">يتيح Android لتطبيق DroidDeck رؤية محرك الأقراص هذا دون قراءته. فعّل الوصول إلى جميع الملفات لتطبيق DroidDeck ثم عُد.</string> <string name="fm_list_view">عرض القائمة</string> <string name="fm_grid_view">عرض الشبكة</string> <string name="fm_search">بحث</string> @@ -1674,6 +1864,93 @@ <string name="second_mode_keyboard_trackpad">لوحة المفاتيح + لوحة اللمس</string> <string name="second_mode_terminal">الوحدة الطرفية</string> <string name="second_mode_deck_controls">مقابض Deck + لوحتا اللمس</string> + <string name="second_mode_dashboard">لوحة المعلومات</string> + <string name="bottom_dashboard_empty">لا يوجد ما يُعرض هنا بعد.</string> + <string name="bottom_page_downloads">التنزيلات</string> + <string name="bottom_downloads_none">لا توجد تنزيلات جارية.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">جارٍ تنزيل ذاكرة المظلِّلات المؤقتة</string> + <string name="bottom_downloads_paused">متوقف مؤقتًا</string> + <string name="bottom_downloads_queued">بانتظار البدء</string> + <string name="bottom_page_notifications">الإشعارات</string> + <string name="bottom_notifications_listener">الشاشة السفلية لـ DroidDeck</string> + <string name="bottom_notifications_why">اعرض الرسائل والإشعارات الأخرى هنا أثناء اللعب. تبقى على هذه الشاشة فقط ولا تُحفظ. يطلب Android الإذن مرة واحدة: تُفتح صفحة الوصول إلى الإشعارات على هذه الشاشة؛ فعِّل DroidDeck هناك وستعود هذه الصفحة تلقائيًا.</string> + <string name="bottom_notifications_allow">السماح بالوصول إلى الإشعارات</string> + <string name="bottom_notifications_none">لا توجد إشعارات.</string> + <string name="bottom_notifications_count">الإشعارات: %1$d</string> + <string name="bottom_notifications_clear">مسح</string> + <string name="bottom_page_screenshots">لقطات الشاشة</string> + <string name="stats_fps_needs_hud">يتطلب FPS تشغيل واجهة الأداء</string> + <string name="stats_speed">السرعة</string> + <string name="stats_pedals">الدواسات</string> + <string name="stats_gforce">قوة G</string> + <string name="stats_timing">التوقيت</string> + <string name="stats_best_lap">أفضل لفة</string> + <string name="stats_tires">الإطارات °C</string> + <string name="stats_trace">دواسة الوقود والمكابح، آخر 10 s</string> + <string name="stats_speed_chart">السرعة، %1$s</string> + <string name="stats_gear">الترس</string> + <string name="stats_speed_units">وحدات السرعة</string> + <string name="stats_speed_units_auto">تلقائي (%1$s)</string> + <string name="stats_steam_client_arm">عميل Steam ARM</string> + <string name="stats_steam_client_x86">عميل Steam x86</string> + <string name="stats_throttle">دواسة الوقود</string> + <string name="stats_brake">المكابح</string> + <string name="stats_lights">لوحة العدادات</string> + <string name="stats_lamp_shift">تبديل الترس</string> + <string name="stats_lamp_handbrake">فرامل اليد</string> + <string name="stats_lamp_pit">محدِّد سرعة حارة الصيانة</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">التيربو %1$s bar</string> + <string name="stats_engine_temp">المحرك %1$s °C</string> + <string name="stats_oil_temp">الزيت %1$s °C</string> + <string name="stats_power">موزّع الطاقة</string> + <string name="stats_fuel_t">الوقود، t</string> + <string name="stats_fuel_main">الرئيسي %1$s t</string> + <string name="stats_fuel_reserve">الاحتياطي %1$s t</string> + <string name="stats_tap_hint">انقر على الشريط العلوي أو لوحة العدادات لتغيير نمطها.</string> + <string name="bottom_telemetry_send_title">إرسال بيانات لوحة العدادات</string> + <string name="bottom_telemetry_send_auto">تلقائي</string> + <string name="bottom_telemetry_send_auto_hint">يفعّلها لكل لعبة مدرجة هنا، بما في ذلك الألعاب التي يُعثر عليها لاحقًا. تبقى الألعاب التي توقفها متوقفة.</string> + <string name="bottom_telemetry_send_note">يغيّر هذا إعداد إخراج البيانات الخاص باللعبة نفسها. يسري في المرة التالية التي تبدأ فيها اللعبة، وإيقافه يعيد الإعداد القديم.</string> + <string name="bottom_telemetry_send_close">أغلق %1$s لتغيير هذا.</string> + <string name="bottom_telemetry_send_failed">تعذّر تغيير إعدادات %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: فعِّل %2$s في إعدادات اللعبة باستخدام IP 127.0.0.1 والمنفذ %3$d.</string> + <string name="bottom_shots_where">تُحفظ في Pictures/DroidDeck. تظهر لقطات شاشة Steam هنا أيضًا.</string> + <string name="bottom_shots_take">التقاط لقطة شاشة</string> + <string name="bottom_shots_saved">تم حفظ لقطة الشاشة.</string> + <string name="bottom_shots_failed">تعذّر التقاط لقطة شاشة.</string> + <string name="bottom_shots_none">لا توجد لقطات شاشة بعد.</string> + <string name="bottom_page_chat">الدردشة والصوت</string> + <string name="bottom_chat_why">اقرأ دردشة Steam وردّ عليها هنا بينما تستمر اللعبة على الشاشة الرئيسية. تستخدم الحساب المسجَّل دخوله في Steam.</string> + <string name="bottom_chat_not_signed_in">لا يملك Steam بعد تسجيل دخول على الويب لمشاركته، لذا سجّل الدخول هنا مرة واحدة.</string> + <string name="bottom_chat_stopped">أغلق Android صفحة الدردشة بينما كان DroidDeck في الخلفية. ستُفتح مجددًا عند عودتك إلى DroidDeck.</string> + <string name="bottom_chat_open">فتح Steam Chat</string> + <string name="bottom_chat_close">إغلاق الدردشة</string> + <string name="bottom_chat_mic_on">الميكروفون مفعّل</string> + <string name="bottom_chat_mic_off">الميكروفون متوقف</string> + <string name="bottom_chat_mic_unavailable">الميكروفون متوقف لهذه اللعبة. للتحدث، فعِّل «الميكروفون» في إعدادات Steam في DroidDeck (الصوت) وابدأ اللعبة من جديد.</string> + <string name="bottom_chat_volume">مستوى الصوت %1$d%%</string> + <string name="bottom_page_telemetry">إحصاءات داخل اللعبة</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">البطارية</string> + <string name="bottom_telemetry_lap">اللفة</string> + <string name="bottom_telemetry_position">المركز</string> + <string name="bottom_telemetry_this_lap">اللفة الحالية</string> + <string name="bottom_telemetry_last_lap">اللفة السابقة</string> + <string name="bottom_telemetry_fuel">الوقود</string> + <string name="bottom_telemetry_cargo">الحمولة</string> + <string name="bottom_telemetry_pips">توزيع الطاقة SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">الوضع القانوني</string> + <string name="bottom_telemetry_balance">الرصيد</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">فعِّل إخراج البيانات في لعبة السباق (يُسمّى غالبًا القياس عن بُعد أو UDP) لرؤية لوحة عدادات حية هنا. تبقى البيانات على هذا الجهاز.</string> + <string name="bottom_telemetry_unknown_format">يستقبل المنفذ %1$d بيانات (%2$d حزمة بحجم %3$d بايت)، لكن بتنسيق لا تستطيع هذه الصفحة قراءته بعد.</string> + <string name="bottom_telemetry_port_busy">يستخدم برنامج آخر المنفذ %1$s بالفعل، لذا لا يمكن عرض تلك اللعبة هنا.</string> <string name="rtinst_removing">جارٍ إزالة بيئة تشغيل Linux</string> <plurals name="rtinst_removing_entries"> @@ -1708,6 +1985,7 @@ <string name="flatpakmgr_not_ready">أعِدّ Flatpak أولاً</string> <string name="flatpakmgr_starting">جارٍ البدء</string> <string name="flatpakmgr_exit_status">خرج Flatpak بالحالة %1$d</string> + <string name="flatpakmgr_wrong_arch">تم بناء %1$s لمعمارية %2$s، ولا يستطيع DroidDeck تشغيلها. تحتاج تطبيقات Flatpak هنا إلى إصدار لمعمارية ARM64 أو x86_64.</string> <string name="flatpakmgr_installing">جارٍ تثبيت %1$s</string> <string name="flatpakmgr_updating">جارٍ تحديث %1$s</string> <string name="flatpakmgr_removing">جارٍ إزالة %1$s</string> @@ -1801,6 +2079,7 @@ <string name="adbpair_applying">جارٍ تطبيق الإعداد…</string> <string name="adbpair_command_failed">فشل أمر تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_channel_name">إعداد تصحيح الأخطاء اللاسلكي</string> + <string name="adbpair_progress_channel_name">تقدّم إعداد تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_channel_description">يطلب رمز إقران تصحيح الأخطاء اللاسلكي أثناء فتح الإعدادات</string> <string name="adbpair_title_pair">إقران تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_waiting_text">فعِّل تصحيح الأخطاء اللاسلكي، ثم اضغط على «إقران الجهاز برمز الإقران».</string> @@ -1909,6 +2188,7 @@ <string name="gpuinfo_not_adreno">وحدة GPU ليست من نوع Adreno</string> <string name="gpuinfo_supported">مدعوم</string> <string name="gpuinfo_experimental">تجريبي: برامج تشغيله إصدارات اختبارية</string> + <string name="gpuinfo_a850_experimental">دعم تجريبي لـ Adreno 850: يتطلب برامج تشغيل تجريبية متوافقة للعرض والألعاب، ولم يُتحقَّق منه على هذا الجهاز</string> <string name="gpuinfo_below_tested">أقل من العتاد المُختبَر (Adreno 725 وأحدث): قد لا يعمل</string> <string name="gpuinfo_unsupported">غير مدعوم: يحتاج DroidDeck إلى وحدة GPU من نوع Adreno (Snapdragon)</string> @@ -2002,10 +2282,10 @@ <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> + <string name="display_follow_screen_scaled">مقياس %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">إظهار تفاصيل الجهاز</string> <string name="device_info_hide">إخفاء تفاصيل الجهاز</string> @@ -2020,7 +2300,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> @@ -2034,11 +2313,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> @@ -2056,9 +2333,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> @@ -2077,12 +2362,43 @@ <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> <string name="stores_sort">ترتيب</string> + <string name="setup_rail_labels">تسميات الشريط الجانبي</string> + <string name="setup_rail_labels_hint">إظهار الأسماء أسفل رموز الشريط الجانبي. أوقفه للحصول على شريط جانبي أنحف.</string> + <string name="library_display">العرض</string> + <string name="library_display_larger">بطاقات أكبر</string> + <string name="library_display_smaller">بطاقات أصغر</string> + <string name="library_display_title">إظهار العنوان</string> + <string name="library_display_size">إظهار الحجم</string> <string name="stores_sort_last_played">لُعب مؤخرًا</string> <string name="stores_sort_recently_installed">ثُبت مؤخرًا</string> <string name="stores_sort_title_asc">العنوان أ–ي</string> @@ -2209,6 +2525,9 @@ <string name="stores_download_manager">مدير التنزيلات</string> <string name="stores_parallel">عدد التنزيلات المتزامنة</string> <string name="stores_install_where">التثبيت في</string> + <string name="stores_install_language">لغة اللعبة</string> + <string name="stores_install_language_hint">يثبّت GOG وEpic هذه اللغة. خيار «النظام» يتبع لغة التطبيق.</string> + <string name="stores_install_language_system">النظام</string> <string name="stores_install_title">تثبيت %1$s:</string> <string name="stores_target_internal">التخزين الداخلي</string> <string name="stores_target_free">%1$s متاحة</string> @@ -2231,6 +2550,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> @@ -2246,6 +2566,9 @@ <string name="edit_target">الهدف</string> <string name="edit_start_in">بدء التشغيل في</string> <string name="edit_launch_options">خيارات التشغيل</string> + <string name="edit_launch_options_steam_hint">مشتركة مع خصائص Steam: أي تغيير في أحدهما يظهر في كليهما.</string> + <string name="edit_launch_options_not_saved">تعذّر حفظ خيارات التشغيل في Steam. حاول مرة أخرى.</string> + <string name="edit_launch_options_desktop">قد يكون Steam مفتوحًا في جلسة سطح المكتب. غيّر خيارات التشغيل من خصائصه، أو أغلق الجلسة أولًا.</string> <string name="edit_artwork">الصور الفنية</string> <string name="edit_other_exe">ملف exe آخر…</string> <string name="edit_remove">إزالة</string> @@ -2381,6 +2704,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="flathub_eyebrow">تطبيقات Linux</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">تطبيقات سطح المكتب لسطح مكتب Linux، تُفتح من سطح المكتب.</string> @@ -2529,6 +2853,22 @@ <string name="glasses_tracking_flat_hint">يُبقي الوضع «تلقائي» لعبة 2D هذه ثابتة أمامك. اختر «شاشة افتراضية» في «العرض» لاستخدام تتبّع الرأس.</string> <string name="glasses_tracking_sbs_hint">يُطبَّق تتبّع الرأس على الشاشة الافتراضية أو على لعبة SteamVR قيد التشغيل.</string> <string name="glasses_hardware">الجهاز</string> + <string name="vr_controllers_tab">وحدات التحكم</string> + <string name="vr_controllers_group">وحدات تحكم SteamVR</string> + <string name="vr_controllers_emulate">ذراع الألعاب في VR</string> + <string name="vr_controllers_emulate_hint">يدا VR اللتان تؤدي وحدة التحكم دورهما. تُطبَّق التغييرات فورًا، حتى أثناء تشغيل SteamVR. تظل وحدات Joy-Con والأيدي المتتبَّعة تتولى جانبها.</string> + <string name="vr_controllers_off">ذراع ألعاب عادية</string> + <string name="vr_controllers_index">وحدات تحكم Valve Index</string> + <string name="vr_controllers_touch">وحدات تحكم Meta Quest 3</string> + <string name="vr_controllers_vive">عصيّ HTC Vive</string> + <string name="vr_controllers_sticks">تبدأ العصا بـ</string> + <string name="vr_controllers_sticks_hint">اضغط على العصوين معًا أثناء VR للتبديل.</string> + <string name="vr_controllers_sticks_game">تحريكك داخل اللعبة</string> + <string name="vr_controllers_sticks_hands">تحريك اليدين</string> + <string name="vr_controllers_buttons">الأزرار</string> + <string name="vr_controllers_buttons_stick">الزنادات زنادات، والأزرار الكتفية للإمساك، وA/B وX/Y هي أزرار الوجه لكل يد، والنقر على العصا ينقر عصا الإبهام، وGuide يفتح قائمة SteamVR. أعلى وأسفل لوحة الاتجاهات يقرّبان اليدين أو يبعدانهما.</string> + <string name="vr_controllers_buttons_vive">العصوان لوحتا لمس، والضغط عليهما بـ A/X أو بالنقر على العصا. الزنادات زنادات، والأزرار الكتفية للإمساك، وStart وSelect للقائمة، وGuide يفتح قائمة SteamVR.</string> + <string name="vr_controllers_buttons_off">بلا أيدٍ في VR. تتلقّى الألعاب التي تدعم ذراع الألعاب، وقائمة SteamVR، وحدة التحكم كالمعتاد.</string> <string name="glasses_brightness">السطوع</string> <string name="glasses_volume">مستوى الصوت</string> <string name="glasses_sunblock">حجب الشمس</string> @@ -2586,6 +2926,12 @@ <string name="hand_camera_placement">وضع الكاميرا</string> <string name="hand_camera_placement_hint">تحقّق من أن الكاميرا تراك قبل اللعب.</string> <string name="hand_camera_check">تحقّق</string> + <string name="tracking_pack_title">تنزيل تتبّع اليدين</string> + <string name="tracking_pack_hint">يتطلب تتبّع اليدين تنزيلًا لمرة واحدة بحجم %1$s.</string> + <string name="tracking_pack_download">تنزيل</string> + <string name="tracking_pack_retry">إعادة المحاولة</string> + <string name="tracking_pack_downloading">جارٍ تنزيل تتبّع اليدين… %1$d%%</string> + <string name="tracking_pack_failed">تعذّر تنزيل تتبّع اليدين. تحقّق من اتصالك وحاول مرة أخرى.</string> <string name="hand_camera_check_title">وضع الكاميرا</string> <string name="hand_camera_how_rear">ضع الجهاز واقفًا على بُعد 1.5 إلى 2 متر تقريبًا بارتفاع الصدر، مع توجيه الكاميرا الخلفية نحوك. ثم ادخل إلى مجال الرؤية ويداك ممدودتان.</string> <string name="hand_camera_how_front">ضع الجهاز واقفًا على بُعد 1.5 إلى 2 متر تقريبًا بارتفاع الصدر، مع توجيه الشاشة نحوك. ثم ادخل إلى مجال الرؤية ويداك ممدودتان.</string> @@ -2657,6 +3003,21 @@ <string name="storage_safe_hint">بيئات تشغيل غير مستخدمة وبقايا وسجلات قديمة</string> <string name="storage_clean_up">جارٍ التنظيف…</string> <string name="storage_session_running">أوقف الجلسة لتنظيف التخزين أو حذف شيء. تبقى الأحجام ظاهرة.</string> + <string name="storage_default_group">موقع التثبيت</string> + <string name="storage_default_title">التخزين الافتراضي</string> + <string name="storage_default_hint">تُثبَّت ألعاب المتاجر الجديدة في الموقع المحدد. تبقى الألعاب الحالية في مكانها. تحتفظ مكتبات Steam بإعدادها الخاص.</string> + <string name="storage_default_ask">السؤال في كل مرة</string> + <string name="storage_default_ask_detail">اختر وجهة لكل تثبيت</string> + <string name="storage_default_internal">مساحة التخزين الداخلية</string> + <string name="storage_default_external">مساحة التخزين الخارجية</string> + <string name="storage_default_external_detail">%1$s · %2$s متاحة</string> + <string name="storage_default_external_missing">غير متصل</string> + <string name="storage_default_folder">مجلد · %1$s</string> + <string name="storage_default_folder_free">%1$s متاحة</string> + <string name="storage_default_folder_missing">غير متصل</string> + <string name="storage_default_choose_folder">اختيار مجلد…</string> + <string name="storage_default_choose_folder_detail">استخدم أي مجلد على بطاقة SD أو محرك USB</string> + <string name="storage_default_note">توضع الألعاب في مجلد Games داخل الموقع المحدد. لا تُنقل الألعاب الحالية.</string> <string name="storage_where">إلى أين يذهب</string> <string name="storage_games">ألعاب Steam</string> <string name="storage_game_data">بيانات الألعاب</string> @@ -2806,6 +3167,9 @@ <string name="storage_data_installed">الألعاب المثبَّتة</string> <string name="storage_data_parts">البادئة %1$s · الشيدرات %2$s · الورشة %3$s</string> <string name="storage_clear_shaders">مسح الشيدرات</string> + <string name="storage_reset_prefix">إعادة ضبط البادئة</string> + <string name="storage_reset_prefix_title">هل تريد إعادة ضبط بادئة %1$s؟</string> + <string name="storage_reset_prefix_confirm">يحذف بادئة Wine الخاصة بها (%1$s) في %2$s ويعيد إنشاءها عند التشغيل التالي. تُفقد عمليات الحفظ والإعدادات والحزم القابلة لإعادة التوزيع المثبَّتة داخلها، وتبقى حفظات Steam Cloud في حسابك.</string> <string name="storage_data_leftovers">ألعاب محذوفة</string> <string name="storage_steam_app">تطبيق Steam %1$d</string> <string name="storage_leftover_unsure_detail">البادئة تحتوي على ملفات، ربما حفظات محلية</string> @@ -3115,4 +3479,310 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">المزامنة عبر Syncthing</string> + <string name="sync_enable_hint">هذا تطبيق لـ Syncthing مبني على Syncthing-Fork، يتيح لك مزامنة الملفات الموجودة في نظام الملفات الداخلي لـ DroidDeck مع نسخ Syncthing أخرى. ينطبق ذلك فقط على الملفات التي تخزّنها داخل نظام الملفات الداخلي لـ DroidDeck.</string> + <string name="sync_missing">هذا الإصدار لا يتضمن Syncthing.</string> + <string name="sync_starting">جارٍ تشغيل Syncthing</string> + <string name="sync_status_starting">جارٍ البدء</string> + <string name="sync_status_up_to_date">محدَّث</string> + <string name="sync_status_syncing">جارٍ المزامنة</string> + <string name="sync_status_paused">متوقف مؤقتًا</string> + <string name="sync_status_pausing">جارٍ الإيقاف المؤقت</string> + <string name="sync_status_resuming">جارٍ الاستئناف</string> + <string name="sync_status_attention">يحتاج إلى انتباه</string> + <string name="sync_status_failed">توقف Syncthing</string> + <string name="sync_failed_retry">إعادة المحاولة</string> + <string name="sync_paused_wifi">متوقف مؤقتًا حتى الاتصال بشبكة Wi-Fi</string> + <string name="sync_paused_game">متوقف مؤقتًا أثناء اللعب</string> + <string name="sync_summary">المجلدات: %1$d · الأجهزة المتصلة: %2$d من %3$d</string> + <string name="sync_left">المتبقي: %1$s</string> + <string name="sync_open_web_ui">فتح واجهة الويب</string> + <string name="sync_pause">إيقاف مؤقت</string> + <string name="sync_resume">استئناف</string> + <string name="sync_running">قيد التشغيل</string> + <string name="sync_running_hint">أوقف هذا الخيار لإيقاف Syncthing تمامًا.</string> + <string name="sync_this_device">هذا الجهاز</string> + <string name="sync_device_id">معرّف الجهاز</string> + <string name="sync_show_qr">عرض رمز QR</string> + <string name="sync_advanced">متقدم</string> + <string name="sync_advanced_hint">المنافذ، وقت التشغيل، إعادة التعيين</string> + <string name="sync_open">فتح</string> + <string name="sync_waiting">بانتظارك</string> + <string name="sync_pending_device">يريد %1$s الاتصال</string> + <string name="sync_pending_folder">يريد %1$s مشاركة «%2$s»</string> + <string name="sync_pending_folder_hint">اقبل لاختيار مكان حفظه في DroidDeck.</string> + <string name="sync_review">المراجعة في واجهة الويب</string> + <string name="sync_folders">المجلدات</string> + <string name="sync_no_folders">لا توجد مجلدات بعد.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">محدَّث</string> + <string name="sync_folder_syncing">جارٍ المزامنة %1$d%%</string> + <string name="sync_folder_scanning">جارٍ الفحص</string> + <string name="sync_folder_paused">متوقف مؤقتًا</string> + <string name="sync_folder_out_of_sync">غير متزامن</string> + <string name="sync_folder_errors">تعذّرت مزامنة ملفات: %1$d</string> + <string name="sync_folder_blocked">محظور</string> + <string name="sync_folder_blocked_hint">يقع هذا المجلد خارج مساحة تخزين DroidDeck، لذلك أوقفه DroidDeck مؤقتًا. لمزامنة مجلدات خارج DroidDeck، استخدم تطبيق Syncthing-Fork.</string> + <string name="sync_remove_folder">إزالة من Syncthing</string> + <string name="sync_remove_folder_hint">لا تؤدي إزالته إلى حذف أي ملفات.</string> + <string name="sync_devices">الأجهزة</string> + <string name="sync_no_devices">لا توجد أجهزة بعد.</string> + <string name="sync_connected">متصل</string> + <string name="sync_offline">غير متصل</string> + <string name="sync_last_seen">آخر ظهور %1$s</string> + <string name="sync_device_id_title">معرّف هذا الجهاز</string> + <string name="sync_device_id_hint">على جهازك الآخر، أضف جهازًا في Syncthing وامسح هذا الرمز أو الصق المعرّف. ثم اقبله هنا في واجهة الويب.</string> + <string name="sync_copy">نسخ</string> + <string name="sync_share">مشاركة</string> + <string name="sync_done">تم</string> + <string name="sync_off_title">هل تريد إيقاف Syncthing؟</string> + <string name="sync_off_body">سيتوقف Syncthing الآن ويظل متوقفًا إلى أن تعيد تشغيله. تبقى الملفات المتزامنة في مكانها.</string> + <string name="sync_off_forget">حذف إعدادات Syncthing أيضًا</string> + <string name="sync_off_forget_hint">يزيل معرّف هذا الجهاز والمجلدات والأجهزة. عند تشغيله مجددًا يبدأ من جديد.</string> + <string name="sync_turn_off">إيقاف</string> + <string name="sync_ports">المنافذ</string> + <string name="sync_port_sync">المزامنة</string> + <string name="sync_port_discovery">الاكتشاف المحلي</string> + <string name="sync_repick">اختيار منافذ جديدة</string> + <string name="sync_repick_hint">يُعاد التحقق منها عند كل تشغيل.</string> + <string name="sync_repick_button">إعادة الاختيار</string> + <string name="sync_reset_group">إعادة التعيين</string> + <string name="sync_api_key">مفتاح API</string> + <string name="sync_regenerate">إعادة الإنشاء</string> + <string name="sync_reset">إعادة تعيين Syncthing</string> + <string name="sync_reset_hint">معرّف جهاز جديد، وتُزال المجلدات والأجهزة. يُحتفظ بالملفات الموجودة في مساحة تخزين DroidDeck.</string> + <string name="sync_reset_button">إعادة التعيين</string> + <string name="sync_reset_confirm_title">هل تريد إعادة تعيين Syncthing؟</string> + <string name="sync_running_group">التشغيل</string> + <string name="sync_run">التشغيل</string> + <string name="sync_run_open">أثناء فتح DroidDeck</string> + <string name="sync_run_background">في الخلفية</string> + <string name="sync_wifi_only">عبر Wi-Fi فقط</string> + <string name="sync_pause_games">إيقاف مؤقت أثناء الألعاب</string> + <string name="sync_logs">السجلات</string> + <string name="sync_logs_hint">مخرجات Syncthing لهذه الجلسة</string> + <string name="sync_logs_share">مشاركة</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">اضبط بيئة تشغيل Linux أولًا.</string> + <string name="sync_accept">قبول</string> + <string name="sync_accept_title">حفظ «%1$s» في</string> + <string name="sync_add_folder">إضافة مجلد</string> + <string name="sync_add_folder_hint">مزامنة مجلد في مساحة تخزين DroidDeck</string> + <string name="sync_choose">اختيار</string> + <string name="sync_add">إضافة</string> + <string name="sync_add_failed">تعذّرت إضافة المجلد.</string> + <string name="sync_share_with">المشاركة مع</string> + <string name="sync_share_none">لا توجد أجهزة بعد. يمكنك مشاركة هذا المجلد من واجهة الويب لاحقًا.</string> + <string name="sync_use_folder">استخدام هذا المجلد</string> + <string name="sync_new_folder">مجلد جديد</string> + <string name="sync_location_home">المجلد الرئيسي للحاوية</string> + <string name="sync_location_sync">مجلد Sync</string> + <string name="sync_location_shared">مساحة تخزين DroidDeck المشتركة</string> + <string name="sync_location_card">DroidDeck على %1$s</string> + <string name="sync_location_app">بيانات تطبيق DroidDeck</string> + <string name="sync_web_path_locked">تُحفظ المجلدات الجديدة في مجلد Sync الخاص بـ DroidDeck. لمزامنة مجلد آخر في DroidDeck، استخدم «إضافة مجلد» في علامة تبويب Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">إعادة التحميل</string> + <string name="sync_not_running">Syncthing لا يعمل.</string> + <string name="session_end_steam_sigill">توقّف Steam بسبب تعليمة غير صالحة (SIGILL). قد تكون مشكلة توافق في تعليمات CPU أو تعطّلًا في العميل. شارك السجلات مع تفاصيل جهازك.</string> + <string name="session_end_steam_try_x64">يمكنك تجربة إعدادات Steam → عميل Steam → x86-64 (تجريبي). يتطلب تنزيلًا إضافيًا وقد يعمل بشكل أبطأ.</string> + <string name="session_end_vulkan_device">تعذّر على برنامج تشغيل رسومات Linux العثور على جهاز Vulkan صالح للاستخدام. تحقّق من أن برنامج تشغيل GPU المحدد لـ Linux يدعم هذا الـ GPU.</string> + <string name="session_end_gpu_unsupported">لا يمكن بدء هذه الجلسة لأن هذا الـ GPU ليس له برنامج تشغيل Vulkan متوافق لـ Linux في الإعداد الحالي. لا يمكن لبرامج تشغيل Adreno Turnip تفعيل دعم وحدات MediaTek/Mali GPU.</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_resources_browser">يُفتح في متصفحك</string> + <string name="game_resource_guides">الأدلة</string> + <string name="game_resource_protondb_detail">تقارير توافق Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">للألعاب التي تُحفظ بياناتها في حساب Steam الخاص بك</string> + <string name="game_resource_search">البحث في الويب</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="library_filter">تصفية</string> + <string name="library_filter_installed">المثبَّتة فقط</string> + <string name="library_filter_all_owned">كل الألعاب المملوكة</string> + <string name="library_no_installed_matches">لا توجد ألعاب مثبَّتة تطابق عوامل التصفية هذه.</string> + <string name="library_browse_owned">تصفّح الألعاب المملوكة</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="stores_itch_updates_found">التحديثات المتاحة: %1$d</string> + <string name="stores_itch_update_replaced">استبدل المطوّر هذا الإصدار بـ %1$s. هل تريد التحديث إليه؟</string> + <string name="xbox_filter_cloud">سحابية</string> + <string name="stores_xbox_cloud_settings">إعدادات السحابة</string> + <string name="integration_title">تكامل Steam</string> + <string name="integration_count">%1$d من %2$d مفعّلة</string> + <string name="integration_set_up">إعداد</string> + <string name="integration_location">الموقع الجغرافي</string> + <string name="integration_app_info">معلومات التطبيق</string> + <string name="integration_wifi">أسماء شبكات Wi-Fi</string> + <string name="integration_brightness">السطوع</string> + <string name="integration_home">DroidDeck كشاشة رئيسية</string> + <string name="integration_shortcuts">اختصارات زر الشاشة الرئيسية</string> + <string name="integration_wifi_hint">إظهار الشبكات في Steam · يتطلب الوصول إلى الموقع الجغرافي، دون تتبّع أبدًا</string> + <string name="integration_wifi_on">تظهر الشبكات في Steam</string> + <string name="integration_wifi_location_off">الموقع الجغرافي متوقف</string> + <string name="integration_wifi_denied">رُفض الوصول إلى الموقع الجغرافي · اسمح به في معلومات التطبيق</string> + <string name="integration_brightness_hint">شريط التمرير في Steam يضبط سطوع الشاشة</string> + <string name="integration_home_hint">زر الشاشة الرئيسية يفتح قائمة Steam أثناء الجلسة</string> + <string name="integration_shortcuts_hint">اضغط مطوّلًا على زر الشاشة الرئيسية لاختصارات Steam Guide</string> + <string name="integration_shortcuts_needs_home">يتطلب DroidDeck كشاشة رئيسية</string> + <string name="integration_shortcuts_maybe_restricted">غير متاح في Android؟ معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة</string> + <string name="integration_shortcuts_restricted">محظور من Android · معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة</string> + <string name="integration_shortcuts_service">زر الشاشة الرئيسية في DroidDeck</string> + <string name="integration_shortcuts_service_description">يمرّر ضغطات زر الشاشة الرئيسية إلى Steam Guide عندما تكون جلسة Steam في المقدمة ويكون DroidDeck تطبيق الشاشة الرئيسية الافتراضي. لا يقرأ محتوى الشاشة.</string> + <string name="integration_brightness_needed">فعّل «السطوع» من الإعداد → تكامل Steam</string> + <string name="apps_search_hint">البحث في التطبيقات</string> + <string name="apps_no_match">لا توجد تطبيقات تطابق ”%1$s“.</string> + <string name="apps_add_widget">إضافة أداة</string> + <string name="apps_widgets_loading">جارٍ تحميل الأدوات…</string> + <string name="apps_widgets_none">لا توجد تطبيقات على هذا الجهاز توفّر أدوات.</string> + <string name="apps_widget_wider">أعرض</string> + <string name="apps_widget_narrower">أضيق</string> + <string name="apps_widget_taller">أطول</string> + <string name="apps_widget_shorter">أقصر</string> + <string name="apps_widget_move_earlier">نقل إلى الأمام</string> + <string name="apps_widget_move_later">نقل إلى الخلف</string> + <string name="apps_widget_configure">إعدادات الأداة</string> + <string name="apps_widget_remove">إزالة الأداة</string> + <string name="apps_add_to_folder">إضافة إلى مجلد</string> + <string name="apps_new_folder">مجلد جديد</string> + <string name="apps_remove_from_folder">إزالة من المجلد</string> + <string name="apps_app_info">معلومات التطبيق</string> + <string name="apps_uninstall">إلغاء التثبيت</string> + <string name="apps_folder_rename">إعادة التسمية</string> + <string name="apps_folder_ungroup">فك التجميع</string> + <string name="apps_folder_default">مجلد</string> + <string name="apps_folder_name">اسم المجلد</string> + <string name="apps_filter">عرض</string> + <string name="apps_filter_all">كل التطبيقات</string> + <string name="apps_filter_games">الألعاب</string> + <string name="apps_filter_downloaded">المنزّلة</string> + <string name="apps_filter_system">النظام</string> + <string name="apps_filter_hidden">المخفية</string> + <string name="apps_hide">إخفاء</string> + <string name="apps_unhide">إظهار في التطبيقات</string> + <string name="apps_shortcut_remove">إزالة الاختصار</string> + <string name="apps_pin_title">إضافة إلى التطبيقات</string> + <string name="apps_pin_add">إضافة</string> + <string name="apps_hidden_none">لا توجد تطبيقات مخفية.</string> + <string name="apps_sort_name_asc">الاسم أ–ي</string> + <string name="apps_sort_name_desc">الاسم ي–أ</string> + <string name="apps_sort_installed">المثبّتة مؤخرًا</string> + <string name="apps_sort_updated">المحدّثة مؤخرًا</string> + <plurals name="apps_count"> + <item quantity="zero">%d تطبيق</item> + <item quantity="one">تطبيق واحد</item> + <item quantity="two">تطبيقان</item> + <item quantity="few">%d تطبيقات</item> + <item quantity="many">%d تطبيقًا</item> + <item quantity="other">%d تطبيق</item> + </plurals> + <string name="desktop_restore_title">جارٍ استعادة برامجك</string> + <string name="desktop_restore_body">إعادة تثبيت التطبيقات التي أضفتها بعد تحديث DroidDeck.</string> + <string name="desktop_restore_done_title">تمت استعادة البرامج</string> + <string name="desktop_restore_done_body">التطبيقات التي أضفتها مثبتة مرة أخرى.</string> + <string name="desktop_restore_failed_title">تعذّرت استعادة بعض البرامج</string> + <string name="desktop_restore_failed_body">راجع ‎~/.cache/droiddeck/apt-restore.log ثم جرّب sudo apt install في Konsole.</string> + <string name="gog_full_files">التحسينات الأصلية غير متاحة. يتضمن التنزيل ملفات بديلة كاملة.</string> + <string name="gog_recover">التحقق من نتيجة التصحيح</string> + <string name="slow_usb_title">اتصال USB بطيء</string> + <string name="slow_usb_cable">%1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث)، لذا ستُحمَّل الألعاب عليه ببطء. استخدم كابل USB 3 بسرعة 5 جيجابت/ث أو أكثر، أو جرّب قلب قابس USB-C، أو استخدم محركًا أسرع.</string> + <string name="slow_usb_port">%1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث). لا يدعم منفذ USB في هذا الجهاز سرعة أعلى، لذا ستُحمَّل الألعاب عليه ببطء. قد تكون الذاكرة الداخلية أو بطاقة microSD أسرع.</string> + <string name="slow_usb_never">عدم الإظهار مرة أخرى</string> + <string name="slow_usb_dismiss">إغلاق</string> + <string name="steam_import_title">هل تريد إعادة تشغيل Steam لإضافة ألعابك؟</string> + <string name="steam_import_body">يمكن لـ Steam إدراج هذه الألعاب التي تملكها كألعاب مثبتة: %1$s. يجب إعادة تشغيله لإظهارها. أعد التشغيل الآن، أو ستُضاف في المرة القادمة التي يبدأ فيها Steam.</string> + <string name="steam_import_names_more">%1$s و%2$d أخرى</string> + <string name="steam_import_now">إعادة التشغيل الآن</string> + <string name="steam_import_later">لاحقًا</string> + <string name="gog_maintenance">إدارة تثبيت GOG</string> + <string name="gog_check">التحقق من وجود تحديثات</string> + <string name="gog_repair">التحقق/الإصلاح</string> + <string name="gog_patches">تصحيحات بلا اتصال</string> + <string name="gog_refresh">تنزيل المثبِّت الكامل بلا اتصال</string> + <string name="gog_update">التحديث إلى %1$s</string> + <string name="gog_resume">استئناف صيانة GOG</string> + <string name="gog_open_patch">فتح مثبِّت التصحيح</string> + <string name="gog_patch_in_session">أكمِل مثبِّت التصحيح أو ألغِه في جلسة Linux.</string> + <string name="gog_patch_requirements">اختر تصحيحًا يناسب الإصدار المثبَّت ولغتك. قد لا تظهر كل إصدارات المصدر المدعومة.</string> + <string name="gog_no_patches">لا تتوفّر لدى GOG تصحيحات Windows مستقلة لهذه اللعبة.</string> + <string name="gog_managed_files">قد تُستبدل ملفات اللعبة المعدَّلة.</string> + <string name="gog_patch_installer_note">يُفتح المثبِّت في جلسة Linux الخاصة بك.</string> + <string name="gog_download_label">التنزيل</string> + <string name="gog_space_label">مساحة إضافية</string> + <string name="gog_space_estimate_label">المساحة التقديرية</string> + <string name="gog_repair_action">إصلاح الملفات</string> + <string name="gog_refresh_action">تحديث التثبيت</string> + <string name="gog_select_patch">اختيار</string> + <string name="setup_all_files">الوصول إلى جميع الملفات</string> + <string name="setup_local_network">الشبكة المحلية</string> + <string name="libraries_title">مكتبات Steam إضافية</string> + <string name="libraries_hint">مجلدات يمكن لـ Steam تثبيت الألعاب فيها وتشغيلها منها، ولكل منها اسم مستقل. إزالتها تبقي الألعاب على القرص.</string> + <string name="libraries_add">إضافة مكتبة</string> + <string name="libraries_rename_title">اسم المكتبة</string> + <string name="libraries_pick">اختر مجلدًا للمكتبة</string> + <string name="libraries_full">بحد أقصى %1$d مكتبات إضافية</string> + <string name="libraries_overlap">هذا المجلد مكتبة بالفعل أو موجود داخل مكتبة</string> + <string name="libraries_missing">%1$s · غير متاحة</string> + <string name="libraries_applies_next">يسري من جلسة Steam التالية</string> + <string name="bottom_desktop_start">تشغيل سطح المكتب</string> + <string name="bottom_desktop_mode_touch">لمس مباشر</string> + <string name="bottom_desktop_trackpad">لوحة لمس. انقر للتبديل إلى اللمس المباشر</string> + <string name="bottom_desktop_direct_touch">لمس مباشر. انقر للتبديل إلى لوحة اللمس</string> + <string name="bottom_desktop_starting">جارٍ تشغيل سطح مكتب KDE…</string> + <string name="bottom_desktop_ended">أُغلق سطح المكتب.</string> + <string name="bottom_desktop_failed">تعذر تشغيل سطح المكتب. سجلاته في مجلد bottom-desktop لهذه الجلسة.</string> + <string name="bottom_desktop_off">سطح المكتب مغلق.</string> + <string name="libraries_rename">إعادة التسمية</string> + <string name="second_mode_desktop">سطح المكتب</string> + <string name="bottom_desktop_mode_trackpad">لوحة اللمس</string> + <string name="bottom_desktop_title">سطح المكتب · %1$s</string> </resources> diff --git a/app/src/main/res/values-b+es+419/gestures.xml b/app/src/main/res/values-b+es+419/gestures.xml index 4f5f49779..d65a5db54 100644 --- a/app/src/main/res/values-b+es+419/gestures.xml +++ b/app/src/main/res/values-b+es+419/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestos</string> <string name="gesture_settings">Ajustes de gestos táctiles</string> - <string name="gesture_settings_hint">Personaliza los gestos de ratón y teclado. Selecciona Gestos como modo táctil para usarlos.</string> <string name="gesture_tap">Toque</string> <string name="gesture_drag">Arrastre con un dedo</string> <string name="gesture_long_press">Pulsación prolongada</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Pulsación sostenida con tres dedos</string> <string name="gesture_pinch">Pellizcar para ampliar</string> <string name="gesture_hold_button">Mantener el botón pulsado</string> + <string name="gesture_hold_left">Mantener pulsado el botón izquierdo</string> + <string name="gesture_hold_right">Mantener pulsado el botón derecho</string> <string name="gesture_click_once">Hacer clic una vez</string> <string name="gesture_hold_delay">Tiempo de pulsación sostenida</string> <string name="gesture_double_delay">Intervalo de doble toque</string> diff --git a/app/src/main/res/values-b+es+419/shortcuts.xml b/app/src/main/res/values-b+es+419/shortcuts.xml new file mode 100644 index 000000000..7b643864a --- /dev/null +++ b/app/src/main/res/values-b+es+419/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Atajos de botones físicos</string> + <string name="shortcuts_dd_menu">Menú de DroidDeck</string> + <string name="shortcuts_capture">Asignar: %1$s</string> + <string name="shortcuts_press">Presiona y suelta un botón. La asignación se guarda automáticamente.</string> + <string name="shortcuts_release">Suelta el botón para continuar.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Este botón ya está asignado a: %1$s</string> + <string name="shortcuts_save">Reasignar</string> + <string name="shortcuts_retry">Probar otro botón</string> + <string name="shortcuts_limitations">El botón Inicio y algunos botones adicionales pueden no estar disponibles.</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 16db21a9b..cf0627e23 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opciones de VKD3D para D3D12. nodxr desactiva el trazado de rayos; úsalo solo en un juego que lo necesite.</string> <string name="game_env_proton_log">Pon 1 para obtener un registro de diagnóstico de Proton. El registro puede reducir el rendimiento y usar almacenamiento.</string> <string name="game_env_wined3d">Pon 1 para usar WineD3D basado en OpenGL en lugar de DXVK, para pruebas de compatibilidad con D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 y los juegos que se ejecutan con WineD3D. Vulkan evita la ruta de OpenGL sobre Zink y es mucho más rápido en juegos antiguos de DirectDraw y Direct3D 7 en Adreno.</string> + <string name="game_env_dxvk_d3d8">Pon 1 para ejecutar Direct3D 8 con DXVK en lugar de WineD3D. Más rápido en la prueba de Direct3D 8 de AIO Graphics Test en Adreno.</string> <string name="game_env_no_ntsync">Pon 1 para que este juego no use ntsync (droiddeck-ntsync o un controlador del kernel); usa droiddeck-esync si hay un paquete y, si no, droiddeck-fsync.</string> <string name="game_env_no_esync">Pon 1 para desactivar droiddeck-esync en este juego; usa droiddeck-fsync en su lugar, o droiddeck-ntsync si fsync también está desactivado.</string> <string name="game_env_no_fsync">Pon 1 para que este juego no use droiddeck-fsync; usa droiddeck-esync si hay un paquete y, si no, droiddeck-ntsync.</string> <string name="game_env_fsync_first">Pon 1 para que este juego use droiddeck-fsync, o 0 para dar prioridad a droiddeck-esync cuando haya un paquete para su Proton.</string> <string name="game_env_xalia">Pon 0 para desactivar el asistente de navegación con control de Proton en este juego.</string> + <string name="game_env_anticheat_offline">Activado de forma predeterminada. Inicia un juego con Easy Anti-Cheat sin su antitrampas cuando el juego admite el modo sin conexión. Desactívalo para iniciarlo con Easy Anti-Cheat como siempre. Los modos en línea que requieren Easy Anti-Cheat siguen sin estar disponibles.</string> <string name="game_env_hud">Superposición de DXVK para D3D9–11. fps muestra la tasa de fotogramas; sin definir la oculta.</string> <string name="game_env_dxvk_config">Ajustes de DXVK separados por punto y coma. Las versiones recientes usan dxvk.maxFrameRate para limitar fotogramas; para el uso normal prefiere el límite de fotogramas de la sesión.</string> + <string name="game_env_cores">Núcleos de CPU para este juego, como 0-4 o 0,2,4, en lugar de los núcleos de juegos de la sesión. Con menos núcleos se calienta menos.</string> <string name="game_env_vkd3d_limit">Límite de fotogramas de D3D12. 0 desactiva el límite.</string> <string name="game_env_glthread">Subprocesos de OpenGL de Mesa. true puede ayudar a juegos OpenGL limitados por la CPU; pruébalo en cada juego.</string> <string name="sync_backend_title">Sincronización de Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX ejecuta programas Linux x86 en este dispositivo ARM64. Auto lo usa cuando el programa es para x86.</string> <string name="app_fex_x86">%1$s con FEX</string> <string name="app_fex_not_ready">Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá.</string> + <string name="session_proot_missing">No se pudo descargar el proot de DroidDeck. Revisa la conexión e inténtalo de nuevo. La sesión no se inició porque el proot alternativo es demasiado lento para jugar.</string> + <string name="session_directaudio_missing">No se pudo descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">No se pudo descargar el cliente de Steam. Es posible que tu red o VPN esté bloqueando los servidores de Steam; revisa la conexión e inténtalo de nuevo.</string> <string name="session_end_steam_setup">No se pudo configurar el cliente de Steam. Revisa la conexión y el espacio libre, y vuelve a intentarlo.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Control de Xbox 360</string> <string name="mode_controller_note">Deck: botón de Quick Access y giroscopio. Steam Controller: lo mismo, con detección de agarre en los botones traseros. DualShock 4 y DualSense: giroscopio, y los trackpads como su panel táctil. Xbox 360: abre Quick Access con Guide+A.</string> <string name="mode_back">Atrás</string> + <string name="back_hold">Mantener Atrás para atajos de Steam</string> + <string name="back_hold_hint">Mantener Atrás abre Acceso rápido o crea combinaciones de Steam con otros botones. Desactívalo para ignorar Atrás mantenido; tocar y tocar dos veces siguen funcionando.</string> + <string name="back_native_qam_hint">Mantén Atrás 700 ms, o mantén Atrás y pulsa otro botón para los atajos de Steam.</string> + <string name="back_double_tap_window">Intervalo de doble toque</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir el control del brillo</string> + <string name="brightness_permission_text">Configura el control del brillo en DroidDeck.</string> <string name="back_menu_then_qam">Menú → QAM</string> <string name="back_qam_then_menu">QAM → Menú</string> <string name="mode_session">Sesión</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Al día · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar la última</string> + <string name="decky_channel">Canal de actualizaciones</string> + <string name="decky_channel_hint">Qué versiones de Decky Loader se instalan. El actualizador propio de Decky usa el mismo canal.</string> + <string name="decky_channel_stable">Estable</string> + <string name="decky_channel_prerelease">Preliminar</string> + <string name="decky_channel_testing">Pruebas</string> + <string name="decky_channel_failed">No se pudo guardar el canal de actualizaciones de Decky</string> <string name="mode_decky_on">Se inicia con Steam. Mientras esté activado, otras apps de este dispositivo podrían controlar Steam.</string> <string name="mode_decky_off">Desactivado. El puerto de depuración remota de Steam permanece cerrado.</string> <string name="mode_decky_remove_title">¿Desinstalar Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Superposición de rendimiento</string> <string name="mode_mangoapp_hint">Desactívalo si los juegos fallan o se quedan en negro en modo Deck. Se aplica en la próxima sesión.</string> + <string name="mode_return_after_game">Volver a DroidDeck al cerrar un juego</string> + <string name="mode_return_after_game_hint">Cuando se cierra un juego que iniciaste desde DroidDeck u otro launcher, Steam se cierra correctamente (primero termina de sincronizar las partidas en la nube) y vuelves allí. Desactivado: te quedas en Steam.</string> + <string name="mode_shader_precache">Precarga de shaders</string> + <string name="mode_shader_precache_hint">Steam descarga shaders precompilados para tus juegos y los procesa en segundo plano, para que los juegos tengan menos microcortes. Desactivado ahorra datos, almacenamiento y batería; los juegos compilan los shaders mientras juegas. Es el mismo ajuste que Descargas > Precarga de shaders en Steam. Se aplica en la próxima sesión.</string> <string name="mode_steam_repair">Reparar el cliente de Steam</string> <string name="mode_steam_repair_hint">Vuelve a descargar el cliente de Steam la próxima vez que se inicie Steam. Úsalo si Steam se queda en la pantalla de carga. Se conservan los juegos, la sesión iniciada y los ajustes.</string> <string name="mode_steam_repair_queued">El cliente de Steam se volverá a descargar la próxima vez que se inicie Steam.</string> @@ -375,6 +414,8 @@ <string name="mode_directaudio_hint">Evita PulseAudio para menor latencia.</string> <string name="mode_mic">Micrófono</string> <string name="mode_mic_hint">Para el chat de voz.</string> + <string name="drawer_mic_hint">Activa o desactiva la captura del micrófono en esta sesión.</string> + <string name="drawer_mic_failed">No se pudo cambiar el micrófono. Inténtalo de nuevo.</string> <string name="mode_network">Red</string> <string name="mode_wifi_discovery">Detección de redes Wi-Fi</string> <string name="mode_wifi_discovery_hint">Muestra en Steam los nombres de Wi-Fi y las redes cercanas.</string> @@ -452,6 +493,13 @@ <string name="game_no_steam_title">Iniciar sin Steam</string> <string name="game_no_steam_detail">Para un juego que se cierra enseguida: lo inicia sin la configuración de Steam de Proton. Las funciones de Steam, como la superposición, están desactivadas para él.</string> <string name="game_no_steam_on">Activado</string> + <string name="game_steam_with">Se inicia con Steam</string> + <string name="game_steam_without">Se inicia sin Steam</string> + <string name="game_settings_card">Ajustes</string> + <string name="game_settings_menu_title">Ajustes de %1$s</string> + <string name="game_settings_default">Predeterminado</string> + <string name="game_settings_default_detail">Devuelve todo lo cambiado para este juego a los ajustes de la app.</string> + <string name="game_sync_custom">Variables de sincronización personalizadas</string> <string name="comp_game_proton_live">La elección de Proton de %1$s se ha guardado y ya está disponible en Steam.</string> <string name="comp_game_proton_next">La elección de Proton de %1$s se ha guardado. Reinicia Steam antes de iniciar el juego.</string> <string name="comp_game_proton_not_runnable">%1$s no puede usar el Proton elegido en este dispositivo.</string> @@ -530,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: cola de GPU en tiempo real</string> <string name="perf_gsrealtime_hint">Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Desactivado</string> + <string name="perf_cap_auto">Predeterminado del controlador</string> + <string name="perf_zram_client">Comprimir Steam mientras se ejecuta un juego</string> + <string name="perf_zram_client_hint">20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera.</string> + <string name="perf_ram_cap">Límite de RAM</string> + <string name="perf_ram_cap_hint">Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener microcortes mientras se recuperan las páginas.</string> + <string name="perf_ram_cap_unavailable">Requiere swap de zRAM, y este dispositivo no lo tiene.</string> + <string name="perf_vram_cap">Límite de VRAM</string> + <string name="perf_vram_cap_hint">La memoria de video que DXVK informa a los juegos Direct3D, para que calculen sus texturas con menos. Los ajustes de DXVK propios de un juego siguen teniendo prioridad. Se aplica en la próxima sesión.</string> <string name="perf_gpuclock">Mantener la GPU a su reloj máximo</string> <string name="perf_gpuclock_hint">Solo Adreno. Menos microcortes, más consumo de batería y calor.</string> <string name="perf_fixes">Correcciones de sesión</string> <string name="perf_sysmem">Turnip: renderizado sysmem</string> <string name="perf_sysmem_hint">Más rápido para el cliente de Steam; en los juegos, el controlador elige entre renderizado por mosaicos o en memoria del sistema en cada pasada. Obligatorio en Adreno 710/720/722.</string> <string name="perf_xalia">Omitir el asistente xalia de Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">Un sustituto en espacio de usuario del controlador ntsync de Linux, para pruebas. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Un sustituto en espacio de usuario del controlador ntsync de Linux. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync primero</string> <string name="perf_fsync_hint">Usa el fsync propio de Proton con los archivos originales de Proton, con futex_waitv proporcionado en espacio de usuario, así que no necesita paquete y sigue funcionando en cuanto Steam actualiza Proton. Mientras está activado, los juegos lo usan antes que droiddeck-esync, salvo los pocos que Proton mantiene sin fsync. Se aplica en la próxima sesión.</string> @@ -548,6 +606,8 @@ <string name="perf_fastpath">Ruta rápida de proot</string> <string name="perf_fastpath_needs_seccomp">Requiere el filtro seccomp de proot.</string> <string name="perf_fastpath_hint">Búsquedas de archivos más rápidas y menos microcortes. Desactívalo si un programa no encuentra sus archivos.</string> + <string name="perf_cursor_composite">Dibujar el cursor dentro de gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dibuja el puntero por sí mismo en lugar de pasárselo a Android. Actívalo para un cursor manejado con el control. Desactivado es más rápido en un celular. Se aplica en la próxima sesión.</string> <string name="perf_identity">Identidad de la sesión</string> <string name="perf_hostname">Nombre del host</string> <string name="perf_hostname_hint">El nombre que Steam ve para este dispositivo. En blanco restaura %1$s.</string> @@ -562,6 +622,8 @@ <string name="driver_delete_plain">Sus archivos se eliminan de la app.</string> <string name="driver_delete_in_use">Sus archivos se eliminan. Está en uso, así que pasa a usarse el predeterminado.</string> <string name="drawer_page_display">Pantalla</string> + <string name="drawer_frame_limit">Límite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string> <string name="drawer_page_effects">Efectos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -586,6 +648,66 @@ <string name="drawer_hud_color_amber">Ámbar</string> <string name="drawer_hud_color_violet">Violeta</string> <string name="drawer_hud_opacity">Opacidad</string> + <string name="hud_size">Tamaño</string> + <string name="hud_size_hint">Tocar el HUD también cambia su tamaño.</string> + <string name="hud_size_full">Completo</string> + <string name="hud_size_tiles">Mosaicos</string> + <string name="hud_size_pill">Píldora</string> + <string name="hud_size_minimal">Mínimo</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> + <string name="hud_locked">Fijar posición</string> + <string name="hud_locked_hint">Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando.</string> + <string name="hud_snap">Ajustar a los lados</string> + <string name="hud_snap_hint">Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección.</string> + <string name="hud_group_look">Aspecto</string> + <string name="hud_scale">Tamaño en pantalla</string> + <string name="hud_color_soft">Suave</string> + <string name="hud_color_mid">Medio</string> + <string name="hud_color_vivid">Intenso</string> + <string name="hud_outline">Contorno</string> + <string name="hud_outline_color">Color del contorno</string> + <string name="hud_outline_gray">Gris</string> + <string name="hud_outline_theme">Color del tema</string> + <string name="hud_group_metrics">Lecturas</string> + <string name="hud_metric_graph">Gráfico de tiempos de fotograma</string> + <string name="hud_metric_decimal">Tasa de fotogramas con decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% más bajo</string> + <string name="hud_metric_engine">Motor gráfico</string> + <string name="hud_metric_gpu_model">Nombre de la GPU</string> + <string name="hud_metric_gpu">Carga de la GPU</string> + <string name="hud_metric_gpu_temp">Temperatura de la GPU</string> + <string name="hud_metric_cpu">Carga de la CPU</string> + <string name="hud_metric_per_core">CPU por núcleo</string> + <string name="hud_metric_temp">Temperaturas</string> + <string name="hud_metric_ram">Memoria</string> + <string name="hud_metric_vram">Memoria gráfica</string> + <string name="hud_metric_swap">Memoria de intercambio</string> + <string name="hud_metric_battery">Nivel de batería</string> + <string name="hud_metric_power">Consumo de energía</string> + <string name="hud_metric_network">Red</string> + <string name="hud_metric_resolution">Resolución</string> + <string name="hud_metric_proton">Versión de Proton</string> + <string name="hud_metric_session">Tiempo de sesión</string> + <string name="hud_metric_clock">Reloj</string> + <string name="hud_group_temps">Temperaturas</string> + <string name="hud_temp_unit">Unidad</string> + <string name="hud_temp_bands">Colores de aviso</string> + <string name="hud_temp_bands_hint">Las temperaturas se vuelven ámbar y luego rojas al acercarse al límite.</string> + <string name="hud_temp_bands_off">Desactivado</string> + <string name="hud_temp_bands_auto">Automático</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU en rojo a partir de</string> + <string name="hud_temp_red_gpu">GPU en rojo a partir de</string> + <string name="hud_temp_red_battery">Batería en rojo a partir de</string> + <string name="hud_group_more">Más</string> + <string name="hud_export">Diagnóstico del HUD</string> + <string name="hud_export_hint">Guarda en Downloads/DroidDeck un informe de cada sensor que lee el HUD.</string> + <string name="hud_export_button">Guardar</string> + <string name="hud_export_done">Guardado en %1$s</string> + <string name="hud_export_failed">No se pudo guardar el informe del HUD.</string> + <string name="hud_reset">Restablecer ajustes del HUD</string> + <string name="hud_reset_button">Restablecer</string> <string name="drawer_scaling">Modo de escalado</string> <string name="drawer_scaling_sharpness">Nitidez del escalado</string> <string name="drawer_effects">Efectos de pantalla</string> @@ -644,10 +766,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latencia</string> + <string name="drawer_low_latency">Modo de baja latencia</string> + <string name="drawer_low_latency_hint">Aumenta el uso de CPU y batería</string> <string name="drawer_low_latency_controller">Control de baja latencia</string> <string name="drawer_low_latency_controller_hint">El control informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU.</string> <string name="drawer_low_latency_touch">Táctil de baja latencia</string> <string name="drawer_low_latency_touch_hint">Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU.</string> + <string name="drawer_evdev_mouse">Canal de ratón sin procesar</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Segunda pantalla</string> @@ -738,6 +864,10 @@ <string name="setup_session">Sesión</string> <string name="setup_logs">Registros de sesión</string> <string name="setup_logs_hint">Se guardan tras cada sesión</string> + <string name="setup_game_debug_logs">Registros de depuración de juegos</string> + <string name="setup_game_debug_logs_hint">Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento.</string> + <string name="setup_game_debug_logs_restart">Reinicia esta sesión para guardar los registros de depuración de juegos</string> + <string name="setup_logging_update_failed">No se pudo actualizar el registro. Revisa el interruptor e inténtalo de nuevo.</string> <string name="setup_agent_commands">Herramientas de depuración</string> <string name="setup_latest_logs">Últimos registros de sesión</string> <string name="setup_saved_logs">Registros de sesión guardados</string> @@ -770,12 +900,28 @@ <string name="setup_home_on">DroidDeck puede ser la app de inicio</string> <string name="setup_home_off">DroidDeck nunca se ofrece como app de inicio</string> <string name="setup_orientation">Orientación</string> + <string name="setup_launcher_orientation">Orientación del launcher</string> + <string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientación de la sesión</string> + <string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se ingresaron.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> + <string name="setup_dual_screen">Pantalla dual</string> + <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la traen integrada. Activado usa cualquier segunda pantalla. Desactivado deja todo en una sola pantalla.</string> + <string name="setup_dual_screen_auto">Automático</string> + <string name="setup_dual_screen_on">Activado</string> + <string name="setup_dual_screen_off">Desactivado</string> + <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> + <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y escribe ahí, para que la pantalla superior conserve la vista completa. L2 y R2 cambian de sección.</string> + <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> + <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión.</string> + <string name="dual_typing_title">Escribiendo en la pantalla superior</string> + <string name="dual_typing_done">Listo</string> <string name="setup_default_home">App de inicio predeterminada</string> <string name="setup_choose_home">Elige una app de inicio</string> <string name="setup_choose">Elegir</string> @@ -926,6 +1072,14 @@ <string name="gate_step1">Abre Ajustes → Opciones de desarrollador → Depuración inalámbrica y actívala</string> <string name="gate_step2">Toca “Vincular dispositivo con código de vinculación”</string> <string name="gate_step3">Escribe el código en la notificación de DroidDeck</string> + <string name="pairguide_build_number">En Acerca del teléfono, toca Número de compilación 7 veces</string> + <string name="pairguide_wireless">Activa la Depuración inalámbrica</string> + <string name="pairguide_pair">Abre Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”</string> + <string name="pairguide_child_process">Activa “Inhabilitar restricciones de procesos secundarios”</string> + <string name="pairguide_row_child_process">Inhabilitar restricciones de procesos secundarios</string> + <string name="pairguide_row_build_number">Número de compilación</string> + <string name="pairguide_row_wireless">Depuración inalámbrica</string> + <string name="pairguide_row_pair">Vincular dispositivo con código de vinculación</string> <string name="gate_waiting">Esperando la ventana de vinculación…</string> <string name="gate_code_needed">Ventana encontrada. Ingresa su código en la notificación.</string> <string name="gate_status">Estado</string> @@ -1008,6 +1162,12 @@ <string name="hand_camera_placement">Posición de la cámara</string> <string name="hand_camera_placement_hint">Comprueba que la cámara pueda verte antes de jugar.</string> <string name="hand_camera_check">Comprobar</string> + <string name="tracking_pack_title">Descarga del seguimiento de manos</string> + <string name="tracking_pack_hint">El seguimiento de manos necesita una descarga única de %1$s.</string> + <string name="tracking_pack_download">Descargar</string> + <string name="tracking_pack_retry">Reintentar</string> + <string name="tracking_pack_downloading">Descargando el seguimiento de manos… %1$d%%</string> + <string name="tracking_pack_failed">No se pudo descargar el seguimiento de manos. Revisa tu conexión e inténtalo de nuevo.</string> <string name="hand_camera_check_title">Posición de la cámara</string> <string name="hand_camera_how_rear">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la cámara trasera hacia ti. Luego entra en el encuadre con las manos extendidas.</string> <string name="hand_camera_how_front">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la pantalla hacia ti. Luego entra en el encuadre con las manos extendidas.</string> @@ -1086,8 +1246,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 +1253,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> @@ -1104,10 +1261,8 @@ <string name="games_never_played">Nunca jugado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <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> @@ -1122,6 +1277,9 @@ <string name="gpu_hide_other">Ocultar controladores de otras GPU</string> <string name="gpu_show_other">Mostrar controladores de otras GPU</string> <string name="gpu_advanced">Avanzado</string> + <string name="gpu_ubwc_title">Compatibilidad con UBWC</string> + <string name="gpu_ubwc_hint">Prueba Activado o Desactivado si Steam o Android muestran franjas o parpadeos. Se aplica a ambos controladores después de reiniciar DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicia DroidDeck para aplicarlo.</string> <string name="gpu_set_with_display">Se define junto con el controlador de pantalla: %1$s incluye ambos.</string> <string name="gpu_set_with_runtime">Se define junto con el controlador de runtime: %1$s incluye ambos.</string> <string name="gpu_runtime_hint">Lo usan los juegos y el escritorio.</string> @@ -1176,7 +1334,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> @@ -1230,10 +1388,15 @@ <string name="pip_auto">Entrar en PiP automáticamente</string> <string name="unfolded_controls">Controles con la pantalla desplegada</string> <string name="unfolded_controls_hint">Desplegado, el juego queda encima de los trackpads y los agarres traseros de Steam Deck. Plegado, el juego ocupa toda la pantalla.</string> + <string name="unfolded_controls_with_controller">Mantenerlos con un control</string> + <string name="unfolded_controls_with_controller_hint">Muestra también estos controles táctiles mientras haya un control conectado.</string> <string name="pip_suspended">Suspendida</string> <string name="pip_not_ready">Imagen en imagen estará disponible cuando la sesión esté lista.</string> <string name="pip_permission">Permite imagen en imagen para DroidDeck en los ajustes de Android.</string> <string name="pip_unavailable">Android no pudo abrir imagen en imagen.</string> + <string name="game_more">Más</string> + <string name="game_edit_art">Editar imágenes</string> + <string name="stores_in_steam_label">En Steam</string> <string name="game_shortcut">Acceso directo</string> <string name="game_shortcut_add">Agregar a la pantalla de inicio</string> <string name="game_shortcut_choose">Elegir juego</string> @@ -1256,6 +1419,10 @@ <string name="game_frontend_files">Archivos para frontends</string> <string name="main_wait_runtime">Espera a que termine la operación del runtime</string> <string name="main_wait_proton_install">Espera a que termine la instalación de la herramienta de compatibilidad</string> + <string name="load_compat_title">Preparando las herramientas de compatibilidad</string> + <string name="load_compat_wait">Esperando a que termine la configuración de compatibilidad</string> + <string name="load_compat_hint">Tu sesión se iniciará cuando termine la configuración.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Espera a que termine la instalación de la app de escritorio</string> <string name="main_wait_install_game">Espera a que termine la instalación antes de iniciar un juego</string> <string name="main_saves_close_session">Cierra primero la sesión de Steam para que el juego no guarde encima de lo importado</string> @@ -1296,6 +1463,9 @@ <string name="main_install_anyway">Instalar de todos modos</string> <string name="main_remove_runtime_title">Eliminar el runtime de Linux</string> <string name="main_remove_runtime_text">Esto elimina el runtime, el cliente de Steam que contiene y todos los juegos instalados en él.</string> + <string name="runtime_actions_title">Runtime de Linux</string> + <string name="runtime_actions_text">Reparar reinstala los archivos del sistema del runtime y conserva Steam, tus juegos y tus ajustes. Los extras, como el escritorio, se vuelven a instalar la próxima vez que los uses. Eliminar borra todo.</string> + <string name="runtime_repair">Reparar el runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">No se pudo abrir %1$s en la pantalla principal</string> <string name="android_app_open_failed_on">No se pudo abrir %1$s en %2$s</string> @@ -1424,6 +1594,12 @@ <string name="session_runtime_catalog_unreachable">No se pudo acceder al catálogo del runtime. Revisa la conexión y vuelve a presionar Jugar.</string> <string name="session_runtime_install_failed">El runtime de Linux no se instaló. Revisa el runtime en Configuración y vuelve a presionar Jugar.</string> <string name="session_desktop_install_failed">El escritorio no se instaló (%1$s). Revisa la conexión y presiona Escritorio de nuevo.</string> + <string name="session_package_resume_failed">No se pudo terminar una instalación interrumpida (%1$s). Revisa la conexión y el espacio, e inténtalo de nuevo.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">El runtime de Linux está dañado: %1$d enlace de biblioteca apunta a un archivo que falta (%2$s), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="many">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="other">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + </plurals> <string name="session_ended_named">%1$s se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_program">El programa se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_desktop">El escritorio se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> @@ -1438,6 +1614,14 @@ <string name="mode_decky_plugins_hint">Instala un ZIP de plugin para la próxima sesión de Steam.</string> <string name="mode_decky_plugin_downloading">Descargando…</string> <string name="mode_decky_plugin_install_zip">Instalar desde ZIP</string> + <string name="decky_zip_warning_title">Instalación de plugin de terceros</string> + <string name="decky_zip_warning_text">El equipo de Decky Loader no ha revisado este plugin. Puede contener malware, como software para robar tu cuenta de Steam o dañar tu dispositivo. Al instalar este plugin, aceptas que asumes todos los riesgos para tu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Espera %1$d segundo</item> + <item quantity="many">Espera %1$d segundos</item> + <item quantity="other">Espera %1$d segundos</item> + </plurals> <string name="store_cat_games">Juegos</string> <string name="store_cat_audio_video">Audio y video</string> <string name="store_cat_graphics">Gráficos</string> @@ -1466,6 +1650,10 @@ <string name="theme_icon_blue_detail">Fondo negro, texto blanco y el azul para todo lo seleccionado, enfocado o presionado.</string> <string name="theme_electric">Azul marino eléctrico</string> <string name="theme_electric_detail">Un azul más vivo, sobre superficies que tiran a azul marino en vez de gris.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Colores que recorren el arcoíris. Respeta los ajustes de animación de Android.</string> + <string name="theme_rgb_speed">Velocidad</string> + <string name="theme_rgb_speed_hint">Qué tan rápido cambian los colores.</string> <string name="theme_gradient">Degradado</string> <string name="theme_gradient_detail">Tus propios colores primario y secundario, combinados en botones y resaltados.</string> <string name="theme_gradient_primary">Primario</string> @@ -1555,7 +1743,7 @@ <item quantity="other">%1$d elementos copiados</item> <item quantity="many">%1$d elementos copiados</item> </plurals> - <string name="fm_already_exists">\\"%1$s\\" ya existe</string> + <string name="fm_already_exists">\"%1$s\" ya existe</string> <string name="fm_op_renaming">Renombrando...</string> <string name="fm_rename_failed">No se pudo renombrar</string> <string name="fm_op_creating_folder">Creando carpeta...</string> @@ -1592,7 +1780,16 @@ <string name="fm_conflict_skip">Omitir</string> <string name="fm_select_this_folder">Seleccionar esta carpeta</string> <string name="fm_back">Atrás</string> + <string name="fm_exit">Salir</string> + <string name="fm_return_to_start">Volver a la carpeta inicial</string> + <string name="fm_start_unavailable">La carpeta inicial ya no está disponible</string> + <string name="fm_cancel_operation_title">¿Cancelar la operación?</string> + <string name="fm_cancel_operation_confirmation">La operación se cancelará. ¿Estás seguro?</string> + <string name="fm_accept">Aceptar</string> + <string name="fm_decline">Rechazar</string> <string name="fm_drive_not_readable">%1$s está montado, pero ahora mismo no se puede leer</string> + <string name="fm_drive_access_title">Permitir acceso a %1$s</string> + <string name="fm_drive_access_text">Android deja que DroidDeck vea esta unidad, pero no que la lea. Activa Acceso a todos los archivos para DroidDeck y vuelve.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de cuadrícula</string> <string name="fm_search">Buscar</string> @@ -1628,7 +1825,7 @@ <string name="fm_rail_session_logs">Registros de sesión</string> <string name="fm_rail_pictures">Imágenes</string> <string name="fm_favorite_added">Se agregó \"%1$s\" a Favoritos</string> - <string name="fm_favorite_removed">Se quitó \\"%1$s\\" de Favoritos</string> + <string name="fm_favorite_removed">Se quitó \"%1$s\" de Favoritos</string> <string name="fm_empty_directory">Carpeta vacía</string> <string name="fm_up_one_level">Subir un nivel</string> <string name="fm_choose_folder">Elige una carpeta</string> @@ -1665,6 +1862,93 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Agarres de Deck + trackpads</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Todavía no hay nada que mostrar aquí.</string> + <string name="bottom_page_downloads">Descargas</string> + <string name="bottom_downloads_none">No hay descargas en curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Descargando caché de shaders</string> + <string name="bottom_downloads_paused">En pausa</string> + <string name="bottom_downloads_queued">Esperando para empezar</string> + <string name="bottom_page_notifications">Notificaciones</string> + <string name="bottom_notifications_listener">DroidDeck – pantalla inferior</string> + <string name="bottom_notifications_why">Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola.</string> + <string name="bottom_notifications_allow">Permitir acceso a notificaciones</string> + <string name="bottom_notifications_none">No hay notificaciones.</string> + <string name="bottom_notifications_count">%1$d notificaciones</string> + <string name="bottom_notifications_clear">Borrar</string> + <string name="bottom_page_screenshots">Capturas de pantalla</string> + <string name="stats_fps_needs_hud">Los FPS requieren el HUD activado</string> + <string name="stats_speed">Velocidad</string> + <string name="stats_pedals">Pedales</string> + <string name="stats_gforce">Fuerza G</string> + <string name="stats_timing">Tiempos</string> + <string name="stats_best_lap">Mejor vuelta</string> + <string name="stats_tires">Llantas °C</string> + <string name="stats_trace">Acelerador y freno, últimos 10 s</string> + <string name="stats_speed_chart">Velocidad, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_speed_units">Unidades de velocidad</string> + <string name="stats_speed_units_auto">Automático (%1$s)</string> + <string name="stats_steam_client_arm">Cliente de Steam ARM</string> + <string name="stats_steam_client_x86">Cliente de Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Luces del tablero</string> + <string name="stats_lamp_shift">Cambio</string> + <string name="stats_lamp_handbrake">Freno de mano</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Aceite %1$s °C</string> + <string name="stats_power">Distribuidor de energía</string> + <string name="stats_fuel_t">Combustible, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="stats_tap_hint">Toca la franja superior o el tablero para cambiar su estilo.</string> + <string name="bottom_telemetry_send_title">Enviar datos al panel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> + <string name="bottom_telemetry_send_note">Esto cambia el ajuste de salida de datos del propio juego. Se aplica la próxima vez que se inicie el juego; al desactivarlo se restaura el ajuste anterior.</string> + <string name="bottom_telemetry_send_close">Cierra %1$s para cambiar esto.</string> + <string name="bottom_telemetry_send_failed">No se pudieron cambiar los ajustes de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activa %2$s en los ajustes del juego con la IP 127.0.0.1 y el puerto %3$d.</string> + <string name="bottom_shots_where">Se guardan en Pictures/DroidDeck. Las capturas de Steam también aparecen aquí.</string> + <string name="bottom_shots_take">Hacer captura de pantalla</string> + <string name="bottom_shots_saved">Captura de pantalla guardada.</string> + <string name="bottom_shots_failed">No se pudo hacer la captura de pantalla.</string> + <string name="bottom_shots_none">Todavía no hay capturas de pantalla.</string> + <string name="bottom_page_chat">Chat y voz</string> + <string name="bottom_chat_why">Lee y responde el chat de Steam aquí mientras el juego sigue en la pantalla principal. Usa la cuenta con la que se inició sesión en Steam.</string> + <string name="bottom_chat_not_signed_in">Steam todavía no tiene una sesión web que compartir, así que inicia sesión aquí una vez.</string> + <string name="bottom_chat_stopped">Android cerró la página del chat mientras DroidDeck estaba en segundo plano. Se volverá a abrir cuando regreses a DroidDeck.</string> + <string name="bottom_chat_open">Abrir Steam Chat</string> + <string name="bottom_chat_close">Cerrar chat</string> + <string name="bottom_chat_mic_on">Micro activado</string> + <string name="bottom_chat_mic_off">Micro desactivado</string> + <string name="bottom_chat_mic_unavailable">El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego.</string> + <string name="bottom_chat_volume">Volumen %1$d%%</string> + <string name="bottom_page_telemetry">Estadísticas del juego</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batería</string> + <string name="bottom_telemetry_lap">Vuelta</string> + <string name="bottom_telemetry_position">Posición</string> + <string name="bottom_telemetry_this_lap">Vuelta actual</string> + <string name="bottom_telemetry_last_lap">Última vuelta</string> + <string name="bottom_telemetry_fuel">Combustible</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en vivo. Los datos no salen de este dispositivo.</string> + <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> + <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> <string name="rtinst_removing">Eliminando el runtime de Linux</string> <plurals name="rtinst_removing_entries"> <item quantity="one">Eliminando el runtime de Linux · %1$d elemento</item> @@ -1693,6 +1977,7 @@ <string name="flatpakmgr_not_ready">Configura Flatpak primero</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">Flatpak terminó con el código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s está compilado para %2$s, que DroidDeck no puede ejecutar. Aquí las apps Flatpak necesitan una versión para ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Actualizando %1$s</string> <string name="flatpakmgr_removing">Quitando %1$s</string> @@ -1782,6 +2067,7 @@ <string name="adbpair_applying">Aplicando el ajuste…</string> <string name="adbpair_command_failed">Falló el comando de la Depuración inalámbrica</string> <string name="adbpair_channel_name">Configuración de la Depuración inalámbrica</string> + <string name="adbpair_progress_channel_name">Progreso de la configuración de la Depuración inalámbrica</string> <string name="adbpair_channel_description">Pide el código de vinculación de la Depuración inalámbrica mientras Ajustes está abierto</string> <string name="adbpair_title_pair">Vincular Depuración inalámbrica</string> <string name="adbpair_waiting_text">Activa la Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”.</string> @@ -1883,6 +2169,7 @@ <string name="gpuinfo_not_adreno">La GPU no es Adreno</string> <string name="gpuinfo_supported">Compatible</string> <string name="gpuinfo_experimental">Experimental: sus controladores son versiones de prueba</string> + <string name="gpuinfo_a850_experimental">Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo</string> <string name="gpuinfo_below_tested">Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione</string> <string name="gpuinfo_unsupported">No compatible: DroidDeck necesita una GPU Adreno (Snapdragon)</string> <string name="turnip_rate_limited">Se alcanzó el límite de solicitudes de GitHub - inténtalo más tarde</string> @@ -1971,10 +2258,10 @@ <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> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalles del dispositivo</string> <string name="device_info_hide">Ocultar detalles del dispositivo</string> @@ -1988,7 +2275,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> @@ -2002,11 +2288,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> @@ -2024,9 +2308,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> @@ -2041,6 +2333,13 @@ <string name="stores_resume">Reanudar</string> <string name="stores_refresh">Actualizar</string> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas de la barra lateral</string> + <string name="setup_rail_labels_hint">Muestra los nombres debajo de los íconos de la barra lateral. Desactívalo para una barra lateral más estrecha.</string> + <string name="library_display">Vista</string> + <string name="library_display_larger">Tarjetas más grandes</string> + <string name="library_display_smaller">Tarjetas más pequeñas</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamaño</string> <string name="stores_sort_last_played">Jugados recientemente</string> <string name="stores_sort_recently_installed">Instalados recientemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2059,6 +2358,20 @@ <string name="epic_eos">Inicio de sesión de Epic (EOS)</string> <string name="epic_offline">Iniciar sin conexión</string> <string name="epic_resolve">Solucionar el inicio de sesión de Epic</string> + <string name="epic_client_version">Versión %1$s</string> + <string name="epic_client_no_runtime">Instala primero el runtime de Linux</string> + <string name="epic_client_checking">Buscando la última versión…</string> + <string name="epic_client_unpacking">Descomprimiendo…</string> + <string name="epic_client_unreachable">El servidor de descargas no respondió</string> + <string name="epic_client_needs_fex">Epic Games Launcher necesita FEX, que descarga Steam. Vuelve a abrir el launcher cuando Steam se haya iniciado.</string> + <string name="epic_client_download_failed">Falló la descarga: %1$s</string> + <string name="epic_client_unpack_failed">No se pudo descomprimir el launcher: %1$s</string> + <string name="epic_client_sign_in_failed">Epic Games Launcher no aceptó el inicio de sesión. Vuelve a iniciarlo desde el launcher.</string> + <string name="epic_client_uninstall_body">Quita el launcher y libera su espacio. Tus juegos de Epic siguen instalados y funcionando, y su inicio de sesión se conserva para cuando lo vuelvas a instalar.</string> + <string name="epic_client_uninstall_stops">Primero se cierra la sesión en curso.</string> + <string name="epic_client_uninstalled">Epic Games Launcher desinstalado</string> + <string name="epic_client_uninstall_failed">No se pudieron quitar algunos archivos del launcher. Inténtalo de nuevo.</string> + <string name="epic_client_uninstalling">Espera a que Epic Games Launcher termine de desinstalarse</string> <string name="store_cloud_saves">Partidas en la nube</string> <string name="cloud_upload">Subir a la nube</string> <string name="cloud_download">Descargar de la nube</string> @@ -2161,6 +2474,9 @@ <string name="stores_download_manager">Administrador de descargas</string> <string name="stores_parallel">Descargas simultáneas</string> <string name="stores_install_where">Instalar en</string> + <string name="stores_install_language">Idioma del juego</string> + <string name="stores_install_language_hint">GOG y Epic instalan este idioma. Sistema sigue el idioma de la app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s libres</string> @@ -2183,6 +2499,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> @@ -2198,6 +2515,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar en</string> <string name="edit_launch_options">Opciones de lanzamiento</string> + <string name="edit_launch_options_steam_hint">Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos.</string> + <string name="edit_launch_options_not_saved">No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo.</string> + <string name="edit_launch_options_desktop">Es posible que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra primero la sesión.</string> <string name="edit_artwork">Ilustraciones</string> <string name="edit_other_exe">Otro exe…</string> <string name="edit_remove">Quitar</string> @@ -2327,6 +2647,7 @@ <string name="setup_download_source_custom">Prefijo propio</string> <string name="setup_download_mirror">Sitio</string> <string name="setup_download_prefix">Prefijo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS DE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para el escritorio de Linux, que se abren desde Escritorio.</string> @@ -2388,7 +2709,7 @@ <string name="touch_done">Hecho</string> <string name="touch_save_failed">No se pudo guardar la disposición táctil</string> <string name="touch_saved">Disposición táctil guardada en Steam</string> - <string name="touch_app_id">App %1$d</string> + <string name="touch_app_id">App %1$s</string> <string name="touch_label_hint">Etiqueta (opcional)</string> <string name="touch_icons_missing">No se encontraron los iconos de Steam</string> <plurals name="touch_icons_found"> @@ -2468,6 +2789,22 @@ <string name="glasses_tracking_flat_hint">Automático mantiene este juego 2D fijo en la vista. Elige Pantalla virtual en la sección Pantalla para usar el seguimiento de cabeza.</string> <string name="glasses_tracking_sbs_hint">El seguimiento de cabeza se aplica a una pantalla virtual o a un juego de SteamVR en marcha.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controles</string> + <string name="vr_controllers_group">Controles de SteamVR</string> + <string name="vr_controllers_emulate">Control en RV</string> + <string name="vr_controllers_emulate_hint">Las dos manos de RV que imita tu control. Los cambios se aplican al instante, también mientras se ejecuta SteamVR. Los Joy-Con y las manos con seguimiento siguen controlando su lado.</string> + <string name="vr_controllers_off">Control normal</string> + <string name="vr_controllers_index">Controles de Valve Index</string> + <string name="vr_controllers_touch">Controles de Meta Quest 3</string> + <string name="vr_controllers_vive">Controles de HTC Vive</string> + <string name="vr_controllers_sticks">Al empezar, los sticks</string> + <string name="vr_controllers_sticks_hint">Presiona ambos sticks a la vez durante la RV para cambiar.</string> + <string name="vr_controllers_sticks_game">Te mueven en el juego</string> + <string name="vr_controllers_sticks_hands">Mueven las manos</string> + <string name="vr_controllers_buttons">Botones</string> + <string name="vr_controllers_buttons_stick">Los gatillos son gatillos, los bumpers agarran, A/B y X/Y son los botones frontales de cada mano, al presionar los sticks se pulsan los joysticks, Guide abre el menú de SteamVR. Arriba y abajo en la cruceta acercan o alejan las manos.</string> + <string name="vr_controllers_buttons_vive">Los sticks son trackpads; A/X o presionar un stick los pulsa. Los gatillos son gatillos, los bumpers agarran, Start y Select son menú, Guide abre el menú de SteamVR.</string> + <string name="vr_controllers_buttons_off">Sin manos de RV. Los juegos compatibles con control, y el menú de SteamVR, reciben tu control como siempre.</string> <string name="glasses_brightness">Brillo</string> <string name="glasses_volume">Volumen</string> <string name="glasses_sunblock">Bloqueo solar</string> @@ -2524,6 +2861,21 @@ <string name="storage_safe_hint">Runtimes sin usar, restos, registros antiguos</string> <string name="storage_clean_up">Limpiar…</string> <string name="storage_session_running">Detén la sesión para limpiar o eliminar algo. Los tamaños se siguen mostrando.</string> + <string name="storage_default_group">Ubicación de instalación</string> + <string name="storage_default_title">Almacenamiento predeterminado</string> + <string name="storage_default_hint">Las nuevas instalaciones de las tiendas van a la ubicación seleccionada. Los juegos existentes se quedan donde están. Las bibliotecas de Steam conservan su propio ajuste.</string> + <string name="storage_default_ask">Preguntar siempre</string> + <string name="storage_default_ask_detail">Elige un destino para cada instalación</string> + <string name="storage_default_internal">Almacenamiento interno</string> + <string name="storage_default_external">Almacenamiento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">No conectado</string> + <string name="storage_default_folder">Carpeta · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">No conectada</string> + <string name="storage_default_choose_folder">Elegir carpeta…</string> + <string name="storage_default_choose_folder_detail">Usa cualquier carpeta de una tarjeta SD o unidad USB</string> + <string name="storage_default_note">Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven.</string> <string name="storage_where">Dónde va</string> <string name="storage_games">Juegos de Steam</string> <string name="storage_game_data">Datos de juegos</string> @@ -2652,6 +3004,9 @@ <string name="storage_data_installed">Juegos instalados</string> <string name="storage_data_parts">Prefijo %1$s · shaders %2$s · taller %3$s</string> <string name="storage_clear_shaders">Borrar shaders</string> + <string name="storage_reset_prefix">Restablecer prefijo</string> + <string name="storage_reset_prefix_title">¿Restablecer el prefijo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Borra su prefijo de Wine (%1$s) en %2$s y lo vuelve a crear en el próximo inicio. Se pierden las partidas, los ajustes y los redistribuibles instalados dentro; las partidas de Steam Cloud se conservan en tu cuenta.</string> <string name="storage_data_leftovers">Juegos desinstalados</string> <string name="storage_steam_app">App de Steam %1$d</string> <string name="storage_leftover_unsure_detail">Su prefijo aún contiene archivos, que pueden incluir partidas guardadas locales</string> @@ -2760,8 +3115,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> @@ -2965,4 +3344,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar con Syncthing</string> + <string name="sync_enable_hint">Basada en Syncthing-Fork, es una implementación de Syncthing que te permite sincronizar archivos del sistema de archivos interno de DroidDeck con otras instancias de Syncthing. Solo sirve para los archivos que guardas en el sistema de archivos interno de DroidDeck.</string> + <string name="sync_missing">Esta compilación no incluye Syncthing.</string> + <string name="sync_starting">Iniciando Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Actualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">En pausa</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Reanudando</string> + <string name="sync_status_attention">Requiere atención</string> + <string name="sync_status_failed">Syncthing se detuvo</string> + <string name="sync_failed_retry">Reintentar</string> + <string name="sync_paused_wifi">En pausa hasta tener Wi-Fi</string> + <string name="sync_paused_game">En pausa durante el juego</string> + <string name="sync_summary">%1$d carpetas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltan %1$s</string> + <string name="sync_open_web_ui">Abrir la interfaz web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Reanudar</string> + <string name="sync_running">En ejecución</string> + <string name="sync_running_hint">Desactívalo para detener Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID del dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avanzado</string> + <string name="sync_advanced_hint">Puertos, cuándo se ejecuta, restablecer</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Esperando tu respuesta</string> + <string name="sync_pending_device">%1$s quiere conectarse</string> + <string name="sync_pending_folder">%1$s quiere compartir “%2$s”</string> + <string name="sync_pending_folder_hint">Acepta para elegir dónde se guarda en DroidDeck.</string> + <string name="sync_review">Revisar en la interfaz web</string> + <string name="sync_folders">Carpetas</string> + <string name="sync_no_folders">Aún no hay carpetas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Escaneando</string> + <string name="sync_folder_paused">En pausa</string> + <string name="sync_folder_out_of_sync">No sincronizada</string> + <string name="sync_folder_errors">No se pudieron sincronizar %1$d archivos</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta carpeta está fuera del almacenamiento de DroidDeck, así que DroidDeck la puso en pausa. Para sincronizar carpetas fuera de DroidDeck, usa la app Syncthing-Fork.</string> + <string name="sync_remove_folder">Quitar de Syncthing</string> + <string name="sync_remove_folder_hint">Quitarla no borra ningún archivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Aún no hay dispositivos.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Sin conexión</string> + <string name="sync_last_seen">Visto por última vez %1$s</string> + <string name="sync_device_id_title">ID de este dispositivo</string> + <string name="sync_device_id_hint">En tu otro dispositivo, agrega un dispositivo en Syncthing y escanea este código o pega el ID. Después, acéptalo aquí en la interfaz web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartir</string> + <string name="sync_done">Listo</string> + <string name="sync_off_title">¿Desactivar Syncthing?</string> + <string name="sync_off_body">Syncthing se detiene ahora y seguirá detenido hasta que vuelvas a activarlo. Los archivos sincronizados se quedan donde están.</string> + <string name="sync_off_forget">Borrar también la configuración de Syncthing</string> + <string name="sync_off_forget_hint">Quita el ID de este dispositivo, las carpetas y los dispositivos. Al volver a activarlo, empieza desde cero.</string> + <string name="sync_turn_off">Desactivar</string> + <string name="sync_ports">Puertos</string> + <string name="sync_port_sync">Sincronización</string> + <string name="sync_port_discovery">Descubrimiento local</string> + <string name="sync_repick">Elegir puertos nuevos</string> + <string name="sync_repick_hint">Se vuelve a revisar en cada inicio.</string> + <string name="sync_repick_button">Volver a elegir</string> + <string name="sync_reset_group">Restablecer</string> + <string name="sync_api_key">Clave API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Restablecer Syncthing</string> + <string name="sync_reset_hint">ID de dispositivo nuevo; se quitan las carpetas y los dispositivos. Los archivos del almacenamiento de DroidDeck se conservan.</string> + <string name="sync_reset_button">Restablecer</string> + <string name="sync_reset_confirm_title">¿Restablecer Syncthing?</string> + <string name="sync_running_group">Ejecución</string> + <string name="sync_run">Ejecutar</string> + <string name="sync_run_open">Mientras DroidDeck está abierto</string> + <string name="sync_run_background">En segundo plano</string> + <string name="sync_wifi_only">Solo con Wi-Fi</string> + <string name="sync_pause_games">Pausar durante los juegos</string> + <string name="sync_logs">Registros</string> + <string name="sync_logs_hint">Salida de Syncthing de esta sesión</string> + <string name="sync_logs_share">Compartir</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura primero el runtime de Linux.</string> + <string name="sync_accept">Aceptar</string> + <string name="sync_accept_title">Guardar “%1$s” en</string> + <string name="sync_add_folder">Agregar carpeta</string> + <string name="sync_add_folder_hint">Sincroniza una carpeta del almacenamiento de DroidDeck</string> + <string name="sync_choose">Elegir</string> + <string name="sync_add">Agregar</string> + <string name="sync_add_failed">No se pudo agregar la carpeta.</string> + <string name="sync_share_with">Compartir con</string> + <string name="sync_share_none">Aún no hay dispositivos. Puedes compartir esta carpeta más tarde desde la interfaz web.</string> + <string name="sync_use_folder">Usar esta carpeta</string> + <string name="sync_new_folder">Carpeta nueva</string> + <string name="sync_location_home">Carpeta personal del contenedor</string> + <string name="sync_location_sync">Carpeta Sync</string> + <string name="sync_location_shared">Almacenamiento compartido de DroidDeck</string> + <string name="sync_location_card">DroidDeck en %1$s</string> + <string name="sync_location_app">Datos de la app DroidDeck</string> + <string name="sync_web_path_locked">Las carpetas nuevas se guardan en la carpeta Sync de DroidDeck. Para sincronizar otra carpeta de DroidDeck, usa Agregar carpeta en la pestaña Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recargar</string> + <string name="sync_not_running">Syncthing no se está ejecutando.</string> + <string name="session_end_steam_sigill">Steam se detuvo por una instrucción ilegal (SIGILL). Puede ser un problema de compatibilidad con instrucciones de la CPU o un fallo del cliente. Comparte los registros con los datos de tu dispositivo.</string> + <string name="session_end_steam_try_x64">Puedes probar Ajustes de Steam → Cliente de Steam → x86-64 (experimental). Requiere una descarga adicional y puede ir más lento.</string> + <string name="session_end_vulkan_device">El controlador gráfico de Linux no encontró un dispositivo Vulkan utilizable. Comprueba que el controlador de GPU de Linux seleccionado sea compatible con esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sesión no puede iniciarse porque esta GPU no tiene un controlador Vulkan de Linux compatible en la configuración actual. Los controladores Turnip de Adreno no pueden habilitar la compatibilidad con GPU MediaTek/Mali.</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_resources_browser">Se abre en tu navegador</string> + <string name="game_resource_guides">Guías</string> + <string name="game_resource_protondb_detail">Informes de compatibilidad de Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para juegos con partidas guardadas en tu cuenta de Steam</string> + <string name="game_resource_search">Búsqueda web</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="library_filter">Filtro</string> + <string name="library_filter_installed">Solo instalados</string> + <string name="library_filter_all_owned">Todos los juegos que tienes</string> + <string name="library_no_installed_matches">Ningún juego instalado coincide con estos filtros.</string> + <string name="library_browse_owned">Explorar los juegos que tienes</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="stores_itch_updates_found">Actualizaciones disponibles: %1$d</string> + <string name="stores_itch_update_replaced">El desarrollador reemplazó esta versión por %1$s. ¿Actualizar a ella?</string> + <string name="xbox_filter_cloud">Nube</string> + <string name="stores_xbox_cloud_settings">Configuración de nube</string> + <string name="integration_title">Integración con Steam</string> + <string name="integration_count">%1$d de %2$d activadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Ubicación</string> + <string name="integration_app_info">Información de la app</string> + <string name="integration_wifi">Nombres de Wi-Fi</string> + <string name="integration_brightness">Brillo</string> + <string name="integration_home">DroidDeck como inicio</string> + <string name="integration_shortcuts">Atajos del botón de inicio</string> + <string name="integration_wifi_hint">Muestra las redes en Steam · requiere acceso a la ubicación, nunca se rastrea</string> + <string name="integration_wifi_on">Las redes se muestran en Steam</string> + <string name="integration_wifi_location_off">La ubicación está desactivada</string> + <string name="integration_wifi_denied">Ubicación denegada · permítela en Información de la app</string> + <string name="integration_brightness_hint">El control deslizante de Steam ajusta el brillo de la pantalla</string> + <string name="integration_home_hint">Inicio abre el menú de Steam en una sesión</string> + <string name="integration_shortcuts_hint">Mantén Inicio para las combinaciones de Steam Guide</string> + <string name="integration_shortcuts_needs_home">Requiere DroidDeck como inicio</string> + <string name="integration_shortcuts_maybe_restricted">¿Aparece en gris en Android? Información de la app → ⋮ → Permitir configuración restringida</string> + <string name="integration_shortcuts_restricted">Bloqueado por Android · Información de la app → ⋮ → Permitir configuración restringida</string> + <string name="integration_shortcuts_service">Botón de inicio de DroidDeck</string> + <string name="integration_shortcuts_service_description">Pasa las pulsaciones del botón de inicio a Steam Guide mientras una sesión de Steam está en primer plano y DroidDeck es la app de inicio predeterminada. No lee el contenido de la pantalla.</string> + <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="apps_search_hint">Buscar apps</string> + <string name="apps_no_match">Ninguna app coincide con «%1$s».</string> + <string name="apps_add_widget">Agregar widget</string> + <string name="apps_widgets_loading">Cargando widgets…</string> + <string name="apps_widgets_none">Ninguna app de este dispositivo ofrece widgets.</string> + <string name="apps_widget_wider">Más ancho</string> + <string name="apps_widget_narrower">Más angosto</string> + <string name="apps_widget_taller">Más alto</string> + <string name="apps_widget_shorter">Más bajo</string> + <string name="apps_widget_move_earlier">Mover antes</string> + <string name="apps_widget_move_later">Mover después</string> + <string name="apps_widget_configure">Configuración del widget</string> + <string name="apps_widget_remove">Quitar widget</string> + <string name="apps_add_to_folder">Agregar a carpeta</string> + <string name="apps_new_folder">Carpeta nueva</string> + <string name="apps_remove_from_folder">Quitar de la carpeta</string> + <string name="apps_app_info">Información de la app</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Cambiar nombre</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Carpeta</string> + <string name="apps_folder_name">Nombre de la carpeta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas las apps</string> + <string name="apps_filter_games">Juegos</string> + <string name="apps_filter_downloaded">Descargadas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar en apps</string> + <string name="apps_shortcut_remove">Quitar acceso directo</string> + <string name="apps_pin_title">Agregar a Apps</string> + <string name="apps_pin_add">Agregar</string> + <string name="apps_hidden_none">No hay apps ocultas.</string> + <string name="apps_sort_name_asc">Nombre A–Z</string> + <string name="apps_sort_name_desc">Nombre Z–A</string> + <string name="apps_sort_installed">Instaladas recientemente</string> + <string name="apps_sort_updated">Actualizadas recientemente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d apps</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="desktop_restore_title">Restaurando tu software</string> + <string name="desktop_restore_body">Reinstalando las apps que agregaste después de una actualización de DroidDeck.</string> + <string name="desktop_restore_done_title">Software restaurado</string> + <string name="desktop_restore_done_body">Las apps que agregaste están instaladas otra vez.</string> + <string name="desktop_restore_failed_title">No se pudo restaurar parte del software</string> + <string name="desktop_restore_failed_body">Revisa ~/.cache/droiddeck/apt-restore.log y luego prueba sudo apt install en Konsole.</string> + <string name="gog_full_files">Las optimizaciones nativas no están disponibles. La descarga incluye archivos de reemplazo completos.</string> + <string name="gog_recover">Verificar el resultado del parche</string> + <string name="slow_usb_title">Conexión USB lenta</string> + <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán lento. Usa un cable USB 3 de 5 Gbps o más, prueba a voltear el conector USB-C o usa una unidad más rápida.</string> + <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no admite más velocidad, así que los juegos cargarán lento. El almacenamiento interno o una microSD pueden ser más rápidos.</string> + <string name="slow_usb_never">No volver a mostrar</string> + <string name="slow_usb_dismiss">Descartar</string> + <string name="steam_import_title">¿Reiniciar Steam para agregar tus juegos?</string> + <string name="steam_import_body">Steam puede mostrar como instalados estos juegos que tienes: %1$s. Tiene que reiniciarse para mostrarlos. Reinicia ahora o se agregarán la próxima vez que Steam se inicie.</string> + <string name="steam_import_names_more">%1$s y %2$d más</string> + <string name="steam_import_now">Reiniciar ahora</string> + <string name="steam_import_later">Más tarde</string> + <string name="gog_maintenance">Administrar la instalación de GOG</string> + <string name="gog_check">Buscar actualizaciones</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Parches sin conexión</string> + <string name="gog_refresh">Descargar el instalador sin conexión completo</string> + <string name="gog_update">Actualizar a %1$s</string> + <string name="gog_resume">Reanudar el mantenimiento de GOG</string> + <string name="gog_open_patch">Abrir el instalador del parche</string> + <string name="gog_patch_in_session">Termina o cancela el instalador del parche en la sesión de Linux.</string> + <string name="gog_patch_requirements">Elige un parche para tu versión instalada y tu idioma. Puede que no aparezcan todas las versiones de origen compatibles.</string> + <string name="gog_no_patches">GOG no tiene parches independientes de Windows para este juego.</string> + <string name="gog_managed_files">Los archivos del juego modificados pueden reemplazarse.</string> + <string name="gog_patch_installer_note">El instalador se abre en tu sesión de Linux.</string> + <string name="gog_download_label">Descarga</string> + <string name="gog_space_label">Espacio adicional</string> + <string name="gog_space_estimate_label">Espacio estimado</string> + <string name="gog_repair_action">Reparar archivos</string> + <string name="gog_refresh_action">Renovar la instalación</string> + <string name="gog_select_patch">Seleccionar</string> + <string name="setup_all_files">Acceso a todos los archivos</string> + <string name="setup_local_network">Red local</string> + <string name="libraries_title">Más bibliotecas de Steam</string> + <string name="libraries_hint">Carpetas donde Steam puede instalar y ejecutar juegos, cada una con su propio nombre. Quitarlas conserva los juegos en el disco.</string> + <string name="libraries_add">Agregar biblioteca</string> + <string name="libraries_rename_title">Nombre de la biblioteca</string> + <string name="libraries_pick">Elige una carpeta para la biblioteca</string> + <string name="libraries_full">Como máximo %1$d bibliotecas adicionales</string> + <string name="libraries_overlap">Esa carpeta ya es una biblioteca o está dentro de una</string> + <string name="libraries_missing">%1$s · no disponible</string> + <string name="libraries_applies_next">Se aplica a partir de la próxima sesión de Steam</string> + <string name="bottom_desktop_start">Iniciar el escritorio</string> + <string name="bottom_desktop_mode_touch">Toque directo</string> + <string name="bottom_desktop_trackpad">Panel táctil. Toca para usar el toque directo</string> + <string name="bottom_desktop_direct_touch">Toque directo. Toca para usar el panel táctil</string> + <string name="bottom_desktop_starting">Iniciando el escritorio KDE…</string> + <string name="bottom_desktop_ended">El escritorio se cerró.</string> + <string name="bottom_desktop_failed">El escritorio no pudo iniciarse. Sus registros están en la carpeta bottom-desktop de esta sesión.</string> + <string name="bottom_desktop_off">El escritorio está cerrado.</string> + <string name="libraries_rename">Renombrar</string> + <string name="second_mode_desktop">Escritorio</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Escritorio · %1$s</string> </resources> diff --git a/app/src/main/res/values-bg/gestures.xml b/app/src/main/res/values-bg/gestures.xml index 7c05b9b60..60d56796f 100644 --- a/app/src/main/res/values-bg/gestures.xml +++ b/app/src/main/res/values-bg/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Жестове</string> <string name="gesture_settings">Настройки на сензорните жестове</string> - <string name="gesture_settings_hint">Настройте жестовете за мишка и клавиатура. За да ги използвате, изберете сензорен режим „Жестове“.</string> <string name="gesture_tap">Докосване</string> <string name="gesture_drag">Плъзгане с един пръст</string> <string name="gesture_long_press">Продължително натискане</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Задържане с три пръста</string> <string name="gesture_pinch">Мащабиране със събиране или раздалечаване на пръстите</string> <string name="gesture_hold_button">Задържане на бутона натиснат</string> + <string name="gesture_hold_left">Задържане на левия бутон</string> + <string name="gesture_hold_right">Задържане на десния бутон</string> <string name="gesture_click_once">Еднократно щракване</string> <string name="gesture_hold_delay">Закъснение за задържане</string> <string name="gesture_double_delay">Интервал за двойно докосване</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Интервал</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-bg/shortcuts.xml b/app/src/main/res/values-bg/shortcuts.xml new file mode 100644 index 000000000..076068c11 --- /dev/null +++ b/app/src/main/res/values-bg/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Преки пътища с физически бутони</string> + <string name="shortcuts_dd_menu">Меню на DroidDeck</string> + <string name="shortcuts_capture">Задаване: %1$s</string> + <string name="shortcuts_press">Натиснете и отпуснете бутон. Назначението се запазва автоматично.</string> + <string name="shortcuts_release">Отпуснете бутона, за да продължите.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Този бутон вече е зададен за: %1$s</string> + <string name="shortcuts_save">Преназначаване</string> + <string name="shortcuts_retry">Опитайте друг бутон</string> + <string name="shortcuts_limitations">Бутонът Начало и някои допълнителни бутони може да не са налични.</string> +</resources> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9dcc424a1..81875ff80 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Настройки на VKD3D за D3D12. nodxr изключва трасирането на лъчи; използвайте само за игра, която го изисква.</string> <string name="game_env_proton_log">Задайте 1 за диагностичен дневник на Proton. Записването на дневник може да намали производителността и да използва място в хранилището.</string> <string name="game_env_wined3d">Задайте 1, за да използвате WineD3D, базиран на OpenGL, вместо DXVK за тестване на съвместимост с D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер за DirectDraw, Direct3D 1-7 и игри, стартирани с WineD3D. Vulkan пропуска пътя OpenGL през Zink и е много по-бърз за стари игри с DirectDraw и Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Задайте 1, за да се изпълнява Direct3D 8 през DXVK вместо WineD3D. По-бързо в теста за Direct3D 8 на AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Задайте 1, за да изключите ntsync (droiddeck-ntsync или драйвер на ядрото) за тази игра; тогава се използва droiddeck-esync, ако има пакет, или droiddeck-fsync в противен случай.</string> <string name="game_env_no_esync">Задайте 1, за да изключите droiddeck-esync за тази игра; вместо това се използва droiddeck-fsync, или droiddeck-ntsync, ако fsync също е изключен.</string> <string name="game_env_no_fsync">Задайте 1, за да изключите droiddeck-fsync за тази игра; тогава се използва droiddeck-esync, ако има пакет, или droiddeck-ntsync в противен случай.</string> <string name="game_env_fsync_first">Задайте 1, за да стартирате тази игра с droiddeck-fsync, или 0, за да поставите droiddeck-esync на първо място, ако има пакет, подходящ за нейния Proton.</string> <string name="game_env_xalia">Задайте 0, за да изключите помощника на Proton за навигация с контролер за тази игра.</string> + <string name="game_env_anticheat_offline">Включено по подразбиране. Стартира игра с Easy Anti-Cheat без античийта ѝ, когато играта поддържа офлайн игра. Изключете, за да стартирате през Easy Anti-Cheat както обикновено. Онлайн режимите, които изискват Easy Anti-Cheat, остават недостъпни.</string> <string name="game_env_hud">Насложен слой на DXVK за D3D9–11. fps показва честотата на кадрите; незададено го скрива.</string> <string name="game_env_dxvk_config">Настройки на DXVK, разделени с точка и запетая. По-новите версии използват dxvk.maxFrameRate за ограничаване на кадрите; за обикновена игра предпочитайте ограничителя на кадри на сесията.</string> + <string name="game_env_cores">CPU ядра за тази игра, например 0-4 или 0,2,4, вместо ядрата за игри на сесията. По-малко ядра означават по-ниска температура.</string> <string name="game_env_vkd3d_limit">Ограничение на честотата на кадрите за D3D12. 0 изключва ограничението.</string> <string name="game_env_glthread">Многонишковост на Mesa OpenGL. true може да помогне при игри с OpenGL, ограничени от процесора; тествайте за всяка игра.</string> <string name="sync_backend_title">Синхронизация на Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX стартира x86 Linux програми на това ARM64 устройство. Автоматично го използва, когато програмата е компилирана за x86.</string> <string name="app_fex_x86">%1$s през FEX</string> <string name="app_fex_not_ready">Тази програма е компилирана за %1$s компютри и се стартира през FEX, който още не е настроен. Отворете Steam веднъж, докато сте влезли: DroidDeck ще изтегли FEX и необходимата Steam Linux Runtime, след което тя ще се отвори.</string> + <string name="session_proot_missing">proot на DroidDeck не можа да бъде изтеглен. Проверете връзката и опитайте пак. Сесията не беше стартирана, защото резервният proot е твърде бавен за игра.</string> + <string name="session_directaudio_missing">DirectAudio не можа да бъде изтеглен, затова звукът на игрите използва по-бавния път в тази сесия.</string> <string name="session_end_program">Тази програма</string> <string name="session_end_steam_download">Клиентът на Steam не можа да бъде изтеглен. Мрежата или VPN връзката ви може да блокира сървърите на Steam; проверете връзката и опитайте отново.</string> <string name="session_end_steam_setup">Клиентът на Steam не можа да бъде настроен. Проверете връзката и свободното място, след което опитайте отново.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Контролер Xbox 360</string> <string name="mode_controller_note">Deck: бутон Quick Access и гироскоп. Steam Controller: същото, с усещане за захват на задните бутони. DualShock 4 и DualSense: гироскоп, а тракпадовете служат като тъчпад. Xbox 360: отворете Quick Access с Guide+A.</string> <string name="mode_back">Back</string> + <string name="back_hold">Задържане на Назад за преки пътища в Steam</string> + <string name="back_hold_hint">Задържането на Назад отваря Бърз достъп или прави комбинации в Steam с други бутони. Изключете, за да се пренебрегва задържането; докосване и двойно докосване още работят.</string> + <string name="back_native_qam_hint">Задръжте Back за 700 ms или задръжте Back и натиснете друг бутон за преки пътища на Steam.</string> + <string name="back_double_tap_window">Интервал за двойно докосване</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Разрешаване на управлението на яркостта</string> + <string name="brightness_permission_text">Настройте управлението на яркостта в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сесия</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Актуално · %1$s</string> <string name="mode_decky_loader">Зареждач</string> <string name="mode_decky_install_latest">Инсталиране на последната версия</string> + <string name="decky_channel">Канал за актуализации</string> + <string name="decky_channel_hint">Кои издания на Decky Loader да се инсталират. Собственият актуализатор на Decky използва същия канал.</string> + <string name="decky_channel_stable">Стабилен</string> + <string name="decky_channel_prerelease">Предварителен</string> + <string name="decky_channel_testing">Тестов</string> + <string name="decky_channel_failed">Каналът за актуализации на Decky не можа да бъде запазен</string> <string name="mode_decky_on">Стартира заедно със Steam. Докато е включено, други приложения на това устройство може да могат да контролират Steam.</string> <string name="mode_decky_off">Изключено. Портът за отдалечено дебъгване на Steam остава затворен.</string> <string name="mode_decky_remove_title">Деинсталиране на Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Клиент</string> <string name="mode_mangoapp">Насложен слой за производителност</string> <string name="mode_mangoapp_hint">Изключете, ако игрите забиват или екранът става черен в режим Deck. Прилага се от следващата сесия.</string> + <string name="mode_return_after_game">Връщане в DroidDeck след игра</string> + <string name="mode_return_after_game_hint">Когато игра, стартирана от DroidDeck или друг стартер, се затвори, Steam излиза правилно (първо се довършват облачните записи) и се връщате там. Изключено: оставате в Steam.</string> + <string name="mode_shader_precache">Предварително кеширане на шейдъри</string> + <string name="mode_shader_precache_hint">Steam изтегля предварително изградени шейдъри за игрите ви и ги обработва във фонов режим, така че игрите засичат по-малко. Изключено пести данни, място и батерия; вместо това игрите изграждат шейдърите по време на игра. Същата настройка като „Изтегляния > Предварително кеширане на шейдъри“ в Steam. Прилага се от следващата сесия.</string> <string name="mode_steam_repair">Поправка на клиента на Steam</string> <string name="mode_steam_repair_hint">Изтегля отново клиента на Steam при следващото стартиране на Steam. Използвайте, ако Steam остава на екрана за зареждане. Игрите, влизането в профила и настройките се запазват.</string> <string name="mode_steam_repair_queued">Клиентът на Steam ще бъде изтеглен отново при следващото стартиране на Steam.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Пропуска PulseAudio за по-ниска латентност.</string> <string name="mode_mic">Микрофон</string> <string name="mode_mic_hint">За гласов чат.</string> + <string name="drawer_mic_hint">Включване или изключване на записа от микрофона за тази сесия.</string> + <string name="drawer_mic_failed">Микрофонът не можа да бъде променен. Опитайте пак.</string> <string name="mode_network">Мрежа</string> <string name="mode_wifi_discovery">Откриване на Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показва имената на Wi-Fi и близките мрежи в Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: GPU опашка в реално време</string> <string name="perf_gsrealtime_hint">Дава приоритет на GPU работата на компоситора. Може да изглади темпото на кадрите с известна цена за игрите.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Памет</string> + <string name="perf_cap_off">Изкл.</string> + <string name="perf_cap_auto">По подразбиране за драйвера</string> + <string name="perf_zram_client">Компресиране на Steam, докато върви игра</string> + <string name="perf_zram_client_hint">20 s след стартиране на игра клиентът на Steam се компресира в zRAM, за да остави повече памет на играта, и се прочита обратно, когато играта се затвори. Изключете, ако сесията се затваря малко след стартиране на игри. Ограничение на RAM по-горе пак компресира Steam, когато сесията го надхвърли.</string> + <string name="perf_ram_cap">Ограничение на RAM</string> + <string name="perf_ram_cap_hint">Прилага се, докато клиентът на Steam работи, в режим Steam или от работния плот. Когато сесията използва повече от това, Steam и след това другите поддържани процеси на сесията се компресират в zRAM. Меко ограничение: нищо не се затваря, но игрите може да засичат, докато страниците се връщат.</string> + <string name="perf_ram_cap_unavailable">Изисква zRAM swap, който това устройство няма.</string> + <string name="perf_vram_cap">Ограничение на VRAM</string> + <string name="perf_vram_cap_hint">Видеопаметта, която DXVK отчита на игрите с Direct3D, за да планират текстури за по-малко. Собствените настройки на DXVK на играта имат предимство. Прилага се от следващата сесия.</string> <string name="perf_gpuclock">Задръжте GPU на максималната му честота</string> <string name="perf_gpuclock_hint">Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина.</string> <string name="perf_fixes">Корекции на сесията</string> <string name="perf_sysmem">Turnip: рендиране sysmem</string> <string name="perf_sysmem_hint">По-бързо за клиента на Steam; в игрите драйверът избира за всеки проход между рендериране на плочки и в системната памет. Задължително на Adreno 710/720/722.</string> <string name="perf_xalia">Пропускане на помощника xalia на Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (експериментално)</string> - <string name="perf_fastsync_hint">Заместител на потребителско ниво за драйвера ntsync на Linux, за тестване. Докато е включен, Proton го използва вместо droiddeck-esync и droiddeck-fsync. Работи с Proton Experimental ARM64, GE-Proton и proton-cachyos. Прилага се от следващата сесия.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Заместител на потребителско ниво за драйвера ntsync на Linux. Докато е включен, Proton го използва вместо droiddeck-esync и droiddeck-fsync. Работи с Proton Experimental ARM64, GE-Proton и proton-cachyos. Прилага се от следващата сесия.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync първо</string> <string name="perf_fsync_hint">Стартира собствения fsync на Proton върху оригиналните файлове на Proton, с futex_waitv, подаден от потребителско ниво, затова не изисква пакет и продължава да работи веднага след актуализация на Proton от Steam. Докато е включен, игрите го използват преди droiddeck-esync, освен малкото, които Proton държи извън fsync. Прилага се от следващата сесия.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">Бърз път на proot</string> <string name="perf_fastpath_needs_seccomp">Изисква филтъра seccomp на proot.</string> <string name="perf_fastpath_hint">По-бързо търсене на файлове и по-малко заекване. Изключете, ако програма не може да намери файловете си.</string> + <string name="perf_cursor_composite">Изобразяване на курсора в gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам рисува показалеца, вместо да го предава на Android. Включете за курсор, управляван с контролер. Изключено е по-бързо на телефон. Прилага се от следващата сесия.</string> <string name="perf_identity">Идентичност на сесията</string> <string name="perf_hostname">Име на хоста</string> <string name="perf_hostname_hint">Името, което Steam вижда за това устройство. Оставено празно възстановява %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Файловете му се премахват от приложението.</string> <string name="driver_delete_in_use">Файловете му се премахват. В употреба е, затова стандартният драйвер поема.</string> <string name="drawer_page_display">Екран</string> + <string name="drawer_frame_limit">Ограничение на кадрите</string> + <string name="drawer_frame_limit_note">Ограничава тази игра. Екранът преминава към честота на опресняване, която се дели точно на ограничението, ако има такава; другите ограничения може да изглеждат неравномерни. Игрите в Steam използват Frame Limit на Steam в менюто Quick Access.</string> <string name="drawer_page_effects">Ефекти</string> <string name="drawer_page_controls">Контроли</string> <string name="drawer_page_components">Компоненти</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Кехлибарено</string> <string name="drawer_hud_color_violet">Виолетово</string> <string name="drawer_hud_opacity">Прозрачност</string> + <string name="hud_size">Размер</string> + <string name="hud_size_hint">Докосването на HUD също променя размера му.</string> + <string name="hud_size_full">Пълен</string> + <string name="hud_size_tiles">Плочки</string> + <string name="hud_size_pill">Хапче</string> + <string name="hud_size_minimal">Минимален</string> + <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Лента</string> + <string name="hud_locked">Заключване на място</string> + <string name="hud_locked_hint">Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят.</string> + <string name="hud_snap">Залепване отстрани</string> + <string name="hud_snap_hint">Пуснете HUD и той отива към по-близката страна на екрана. Бързо плъзване го хвърля в тази посока.</string> + <string name="hud_group_look">Визия</string> + <string name="hud_scale">Размер на екрана</string> + <string name="hud_color_soft">Мек</string> + <string name="hud_color_mid">Среден</string> + <string name="hud_color_vivid">Наситен</string> + <string name="hud_outline">Контур</string> + <string name="hud_outline_color">Цвят на контура</string> + <string name="hud_outline_gray">Сив</string> + <string name="hud_outline_theme">Цвят на темата</string> + <string name="hud_group_metrics">Показания</string> + <string name="hud_metric_graph">Графика на времето на кадрите</string> + <string name="hud_metric_decimal">Честота на кадрите с десетичен знак</string> + <string name="hud_metric_low001" formatted="false">0.01% най-ниски</string> + <string name="hud_metric_engine">Графичен двигател</string> + <string name="hud_metric_gpu_model">Име на GPU</string> + <string name="hud_metric_gpu">Натоварване на GPU</string> + <string name="hud_metric_gpu_temp">Температура на GPU</string> + <string name="hud_metric_cpu">Натоварване на CPU</string> + <string name="hud_metric_per_core">CPU по ядра</string> + <string name="hud_metric_temp">Температури</string> + <string name="hud_metric_ram">Памет</string> + <string name="hud_metric_vram">Графична памет</string> + <string name="hud_metric_swap">Swap памет</string> + <string name="hud_metric_battery">Ниво на батерията</string> + <string name="hud_metric_power">Консумация на енергия</string> + <string name="hud_metric_network">Мрежа</string> + <string name="hud_metric_resolution">Разделителна способност</string> + <string name="hud_metric_proton">Версия на Proton</string> + <string name="hud_metric_session">Продължителност на сесията</string> + <string name="hud_metric_clock">Часовник</string> + <string name="hud_group_temps">Температури</string> + <string name="hud_temp_unit">Мерна единица</string> + <string name="hud_temp_bands">Предупредителни цветове</string> + <string name="hud_temp_bands_hint">Температурите стават кехлибарени, а после червени, когато наближат границата.</string> + <string name="hud_temp_bands_off">Изкл.</string> + <string name="hud_temp_bands_auto">Автоматично</string> + <string name="hud_temp_bands_manual">Ръчно</string> + <string name="hud_temp_red_cpu">CPU в червено от</string> + <string name="hud_temp_red_gpu">GPU в червено от</string> + <string name="hud_temp_red_battery">Батерия в червено от</string> + <string name="hud_group_more">Повече</string> + <string name="hud_export">Диагностика на HUD</string> + <string name="hud_export_hint">Записва в Downloads/DroidDeck отчет за всеки сензор, който HUD чете.</string> + <string name="hud_export_button">Запиши</string> + <string name="hud_export_done">Записано в %1$s</string> + <string name="hud_export_failed">Отчетът за HUD не можа да бъде записан.</string> + <string name="hud_reset">Нулиране на настройките на HUD</string> + <string name="hud_reset_button">Нулиране</string> <string name="drawer_scaling">Режим на мащабиране</string> <string name="drawer_scaling_sharpness">Острота на мащабиране</string> <string name="drawer_effects">Ефекти на екрана</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Автоматично (%1$s)</string> <string name="drawer_keyboard">Клавиатура</string> <string name="drawer_latency">Закъснение</string> + <string name="drawer_low_latency">Режим на ниска латентност</string> + <string name="drawer_low_latency_hint">Увеличава използването на CPU и батерията</string> <string name="drawer_low_latency_controller">Контролер с ниско закъснение</string> <string name="drawer_low_latency_controller_hint">Контролерът докладва при 1000 Hz вместо 250 Hz. Малко повече CPU.</string> <string name="drawer_low_latency_touch">Докосване с ниско закъснение</string> <string name="drawer_low_latency_touch_hint">Докосванията пропускат групирането на кадри; управлението с докосване в Steam работи при 1000 Hz. Малко повече CPU.</string> + <string name="drawer_evdev_mouse">Суров канал за мишка</string> + <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавиатура за компютър</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Втори екран</string> @@ -715,6 +834,10 @@ <string name="setup_session">Сесия</string> <string name="setup_logs">Дневници на сесията</string> <string name="setup_logs_hint">Запазват се след всяка сесия</string> + <string name="setup_game_debug_logs">Дневници за дебъгване на игри</string> + <string name="setup_game_debug_logs_hint">Включва диагностика на Proton, Wine и графиката при следващото стартиране на игра. Може да намали производителността и да заеме повече място.</string> + <string name="setup_game_debug_logs_restart">Рестартирайте тази сесия, за да запазите дневниците за дебъгване на игри</string> + <string name="setup_logging_update_failed">Записването в дневник не можа да бъде променено. Проверете превключвателя и опитайте пак.</string> <string name="setup_agent_commands">Инструменти за отстраняване на грешки</string> <string name="setup_latest_logs">Последни дневници на сесията</string> <string name="setup_saved_logs">Запазени дневници на сесията</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck може да бъде приложението за начален екран</string> <string name="setup_home_off">DroidDeck никога не се предлага като приложение за начален екран</string> <string name="setup_orientation">Ориентация</string> + <string name="setup_launcher_orientation">Ориентация на стартера</string> + <string name="setup_launcher_orientation_auto">Следва завъртането на устройството</string> + <string name="setup_orientation_portrait">Вертикална</string> + <string name="setup_session_orientation">Ориентация на сесията</string> + <string name="setup_session_orientation_hint">Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; персонализираните ширина и височина остават както са въведени.</string> <string name="setup_orientation_auto">Автоматичен хоризонтален</string> <string name="setup_orientation_landscape">Хоризонтална</string> <string name="setup_orientation_reverse">Обърната хоризонтална</string> <string name="setup_fullscreen">Цял екран</string> <string name="setup_fullscreen_on">Скрива лентите за състояние и навигация на Android</string> <string name="setup_fullscreen_off">Показва лентите за състояние и навигация на Android</string> + <string name="setup_dual_screen">Двоен екран</string> + <string name="setup_dual_screen_hint">Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран.</string> + <string name="setup_dual_screen_auto">Автоматично</string> + <string name="setup_dual_screen_on">Вкл.</string> + <string name="setup_dual_screen_off">Изкл.</string> + <string name="setup_dual_screen_menu">Меню на долния екран</string> + <string name="setup_dual_screen_menu_hint">Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите.</string> + <string name="setup_dual_screen_controls">Контроли на долния екран в игрите</string> + <string name="setup_dual_screen_controls_hint">Отваря тракпада и клавиатурата на втория екран при стартиране на сесия.</string> + <string name="dual_typing_title">Въвеждане за горния екран</string> + <string name="dual_typing_done">Готово</string> <string name="setup_default_home">Приложение за начален екран по подразбиране</string> <string name="setup_choose_home">Изберете приложение за начален екран</string> <string name="setup_choose">Избор</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Отворете Настройки → Опции за програмисти → Безжично отстраняване на грешки и го включете</string> <string name="gate_step2">Докоснете „Сдвояване на устройство с код за сдвояване“</string> <string name="gate_step3">Въведете кода в известието на DroidDeck</string> + <string name="pairguide_build_number">В „Всичко за телефона“ докоснете „Номер на версията“ 7 пъти</string> + <string name="pairguide_wireless">Включете „Безжично отстраняване на грешки“</string> + <string name="pairguide_pair">Отворете „Безжично отстраняване на грешки“, след което докоснете „Сдвояване на устройството с код за сдвояване“</string> + <string name="pairguide_child_process">Включете „Деактивиране на ограниченията за дъщерните процеси“</string> + <string name="pairguide_row_child_process">Деактивиране на ограниченията за дъщерните процеси</string> + <string name="pairguide_row_build_number">Номер на версията</string> + <string name="pairguide_row_wireless">Безжично отстраняване на грешки</string> + <string name="pairguide_row_pair">Сдвояване на устройството с код за сдвояване</string> <string name="gate_waiting">Изчакване на изскачащия прозорец за сдвояване…</string> <string name="gate_code_needed">Изскачащият прозорец е намерен. Въведете кода му в известието.</string> <string name="gate_status">Състояние</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Никога не е играна</string> <string name="games_runtime_busy_percent">Средата за изпълнение е заета · %1$d%%</string> <string name="games_runtime_busy">Средата за изпълнение е заета</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Скриване на драйверите за други GPU</string> <string name="gpu_show_other">Показване на драйверите за други GPU</string> <string name="gpu_advanced">Разширени</string> + <string name="gpu_ubwc_title">Съвместимост с UBWC</string> + <string name="gpu_ubwc_hint">Опитайте Вкл. или Изкл., ако Steam или Android показва ивици или трептене. Прилага се и за двата драйвера след рестартиране на DroidDeck.</string> + <string name="gpu_ubwc_restart">Рестартирайте DroidDeck, за да се приложи.</string> <string name="gpu_set_with_display">Задава се заедно с драйвера за дисплея: %1$s включва и двете.</string> <string name="gpu_set_with_runtime">Задава се заедно с драйвера за изпълнение: %1$s включва и двете.</string> <string name="gpu_runtime_hint">Използва се от игрите и работния плот.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Автоматично влизане в „Картина в картината“</string> <string name="unfolded_controls">Контроли на разгънатия екран</string> <string name="unfolded_controls_hint">Разгънат, играта стои над тракпадите и задните захвати на Steam Deck. Сгънат, играта е на цял екран.</string> + <string name="unfolded_controls_with_controller">Запазване при контролер</string> + <string name="unfolded_controls_with_controller_hint">Показване на тези контроли с докосване и когато има свързан контролер.</string> <string name="pip_suspended">Прекъсната</string> <string name="pip_not_ready">Картина в картината е достъпна само когато сесията е готова.</string> <string name="pip_permission">Разреши картина в картината за DroidDeck в настройките на Android.</string> <string name="pip_unavailable">Android не можа да отвори картина в картината.</string> + <string name="game_more">Още</string> + <string name="game_edit_art">Редактиране на изображенията</string> + <string name="stores_in_steam_label">В Steam</string> <string name="game_shortcut">Пряк път</string> <string name="game_shortcut_add">Добавяне към началния екран</string> <string name="game_shortcut_choose">Избор на игра</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Изчакай операцията със средата да приключи</string> <string name="main_wait_proton_install">Изчакай инсталирането на инструмента за съвместимост да приключи</string> + <string name="load_compat_title">Подготовка на инструментите за съвместимост</string> + <string name="load_compat_wait">Изчакване настройката за съвместимост да завърши</string> + <string name="load_compat_hint">Сесията ви ще започне, когато настройката завърши.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Изчакай инсталирането на работния плот да приключи</string> <string name="main_wait_install_game">Изчакай инсталирането да приключи, преди да пуснеш игра.</string> <string name="main_saves_close_session">Затвори сесията на Steam, за да играта не презапише импортираните файлове.</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Инсталиране въпреки това</string> <string name="main_remove_runtime_title">Премахване на средата на Linux</string> <string name="main_remove_runtime_text">Това изтрива средата, клиента на Steam в нея и всяка инсталирана в нея игра.</string> + <string name="runtime_actions_title">Среда на Linux</string> + <string name="runtime_actions_text">Поправката преинсталира системните файлове на средата и запазва Steam, игрите и настройките ви. Допълнения като работния плот се инсталират отново, когато ги използвате следващия път. Премахването изтрива всичко.</string> + <string name="runtime_repair">Поправка на средата</string> <string name="main_applied">Приложено: %1$s</string> <string name="android_app_open_failed_primary">%1$s не можа да се отвори на основния екран</string> <string name="android_app_open_failed_on">%1$s не можа да се отвори на %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Каталогът на средата не можа да бъде достигнат. Провери връзката и натисни „Пускане“ отново.</string> <string name="session_runtime_install_failed">Средата на Linux не се инсталира. Провери средата в „Настройка“ и натисни „Пускане“ отново.</string> <string name="session_desktop_install_failed">Работният плот не се инсталира (%1$s). Провери връзката и натисни „Desktop“ отново.</string> + <string name="session_package_resume_failed">Прекъсната инсталация не можа да бъде довършена (%1$s). Проверете връзката и мястото, след което опитайте пак.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Средата на Linux е повредена: %1$d връзка към библиотека сочи към липсващ файл (%2$s), обикновено след прекъсната инсталация. Поправката запазва игрите и настройките ви.</item> + <item quantity="other">Средата на Linux е повредена: %1$d връзки към библиотеки сочат към липсващи файлове (%2$s и други), обикновено след прекъсната инсталация. Поправката запазва игрите и настройките ви.</item> + </plurals> <string name="session_ended_named">%1$s спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> <string name="session_ended_program">Програмата спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> <string name="session_ended_desktop">Работният плот спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Инсталирай ZIP с плъгин за следващата сесия на Steam.</string> <string name="mode_decky_plugin_downloading">Изтегляне…</string> <string name="mode_decky_plugin_install_zip">Инсталиране от ZIP</string> + <string name="decky_zip_warning_title">Инсталиране на плъгин от трета страна</string> + <string name="decky_zip_warning_text">Екипът на Decky Loader не е прегледал този плъгин. Той може да съдържа зловреден софтуер, например за кражба на акаунта ви в Steam или за увреждане на устройството ви. С инсталирането на този плъгин приемате, че поемате всички рискове за устройството си.</string> + <string name="decky_zip_warning_continue">Продължи</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Изчакайте %1$d секунда</item> + <item quantity="other">Изчакайте %1$d секунди</item> + </plurals> <string name="store_cat_games">Игри</string> <string name="store_cat_audio_video">Аудио и видео</string> <string name="store_cat_graphics">Графика</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Черен фон, бял текст, синьото за всичко избрано, на фокус или натиснато.</string> <string name="theme_electric">Яркосиньо</string> <string name="theme_electric_detail">По-яркото синьо, върху повърхности, по-близки до тъмносиньо, вместо сиво.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Цветове, които преминават през дъгата. Следва настройките за анимации на Android.</string> + <string name="theme_rgb_speed">Скорост</string> + <string name="theme_rgb_speed_hint">Колко бързо се сменят цветовете.</string> <string name="theme_gradient">Градиент</string> <string name="theme_gradient_detail">Вашите основен и вторичен цвят, смесени в бутоните и акцентите.</string> <string name="theme_gradient_primary">Основен</string> @@ -1424,7 +1597,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Интервал</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Пропускане</string> <string name="fm_select_this_folder">Избор на тази папка</string> <string name="fm_back">Назад</string> + <string name="fm_exit">Изход</string> + <string name="fm_return_to_start">Връщане в началната папка</string> + <string name="fm_start_unavailable">Началната папка вече не е достъпна</string> + <string name="fm_cancel_operation_title">Отмяна на операцията?</string> + <string name="fm_cancel_operation_confirmation">Операцията ще бъде отменена. Сигурни ли сте?</string> + <string name="fm_accept">Приемам</string> + <string name="fm_decline">Отказвам</string> <string name="fm_drive_not_readable">%1$s е монтирано, но в момента не може да се прочете</string> + <string name="fm_drive_access_title">Разрешаване на достъп до %1$s</string> + <string name="fm_drive_access_text">Android позволява на DroidDeck да вижда това устройство, но не и да го чете. Включете Достъп до всички файлове за DroidDeck и се върнете.</string> <string name="fm_list_view">Изглед като списък</string> <string name="fm_grid_view">Изглед като мрежа</string> <string name="fm_search">Търсене</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Клавиатура + тракпад</string> <string name="second_mode_terminal">Терминал</string> <string name="second_mode_deck_controls">Захвати + тракпади на Deck</string> + <string name="second_mode_dashboard">Табло</string> + <string name="bottom_dashboard_empty">Все още няма нищо за показване.</string> + <string name="bottom_page_downloads">Изтегляния</string> + <string name="bottom_downloads_none">Няма активни изтегляния.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Изтегляне на кеша на шейдърите</string> + <string name="bottom_downloads_paused">На пауза</string> + <string name="bottom_downloads_queued">Изчаква стартиране</string> + <string name="bottom_page_notifications">Известия</string> + <string name="bottom_notifications_listener">Долен екран на DroidDeck</string> + <string name="bottom_notifications_why">Показвайте тук съобщения и други известия, докато играете. Те остават само на този екран и не се запазват. Android пита веднъж: страницата за достъп до известията се отваря на този екран; включете DroidDeck там и тази страница ще се върне сама.</string> + <string name="bottom_notifications_allow">Разрешаване на достъпа до известията</string> + <string name="bottom_notifications_none">Няма известия.</string> + <string name="bottom_notifications_count">Известия: %1$d</string> + <string name="bottom_notifications_clear">Изчисти</string> + <string name="bottom_page_screenshots">Екранни снимки</string> + <string name="stats_fps_needs_hud">За FPS трябва HUD да е включен</string> + <string name="stats_speed">Скорост</string> + <string name="stats_pedals">Педали</string> + <string name="stats_gforce">G-сила</string> + <string name="stats_timing">Времена</string> + <string name="stats_best_lap">Най-добра обиколка</string> + <string name="stats_tires">Гуми °C</string> + <string name="stats_trace">Газ и спирачка, последните 10 s</string> + <string name="stats_speed_chart">Скорост, %1$s</string> + <string name="stats_gear">Предавка</string> + <string name="stats_speed_units">Единици за скорост</string> + <string name="stats_speed_units_auto">Автоматично (%1$s)</string> + <string name="stats_steam_client_arm">Steam клиент ARM</string> + <string name="stats_steam_client_x86">Steam клиент x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Спирачка</string> + <string name="stats_lights">Табло</string> + <string name="stats_lamp_shift">Смяна на предавка</string> + <string name="stats_lamp_handbrake">Ръчна спирачка</string> + <string name="stats_lamp_pit">Ограничител за бокса</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигател %1$s °C</string> + <string name="stats_oil_temp">Масло %1$s °C</string> + <string name="stats_power">Разпределител на енергия</string> + <string name="stats_fuel_t">Гориво, t</string> + <string name="stats_fuel_main">Основно %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="stats_tap_hint">Докоснете горната лента или таблото, за да смените стила му.</string> + <string name="bottom_telemetry_send_title">Изпращане на данни за таблото</string> + <string name="bottom_telemetry_send_auto">Автоматично</string> + <string name="bottom_telemetry_send_auto_hint">Включва го за всяка игра от списъка тук, включително игри, открити по-късно. Игрите, които изключите, остават изключени.</string> + <string name="bottom_telemetry_send_note">Това променя собствената настройка на играта за извеждане на данни. Влиза в сила при следващото стартиране на играта; изключването връща старата настройка.</string> + <string name="bottom_telemetry_send_close">Затворете %1$s, за да промените това.</string> + <string name="bottom_telemetry_send_failed">Настройките на %1$s не можаха да бъдат променени.</string> + <string name="bottom_telemetry_send_menu">%1$s: включете %2$s в настройките на играта с IP 127.0.0.1 и порт %3$d.</string> + <string name="bottom_shots_where">Запазват се в Pictures/DroidDeck. Екранните снимки от Steam също се показват тук.</string> + <string name="bottom_shots_take">Направи екранна снимка</string> + <string name="bottom_shots_saved">Екранната снимка е запазена.</string> + <string name="bottom_shots_failed">Не можа да се направи екранна снимка.</string> + <string name="bottom_shots_none">Все още няма екранни снимки.</string> + <string name="bottom_page_chat">Чат и глас</string> + <string name="bottom_chat_why">Четете и отговаряйте на чата в Steam тук, докато играта продължава на основния екран. Използва се акаунтът, с който сте влезли в Steam.</string> + <string name="bottom_chat_not_signed_in">Steam все още няма уеб вход за споделяне, затова влезте тук веднъж.</string> + <string name="bottom_chat_stopped">Android затвори страницата на чата, докато DroidDeck беше на заден фон. Тя ще се отвори отново, когато се върнете в DroidDeck.</string> + <string name="bottom_chat_open">Отвори Steam Chat</string> + <string name="bottom_chat_close">Затвори чата</string> + <string name="bottom_chat_mic_on">Микрофонът е включен</string> + <string name="bottom_chat_mic_off">Микрофонът е изключен</string> + <string name="bottom_chat_mic_unavailable">Микрофонът е изключен за тази игра. За да говорите, включете „Микрофон“ в настройките на Steam в DroidDeck (Звук) и стартирайте играта отново.</string> + <string name="bottom_chat_volume">Сила на звука %1$d%%</string> + <string name="bottom_page_telemetry">Статистика в играта</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батерия</string> + <string name="bottom_telemetry_lap">Обиколка</string> + <string name="bottom_telemetry_position">Позиция</string> + <string name="bottom_telemetry_this_lap">Тази обиколка</string> + <string name="bottom_telemetry_last_lap">Последна обиколка</string> + <string name="bottom_telemetry_fuel">Гориво</string> + <string name="bottom_telemetry_cargo">Товар</string> + <string name="bottom_telemetry_pips">Енергия SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правен статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Включете извеждането на данни в състезателна игра (често наричано телеметрия или UDP), за да виждате тук табло на живо. Данните остават на това устройство.</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d получава данни (%2$d пакета по %3$d байта), но във формат, който тази страница все още не може да чете.</string> + <string name="bottom_telemetry_port_busy">Друга програма вече използва порт %1$s, затова тази игра не може да се показва тук.</string> <string name="rtinst_removing">Премахване на средата на Linux</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Настрой Flatpak първо</string> <string name="flatpakmgr_starting">Стартиране</string> <string name="flatpakmgr_exit_status">Flatpak приключи със код %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s е създадено за %2$s, което DroidDeck не може да изпълнява. Приложенията Flatpak тук трябва да са за ARM64 или x86_64.</string> <string name="flatpakmgr_installing">Инсталиране на %1$s</string> <string name="flatpakmgr_updating">Актуализиране на %1$s</string> <string name="flatpakmgr_removing">Премахване на %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Прилагане на настройката…</string> <string name="adbpair_command_failed">Командата за безжично отстраняване на грешки се провали</string> <string name="adbpair_channel_name">Настройка на безжично отстраняване на грешки</string> + <string name="adbpair_progress_channel_name">Напредък на настройката на безжичното отстраняване на грешки</string> <string name="adbpair_channel_description">Пита за кода за чифтосване за безжично отстраняване на грешки, докато Настройки е отворено</string> <string name="adbpair_title_pair">Чифтосване на безжично отстраняване на грешки</string> <string name="adbpair_waiting_text">Включи безжичното отстраняване на грешки, после докосни „Чифтосване на устройство с код за чифтосване“.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Не е GPU Adreno</string> <string name="gpuinfo_supported">Поддържан</string> <string name="gpuinfo_experimental">Експериментален: драйверите му са тестови версии</string> + <string name="gpuinfo_a850_experimental">Експериментална поддръжка на Adreno 850: изисква съвместими експериментални драйвери за дисплея и игрите; не е проверена на това устройство</string> <string name="gpuinfo_below_tested">Под тестваните устройства (Adreno 725 и по-нови): може да не работи</string> <string name="gpuinfo_unsupported">Не се поддържа: DroidDeck изисква GPU Adreno (Snapdragon)</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Мащабирано %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Покажи данните за устройството</string> <string name="device_info_hide">Скрий данните за устройството</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Сортиране</string> + <string name="setup_rail_labels">Етикети в страничната лента</string> + <string name="setup_rail_labels_hint">Показване на имена под иконите в страничната лента. Изключете за по-тясна странична лента.</string> + <string name="library_display">Изглед</string> + <string name="library_display_larger">По-големи карти</string> + <string name="library_display_smaller">По-малки карти</string> + <string name="library_display_title">Показване на заглавието</string> + <string name="library_display_size">Показване на размера</string> <string name="stores_sort_last_played">Играни наскоро</string> <string name="stores_sort_recently_installed">Инсталирани наскоро</string> <string name="stores_sort_title_asc">Заглавие А–Я</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Диспечер на изтеглянията</string> <string name="stores_parallel">Изтегляния едновременно</string> <string name="stores_install_where">Инсталирай в</string> + <string name="stores_install_language">Език на играта</string> + <string name="stores_install_language_hint">GOG и Epic инсталират на този език. „Системен“ следва езика на приложението.</string> + <string name="stores_install_language_system">Системен</string> <string name="stores_install_title">Инсталация на %1$s:</string> <string name="stores_target_internal">Вътрешна памет</string> <string name="stores_target_free">%1$s свободни</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Цел</string> <string name="edit_start_in">Старт в</string> <string name="edit_launch_options">Настройки за стартиране</string> + <string name="edit_launch_options_steam_hint">Общи са със „Свойства“ в Steam: промяна на едното място се вижда и на двете.</string> + <string name="edit_launch_options_not_saved">Настройките за стартиране не можаха да бъдат запазени в Steam. Опитайте отново.</string> + <string name="edit_launch_options_desktop">Steam може да е отворен в сесията на работния плот. Променете настройките за стартиране в неговите „Свойства“ или първо затворете сесията.</string> <string name="edit_artwork">Визия</string> <string name="edit_other_exe">Друг exe…</string> <string name="edit_remove">Премахни</string> @@ -2289,6 +2604,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="flathub_eyebrow">ПРИЛОЖЕНИЯ ЗА LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Приложения за десктоп на Linux, отваряни от Desktop.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">„Автоматично“ държи тази 2D игра неподвижна в изгледа. Изберете „Виртуален екран“ в „Екран“, за да използвате проследяване на главата.</string> <string name="glasses_tracking_sbs_hint">Проследяването на главата се отнася за виртуален екран или за работеща игра в SteamVR.</string> <string name="glasses_hardware">Устройство</string> + <string name="vr_controllers_tab">Контролери</string> + <string name="vr_controllers_group">Контролери за SteamVR</string> + <string name="vr_controllers_emulate">Геймпад във VR</string> + <string name="vr_controllers_emulate_hint">Двете VR ръце, като които играе контролерът ви. Промените се прилагат веднага, дори докато SteamVR работи. Joy-Con и проследяваните ръце пак поемат своята страна.</string> + <string name="vr_controllers_off">Обикновен геймпад</string> + <string name="vr_controllers_index">Контролери Valve Index</string> + <string name="vr_controllers_touch">Контролери Meta Quest 3</string> + <string name="vr_controllers_vive">Контролери HTC Vive</string> + <string name="vr_controllers_sticks">Стиковете първоначално</string> + <string name="vr_controllers_sticks_hint">Натиснете двата стика едновременно във VR, за да превключите.</string> + <string name="vr_controllers_sticks_game">Ви придвижват в играта</string> + <string name="vr_controllers_sticks_hands">Придвижват ръцете</string> + <string name="vr_controllers_buttons">Бутони</string> + <string name="vr_controllers_buttons_stick">Тригерите са тригери, бъмперите хващат, A/B и X/Y са предните бутони на всяка ръка, натискането на стиковете натиска джойстиците, Guide отваря менюто на SteamVR. Кръстачката нагоре и надолу приближава или отдалечава ръцете.</string> + <string name="vr_controllers_buttons_vive">Стиковете са тракпадове; A/X или натискане на стика ги натиска. Тригерите са тригери, бъмперите хващат, Start и Select са меню, Guide отваря менюто на SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR ръце. Игрите, които поддържат геймпад, и менюто на SteamVR получават контролера ви както обикновено.</string> <string name="glasses_brightness">Яркост</string> <string name="glasses_volume">Сила на звука</string> <string name="glasses_sunblock">Затъмняване</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Разположение на камерата</string> <string name="hand_camera_placement_hint">Проверете дали камерата ви вижда, преди да играете.</string> <string name="hand_camera_check">Проверка</string> + <string name="tracking_pack_title">Изтегляне за проследяване на ръцете</string> + <string name="tracking_pack_hint">Проследяването на ръцете изисква еднократно изтегляне от %1$s.</string> + <string name="tracking_pack_download">Изтегляне</string> + <string name="tracking_pack_retry">Повторен опит</string> + <string name="tracking_pack_downloading">Изтегляне на проследяването на ръцете… %1$d%%</string> + <string name="tracking_pack_failed">Проследяването на ръцете не можа да бъде изтеглено. Проверете връзката си и опитайте пак.</string> <string name="hand_camera_check_title">Разположение на камерата</string> <string name="hand_camera_how_rear">Поставете устройството изправено на 1,5–2 метра разстояние, приблизително на нивото на гърдите, със задната камера, насочена към вас. След това застанете в кадър с протегнати ръце.</string> <string name="hand_camera_how_front">Поставете устройството изправено на 1,5–2 метра разстояние, приблизително на нивото на гърдите, с екрана, насочен към вас. След това застанете в кадър с протегнати ръце.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Неизползвани среди, остатъци, стари логове</string> <string name="storage_clean_up">Почистване…</string> <string name="storage_session_running">Спри сесията, за да почистиш или изтриеш нещо. Размерите остават видими.</string> + <string name="storage_default_group">Място за инсталиране</string> + <string name="storage_default_title">Хранилище по подразбиране</string> + <string name="storage_default_hint">Новите инсталации от магазини отиват в избраното място. Съществуващите игри остават, където са. Библиотеките на Steam запазват собствената си настройка.</string> + <string name="storage_default_ask">Питане всеки път</string> + <string name="storage_default_ask_detail">Избор на място за всяка инсталация</string> + <string name="storage_default_internal">Вътрешна памет</string> + <string name="storage_default_external">Външна памет</string> + <string name="storage_default_external_detail">%1$s · %2$s свободни</string> + <string name="storage_default_external_missing">Не е свързано</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">%1$s свободни</string> + <string name="storage_default_folder_missing">Не е свързано</string> + <string name="storage_default_choose_folder">Избор на папка…</string> + <string name="storage_default_choose_folder_detail">Използвайте която и да е папка на SD карта или USB устройство</string> + <string name="storage_default_note">Игрите отиват в папка Games в избраното място. Съществуващите игри не се преместват.</string> <string name="storage_where">Къде отива</string> <string name="storage_games">Игри от Steam</string> <string name="storage_game_data">Данни на игрите</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Инсталирани игри</string> <string name="storage_data_parts">Префикс %1$s · шейдъри %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Изчисти шейдърите</string> + <string name="storage_reset_prefix">Нулиране на префикса</string> + <string name="storage_reset_prefix_title">Нулиране на префикса за %1$s?</string> + <string name="storage_reset_prefix_confirm">Изтрива префикса на Wine (%1$s) в %2$s и го създава отново при следващото стартиране. Записите, настройките и инсталираните в него допълнителни компоненти се губят; записите в Steam Cloud остават в акаунта ви.</string> <string name="storage_data_leftovers">Изтрити игри</string> <string name="storage_steam_app">Приложение Steam %1$d</string> <string name="storage_leftover_unsure_detail">Префиксът още съдържа файлове, може би локални записи</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронизиране със Syncthing</string> + <string name="sync_enable_hint">Базирана на Syncthing-Fork, това е реализация на Syncthing, която ви позволява да синхронизирате файлове във вътрешната файлова система на DroidDeck с други екземпляри на Syncthing. Това важи само за файлове, които съхранявате във вътрешната файлова система на DroidDeck.</string> + <string name="sync_missing">Тази компилация не включва Syncthing.</string> + <string name="sync_starting">Стартиране на Syncthing</string> + <string name="sync_status_starting">Стартиране</string> + <string name="sync_status_up_to_date">Актуално</string> + <string name="sync_status_syncing">Синхронизиране</string> + <string name="sync_status_paused">На пауза</string> + <string name="sync_status_pausing">Поставяне на пауза</string> + <string name="sync_status_resuming">Възобновяване</string> + <string name="sync_status_attention">Изисква внимание</string> + <string name="sync_status_failed">Syncthing спря</string> + <string name="sync_failed_retry">Опитай отново</string> + <string name="sync_paused_wifi">На пауза до връзка с Wi-Fi</string> + <string name="sync_paused_game">На пауза по време на играта</string> + <string name="sync_summary">Папки: %1$d · свързани устройства: %2$d от %3$d</string> + <string name="sync_left">Остават %1$s</string> + <string name="sync_open_web_ui">Отвори уеб интерфейса</string> + <string name="sync_pause">Пауза</string> + <string name="sync_resume">Продължи</string> + <string name="sync_running">Работи</string> + <string name="sync_running_hint">Изключете, за да спрете Syncthing напълно.</string> + <string name="sync_this_device">Това устройство</string> + <string name="sync_device_id">Идентификатор на устройството</string> + <string name="sync_show_qr">Покажи QR</string> + <string name="sync_advanced">Разширени</string> + <string name="sync_advanced_hint">Портове, кога да работи, нулиране</string> + <string name="sync_open">Отвори</string> + <string name="sync_waiting">Очаква ви</string> + <string name="sync_pending_device">%1$s иска да се свърже</string> + <string name="sync_pending_folder">%1$s иска да сподели „%2$s“</string> + <string name="sync_pending_folder_hint">Приемете, за да изберете къде да се запази в DroidDeck.</string> + <string name="sync_review">Преглед в уеб интерфейса</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Все още няма папки.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Актуално</string> + <string name="sync_folder_syncing">Синхронизиране %1$d%%</string> + <string name="sync_folder_scanning">Сканиране</string> + <string name="sync_folder_paused">На пауза</string> + <string name="sync_folder_out_of_sync">Несинхронизирано</string> + <string name="sync_folder_errors">Файлове, които не можаха да се синхронизират: %1$d</string> + <string name="sync_folder_blocked">Блокирано</string> + <string name="sync_folder_blocked_hint">Тази папка е извън хранилището на DroidDeck, затова DroidDeck я постави на пауза. За да синхронизирате папки извън DroidDeck, използвайте приложението Syncthing-Fork.</string> + <string name="sync_remove_folder">Премахни от Syncthing</string> + <string name="sync_remove_folder_hint">Премахването не изтрива файлове.</string> + <string name="sync_devices">Устройства</string> + <string name="sync_no_devices">Все още няма устройства.</string> + <string name="sync_connected">Свързано</string> + <string name="sync_offline">Офлайн</string> + <string name="sync_last_seen">Последно видяно %1$s</string> + <string name="sync_device_id_title">Идентификатор на това устройство</string> + <string name="sync_device_id_hint">На другото си устройство добавете устройство в Syncthing и сканирайте този код или поставете идентификатора. След това го приемете тук в уеб интерфейса.</string> + <string name="sync_copy">Копирай</string> + <string name="sync_share">Сподели</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Изключване на Syncthing?</string> + <string name="sync_off_body">Syncthing спира сега и остава спрян, докато не бъде включен отново. Синхронизираните файлове остават на мястото си.</string> + <string name="sync_off_forget">Изтрий и конфигурацията на Syncthing</string> + <string name="sync_off_forget_hint">Премахва идентификатора на това устройство, папките и устройствата. При повторно включване започва отначало.</string> + <string name="sync_turn_off">Изключи</string> + <string name="sync_ports">Портове</string> + <string name="sync_port_sync">Синхронизиране</string> + <string name="sync_port_discovery">Локално откриване</string> + <string name="sync_repick">Избор на нови портове</string> + <string name="sync_repick_hint">Проверява се отново при всяко стартиране.</string> + <string name="sync_repick_button">Избери отново</string> + <string name="sync_reset_group">Нулиране</string> + <string name="sync_api_key">API ключ</string> + <string name="sync_regenerate">Генерирай нов</string> + <string name="sync_reset">Нулиране на Syncthing</string> + <string name="sync_reset_hint">Нов идентификатор на устройството, папките и устройствата се премахват. Файловете в хранилището на DroidDeck се запазват.</string> + <string name="sync_reset_button">Нулирай</string> + <string name="sync_reset_confirm_title">Нулиране на Syncthing?</string> + <string name="sync_running_group">Работа</string> + <string name="sync_run">Изпълнение</string> + <string name="sync_run_open">Докато DroidDeck е отворен</string> + <string name="sync_run_background">На заден план</string> + <string name="sync_wifi_only">Само през Wi-Fi</string> + <string name="sync_pause_games">Пауза по време на игри</string> + <string name="sync_logs">Журнали</string> + <string name="sync_logs_hint">Изход на Syncthing за тази сесия</string> + <string name="sync_logs_share">Сподели</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Първо настройте средата на Linux.</string> + <string name="sync_accept">Приеми</string> + <string name="sync_accept_title">Запазване на „%1$s“ в</string> + <string name="sync_add_folder">Добави папка</string> + <string name="sync_add_folder_hint">Синхронизиране на папка в хранилището на DroidDeck</string> + <string name="sync_choose">Избери</string> + <string name="sync_add">Добави</string> + <string name="sync_add_failed">Папката не можа да бъде добавена.</string> + <string name="sync_share_with">Споделяне с</string> + <string name="sync_share_none">Все още няма устройства. Можете да споделите тази папка по-късно от уеб интерфейса.</string> + <string name="sync_use_folder">Използвай тази папка</string> + <string name="sync_new_folder">Нова папка</string> + <string name="sync_location_home">Домашна папка на контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Споделено хранилище на DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Данни на приложението DroidDeck</string> + <string name="sync_web_path_locked">Новите папки се запазват в папката Sync на DroidDeck. За да синхронизирате друга папка на DroidDeck, използвайте „Добави папка“ в раздела Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Презареди</string> + <string name="sync_not_running">Syncthing не работи.</string> + <string name="session_end_steam_sigill">Steam спря с невалидна инструкция (SIGILL). Това може да е проблем със съвместимостта на CPU инструкциите или срив на клиента. Споделете дневниците с данни за устройството си.</string> + <string name="session_end_steam_try_x64">Можете да опитате Настройки на Steam → Клиент на Steam → x86-64 (експериментално). Изисква допълнително изтегляне и може да работи по-бавно.</string> + <string name="session_end_vulkan_device">Графичният драйвер на Linux не намери използваемо устройство Vulkan. Проверете дали избраният GPU драйвер за Linux поддържа този GPU.</string> + <string name="session_end_gpu_unsupported">Тази сесия не може да започне, защото този GPU няма съвместим Vulkan драйвер за Linux в текущата настройка. Драйверите Adreno Turnip не могат да добавят поддръжка за GPU на MediaTek/Mali.</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_resources_browser">Отваря се в браузъра ви</string> + <string name="game_resource_guides">Ръководства</string> + <string name="game_resource_protondb_detail">Доклади за съвместимост с Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">За игри със записи в акаунта ви в Steam</string> + <string name="game_resource_search">Търсене в мрежата</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="library_filter">Филтър</string> + <string name="library_filter_installed">Само инсталирани</string> + <string name="library_filter_all_owned">Всички притежавани игри</string> + <string name="library_no_installed_matches">Няма инсталирани игри, отговарящи на тези филтри.</string> + <string name="library_browse_owned">Разглеждане на притежаваните игри</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="stores_itch_updates_found">Налични актуализации: %1$d</string> + <string name="stores_itch_update_replaced">Разработчикът замени тази версия с %1$s. Да се актуализира ли до нея?</string> + <string name="xbox_filter_cloud">Облак</string> + <string name="stores_xbox_cloud_settings">Настройки на облака</string> + <string name="integration_title">Интеграция със Steam</string> + <string name="integration_count">%1$d от %2$d включени</string> + <string name="integration_set_up">Настройване</string> + <string name="integration_location">Местоположение</string> + <string name="integration_app_info">Информация за приложението</string> + <string name="integration_wifi">Имена на Wi-Fi</string> + <string name="integration_brightness">Яркост</string> + <string name="integration_home">DroidDeck като начален екран</string> + <string name="integration_shortcuts">Преки пътища с бутона за начален екран</string> + <string name="integration_wifi_hint">Показване на мрежите в Steam · изисква достъп до местоположението, никога не се проследява</string> + <string name="integration_wifi_on">Мрежите се показват в Steam</string> + <string name="integration_wifi_location_off">Местоположението е изключено</string> + <string name="integration_wifi_denied">Местоположението е отказано · разрешете го в „Информация за приложението“</string> + <string name="integration_brightness_hint">Плъзгачът на Steam задава яркостта на екрана</string> + <string name="integration_home_hint">Бутонът за начален екран отваря менюто на Steam в сесия</string> + <string name="integration_shortcuts_hint">Задръжте бутона за начален екран за комбинации със Steam Guide</string> + <string name="integration_shortcuts_needs_home">Изисква DroidDeck като начален екран</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? Информация за приложението → ⋮ → Разрешаване на ограничените настройки</string> + <string name="integration_shortcuts_restricted">Блокирано от Android · Информация за приложението → ⋮ → Разрешаване на ограничените настройки</string> + <string name="integration_shortcuts_service">Бутон за начален екран на DroidDeck</string> + <string name="integration_shortcuts_service_description">Предава натисканията на бутона за начален екран към Steam Guide, докато сесия на Steam е на фокус и DroidDeck е приложението за начален екран по подразбиране. Не чете съдържанието на екрана.</string> + <string name="integration_brightness_needed">Включете „Яркост“ в Настройка → Интеграция със Steam</string> + <string name="apps_search_hint">Търсене на приложения</string> + <string name="apps_no_match">Няма приложения, отговарящи на „%1$s“.</string> + <string name="apps_add_widget">Добавяне на приспособление</string> + <string name="apps_widgets_loading">Приспособленията се зареждат…</string> + <string name="apps_widgets_none">Няма приложения с приспособления на това устройство.</string> + <string name="apps_widget_wider">По-широко</string> + <string name="apps_widget_narrower">По-тясно</string> + <string name="apps_widget_taller">По-високо</string> + <string name="apps_widget_shorter">По-ниско</string> + <string name="apps_widget_move_earlier">Преместване по-рано</string> + <string name="apps_widget_move_later">Преместване по-късно</string> + <string name="apps_widget_configure">Настройки на приспособлението</string> + <string name="apps_widget_remove">Премахване на приспособлението</string> + <string name="apps_add_to_folder">Добавяне в папка</string> + <string name="apps_new_folder">Нова папка</string> + <string name="apps_remove_from_folder">Премахване от папката</string> + <string name="apps_app_info">Информация за приложението</string> + <string name="apps_uninstall">Деинсталиране</string> + <string name="apps_folder_rename">Преименуване</string> + <string name="apps_folder_ungroup">Разгрупиране</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Име на папката</string> + <string name="apps_filter">Показване</string> + <string name="apps_filter_all">Всички приложения</string> + <string name="apps_filter_games">Игри</string> + <string name="apps_filter_downloaded">Изтеглени</string> + <string name="apps_filter_system">Системни</string> + <string name="apps_filter_hidden">Скрити</string> + <string name="apps_hide">Скриване</string> + <string name="apps_unhide">Показване в приложенията</string> + <string name="apps_shortcut_remove">Премахване на прекия път</string> + <string name="apps_pin_title">Добавяне към приложенията</string> + <string name="apps_pin_add">Добавяне</string> + <string name="apps_hidden_none">Няма скрити приложения.</string> + <string name="apps_sort_name_asc">Име А–Я</string> + <string name="apps_sort_name_desc">Име Я–А</string> + <string name="apps_sort_installed">Наскоро инсталирани</string> + <string name="apps_sort_updated">Наскоро актуализирани</string> + <plurals name="apps_count"> + <item quantity="one">%d приложение</item> + <item quantity="other">%d приложения</item> + </plurals> + <string name="desktop_restore_title">Възстановяване на софтуера ви</string> + <string name="desktop_restore_body">Преинсталиране на приложенията, които добавихте, след обновяване на DroidDeck.</string> + <string name="desktop_restore_done_title">Софтуерът е възстановен</string> + <string name="desktop_restore_done_body">Добавените от вас приложения са инсталирани отново.</string> + <string name="desktop_restore_failed_title">Част от софтуера не можа да бъде възстановена</string> + <string name="desktop_restore_failed_body">Вижте ~/.cache/droiddeck/apt-restore.log, след това опитайте sudo apt install в Konsole.</string> + <string name="gog_full_files">Оптимизациите за платформата не са налични. Изтеглянето включва пълни файлове за замяна.</string> + <string name="gog_recover">Проверка на резултата от корекцията</string> + <string name="slow_usb_title">Бавна USB връзка</string> + <string name="slow_usb_cable">%1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s), затова игрите на него ще се зареждат бавно. Използвайте USB 3 кабел за 5 Gbps или повече, обърнете USB-C щекера или използвайте по-бързо устройство.</string> + <string name="slow_usb_port">%1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s). USB портът на това устройство не поддържа по-висока скорост, затова игрите ще се зареждат бавно. Вътрешната памет или microSD карта може да са по-бързи.</string> + <string name="slow_usb_never">Не показвай отново</string> + <string name="slow_usb_dismiss">Затвори</string> + <string name="steam_import_title">Да се рестартира ли Steam, за да добави игрите ви?</string> + <string name="steam_import_body">Steam може да покаже тези ваши игри като инсталирани: %1$s. Трябва да се рестартира, за да ги покаже. Рестартирайте сега или те ще бъдат добавени при следващото стартиране на Steam.</string> + <string name="steam_import_names_more">%1$s и още %2$d</string> + <string name="steam_import_now">Рестартиране сега</string> + <string name="steam_import_later">По-късно</string> + <string name="gog_maintenance">Управление на инсталацията от GOG</string> + <string name="gog_check">Проверка за актуализации</string> + <string name="gog_repair">Проверка/поправка</string> + <string name="gog_patches">Офлайн корекции</string> + <string name="gog_refresh">Изтегляне на пълния офлайн инсталатор</string> + <string name="gog_update">Актуализиране до %1$s</string> + <string name="gog_resume">Продължаване на поддръжката от GOG</string> + <string name="gog_open_patch">Отваряне на инсталатора на корекцията</string> + <string name="gog_patch_in_session">Завършете или откажете инсталатора на корекцията в сесията на Linux.</string> + <string name="gog_patch_requirements">Изберете корекция за инсталираната версия и език. Поддържаните изходни версии може да не са посочени.</string> + <string name="gog_no_patches">GOG няма самостоятелни корекции за Windows за тази игра.</string> + <string name="gog_managed_files">Променените файлове на играта може да бъдат заменени.</string> + <string name="gog_patch_installer_note">Инсталаторът се отваря в сесията ви на Linux.</string> + <string name="gog_download_label">Изтегляне</string> + <string name="gog_space_label">Допълнително място</string> + <string name="gog_space_estimate_label">Приблизително място</string> + <string name="gog_repair_action">Поправка на файловете</string> + <string name="gog_refresh_action">Обновяване на инсталацията</string> + <string name="gog_select_patch">Избор</string> + <string name="setup_all_files">Достъп до всички файлове</string> + <string name="setup_local_network">Локална мрежа</string> + <string name="libraries_title">Още библиотеки на Steam</string> + <string name="libraries_hint">Папки, в които Steam може да инсталира и стартира игри, всяка със собствено име. Премахването запазва игрите на диска.</string> + <string name="libraries_add">Добавяне на библиотека</string> + <string name="libraries_rename_title">Име на библиотеката</string> + <string name="libraries_pick">Изберете папка за библиотеката</string> + <string name="libraries_full">Най-много %1$d допълнителни библиотеки</string> + <string name="libraries_overlap">Тази папка вече е библиотека или се намира в такава</string> + <string name="libraries_missing">%1$s · недостъпна</string> + <string name="libraries_applies_next">Прилага се от следващата сесия на Steam</string> + <string name="bottom_desktop_start">Стартиране на работния плот</string> + <string name="bottom_desktop_mode_touch">Директно докосване</string> + <string name="bottom_desktop_trackpad">Тракпад. Докоснете за директно докосване</string> + <string name="bottom_desktop_direct_touch">Директно докосване. Докоснете за тракпад</string> + <string name="bottom_desktop_starting">Стартиране на работния плот KDE…</string> + <string name="bottom_desktop_ended">Работният плот се затвори.</string> + <string name="bottom_desktop_failed">Работният плот не можа да стартира. Журналите са в папката bottom-desktop на тази сесия.</string> + <string name="bottom_desktop_off">Работният плот е затворен.</string> + <string name="libraries_rename">Преименуване</string> + <string name="second_mode_desktop">Работен плот</string> + <string name="bottom_desktop_mode_trackpad">Тракпад</string> + <string name="bottom_desktop_title">Работен плот · %1$s</string> </resources> diff --git a/app/src/main/res/values-cs/gestures.xml b/app/src/main/res/values-cs/gestures.xml index 4de0b6119..6252bf73e 100644 --- a/app/src/main/res/values-cs/gestures.xml +++ b/app/src/main/res/values-cs/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesta</string> <string name="gesture_settings">Nastavení dotykových gest</string> - <string name="gesture_settings_hint">Přizpůsobte gesta myši a klávesnice. Chcete-li je používat, vyberte dotykový režim Gesta.</string> <string name="gesture_tap">Klepnutí</string> <string name="gesture_drag">Tažení jedním prstem</string> <string name="gesture_long_press">Dlouhé stisknutí</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Podržení třemi prsty</string> <string name="gesture_pinch">Přiblížení sevřením či rozevřením prstů</string> <string name="gesture_hold_button">Držet tlačítko stisknuté</string> + <string name="gesture_hold_left">Držet levé tlačítko</string> + <string name="gesture_hold_right">Držet pravé tlačítko</string> <string name="gesture_click_once">Jednou kliknout</string> <string name="gesture_hold_delay">Prodleva podržení</string> <string name="gesture_double_delay">Interval dvojitého klepnutí</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mezerník</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-cs/shortcuts.xml b/app/src/main/res/values-cs/shortcuts.xml new file mode 100644 index 000000000..fdc7e7877 --- /dev/null +++ b/app/src/main/res/values-cs/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Zkratky fyzických tlačítek</string> + <string name="shortcuts_dd_menu">Nabídka DroidDeck</string> + <string name="shortcuts_capture">Přiřadit: %1$s</string> + <string name="shortcuts_press">Stiskněte a uvolněte tlačítko. Přiřazení se uloží automaticky.</string> + <string name="shortcuts_release">Pokračujte uvolněním tlačítka.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Toto tlačítko je již přiřazeno k: %1$s</string> + <string name="shortcuts_save">Přeřadit</string> + <string name="shortcuts_retry">Zkusit jiné tlačítko</string> + <string name="shortcuts_limitations">Tlačítko Domů a některá další tlačítka nemusí být dostupná.</string> +</resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 97e679960..5f47d8ead 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Možnosti VKD3D pro D3D12. nodxr vypíná ray tracing; použijte jen pro hru, která to vyžaduje.</string> <string name="game_env_proton_log">Nastavte na 1 pro diagnostický log Protonu. Protokolování může snížit výkon a zabírat úložiště.</string> <string name="game_env_wined3d">Nastavte na 1 pro použití WineD3D založeného na OpenGL místo DXVK, pro testování kompatibility D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer pro DirectDraw, Direct3D 1-7 a hry spuštěné s WineD3D. Vulkan obchází cestu OpenGL přes Zink a je u starých her DirectDraw a Direct3D 7 na Adreno mnohem rychlejší.</string> + <string name="game_env_dxvk_d3d8">Nastavte na 1 pro běh Direct3D 8 přes DXVK místo WineD3D. Rychlejší v testu Direct3D 8 v AIO Graphics Test na Adreno.</string> <string name="game_env_no_ntsync">Nastavte na 1, aby tato hra nepoužívala ntsync (droiddeck-ntsync nebo ovladač jádra); použije droiddeck-esync, pokud existuje balíček, jinak droiddeck-fsync.</string> <string name="game_env_no_esync">Nastavte na 1 pro vypnutí droiddeck-esync u této hry; místo něj použije droiddeck-fsync, nebo droiddeck-ntsync, pokud je vypnutý i fsync.</string> <string name="game_env_no_fsync">Nastavte na 1, aby tato hra nepoužívala droiddeck-fsync; použije droiddeck-esync, pokud existuje balíček, jinak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Nastavte na 1 pro spuštění této hry na droiddeck-fsync, nebo na 0, aby měl droiddeck-esync přednost, pokud balíček odpovídá jejímu Protonu.</string> <string name="game_env_xalia">Nastavte na 0 pro vypnutí pomocníka Protonu pro navigaci gamepadem u této hry.</string> + <string name="game_env_anticheat_offline">Ve výchozím stavu zapnuto. Spustí hru s Easy Anti-Cheat bez anti-cheatu, pokud hra podporuje hraní offline. Vypněte pro běžné spuštění přes Easy Anti-Cheat. Online režimy vyžadující Easy Anti-Cheat zůstanou nedostupné.</string> <string name="game_env_hud">Překryvná vrstva DXVK pro D3D9–11. fps zobrazuje snímkovou frekvenci; bez nastavení se skryje.</string> <string name="game_env_dxvk_config">Nastavení DXVK oddělená středníky. Novější verze používají pro omezení snímků dxvk.maxFrameRate; pro běžné hraní dejte přednost omezovači snímků relace.</string> + <string name="game_env_cores">Jádra CPU pro tuto hru, například 0-4 nebo 0,2,4, místo jader pro hru z relace. Méně jader znamená nižší teplotu.</string> <string name="game_env_vkd3d_limit">Omezení snímkové frekvence D3D12. 0 omezení vypíná.</string> <string name="game_env_glthread">Vícevláknové OpenGL Mesa. true může pomoci hrám OpenGL omezeným CPU; vyzkoušejte u každé hry zvlášť.</string> <string name="sync_backend_title">Synchronizace Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX spouští programy pro x86 Linux na tomto zařízení ARM64. Automaticky ho použije, když je program sestaven pro x86.</string> <string name="app_fex_x86">%1$s přes FEX</string> <string name="app_fex_not_ready">Tento program je sestaven pro PC %1$s a běží přes FEX, který ještě není nastaven. Jednou spusťte přihlášený Steam: DroidDeck tím stáhne FEX a Steam Linux Runtime, který potřebuje, a pak se tento program otevře.</string> + <string name="session_proot_missing">Proot od DroidDeck se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu. Relace nebyla spuštěna, protože záložní proot je na hraní příliš pomalý.</string> + <string name="session_directaudio_missing">DirectAudio se nepodařilo stáhnout, takže zvuk her v této relaci používá pomalejší cestu.</string> <string name="session_end_program">Tento program</string> <string name="session_end_steam_download">Klienta Steam se nepodařilo stáhnout. Vaše síť nebo VPN možná blokuje servery Steamu; zkontrolujte připojení a zkuste to znovu.</string> <string name="session_end_steam_setup">Klienta Steam se nepodařilo nastavit. Zkontrolujte připojení a volné místo a zkuste to znovu.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Ovladač Xbox 360</string> <string name="mode_controller_note">Deck: tlačítko Quick Access a gyroskop. Steam Controller: totéž, navíc snímání úchopu na zadních tlačítkách. DualShock 4 a DualSense: gyroskop, trackpad slouží jako touchpad. Xbox 360: Quick Access otevřete kombinací Guide+A.</string> <string name="mode_back">Zpět</string> + <string name="back_hold">Podržení Zpět pro zkratky Steam</string> + <string name="back_hold_hint">Podržení Zpět otevře Rychlý přístup nebo vytváří kombinace Steam s dalšími tlačítky. Vypnutím se podržení Zpět ignoruje; klepnutí a dvojité klepnutí fungují dál.</string> + <string name="back_native_qam_hint">Podržte Zpět 700 ms, nebo podržte Zpět a stiskněte jiné tlačítko pro zkratky Steamu.</string> + <string name="back_double_tap_window">Interval dvojitého klepnutí</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Povolit ovládání jasu</string> + <string name="brightness_permission_text">Nastavte ovládání jasu v DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Relace</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Aktuální · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Nainstalovat nejnovější</string> + <string name="decky_channel">Kanál aktualizací</string> + <string name="decky_channel_hint">Která vydání Decky Loader instalovat. Vlastní aktualizátor Decky používá stejný kanál.</string> + <string name="decky_channel_stable">Stabilní</string> + <string name="decky_channel_prerelease">Předběžné vydání</string> + <string name="decky_channel_testing">Testovací</string> + <string name="decky_channel_failed">Kanál aktualizací Decky se nepodařilo uložit</string> <string name="mode_decky_on">Spouští se se Steamem. Když je zapnuto, jiné aplikace na tomto zařízení mohou mít možnost ovládat Steam.</string> <string name="mode_decky_off">Vypnuto. Port pro vzdálené ladění Steamu zůstává zavřený.</string> <string name="mode_decky_remove_title">Odinstalovat Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Výkonový overlay</string> <string name="mode_mangoapp_hint">Vypněte, pokud hry v režimu Deck padají nebo zčernají. Použije se od příští relace.</string> + <string name="mode_return_after_game">Po hře se vrátit do DroidDeck</string> + <string name="mode_return_after_game_hint">Když se zavře hra spuštěná z DroidDeck nebo jiného launcheru, Steam se čistě ukončí (nejprve dokončí cloudová uložení) a vrátíte se tam. Vypnuto: zůstanete ve Steamu.</string> + <string name="mode_shader_precache">Předběžné ukládání shaderů</string> + <string name="mode_shader_precache_hint">Steam stahuje předem sestavené shadery pro vaše hry a zpracovává je na pozadí, takže hry méně trhají. Vypnutí šetří data, úložiště a baterii; hry pak shadery sestavují během hraní. Stejné nastavení jako Stahování > Předběžné ukládání shaderů ve Steamu. Použije se od příští relace.</string> <string name="mode_steam_repair">Opravit klienta Steam</string> <string name="mode_steam_repair_hint">Při dalším spuštění znovu stáhne klienta Steam. Použijte, pokud Steam zůstává na načítací obrazovce. Hry, přihlášení a nastavení zůstanou zachovány.</string> <string name="mode_steam_repair_queued">Klient Steam se znovu stáhne při dalším spuštění Steamu.</string> @@ -376,6 +415,8 @@ <string name="mode_directaudio_hint">Obchází PulseAudio pro nižší latenci.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Pro hlasový chat.</string> + <string name="drawer_mic_hint">Zapnout nebo vypnout snímání mikrofonu pro tuto relaci.</string> + <string name="drawer_mic_failed">Mikrofon se nepodařilo změnit. Zkuste to znovu.</string> <string name="mode_network">Síť</string> <string name="mode_wifi_discovery">Vyhledávání Wi-Fi</string> <string name="mode_wifi_discovery_hint">Zobrazí názvy Wi-Fi a okolních sítí ve Steamu.</string> @@ -539,14 +580,24 @@ <string name="perf_gsrealtime">gamescope: fronta GPU v reálném čase</string> <string name="perf_gsrealtime_hint">Dává prioritu práci GPU kompozitoru. Může vyhladit tempo snímků na úkor her.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Paměť</string> + <string name="perf_cap_off">Vypnuto</string> + <string name="perf_cap_auto">Výchozí ovladače</string> + <string name="perf_zram_client">Komprimovat Steam během hry</string> + <string name="perf_zram_client_hint">20 s po spuštění hry se klient Steam zkomprimuje do zRAM, aby hře zbylo více paměti, a po zavření hry se načte zpět. Vypněte, pokud se relace krátce po spuštění her zavírá. Limit RAM výše stále komprimuje Steam, když ho relace překročí.</string> + <string name="perf_ram_cap">Limit RAM</string> + <string name="perf_ram_cap_hint">Platí, když běží klient Steam, v režimu Steam nebo z Plochy. Když relace použije víc, zkomprimuje se do zRAM Steam a poté další podporované procesy relace. Měkký limit: nic se nezavře, ale hry mohou trhat, než se stránky načtou zpět.</string> + <string name="perf_ram_cap_unavailable">Vyžaduje swap zRAM, který toto zařízení nemá.</string> + <string name="perf_vram_cap">Limit VRAM</string> + <string name="perf_vram_cap_hint">Video paměť, kterou DXVK hlásí hrám Direct3D, aby počítaly s menším rozpočtem na textury. Vlastní nastavení DXVK hry mají přednost. Použije se od příští relace.</string> <string name="perf_gpuclock">Udržet GPU na nejvyšších taktech</string> <string name="perf_gpuclock_hint">Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla.</string> <string name="perf_fixes">Opravy relace</string> <string name="perf_sysmem">Turnip: vykreslování sysmem</string> <string name="perf_sysmem_hint">Rychlejší pro klienta Steam; ve hrách ovladač pro každý průchod volí dlaždicové vykreslování, nebo vykreslování v systémové paměti. Vyžadováno na Adreno 710/720/722.</string> <string name="perf_xalia">Vynechat Steamova pomocníka xalia</string> - <string name="perf_fastsync">droiddeck-ntsync (experimentální)</string> - <string name="perf_fastsync_hint">Uživatelská náhrada linuxového ovladače ntsync, pro testování. Když je zapnuto, Proton ho používá místo droiddeck-esync a droiddeck-fsync. Funguje s Proton Experimental ARM64, GE-Proton a proton-cachyos. Použije se od příští relace.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Uživatelská náhrada linuxového ovladače ntsync. Když je zapnuto, Proton ho používá místo droiddeck-esync a droiddeck-fsync. Funguje s Proton Experimental ARM64, GE-Proton a proton-cachyos. Použije se od příští relace.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync jako první</string> <string name="perf_fsync_hint">Spouští vlastní fsync Protonu na původních souborech Protonu, s futex_waitv dodaným v uživatelském prostoru, takže nepotřebuje balíček a funguje i hned po aktualizaci Protonu Steamem. Když je zapnuto, hry ho používají před droiddeck-esync, kromě těch pár, které Proton u fsync nechává vypnuté. Použije se od příští relace.</string> @@ -557,6 +608,8 @@ <string name="perf_fastpath">Rychlá cesta proot</string> <string name="perf_fastpath_needs_seccomp">Vyžaduje filtr seccomp od proot.</string> <string name="perf_fastpath_hint">Rychlejší vyhledávání souborů a méně zadrhávání. Vypněte, pokud program nemůže najít své soubory.</string> + <string name="perf_cursor_composite">Kreslit kurzor v gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope kreslí ukazatel sám, místo aby ho předal Androidu. Zapněte pro kurzor ovládaný ovladačem. Vypnuto je na telefonu rychlejší. Použije se od příští relace.</string> <string name="perf_identity">Identita relace</string> <string name="perf_hostname">Název hostitele</string> <string name="perf_hostname_hint">Název, který Steam vidí pro toto zařízení. Prázdné obnoví %1$s.</string> @@ -571,6 +624,8 @@ <string name="driver_delete_plain">Jeho soubory se odstraní z aplikace.</string> <string name="driver_delete_in_use">Jeho soubory se odstraní. Používá se, takže převezme výchozí.</string> <string name="drawer_page_display">Displej</string> + <string name="drawer_frame_limit">Limit snímků</string> + <string name="drawer_frame_limit_note">Omezí tuto hru. Displej se přepne na obnovovací frekvenci, kterou limit beze zbytku dělí, pokud nějakou má; jiné limity mohou působit nerovnoměrně. Hry ze Steamu používají Limit snímků Steamu v nabídce Rychlý přístup.</string> <string name="drawer_page_effects">Efekty</string> <string name="drawer_page_controls">Ovládání</string> <string name="drawer_page_components">Komponenty</string> @@ -595,6 +650,66 @@ <string name="drawer_hud_color_amber">Ambrová</string> <string name="drawer_hud_color_violet">Fialová</string> <string name="drawer_hud_opacity">Průhlednost</string> + <string name="hud_size">Velikost</string> + <string name="hud_size_hint">Klepnutím na HUD se také změní jeho velikost.</string> + <string name="hud_size_full">Plný</string> + <string name="hud_size_tiles">Dlaždice</string> + <string name="hud_size_pill">Pilulka</string> + <string name="hud_size_minimal">Minimální</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Lišta</string> + <string name="hud_locked">Zamknout na místě</string> + <string name="hud_locked_hint">Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují.</string> + <string name="hud_snap">Přichytit ke stranám</string> + <string name="hud_snap_hint">Pusťte HUD a přesune se k bližší straně obrazovky. Rychlým švihnutím ho hodíte tím směrem.</string> + <string name="hud_group_look">Vzhled</string> + <string name="hud_scale">Velikost na obrazovce</string> + <string name="hud_color_soft">Jemná</string> + <string name="hud_color_mid">Střední</string> + <string name="hud_color_vivid">Sytá</string> + <string name="hud_outline">Obrys</string> + <string name="hud_outline_color">Barva obrysu</string> + <string name="hud_outline_gray">Šedá</string> + <string name="hud_outline_theme">Barva tématu</string> + <string name="hud_group_metrics">Údaje</string> + <string name="hud_metric_graph">Graf časů snímků</string> + <string name="hud_metric_decimal">Snímková frekvence s desetinným místem</string> + <string name="hud_metric_low001" formatted="false">0.01% nejnižší</string> + <string name="hud_metric_engine">Grafický engine</string> + <string name="hud_metric_gpu_model">Název GPU</string> + <string name="hud_metric_gpu">Vytížení GPU</string> + <string name="hud_metric_gpu_temp">Teplota GPU</string> + <string name="hud_metric_cpu">Vytížení CPU</string> + <string name="hud_metric_per_core">CPU po jádrech</string> + <string name="hud_metric_temp">Teploty</string> + <string name="hud_metric_ram">Paměť</string> + <string name="hud_metric_vram">Grafická paměť</string> + <string name="hud_metric_swap">Odkládací paměť</string> + <string name="hud_metric_battery">Stav baterie</string> + <string name="hud_metric_power">Příkon</string> + <string name="hud_metric_network">Síť</string> + <string name="hud_metric_resolution">Rozlišení</string> + <string name="hud_metric_proton">Verze Protonu</string> + <string name="hud_metric_session">Doba relace</string> + <string name="hud_metric_clock">Hodiny</string> + <string name="hud_group_temps">Teploty</string> + <string name="hud_temp_unit">Jednotka</string> + <string name="hud_temp_bands">Varovné barvy</string> + <string name="hud_temp_bands_hint">Teploty se při přiblížení k limitu zbarví nejprve ambrově, pak červeně.</string> + <string name="hud_temp_bands_off">Vypnuto</string> + <string name="hud_temp_bands_auto">Automaticky</string> + <string name="hud_temp_bands_manual">Manuální</string> + <string name="hud_temp_red_cpu">CPU červeně od</string> + <string name="hud_temp_red_gpu">GPU červeně od</string> + <string name="hud_temp_red_battery">Baterie červeně od</string> + <string name="hud_group_more">Více</string> + <string name="hud_export">Diagnostika HUD</string> + <string name="hud_export_hint">Uloží do Downloads/DroidDeck zprávu o všech senzorech, které HUD čte.</string> + <string name="hud_export_button">Uložit</string> + <string name="hud_export_done">Uloženo do %1$s</string> + <string name="hud_export_failed">Zprávu HUD se nepodařilo uložit.</string> + <string name="hud_reset">Obnovit nastavení HUD</string> + <string name="hud_reset_button">Obnovit</string> <string name="drawer_scaling">Režim škálování</string> <string name="drawer_scaling_sharpness">Ostrost škálování</string> <string name="drawer_effects">Efekty obrazovky</string> @@ -629,10 +744,14 @@ <string name="drawer_touch_auto">Automaticky (%1$s)</string> <string name="drawer_keyboard">Klávesnice</string> <string name="drawer_latency">Zpoždění</string> + <string name="drawer_low_latency">Režim nízkého zpoždění</string> + <string name="drawer_low_latency_hint">Zvyšuje využití CPU a baterie</string> <string name="drawer_low_latency_controller">Ovladač s nízkým zpožděním</string> <string name="drawer_low_latency_controller_hint">Ovladač hlásí na 1000 Hz místo 250 Hz. O něco víc CPU.</string> <string name="drawer_low_latency_touch">Dotek s nízkým zpožděním</string> <string name="drawer_low_latency_touch_hint">Doteky přeskakují dávkování snímků, takže ovládání dotykem ve Steamu běží na 1000 Hz. O něco víc CPU.</string> + <string name="drawer_evdev_mouse">Surový kanál myši</string> + <string name="drawer_direct_cursor">Kurzor</string> <string name="drawer_pc_keyboard">Klávesnice PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Druhá obrazovka</string> @@ -721,6 +840,10 @@ <string name="setup_session">Relace</string> <string name="setup_logs">Protokoly relace</string> <string name="setup_logs_hint">Uloženo po každé relaci</string> + <string name="setup_game_debug_logs">Ladicí protokoly her</string> + <string name="setup_game_debug_logs_hint">Při dalším spuštění hry zahrnout diagnostiku Protonu, Wine a grafiky. Může snížit výkon a zabrat více úložiště.</string> + <string name="setup_game_debug_logs_restart">Pro ukládání ladicích protokolů her restartujte tuto relaci</string> + <string name="setup_logging_update_failed">Protokolování se nepodařilo změnit. Zkontrolujte přepínač a zkuste to znovu.</string> <string name="setup_agent_commands">Nástroje pro ladění</string> <string name="setup_latest_logs">Protokoly poslední relace</string> <string name="setup_saved_logs">Uložené protokoly relací</string> @@ -753,12 +876,28 @@ <string name="setup_home_on">DroidDeck může být domovská aplikace</string> <string name="setup_home_off">DroidDeck se nikdy nenabízí jako domovská aplikace</string> <string name="setup_orientation">Orientace</string> + <string name="setup_launcher_orientation">Orientace launcheru</string> + <string name="setup_launcher_orientation_auto">Podle otočení zařízení</string> + <string name="setup_orientation_portrait">Na výšku</string> + <string name="setup_session_orientation">Orientace relace</string> + <string name="setup_session_orientation_hint">Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; vlastní šířka a výška zůstávají, jak jsou zadány.</string> <string name="setup_orientation_auto">Automaticky na šířku</string> <string name="setup_orientation_landscape">Na šířku</string> <string name="setup_orientation_reverse">Na šířku obráceně</string> <string name="setup_fullscreen">Celá obrazovka</string> <string name="setup_fullscreen_on">Skryje stavový a navigační panel Androidu</string> <string name="setup_fullscreen_off">Zobrazí stavový a navigační panel Androidu</string> + <string name="setup_dual_screen">Dvě obrazovky</string> + <string name="setup_dual_screen_hint">Automaticky používá druhou obrazovku na kapesních zařízeních, která ji mají vestavěnou. Zapnuto používá jakýkoli druhý displej. Vypnuto nechá vše na jedné obrazovce.</string> + <string name="setup_dual_screen_auto">Automaticky</string> + <string name="setup_dual_screen_on">Zapnuto</string> + <string name="setup_dual_screen_off">Vypnuto</string> + <string name="setup_dual_screen_menu">Nabídka na spodní obrazovce</string> + <string name="setup_dual_screen_menu_hint">Přesune sekce a herní nabídku na druhou obrazovku a píše se tam, takže horní obrazovka zůstane celá volná. L2 a R2 přepínají sekce.</string> + <string name="setup_dual_screen_controls">Ovládání na spodní obrazovce ve hrách</string> + <string name="setup_dual_screen_controls_hint">Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce.</string> + <string name="dual_typing_title">Psaní pro horní obrazovku</string> + <string name="dual_typing_done">Hotovo</string> <string name="setup_default_home">Výchozí domovská aplikace</string> <string name="setup_choose_home">Vybrat domovskou aplikaci</string> <string name="setup_choose">Vybrat</string> @@ -912,6 +1051,14 @@ <string name="gate_step1">Otevřete Nastavení → Možnosti pro vývojáře → Bezdrátové ladění a zapněte ho</string> <string name="gate_step2">Klepněte na „Spárovat zařízení pomocí párovacího kódu“</string> <string name="gate_step3">Zadejte kód do oznámení DroidDecku</string> + <string name="pairguide_build_number">V části O telefonu klepněte 7krát na Číslo sestavení</string> + <string name="pairguide_wireless">Zapněte Bezdrátové ladění</string> + <string name="pairguide_pair">Otevřete Bezdrátové ladění a klepněte na „Spárovat zařízení pomocí párovacího kódu“</string> + <string name="pairguide_child_process">Zapněte „Deaktivace omezení podřízených procesů“</string> + <string name="pairguide_row_child_process">Deaktivace omezení podřízených procesů</string> + <string name="pairguide_row_build_number">Číslo sestavení</string> + <string name="pairguide_row_wireless">Bezdrátové ladění</string> + <string name="pairguide_row_pair">Spárovat zařízení pomocí párovacího kódu</string> <string name="gate_waiting">Čekání na párovací okno…</string> <string name="gate_code_needed">Okno nalezeno. Zadejte jeho kód do oznámení.</string> <string name="gate_status">Stav</string> @@ -1035,8 +1182,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 +1189,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> @@ -1053,10 +1197,8 @@ <string name="games_never_played">Nikdy nehráno</string> <string name="games_runtime_busy_percent">Runtime zaneprázdněn · %1$d%%</string> <string name="games_runtime_busy">Runtime zaneprázdněn</string> - <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> @@ -1071,6 +1213,9 @@ <string name="gpu_hide_other">Skrýt ovladače pro jiné GPU</string> <string name="gpu_show_other">Zobrazit ovladače pro jiné GPU</string> <string name="gpu_advanced">Pokročilé</string> + <string name="gpu_ubwc_title">Kompatibilita UBWC</string> + <string name="gpu_ubwc_hint">Pokud Steam nebo Android zobrazuje pruhy nebo blikání, zkuste Zapnuto nebo Vypnuto. Platí pro oba ovladače po restartu DroidDeck.</string> + <string name="gpu_ubwc_restart">Pro použití restartujte DroidDeck.</string> <string name="gpu_set_with_display">Nastaveno společně s ovladačem displeje: %1$s obsahuje oba.</string> <string name="gpu_set_with_runtime">Nastaveno společně s ovladačem runtime: %1$s obsahuje oba.</string> <string name="gpu_runtime_hint">Používají hry a desktop.</string> @@ -1125,7 +1270,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> @@ -1179,10 +1324,15 @@ <string name="pip_auto">Automaticky přejít do PiP</string> <string name="unfolded_controls">Ovládání na rozložené obrazovce</string> <string name="unfolded_controls_hint">Po rozložení je hra zobrazena nad trackpady a zadními rukojeťmi Steam Decku. Po složení je hra na celou obrazovku.</string> + <string name="unfolded_controls_with_controller">Ponechat i s ovladačem</string> + <string name="unfolded_controls_with_controller_hint">Zobrazovat toto dotykové ovládání i při připojeném ovladači.</string> <string name="pip_suspended">Pozastaveno</string> <string name="pip_not_ready">Obraz v obraze bude dostupný, jakmile bude relace připravena.</string> <string name="pip_permission">Povolte obraz v obraze pro DroidDeck v nastavení Androidu.</string> <string name="pip_unavailable">Android nemohl otevřít obraz v obraze.</string> + <string name="game_more">Další</string> + <string name="game_edit_art">Upravit grafiku</string> + <string name="stores_in_steam_label">Ve Steamu</string> <string name="game_shortcut">Zkratka</string> <string name="game_shortcut_add">Přidat na domovskou obrazovku</string> <string name="game_shortcut_choose">Vybrat hru</string> @@ -1206,6 +1356,10 @@ <string name="main_wait_runtime">Počkejte, až skončí operace s runtime</string> <string name="main_wait_proton_install">Počkejte, až skončí instalace nástroje kompatibility</string> + <string name="load_compat_title">Příprava nástrojů kompatibility</string> + <string name="load_compat_wait">Čekání na dokončení nastavení kompatibility</string> + <string name="load_compat_hint">Relace se spustí po dokončení nastavení.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Počkejte, až skončí instalace plochy</string> <string name="main_wait_install_game">Před spuštěním hry počkejte, až skončí instalace</string> <string name="main_saves_close_session">Nejprve zavřete relaci Steamu, aby hra svým uložením nepřepsala import.</string> @@ -1250,6 +1404,9 @@ <string name="main_install_anyway">Přesto instalovat</string> <string name="main_remove_runtime_title">Odstranit runtime Linuxu</string> <string name="main_remove_runtime_text">Tím se odstraní runtime, klient Steam v něm a všechny hry v něm nainstalované.</string> + <string name="runtime_actions_title">Běhové prostředí Linuxu</string> + <string name="runtime_actions_text">Oprava znovu nainstaluje systémové soubory prostředí a zachová Steam, vaše hry a nastavení. Doplňky, jako je Plocha, se znovu nainstalují při dalším použití. Odebrání smaže vše.</string> + <string name="runtime_repair">Opravit prostředí</string> <string name="main_applied">Použito: %1$s</string> <string name="android_app_open_failed_primary">Nepodařilo se otevřít %1$s na hlavní obrazovce</string> <string name="android_app_open_failed_on">Nepodařilo se otevřít %1$s na %2$s</string> @@ -1385,6 +1542,13 @@ <string name="session_runtime_catalog_unreachable">Nepodařilo se spojit s katalogem runtime. Zkontrolujte připojení a znovu stiskněte Hrát.</string> <string name="session_runtime_install_failed">Runtime Linuxu se nenainstaloval. Zkontrolujte runtime v Přípravě a znovu stiskněte Hrát.</string> <string name="session_desktop_install_failed">Plocha se nenainstalovala (%1$s). Zkontrolujte připojení a znovu stiskněte Plocha.</string> + <string name="session_package_resume_failed">Přerušenou instalaci se nepodařilo dokončit (%1$s). Zkontrolujte připojení a místo a zkuste to znovu.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Běhové prostředí Linuxu je poškozené: %1$d odkaz knihovny vede na chybějící soubor (%2$s), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="few">Běhové prostředí Linuxu je poškozené: %1$d odkazy knihoven vedou na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="many">Běhové prostředí Linuxu je poškozené: %1$d odkazu knihoven vede na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="other">Běhové prostředí Linuxu je poškozené: %1$d odkazů knihoven vede na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + </plurals> <string name="session_ended_named">Došlo k neočekávanému zastavení %1$s. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> <string name="session_ended_program">Program neočekávaně skončil. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> <string name="session_ended_desktop">Plocha neočekávaně skončila. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> @@ -1401,6 +1565,15 @@ <string name="mode_decky_plugins_hint">Nainstalujte ZIP s pluginem pro další relaci Steamu.</string> <string name="mode_decky_plugin_downloading">Stahování…</string> <string name="mode_decky_plugin_install_zip">Instalovat ze ZIP</string> + <string name="decky_zip_warning_title">Instalace pluginu třetí strany</string> + <string name="decky_zip_warning_text">Tým Decky Loader tento plugin nezkontroloval. Může obsahovat malware, například software, který ukradne váš účet Steam nebo poškodí zařízení. Instalací tohoto pluginu souhlasíte, že přebíráte veškerá rizika pro své zařízení.</string> + <string name="decky_zip_warning_continue">Pokračovat</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Počkejte %1$d sekundu</item> + <item quantity="few">Počkejte %1$d sekundy</item> + <item quantity="many">Počkejte %1$d sekundy</item> + <item quantity="other">Počkejte %1$d sekund</item> + </plurals> <string name="store_cat_games">Hry</string> <string name="store_cat_audio_video">Zvuk a video</string> <string name="store_cat_graphics">Grafika</string> @@ -1429,6 +1602,10 @@ <string name="theme_icon_blue_detail">Černé pozadí, bílé písmo, modrá pro vše vybrané, zaměřené nebo stisknuté.</string> <string name="theme_electric">Elektrická modř</string> <string name="theme_electric_detail">Jasnější modrá na povrchách, které jsou spíše tmavomodré než šedé.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Barvy, které procházejí celou duhu. Respektuje nastavení animací v Androidu.</string> + <string name="theme_rgb_speed">Rychlost</string> + <string name="theme_rgb_speed_hint">Jak rychle se barvy střídají.</string> <string name="theme_gradient">Přechod</string> <string name="theme_gradient_detail">Vaše vlastní primární a sekundární barva, prolnuté na tlačítkách a zvýrazněních.</string> <string name="theme_gradient_primary">Primární</string> @@ -1452,7 +1629,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mezerník</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1560,7 +1737,16 @@ <string name="fm_conflict_skip">Přeskočit</string> <string name="fm_select_this_folder">Vybrat tuto složku</string> <string name="fm_back">Zpět</string> + <string name="fm_exit">Ukončit</string> + <string name="fm_return_to_start">Zpět do výchozí složky</string> + <string name="fm_start_unavailable">Výchozí složka již není dostupná</string> + <string name="fm_cancel_operation_title">Zrušit operaci?</string> + <string name="fm_cancel_operation_confirmation">Operace bude zrušena. Opravdu chcete pokračovat?</string> + <string name="fm_accept">Přijmout</string> + <string name="fm_decline">Odmítnout</string> <string name="fm_drive_not_readable">%1$s je připojeno, ale momentálně není čitelné</string> + <string name="fm_drive_access_title">Povolit přístup k %1$s</string> + <string name="fm_drive_access_text">Android umožňuje aplikaci DroidDeck tento disk vidět, ale ne číst. Zapněte pro DroidDeck Přístup ke všem souborům a pak se vraťte.</string> <string name="fm_list_view">Zobrazení seznamu</string> <string name="fm_grid_view">Zobrazení mřížky</string> <string name="fm_search">Hledat</string> @@ -1634,6 +1820,93 @@ <string name="second_mode_keyboard_trackpad">Klávesnice + trackpad</string> <string name="second_mode_terminal">Terminál</string> <string name="second_mode_deck_controls">Rukojeti + trackpady Deck</string> + <string name="second_mode_dashboard">Přehled</string> + <string name="bottom_dashboard_empty">Zatím tu není nic k zobrazení.</string> + <string name="bottom_page_downloads">Stahování</string> + <string name="bottom_downloads_none">Neprobíhá žádné stahování.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Stahování mezipaměti shaderů</string> + <string name="bottom_downloads_paused">Pozastaveno</string> + <string name="bottom_downloads_queued">Čeká na spuštění</string> + <string name="bottom_page_notifications">Oznámení</string> + <string name="bottom_notifications_listener">Spodní obrazovka DroidDeck</string> + <string name="bottom_notifications_why">Zobrazujte zde zprávy a další oznámení během hraní. Zůstávají jen na této obrazovce a neukládají se. Android se zeptá jednou: na této obrazovce se otevře jeho stránka přístupu k oznámením; zapněte tam DroidDeck a tato stránka se sama vrátí.</string> + <string name="bottom_notifications_allow">Povolit přístup k oznámením</string> + <string name="bottom_notifications_none">Žádná oznámení.</string> + <string name="bottom_notifications_count">Oznámení: %1$d</string> + <string name="bottom_notifications_clear">Vymazat</string> + <string name="bottom_page_screenshots">Snímky obrazovky</string> + <string name="stats_fps_needs_hud">FPS vyžaduje zapnutý HUD</string> + <string name="stats_speed">Rychlost</string> + <string name="stats_pedals">Pedály</string> + <string name="stats_gforce">Přetížení (G)</string> + <string name="stats_timing">Časy</string> + <string name="stats_best_lap">Nejlepší kolo</string> + <string name="stats_tires">Pneumatiky °C</string> + <string name="stats_trace">Plyn a brzda, posledních 10 s</string> + <string name="stats_speed_chart">Rychlost, %1$s</string> + <string name="stats_gear">Rychlostní stupeň</string> + <string name="stats_speed_units">Jednotky rychlosti</string> + <string name="stats_speed_units_auto">Automaticky (%1$s)</string> + <string name="stats_steam_client_arm">Klient Steam ARM</string> + <string name="stats_steam_client_x86">Klient Steam x86</string> + <string name="stats_throttle">Plyn</string> + <string name="stats_brake">Brzda</string> + <string name="stats_lights">Kontrolky</string> + <string name="stats_lamp_shift">Řazení</string> + <string name="stats_lamp_handbrake">Ruční brzda</string> + <string name="stats_lamp_pit">Omezovač v boxech</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olej %1$s °C</string> + <string name="stats_power">Rozdělovač energie</string> + <string name="stats_fuel_t">Palivo, t</string> + <string name="stats_fuel_main">Hlavní %1$s t</string> + <string name="stats_fuel_reserve">Rezerva %1$s t</string> + <string name="stats_tap_hint">Klepnutím na horní pruh nebo palubní desku změníte jejich styl.</string> + <string name="bottom_telemetry_send_title">Odesílat data pro palubní desku</string> + <string name="bottom_telemetry_send_auto">Automaticky</string> + <string name="bottom_telemetry_send_auto_hint">Zapne to pro každou zde uvedenou hru, včetně her nalezených později. Hry, které vypnete, zůstanou vypnuté.</string> + <string name="bottom_telemetry_send_note">Tím se mění vlastní nastavení výstupu dat ve hře. Projeví se při příštím spuštění hry; vypnutím se obnoví původní nastavení.</string> + <string name="bottom_telemetry_send_close">Pro změnu zavřete %1$s.</string> + <string name="bottom_telemetry_send_failed">Nastavení hry %1$s se nepodařilo změnit.</string> + <string name="bottom_telemetry_send_menu">%1$s: zapněte %2$s v nastavení hry s IP 127.0.0.1 a portem %3$d.</string> + <string name="bottom_shots_where">Ukládá se do Pictures/DroidDeck. Zobrazují se zde i snímky obrazovky ze Steamu.</string> + <string name="bottom_shots_take">Pořídit snímek obrazovky</string> + <string name="bottom_shots_saved">Snímek obrazovky uložen.</string> + <string name="bottom_shots_failed">Snímek obrazovky se nepodařilo pořídit.</string> + <string name="bottom_shots_none">Zatím žádné snímky obrazovky.</string> + <string name="bottom_page_chat">Chat a hlas</string> + <string name="bottom_chat_why">Čtěte chat Steamu a odpovídejte na něj zde, zatímco hra dál běží na hlavní obrazovce. Používá účet, kterým je Steam přihlášen.</string> + <string name="bottom_chat_not_signed_in">Steam zatím nemá webové přihlášení ke sdílení, proto se zde jednou přihlaste.</string> + <string name="bottom_chat_stopped">Android zavřel stránku chatu, když byl DroidDeck na pozadí. Znovu se otevře, až se do DroidDecku vrátíte.</string> + <string name="bottom_chat_open">Otevřít Steam Chat</string> + <string name="bottom_chat_close">Zavřít chat</string> + <string name="bottom_chat_mic_on">Mikrofon zapnut</string> + <string name="bottom_chat_mic_off">Mikrofon vypnut</string> + <string name="bottom_chat_mic_unavailable">Mikrofon je pro tuto hru vypnutý. Chcete-li mluvit, zapněte Mikrofon v nastavení Steamu v DroidDecku (Zvuk) a spusťte hru znovu.</string> + <string name="bottom_chat_volume">Hlasitost %1$d%%</string> + <string name="bottom_page_telemetry">Statistiky ve hře</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterie</string> + <string name="bottom_telemetry_lap">Kolo</string> + <string name="bottom_telemetry_position">Pozice</string> + <string name="bottom_telemetry_this_lap">Aktuální kolo</string> + <string name="bottom_telemetry_last_lap">Poslední kolo</string> + <string name="bottom_telemetry_fuel">Palivo</string> + <string name="bottom_telemetry_cargo">Náklad</string> + <string name="bottom_telemetry_pips">Energie SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Právní stav</string> + <string name="bottom_telemetry_balance">Zůstatek</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Zapněte v závodní hře výstup dat (často nazývaný telemetrie nebo UDP) a uvidíte zde živou palubní desku. Data zůstávají v tomto zařízení.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d přijímá data (%2$d paketů po %3$d bajtech), ale ve formátu, který tato stránka zatím neumí přečíst.</string> + <string name="bottom_telemetry_port_busy">Port %1$s již používá jiný program, takže se zde tato hra nemůže zobrazit.</string> <string name="rtinst_removing">Odstraňování runtime Linuxu</string> <plurals name="rtinst_removing_entries"> @@ -1666,6 +1939,7 @@ <string name="flatpakmgr_not_ready">Nejprve nastavte Flatpak</string> <string name="flatpakmgr_starting">Spouštění</string> <string name="flatpakmgr_exit_status">Flatpak skončil s návratovým kódem %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s je sestaveno pro %2$s, které DroidDeck neumí spustit. Aplikace Flatpak zde potřebují verzi pro ARM64 nebo x86_64.</string> <string name="flatpakmgr_installing">Instalování %1$s</string> <string name="flatpakmgr_updating">Aktualizování %1$s</string> <string name="flatpakmgr_removing">Odstraňování %1$s</string> @@ -1759,6 +2033,7 @@ <string name="adbpair_applying">Použití nastavení…</string> <string name="adbpair_command_failed">Příkaz bezdrátového ladění se nezdařil</string> <string name="adbpair_channel_name">Nastavení bezdrátového ladění</string> + <string name="adbpair_progress_channel_name">Průběh nastavení bezdrátového ladění</string> <string name="adbpair_channel_description">Vyžádá kód pro párování bezdrátového ladění, dokud je otevřené Nastavení</string> <string name="adbpair_title_pair">Zpárovat bezdrátové ladění</string> <string name="adbpair_waiting_text">Zapněte bezdrátové ladění a pak klepněte na „Párování zařízení pomocí párovacího kódu“.</string> @@ -1867,6 +2142,7 @@ <string name="gpuinfo_not_adreno">Není GPU Adreno</string> <string name="gpuinfo_supported">Podporováno</string> <string name="gpuinfo_experimental">Experimentální: jeho ovladače jsou testovací sestavení</string> + <string name="gpuinfo_a850_experimental">Experimentální podpora Adreno 850: vyžaduje kompatibilní experimentální ovladače displeje a her; na tomto zařízení neověřeno</string> <string name="gpuinfo_below_tested">Pod testovaným hardwarem (Adreno 725 a novější): nemusí fungovat</string> <string name="gpuinfo_unsupported">Není podporováno: DroidDeck potřebuje GPU Adreno (Snapdragon)</string> @@ -1960,10 +2236,10 @@ <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> + <string name="display_follow_screen_scaled">Zmenšeno %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Zobrazit podrobnosti o zařízení</string> <string name="device_info_hide">Skrýt podrobnosti o zařízení</string> @@ -1978,7 +2254,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> @@ -1992,11 +2267,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> @@ -2014,9 +2287,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> @@ -2035,12 +2316,43 @@ <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> <string name="stores_sort">Řazení</string> + <string name="setup_rail_labels">Popisky postranního panelu</string> + <string name="setup_rail_labels_hint">Zobrazovat názvy pod ikonami postranního panelu. Vypněte pro užší panel.</string> + <string name="library_display">Zobrazení</string> + <string name="library_display_larger">Větší karty</string> + <string name="library_display_smaller">Menší karty</string> + <string name="library_display_title">Zobrazit název</string> + <string name="library_display_size">Zobrazit velikost</string> <string name="stores_sort_last_played">Nedávno hrané</string> <string name="stores_sort_recently_installed">Nedávno nainstalované</string> <string name="stores_sort_title_asc">Název A–Z</string> @@ -2167,6 +2479,9 @@ <string name="stores_download_manager">Správce stahování</string> <string name="stores_parallel">Souběžných stahování</string> <string name="stores_install_where">Instalovat do</string> + <string name="stores_install_language">Jazyk hry</string> + <string name="stores_install_language_hint">GOG a Epic nainstalují tento jazyk. Systémový se řídí jazykem aplikace.</string> + <string name="stores_install_language_system">Systémový</string> <string name="stores_install_title">Instalace %1$s:</string> <string name="stores_target_internal">Interní úložiště</string> <string name="stores_target_free">%1$s volných</string> @@ -2189,6 +2504,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> @@ -2204,6 +2520,9 @@ <string name="edit_target">Cíl</string> <string name="edit_start_in">Spustit v</string> <string name="edit_launch_options">Možnosti spuštění</string> + <string name="edit_launch_options_steam_hint">Sdíleno s Vlastnostmi ve Steamu: změna na jednom místě se projeví na obou.</string> + <string name="edit_launch_options_not_saved">Možnosti spuštění se nepodařilo uložit do Steamu. Zkuste to znovu.</string> + <string name="edit_launch_options_desktop">Steam může být otevřený v relaci Plochy. Změňte možnosti spuštění v jeho Vlastnostech, nebo nejdřív relaci ukončete.</string> <string name="edit_artwork">Grafika</string> <string name="edit_other_exe">Jiný exe…</string> <string name="edit_remove">Odstranit</string> @@ -2335,6 +2654,7 @@ <string name="setup_download_source_custom">Vlastní prefix</string> <string name="setup_download_mirror">Web</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">LINUXOVÉ APLIKACE</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Desktopové aplikace pro Linuxový desktop, otevírané z Desktopu.</string> @@ -2479,6 +2799,22 @@ <string name="glasses_tracking_flat_hint">Režim Automaticky drží tuto 2D hru pevně v zorném poli. Chcete-li použít sledování hlavy, zvolte v části Displej možnost „Virtuální obrazovka“.</string> <string name="glasses_tracking_sbs_hint">Sledování hlavy platí pro virtuální obrazovku nebo spuštěnou hru SteamVR.</string> <string name="glasses_hardware">Zařízení</string> + <string name="vr_controllers_tab">Ovladače</string> + <string name="vr_controllers_group">Ovladače SteamVR</string> + <string name="vr_controllers_emulate">Gamepad ve VR</string> + <string name="vr_controllers_emulate_hint">Dvě ruce ve VR, za které váš ovladač hraje. Změny platí hned, i když běží SteamVR. Joy-Cony a sledované ruce svou stranu stále převezmou.</string> + <string name="vr_controllers_off">Běžný gamepad</string> + <string name="vr_controllers_index">Ovladače Valve Index</string> + <string name="vr_controllers_touch">Ovladače Meta Quest 3</string> + <string name="vr_controllers_vive">Ovladače HTC Vive</string> + <string name="vr_controllers_sticks">Páčky na začátku</string> + <string name="vr_controllers_sticks_hint">Pro přepnutí ve VR stiskněte obě páčky současně.</string> + <string name="vr_controllers_sticks_game">Pohybují vámi ve hře</string> + <string name="vr_controllers_sticks_hands">Pohybují rukama</string> + <string name="vr_controllers_buttons">Tlačítka</string> + <string name="vr_controllers_buttons_stick">Spouště jsou spouště, bumpery úchop, A/B a X/Y jsou čelní tlačítka každé ruky, stisk páčky klikne thumbstickem, Guide otevře nabídku SteamVR. D-pad nahoru a dolů přibližuje a vzdaluje ruce.</string> + <string name="vr_controllers_buttons_vive">Páčky jsou trackpady; A/X nebo stisk páčky je stiskne. Spouště jsou spouště, bumpery úchop, Start a Select jsou menu, Guide otevře nabídku SteamVR.</string> + <string name="vr_controllers_buttons_off">Žádné ruce ve VR. Hry podporující gamepad a nabídka SteamVR dostanou váš ovladač jako obvykle.</string> <string name="glasses_brightness">Jas</string> <string name="glasses_volume">Hlasitost</string> <string name="glasses_sunblock">Zatmavení</string> @@ -2536,6 +2872,12 @@ <string name="hand_camera_placement">Umístění kamery</string> <string name="hand_camera_placement_hint">Než začnete hrát, zkontrolujte, že vás kamera vidí.</string> <string name="hand_camera_check">Zkontrolovat</string> + <string name="tracking_pack_title">Stažení sledování rukou</string> + <string name="tracking_pack_hint">Sledování rukou vyžaduje jednorázové stažení %1$s.</string> + <string name="tracking_pack_download">Stáhnout</string> + <string name="tracking_pack_retry">Zkusit znovu</string> + <string name="tracking_pack_downloading">Stahování sledování rukou… %1$d%%</string> + <string name="tracking_pack_failed">Sledování rukou se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu.</string> <string name="hand_camera_check_title">Umístění kamery</string> <string name="hand_camera_how_rear">Postavte zařízení svisle do vzdálenosti 1,5 až 2 metry přibližně ve výšce hrudníku tak, aby zadní kamera směřovala k vám. Pak se postavte do záběru s nataženýma rukama.</string> <string name="hand_camera_how_front">Postavte zařízení svisle do vzdálenosti 1,5 až 2 metry přibližně ve výšce hrudníku tak, aby obrazovka směřovala k vám. Pak se postavte do záběru s nataženýma rukama.</string> @@ -2607,6 +2949,21 @@ <string name="storage_safe_hint">Nevyužitá prostředí, zbytky, staré logy</string> <string name="storage_clean_up">Čištění…</string> <string name="storage_session_running">Zastav relaci, ať můžeš uklidit nebo něco smazat. Velikosti zůstávají vidět.</string> + <string name="storage_default_group">Umístění instalace</string> + <string name="storage_default_title">Výchozí úložiště</string> + <string name="storage_default_hint">Nové instalace z obchodů půjdou do vybraného umístění. Stávající hry zůstanou, kde jsou. Knihovny Steamu mají vlastní nastavení.</string> + <string name="storage_default_ask">Vždy se zeptat</string> + <string name="storage_default_ask_detail">Vybrat cíl u každé instalace</string> + <string name="storage_default_internal">Interní úložiště</string> + <string name="storage_default_external">Externí úložiště</string> + <string name="storage_default_external_detail">%1$s · volně %2$s</string> + <string name="storage_default_external_missing">Nepřipojeno</string> + <string name="storage_default_folder">Složka · %1$s</string> + <string name="storage_default_folder_free">volně %1$s</string> + <string name="storage_default_folder_missing">Nepřipojeno</string> + <string name="storage_default_choose_folder">Vybrat složku…</string> + <string name="storage_default_choose_folder_detail">Použít libovolnou složku na kartě SD nebo disku USB</string> + <string name="storage_default_note">Hry se ukládají do složky Games ve vybraném umístění. Stávající hry se nepřesouvají.</string> <string name="storage_where">Kam to jde</string> <string name="storage_games">Hry ze Steamu</string> <string name="storage_game_data">Data her</string> @@ -2742,6 +3099,9 @@ <string name="storage_data_installed">Nainstalované hry</string> <string name="storage_data_parts">Prefix %1$s · shadery %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Vymazat shadery</string> + <string name="storage_reset_prefix">Resetovat prefix</string> + <string name="storage_reset_prefix_title">Resetovat prefix pro %1$s?</string> + <string name="storage_reset_prefix_confirm">Smaže její prefix Wine (%1$s) v %2$s a při dalším spuštění ho vytvoří znovu. Uložené hry, nastavení a nainstalované redistribuovatelné balíčky v něm budou ztraceny; uložení ve Steam Cloud zůstanou ve vašem účtu.</string> <string name="storage_data_leftovers">Smazané hry</string> <string name="storage_steam_app">Aplikace Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix stále obsahuje soubory, možná místní uložené pozice</string> @@ -3047,4 +3407,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchronizovat přes Syncthing</string> + <string name="sync_enable_hint">Jde o implementaci Syncthingu založenou na Syncthing-Fork, která umožňuje synchronizovat soubory v interním souborovém systému DroidDecku s dalšími instancemi Syncthingu. Týká se pouze souborů, které ukládáte v interním souborovém systému DroidDecku.</string> + <string name="sync_missing">Toto sestavení neobsahuje Syncthing.</string> + <string name="sync_starting">Spouští se Syncthing</string> + <string name="sync_status_starting">Spouští se</string> + <string name="sync_status_up_to_date">Aktuální</string> + <string name="sync_status_syncing">Synchronizuje se</string> + <string name="sync_status_paused">Pozastaveno</string> + <string name="sync_status_pausing">Pozastavuje se</string> + <string name="sync_status_resuming">Obnovuje se</string> + <string name="sync_status_attention">Vyžaduje pozornost</string> + <string name="sync_status_failed">Syncthing se zastavil</string> + <string name="sync_failed_retry">Zkusit znovu</string> + <string name="sync_paused_wifi">Pozastaveno do připojení k Wi-Fi</string> + <string name="sync_paused_game">Pozastaveno během hry</string> + <string name="sync_summary">Složky: %1$d · připojená zařízení: %2$d z %3$d</string> + <string name="sync_left">Zbývá %1$s</string> + <string name="sync_open_web_ui">Otevřít webové rozhraní</string> + <string name="sync_pause">Pozastavit</string> + <string name="sync_resume">Obnovit</string> + <string name="sync_running">Spuštěno</string> + <string name="sync_running_hint">Vypnutím Syncthing úplně zastavíte.</string> + <string name="sync_this_device">Toto zařízení</string> + <string name="sync_device_id">ID zařízení</string> + <string name="sync_show_qr">Zobrazit QR</string> + <string name="sync_advanced">Pokročilé</string> + <string name="sync_advanced_hint">Porty, kdy spouštět, obnovení</string> + <string name="sync_open">Otevřít</string> + <string name="sync_waiting">Čeká na vás</string> + <string name="sync_pending_device">%1$s se chce připojit</string> + <string name="sync_pending_folder">%1$s chce sdílet „%2$s“</string> + <string name="sync_pending_folder_hint">Po přijetí vyberete, kam se v DroidDecku uloží.</string> + <string name="sync_review">Zkontrolovat ve webovém rozhraní</string> + <string name="sync_folders">Složky</string> + <string name="sync_no_folders">Zatím žádné složky.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuální</string> + <string name="sync_folder_syncing">Synchronizace %1$d %%</string> + <string name="sync_folder_scanning">Prohledává se</string> + <string name="sync_folder_paused">Pozastaveno</string> + <string name="sync_folder_out_of_sync">Nesynchronizováno</string> + <string name="sync_folder_errors">Nepodařilo se synchronizovat soubory: %1$d</string> + <string name="sync_folder_blocked">Zablokováno</string> + <string name="sync_folder_blocked_hint">Tato složka je mimo úložiště DroidDecku, proto ji DroidDeck pozastavil. Ke synchronizaci složek mimo DroidDeck použijte aplikaci Syncthing-Fork.</string> + <string name="sync_remove_folder">Odebrat ze Syncthingu</string> + <string name="sync_remove_folder_hint">Odebráním se žádné soubory nesmažou.</string> + <string name="sync_devices">Zařízení</string> + <string name="sync_no_devices">Zatím žádná zařízení.</string> + <string name="sync_connected">Připojeno</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Naposledy viděno %1$s</string> + <string name="sync_device_id_title">ID tohoto zařízení</string> + <string name="sync_device_id_hint">Na druhém zařízení přidejte v Syncthingu zařízení a naskenujte tento kód nebo vložte ID. Potom ho zde přijměte ve webovém rozhraní.</string> + <string name="sync_copy">Kopírovat</string> + <string name="sync_share">Sdílet</string> + <string name="sync_done">Hotovo</string> + <string name="sync_off_title">Vypnout Syncthing?</string> + <string name="sync_off_body">Syncthing se nyní zastaví a zůstane zastavený, dokud ho znovu nezapnete. Synchronizované soubory zůstanou, kde jsou.</string> + <string name="sync_off_forget">Smazat také konfiguraci Syncthingu</string> + <string name="sync_off_forget_hint">Odebere ID tohoto zařízení, složky a zařízení. Po opětovném zapnutí začne od začátku.</string> + <string name="sync_turn_off">Vypnout</string> + <string name="sync_ports">Porty</string> + <string name="sync_port_sync">Synchronizace</string> + <string name="sync_port_discovery">Místní vyhledávání</string> + <string name="sync_repick">Vybrat nové porty</string> + <string name="sync_repick_hint">Kontroluje se znovu při každém spuštění.</string> + <string name="sync_repick_button">Vybrat znovu</string> + <string name="sync_reset_group">Obnovení</string> + <string name="sync_api_key">Klíč API</string> + <string name="sync_regenerate">Vygenerovat znovu</string> + <string name="sync_reset">Obnovit Syncthing</string> + <string name="sync_reset_hint">Nové ID zařízení, složky a zařízení budou odebrány. Soubory v úložišti DroidDecku zůstanou zachovány.</string> + <string name="sync_reset_button">Obnovit</string> + <string name="sync_reset_confirm_title">Obnovit Syncthing?</string> + <string name="sync_running_group">Spouštění</string> + <string name="sync_run">Spouštět</string> + <string name="sync_run_open">Když je DroidDeck otevřený</string> + <string name="sync_run_background">Na pozadí</string> + <string name="sync_wifi_only">Pouze Wi-Fi</string> + <string name="sync_pause_games">Pozastavit během her</string> + <string name="sync_logs">Protokoly</string> + <string name="sync_logs_hint">Výstup Syncthingu pro tuto relaci</string> + <string name="sync_logs_share">Sdílet</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Nejprve nastavte běhové prostředí Linuxu.</string> + <string name="sync_accept">Přijmout</string> + <string name="sync_accept_title">Uložit „%1$s“ do</string> + <string name="sync_add_folder">Přidat složku</string> + <string name="sync_add_folder_hint">Synchronizovat složku v úložišti DroidDecku</string> + <string name="sync_choose">Vybrat</string> + <string name="sync_add">Přidat</string> + <string name="sync_add_failed">Složku se nepodařilo přidat.</string> + <string name="sync_share_with">Sdílet se</string> + <string name="sync_share_none">Zatím žádná zařízení. Tuto složku můžete sdílet později z webového rozhraní.</string> + <string name="sync_use_folder">Použít tuto složku</string> + <string name="sync_new_folder">Nová složka</string> + <string name="sync_location_home">Domovská složka kontejneru</string> + <string name="sync_location_sync">Složka Sync</string> + <string name="sync_location_shared">Sdílené úložiště DroidDecku</string> + <string name="sync_location_card">DroidDeck na %1$s</string> + <string name="sync_location_app">Data aplikace DroidDeck</string> + <string name="sync_web_path_locked">Nové složky se ukládají do složky Sync v DroidDecku. Chcete-li synchronizovat jinou složku DroidDecku, použijte Přidat složku na kartě Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Načíst znovu</string> + <string name="sync_not_running">Syncthing neběží.</string> + <string name="session_end_steam_sigill">Steam se zastavil na neplatné instrukci (SIGILL). Může jít o problém s kompatibilitou instrukcí CPU nebo o pád klienta. Sdílejte protokoly s údaji o zařízení.</string> + <string name="session_end_steam_try_x64">Můžete zkusit Nastavení Steamu → Klient Steam → x86-64 (experimentální). Vyžaduje další stahování a může běžet pomaleji.</string> + <string name="session_end_vulkan_device">Grafický ovladač Linuxu nenašel použitelné zařízení Vulkan. Zkontrolujte, zda vybraný ovladač GPU pro Linux toto GPU podporuje.</string> + <string name="session_end_gpu_unsupported">Tuto relaci nelze spustit, protože toto GPU nemá v aktuálním nastavení kompatibilní ovladač Vulkan pro Linux. Ovladače Adreno Turnip nemohou zapnout podporu GPU MediaTek/Mali.</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_resources_browser">Otevře se v prohlížeči</string> + <string name="game_resource_guides">Návody</string> + <string name="game_resource_protondb_detail">Hlášení o kompatibilitě Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pro hry s uloženými pozicemi ve vašem účtu Steam</string> + <string name="game_resource_search">Hledat na webu</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="library_filter">Filtr</string> + <string name="library_filter_installed">Jen nainstalované</string> + <string name="library_filter_all_owned">Všechny vlastněné hry</string> + <string name="library_no_installed_matches">Těmto filtrům neodpovídají žádné nainstalované hry.</string> + <string name="library_browse_owned">Procházet vlastněné hry</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="stores_itch_updates_found">Dostupné aktualizace: %1$d</string> + <string name="stores_itch_update_replaced">Vývojář nahradil tuto verzi souborem %1$s. Aktualizovat na ni?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Nastavení cloudu</string> + <string name="integration_title">Integrace se Steamem</string> + <string name="integration_count">Zapnuto %1$d z %2$d</string> + <string name="integration_set_up">Nastavit</string> + <string name="integration_location">Poloha</string> + <string name="integration_app_info">Informace o aplikaci</string> + <string name="integration_wifi">Názvy Wi-Fi</string> + <string name="integration_brightness">Jas</string> + <string name="integration_home">DroidDeck jako domovská obrazovka</string> + <string name="integration_shortcuts">Zkratky tlačítka Domů</string> + <string name="integration_wifi_hint">Zobrazit sítě ve Steamu · vyžaduje přístup k poloze, nikdy se nesleduje</string> + <string name="integration_wifi_on">Sítě se zobrazují ve Steamu</string> + <string name="integration_wifi_location_off">Poloha je vypnutá</string> + <string name="integration_wifi_denied">Poloha zamítnuta · povolte ji v Informacích o aplikaci</string> + <string name="integration_brightness_hint">Posuvník Steamu nastavuje jas obrazovky</string> + <string name="integration_home_hint">Tlačítko Domů v relaci otevře nabídku Steam</string> + <string name="integration_shortcuts_hint">Podržte Domů pro kombinace Steam Guide</string> + <string name="integration_shortcuts_needs_home">Vyžaduje DroidDeck jako domovskou obrazovku</string> + <string name="integration_shortcuts_maybe_restricted">V Androidu zašedlé? Informace o aplikaci → ⋮ → Povolit omezená nastavení</string> + <string name="integration_shortcuts_restricted">Blokováno Androidem · Informace o aplikaci → ⋮ → Povolit omezená nastavení</string> + <string name="integration_shortcuts_service">Tlačítko Domů pro DroidDeck</string> + <string name="integration_shortcuts_service_description">Předává stisky tlačítka Domů do Steam Guide, když je aktivní relace Steamu a DroidDeck je výchozí aplikací domovské obrazovky. Nečte obsah obrazovky.</string> + <string name="integration_brightness_needed">Zapněte Jas v Příprava → Integrace se Steamem</string> + <string name="apps_search_hint">Hledat aplikace</string> + <string name="apps_no_match">Výrazu „%1$s“ neodpovídá žádná aplikace.</string> + <string name="apps_add_widget">Přidat widget</string> + <string name="apps_widgets_loading">Načítání widgetů…</string> + <string name="apps_widgets_none">Žádná aplikace v zařízení nenabízí widgety.</string> + <string name="apps_widget_wider">Širší</string> + <string name="apps_widget_narrower">Užší</string> + <string name="apps_widget_taller">Vyšší</string> + <string name="apps_widget_shorter">Nižší</string> + <string name="apps_widget_move_earlier">Posunout dříve</string> + <string name="apps_widget_move_later">Posunout později</string> + <string name="apps_widget_configure">Nastavení widgetu</string> + <string name="apps_widget_remove">Odebrat widget</string> + <string name="apps_add_to_folder">Přidat do složky</string> + <string name="apps_new_folder">Nová složka</string> + <string name="apps_remove_from_folder">Odebrat ze složky</string> + <string name="apps_app_info">Informace o aplikaci</string> + <string name="apps_uninstall">Odinstalovat</string> + <string name="apps_folder_rename">Přejmenovat</string> + <string name="apps_folder_ungroup">Zrušit složku</string> + <string name="apps_folder_default">Složka</string> + <string name="apps_folder_name">Název složky</string> + <string name="apps_filter">Zobrazit</string> + <string name="apps_filter_all">Všechny aplikace</string> + <string name="apps_filter_games">Hry</string> + <string name="apps_filter_downloaded">Stažené</string> + <string name="apps_filter_system">Systémové</string> + <string name="apps_filter_hidden">Skryté</string> + <string name="apps_hide">Skrýt</string> + <string name="apps_unhide">Zobrazit v aplikacích</string> + <string name="apps_shortcut_remove">Odebrat zkratku</string> + <string name="apps_pin_title">Přidat do aplikací</string> + <string name="apps_pin_add">Přidat</string> + <string name="apps_hidden_none">Žádné skryté aplikace.</string> + <string name="apps_sort_name_asc">Název A–Z</string> + <string name="apps_sort_name_desc">Název Z–A</string> + <string name="apps_sort_installed">Nedávno nainstalované</string> + <string name="apps_sort_updated">Nedávno aktualizované</string> + <plurals name="apps_count"> + <item quantity="one">%d aplikace</item> + <item quantity="few">%d aplikace</item> + <item quantity="many">%d aplikace</item> + <item quantity="other">%d aplikací</item> + </plurals> + <string name="desktop_restore_title">Obnovování vašeho softwaru</string> + <string name="desktop_restore_body">Přeinstalace aplikací, které jste přidali, po aktualizaci DroidDecku.</string> + <string name="desktop_restore_done_title">Software obnoven</string> + <string name="desktop_restore_done_body">Aplikace, které jste přidali, jsou znovu nainstalovány.</string> + <string name="desktop_restore_failed_title">Část softwaru se nepodařilo obnovit</string> + <string name="desktop_restore_failed_body">Podívejte se do ~/.cache/droiddeck/apt-restore.log a pak zkuste sudo apt install v Konsoli.</string> + <string name="gog_full_files">Nativní optimalizace nejsou k dispozici. Stažení obsahuje kompletní náhradní soubory.</string> + <string name="gog_recover">Ověřit výsledek patche</string> + <string name="slow_usb_title">Pomalé připojení USB</string> + <string name="slow_usb_cable">%1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s), takže hry na něm se budou načítat pomalu. Použijte kabel USB 3 s rychlostí 5 Gb/s nebo vyšší, zkuste otočit konektor USB-C nebo použijte rychlejší disk.</string> + <string name="slow_usb_port">%1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s). Port USB tohoto zařízení rychleji neumí, takže hry na něm se budou načítat pomalu. Interní úložiště nebo karta microSD může být rychlejší.</string> + <string name="slow_usb_never">Už nezobrazovat</string> + <string name="slow_usb_dismiss">Zavřít</string> + <string name="steam_import_title">Restartovat Steam a přidat vaše hry?</string> + <string name="steam_import_body">Steam může tyto vaše hry zobrazit jako nainstalované: %1$s. Aby je ukázal, musí se restartovat. Restartujte teď, nebo se přidají při příštím spuštění Steamu.</string> + <string name="steam_import_names_more">%1$s a %2$d dalších</string> + <string name="steam_import_now">Restartovat teď</string> + <string name="steam_import_later">Později</string> + <string name="gog_maintenance">Spravovat instalaci GOG</string> + <string name="gog_check">Zkontrolovat aktualizace</string> + <string name="gog_repair">Ověřit/opravit</string> + <string name="gog_patches">Offline patche</string> + <string name="gog_refresh">Stáhnout úplný offline instalátor</string> + <string name="gog_update">Aktualizovat na %1$s</string> + <string name="gog_resume">Pokračovat v údržbě GOG</string> + <string name="gog_open_patch">Otevřít instalátor patche</string> + <string name="gog_patch_in_session">Dokončete nebo zrušte instalátor patche v relaci Linuxu.</string> + <string name="gog_patch_requirements">Vyberte patch pro nainstalovanou verzi a jazyk. Podporované zdrojové verze nemusí být uvedeny.</string> + <string name="gog_no_patches">GOG pro tuto hru nemá samostatné patche pro Windows.</string> + <string name="gog_managed_files">Upravené soubory hry mohou být nahrazeny.</string> + <string name="gog_patch_installer_note">Instalátor se otevře ve vaší relaci Linuxu.</string> + <string name="gog_download_label">Stažení</string> + <string name="gog_space_label">Místo navíc</string> + <string name="gog_space_estimate_label">Odhad místa</string> + <string name="gog_repair_action">Opravit soubory</string> + <string name="gog_refresh_action">Obnovit instalaci</string> + <string name="gog_select_patch">Vybrat</string> + <string name="setup_all_files">Přístup ke všem souborům</string> + <string name="setup_local_network">Místní síť</string> + <string name="libraries_title">Další knihovny Steamu</string> + <string name="libraries_hint">Složky, do kterých může Steam instalovat hry a spouštět je, každá s vlastním názvem. Odebrání zachová hry na disku.</string> + <string name="libraries_add">Přidat knihovnu</string> + <string name="libraries_rename_title">Název knihovny</string> + <string name="libraries_pick">Vyberte složku knihovny</string> + <string name="libraries_full">Nejvýše %1$d dalších knihoven</string> + <string name="libraries_overlap">Tato složka už je knihovnou nebo se v ní nachází</string> + <string name="libraries_missing">%1$s · nedostupná</string> + <string name="libraries_applies_next">Platí od příští relace Steamu</string> + <string name="bottom_desktop_start">Spustit plochu</string> + <string name="bottom_desktop_mode_touch">Přímý dotyk</string> + <string name="bottom_desktop_trackpad">Touchpad. Klepnutím přepnete na přímý dotyk</string> + <string name="bottom_desktop_direct_touch">Přímý dotyk. Klepnutím přepnete na touchpad</string> + <string name="bottom_desktop_starting">Spouštění plochy KDE…</string> + <string name="bottom_desktop_ended">Plocha byla zavřena.</string> + <string name="bottom_desktop_failed">Plochu se nepodařilo spustit. Protokoly jsou ve složce bottom-desktop této relace.</string> + <string name="bottom_desktop_off">Plocha je zavřená.</string> + <string name="libraries_rename">Přejmenovat</string> + <string name="second_mode_desktop">Plocha</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Plocha · %1$s</string> </resources> diff --git a/app/src/main/res/values-da/gestures.xml b/app/src/main/res/values-da/gestures.xml index fdac523a6..022f14b97 100644 --- a/app/src/main/res/values-da/gestures.xml +++ b/app/src/main/res/values-da/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Bevægelser</string> <string name="gesture_settings">Indstillinger for berøringsbevægelser</string> - <string name="gesture_settings_hint">Tilpas muse- og tastaturbevægelser. Vælg Bevægelser som berøringstilstand for at bruge dem.</string> <string name="gesture_tap">Tryk</string> <string name="gesture_drag">Træk med én finger</string> <string name="gesture_long_press">Langt tryk</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Hold med tre fingre</string> <string name="gesture_pinch">Knib for at zoome</string> <string name="gesture_hold_button">Hold knappen nede</string> + <string name="gesture_hold_left">Hold venstre knap nede</string> + <string name="gesture_hold_right">Hold højre knap nede</string> <string name="gesture_click_once">Klik én gang</string> <string name="gesture_hold_delay">Forsinkelse før hold</string> <string name="gesture_double_delay">Interval for dobbelttryk</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">Tilbage</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mellemrum</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-da/shortcuts.xml b/app/src/main/res/values-da/shortcuts.xml new file mode 100644 index 000000000..d95cac5a5 --- /dev/null +++ b/app/src/main/res/values-da/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Genveje til fysiske knapper</string> + <string name="shortcuts_dd_menu">DroidDeck-menu</string> + <string name="shortcuts_capture">Tildel: %1$s</string> + <string name="shortcuts_press">Tryk på en knap, og slip den. Tildelingen gemmes automatisk.</string> + <string name="shortcuts_release">Slip knappen for at fortsætte.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Denne knap er allerede tildelt: %1$s</string> + <string name="shortcuts_save">Tildel igen</string> + <string name="shortcuts_retry">Prøv en anden knap</string> + <string name="shortcuts_limitations">Hjem-knappen og visse ekstra knapper er muligvis ikke tilgængelige.</string> +</resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0c2bc230b..7a7fb84af 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-indstillinger for D3D12. nodxr deaktiverer ray tracing; brug kun til et spil, der har brug for det.</string> <string name="game_env_proton_log">Sæt til 1 for en diagnostisk Proton-log. Logning kan reducere ydelsen og bruge lagerplads.</string> <string name="game_env_wined3d">Sæt til 1 for at bruge OpenGL-baseret WineD3D i stedet for DXVK til D3D9–11-kompatibilitetstest.</string> + <string name="game_env_wined3d_renderer">Renderer til DirectDraw, Direct3D 1-7 og spil, der kører med WineD3D. Vulkan springer OpenGL-via-Zink-vejen over og er meget hurtigere til gamle DirectDraw- og Direct3D 7-spil på Adreno.</string> + <string name="game_env_dxvk_d3d8">Sæt til 1 for at køre Direct3D 8 via DXVK i stedet for WineD3D. Hurtigere i AIO Graphics Tests Direct3D 8-test på Adreno.</string> <string name="game_env_no_ntsync">Sæt til 1 for at holde dette spil væk fra ntsync (droiddeck-ntsync eller en kerneldriver); det bruger droiddeck-esync, hvor en pack findes, ellers droiddeck-fsync.</string> <string name="game_env_no_esync">Sæt til 1 for at slå droiddeck-esync fra for dette spil; det bruger droiddeck-fsync i stedet, eller droiddeck-ntsync hvis fsync også er fra.</string> <string name="game_env_no_fsync">Sæt til 1 for at holde dette spil væk fra droiddeck-fsync; det bruger droiddeck-esync, hvor en pack findes, ellers droiddeck-ntsync.</string> <string name="game_env_fsync_first">Sæt til 1 for at køre dette spil på droiddeck-fsync, eller 0 for at sætte droiddeck-esync først, hvor en pack passer til dets Proton.</string> <string name="game_env_xalia">Sæt til 0 for at deaktivere Protons gamepad-navigationshjælper for dette spil.</string> + <string name="game_env_anticheat_offline">Til som standard. Starter et Easy Anti-Cheat-spil uden dets anti-cheat, når spillet understøtter offlinespil. Slå fra for at starte via Easy Anti-Cheat som normalt. Onlinetilstande, der kræver Easy Anti-Cheat, forbliver utilgængelige.</string> <string name="game_env_hud">DXVK-overlay til D3D9–11. fps viser billedhastigheden; lad stå tomt for at skjule den.</string> <string name="game_env_dxvk_config">DXVK-indstillinger adskilt af semikolon. Nyere builds bruger dxvk.maxFrameRate til at begrænse billedhastigheden; foretræk sessionens billedgrænse til almindeligt spil.</string> + <string name="game_env_cores">CPU-kerner til dette spil, f.eks. 0-4 eller 0,2,4, i stedet for sessionens spilkerner. Færre kerner kører køligere.</string> <string name="game_env_vkd3d_limit">Grænse for D3D12-billedhastighed. 0 deaktiverer grænsen.</string> <string name="game_env_glthread">Mesa OpenGL-threading. true kan hjælpe CPU-begrænsede OpenGL-spil; test for hvert spil.</string> <string name="sync_backend_title">Wine-synkronisering</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kører x86-Linux-programmer på denne ARM64-enhed. Auto bruger det, når programmet er bygget til x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dette program er bygget til %1$s-pc’er og køres via FEX, som ikke er sat op endnu. Åbn Steam én gang, mens du er logget ind: DroidDeck downloader så FEX og den Steam Linux Runtime, det kræver, hvorefter dette åbner.</string> + <string name="session_proot_missing">DroidDecks proot kunne ikke downloades. Tjek forbindelsen, og prøv igen. Sessionen blev ikke startet, fordi reserve-proot er for langsom at spille på.</string> + <string name="session_directaudio_missing">DirectAudio kunne ikke downloades, så spillyd bruger den langsommere vej i denne session.</string> <string name="session_end_program">Dette program</string> <string name="session_end_steam_download">Steam-klienten kunne ikke downloades. Dit netværk eller din VPN blokerer muligvis Steams servere; tjek forbindelsen, og prøv igen.</string> <string name="session_end_steam_setup">Steam-klienten kunne ikke konfigureres. Tjek forbindelsen og den ledige lagerplads, og prøv igen.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-controller</string> <string name="mode_controller_note">Deck: Hurtig adgang-knap og gyro. Steam Controller: det samme, med gribefølsomme bagknapper. DualShock 4 og DualSense: gyro, og touchpaddene som deres touchpad. Xbox 360: åbn Hurtig adgang med Guide+A.</string> <string name="mode_back">Tilbage</string> + <string name="back_hold">Hold Tilbage for Steam-genveje</string> + <string name="back_hold_hint">Hold Tilbage for at åbne Hurtig adgang eller lave Steam-kombinationer med andre knapper. Slå fra for at ignorere holdt Tilbage; tryk og dobbelttryk virker stadig.</string> + <string name="back_native_qam_hint">Hold Tilbage i 700 ms, eller hold Tilbage og tryk på en anden knap for Steam-genveje.</string> + <string name="back_double_tap_window">Tidsrum for dobbelttryk</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillad styring af lysstyrke</string> + <string name="brightness_permission_text">Konfigurer styring af lysstyrke i 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> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Opdateret · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installer nyeste</string> + <string name="decky_channel">Opdateringskanal</string> + <string name="decky_channel_hint">Hvilke Decky Loader-udgivelser der installeres. Deckys egen opdatering bruger samme kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Forhåndsudgivelse</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Kunne ikke gemme Decky-opdateringskanalen</string> <string name="mode_decky_on">Starter med Steam. Mens den er til, kan andre apps på denne enhed muligvis styre Steam.</string> <string name="mode_decky_off">Fra. Steams fjerndebugport forbliver lukket.</string> <string name="mode_decky_remove_title">Afinstaller Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Ydelsesoverlay</string> <string name="mode_mangoapp_hint">Slå fra, hvis spil går ned eller bliver sorte i Deck-tilstand. Gælder fra næste session.</string> + <string name="mode_return_after_game">Vend tilbage til DroidDeck efter et spil</string> + <string name="mode_return_after_game_hint">Når et spil, du startede fra DroidDeck eller en anden launcher, lukkes, afslutter Steam pænt (cloud-gemninger afsluttes først), og du vender tilbage dertil. Fra: bliv i Steam.</string> + <string name="mode_shader_precache">Shader-forhåndscaching</string> + <string name="mode_shader_precache_hint">Steam downloader forudbyggede shadere til dine spil og behandler dem i baggrunden, så spil hakker mindre. Fra sparer data, lagerplads og batteri; spil bygger i stedet shadere undervejs. Samme indstilling som Steams Downloads > Shader Pre-Caching. Gælder fra næste session.</string> <string name="mode_steam_repair">Reparer Steam-klienten</string> <string name="mode_steam_repair_hint">Downloader Steam-klienten igen, næste gang Steam starter. Brug det, hvis Steam bliver hængende på sin indlæsningsskærm. Spil, login og indstillinger bevares.</string> <string name="mode_steam_repair_queued">Steam-klienten downloades igen, næste gang Steam starter.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Går uden om PulseAudio for lavere forsinkelse.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Til voicechat.</string> + <string name="drawer_mic_hint">Slå mikrofonoptagelse til eller fra for denne session.</string> + <string name="drawer_mic_failed">Kunne ikke ændre mikrofonen. Prøv igen.</string> <string name="mode_network">Netværk</string> <string name="mode_wifi_discovery">Wi-Fi-søgning</string> <string name="mode_wifi_discovery_hint">Vis Wi-Fi-navne og netværk i nærheden i Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: realtids-GPU-kø</string> <string name="perf_gsrealtime_hint">Prioriterer compositorens GPU-arbejde. Kan give jævnere billedtiming på bekostning af spillene.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Hukommelse</string> + <string name="perf_cap_off">Fra</string> + <string name="perf_cap_auto">Driverstandard</string> + <string name="perf_zram_client">Komprimer Steam, mens et spil kører</string> + <string name="perf_zram_client_hint">20 s efter et spil starter, komprimeres Steam-klienten i zRAM for at give spillet mere hukommelse, og læses tilbage, når spillet lukkes. Slå fra, hvis sessionen lukker kort efter, at spil starter. En RAM-grænse ovenfor komprimerer stadig Steam, når sessionen overskrider den.</string> + <string name="perf_ram_cap">RAM-grænse</string> + <string name="perf_ram_cap_hint">Gælder, mens Steam-klienten kører, i Steam-tilstand eller fra skrivebordet. Når sessionen bruger mere end dette, komprimeres Steam og derefter sessionens andre understøttede processer i zRAM. En blød grænse: intet lukkes, men spil kan hakke, mens sider hentes tilbage.</string> + <string name="perf_ram_cap_unavailable">Kræver zRAM-swap, som denne enhed ikke har.</string> + <string name="perf_vram_cap">VRAM-grænse</string> + <string name="perf_vram_cap_hint">Den videohukommelse, DXVK rapporterer til Direct3D-spil, så de budgetterer teksturer til mindre. Et spils egne DXVK-indstillinger har forrang. Træder i kraft ved næste session.</string> <string name="perf_gpuclock">Hold GPU’en på dens højeste clock</string> <string name="perf_gpuclock_hint">Kun Adreno. Færre hak, mere batteribrug og varme.</string> <string name="perf_fixes">Sessionsrettelser</string> <string name="perf_sysmem">Turnip: sysmem-rendering</string> <string name="perf_sysmem_hint">Hurtigere til Steam-klienten; i spil vælger driveren flise- eller systemhukommelses-rendering for hvert pass. Påkrævet på Adreno 710/720/722.</string> <string name="perf_xalia">Spring Steams xalia-hjælper over</string> - <string name="perf_fastsync">droiddeck-ntsync (eksperimentel)</string> - <string name="perf_fastsync_hint">En stand-in til ntsync-driveren i Linux-kernen, i brugerrum, til test. Mens den er til, bruger Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gælder fra næste session.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">En stand-in til ntsync-driveren i Linux-kernen, i brugerrum. Mens den er til, bruger Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gælder fra næste session.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync først</string> <string name="perf_fsync_hint">Kører Protons egen fsync på de uændrede Proton-filer, med futex_waitv leveret i brugerrum, så det kræver ingen pack og fortsætter med at virke, lige så snart Steam opdaterer Proton. Mens den er til, bruger spil den før droiddeck-esync, undtagen de få, Proton holder uden for fsync. Gælder fra næste session.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot-hurtigvej</string> <string name="perf_fastpath_needs_seccomp">Kræver prootets seccomp-filter.</string> <string name="perf_fastpath_hint">Hurtigere filopslag og mindre hak. Slå fra, hvis et program ikke kan finde sine filer.</string> + <string name="perf_cursor_composite">Tegn markøren i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tegner selv markøren i stedet for at overlade den til Android. Slå til for en controllerstyret markør. Fra er hurtigere på en telefon. Gælder fra næste session.</string> <string name="perf_identity">Sessionsidentitet</string> <string name="perf_hostname">Værtsnavn</string> <string name="perf_hostname_hint">Navnet Steam ser for denne enhed. Tomt gendanner %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Dens filer fjernes fra appen.</string> <string name="driver_delete_in_use">Dens filer fjernes. Den er i brug, så standarden tager over.</string> <string name="drawer_page_display">Skærm</string> + <string name="drawer_frame_limit">Billedgrænse</string> + <string name="drawer_frame_limit_note">Begrænser dette spil. Skærmen skifter til en opdateringshastighed, som grænsen går lige op i, når den har en; andre grænser kan virke ujævne. Steam-spil bruger Steams Frame Limit i Hurtig adgang-menuen.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Ravgul</string> <string name="drawer_hud_color_violet">Violet</string> <string name="drawer_hud_opacity">Gennemsigtighed</string> + <string name="hud_size">Størrelse</string> + <string name="hud_size_hint">Et tryk på HUD ændrer også størrelsen.</string> + <string name="hud_size_full">Fuld</string> + <string name="hud_size_tiles">Fliser</string> + <string name="hud_size_pill">Pille</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bjælke</string> + <string name="hud_locked">Lås fast</string> + <string name="hud_locked_hint">Træk i HUD for at flytte det; et langt tryk låser eller frigør det. Mens det er låst, virker skærmknapperne under det stadig.</string> + <string name="hud_snap">Fastgør til siderne</string> + <string name="hud_snap_hint">Slip HUD\'en, så flytter den sig til skærmens nærmeste side. Et hurtigt stryg kaster den i den retning.</string> + <string name="hud_group_look">Udseende</string> + <string name="hud_scale">Størrelse på skærmen</string> + <string name="hud_color_soft">Blød</string> + <string name="hud_color_mid">Mellem</string> + <string name="hud_color_vivid">Kraftig</string> + <string name="hud_outline">Kontur</string> + <string name="hud_outline_color">Konturfarve</string> + <string name="hud_outline_gray">Grå</string> + <string name="hud_outline_theme">Temafarve</string> + <string name="hud_group_metrics">Målinger</string> + <string name="hud_metric_graph">Billedtidsgraf</string> + <string name="hud_metric_decimal">Billedhastighed med decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% laveste</string> + <string name="hud_metric_engine">Grafikmotor</string> + <string name="hud_metric_gpu_model">GPU-navn</string> + <string name="hud_metric_gpu">GPU-belastning</string> + <string name="hud_metric_gpu_temp">GPU-temperatur</string> + <string name="hud_metric_cpu">CPU-belastning</string> + <string name="hud_metric_per_core">CPU pr. kerne</string> + <string name="hud_metric_temp">Temperaturer</string> + <string name="hud_metric_ram">Hukommelse</string> + <string name="hud_metric_vram">Grafikhukommelse</string> + <string name="hud_metric_swap">Swap-hukommelse</string> + <string name="hud_metric_battery">Batteriniveau</string> + <string name="hud_metric_power">Strømforbrug</string> + <string name="hud_metric_network">Netværk</string> + <string name="hud_metric_resolution">Opløsning</string> + <string name="hud_metric_proton">Proton-version</string> + <string name="hud_metric_session">Sessionstid</string> + <string name="hud_metric_clock">Ur</string> + <string name="hud_group_temps">Temperaturer</string> + <string name="hud_temp_unit">Enhed</string> + <string name="hud_temp_bands">Advarselsfarver</string> + <string name="hud_temp_bands_hint">Temperaturer bliver ravgule og derefter røde, når de nærmer sig grænsen.</string> + <string name="hud_temp_bands_off">Fra</string> + <string name="hud_temp_bands_auto">Automatisk</string> + <string name="hud_temp_bands_manual">Manuel</string> + <string name="hud_temp_red_cpu">CPU rød ved</string> + <string name="hud_temp_red_gpu">GPU rød ved</string> + <string name="hud_temp_red_battery">Batteri rødt ved</string> + <string name="hud_group_more">Mere</string> + <string name="hud_export">HUD-diagnostik</string> + <string name="hud_export_hint">Gemmer en rapport over alle sensorer, som HUD læser, i Downloads/DroidDeck.</string> + <string name="hud_export_button">Gem</string> + <string name="hud_export_done">Gemt i %1$s</string> + <string name="hud_export_failed">HUD-rapporten kunne ikke gemmes.</string> + <string name="hud_reset">Nulstil HUD-indstillinger</string> + <string name="hud_reset_button">Nulstil</string> <string name="drawer_scaling">Skaleringstilstand</string> <string name="drawer_scaling_sharpness">Skaleringsskarphed</string> <string name="drawer_effects">Skærmeffekter</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Forsinkelse</string> + <string name="drawer_low_latency">Lav forsinkelse</string> + <string name="drawer_low_latency_hint">Øger CPU- og batteriforbrug</string> <string name="drawer_low_latency_controller">Controller med lav forsinkelse</string> <string name="drawer_low_latency_controller_hint">Controlleren rapporterer ved 1000 Hz i stedet for 250 Hz. Lidt mere CPU.</string> <string name="drawer_low_latency_touch">Berøring med lav forsinkelse</string> <string name="drawer_low_latency_touch_hint">Berøringer springer billedsamling over; Steams berøringsstyring kører ved 1000 Hz. Lidt mere CPU.</string> + <string name="drawer_evdev_mouse">Rå musekanal</string> + <string name="drawer_direct_cursor">Markør</string> <string name="drawer_pc_keyboard">PC-tastatur</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Anden skærm</string> @@ -715,6 +834,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Sessionslogs</string> <string name="setup_logs_hint">Gemt efter hver session</string> + <string name="setup_game_debug_logs">Fejlfindingslogs for spil</string> + <string name="setup_game_debug_logs_hint">Medtag Proton-, Wine- og grafikdiagnostik ved næste spilstart. Kan reducere ydelsen og bruge mere lagerplads.</string> + <string name="setup_game_debug_logs_restart">Genstart denne session for at gemme fejlfindingslogs for spil</string> + <string name="setup_logging_update_failed">Kunne ikke opdatere logning. Tjek kontakten, og prøv igen.</string> <string name="setup_agent_commands">Fejlfindingsværktøjer</string> <string name="setup_latest_logs">Seneste sessionslogs</string> <string name="setup_saved_logs">Gemte sessionslogs</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck kan være Home-appen</string> <string name="setup_home_off">DroidDeck tilbydes aldrig som Home-app</string> <string name="setup_orientation">Retning</string> + <string name="setup_launcher_orientation">Launcherens retning</string> + <string name="setup_launcher_orientation_auto">Følg enhedens rotation</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Sessionens retning</string> + <string name="setup_session_orientation_hint">Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; brugerdefineret bredde og højde forbliver som angivet.</string> <string name="setup_orientation_auto">Automatisk liggende</string> <string name="setup_orientation_landscape">Liggende</string> <string name="setup_orientation_reverse">Omvendt liggende</string> <string name="setup_fullscreen">Fuldskærm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigationsbjælker</string> <string name="setup_fullscreen_off">Viser Androids status- og navigationsbjælker</string> + <string name="setup_dual_screen">Dobbeltskærm</string> + <string name="setup_dual_screen_hint">Automatisk bruger den anden skærm på håndholdte enheder med en indbygget ekstra skærm. Til bruger enhver anden skærm. Fra holder alt på én skærm.</string> + <string name="setup_dual_screen_auto">Automatisk</string> + <string name="setup_dual_screen_on">Til</string> + <string name="setup_dual_screen_off">Fra</string> + <string name="setup_dual_screen_menu">Menu på nederste skærm</string> + <string name="setup_dual_screen_menu_hint">Flytter sektionerne og menuen i spillet til den anden skærm og skriver der, så den øverste skærm beholder hele visningen. L2 og R2 skifter sektion.</string> + <string name="setup_dual_screen_controls">Kontroller på nederste skærm i spil</string> + <string name="setup_dual_screen_controls_hint">Åbner pegefeltet og tastaturet på den anden skærm, når en session starter.</string> + <string name="dual_typing_title">Skriver til den øverste skærm</string> + <string name="dual_typing_done">Færdig</string> <string name="setup_default_home">Standard Home-app</string> <string name="setup_choose_home">Vælg en Home-app</string> <string name="setup_choose">Vælg</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Åbn Indstillinger → Udviklerindstillinger → Trådløs fejlretning, og slå den til</string> <string name="gate_step2">Tryk på “Par enhed med parringskode”</string> <string name="gate_step3">Indtast koden i DroidDeck-notifikationen</string> + <string name="pairguide_build_number">Tryk 7 gange på Buildnummer under Om telefonen</string> + <string name="pairguide_wireless">Slå Trådløs fejlretning til</string> + <string name="pairguide_pair">Åbn Trådløs fejlretning, og tryk på “Par enhed med parringskode”</string> + <string name="pairguide_child_process">Slå “Deaktiver begrænsningerne for underprocesser” til</string> + <string name="pairguide_row_child_process">Deaktiver begrænsningerne for underprocesser</string> + <string name="pairguide_row_build_number">Buildnummer</string> + <string name="pairguide_row_wireless">Trådløs fejlretning</string> + <string name="pairguide_row_pair">Par enhed med parringskode</string> <string name="gate_waiting">Venter på parringsvinduet…</string> <string name="gate_code_needed">Vindue fundet. Indtast dets kode i notifikationen.</string> <string name="gate_status">Status</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Aldrig spillet</string> <string name="games_runtime_busy_percent">Runtime optaget · %1$d%%</string> <string name="games_runtime_busy">Runtime optaget</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Skjul drivere til andre GPU’er</string> <string name="gpu_show_other">Vis drivere til andre GPU’er</string> <string name="gpu_advanced">Avanceret</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prøv Til eller Fra, hvis Steam eller Android viser striber eller flimmer. Gælder begge drivere efter genstart af DroidDeck.</string> + <string name="gpu_ubwc_restart">Genstart DroidDeck for at anvende.</string> <string name="gpu_set_with_display">Angives sammen med skærmdriveren: %1$s dækker begge.</string> <string name="gpu_set_with_runtime">Angives sammen med runtimedriveren: %1$s dækker begge.</string> <string name="gpu_runtime_hint">Bruges af spil og skrivebordet.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Gå automatisk til billede i billede</string> <string name="unfolded_controls">Kontroller på den udfoldede skærm</string> <string name="unfolded_controls_hint">Når skærmen er foldet ud, ligger spillet over Steam Decks trackpads og grebsknapper. Når den er foldet sammen, fylder spillet hele skærmen.</string> + <string name="unfolded_controls_with_controller">Behold dem med en controller</string> + <string name="unfolded_controls_with_controller_hint">Vis også disse berøringskontroller, mens en controller er tilsluttet.</string> <string name="pip_suspended">Sat i bero</string> <string name="pip_not_ready">Billede i billede er tilgængeligt, når sessionen er klar.</string> <string name="pip_permission">Tillad billede i billede for DroidDeck i Android-indstillingerne.</string> <string name="pip_unavailable">Android kunne ikke åbne billede i billede.</string> + <string name="game_more">Mere</string> + <string name="game_edit_art">Rediger grafik</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Genvej</string> <string name="game_shortcut_add">Tilføj til hjemmeskærm</string> <string name="game_shortcut_choose">Vælg spil</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Vent til runtime-handlingen er færdig</string> <string name="main_wait_proton_install">Vent til installationen af kompatibilitetsværktøjet er færdig</string> + <string name="load_compat_title">Forbereder kompatibilitetsværktøjer</string> + <string name="load_compat_wait">Venter på, at kompatibilitetsopsætningen bliver færdig</string> + <string name="load_compat_hint">Din session starter, når opsætningen er færdig.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vent til installationen af skrivebordsappen er færdig</string> <string name="main_wait_install_game">Vent til installationen er færdig, før du starter et spil</string> <string name="main_saves_close_session">Luk Steam-sessionen først, så spillet ikke overskriver importen</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Installer alligevel</string> <string name="main_remove_runtime_title">Fjern Linux-runtime</string> <string name="main_remove_runtime_text">Dette sletter runtime\'en, Steam-klienten i den og alle spil installeret der.</string> + <string name="runtime_actions_title">Linux-runtime</string> + <string name="runtime_actions_text">Reparer geninstallerer runtimens systemfiler og bevarer Steam, dine spil og indstillinger. Ekstra komponenter som skrivebordet installeres igen, næste gang du bruger dem. Fjern sletter alt.</string> + <string name="runtime_repair">Reparer runtime</string> <string name="main_applied">Anvendt: %1$s</string> <string name="android_app_open_failed_primary">Kunne ikke åbne %1$s på den primære skærm</string> <string name="android_app_open_failed_on">Kunne ikke åbne %1$s på %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Kunne ikke nå runtime-kataloget. Kontroller forbindelsen, og tryk på Spil igen.</string> <string name="session_runtime_install_failed">Linux-runtime blev ikke installeret. Kontroller runtime i Opsætning, og tryk på Spil igen.</string> <string name="session_desktop_install_failed">Skrivebordet blev ikke installeret (%1$s). Kontroller forbindelsen, og tryk på Skrivebord igen.</string> + <string name="session_package_resume_failed">En afbrudt installation kunne ikke fuldføres (%1$s). Tjek forbindelsen og den ledige plads, og prøv igen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-runtimen er beskadiget: %1$d bibliotekslink peger på en manglende fil (%2$s), som regel efter en afbrudt installation. Reparer bevarer dine spil og indstillinger.</item> + <item quantity="other">Linux-runtimen er beskadiget: %1$d bibliotekslinks peger på manglende filer (%2$s og andre), som regel efter en afbrudt installation. Reparer bevarer dine spil og indstillinger.</item> + </plurals> <string name="session_ended_named">%1$s stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> <string name="session_ended_program">Programmet stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> <string name="session_ended_desktop">Skrivebordet stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Installer en plugin-ZIP til den næste Steam-session.</string> <string name="mode_decky_plugin_downloading">Downloader…</string> <string name="mode_decky_plugin_install_zip">Installer fra ZIP</string> + <string name="decky_zip_warning_title">Installation af tredjeparts-plugin</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har ikke gennemgået dette plugin. Det kan indeholde malware, f.eks. software, der stjæler din Steam-konto eller skader din enhed. Ved at installere dette plugin accepterer du, at du påtager dig al risiko for din enhed.</string> + <string name="decky_zip_warning_continue">Fortsæt</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vent %1$d sekund</item> + <item quantity="other">Vent %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spil</string> <string name="store_cat_audio_video">Lyd og video</string> <string name="store_cat_graphics">Grafik</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Sort baggrund, hvid skrift, blå til alt, der er valgt, fokuseret eller trykket.</string> <string name="theme_electric">Elektrisk marineblå</string> <string name="theme_electric_detail">Den blå er klarere, på overflader der trækker mod marineblåt i stedet for gråt.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Farver, der skifter gennem regnbuen. Følger Androids animationsindstillinger.</string> + <string name="theme_rgb_speed">Hastighed</string> + <string name="theme_rgb_speed_hint">Hvor hurtigt farverne skifter.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Dine egne primære og sekundære farver, blandet på knapper og fremhævninger.</string> <string name="theme_gradient_primary">Primær</string> @@ -1424,7 +1597,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mellemrum</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Spring over</string> <string name="fm_select_this_folder">Vælg denne mappe</string> <string name="fm_back">Tilbage</string> + <string name="fm_exit">Afslut</string> + <string name="fm_return_to_start">Tilbage til startmappen</string> + <string name="fm_start_unavailable">Startmappen er ikke længere tilgængelig</string> + <string name="fm_cancel_operation_title">Annuller handlingen?</string> + <string name="fm_cancel_operation_confirmation">Handlingen bliver annulleret. Er du sikker?</string> + <string name="fm_accept">Accepter</string> + <string name="fm_decline">Afvis</string> <string name="fm_drive_not_readable">%1$s er monteret, men kan ikke læses lige nu</string> + <string name="fm_drive_access_title">Giv adgang til %1$s</string> + <string name="fm_drive_access_text">Android lader DroidDeck se dette drev, men ikke læse det. Slå Adgang til alle filer til for DroidDeck, og kom så tilbage.</string> <string name="fm_list_view">Listevisning</string> <string name="fm_grid_view">Gittervisning</string> <string name="fm_search">Søg</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Tastatur + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-greb + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Intet at vise her endnu.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Ingen downloads i gang.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Downloader shader-cache</string> + <string name="bottom_downloads_paused">På pause</string> + <string name="bottom_downloads_queued">Venter på at starte</string> + <string name="bottom_page_notifications">Notifikationer</string> + <string name="bottom_notifications_listener">DroidDecks nederste skærm</string> + <string name="bottom_notifications_why">Vis beskeder og andre notifikationer her, mens du spiller. De bliver kun på denne skærm og gemmes ikke. Android spørger én gang: siden for notifikationsadgang åbnes på denne skærm; slå DroidDeck til der, så vender denne side selv tilbage.</string> + <string name="bottom_notifications_allow">Tillad notifikationsadgang</string> + <string name="bottom_notifications_none">Ingen notifikationer.</string> + <string name="bottom_notifications_count">%1$d notifikationer</string> + <string name="bottom_notifications_clear">Ryd</string> + <string name="bottom_page_screenshots">Skærmbilleder</string> + <string name="stats_fps_needs_hud">FPS kræver, at HUD er slået til</string> + <string name="stats_speed">Hastighed</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tider</string> + <string name="stats_best_lap">Bedste omgang</string> + <string name="stats_tires">Dæk °C</string> + <string name="stats_trace">Speeder og bremse, seneste 10 s</string> + <string name="stats_speed_chart">Hastighed, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_speed_units">Hastighedsenheder</string> + <string name="stats_speed_units_auto">Auto (%1$s)</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Speeder</string> + <string name="stats_brake">Bremse</string> + <string name="stats_lights">Kontrollamper</string> + <string name="stats_lamp_shift">Gearskift</string> + <string name="stats_lamp_handbrake">Håndbremse</string> + <string name="stats_lamp_pit">Pitbegrænser</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olie %1$s °C</string> + <string name="stats_power">Energifordeler</string> + <string name="stats_fuel_t">Brændstof, t</string> + <string name="stats_fuel_main">Hoved %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_tap_hint">Tryk på den øverste bjælke eller instrumentbrættet for at skifte stil.</string> + <string name="bottom_telemetry_send_title">Send instrumentbrætdata</string> + <string name="bottom_telemetry_send_auto">Auto</string> + <string name="bottom_telemetry_send_auto_hint">Slår det til for alle spil på listen her, også spil, der findes senere. Spil, du slår fra, forbliver slået fra.</string> + <string name="bottom_telemetry_send_note">Dette ændrer spillets egen indstilling for dataoutput. Det træder i kraft, næste gang spillet starter; slås det fra, gendannes den gamle indstilling.</string> + <string name="bottom_telemetry_send_close">Luk %1$s for at ændre dette.</string> + <string name="bottom_telemetry_send_failed">Kunne ikke ændre indstillingerne for %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå %2$s til i spillets indstillinger med IP 127.0.0.1 og port %3$d.</string> + <string name="bottom_shots_where">Gemmes i Pictures/DroidDeck. Steam-skærmbilleder vises også her.</string> + <string name="bottom_shots_take">Tag skærmbillede</string> + <string name="bottom_shots_saved">Skærmbillede gemt.</string> + <string name="bottom_shots_failed">Kunne ikke tage et skærmbillede.</string> + <string name="bottom_shots_none">Ingen skærmbilleder endnu.</string> + <string name="bottom_page_chat">Chat og stemme</string> + <string name="bottom_chat_why">Læs og besvar Steam-chat her, mens spillet fortsætter på hovedskærmen. Den bruger den konto, Steam er logget ind med.</string> + <string name="bottom_chat_not_signed_in">Steam har endnu ikke et weblogin at dele, så log ind her én gang.</string> + <string name="bottom_chat_stopped">Android lukkede chatsiden, mens DroidDeck var i baggrunden. Den åbner igen, når du vender tilbage til DroidDeck.</string> + <string name="bottom_chat_open">Åbn Steam Chat</string> + <string name="bottom_chat_close">Luk chat</string> + <string name="bottom_chat_mic_on">Mikrofon til</string> + <string name="bottom_chat_mic_off">Mikrofon fra</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen er slået fra for dette spil. For at tale skal du slå Mikrofon til i DroidDecks Steam-indstillinger (Lyd) og starte spillet igen.</string> + <string name="bottom_chat_volume">Lydstyrke %1$d%%</string> + <string name="bottom_page_telemetry">Statistik i spillet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Omgang</string> + <string name="bottom_telemetry_position">Placering</string> + <string name="bottom_telemetry_this_lap">Denne omgang</string> + <string name="bottom_telemetry_last_lap">Sidste omgang</string> + <string name="bottom_telemetry_fuel">Brændstof</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Energi SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridisk status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Slå dataoutput til i et racerspil (ofte kaldet telemetri eller UDP) for at se et live-instrumentbræt her. Det forbliver på denne enhed.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d modtager data (%2$d pakker á %3$d bytes), men i et format, som denne side endnu ikke kan læse.</string> + <string name="bottom_telemetry_port_busy">Et andet program bruger allerede port %1$s, så det spil kan ikke vises her.</string> <string name="rtinst_removing">Fjerner Linux-runtime</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Opsæt Flatpak først</string> <string name="flatpakmgr_starting">Starter</string> <string name="flatpakmgr_exit_status">Flatpak afsluttede med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s er bygget til %2$s, som DroidDeck ikke kan køre. Flatpak-apps her skal være bygget til ARM64 eller x86_64.</string> <string name="flatpakmgr_installing">Installerer %1$s</string> <string name="flatpakmgr_updating">Opdaterer %1$s</string> <string name="flatpakmgr_removing">Fjerner %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Anvender indstillingen…</string> <string name="adbpair_command_failed">Kommando til Trådløs fejlretning mislykkedes</string> <string name="adbpair_channel_name">Opsætning af Trådløs fejlretning</string> + <string name="adbpair_progress_channel_name">Status for opsætning af trådløs fejlretning</string> <string name="adbpair_channel_description">Spørger efter parringskoden til Trådløs fejlretning, mens Indstillinger er åben</string> <string name="adbpair_title_pair">Par Trådløs fejlretning</string> <string name="adbpair_waiting_text">Tænd Trådløs fejlretning, og tryk derefter på „Par enhed med parringskode“.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Ikke en Adreno-GPU</string> <string name="gpuinfo_supported">Understøttet</string> <string name="gpuinfo_experimental">Eksperimentel: dens drivere er testversioner</string> + <string name="gpuinfo_a850_experimental">Eksperimentel Adreno 850-understøttelse: kræver kompatible eksperimentelle skærm- og spildrivere; ikke bekræftet på denne enhed</string> <string name="gpuinfo_below_tested">Under testet hardware (Adreno 725 og nyere): kører muligvis ikke</string> <string name="gpuinfo_unsupported">Ikke understøttet: DroidDeck kræver en Adreno (Snapdragon) GPU</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Skaleret %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Vis enhedsoplysninger</string> <string name="device_info_hide">Skjul enhedsoplysninger</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Sortér</string> + <string name="setup_rail_labels">Sidepanelets etiketter</string> + <string name="setup_rail_labels_hint">Vis navne under ikonerne i sidepanelet. Slå fra for et smallere sidepanel.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Større kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Vis titel</string> + <string name="library_display_size">Vis størrelse</string> <string name="stores_sort_last_played">Senest spillet</string> <string name="stores_sort_recently_installed">Senest installeret</string> <string name="stores_sort_title_asc">Titel A–Å</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Downloadadministrator</string> <string name="stores_parallel">Downloads på samme tid</string> <string name="stores_install_where">Installer til</string> + <string name="stores_install_language">Spilsprog</string> + <string name="stores_install_language_hint">GOG og Epic installerer dette sprog. System følger appens sprog.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installer %1$s:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s fri</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Start i</string> <string name="edit_launch_options">Startindstillinger</string> + <string name="edit_launch_options_steam_hint">Delt med Egenskaber i Steam: en ændring det ene sted vises begge steder.</string> + <string name="edit_launch_options_not_saved">Startindstillingerne kunne ikke gemmes i Steam. Prøv igen.</string> + <string name="edit_launch_options_desktop">Steam kan være åben i skrivebordssessionen. Skift startindstillingerne under dens Egenskaber, eller luk sessionen først.</string> <string name="edit_artwork">Grafik</string> <string name="edit_other_exe">Anden exe…</string> <string name="edit_remove">Fjern</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Eget præfiks</string> <string name="setup_download_mirror">Websted</string> <string name="setup_download_prefix">Præfiks</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">Desktopapps til Linux-desktoppen, åbnet fra Desktop.</string> @@ -2406,7 +2722,7 @@ <string name="glasses_game_on_hint">Vis kun spillet på brillen. Fra: telefonen viser det, og Android spejler telefonen.</string> <string name="glasses_display">Skærm</string> <string name="glasses_refresh">Opdateringshastighed</string> - <string name="glasses_3d">3D (side-by-side)</string> + <string name="glasses_3d">3D (side om side)</string> <string name="glasses_3d_hint">Skift smartbrillerne til side-om-side 3D. Hovedsporing styres separat.</string> <string name="glasses_3d_failed">3D-signalet blev ikke bekræftet. Prøv igen, når 2D-billedet er tilbage.</string> <string name="glasses_no_signal">Intet billede: brillen er i en tilstand, som telefonen ikke kan sende. Hold dens 2D/3D-knap inde, eller tag stikket ud og sæt det i igen.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Automatisk holder dette 2D-spil fast i synsfeltet. Vælg Virtuel skærm under Skærm for at bruge hovedsporing.</string> <string name="glasses_tracking_sbs_hint">Hovedsporing gælder for en virtuel skærm eller et kørende SteamVR-spil.</string> <string name="glasses_hardware">Enhed</string> + <string name="vr_controllers_tab">Controllere</string> + <string name="vr_controllers_group">SteamVR-controllere</string> + <string name="vr_controllers_emulate">Gamepad i VR</string> + <string name="vr_controllers_emulate_hint">De to VR-hænder, din controller fungerer som. Ændringer gælder med det samme, også mens SteamVR kører. Joy-Cons og sporede hænder overtager stadig deres side.</string> + <string name="vr_controllers_off">Almindelig gamepad</string> + <string name="vr_controllers_index">Valve Index-controllere</string> + <string name="vr_controllers_touch">Meta Quest 3-controllere</string> + <string name="vr_controllers_vive">HTC Vive-controllere</string> + <string name="vr_controllers_sticks">Pindene starter med</string> + <string name="vr_controllers_sticks_hint">Tryk begge pinde ind samtidig i VR for at skifte.</string> + <string name="vr_controllers_sticks_game">At flytte dig i spillet</string> + <string name="vr_controllers_sticks_hands">At flytte hænderne</string> + <string name="vr_controllers_buttons">Knapper</string> + <string name="vr_controllers_buttons_stick">Triggere er triggere, bumpere griber, A/B og X/Y er hver hånds frontknapper, pindeklik klikker på thumbsticks, Guide åbner SteamVR-menuen. D-pad op og ned flytter hænderne tættere på eller længere væk.</string> + <string name="vr_controllers_buttons_vive">Pindene er trackpads; A/X eller et pindeklik trykker på dem. Triggere er triggere, bumpere griber, Start og Select er menu, Guide åbner SteamVR-menuen.</string> + <string name="vr_controllers_buttons_off">Ingen VR-hænder. Spil, der understøtter en gamepad, og SteamVR-menuen får din controller som normalt.</string> <string name="glasses_brightness">Lysstyrke</string> <string name="glasses_volume">Lydstyrke</string> <string name="glasses_sunblock">Solafskærmning</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Kameraplacering</string> <string name="hand_camera_placement_hint">Tjek, at kameraet kan se dig, før du spiller.</string> <string name="hand_camera_check">Tjek</string> + <string name="tracking_pack_title">Download af håndsporing</string> + <string name="tracking_pack_hint">Håndsporing kræver en engangsdownload på %1$s.</string> + <string name="tracking_pack_download">Download</string> + <string name="tracking_pack_retry">Prøv igen</string> + <string name="tracking_pack_downloading">Downloader håndsporing… %1$d%%</string> + <string name="tracking_pack_failed">Håndsporing kunne ikke downloades. Tjek din forbindelse, og prøv igen.</string> <string name="hand_camera_check_title">Kameraplacering</string> <string name="hand_camera_how_rear">Stil enheden op 1,5 til 2 meter væk i cirka brysthøjde med bagkameraet vendt mod dig. Træd så ind i billedet med hænderne ude.</string> <string name="hand_camera_how_front">Stil enheden op 1,5 til 2 meter væk i cirka brysthøjde med skærmen vendt mod dig. Træd så ind i billedet med hænderne ude.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Ubrugte kørselsmiljøer, rester, gamle logfiler</string> <string name="storage_clean_up">Rydder op…</string> <string name="storage_session_running">Stop sessionen for at rydde op eller slette noget. Størrelserne vises stadig.</string> + <string name="storage_default_group">Installationsplacering</string> + <string name="storage_default_title">Standardlager</string> + <string name="storage_default_hint">Nye butiksinstallationer går til den valgte placering. Eksisterende spil bliver, hvor de er. Steam-biblioteker har deres egen indstilling.</string> + <string name="storage_default_ask">Spørg hver gang</string> + <string name="storage_default_ask_detail">Vælg en placering for hver installation</string> + <string name="storage_default_internal">Internt lager</string> + <string name="storage_default_external">Eksternt lager</string> + <string name="storage_default_external_detail">%1$s · %2$s ledigt</string> + <string name="storage_default_external_missing">Ikke tilsluttet</string> + <string name="storage_default_folder">Mappe · %1$s</string> + <string name="storage_default_folder_free">%1$s ledigt</string> + <string name="storage_default_folder_missing">Ikke tilsluttet</string> + <string name="storage_default_choose_folder">Vælg mappe…</string> + <string name="storage_default_choose_folder_detail">Brug en hvilken som helst mappe på et SD-kort eller USB-drev</string> + <string name="storage_default_note">Spil placeres i en Games-mappe på den valgte placering. Eksisterende spil flyttes ikke.</string> <string name="storage_where">Hvor det ender</string> <string name="storage_games">Steam-spil</string> <string name="storage_game_data">Spildata</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Installerede spil</string> <string name="storage_data_parts">Præfiks %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Ryd shaders</string> + <string name="storage_reset_prefix">Nulstil prefix</string> + <string name="storage_reset_prefix_title">Nulstil prefix for %1$s?</string> + <string name="storage_reset_prefix_confirm">Sletter dets Wine-prefix (%1$s) i %2$s og genopretter det ved næste start. Gemte spil, indstillinger og installerede redistributables i det går tabt; Steam Cloud-gemninger forbliver på din konto.</string> <string name="storage_data_leftovers">Slettede spil</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Præfikset indeholder stadig filer, måske lokale gemte spil</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkroniser med Syncthing</string> + <string name="sync_enable_hint">Baseret på Syncthing-Fork er dette en Syncthing-implementering, der lader dig synkronisere filer i DroidDecks interne filsystem med andre Syncthing-instanser. Det gælder kun filer, du gemmer i DroidDecks interne filsystem.</string> + <string name="sync_missing">Denne build indeholder ikke Syncthing.</string> + <string name="sync_starting">Starter Syncthing</string> + <string name="sync_status_starting">Starter</string> + <string name="sync_status_up_to_date">Opdateret</string> + <string name="sync_status_syncing">Synkroniserer</string> + <string name="sync_status_paused">Sat på pause</string> + <string name="sync_status_pausing">Sætter på pause</string> + <string name="sync_status_resuming">Genoptager</string> + <string name="sync_status_attention">Kræver opmærksomhed</string> + <string name="sync_status_failed">Syncthing er stoppet</string> + <string name="sync_failed_retry">Prøv igen</string> + <string name="sync_paused_wifi">På pause indtil Wi-Fi</string> + <string name="sync_paused_game">På pause under spillet</string> + <string name="sync_summary">%1$d mapper · %2$d af %3$d enheder forbundet</string> + <string name="sync_left">%1$s tilbage</string> + <string name="sync_open_web_ui">Åbn webgrænsefladen</string> + <string name="sync_pause">Sæt på pause</string> + <string name="sync_resume">Genoptag</string> + <string name="sync_running">Kører</string> + <string name="sync_running_hint">Slå fra for at stoppe Syncthing helt.</string> + <string name="sync_this_device">Denne enhed</string> + <string name="sync_device_id">Enheds-ID</string> + <string name="sync_show_qr">Vis QR</string> + <string name="sync_advanced">Avanceret</string> + <string name="sync_advanced_hint">Porte, hvornår der køres, nulstilling</string> + <string name="sync_open">Åbn</string> + <string name="sync_waiting">Venter på dig</string> + <string name="sync_pending_device">%1$s vil gerne forbinde</string> + <string name="sync_pending_folder">%1$s vil gerne dele »%2$s«</string> + <string name="sync_pending_folder_hint">Accepter for at vælge, hvor den gemmes i DroidDeck.</string> + <string name="sync_review">Gennemse i webgrænsefladen</string> + <string name="sync_folders">Mapper</string> + <string name="sync_no_folders">Ingen mapper endnu.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Opdateret</string> + <string name="sync_folder_syncing">Synkroniserer %1$d%%</string> + <string name="sync_folder_scanning">Scanner</string> + <string name="sync_folder_paused">Sat på pause</string> + <string name="sync_folder_out_of_sync">Ikke synkroniseret</string> + <string name="sync_folder_errors">%1$d filer kunne ikke synkroniseres</string> + <string name="sync_folder_blocked">Blokeret</string> + <string name="sync_folder_blocked_hint">Denne mappe ligger uden for DroidDecks lager, så DroidDeck har sat den på pause. Brug appen Syncthing-Fork til at synkronisere mapper uden for DroidDeck.</string> + <string name="sync_remove_folder">Fjern fra Syncthing</string> + <string name="sync_remove_folder_hint">Fjernelse sletter ingen filer.</string> + <string name="sync_devices">Enheder</string> + <string name="sync_no_devices">Ingen enheder endnu.</string> + <string name="sync_connected">Forbundet</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Sidst set %1$s</string> + <string name="sync_device_id_title">Denne enheds ID</string> + <string name="sync_device_id_hint">Tilføj en enhed i Syncthing på din anden enhed, og scan denne kode, eller indsæt ID\'et. Accepter den derefter her i webgrænsefladen.</string> + <string name="sync_copy">Kopiér</string> + <string name="sync_share">Del</string> + <string name="sync_done">Færdig</string> + <string name="sync_off_title">Slå Syncthing fra?</string> + <string name="sync_off_body">Syncthing stopper nu og forbliver stoppet, indtil det slås til igen. Synkroniserede filer bliver, hvor de er.</string> + <string name="sync_off_forget">Slet også Syncthings konfiguration</string> + <string name="sync_off_forget_hint">Fjerner denne enheds ID, mapper og enheder. Når det slås til igen, starter det forfra.</string> + <string name="sync_turn_off">Slå fra</string> + <string name="sync_ports">Porte</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal opdagelse</string> + <string name="sync_repick">Vælg nye porte</string> + <string name="sync_repick_hint">Kontrolleres igen ved hver start.</string> + <string name="sync_repick_button">Vælg igen</string> + <string name="sync_reset_group">Nulstil</string> + <string name="sync_api_key">API-nøgle</string> + <string name="sync_regenerate">Generér ny</string> + <string name="sync_reset">Nulstil Syncthing</string> + <string name="sync_reset_hint">Nyt enheds-ID, mapper og enheder fjernes. Filer i DroidDecks lager bevares.</string> + <string name="sync_reset_button">Nulstil</string> + <string name="sync_reset_confirm_title">Nulstil Syncthing?</string> + <string name="sync_running_group">Kørsel</string> + <string name="sync_run">Kør</string> + <string name="sync_run_open">Mens DroidDeck er åben</string> + <string name="sync_run_background">I baggrunden</string> + <string name="sync_wifi_only">Kun Wi-Fi</string> + <string name="sync_pause_games">Sæt på pause under spil</string> + <string name="sync_logs">Logfiler</string> + <string name="sync_logs_hint">Syncthing-output for denne session</string> + <string name="sync_logs_share">Del</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurer Linux-runtimen først.</string> + <string name="sync_accept">Accepter</string> + <string name="sync_accept_title">Gem »%1$s« i</string> + <string name="sync_add_folder">Tilføj mappe</string> + <string name="sync_add_folder_hint">Synkroniser en mappe i DroidDecks lager</string> + <string name="sync_choose">Vælg</string> + <string name="sync_add">Tilføj</string> + <string name="sync_add_failed">Mappen kunne ikke tilføjes.</string> + <string name="sync_share_with">Del med</string> + <string name="sync_share_none">Ingen enheder endnu. Du kan dele mappen fra webgrænsefladen senere.</string> + <string name="sync_use_folder">Brug denne mappe</string> + <string name="sync_new_folder">Ny mappe</string> + <string name="sync_location_home">Containerens hjemmemappe</string> + <string name="sync_location_sync">Sync-mappe</string> + <string name="sync_location_shared">DroidDecks delte lager</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDecks appdata</string> + <string name="sync_web_path_locked">Nye mapper gemmes i DroidDecks Sync-mappe. Brug Tilføj mappe på fanen Syncthing for at synkronisere en anden DroidDeck-mappe.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Genindlæs</string> + <string name="sync_not_running">Syncthing kører ikke.</string> + <string name="session_end_steam_sigill">Steam stoppede med en ulovlig instruktion (SIGILL). Det kan være et kompatibilitetsproblem med CPU-instruktioner eller et klientnedbrud. Del logs med oplysninger om din enhed.</string> + <string name="session_end_steam_try_x64">Du kan prøve Steam-indstillinger → Steam-klient → x86-64 (eksperimentel). Det kræver en ekstra download og kan køre langsommere.</string> + <string name="session_end_vulkan_device">Linux-grafikdriveren kunne ikke finde en brugbar Vulkan-enhed. Tjek, at den valgte Linux-GPU-driver understøtter denne GPU.</string> + <string name="session_end_gpu_unsupported">Denne session kan ikke starte, fordi denne GPU ikke har nogen kompatibel Linux Vulkan-driver i den nuværende opsætning. Adreno Turnip-drivere kan ikke aktivere understøttelse af MediaTek/Mali-GPU’er.</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_resources_browser">Åbnes i din browser</string> + <string name="game_resource_guides">Guider</string> + <string name="game_resource_protondb_detail">Linux/Proton-kompatibilitetsrapporter</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Til spil med gemte data på din Steam-konto</string> + <string name="game_resource_search">Websøgning</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="library_filter">Filter</string> + <string name="library_filter_installed">Kun installerede</string> + <string name="library_filter_all_owned">Alle ejede spil</string> + <string name="library_no_installed_matches">Ingen installerede spil matcher disse filtre.</string> + <string name="library_browse_owned">Gennemse ejede spil</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="stores_itch_updates_found">Opdateringer tilgængelige: %1$d</string> + <string name="stores_itch_update_replaced">Udvikleren har erstattet denne version med %1$s. Opdater til den?</string> + <string name="xbox_filter_cloud">Sky</string> + <string name="stores_xbox_cloud_settings">Skyindstillinger</string> + <string name="integration_title">Steam-integration</string> + <string name="integration_count">%1$d af %2$d til</string> + <string name="integration_set_up">Konfigurer</string> + <string name="integration_location">Placering</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-navne</string> + <string name="integration_brightness">Lysstyrke</string> + <string name="integration_home">DroidDeck som startskærm</string> + <string name="integration_shortcuts">Genveje til Hjem-knappen</string> + <string name="integration_wifi_hint">Vis netværk i Steam · kræver placeringsadgang, spores aldrig</string> + <string name="integration_wifi_on">Netværk vises i Steam</string> + <string name="integration_wifi_location_off">Placering er slået fra</string> + <string name="integration_wifi_denied">Placering afvist · tillad den i Appinfo</string> + <string name="integration_brightness_hint">Steams skyder indstiller skærmens lysstyrke</string> + <string name="integration_home_hint">Hjem åbner Steam-menuen i en session</string> + <string name="integration_shortcuts_hint">Hold Hjem nede for Steam Guide-kombinationer</string> + <string name="integration_shortcuts_needs_home">Kræver DroidDeck som startskærm</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonet i Android? Appinfo → ⋮ → Tillad begrænsede indstillinger</string> + <string name="integration_shortcuts_restricted">Blokeret af Android · Appinfo → ⋮ → Tillad begrænsede indstillinger</string> + <string name="integration_shortcuts_service">DroidDeck Hjem-knap</string> + <string name="integration_shortcuts_service_description">Sender tryk på Hjem-knappen til Steam Guide, mens en Steam-session er i fokus, og DroidDeck er standardstartskærmen. Læser ikke skærmindhold.</string> + <string name="integration_brightness_needed">Slå Lysstyrke til under Opsætning → Steam-integration</string> + <string name="apps_search_hint">Søg i apps</string> + <string name="apps_no_match">Ingen apps matcher “%1$s”.</string> + <string name="apps_add_widget">Tilføj widget</string> + <string name="apps_widgets_loading">Indlæser widgets…</string> + <string name="apps_widgets_none">Ingen apps på enheden tilbyder widgets.</string> + <string name="apps_widget_wider">Bredere</string> + <string name="apps_widget_narrower">Smallere</string> + <string name="apps_widget_taller">Højere</string> + <string name="apps_widget_shorter">Lavere</string> + <string name="apps_widget_move_earlier">Flyt tidligere</string> + <string name="apps_widget_move_later">Flyt senere</string> + <string name="apps_widget_configure">Widgetindstillinger</string> + <string name="apps_widget_remove">Fjern widget</string> + <string name="apps_add_to_folder">Føj til mappe</string> + <string name="apps_new_folder">Ny mappe</string> + <string name="apps_remove_from_folder">Fjern fra mappe</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Afinstaller</string> + <string name="apps_folder_rename">Omdøb</string> + <string name="apps_folder_ungroup">Opløs</string> + <string name="apps_folder_default">Mappe</string> + <string name="apps_folder_name">Mappenavn</string> + <string name="apps_filter">Vis</string> + <string name="apps_filter_all">Alle apps</string> + <string name="apps_filter_games">Spil</string> + <string name="apps_filter_downloaded">Downloadet</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Skjulte</string> + <string name="apps_hide">Skjul</string> + <string name="apps_unhide">Vis i apps</string> + <string name="apps_shortcut_remove">Fjern genvej</string> + <string name="apps_pin_title">Føj til Apps</string> + <string name="apps_pin_add">Tilføj</string> + <string name="apps_hidden_none">Ingen skjulte apps.</string> + <string name="apps_sort_name_asc">Navn A–Å</string> + <string name="apps_sort_name_desc">Navn Å–A</string> + <string name="apps_sort_installed">Senest installeret</string> + <string name="apps_sort_updated">Senest opdateret</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="desktop_restore_title">Gendanner din software</string> + <string name="desktop_restore_body">Geninstallerer de apps, du tilføjede, efter en DroidDeck-opdatering.</string> + <string name="desktop_restore_done_title">Software gendannet</string> + <string name="desktop_restore_done_body">De apps, du tilføjede, er installeret igen.</string> + <string name="desktop_restore_failed_title">Noget software kunne ikke gendannes</string> + <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log, og prøv derefter sudo apt install i Konsole.</string> + <string name="gog_full_files">Native optimeringer er ikke tilgængelige. Downloaden indeholder komplette erstatningsfiler.</string> + <string name="gog_recover">Bekræft patch-resultat</string> + <string name="slow_usb_title">Langsom USB-forbindelse</string> + <string name="slow_usb_cable">%1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s), så spil på den indlæses langsomt. Brug et USB 3-kabel til 5 Gbps eller mere, prøv at vende USB-C-stikket, eller brug et hurtigere drev.</string> + <string name="slow_usb_port">%1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s). Denne enheds USB-port kan ikke køre hurtigere, så spil på den indlæses langsomt. Intern lagerplads eller et microSD-kort kan være hurtigere.</string> + <string name="slow_usb_never">Vis ikke igen</string> + <string name="slow_usb_dismiss">Luk</string> + <string name="steam_import_title">Genstart Steam for at tilføje dine spil?</string> + <string name="steam_import_body">Steam kan vise disse spil, du ejer, som installerede: %1$s. Steam skal genstartes for at vise dem. Genstart nu, eller de bliver tilføjet næste gang Steam starter.</string> + <string name="steam_import_names_more">%1$s og %2$d mere</string> + <string name="steam_import_now">Genstart nu</string> + <string name="steam_import_later">Senere</string> + <string name="gog_maintenance">Administrer GOG-installation</string> + <string name="gog_check">Søg efter opdateringer</string> + <string name="gog_repair">Bekræft/reparer</string> + <string name="gog_patches">Offline-patches</string> + <string name="gog_refresh">Download fuldt offline-installationsprogram</string> + <string name="gog_update">Opdater til %1$s</string> + <string name="gog_resume">Genoptag GOG-vedligeholdelse</string> + <string name="gog_open_patch">Åbn patch-installationsprogram</string> + <string name="gog_patch_in_session">Afslut eller annuller patch-installationsprogrammet i Linux-sessionen.</string> + <string name="gog_patch_requirements">Vælg en patch til din installerede version og dit sprog. Understøttede kildeversioner er muligvis ikke vist.</string> + <string name="gog_no_patches">GOG har ingen separate Windows-patches til dette spil.</string> + <string name="gog_managed_files">Ændrede spilfiler kan blive erstattet.</string> + <string name="gog_patch_installer_note">Installationsprogrammet åbnes i din Linux-session.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Ekstra plads</string> + <string name="gog_space_estimate_label">Anslået plads</string> + <string name="gog_repair_action">Reparer filer</string> + <string name="gog_refresh_action">Opdater installationen</string> + <string name="gog_select_patch">Vælg</string> + <string name="setup_all_files">Adgang til alle filer</string> + <string name="setup_local_network">Lokalt netværk</string> + <string name="libraries_title">Flere Steam-biblioteker</string> + <string name="libraries_hint">Mapper, som Steam kan installere og starte spil fra, hver med sit eget navn. Fjernelse bevarer spillene på disken.</string> + <string name="libraries_add">Tilføj bibliotek</string> + <string name="libraries_rename_title">Bibliotekets navn</string> + <string name="libraries_pick">Vælg en mappe til biblioteket</string> + <string name="libraries_full">Højst %1$d ekstra biblioteker</string> + <string name="libraries_overlap">Denne mappe er allerede et bibliotek eller ligger i et</string> + <string name="libraries_missing">%1$s · ikke tilgængeligt</string> + <string name="libraries_applies_next">Gælder fra næste Steam-session</string> + <string name="bottom_desktop_start">Start skrivebordet</string> + <string name="bottom_desktop_mode_touch">Direkte berøring</string> + <string name="bottom_desktop_trackpad">Pegefelt. Tryk for direkte berøring</string> + <string name="bottom_desktop_direct_touch">Direkte berøring. Tryk for pegefelt</string> + <string name="bottom_desktop_starting">Starter KDE-skrivebordet…</string> + <string name="bottom_desktop_ended">Skrivebordet blev lukket.</string> + <string name="bottom_desktop_failed">Skrivebordet kunne ikke starte. Logfilerne findes i denne sessions bottom-desktop-mappe.</string> + <string name="bottom_desktop_off">Skrivebordet er lukket.</string> + <string name="libraries_rename">Omdøb</string> + <string name="second_mode_desktop">Skrivebord</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Skrivebord · %1$s</string> </resources> diff --git a/app/src/main/res/values-de/gestures.xml b/app/src/main/res/values-de/gestures.xml index 47532cd74..1c962d656 100644 --- a/app/src/main/res/values-de/gestures.xml +++ b/app/src/main/res/values-de/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesten</string> <string name="gesture_settings">Touchgesten-Einstellungen</string> - <string name="gesture_settings_hint">Maus- und Tastaturgesten anpassen. Wähle Gesten als Touchmodus, um sie zu verwenden.</string> <string name="gesture_tap">Tippen</string> <string name="gesture_drag">Mit einem Finger ziehen</string> <string name="gesture_long_press">Lange drücken</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Mit drei Fingern halten</string> <string name="gesture_pinch">Zum Zoomen Finger zusammen- oder auseinanderziehen</string> <string name="gesture_hold_button">Taste gedrückt halten</string> + <string name="gesture_hold_left">Linke Taste gedrückt halten</string> + <string name="gesture_hold_right">Rechte Taste gedrückt halten</string> <string name="gesture_click_once">Einmal klicken</string> <string name="gesture_hold_delay">Halteverzögerung</string> <string name="gesture_double_delay">Doppeltipp-Intervall</string> diff --git a/app/src/main/res/values-de/shortcuts.xml b/app/src/main/res/values-de/shortcuts.xml new file mode 100644 index 000000000..aa4dca553 --- /dev/null +++ b/app/src/main/res/values-de/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Physische Tastenkürzel</string> + <string name="shortcuts_dd_menu">DroidDeck-Menü</string> + <string name="shortcuts_capture">Zuweisen: %1$s</string> + <string name="shortcuts_press">Drücke eine Taste und lasse sie los. Die Zuweisung wird automatisch gespeichert.</string> + <string name="shortcuts_release">Lasse die Taste los, um fortzufahren.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Diese Taste ist bereits zugewiesen: %1$s</string> + <string name="shortcuts_save">Neu zuweisen</string> + <string name="shortcuts_retry">Andere Taste versuchen</string> + <string name="shortcuts_limitations">Die Home-Taste und einige Zusatztasten sind möglicherweise nicht verfügbar.</string> +</resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c09e49dd7..a85acfdc3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-Optionen für D3D12. nodxr deaktiviert Raytracing; nur bei Spielen verwenden, die das brauchen.</string> <string name="game_env_proton_log">Auf 1 setzen für ein Proton-Diagnoseprotokoll. Protokollieren kann die Leistung mindern und Speicherplatz belegen.</string> <string name="game_env_wined3d">Auf 1 setzen, um für D3D9–11-Kompatibilitätstests das OpenGL-basierte WineD3D statt DXVK zu verwenden.</string> + <string name="game_env_wined3d_renderer">Renderer für DirectDraw, Direct3D 1–7 und Spiele, die mit WineD3D laufen. Vulkan umgeht den Weg über OpenGL auf Zink und ist auf Adreno bei alten DirectDraw- und Direct3D-7-Spielen deutlich schneller.</string> + <string name="game_env_dxvk_d3d8">Auf 1 setzen, um Direct3D 8 über DXVK statt WineD3D auszuführen. Schneller im Direct3D-8-Test von AIO Graphics Test auf Adreno.</string> <string name="game_env_no_ntsync">Auf 1 setzen, um dieses Spiel von ntsync fernzuhalten (droiddeck-ntsync oder ein Kerneltreiber); es nutzt dann droiddeck-esync, wo ein Pack existiert, sonst droiddeck-fsync.</string> <string name="game_env_no_esync">Auf 1 setzen, um droiddeck-esync für dieses Spiel abzuschalten; es nutzt stattdessen droiddeck-fsync oder droiddeck-ntsync, wo auch fsync aus ist.</string> <string name="game_env_no_fsync">Auf 1 setzen, um dieses Spiel von droiddeck-fsync fernzuhalten; es nutzt dann droiddeck-esync, wo ein Pack existiert, sonst droiddeck-ntsync.</string> <string name="game_env_fsync_first">Auf 1 setzen, um dieses Spiel mit droiddeck-fsync auszuführen, oder auf 0, um droiddeck-esync vorzuziehen, wo ein Pack zu seinem Proton passt.</string> <string name="game_env_xalia">Auf 0 setzen, um Protons Gamepad-Navigationshilfe für dieses Spiel zu deaktivieren.</string> + <string name="game_env_anticheat_offline">Standardmäßig an. Startet ein Easy-Anti-Cheat-Spiel ohne seinen Anti-Cheat, wenn das Spiel Offline-Spielen unterstützt. Ausschalten, um wie gewohnt über Easy Anti-Cheat zu starten. Online-Modi, die Easy Anti-Cheat erfordern, bleiben nicht verfügbar.</string> <string name="game_env_hud">DXVK-Overlay für D3D9–11. fps zeigt die Bildrate an; ohne Wert wird es ausgeblendet.</string> <string name="game_env_dxvk_config">DXVK-Einstellungen, durch Semikolons getrennt. Neuere Builds nutzen dxvk.maxFrameRate zur Bildratenbegrenzung; fürs normale Spielen besser das Bildratenlimit der Sitzung verwenden.</string> + <string name="game_env_cores">CPU-Kerne für dieses Spiel, z. B. 0-4 oder 0,2,4, anstelle der Spielkerne der Sitzung. Weniger Kerne bleiben kühler.</string> <string name="game_env_vkd3d_limit">D3D12-Bildratenlimit. 0 hebt das Limit auf.</string> <string name="game_env_glthread">Mesa-OpenGL-Threading. true kann CPU-limitierten OpenGL-Spielen helfen; pro Spiel testen.</string> <string name="sync_backend_title">Wine-Sync</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX führt x86-Linux-Programme auf diesem ARM64-Gerät aus. Auto nutzt es, wenn das Programm für x86 gebaut ist.</string> <string name="app_fex_x86">%1$s über FEX</string> <string name="app_fex_not_ready">Dieses Programm ist für %1$s-PCs gebaut und läuft über FEX, das noch nicht eingerichtet ist. Öffne Steam einmal, während du angemeldet bist: DroidDeck lässt es FEX und die nötige Steam Linux Runtime herunterladen, danach lässt sich das Programm öffnen.</string> + <string name="session_proot_missing">DroidDecks proot konnte nicht heruntergeladen werden. Prüfe die Verbindung und versuch es erneut. Die Sitzung wurde nicht gestartet, da das Ersatz-proot zum Spielen zu langsam ist.</string> + <string name="session_directaudio_missing">DirectAudio konnte nicht heruntergeladen werden, daher nutzt der Spielton in dieser Sitzung den langsameren Weg.</string> <string name="session_end_program">Dieses Programm</string> <string name="session_end_steam_download">Der Steam-Client konnte nicht heruntergeladen werden. Dein Netzwerk oder VPN blockiert möglicherweise die Server von Steam; prüfe die Verbindung und versuche es erneut.</string> <string name="session_end_steam_setup">Der Steam-Client konnte nicht eingerichtet werden. Prüfe die Verbindung und den freien Speicher und versuche es erneut.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox-360-Controller</string> <string name="mode_controller_note">Deck: Schnellzugriffstaste und Gyro. Steam Controller: dasselbe, mit Griffsensor an den Rücktasten. DualShock 4 und DualSense: Gyro, die Trackpads dienen als deren Touchpad. Xbox 360: Schnellzugriff mit Guide+A öffnen.</string> <string name="mode_back">Zurück</string> + <string name="back_hold">Zurück halten für Steam-Kürzel</string> + <string name="back_hold_hint">Zurück halten öffnet den Schnellzugriff oder bildet mit anderen Tasten Steam-Kombinationen. Ausschalten, um gehaltenes Zurück zu ignorieren; Tippen und Doppeltippen funktionieren weiter.</string> + <string name="back_native_qam_hint">Halte Zurück 700 ms lang gedrückt oder halte Zurück und drücke eine weitere Taste für Steam-Tastenkürzel.</string> + <string name="back_double_tap_window">Zeitfenster für Doppeltippen</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Helligkeitssteuerung erlauben</string> + <string name="brightness_permission_text">Richte die Helligkeitssteuerung in DroidDeck ein.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Sitzung</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Aktuell · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Neueste Version installieren</string> + <string name="decky_channel">Update-Kanal</string> + <string name="decky_channel_hint">Welche Decky-Loader-Releases installiert werden. Deckys eigener Updater nutzt denselben Kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Vorabversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Decky-Update-Kanal konnte nicht gespeichert werden</string> <string name="mode_decky_on">Startet mit Steam. Solange aktiv, können andere Apps auf diesem Gerät Steam möglicherweise steuern.</string> <string name="mode_decky_off">Aus. Der Remote-Debugging-Port von Steam bleibt geschlossen.</string> <string name="mode_decky_remove_title">Decky Loader deinstallieren?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Leistungs-Overlay</string> <string name="mode_mangoapp_hint">Deaktivieren, wenn Spiele im Deck-Modus abstürzen oder schwarz werden. Gilt ab der nächsten Sitzung.</string> + <string name="mode_return_after_game">Nach einem Spiel zu DroidDeck zurückkehren</string> + <string name="mode_return_after_game_hint">Wenn ein Spiel, das du über DroidDeck oder einen anderen Launcher gestartet hast, beendet wird, schließt Steam sauber (Cloud-Speicherstände werden zuerst fertig) und du kehrst dorthin zurück. Aus: in Steam bleiben.</string> + <string name="mode_shader_precache">Shader-Vorab-Caching</string> + <string name="mode_shader_precache_hint">Steam lädt für deine Spiele vorkompilierte Shader herunter und verarbeitet sie im Hintergrund, damit Spiele weniger ruckeln. Aus spart Daten, Speicher und Akku; Spiele erstellen Shader dann während des Spielens. Dieselbe Einstellung wie Steams Downloads > Shader-Vorab-Caching. Gilt ab der nächsten Sitzung.</string> <string name="mode_steam_repair">Steam-Client reparieren</string> <string name="mode_steam_repair_hint">Lädt den Steam-Client beim nächsten Start von Steam erneut herunter. Nutze dies, wenn Steam im Ladebildschirm hängen bleibt. Spiele, Anmeldung und Einstellungen bleiben erhalten.</string> <string name="mode_steam_repair_queued">Der Steam-Client wird beim nächsten Start von Steam erneut heruntergeladen.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Umgeht PulseAudio für geringere Latenz.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Für Sprachchat.</string> + <string name="drawer_mic_hint">Mikrofonaufnahme für diese Sitzung ein- oder ausschalten.</string> + <string name="drawer_mic_failed">Das Mikrofon konnte nicht umgeschaltet werden. Bitte versuch es erneut.</string> <string name="mode_network">Netzwerk</string> <string name="mode_wifi_discovery">Wi-Fi-Erkennung</string> <string name="mode_wifi_discovery_hint">Wi-Fi-Namen und Netzwerke in der Nähe in Steam anzeigen.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: Echtzeit-GPU-Warteschlange</string> <string name="perf_gsrealtime_hint">Priorisiert die GPU-Arbeit des Compositors. Kann das Frame-Pacing glätten, kostet Spiele aber etwas Leistung.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Arbeitsspeicher</string> + <string name="perf_cap_off">Aus</string> + <string name="perf_cap_auto">Treiberstandard</string> + <string name="perf_zram_client">Steam komprimieren, während ein Spiel läuft</string> + <string name="perf_zram_client_hint">20 s nach dem Spielstart wird der Steam-Client in zRAM komprimiert, um dem Spiel mehr Speicher zu lassen, und beim Beenden des Spiels zurückgelesen. Schalte dies aus, wenn sich die Sitzung kurz nach dem Spielstart schließt. Ein RAM-Limit oben komprimiert Steam weiterhin, wenn die Sitzung es überschreitet.</string> + <string name="perf_ram_cap">RAM-Limit</string> + <string name="perf_ram_cap_hint">Gilt, solange der Steam-Client läuft, im Steam-Modus oder vom Desktop aus. Verbraucht die Sitzung mehr als diesen Wert, werden Steam und danach die übrigen unterstützten Prozesse der Sitzung in zRAM komprimiert. Ein weiches Limit: Nichts wird geschlossen, aber Spiele können ruckeln, während Seiten zurückgeladen werden.</string> + <string name="perf_ram_cap_unavailable">Benötigt zRAM-Swap, den dieses Gerät nicht hat.</string> + <string name="perf_vram_cap">VRAM-Limit</string> + <string name="perf_vram_cap_hint">Der Grafikspeicher, den DXVK an Direct3D-Spiele meldet, damit sie weniger für Texturen einplanen. Eigene DXVK-Einstellungen eines Spiels haben Vorrang. Gilt ab der nächsten Sitzung.</string> <string name="perf_gpuclock">GPU auf höchstem Takt halten</string> <string name="perf_gpuclock_hint">Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme.</string> <string name="perf_fixes">Sitzungskorrekturen</string> <string name="perf_sysmem">Turnip: Sysmem-Rendering</string> <string name="perf_sysmem_hint">Schneller für den Steam-Client; in Spielen wählt der Treiber pro Durchgang zwischen Kachel- und Systemspeicher-Rendering. Erforderlich bei Adreno 710/720/722.</string> <string name="perf_xalia">Steams xalia-Helfer überspringen</string> - <string name="perf_fastsync">droiddeck-ntsync (experimentell)</string> - <string name="perf_fastsync_hint">Ein Userspace-Ersatz für den Linux-Treiber ntsync, zum Testen. Solange er aktiv ist, nutzt Proton ihn statt droiddeck-esync und droiddeck-fsync. Funktioniert mit Proton Experimental ARM64, GE-Proton und proton-cachyos. Gilt ab der nächsten Sitzung.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Ein Userspace-Ersatz für den Linux-Treiber ntsync. Solange er aktiv ist, nutzt Proton ihn statt droiddeck-esync und droiddeck-fsync. Funktioniert mit Proton Experimental ARM64, GE-Proton und proton-cachyos. Gilt ab der nächsten Sitzung.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync bevorzugen</string> <string name="perf_fsync_hint">Führt Protons eigenes fsync mit den unveränderten Proton-Dateien aus, wobei futex_waitv im Userspace bereitgestellt wird. Es braucht daher kein Pack und funktioniert weiter, sobald Steam Proton aktualisiert. Solange es aktiv ist, nutzen Spiele es vor droiddeck-esync, außer den wenigen, die Proton von fsync fernhält. Gilt ab der nächsten Sitzung.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot-Schnellpfad</string> <string name="perf_fastpath_needs_seccomp">Benötigt den seccomp-Filter von proot.</string> <string name="perf_fastpath_hint">Schnellere Dateisuche und weniger Ruckler. Deaktivieren, wenn ein Programm seine Dateien nicht findet.</string> + <string name="perf_cursor_composite">Zeiger in gamescope zeichnen</string> + <string name="perf_cursor_composite_hint">Gamescope zeichnet den Zeiger selbst, statt ihn an Android zu übergeben. Für einen per Controller gesteuerten Zeiger einschalten. Aus ist auf einem Smartphone schneller. Gilt ab der nächsten Sitzung.</string> <string name="perf_identity">Sitzungsidentität</string> <string name="perf_hostname">Hostname</string> <string name="perf_hostname_hint">Der Name, den Steam für dieses Gerät sieht. Leer lassen stellt %1$s wieder her.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Seine Dateien werden aus der App entfernt.</string> <string name="driver_delete_in_use">Seine Dateien werden entfernt. Er ist in Verwendung, daher übernimmt der Standard.</string> <string name="drawer_page_display">Anzeige</string> + <string name="drawer_frame_limit">Bildratenlimit</string> + <string name="drawer_frame_limit_note">Begrenzt dieses Spiel. Der Bildschirm wechselt zu einer Bildwiederholrate, die durch das Limit glatt teilbar ist, sofern vorhanden; andere Limits können ungleichmäßig wirken. Steam-Spiele nutzen das Bildratenlimit von Steam im Schnellzugriffsmenü.</string> <string name="drawer_page_effects">Effekte</string> <string name="drawer_page_controls">Steuerung</string> <string name="drawer_page_components">Komponenten</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Bernstein</string> <string name="drawer_hud_color_violet">Violett</string> <string name="drawer_hud_opacity">Deckkraft</string> + <string name="hud_size">Größe</string> + <string name="hud_size_hint">Tippen auf das HUD ändert auch seine Größe.</string> + <string name="hud_size_full">Voll</string> + <string name="hud_size_tiles">Kacheln</string> + <string name="hud_size_pill">Kapsel</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Leiste</string> + <string name="hud_locked">Position sperren</string> + <string name="hud_locked_hint">Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter.</string> + <string name="hud_snap">An Seiten einrasten</string> + <string name="hud_snap_hint">Lass das HUD los, und es springt an die nähere Bildschirmseite. Ein Wischen wirft es in diese Richtung.</string> + <string name="hud_group_look">Aussehen</string> + <string name="hud_scale">Größe auf dem Bildschirm</string> + <string name="hud_color_soft">Dezent</string> + <string name="hud_color_mid">Mittel</string> + <string name="hud_color_vivid">Kräftig</string> + <string name="hud_outline">Kontur</string> + <string name="hud_outline_color">Konturfarbe</string> + <string name="hud_outline_gray">Grau</string> + <string name="hud_outline_theme">Designfarbe</string> + <string name="hud_group_metrics">Messwerte</string> + <string name="hud_metric_graph">Frametime-Diagramm</string> + <string name="hud_metric_decimal">Bildrate mit Nachkommastelle</string> + <string name="hud_metric_low001" formatted="false">0.01%-Tiefstwert</string> + <string name="hud_metric_engine">Grafik-Engine</string> + <string name="hud_metric_gpu_model">GPU-Name</string> + <string name="hud_metric_gpu">GPU-Auslastung</string> + <string name="hud_metric_gpu_temp">GPU-Temperatur</string> + <string name="hud_metric_cpu">CPU-Auslastung</string> + <string name="hud_metric_per_core">CPU pro Kern</string> + <string name="hud_metric_temp">Temperaturen</string> + <string name="hud_metric_ram">Arbeitsspeicher</string> + <string name="hud_metric_vram">Grafikspeicher</string> + <string name="hud_metric_swap">Swap-Speicher</string> + <string name="hud_metric_battery">Akkustand</string> + <string name="hud_metric_power">Leistungsaufnahme</string> + <string name="hud_metric_network">Netzwerk</string> + <string name="hud_metric_resolution">Auflösung</string> + <string name="hud_metric_proton">Proton-Version</string> + <string name="hud_metric_session">Sitzungsdauer</string> + <string name="hud_metric_clock">Uhrzeit</string> + <string name="hud_group_temps">Temperaturen</string> + <string name="hud_temp_unit">Einheit</string> + <string name="hud_temp_bands">Warnfarben</string> + <string name="hud_temp_bands_hint">Temperaturen werden erst bernsteinfarben, dann rot, wenn sie sich dem Grenzwert nähern.</string> + <string name="hud_temp_bands_off">Aus</string> + <string name="hud_temp_bands_auto">Automatisch</string> + <string name="hud_temp_bands_manual">Manuell</string> + <string name="hud_temp_red_cpu">CPU rot ab</string> + <string name="hud_temp_red_gpu">GPU rot ab</string> + <string name="hud_temp_red_battery">Akku rot ab</string> + <string name="hud_group_more">Mehr</string> + <string name="hud_export">HUD-Diagnose</string> + <string name="hud_export_hint">Speichert einen Bericht zu allen Sensoren, die das HUD ausliest, unter Downloads/DroidDeck.</string> + <string name="hud_export_button">Speichern</string> + <string name="hud_export_done">Gespeichert unter %1$s</string> + <string name="hud_export_failed">Der HUD-Bericht konnte nicht gespeichert werden.</string> + <string name="hud_reset">HUD-Einstellungen zurücksetzen</string> + <string name="hud_reset_button">Zurücksetzen</string> <string name="drawer_scaling">Skalierungsmodus</string> <string name="drawer_scaling_sharpness">Skalierungsschärfe</string> <string name="drawer_effects">Bildschirmeffekte</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Latenz</string> + <string name="drawer_low_latency">Modus mit geringer Latenz</string> + <string name="drawer_low_latency_hint">Erhöht CPU- und Akkuverbrauch</string> <string name="drawer_low_latency_controller">Controller mit geringer Latenz</string> <string name="drawer_low_latency_controller_hint">Der Controller meldet mit 1000 Hz statt 250 Hz. Die CPU-Last ist etwas höher.</string> <string name="drawer_low_latency_touch">Touch mit geringer Latenz</string> <string name="drawer_low_latency_touch_hint">Touch überspringt das Zusammenfassen von Frames, Steam-Touch meldet mit 1000 Hz. Die CPU-Last ist etwas höher.</string> + <string name="drawer_evdev_mouse">Roher Mauskanal</string> + <string name="drawer_direct_cursor">Zeiger</string> <string name="drawer_pc_keyboard">PC-Tastatur</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Zweiter Bildschirm</string> @@ -715,6 +834,10 @@ <string name="setup_session">Sitzung</string> <string name="setup_logs">Sitzungslogs</string> <string name="setup_logs_hint">Nach jeder Sitzung gespeichert</string> + <string name="setup_game_debug_logs">Spiel-Debug-Logs</string> + <string name="setup_game_debug_logs_hint">Beim nächsten Spielstart Diagnosen von Proton, Wine und Grafik einschließen. Kann die Leistung mindern und mehr Speicher belegen.</string> + <string name="setup_game_debug_logs_restart">Starte diese Sitzung neu, um Spiel-Debug-Logs zu speichern</string> + <string name="setup_logging_update_failed">Protokollierung konnte nicht aktualisiert werden. Prüfe den Schalter und versuch es erneut.</string> <string name="setup_agent_commands">Debugging-Tools</string> <string name="setup_latest_logs">Neueste Sitzungslogs</string> <string name="setup_saved_logs">Gespeicherte Sitzungslogs</string> @@ -739,12 +862,28 @@ <string name="setup_home_on">DroidDeck kann die Startbildschirm-App sein</string> <string name="setup_home_off">DroidDeck wird nie als Startbildschirm-App angeboten</string> <string name="setup_orientation">Ausrichtung</string> + <string name="setup_launcher_orientation">Launcher-Ausrichtung</string> + <string name="setup_launcher_orientation_auto">Gerätedrehung folgen</string> + <string name="setup_orientation_portrait">Hochformat</string> + <string name="setup_session_orientation">Sitzungsausrichtung</string> + <string name="setup_session_orientation_hint">Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; eigene Breite und Höhe bleiben wie eingegeben.</string> <string name="setup_orientation_auto">Automatisch Querformat</string> <string name="setup_orientation_landscape">Querformat</string> <string name="setup_orientation_reverse">Umgekehrtes Querformat</string> <string name="setup_fullscreen">Vollbild</string> <string name="setup_fullscreen_on">Blendet die Status- und Navigationsleiste von Android aus</string> <string name="setup_fullscreen_off">Zeigt die Status- und Navigationsleiste von Android an</string> + <string name="setup_dual_screen">Zwei Bildschirme</string> + <string name="setup_dual_screen_hint">Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm.</string> + <string name="setup_dual_screen_auto">Automatisch</string> + <string name="setup_dual_screen_on">Ein</string> + <string name="setup_dual_screen_off">Aus</string> + <string name="setup_dual_screen_menu">Menü auf dem unteren Bildschirm</string> + <string name="setup_dual_screen_menu_hint">Verschiebt die Bereiche und das Menü im Spiel auf den zweiten Bildschirm und tippt dort, damit der obere Bildschirm die volle Ansicht behält. L2 und R2 wechseln den Bereich.</string> + <string name="setup_dual_screen_controls">Steuerung auf dem unteren Bildschirm in Spielen</string> + <string name="setup_dual_screen_controls_hint">Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm.</string> + <string name="dual_typing_title">Eingabe für den oberen Bildschirm</string> + <string name="dual_typing_done">Fertig</string> <string name="setup_default_home">Standard-Startbildschirm-App</string> <string name="setup_choose_home">Startbildschirm-App auswählen</string> <string name="setup_choose">Auswählen</string> @@ -892,6 +1031,14 @@ <string name="gate_step1">Öffne Einstellungen → Entwickleroptionen → Debugging über WLAN und aktiviere es</string> <string name="gate_step2">Tippe auf „Gerät über einen Kopplungscode koppeln“</string> <string name="gate_step3">Gib den Code in die DroidDeck-Benachrichtigung ein</string> + <string name="pairguide_build_number">Tippe unter „Über das Telefon“ 7-mal auf „Build-Nummer“</string> + <string name="pairguide_wireless">Aktiviere „Debugging über WLAN“</string> + <string name="pairguide_pair">Öffne „Debugging über WLAN“ und tippe dann auf „Gerät mit Kopplungscode koppeln“</string> + <string name="pairguide_child_process">Aktiviere „Beschränkungen für Unterprozesse deaktivieren“</string> + <string name="pairguide_row_child_process">Beschränkungen für Unterprozesse deaktivieren</string> + <string name="pairguide_row_build_number">Build-Nummer</string> + <string name="pairguide_row_wireless">Debugging über WLAN</string> + <string name="pairguide_row_pair">Gerät mit Kopplungscode koppeln</string> <string name="gate_waiting">Warte auf das Kopplungs-Pop-up…</string> <string name="gate_code_needed">Pop-up gefunden. Gib seinen Code in der Benachrichtigung ein.</string> <string name="gate_status">Status</string> @@ -1015,8 +1162,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 +1169,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> @@ -1033,10 +1177,8 @@ <string name="games_never_played">Nie gespielt</string> <string name="games_runtime_busy_percent">Laufzeit beschäftigt · %1$d %%</string> <string name="games_runtime_busy">Laufzeit beschäftigt</string> - <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> @@ -1051,6 +1193,9 @@ <string name="gpu_hide_other">Treiber für andere GPUs ausblenden</string> <string name="gpu_show_other">Treiber für andere GPUs anzeigen</string> <string name="gpu_advanced">Erweitert</string> + <string name="gpu_ubwc_title">UBWC-Kompatibilität</string> + <string name="gpu_ubwc_hint">Probiere An oder Aus, wenn Steam oder Android Streifen oder Flackern zeigt. Gilt für beide Treiber nach einem Neustart von DroidDeck.</string> + <string name="gpu_ubwc_restart">Starte DroidDeck neu, um dies anzuwenden.</string> <string name="gpu_set_with_display">Zusammen mit dem Anzeigetreiber festgelegt: %1$s enthält beide.</string> <string name="gpu_set_with_runtime">Zusammen mit dem Laufzeittreiber festgelegt: %1$s enthält beide.</string> <string name="gpu_runtime_hint">Wird von Spielen und dem Desktop genutzt.</string> @@ -1105,7 +1250,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> @@ -1159,10 +1304,15 @@ <string name="pip_auto">Automatisch zu Bild im Bild wechseln</string> <string name="unfolded_controls">Steuerung auf dem aufgeklappten Bildschirm</string> <string name="unfolded_controls_hint">Aufgeklappt liegt das Spiel über den Steam Deck-Trackpads und den hinteren Griffen. Zugeklappt läuft es im Vollbild.</string> + <string name="unfolded_controls_with_controller">Mit Controller beibehalten</string> + <string name="unfolded_controls_with_controller_hint">Diese Touch-Steuerung auch anzeigen, während ein Controller verbunden ist.</string> <string name="pip_suspended">Angehalten</string> <string name="pip_not_ready">Bild im Bild ist verfügbar, sobald die Sitzung bereit ist.</string> <string name="pip_permission">Erlaube Bild im Bild für DroidDeck in den Android-Einstellungen.</string> <string name="pip_unavailable">Android konnte Bild im Bild nicht öffnen.</string> + <string name="game_more">Mehr</string> + <string name="game_edit_art">Grafiken bearbeiten</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Verknüpfung</string> <string name="game_shortcut_add">Zum Startbildschirm hinzufügen</string> <string name="game_shortcut_choose">Spiel auswählen</string> @@ -1186,6 +1336,10 @@ <string name="main_wait_runtime">Warte, bis der Vorgang an der Laufzeit abgeschlossen ist</string> <string name="main_wait_proton_install">Warte, bis die Installation des Kompatibilitätstools abgeschlossen ist</string> + <string name="load_compat_title">Kompatibilitätstools werden vorbereitet</string> + <string name="load_compat_wait">Warte auf Abschluss der Kompatibilitätseinrichtung</string> + <string name="load_compat_hint">Deine Sitzung startet, sobald die Einrichtung abgeschlossen ist.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Warte, bis die Installation der Desktop-App abgeschlossen ist</string> <string name="main_wait_install_game">Warte, bis die Installation abgeschlossen ist, bevor du ein Spiel startest</string> <string name="main_saves_close_session">Schließe zuerst die Steam-Sitzung, damit das Spiel den Import nicht überschreiben kann</string> @@ -1222,6 +1376,9 @@ <string name="main_install_anyway">Trotzdem installieren</string> <string name="main_remove_runtime_title">Linux-Laufzeit entfernen</string> <string name="main_remove_runtime_text">Dadurch werden die Laufzeit, der Steam-Client darin und alle dort installierten Spiele gelöscht.</string> + <string name="runtime_actions_title">Linux-Laufzeit</string> + <string name="runtime_actions_text">Reparieren installiert die Systemdateien der Laufzeit neu und behält Steam, deine Spiele und Einstellungen. Extras wie der Desktop werden bei der nächsten Nutzung erneut installiert. Entfernen löscht alles.</string> + <string name="runtime_repair">Laufzeit reparieren</string> <string name="main_applied">Angewendet: %1$s</string> <string name="android_app_open_failed_primary">%1$s konnte nicht auf dem Hauptbildschirm geöffnet werden</string> <string name="android_app_open_failed_on">%1$s konnte nicht auf %2$s geöffnet werden</string> @@ -1351,6 +1508,11 @@ <string name="session_runtime_catalog_unreachable">Der Katalog der Laufzeiten war nicht erreichbar. Prüfe die Verbindung und tippe erneut auf Spielen.</string> <string name="session_runtime_install_failed">Die Linux-Laufzeit wurde nicht installiert. Prüfe sie unter Einrichtung und tippe erneut auf Spielen.</string> <string name="session_desktop_install_failed">Der Desktop wurde nicht installiert (%1$s). Prüfe die Verbindung und tippe erneut auf Desktop.</string> + <string name="session_package_resume_failed">Eine unterbrochene Installation konnte nicht abgeschlossen werden (%1$s). Prüfe Verbindung und Speicherplatz und versuch es dann erneut.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Die Linux-Laufzeit ist beschädigt: %1$d Bibliotheksverknüpfung zeigt auf eine fehlende Datei (%2$s), meist nach einer unterbrochenen Installation. Reparieren behält deine Spiele und Einstellungen.</item> + <item quantity="other">Die Linux-Laufzeit ist beschädigt: %1$d Bibliotheksverknüpfungen zeigen auf fehlende Dateien (%2$s und weitere), meist nach einer unterbrochenen Installation. Reparieren behält deine Spiele und Einstellungen.</item> + </plurals> <string name="session_ended_named">%1$s wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> <string name="session_ended_program">Das Programm wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> <string name="session_ended_desktop">Der Desktop wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> @@ -1365,6 +1527,13 @@ <string name="mode_decky_plugins_hint">Installiere eine Plugin-ZIP für die nächste Steam-Sitzung.</string> <string name="mode_decky_plugin_downloading">Wird heruntergeladen…</string> <string name="mode_decky_plugin_install_zip">Aus ZIP installieren</string> + <string name="decky_zip_warning_title">Installation eines Drittanbieter-Plugins</string> + <string name="decky_zip_warning_text">Das Decky-Loader-Team hat dieses Plugin nicht geprüft. Es kann Schadsoftware enthalten, etwa Software, die dein Steam-Konto stiehlt oder deinem Gerät schadet. Mit der Installation dieses Plugins erklärst du, dass du alle Risiken für dein Gerät trägst.</string> + <string name="decky_zip_warning_continue">Weiter</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Bitte %1$d Sekunde warten</item> + <item quantity="other">Bitte %1$d Sekunden warten</item> + </plurals> <string name="store_cat_games">Spiele</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1393,6 +1562,10 @@ <string name="theme_icon_blue_detail">Schwarzer Grund, weiße Schrift, das Blau für alles Ausgewählte, Fokussierte oder Gedrückte.</string> <string name="theme_electric">Elektrisches Marineblau</string> <string name="theme_electric_detail">Das Blau heller, auf Flächen, die eher zu Marineblau als zu Grau tendieren.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Farben, die durch den Regenbogen wechseln. Folgt den Animationseinstellungen von Android.</string> + <string name="theme_rgb_speed">Geschwindigkeit</string> + <string name="theme_rgb_speed_hint">Wie schnell die Farben wechseln.</string> <string name="theme_gradient">Farbverlauf</string> <string name="theme_gradient_detail">Eigene Primär- und Sekundärfarbe, als Verlauf auf Schaltflächen und Hervorhebungen.</string> <string name="theme_gradient_primary">Primär</string> @@ -1514,7 +1687,16 @@ <string name="fm_conflict_skip">Überspringen</string> <string name="fm_select_this_folder">Diesen Ordner auswählen</string> <string name="fm_back">Zurück</string> + <string name="fm_exit">Beenden</string> + <string name="fm_return_to_start">Zurück zum Startordner</string> + <string name="fm_start_unavailable">Startordner ist nicht mehr verfügbar</string> + <string name="fm_cancel_operation_title">Vorgang abbrechen?</string> + <string name="fm_cancel_operation_confirmation">Der Vorgang wird abgebrochen. Bist du sicher?</string> + <string name="fm_accept">Akzeptieren</string> + <string name="fm_decline">Ablehnen</string> <string name="fm_drive_not_readable">%1$s ist eingebunden, aber derzeit nicht lesbar</string> + <string name="fm_drive_access_title">Zugriff auf %1$s erlauben</string> + <string name="fm_drive_access_text">Android lässt DroidDeck dieses Laufwerk sehen, aber nicht lesen. Aktiviere für DroidDeck den Zugriff auf alle Dateien und komm dann zurück.</string> <string name="fm_list_view">Listenansicht</string> <string name="fm_grid_view">Rasteransicht</string> <string name="fm_search">Suchen</string> @@ -1586,6 +1768,93 @@ <string name="second_mode_keyboard_trackpad">Tastatur + Trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-Griffe + Trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Hier gibt es noch nichts anzuzeigen.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Keine laufenden Downloads.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shader-Cache wird heruntergeladen</string> + <string name="bottom_downloads_paused">Pausiert</string> + <string name="bottom_downloads_queued">Wartet auf Start</string> + <string name="bottom_page_notifications">Benachrichtigungen</string> + <string name="bottom_notifications_listener">DroidDeck – unterer Bildschirm</string> + <string name="bottom_notifications_why">Zeigt Nachrichten und andere Benachrichtigungen hier an, während du spielst. Sie bleiben nur auf diesem Bildschirm und werden nicht gespeichert. Android fragt einmal: Die Seite für den Benachrichtigungszugriff öffnet sich auf diesem Bildschirm; aktiviere dort DroidDeck, dann kehrt diese Seite von selbst zurück.</string> + <string name="bottom_notifications_allow">Benachrichtigungszugriff erlauben</string> + <string name="bottom_notifications_none">Keine Benachrichtigungen.</string> + <string name="bottom_notifications_count">%1$d Benachrichtigungen</string> + <string name="bottom_notifications_clear">Löschen</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">FPS benötigt das aktive HUD</string> + <string name="stats_speed">Geschwindigkeit</string> + <string name="stats_pedals">Pedale</string> + <string name="stats_gforce">G-Kraft</string> + <string name="stats_timing">Zeiten</string> + <string name="stats_best_lap">Beste Runde</string> + <string name="stats_tires">Reifen °C</string> + <string name="stats_trace">Gas und Bremse, letzte 10 s</string> + <string name="stats_speed_chart">Geschwindigkeit, %1$s</string> + <string name="stats_gear">Gang</string> + <string name="stats_speed_units">Geschwindigkeitseinheit</string> + <string name="stats_speed_units_auto">Automatisch (%1$s)</string> + <string name="stats_steam_client_arm">Steam-Client ARM</string> + <string name="stats_steam_client_x86">Steam-Client x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Bremse</string> + <string name="stats_lights">Kontrollleuchten</string> + <string name="stats_lamp_shift">Schalten</string> + <string name="stats_lamp_handbrake">Handbremse</string> + <string name="stats_lamp_pit">Pit-Limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Öl %1$s °C</string> + <string name="stats_power">Energieverteiler</string> + <string name="stats_fuel_t">Treibstoff, t</string> + <string name="stats_fuel_main">Haupttank %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_tap_hint">Tippe auf die obere Leiste oder die Instrumentenanzeige, um ihren Stil zu ändern.</string> + <string name="bottom_telemetry_send_title">Dashboard-Daten senden</string> + <string name="bottom_telemetry_send_auto">Automatisch</string> + <string name="bottom_telemetry_send_auto_hint">Schaltet es für jedes hier aufgeführte Spiel ein, auch für später gefundene Spiele. Spiele, die du ausschaltest, bleiben aus.</string> + <string name="bottom_telemetry_send_note">Dies ändert die eigene Datenausgabe-Einstellung des Spiels. Es wirkt beim nächsten Start des Spiels; beim Ausschalten wird die alte Einstellung wiederhergestellt.</string> + <string name="bottom_telemetry_send_close">Schließe %1$s, um dies zu ändern.</string> + <string name="bottom_telemetry_send_failed">Die Einstellungen von %1$s konnten nicht geändert werden.</string> + <string name="bottom_telemetry_send_menu">%1$s: Aktiviere %2$s in den Spieleinstellungen mit IP 127.0.0.1 und Port %3$d.</string> + <string name="bottom_shots_where">Gespeichert in Pictures/DroidDeck. Steam-Screenshots werden hier ebenfalls angezeigt.</string> + <string name="bottom_shots_take">Screenshot aufnehmen</string> + <string name="bottom_shots_saved">Screenshot gespeichert.</string> + <string name="bottom_shots_failed">Screenshot konnte nicht aufgenommen werden.</string> + <string name="bottom_shots_none">Noch keine Screenshots.</string> + <string name="bottom_page_chat">Chat & Sprache</string> + <string name="bottom_chat_why">Lies und beantworte hier den Steam-Chat, während das Spiel auf dem Hauptbildschirm weiterläuft. Es wird das Konto verwendet, mit dem Steam angemeldet ist.</string> + <string name="bottom_chat_not_signed_in">Steam hat noch keine Web-Anmeldung zum Teilen, melde dich also einmal hier an.</string> + <string name="bottom_chat_stopped">Android hat die Chat-Seite geschlossen, während DroidDeck im Hintergrund war. Sie öffnet sich wieder, wenn du zu DroidDeck zurückkehrst.</string> + <string name="bottom_chat_open">Steam Chat öffnen</string> + <string name="bottom_chat_close">Chat schließen</string> + <string name="bottom_chat_mic_on">Mikro an</string> + <string name="bottom_chat_mic_off">Mikro aus</string> + <string name="bottom_chat_mic_unavailable">Das Mikro ist für dieses Spiel aus. Um zu sprechen, aktiviere „Mikrofon“ in den Steam-Einstellungen von DroidDeck (Audio) und starte das Spiel neu.</string> + <string name="bottom_chat_volume">Lautstärke %1$d%%</string> + <string name="bottom_page_telemetry">Spielstatistiken</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akku</string> + <string name="bottom_telemetry_lap">Runde</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">Aktuelle Runde</string> + <string name="bottom_telemetry_last_lap">Letzte Runde</string> + <string name="bottom_telemetry_fuel">Treibstoff</string> + <string name="bottom_telemetry_cargo">Fracht</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Rechtsstatus</string> + <string name="bottom_telemetry_balance">Guthaben</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Aktiviere die Datenausgabe eines Rennspiels (oft Telemetrie oder UDP genannt), um hier ein Live-Cockpit zu sehen. Die Daten bleiben auf diesem Gerät.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d empfängt Daten (%2$d Pakete mit %3$d Bytes), aber in einem Format, das diese Seite noch nicht lesen kann.</string> + <string name="bottom_telemetry_port_busy">Ein anderes Programm verwendet bereits Port %1$s, daher kann dieses Spiel hier nicht angezeigt werden.</string> <string name="rtinst_removing">Linux-Laufzeit wird entfernt</string> <plurals name="rtinst_removing_entries"> @@ -1616,6 +1885,7 @@ <string name="flatpakmgr_not_ready">Richte zuerst Flatpak ein</string> <string name="flatpakmgr_starting">Wird gestartet</string> <string name="flatpakmgr_exit_status">Flatpak wurde mit Status %1$d beendet</string> + <string name="flatpakmgr_wrong_arch">%1$s wurde für %2$s gebaut, das DroidDeck nicht ausführen kann. Flatpak-Apps brauchen hier eine ARM64- oder x86_64-Version.</string> <string name="flatpakmgr_installing">%1$s wird installiert</string> <string name="flatpakmgr_updating">%1$s wird aktualisiert</string> <string name="flatpakmgr_removing">%1$s wird entfernt</string> @@ -1709,6 +1979,7 @@ <string name="adbpair_applying">Einstellung wird angewendet…</string> <string name="adbpair_command_failed">Befehl für Debugging über WLAN fehlgeschlagen</string> <string name="adbpair_channel_name">Einrichtung von Debugging über WLAN</string> + <string name="adbpair_progress_channel_name">Fortschritt der Einrichtung von Debugging über WLAN</string> <string name="adbpair_channel_description">Fragt nach dem Kopplungscode für Debugging über WLAN, während die Einstellungen geöffnet sind</string> <string name="adbpair_title_pair">Debugging über WLAN koppeln</string> <string name="adbpair_waiting_text">Aktiviere Debugging über WLAN und tippe dann auf „Gerät mit Kopplungscode koppeln“.</string> @@ -1817,6 +2088,7 @@ <string name="gpuinfo_not_adreno">Keine Adreno-GPU</string> <string name="gpuinfo_supported">Unterstützt</string> <string name="gpuinfo_experimental">Experimentell: Die Treiber sind Test-Builds</string> + <string name="gpuinfo_a850_experimental">Experimentelle Adreno-850-Unterstützung: erfordert kompatible experimentelle Anzeige- und Spieltreiber; auf diesem Gerät nicht geprüft</string> <string name="gpuinfo_below_tested">Unter der getesteten Hardware (Adreno 725 und neuer): läuft eventuell nicht</string> <string name="gpuinfo_unsupported">Nicht unterstützt: DroidDeck braucht eine Adreno-GPU (Snapdragon)</string> @@ -1910,10 +2182,10 @@ <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> + <string name="display_follow_screen_scaled">Skaliert %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Gerätedetails anzeigen</string> <string name="device_info_hide">Gerätedetails ausblenden</string> @@ -1928,7 +2200,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> @@ -1942,11 +2213,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> @@ -1964,9 +2233,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> @@ -1985,12 +2262,43 @@ <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> <string name="stores_sort">Sortieren</string> + <string name="setup_rail_labels">Seitenleisten-Beschriftungen</string> + <string name="setup_rail_labels_hint">Namen unter den Symbolen der Seitenleiste anzeigen. Ausschalten für eine schmalere Seitenleiste.</string> + <string name="library_display">Anzeige</string> + <string name="library_display_larger">Größere Karten</string> + <string name="library_display_smaller">Kleinere Karten</string> + <string name="library_display_title">Titel anzeigen</string> + <string name="library_display_size">Größe anzeigen</string> <string name="stores_sort_last_played">Zuletzt gespielt</string> <string name="stores_sort_recently_installed">Zuletzt installiert</string> <string name="stores_sort_title_asc">Titel A–Z</string> @@ -2117,6 +2425,9 @@ <string name="stores_download_manager">Download-Manager</string> <string name="stores_parallel">Gleichzeitige Downloads</string> <string name="stores_install_where">Installieren in</string> + <string name="stores_install_language">Spielsprache</string> + <string name="stores_install_language_hint">GOG und Epic installieren diese Sprache. System folgt der App-Sprache.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">%1$s installieren:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s frei</string> @@ -2136,6 +2447,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> @@ -2151,6 +2463,9 @@ <string name="edit_target">Ziel</string> <string name="edit_start_in">Ausführen in</string> <string name="edit_launch_options">Startoptionen</string> + <string name="edit_launch_options_steam_hint">Gemeinsam mit den Eigenschaften in Steam: Eine Änderung an einer Stelle gilt für beide.</string> + <string name="edit_launch_options_not_saved">Die Startoptionen konnten nicht in Steam gespeichert werden. Versuche es erneut.</string> + <string name="edit_launch_options_desktop">Steam ist eventuell in der Desktop-Sitzung geöffnet. Ändere die Startoptionen dort in den Eigenschaften oder beende zuerst die Sitzung.</string> <string name="edit_artwork">Grafiken</string> <string name="edit_other_exe">Andere EXE…</string> <string name="edit_remove">Entfernen</string> @@ -2278,6 +2593,7 @@ <string name="setup_download_source_custom">Eigener Präfix</string> <string name="setup_download_mirror">Seite</string> <string name="setup_download_prefix">Präfix</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 für den Linux-Desktop, geöffnet über Desktop.</string> @@ -2418,6 +2734,22 @@ <string name="glasses_tracking_flat_hint">„Automatisch“ hält dieses 2D-Spiel fest im Blickfeld. Wähle unter „Anzeige“ die Option „Virtueller Bildschirm“, um Kopf-Tracking zu nutzen.</string> <string name="glasses_tracking_sbs_hint">Kopf-Tracking gilt für einen virtuellen Bildschirm oder ein laufendes SteamVR-Spiel.</string> <string name="glasses_hardware">Gerät</string> + <string name="vr_controllers_tab">Controller</string> + <string name="vr_controllers_group">SteamVR-Controller</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">Die beiden VR-Hände, als die dein Controller spielt. Änderungen gelten sofort, auch während SteamVR läuft. Joy-Cons und getrackte Hände übernehmen weiterhin ihre Seite.</string> + <string name="vr_controllers_off">Normales Gamepad</string> + <string name="vr_controllers_index">Valve-Index-Controller</string> + <string name="vr_controllers_touch">Meta-Quest-3-Controller</string> + <string name="vr_controllers_vive">HTC-Vive-Controller</string> + <string name="vr_controllers_sticks">Sticks starten mit</string> + <string name="vr_controllers_sticks_hint">Drücke in VR beide Sticks gleichzeitig, um umzuschalten.</string> + <string name="vr_controllers_sticks_game">Bewegung im Spiel</string> + <string name="vr_controllers_sticks_hands">Bewegung der Hände</string> + <string name="vr_controllers_buttons">Tasten</string> + <string name="vr_controllers_buttons_stick">Trigger sind Trigger, Schultertasten greifen, A/B und X/Y sind die Fronttasten der jeweiligen Hand, Stick-Klicks klicken die Thumbsticks, Guide öffnet das SteamVR-Menü. Steuerkreuz hoch und runter bewegt die Hände näher heran oder weiter weg.</string> + <string name="vr_controllers_buttons_vive">Die Sticks sind Trackpads; A/X oder ein Stick-Klick drückt sie. Trigger sind Trigger, Schultertasten greifen, Start und Select sind Menü, Guide öffnet das SteamVR-Menü.</string> + <string name="vr_controllers_buttons_off">Keine VR-Hände. Spiele mit Gamepad-Unterstützung und das SteamVR-Menü erhalten deinen Controller wie gewohnt.</string> <string name="glasses_brightness">Helligkeit</string> <string name="glasses_volume">Lautstärke</string> <string name="glasses_sunblock">Sonnenschutz</string> @@ -2475,6 +2807,12 @@ <string name="hand_camera_placement">Kameraplatzierung</string> <string name="hand_camera_placement_hint">Prüfe, ob die Kamera dich sehen kann, bevor du spielst.</string> <string name="hand_camera_check">Prüfen</string> + <string name="tracking_pack_title">Download für Hand-Tracking</string> + <string name="tracking_pack_hint">Hand-Tracking benötigt einen einmaligen Download von %1$s.</string> + <string name="tracking_pack_download">Herunterladen</string> + <string name="tracking_pack_retry">Erneut versuchen</string> + <string name="tracking_pack_downloading">Hand-Tracking wird heruntergeladen… %1$d%%</string> + <string name="tracking_pack_failed">Hand-Tracking konnte nicht heruntergeladen werden. Prüfe deine Verbindung und versuch es erneut.</string> <string name="hand_camera_check_title">Kameraplatzierung</string> <string name="hand_camera_how_rear">Stell das Gerät etwa 1,5 bis 2 Meter entfernt in Brusthöhe auf, mit der Rückkamera zu dir gerichtet. Tritt dann mit ausgestreckten Händen ins Bild.</string> <string name="hand_camera_how_front">Stell das Gerät etwa 1,5 bis 2 Meter entfernt in Brusthöhe auf, mit dem Bildschirm zu dir gerichtet. Tritt dann mit ausgestreckten Händen ins Bild.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Ungenutzte Laufzeiten, Reste, alte Logs</string> <string name="storage_clean_up">Aufräumen…</string> <string name="storage_session_running">Beende die Sitzung, um aufzuräumen oder zu entfernen. Die Größen werden weiterhin angezeigt.</string> + <string name="storage_default_group">Installationsort</string> + <string name="storage_default_title">Standardspeicher</string> + <string name="storage_default_hint">Neue Store-Installationen landen am ausgewählten Ort. Vorhandene Spiele bleiben, wo sie sind. Steam-Bibliotheken behalten ihre eigene Einstellung.</string> + <string name="storage_default_ask">Jedes Mal fragen</string> + <string name="storage_default_ask_detail">Für jede Installation ein Ziel wählen</string> + <string name="storage_default_internal">Interner Speicher</string> + <string name="storage_default_external">Externer Speicher</string> + <string name="storage_default_external_detail">%1$s · %2$s frei</string> + <string name="storage_default_external_missing">Nicht verbunden</string> + <string name="storage_default_folder">Ordner · %1$s</string> + <string name="storage_default_folder_free">%1$s frei</string> + <string name="storage_default_folder_missing">Nicht verbunden</string> + <string name="storage_default_choose_folder">Ordner auswählen…</string> + <string name="storage_default_choose_folder_detail">Einen beliebigen Ordner auf einer SD-Karte oder einem USB-Laufwerk verwenden</string> + <string name="storage_default_note">Spiele kommen in einen Games-Ordner am ausgewählten Ort. Vorhandene Spiele werden nicht verschoben.</string> <string name="storage_where">Belegung</string> <string name="storage_games">Steam-Spiele</string> <string name="storage_game_data">Spieldaten</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Installierte Spiele</string> <string name="storage_data_parts">Präfix %1$s · Shader %2$s · Workshop %3$s</string> <string name="storage_clear_shaders">Shader löschen</string> + <string name="storage_reset_prefix">Präfix zurücksetzen</string> + <string name="storage_reset_prefix_title">Präfix für %1$s zurücksetzen?</string> + <string name="storage_reset_prefix_confirm">Löscht sein Wine-Präfix (%1$s) in %2$s und erstellt es beim nächsten Start neu. Speicherstände, Einstellungen und darin installierte Redistributables gehen verloren; Steam-Cloud-Speicherstände bleiben in deinem Konto.</string> <string name="storage_data_leftovers">Deinstallierte Spiele</string> <string name="storage_steam_app">Steam-App %1$d</string> <string name="storage_leftover_unsure_detail">Das Präfix enthält noch Dateien, darunter möglicherweise lokale Speicherstände</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Mit Syncthing synchronisieren</string> + <string name="sync_enable_hint">Basiert auf Syncthing-Fork: eine Syncthing-Implementierung, mit der du Dateien im internen Dateisystem von DroidDeck mit anderen Syncthing-Instanzen synchronisieren kannst. Gilt nur für Dateien, die du im internen Dateisystem von DroidDeck speicherst.</string> + <string name="sync_missing">Dieser Build enthält kein Syncthing.</string> + <string name="sync_starting">Syncthing wird gestartet</string> + <string name="sync_status_starting">Wird gestartet</string> + <string name="sync_status_up_to_date">Aktuell</string> + <string name="sync_status_syncing">Synchronisiert</string> + <string name="sync_status_paused">Pausiert</string> + <string name="sync_status_pausing">Wird pausiert</string> + <string name="sync_status_resuming">Wird fortgesetzt</string> + <string name="sync_status_attention">Benötigt Aufmerksamkeit</string> + <string name="sync_status_failed">Syncthing gestoppt</string> + <string name="sync_failed_retry">Erneut versuchen</string> + <string name="sync_paused_wifi">Pausiert, bis Wi-Fi verfügbar ist</string> + <string name="sync_paused_game">Während des Spiels pausiert</string> + <string name="sync_summary">%1$d Ordner · %2$d von %3$d Geräten verbunden</string> + <string name="sync_left">Noch %1$s</string> + <string name="sync_open_web_ui">Web-GUI öffnen</string> + <string name="sync_pause">Pausieren</string> + <string name="sync_resume">Fortsetzen</string> + <string name="sync_running">Aktiv</string> + <string name="sync_running_hint">Ausschalten, um Syncthing vollständig zu beenden.</string> + <string name="sync_this_device">Dieses Gerät</string> + <string name="sync_device_id">Geräte-ID</string> + <string name="sync_show_qr">QR-Code anzeigen</string> + <string name="sync_advanced">Erweitert</string> + <string name="sync_advanced_hint">Ports, Ausführung, Zurücksetzen</string> + <string name="sync_open">Öffnen</string> + <string name="sync_waiting">Wartet auf dich</string> + <string name="sync_pending_device">%1$s möchte sich verbinden</string> + <string name="sync_pending_folder">%1$s möchte „%2$s“ teilen</string> + <string name="sync_pending_folder_hint">Annehmen, um zu wählen, wo es in DroidDeck gespeichert wird.</string> + <string name="sync_review">In der Web-GUI prüfen</string> + <string name="sync_folders">Ordner</string> + <string name="sync_no_folders">Noch keine Ordner.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuell</string> + <string name="sync_folder_syncing">Synchronisiere %1$d %%</string> + <string name="sync_folder_scanning">Scanne</string> + <string name="sync_folder_paused">Pausiert</string> + <string name="sync_folder_out_of_sync">Nicht synchron</string> + <string name="sync_folder_errors">%1$d Dateien konnten nicht synchronisiert werden</string> + <string name="sync_folder_blocked">Blockiert</string> + <string name="sync_folder_blocked_hint">Dieser Ordner liegt außerhalb des DroidDeck-Speichers, daher hat DroidDeck ihn pausiert. Um Ordner außerhalb von DroidDeck zu synchronisieren, nutze die App Syncthing-Fork.</string> + <string name="sync_remove_folder">Aus Syncthing entfernen</string> + <string name="sync_remove_folder_hint">Beim Entfernen werden keine Dateien gelöscht.</string> + <string name="sync_devices">Geräte</string> + <string name="sync_no_devices">Noch keine Geräte.</string> + <string name="sync_connected">Verbunden</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Zuletzt gesehen %1$s</string> + <string name="sync_device_id_title">ID dieses Geräts</string> + <string name="sync_device_id_hint">Füge auf deinem anderen Gerät in Syncthing ein Gerät hinzu und scanne diesen Code oder füge die ID ein. Nimm es dann hier in der Web-GUI an.</string> + <string name="sync_copy">Kopieren</string> + <string name="sync_share">Teilen</string> + <string name="sync_done">Fertig</string> + <string name="sync_off_title">Syncthing ausschalten?</string> + <string name="sync_off_body">Syncthing wird jetzt beendet und bleibt aus, bis du es wieder einschaltest. Synchronisierte Dateien bleiben, wo sie sind.</string> + <string name="sync_off_forget">Auch die Syncthing-Konfiguration löschen</string> + <string name="sync_off_forget_hint">Entfernt die ID dieses Geräts, Ordner und Geräte. Beim erneuten Einschalten beginnt alles von vorn.</string> + <string name="sync_turn_off">Ausschalten</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Synchronisierung</string> + <string name="sync_port_discovery">Lokale Gerätesuche</string> + <string name="sync_repick">Neue Ports wählen</string> + <string name="sync_repick_hint">Wird bei jedem Start erneut geprüft.</string> + <string name="sync_repick_button">Neu wählen</string> + <string name="sync_reset_group">Zurücksetzen</string> + <string name="sync_api_key">API-Schlüssel</string> + <string name="sync_regenerate">Neu generieren</string> + <string name="sync_reset">Syncthing zurücksetzen</string> + <string name="sync_reset_hint">Neue Geräte-ID, Ordner und Geräte werden entfernt. Dateien im DroidDeck-Speicher bleiben erhalten.</string> + <string name="sync_reset_button">Zurücksetzen</string> + <string name="sync_reset_confirm_title">Syncthing zurücksetzen?</string> + <string name="sync_running_group">Ausführung</string> + <string name="sync_run">Ausführen</string> + <string name="sync_run_open">Während DroidDeck geöffnet ist</string> + <string name="sync_run_background">Im Hintergrund</string> + <string name="sync_wifi_only">Nur über Wi-Fi</string> + <string name="sync_pause_games">Während Spielen pausieren</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing-Ausgabe dieser Sitzung</string> + <string name="sync_logs_share">Teilen</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Richte zuerst die Linux-Laufzeit ein.</string> + <string name="sync_accept">Annehmen</string> + <string name="sync_accept_title">„%1$s“ speichern in</string> + <string name="sync_add_folder">Ordner hinzufügen</string> + <string name="sync_add_folder_hint">Einen Ordner im DroidDeck-Speicher synchronisieren</string> + <string name="sync_choose">Auswählen</string> + <string name="sync_add">Hinzufügen</string> + <string name="sync_add_failed">Der Ordner konnte nicht hinzugefügt werden.</string> + <string name="sync_share_with">Teilen mit</string> + <string name="sync_share_none">Noch keine Geräte. Du kannst diesen Ordner später über die Web-GUI teilen.</string> + <string name="sync_use_folder">Diesen Ordner verwenden</string> + <string name="sync_new_folder">Neuer Ordner</string> + <string name="sync_location_home">Home-Verzeichnis des Containers</string> + <string name="sync_location_sync">Sync-Ordner</string> + <string name="sync_location_shared">Gemeinsamer DroidDeck-Speicher</string> + <string name="sync_location_card">DroidDeck auf %1$s</string> + <string name="sync_location_app">DroidDeck-App-Daten</string> + <string name="sync_web_path_locked">Neue Ordner werden im Sync-Ordner von DroidDeck gespeichert. Um einen anderen DroidDeck-Ordner zu synchronisieren, nutze „Ordner hinzufügen“ im Tab „Syncthing“.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Neu laden</string> + <string name="sync_not_running">Syncthing läuft nicht.</string> + <string name="session_end_steam_sigill">Steam wurde mit einer ungültigen Anweisung (SIGILL) beendet. Das kann ein Kompatibilitätsproblem mit CPU-Befehlen oder ein Absturz des Clients sein. Teile die Logs zusammen mit den Details deines Geräts.</string> + <string name="session_end_steam_try_x64">Du kannst Steam-Einstellungen → Steam-Client → x86-64 (experimentell) ausprobieren. Das erfordert einen zusätzlichen Download und kann langsamer laufen.</string> + <string name="session_end_vulkan_device">Der Linux-Grafiktreiber hat kein nutzbares Vulkan-Gerät gefunden. Prüfe, ob der ausgewählte Linux-GPU-Treiber diese GPU unterstützt.</string> + <string name="session_end_gpu_unsupported">Diese Sitzung kann nicht starten, weil es für diese GPU in der aktuellen Konfiguration keinen kompatiblen Linux-Vulkan-Treiber gibt. Adreno-Turnip-Treiber können keine Unterstützung für MediaTek/Mali-GPUs aktivieren.</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_resources_browser">Öffnet sich in deinem Browser</string> + <string name="game_resource_guides">Anleitungen</string> + <string name="game_resource_protondb_detail">Kompatibilitätsberichte zu Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Für Spiele mit Speicherständen in deinem Steam-Konto</string> + <string name="game_resource_search">Websuche</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="library_filter">Filter</string> + <string name="library_filter_installed">Nur installierte</string> + <string name="library_filter_all_owned">Alle eigenen Spiele</string> + <string name="library_no_installed_matches">Keine installierten Spiele entsprechen diesen Filtern.</string> + <string name="library_browse_owned">Eigene Spiele durchsuchen</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="stores_itch_updates_found">Verfügbare Updates: %1$d</string> + <string name="stores_itch_update_replaced">Der Entwickler hat diesen Build durch %1$s ersetzt. Darauf aktualisieren?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Cloud-Einstellungen</string> + <string name="integration_title">Steam-Integration</string> + <string name="integration_count">%1$d von %2$d an</string> + <string name="integration_set_up">Einrichten</string> + <string name="integration_location">Standort</string> + <string name="integration_app_info">App-Info</string> + <string name="integration_wifi">Wi-Fi-Namen</string> + <string name="integration_brightness">Helligkeit</string> + <string name="integration_home">DroidDeck als Startbildschirm</string> + <string name="integration_shortcuts">Kürzel der Home-Taste</string> + <string name="integration_wifi_hint">Netzwerke in Steam anzeigen · braucht Standortzugriff, kein Tracking</string> + <string name="integration_wifi_on">Netzwerke werden in Steam angezeigt</string> + <string name="integration_wifi_location_off">Standort ist aus</string> + <string name="integration_wifi_denied">Standort verweigert · erlaube ihn in App-Info</string> + <string name="integration_brightness_hint">Steams Regler stellt die Bildschirmhelligkeit ein</string> + <string name="integration_home_hint">Home öffnet in einer Sitzung das Steam-Menü</string> + <string name="integration_shortcuts_hint">Home halten für Steam-Guide-Tastenkombinationen</string> + <string name="integration_shortcuts_needs_home">Benötigt DroidDeck als Startbildschirm</string> + <string name="integration_shortcuts_maybe_restricted">In Android ausgegraut? App-Info → ⋮ → Eingeschränkte Einstellungen zulassen</string> + <string name="integration_shortcuts_restricted">Von Android blockiert · App-Info → ⋮ → Eingeschränkte Einstellungen zulassen</string> + <string name="integration_shortcuts_service">DroidDeck-Home-Taste</string> + <string name="integration_shortcuts_service_description">Leitet Drücke der Home-Taste an Steam Guide weiter, während eine Steam-Sitzung im Fokus ist und DroidDeck die Standard-Startbildschirm-App ist. Liest keine Bildschirminhalte.</string> + <string name="integration_brightness_needed">Aktiviere Helligkeit unter Einrichtung → Steam-Integration</string> + <string name="apps_search_hint">Apps durchsuchen</string> + <string name="apps_no_match">Keine Apps passen zu „%1$s“.</string> + <string name="apps_add_widget">Widget hinzufügen</string> + <string name="apps_widgets_loading">Widgets werden geladen…</string> + <string name="apps_widgets_none">Keine App auf diesem Gerät bietet Widgets an.</string> + <string name="apps_widget_wider">Breiter</string> + <string name="apps_widget_narrower">Schmaler</string> + <string name="apps_widget_taller">Höher</string> + <string name="apps_widget_shorter">Niedriger</string> + <string name="apps_widget_move_earlier">Nach vorne</string> + <string name="apps_widget_move_later">Nach hinten</string> + <string name="apps_widget_configure">Widget-Einstellungen</string> + <string name="apps_widget_remove">Widget entfernen</string> + <string name="apps_add_to_folder">Zu Ordner hinzufügen</string> + <string name="apps_new_folder">Neuer Ordner</string> + <string name="apps_remove_from_folder">Aus Ordner entfernen</string> + <string name="apps_app_info">App-Info</string> + <string name="apps_uninstall">Deinstallieren</string> + <string name="apps_folder_rename">Umbenennen</string> + <string name="apps_folder_ungroup">Auflösen</string> + <string name="apps_folder_default">Ordner</string> + <string name="apps_folder_name">Ordnername</string> + <string name="apps_filter">Anzeigen</string> + <string name="apps_filter_all">Alle Apps</string> + <string name="apps_filter_games">Spiele</string> + <string name="apps_filter_downloaded">Heruntergeladen</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Ausgeblendet</string> + <string name="apps_hide">Ausblenden</string> + <string name="apps_unhide">In Apps anzeigen</string> + <string name="apps_shortcut_remove">Verknüpfung entfernen</string> + <string name="apps_pin_title">Zu Apps hinzufügen</string> + <string name="apps_pin_add">Hinzufügen</string> + <string name="apps_hidden_none">Keine ausgeblendeten Apps.</string> + <string name="apps_sort_name_asc">Name A–Z</string> + <string name="apps_sort_name_desc">Name Z–A</string> + <string name="apps_sort_installed">Zuletzt installiert</string> + <string name="apps_sort_updated">Zuletzt aktualisiert</string> + <plurals name="apps_count"> + <item quantity="one">%d App</item> + <item quantity="other">%d Apps</item> + </plurals> + <string name="desktop_restore_title">Deine Software wird wiederhergestellt</string> + <string name="desktop_restore_body">Die Apps, die du hinzugefügt hast, werden nach einem DroidDeck-Update neu installiert.</string> + <string name="desktop_restore_done_title">Software wiederhergestellt</string> + <string name="desktop_restore_done_body">Die Apps, die du hinzugefügt hast, sind wieder installiert.</string> + <string name="desktop_restore_failed_title">Manche Software konnte nicht wiederhergestellt werden</string> + <string name="desktop_restore_failed_body">Sieh in ~/.cache/droiddeck/apt-restore.log nach und versuche dann sudo apt install in Konsole.</string> + <string name="gog_full_files">Native Optimierungen sind nicht verfügbar. Der Download enthält vollständige Ersatzdateien.</string> + <string name="gog_recover">Patch-Ergebnis prüfen</string> + <string name="slow_usb_title">Langsame USB-Verbindung</string> + <string name="slow_usb_cable">%1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s), daher laden Spiele darauf langsam. Nutze ein USB-3-Kabel mit 5 Gbit/s oder mehr, dreh den USB-C-Stecker um oder verwende ein schnelleres Laufwerk.</string> + <string name="slow_usb_port">%1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s). Der USB-Anschluss dieses Geräts kann nicht schneller, daher laden Spiele darauf langsam. Interner Speicher oder eine microSD-Karte können schneller sein.</string> + <string name="slow_usb_never">Nicht mehr anzeigen</string> + <string name="slow_usb_dismiss">Schließen</string> + <string name="steam_import_title">Steam neu starten, um deine Spiele hinzuzufügen?</string> + <string name="steam_import_body">Steam kann diese Spiele, die du besitzt, als installiert anzeigen: %1$s. Dafür muss Steam neu starten. Starte jetzt neu, oder sie werden beim nächsten Start von Steam hinzugefügt.</string> + <string name="steam_import_names_more">%1$s und %2$d weitere</string> + <string name="steam_import_now">Jetzt neu starten</string> + <string name="steam_import_later">Später</string> + <string name="gog_maintenance">GOG-Installation verwalten</string> + <string name="gog_check">Nach Updates suchen</string> + <string name="gog_repair">Prüfen/Reparieren</string> + <string name="gog_patches">Offline-Patches</string> + <string name="gog_refresh">Vollständigen Offline-Installer herunterladen</string> + <string name="gog_update">Auf %1$s aktualisieren</string> + <string name="gog_resume">GOG-Wartung fortsetzen</string> + <string name="gog_open_patch">Patch-Installer öffnen</string> + <string name="gog_patch_in_session">Schließe den Patch-Installer in der Linux-Sitzung ab oder brich ihn ab.</string> + <string name="gog_patch_requirements">Wähle einen Patch für deine installierte Version und Sprache. Unterstützte Ausgangsversionen sind eventuell nicht aufgeführt.</string> + <string name="gog_no_patches">GOG hat keine eigenständigen Windows-Patches für dieses Spiel.</string> + <string name="gog_managed_files">Geänderte Spieldateien werden möglicherweise ersetzt.</string> + <string name="gog_patch_installer_note">Der Installer öffnet sich in deiner Linux-Sitzung.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Zusätzlicher Speicher</string> + <string name="gog_space_estimate_label">Geschätzter Speicherbedarf</string> + <string name="gog_repair_action">Dateien reparieren</string> + <string name="gog_refresh_action">Installation erneuern</string> + <string name="gog_select_patch">Auswählen</string> + <string name="setup_all_files">Zugriff auf alle Dateien</string> + <string name="setup_local_network">Lokales Netzwerk</string> + <string name="libraries_title">Weitere Steam-Bibliotheken</string> + <string name="libraries_hint">Ordner, in denen Steam Spiele installieren und starten kann, jeweils mit eigenem Namen. Beim Entfernen bleiben die Spiele auf dem Datenträger.</string> + <string name="libraries_add">Bibliothek hinzufügen</string> + <string name="libraries_rename_title">Bibliotheksname</string> + <string name="libraries_pick">Ordner für die Bibliothek wählen</string> + <string name="libraries_full">Höchstens %1$d zusätzliche Bibliotheken</string> + <string name="libraries_overlap">Dieser Ordner ist bereits eine Bibliothek oder liegt darin</string> + <string name="libraries_missing">%1$s · nicht verfügbar</string> + <string name="libraries_applies_next">Gilt ab der nächsten Steam-Sitzung</string> + <string name="bottom_desktop_start">Desktop starten</string> + <string name="bottom_desktop_mode_touch">Direkte Berührung</string> + <string name="bottom_desktop_trackpad">Trackpad. Für direkte Berührung tippen</string> + <string name="bottom_desktop_direct_touch">Direkte Berührung. Für Trackpad tippen</string> + <string name="bottom_desktop_starting">KDE-Desktop wird gestartet…</string> + <string name="bottom_desktop_ended">Der Desktop wurde geschlossen.</string> + <string name="bottom_desktop_failed">Der Desktop konnte nicht starten. Seine Protokolle liegen im Ordner bottom-desktop dieser Sitzung.</string> + <string name="bottom_desktop_off">Der Desktop ist geschlossen.</string> + <string name="libraries_rename">Umbenennen</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-el/gestures.xml b/app/src/main/res/values-el/gestures.xml index 22d20ba93..f0bdfe451 100644 --- a/app/src/main/res/values-el/gestures.xml +++ b/app/src/main/res/values-el/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Χειρονομίες</string> <string name="gesture_settings">Ρυθμίσεις χειρονομιών αφής</string> - <string name="gesture_settings_hint">Προσαρμόστε τις χειρονομίες ποντικιού και πληκτρολογίου. Επιλέξτε Χειρονομίες ως λειτουργία αφής για να τις χρησιμοποιήσετε.</string> <string name="gesture_tap">Πάτημα</string> <string name="gesture_drag">Σύρσιμο με ένα δάχτυλο</string> <string name="gesture_long_press">Παρατεταμένο πάτημα</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Κράτημα με τρία δάχτυλα</string> <string name="gesture_pinch">Μεγέθυνση με τσίμπημα</string> <string name="gesture_hold_button">Διατήρηση του κουμπιού πατημένου</string> + <string name="gesture_hold_left">Διατήρηση αριστερού κουμπιού πατημένου</string> + <string name="gesture_hold_right">Διατήρηση δεξιού κουμπιού πατημένου</string> <string name="gesture_click_once">Ένα κλικ</string> <string name="gesture_hold_delay">Καθυστέρηση κρατήματος</string> <string name="gesture_double_delay">Διάστημα διπλού πατήματος</string> diff --git a/app/src/main/res/values-el/shortcuts.xml b/app/src/main/res/values-el/shortcuts.xml new file mode 100644 index 000000000..a09be7c53 --- /dev/null +++ b/app/src/main/res/values-el/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Συντομεύσεις φυσικών κουμπιών</string> + <string name="shortcuts_dd_menu">Μενού DroidDeck</string> + <string name="shortcuts_capture">Αντιστοίχιση: %1$s</string> + <string name="shortcuts_press">Πατήστε και αφήστε ένα κουμπί. Η αντιστοίχιση αποθηκεύεται αυτόματα.</string> + <string name="shortcuts_release">Αφήστε το κουμπί για συνέχεια.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Αυτό το κουμπί έχει ήδη αντιστοιχιστεί σε: %1$s</string> + <string name="shortcuts_save">Επαναντιστοίχιση</string> + <string name="shortcuts_retry">Δοκιμή άλλου κουμπιού</string> + <string name="shortcuts_limitations">Το κουμπί Αρχική και ορισμένα επιπλέον κουμπιά ενδέχεται να μην είναι διαθέσιμα.</string> +</resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 181822f35..1407b3abf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Επιλογές VKD3D για D3D12. Το nodxr απενεργοποιεί το ray tracing· χρησιμοποιήστε το μόνο για παιχνίδι που το χρειάζεται.</string> <string name="game_env_proton_log">Ορίστε σε 1 για διαγνωστικό αρχείο καταγραφής του Proton. Η καταγραφή μπορεί να μειώσει την απόδοση και να χρησιμοποιήσει χώρο αποθήκευσης.</string> <string name="game_env_wined3d">Ορίστε σε 1 για χρήση του WineD3D με βάση OpenGL αντί του DXVK, για δοκιμές συμβατότητας D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer για DirectDraw, Direct3D 1-7 και παιχνίδια που εκτελούνται με WineD3D. Το Vulkan παρακάμπτει τη διαδρομή OpenGL μέσω Zink και είναι πολύ πιο γρήγορο για παλιά παιχνίδια DirectDraw και Direct3D 7 σε Adreno.</string> + <string name="game_env_dxvk_d3d8">Ορίστε σε 1 για εκτέλεση του Direct3D 8 μέσω DXVK αντί για WineD3D. Πιο γρήγορο στη δοκιμή Direct3D 8 του AIO Graphics Test σε Adreno.</string> <string name="game_env_no_ntsync">Ορίστε σε 1 για να κρατήσετε αυτό το παιχνίδι εκτός ntsync (droiddeck-ntsync ή οδηγός πυρήνα)· χρησιμοποιεί το droiddeck-esync όπου υπάρχει πακέτο, διαφορετικά το droiddeck-fsync.</string> <string name="game_env_no_esync">Ορίστε σε 1 για να απενεργοποιήσετε το droiddeck-esync για αυτό το παιχνίδι· χρησιμοποιεί αντ’ αυτού το droiddeck-fsync, ή το droiddeck-ntsync όταν είναι απενεργοποιημένο και το fsync.</string> <string name="game_env_no_fsync">Ορίστε σε 1 για να κρατήσετε αυτό το παιχνίδι εκτός droiddeck-fsync· χρησιμοποιεί το droiddeck-esync όπου υπάρχει πακέτο, διαφορετικά το droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ορίστε σε 1 για εκτέλεση αυτού του παιχνιδιού με droiddeck-fsync, ή σε 0 για να προτάξετε το droiddeck-esync όπου ένα πακέτο ταιριάζει με το Proton του.</string> <string name="game_env_xalia">Ορίστε σε 0 για να απενεργοποιήσετε τον βοηθό πλοήγησης με χειριστήριο του Proton για αυτό το παιχνίδι.</string> + <string name="game_env_anticheat_offline">Ενεργό από προεπιλογή. Ξεκινά ένα παιχνίδι Easy Anti-Cheat χωρίς το anti-cheat του όταν το παιχνίδι υποστηρίζει παιχνίδι εκτός σύνδεσης. Απενεργοποιήστε το για εκκίνηση μέσω Easy Anti-Cheat ως συνήθως. Οι διαδικτυακές λειτουργίες που απαιτούν Easy Anti-Cheat παραμένουν μη διαθέσιμες.</string> <string name="game_env_hud">Επικάλυψη DXVK για D3D9–11. Το fps εμφανίζει τον ρυθμό καρέ· χωρίς ορισμό το αποκρύπτει.</string> <string name="game_env_dxvk_config">Ρυθμίσεις DXVK χωρισμένες με ερωτηματικά. Οι πρόσφατες εκδόσεις χρησιμοποιούν το dxvk.maxFrameRate για τον περιορισμό καρέ· προτιμήστε τον περιοριστή καρέ της συνεδρίας για συνήθη χρήση.</string> + <string name="game_env_cores">Πυρήνες CPU για αυτό το παιχνίδι, όπως 0-4 ή 0,2,4, αντί για τους πυρήνες παιχνιδιών της συνεδρίας. Λιγότεροι πυρήνες ζεσταίνονται λιγότερο.</string> <string name="game_env_vkd3d_limit">Όριο ρυθμού καρέ D3D12. Το 0 απενεργοποιεί το όριο.</string> <string name="game_env_glthread">Πολυνημάτωση OpenGL της Mesa. Το true μπορεί να βοηθήσει παιχνίδια OpenGL περιορισμένα από CPU· δοκιμάστε το ανά παιχνίδι.</string> <string name="sync_backend_title">Συγχρονισμός Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">Το FEX εκτελεί προγράμματα x86 Linux σε αυτή τη συσκευή ARM64. Το Αυτόματο το χρησιμοποιεί όταν το πρόγραμμα είναι χτισμένο για x86.</string> <string name="app_fex_x86">%1$s μέσω FEX</string> <string name="app_fex_not_ready">Αυτό το πρόγραμμα είναι χτισμένο για υπολογιστές %1$s και εκτελείται μέσω FEX, το οποίο δεν έχει ρυθμιστεί ακόμα. Ανοίξτε το Steam μία φορά ενώ είστε συνδεδεμένοι: το DroidDeck κάνει λήψη του FEX και του Steam Linux Runtime που χρειάζεται, και μετά αυτό ανοίγει.</string> + <string name="session_proot_missing">Δεν ήταν δυνατή η λήψη του proot του DroidDeck. Ελέγξτε τη σύνδεση και δοκιμάστε ξανά. Η συνεδρία δεν ξεκίνησε, επειδή το εναλλακτικό proot είναι πολύ αργό για παιχνίδι.</string> + <string name="session_directaudio_missing">Δεν ήταν δυνατή η λήψη του DirectAudio, οπότε ο ήχος των παιχνιδιών χρησιμοποιεί την πιο αργή διαδρομή σε αυτή τη συνεδρία.</string> <string name="session_end_program">Αυτό το πρόγραμμα</string> <string name="session_end_steam_download">Δεν ήταν δυνατή η λήψη του πελάτη Steam. Το δίκτυο ή το VPN σας ίσως αποκλείει τους διακομιστές του Steam· ελέγξτε τη σύνδεση και δοκιμάστε ξανά.</string> <string name="session_end_steam_setup">Δεν ήταν δυνατή η ρύθμιση του πελάτη Steam. Ελέγξτε τη σύνδεση και τον ελεύθερο χώρο αποθήκευσης και δοκιμάστε ξανά.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Χειριστήριο Xbox 360</string> <string name="mode_controller_note">Deck: κουμπί Quick Access και γυροσκόπιο. Steam Controller: το ίδιο, με αίσθηση λαβής στα πίσω κουμπιά. DualShock 4 και DualSense: γυροσκόπιο, και τα trackpad ως πινακίδα αφής τους. Xbox 360: ανοίξτε το Quick Access με Guide+A.</string> <string name="mode_back">Πίσω</string> + <string name="back_hold">Παρατεταμένο Πίσω για συντομεύσεις Steam</string> + <string name="back_hold_hint">Το παρατεταμένο Πίσω ανοίγει τη Γρήγορη πρόσβαση ή κάνει συνδυασμούς Steam με άλλα κουμπιά. Απενεργοποιήστε για να αγνοείται· το πάτημα και το διπλό πάτημα λειτουργούν.</string> + <string name="back_native_qam_hint">Κρατήστε πατημένο το Πίσω για 700 ms ή κρατήστε το Πίσω και πατήστε άλλο κουμπί για συντομεύσεις Steam.</string> + <string name="back_double_tap_window">Διάστημα διπλού πατήματος</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Να επιτρέπεται ο έλεγχος φωτεινότητας</string> + <string name="brightness_permission_text">Ρυθμίστε τον έλεγχο φωτεινότητας στο DroidDeck.</string> <string name="back_menu_then_qam">Μενού → QAM</string> <string name="back_qam_then_menu">QAM → Μενού</string> <string name="mode_session">Συνεδρία</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Ενημερωμένο · %1$s</string> <string name="mode_decky_loader">Φορτωτής</string> <string name="mode_decky_install_latest">Εγκατάσταση τελευταίας έκδοσης</string> + <string name="decky_channel">Κανάλι ενημερώσεων</string> + <string name="decky_channel_hint">Ποιες εκδόσεις του Decky Loader θα εγκατασταθούν. Το πρόγραμμα ενημέρωσης του Decky χρησιμοποιεί το ίδιο κανάλι.</string> + <string name="decky_channel_stable">Σταθερό</string> + <string name="decky_channel_prerelease">Προέκδοση</string> + <string name="decky_channel_testing">Δοκιμαστικό</string> + <string name="decky_channel_failed">Δεν ήταν δυνατή η αποθήκευση του καναλιού ενημερώσεων του Decky</string> <string name="mode_decky_on">Ξεκινά με το Steam. Όσο είναι ενεργό, άλλες εφαρμογές σε αυτή τη συσκευή μπορεί να είναι σε θέση να ελέγξουν το Steam.</string> <string name="mode_decky_off">Ανενεργό. Η θύρα απομακρυσμένου εντοπισμού σφαλμάτων του Steam παραμένει κλειστή.</string> <string name="mode_decky_remove_title">Κατάργηση εγκατάστασης του Decky Loader;</string> @@ -307,6 +342,10 @@ <string name="mode_client">Πελάτης</string> <string name="mode_mangoapp">Επικάλυψη απόδοσης</string> <string name="mode_mangoapp_hint">Απενεργοποιήστε το αν τα παιχνίδια κολλάνε ή μαυρίζει η οθόνη σε λειτουργία Deck. Εφαρμόζεται στην επόμενη συνεδρία.</string> + <string name="mode_return_after_game">Επιστροφή στο DroidDeck μετά από παιχνίδι</string> + <string name="mode_return_after_game_hint">Όταν κλείνει ένα παιχνίδι που ξεκινήσατε από το DroidDeck ή άλλο launcher, το Steam τερματίζεται κανονικά (πρώτα ολοκληρώνονται οι αποθηκεύσεις στο cloud) και επιστρέφετε εκεί. Ανενεργό: παραμένετε στο Steam.</string> + <string name="mode_shader_precache">Προ-αποθήκευση shader</string> + <string name="mode_shader_precache_hint">Το Steam κατεβάζει έτοιμα shaders για τα παιχνίδια σας και τα επεξεργάζεται στο παρασκήνιο, ώστε τα παιχνίδια να κολλάνε λιγότερο. Η απενεργοποίηση εξοικονομεί δεδομένα, χώρο και μπαταρία· τα παιχνίδια δημιουργούν τα shaders κατά το παιχνίδι. Η ίδια ρύθμιση με το Λήψεις > Shader Pre-Caching του Steam. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="mode_steam_repair">Επιδιόρθωση πελάτη Steam</string> <string name="mode_steam_repair_hint">Κάνει ξανά λήψη του πελάτη Steam την επόμενη φορά που θα ξεκινήσει το Steam. Χρησιμοποιήστε το αν το Steam παραμένει στην οθόνη φόρτωσης. Τα παιχνίδια, η σύνδεση και οι ρυθμίσεις διατηρούνται.</string> <string name="mode_steam_repair_queued">Ο πελάτης Steam θα ληφθεί ξανά την επόμενη φορά που θα ξεκινήσει το Steam.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Παρακάμπτει το PulseAudio για μικρότερη καθυστέρηση.</string> <string name="mode_mic">Μικρόφωνο</string> <string name="mode_mic_hint">Για φωνητική συνομιλία.</string> + <string name="drawer_mic_hint">Ενεργοποίηση ή απενεργοποίηση της λήψης μικροφώνου για αυτή τη συνεδρία.</string> + <string name="drawer_mic_failed">Δεν ήταν δυνατή η αλλαγή του μικροφώνου. Δοκιμάστε ξανά.</string> <string name="mode_network">Δίκτυο</string> <string name="mode_wifi_discovery">Εντοπισμός Wi-Fi</string> <string name="mode_wifi_discovery_hint">Εμφανίζει ονόματα Wi-Fi και κοντινά δίκτυα στο Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: ουρά GPU πραγματικού χρόνου</string> <string name="perf_gsrealtime_hint">Δίνει προτεραιότητα στην εργασία GPU του compositor. Μπορεί να εξομαλύνει τον ρυθμό καρέ με κάποιο κόστος για τα παιχνίδια.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Μνήμη</string> + <string name="perf_cap_off">Ανενεργό</string> + <string name="perf_cap_auto">Προεπιλογή προγράμματος οδήγησης</string> + <string name="perf_zram_client">Συμπίεση του Steam όσο τρέχει παιχνίδι</string> + <string name="perf_zram_client_hint">20 s μετά την εκκίνηση ενός παιχνιδιού, ο πελάτης Steam συμπιέζεται στη zRAM για να μείνει περισσότερη μνήμη στο παιχνίδι, και διαβάζεται πίσω όταν το παιχνίδι κλείσει. Απενεργοποιήστε το αν η συνεδρία κλείνει λίγο μετά την εκκίνηση παιχνιδιών. Ένα όριο RAM παραπάνω εξακολουθεί να συμπιέζει το Steam όταν η συνεδρία το ξεπεράσει.</string> + <string name="perf_ram_cap">Όριο RAM</string> + <string name="perf_ram_cap_hint">Ισχύει όσο τρέχει ο πελάτης Steam, σε λειτουργία Steam ή από την επιφάνεια εργασίας. Όταν η συνεδρία χρησιμοποιεί περισσότερη, το Steam και έπειτα οι άλλες υποστηριζόμενες διεργασίες της συνεδρίας συμπιέζονται στη zRAM. Ήπιο όριο: τίποτα δεν κλείνει, αλλά τα παιχνίδια μπορεί να κολλάνε όσο επιστρέφουν οι σελίδες.</string> + <string name="perf_ram_cap_unavailable">Απαιτεί zRAM swap, που δεν υπάρχει σε αυτή τη συσκευή.</string> + <string name="perf_vram_cap">Όριο VRAM</string> + <string name="perf_vram_cap_hint">Η μνήμη βίντεο που αναφέρει το DXVK στα παιχνίδια Direct3D, ώστε να προγραμματίζουν υφές για λιγότερη. Οι δικές ρυθμίσεις DXVK του παιχνιδιού υπερισχύουν. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="perf_gpuclock">Διατήρηση της GPU στη μέγιστη συχνότητά της</string> <string name="perf_gpuclock_hint">Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα.</string> <string name="perf_fixes">Διορθώσεις συνεδρίας</string> <string name="perf_sysmem">Turnip: απόδοση sysmem</string> <string name="perf_sysmem_hint">Ταχύτερο για το πρόγραμμα-πελάτη Steam· στα παιχνίδια ο οδηγός επιλέγει σε κάθε πέρασμα απόδοση με πλακίδια ή στη μνήμη συστήματος. Απαιτείται σε Adreno 710/720/722.</string> <string name="perf_xalia">Παράβλεψη του βοηθού xalia του Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (πειραματικό)</string> - <string name="perf_fastsync_hint">Ένα υποκατάστατο σε επίπεδο χρήστη για το πρόγραμμα οδήγησης ntsync του Linux, για δοκιμές. Όσο είναι ενεργό, το Proton το χρησιμοποιεί αντί για το droiddeck-esync και το droiddeck-fsync. Λειτουργεί με Proton Experimental ARM64, GE-Proton και proton-cachyos. Εφαρμόζεται στην επόμενη συνεδρία.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Ένα υποκατάστατο σε επίπεδο χρήστη για το πρόγραμμα οδήγησης ntsync του Linux. Όσο είναι ενεργό, το Proton το χρησιμοποιεί αντί για το droiddeck-esync και το droiddeck-fsync. Λειτουργεί με Proton Experimental ARM64, GE-Proton και proton-cachyos. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync πρώτα</string> <string name="perf_fsync_hint">Εκτελεί το δικό του fsync του Proton στα απλά αρχεία Proton, με το futex_waitv παρεχόμενο σε επίπεδο χρήστη, οπότε δεν χρειάζεται πακέτο και συνεχίζει να λειτουργεί τη στιγμή που το Steam ενημερώνει το Proton. Όσο είναι ενεργό, τα παιχνίδια το χρησιμοποιούν πριν από το droiddeck-esync, εκτός από τα λίγα που το Proton κρατά εκτός fsync. Εφαρμόζεται στην επόμενη συνεδρία.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">Ταχεία διαδρομή proot</string> <string name="perf_fastpath_needs_seccomp">Απαιτεί το φίλτρο seccomp του proot.</string> <string name="perf_fastpath_hint">Ταχύτερη αναζήτηση αρχείων και λιγότερα κολλήματα. Απενεργοποιήστε το αν ένα πρόγραμμα δεν μπορεί να βρει τα αρχεία του.</string> + <string name="perf_cursor_composite">Σχεδίαση του δείκτη μέσα στο gamescope</string> + <string name="perf_cursor_composite_hint">Το Gamescope σχεδιάζει μόνο του τον δείκτη αντί να τον παραδίδει στο Android. Ενεργοποιήστε το για δείκτη που ελέγχεται από χειριστήριο. Το ανενεργό είναι πιο γρήγορο σε τηλέφωνο. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="perf_identity">Ταυτότητα συνεδρίας</string> <string name="perf_hostname">Όνομα κεντρικού υπολογιστή</string> <string name="perf_hostname_hint">Το όνομα που βλέπει το Steam για αυτή τη συσκευή. Αν το αφήσετε κενό, επανέρχεται σε %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Τα αρχεία του αφαιρούνται από την εφαρμογή.</string> <string name="driver_delete_in_use">Τα αρχεία του αφαιρούνται. Είναι σε χρήση, οπότε το προεπιλεγμένο παίρνει τη θέση του.</string> <string name="drawer_page_display">Οθόνη</string> + <string name="drawer_frame_limit">Όριο καρέ</string> + <string name="drawer_frame_limit_note">Περιορίζει αυτό το παιχνίδι. Η οθόνη αλλάζει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο, αν υπάρχει· άλλα όρια μπορεί να φαίνονται ανομοιόμορφα. Τα παιχνίδια Steam χρησιμοποιούν το Frame Limit του Steam στο μενού Quick Access.</string> <string name="drawer_page_effects">Εφέ</string> <string name="drawer_page_controls">Χειριστήρια</string> <string name="drawer_page_components">Στοιχεία</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Κεχριμπαρί</string> <string name="drawer_hud_color_violet">Βιολετί</string> <string name="drawer_hud_opacity">Διαφάνεια</string> + <string name="hud_size">Μέγεθος</string> + <string name="hud_size_hint">Το πάτημα στο HUD αλλάζει επίσης το μέγεθός του.</string> + <string name="hud_size_full">Πλήρες</string> + <string name="hud_size_tiles">Πλακίδια</string> + <string name="hud_size_pill">Κάψουλα</string> + <string name="hud_size_minimal">Ελάχιστο</string> + <string name="hud_size_mega">Μέγα</string> + <string name="hud_size_strip">Λωρίδα</string> + <string name="hud_locked">Κλείδωμα θέσης</string> + <string name="hud_locked_hint">Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν.</string> + <string name="hud_snap">Προσκόλληση στα πλάγια</string> + <string name="hud_snap_hint">Αφήστε το HUD και μετακινείται στην πιο κοντινή πλευρά της οθόνης. Μια γρήγορη κίνηση το πετάει προς εκείνη την κατεύθυνση.</string> + <string name="hud_group_look">Εμφάνιση</string> + <string name="hud_scale">Μέγεθος στην οθόνη</string> + <string name="hud_color_soft">Απαλό</string> + <string name="hud_color_mid">Μεσαίο</string> + <string name="hud_color_vivid">Έντονο</string> + <string name="hud_outline">Περίγραμμα</string> + <string name="hud_outline_color">Χρώμα περιγράμματος</string> + <string name="hud_outline_gray">Γκρι</string> + <string name="hud_outline_theme">Χρώμα θέματος</string> + <string name="hud_group_metrics">Μετρήσεις</string> + <string name="hud_metric_graph">Γράφημα χρόνου καρέ</string> + <string name="hud_metric_decimal">Ρυθμός καρέ με δεκαδικό</string> + <string name="hud_metric_low001" formatted="false">0.01% χαμηλότερα</string> + <string name="hud_metric_engine">Μηχανή γραφικών</string> + <string name="hud_metric_gpu_model">Όνομα GPU</string> + <string name="hud_metric_gpu">Φόρτος GPU</string> + <string name="hud_metric_gpu_temp">Θερμοκρασία GPU</string> + <string name="hud_metric_cpu">Φόρτος CPU</string> + <string name="hud_metric_per_core">CPU ανά πυρήνα</string> + <string name="hud_metric_temp">Θερμοκρασίες</string> + <string name="hud_metric_ram">Μνήμη</string> + <string name="hud_metric_vram">Μνήμη γραφικών</string> + <string name="hud_metric_swap">Μνήμη swap</string> + <string name="hud_metric_battery">Στάθμη μπαταρίας</string> + <string name="hud_metric_power">Κατανάλωση ισχύος</string> + <string name="hud_metric_network">Δίκτυο</string> + <string name="hud_metric_resolution">Ανάλυση</string> + <string name="hud_metric_proton">Έκδοση Proton</string> + <string name="hud_metric_session">Χρόνος συνεδρίας</string> + <string name="hud_metric_clock">Ρολόι</string> + <string name="hud_group_temps">Θερμοκρασίες</string> + <string name="hud_temp_unit">Μονάδα</string> + <string name="hud_temp_bands">Χρώματα προειδοποίησης</string> + <string name="hud_temp_bands_hint">Οι θερμοκρασίες γίνονται κεχριμπαρί και μετά κόκκινες καθώς πλησιάζουν το όριο.</string> + <string name="hud_temp_bands_off">Ανενεργό</string> + <string name="hud_temp_bands_auto">Αυτόματο</string> + <string name="hud_temp_bands_manual">Μη αυτόματο</string> + <string name="hud_temp_red_cpu">CPU κόκκινο από</string> + <string name="hud_temp_red_gpu">GPU κόκκινο από</string> + <string name="hud_temp_red_battery">Μπαταρία κόκκινο από</string> + <string name="hud_group_more">Περισσότερα</string> + <string name="hud_export">Διαγνωστικά HUD</string> + <string name="hud_export_hint">Αποθηκεύει στο Downloads/DroidDeck μια αναφορά για κάθε αισθητήρα που διαβάζει το HUD.</string> + <string name="hud_export_button">Αποθήκευση</string> + <string name="hud_export_done">Αποθηκεύτηκε στο %1$s</string> + <string name="hud_export_failed">Δεν ήταν δυνατή η αποθήκευση της αναφοράς HUD.</string> + <string name="hud_reset">Επαναφορά ρυθμίσεων HUD</string> + <string name="hud_reset_button">Επαναφορά</string> <string name="drawer_scaling">Λειτουργία κλιμάκωσης</string> <string name="drawer_scaling_sharpness">Οξύτητα κλιμάκωσης</string> <string name="drawer_effects">Εφέ οθόνης</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Αυτόματο (%1$s)</string> <string name="drawer_keyboard">Πληκτρολόγιο</string> <string name="drawer_latency">Καθυστέρηση</string> + <string name="drawer_low_latency">Λειτουργία χαμηλής καθυστέρησης</string> + <string name="drawer_low_latency_hint">Αυξάνει τη χρήση CPU και μπαταρίας</string> <string name="drawer_low_latency_controller">Χειριστήριο χαμηλής καθυστέρησης</string> <string name="drawer_low_latency_controller_hint">Το χειριστήριο αναφέρει στα 1000 Hz αντί για 250 Hz. Λίγο περισσότερο CPU.</string> <string name="drawer_low_latency_touch">Αφή χαμηλής καθυστέρησης</string> <string name="drawer_low_latency_touch_hint">Οι αφές παρακάμπτουν την ομαδοποίηση καρέ, οπότε ο χειρισμός αφής του Steam τρέχει στα 1000 Hz. Λίγο περισσότερο CPU.</string> + <string name="drawer_evdev_mouse">Ακατέργαστο κανάλι ποντικιού</string> + <string name="drawer_direct_cursor">Δείκτης</string> <string name="drawer_pc_keyboard">Πληκτρολόγιο PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Δεύτερη οθόνη</string> @@ -715,6 +834,10 @@ <string name="setup_session">Συνεδρία</string> <string name="setup_logs">Αρχεία καταγραφής συνεδρίας</string> <string name="setup_logs_hint">Αποθηκεύονται μετά από κάθε συνεδρία</string> + <string name="setup_game_debug_logs">Αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών</string> + <string name="setup_game_debug_logs_hint">Συμπερίληψη διαγνωστικών Proton, Wine και γραφικών στην επόμενη εκκίνηση παιχνιδιού. Μπορεί να μειώσει την απόδοση και να χρησιμοποιήσει περισσότερο χώρο.</string> + <string name="setup_game_debug_logs_restart">Επανεκκινήστε αυτή τη συνεδρία για να αποθηκεύσετε αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών</string> + <string name="setup_logging_update_failed">Δεν ήταν δυνατή η ενημέρωση της καταγραφής. Ελέγξτε τον διακόπτη και δοκιμάστε ξανά.</string> <string name="setup_agent_commands">Εργαλεία εντοπισμού σφαλμάτων</string> <string name="setup_latest_logs">Πιο πρόσφατα αρχεία καταγραφής συνεδρίας</string> <string name="setup_saved_logs">Αποθηκευμένα αρχεία καταγραφής συνεδρίας</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">Το DroidDeck μπορεί να είναι η εφαρμογή αρχικής οθόνης</string> <string name="setup_home_off">Το DroidDeck δεν προτείνεται ποτέ ως εφαρμογή αρχικής οθόνης</string> <string name="setup_orientation">Προσανατολισμός</string> + <string name="setup_launcher_orientation">Προσανατολισμός launcher</string> + <string name="setup_launcher_orientation_auto">Ακολουθεί την περιστροφή της συσκευής</string> + <string name="setup_orientation_portrait">Κατακόρυφος</string> + <string name="setup_session_orientation">Προσανατολισμός συνεδρίας</string> + <string name="setup_session_orientation_hint">Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· το προσαρμοσμένο πλάτος και ύψος μένουν όπως καταχωρίστηκαν.</string> <string name="setup_orientation_auto">Αυτόματος οριζόντιος προσανατολισμός</string> <string name="setup_orientation_landscape">Οριζόντιος προσανατολισμός</string> <string name="setup_orientation_reverse">Αντίστροφος οριζόντιος προσανατολισμός</string> <string name="setup_fullscreen">Πλήρης οθόνη</string> <string name="setup_fullscreen_on">Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android</string> <string name="setup_fullscreen_off">Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android</string> + <string name="setup_dual_screen">Διπλή οθόνη</string> + <string name="setup_dual_screen_hint">Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη.</string> + <string name="setup_dual_screen_auto">Αυτόματο</string> + <string name="setup_dual_screen_on">Ενεργό</string> + <string name="setup_dual_screen_off">Ανενεργό</string> + <string name="setup_dual_screen_menu">Μενού κάτω οθόνης</string> + <string name="setup_dual_screen_menu_hint">Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα.</string> + <string name="setup_dual_screen_controls">Χειριστήρια κάτω οθόνης στα παιχνίδια</string> + <string name="setup_dual_screen_controls_hint">Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία.</string> + <string name="dual_typing_title">Πληκτρολόγηση για την πάνω οθόνη</string> + <string name="dual_typing_done">Τέλος</string> <string name="setup_default_home">Προεπιλεγμένη εφαρμογή αρχικής οθόνης</string> <string name="setup_choose_home">Επιλογή εφαρμογής αρχικής οθόνης</string> <string name="setup_choose">Επιλογή</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Ανοίξτε Ρυθμίσεις → Επιλογές προγραμματιστή → Ασύρματος εντοπισμός σφαλμάτων και ενεργοποιήστε τον</string> <string name="gate_step2">Πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης»</string> <string name="gate_step3">Πληκτρολογήστε τον κωδικό στην ειδοποίηση του DroidDeck</string> + <string name="pairguide_build_number">Στο Σχετικά με το τηλέφωνο, πατήστε 7 φορές τον Αριθμό έκδοσης</string> + <string name="pairguide_wireless">Ενεργοποιήστε τον Ασύρματο εντοπισμό σφαλμάτων</string> + <string name="pairguide_pair">Ανοίξτε τον Ασύρματο εντοπισμό σφαλμάτων και πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης»</string> + <string name="pairguide_child_process">Ενεργοποιήστε την επιλογή «Απενεργοποίηση περιορισμών θυγατρικών διεργασιών»</string> + <string name="pairguide_row_child_process">Απενεργοποίηση περιορισμών θυγατρικών διεργασιών</string> + <string name="pairguide_row_build_number">Αριθμός έκδοσης</string> + <string name="pairguide_row_wireless">Ασύρματος εντοπισμός σφαλμάτων</string> + <string name="pairguide_row_pair">Σύζευξη συσκευής με κωδικό σύζευξης</string> <string name="gate_waiting">Αναμονή για το αναδυόμενο παράθυρο σύζευξης…</string> <string name="gate_code_needed">Βρέθηκε αναδυόμενο παράθυρο. Εισαγάγετε τον κωδικό του στην ειδοποίηση.</string> <string name="gate_status">Κατάσταση</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Δεν έχει παιχτεί ποτέ</string> <string name="games_runtime_busy_percent">Το runtime είναι απασχολημένο · %1$d%%</string> <string name="games_runtime_busy">Το runtime είναι απασχολημένο</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Απόκρυψη προγραμμάτων οδήγησης για άλλες GPU</string> <string name="gpu_show_other">Εμφάνιση προγραμμάτων οδήγησης για άλλες GPU</string> <string name="gpu_advanced">Για προχωρημένους</string> + <string name="gpu_ubwc_title">Συμβατότητα UBWC</string> + <string name="gpu_ubwc_hint">Δοκιμάστε Ενεργό ή Ανενεργό αν το Steam ή το Android εμφανίζει γραμμές ή τρεμόπαιγμα. Ισχύει και για τα δύο προγράμματα οδήγησης μετά την επανεκκίνηση του DroidDeck.</string> + <string name="gpu_ubwc_restart">Κάντε επανεκκίνηση του DroidDeck για εφαρμογή.</string> <string name="gpu_set_with_display">Ορίζεται μαζί με το πρόγραμμα οδήγησης οθόνης: το %1$s φέρει και τα δύο.</string> <string name="gpu_set_with_runtime">Ορίζεται μαζί με το πρόγραμμα οδήγησης runtime: το %1$s φέρει και τα δύο.</string> <string name="gpu_runtime_hint">Χρησιμοποιείται από παιχνίδια και την επιφάνεια εργασίας.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Αυτόματη είσοδος σε λειτουργία εικόνας εντός εικόνας</string> <string name="unfolded_controls">Χειριστήρια στην ξεδιπλωμένη οθόνη</string> <string name="unfolded_controls_hint">Ξεδιπλωμένη, το παιχνίδι βρίσκεται πάνω από τις πινακίδες αφής και τις πίσω λαβές του Steam Deck. Διπλωμένη, το παιχνίδι καταλαμβάνει όλη την οθόνη.</string> + <string name="unfolded_controls_with_controller">Διατήρηση με χειριστήριο</string> + <string name="unfolded_controls_with_controller_hint">Εμφάνιση αυτών των χειριστηρίων αφής και όταν είναι συνδεδεμένο χειριστήριο.</string> <string name="pip_suspended">Σε αναστολή</string> <string name="pip_not_ready">Η λειτουργία εικόνας εντός εικόνας είναι διαθέσιμη μόλις η συνεδρία είναι έτοιμη.</string> <string name="pip_permission">Επιτρέψτε την εικόνα εντός εικόνας για το DroidDeck στις ρυθμίσεις Android.</string> <string name="pip_unavailable">Το Android δεν μπόρεσε να ανοίξει τη λειτουργία εικόνας εντός εικόνας.</string> + <string name="game_more">Περισσότερα</string> + <string name="game_edit_art">Επεξεργασία εικαστικών</string> + <string name="stores_in_steam_label">Στο Steam</string> <string name="game_shortcut">Συντόμευση</string> <string name="game_shortcut_add">Προσθήκη στην αρχική οθόνη</string> <string name="game_shortcut_choose">Επιλογή παιχνιδιού</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Περιμένετε να ολοκληρωθεί η λειτουργία του runtime</string> <string name="main_wait_proton_install">Περιμένετε να ολοκληρωθεί η εγκατάσταση του εργαλείου συμβατότητας</string> + <string name="load_compat_title">Προετοιμασία εργαλείων συμβατότητας</string> + <string name="load_compat_wait">Αναμονή για ολοκλήρωση της ρύθμισης συμβατότητας</string> + <string name="load_compat_hint">Η συνεδρία σας θα ξεκινήσει όταν ολοκληρωθεί η ρύθμιση.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Περιμένετε να ολοκληρωθεί η εγκατάσταση της εφαρμογής επιφάνειας εργασίας</string> <string name="main_wait_install_game">Περιμένετε να ολοκληρωθεί η εγκατάσταση πριν εκκινήσετε ένα παιχνίδι</string> <string name="main_saves_close_session">Κλείστε πρώτα τη συνεδρία Steam, ώστε το παιχνίδι να μην αποθηκεύσει πάνω από την εισαγωγή</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Εγκατάσταση παρόλα αυτά</string> <string name="main_remove_runtime_title">Κατάργηση του Linux runtime</string> <string name="main_remove_runtime_text">Αυτό διαγράφει το runtime, τον πελάτη Steam μέσα σε αυτό και κάθε παιχνίδι που είναι εγκατεστημένο εκεί.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Η Επιδιόρθωση επανεγκαθιστά τα αρχεία συστήματος του runtime και διατηρεί το Steam, τα παιχνίδια και τις ρυθμίσεις σας. Πρόσθετα όπως η επιφάνεια εργασίας εγκαθίστανται ξανά όταν τα χρησιμοποιήσετε. Η Αφαίρεση διαγράφει τα πάντα.</string> + <string name="runtime_repair">Επιδιόρθωση runtime</string> <string name="main_applied">Εφαρμόστηκε: %1$s</string> <string name="android_app_open_failed_primary">Δεν ήταν δυνατό το άνοιγμα του %1$s στην κύρια οθόνη</string> <string name="android_app_open_failed_on">Δεν ήταν δυνατό το άνοιγμα του %1$s στο %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Δεν ήταν δυνατή η πρόσβαση στον κατάλογο runtime. Ελέγξτε τη σύνδεση και πατήστε ξανά Αναπαραγωγή.</string> <string name="session_runtime_install_failed">Το Linux runtime δεν εγκαταστάθηκε. Ελέγξτε το runtime στη Ρύθμιση και πατήστε ξανά Αναπαραγωγή.</string> <string name="session_desktop_install_failed">Η επιφάνεια εργασίας δεν εγκαταστάθηκε (%1$s). Ελέγξτε τη σύνδεση και πατήστε ξανά Επιφάνεια εργασίας.</string> + <string name="session_package_resume_failed">Δεν ήταν δυνατή η ολοκλήρωση μιας εγκατάστασης που διακόπηκε (%1$s). Ελέγξτε τη σύνδεση και τον χώρο και δοκιμάστε ξανά.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Το runtime Linux είναι κατεστραμμένο: %1$d σύνδεσμος βιβλιοθήκης δείχνει σε αρχείο που λείπει (%2$s), συνήθως μετά από διακοπή εγκατάστασης. Η Επιδιόρθωση διατηρεί τα παιχνίδια και τις ρυθμίσεις σας.</item> + <item quantity="other">Το runtime Linux είναι κατεστραμμένο: %1$d σύνδεσμοι βιβλιοθηκών δείχνουν σε αρχεία που λείπουν (%2$s και άλλα), συνήθως μετά από διακοπή εγκατάστασης. Η Επιδιόρθωση διατηρεί τα παιχνίδια και τις ρυθμίσεις σας.</item> + </plurals> <string name="session_ended_named">%1$s διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> <string name="session_ended_program">Το πρόγραμμα διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> <string name="session_ended_desktop">Η επιφάνεια εργασίας διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Εγκαταστήστε ένα ZIP προσθέτου για την επόμενη συνεδρία Steam.</string> <string name="mode_decky_plugin_downloading">Γίνεται λήψη…</string> <string name="mode_decky_plugin_install_zip">Εγκατάσταση από ZIP</string> + <string name="decky_zip_warning_title">Εγκατάσταση plugin τρίτων</string> + <string name="decky_zip_warning_text">Η ομάδα του Decky Loader δεν έχει ελέγξει αυτό το plugin. Μπορεί να περιέχει κακόβουλο λογισμικό, όπως λογισμικό για υποκλοπή του λογαριασμού σας Steam ή βλάβη της συσκευής σας. Με την εγκατάσταση αυτού του plugin, αποδέχεστε ότι αναλαμβάνετε όλους τους κινδύνους για τη συσκευή σας.</string> + <string name="decky_zip_warning_continue">Συνέχεια</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Περιμένετε %1$d δευτερόλεπτο</item> + <item quantity="other">Περιμένετε %1$d δευτερόλεπτα</item> + </plurals> <string name="store_cat_games">Παιχνίδια</string> <string name="store_cat_audio_video">Ήχος & βίντεο</string> <string name="store_cat_graphics">Γραφικά</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Μαύρο φόντο, λευκά γράμματα, το μπλε για ό,τι είναι επιλεγμένο, εστιασμένο ή πατημένο.</string> <string name="theme_electric">Ηλεκτρικό ναυτικό μπλε</string> <string name="theme_electric_detail">Το μπλε πιο έντονο, σε επιφάνειες που τείνουν προς το ναυτικό μπλε αντί για γκρι.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Χρώματα που διατρέχουν το ουράνιο τόξο. Ακολουθεί τις ρυθμίσεις animation του Android.</string> + <string name="theme_rgb_speed">Ταχύτητα</string> + <string name="theme_rgb_speed_hint">Πόσο γρήγορα αλλάζουν τα χρώματα.</string> <string name="theme_gradient">Διαβάθμιση</string> <string name="theme_gradient_detail">Δικά σας πρωτεύον και δευτερεύον χρώμα, σε μίξη στα κουμπιά και τις επισημάνσεις.</string> <string name="theme_gradient_primary">Πρωτεύον</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Παράλειψη</string> <string name="fm_select_this_folder">Επιλογή αυτού του φακέλου</string> <string name="fm_back">Πίσω</string> + <string name="fm_exit">Έξοδος</string> + <string name="fm_return_to_start">Επιστροφή στον αρχικό φάκελο</string> + <string name="fm_start_unavailable">Ο αρχικός φάκελος δεν είναι πλέον διαθέσιμος</string> + <string name="fm_cancel_operation_title">Ακύρωση ενέργειας;</string> + <string name="fm_cancel_operation_confirmation">Η ενέργεια θα ακυρωθεί. Είστε σίγουροι;</string> + <string name="fm_accept">Αποδοχή</string> + <string name="fm_decline">Απόρριψη</string> <string name="fm_drive_not_readable">Το %1$s είναι προσαρτημένο αλλά δεν είναι αναγνώσιμο αυτή τη στιγμή</string> + <string name="fm_drive_access_title">Να επιτραπεί η πρόσβαση στο %1$s</string> + <string name="fm_drive_access_text">Το Android επιτρέπει στο DroidDeck να βλέπει αυτόν τον δίσκο αλλά όχι να τον διαβάζει. Ενεργοποιήστε την Πρόσβαση σε όλα τα αρχεία για το DroidDeck και επιστρέψτε.</string> <string name="fm_list_view">Προβολή λίστας</string> <string name="fm_grid_view">Προβολή πλέγματος</string> <string name="fm_search">Αναζήτηση</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Πληκτρολόγιο + πινακίδα αφής</string> <string name="second_mode_terminal">Τερματικό</string> <string name="second_mode_deck_controls">Λαβές Deck + πινακίδες αφής</string> + <string name="second_mode_dashboard">Πίνακας ελέγχου</string> + <string name="bottom_dashboard_empty">Δεν υπάρχει τίποτα για εμφάνιση ακόμα.</string> + <string name="bottom_page_downloads">Λήψεις</string> + <string name="bottom_downloads_none">Δεν εκτελούνται λήψεις.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Λήψη cache shader</string> + <string name="bottom_downloads_paused">Σε παύση</string> + <string name="bottom_downloads_queued">Αναμονή για έναρξη</string> + <string name="bottom_page_notifications">Ειδοποιήσεις</string> + <string name="bottom_notifications_listener">DroidDeck – κάτω οθόνη</string> + <string name="bottom_notifications_why">Εμφάνιση μηνυμάτων και άλλων ειδοποιήσεων εδώ ενώ παίζετε. Παραμένουν μόνο σε αυτή την οθόνη και δεν αποθηκεύονται. Το Android ρωτά μία φορά: η σελίδα πρόσβασης ειδοποιήσεων ανοίγει σε αυτή την οθόνη· ενεργοποιήστε εκεί το DroidDeck και αυτή η σελίδα επιστρέφει μόνη της.</string> + <string name="bottom_notifications_allow">Αποδοχή πρόσβασης ειδοποιήσεων</string> + <string name="bottom_notifications_none">Δεν υπάρχουν ειδοποιήσεις.</string> + <string name="bottom_notifications_count">%1$d ειδοποιήσεις</string> + <string name="bottom_notifications_clear">Απαλοιφή</string> + <string name="bottom_page_screenshots">Στιγμιότυπα οθόνης</string> + <string name="stats_fps_needs_hud">Τα FPS απαιτούν ενεργό HUD</string> + <string name="stats_speed">Ταχύτητα</string> + <string name="stats_pedals">Πεντάλ</string> + <string name="stats_gforce">Δύναμη G</string> + <string name="stats_timing">Χρονομέτρηση</string> + <string name="stats_best_lap">Καλύτερος γύρος</string> + <string name="stats_tires">Ελαστικά °C</string> + <string name="stats_trace">Γκάζι και φρένο, τελευταία 10 s</string> + <string name="stats_speed_chart">Ταχύτητα, %1$s</string> + <string name="stats_gear">Σχέση</string> + <string name="stats_speed_units">Μονάδες ταχύτητας</string> + <string name="stats_speed_units_auto">Αυτόματα (%1$s)</string> + <string name="stats_steam_client_arm">Πελάτης Steam ARM</string> + <string name="stats_steam_client_x86">Πελάτης Steam x86</string> + <string name="stats_throttle">Γκάζι</string> + <string name="stats_brake">Φρένο</string> + <string name="stats_lights">Ενδεικτικές λυχνίες</string> + <string name="stats_lamp_shift">Αλλαγή</string> + <string name="stats_lamp_handbrake">Χειρόφρενο</string> + <string name="stats_lamp_pit">Περιοριστής pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Κινητήρας %1$s °C</string> + <string name="stats_oil_temp">Λάδι %1$s °C</string> + <string name="stats_power">Διανομέας ισχύος</string> + <string name="stats_fuel_t">Καύσιμο, t</string> + <string name="stats_fuel_main">Κύριο %1$s t</string> + <string name="stats_fuel_reserve">Εφεδρικό %1$s t</string> + <string name="stats_tap_hint">Πατήστε τη λωρίδα στο πάνω μέρος ή τον πίνακα οργάνων για να αλλάξετε το στυλ του.</string> + <string name="bottom_telemetry_send_title">Αποστολή δεδομένων πίνακα</string> + <string name="bottom_telemetry_send_auto">Αυτόματα</string> + <string name="bottom_telemetry_send_auto_hint">Το ενεργοποιεί για κάθε παιχνίδι της λίστας, μαζί και όσα βρεθούν αργότερα. Τα παιχνίδια που απενεργοποιείτε παραμένουν ανενεργά.</string> + <string name="bottom_telemetry_send_note">Αυτό αλλάζει τη ρύθμιση εξόδου δεδομένων του ίδιου του παιχνιδιού. Εφαρμόζεται την επόμενη φορά που ξεκινά το παιχνίδι· η απενεργοποίηση επαναφέρει την προηγούμενη ρύθμιση.</string> + <string name="bottom_telemetry_send_close">Κλείστε το %1$s για να το αλλάξετε.</string> + <string name="bottom_telemetry_send_failed">Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων του %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ενεργοποιήστε το %2$s στις ρυθμίσεις του παιχνιδιού με IP 127.0.0.1 και θύρα %3$d.</string> + <string name="bottom_shots_where">Αποθηκεύονται στο Pictures/DroidDeck. Εδώ εμφανίζονται και τα στιγμιότυπα του Steam.</string> + <string name="bottom_shots_take">Λήψη στιγμιότυπου</string> + <string name="bottom_shots_saved">Το στιγμιότυπο αποθηκεύτηκε.</string> + <string name="bottom_shots_failed">Δεν ήταν δυνατή η λήψη στιγμιότυπου.</string> + <string name="bottom_shots_none">Δεν υπάρχουν στιγμιότυπα ακόμα.</string> + <string name="bottom_page_chat">Συνομιλία & φωνή</string> + <string name="bottom_chat_why">Διαβάστε και απαντήστε στη συνομιλία του Steam εδώ ενώ το παιχνίδι συνεχίζει στην κύρια οθόνη. Χρησιμοποιεί τον λογαριασμό με τον οποίο είναι συνδεδεμένο το Steam.</string> + <string name="bottom_chat_not_signed_in">Το Steam δεν έχει ακόμα σύνδεση web για κοινή χρήση, οπότε συνδεθείτε εδώ μία φορά.</string> + <string name="bottom_chat_stopped">Το Android έκλεισε τη σελίδα συνομιλίας ενώ το DroidDeck ήταν στο παρασκήνιο. Ανοίγει ξανά όταν επιστρέψετε στο DroidDeck.</string> + <string name="bottom_chat_open">Άνοιγμα Steam Chat</string> + <string name="bottom_chat_close">Κλείσιμο συνομιλίας</string> + <string name="bottom_chat_mic_on">Μικρόφωνο ανοιχτό</string> + <string name="bottom_chat_mic_off">Μικρόφωνο κλειστό</string> + <string name="bottom_chat_mic_unavailable">Το μικρόφωνο είναι απενεργοποιημένο για αυτό το παιχνίδι. Για να μιλήσετε, ενεργοποιήστε το Μικρόφωνο στις ρυθμίσεις Steam του DroidDeck (Ήχος) και ξεκινήστε ξανά το παιχνίδι.</string> + <string name="bottom_chat_volume">Ένταση %1$d%%</string> + <string name="bottom_page_telemetry">Στατιστικά παιχνιδιού</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Μπαταρία</string> + <string name="bottom_telemetry_lap">Γύρος</string> + <string name="bottom_telemetry_position">Θέση</string> + <string name="bottom_telemetry_this_lap">Τρέχων γύρος</string> + <string name="bottom_telemetry_last_lap">Προηγούμενος γύρος</string> + <string name="bottom_telemetry_fuel">Καύσιμο</string> + <string name="bottom_telemetry_cargo">Φορτίο</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Νομική κατάσταση</string> + <string name="bottom_telemetry_balance">Υπόλοιπο</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Ενεργοποιήστε την έξοδο δεδομένων ενός αγωνιστικού παιχνιδιού (συχνά λέγεται τηλεμετρία ή UDP) για να δείτε εδώ ζωντανό πίνακα οργάνων. Τα δεδομένα μένουν σε αυτή τη συσκευή.</string> + <string name="bottom_telemetry_unknown_format">Η θύρα %1$d λαμβάνει δεδομένα (%2$d πακέτα των %3$d byte), αλλά σε μορφή που αυτή η σελίδα δεν μπορεί ακόμα να διαβάσει.</string> + <string name="bottom_telemetry_port_busy">Ένα άλλο πρόγραμμα χρησιμοποιεί ήδη τη θύρα %1$s, οπότε αυτό το παιχνίδι δεν μπορεί να εμφανιστεί εδώ.</string> <string name="rtinst_removing">Κατάργηση του Linux runtime</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Ρυθμίστε πρώτα το Flatpak</string> <string name="flatpakmgr_starting">Γίνεται εκκίνηση</string> <string name="flatpakmgr_exit_status">Το Flatpak έκλεισε με κατάσταση %1$d</string> + <string name="flatpakmgr_wrong_arch">Το %1$s είναι φτιαγμένο για %2$s, που το DroidDeck δεν μπορεί να εκτελέσει. Οι εφαρμογές Flatpak εδώ χρειάζονται έκδοση για ARM64 ή x86_64.</string> <string name="flatpakmgr_installing">Εγκατάσταση %1$s</string> <string name="flatpakmgr_updating">Ενημέρωση %1$s</string> <string name="flatpakmgr_removing">Κατάργηση %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Εφαρμογή της ρύθμισης…</string> <string name="adbpair_command_failed">Η εντολή ασύρματου εντοπισμού σφαλμάτων απέτυχε</string> <string name="adbpair_channel_name">Ρύθμιση ασύρματου εντοπισμού σφαλμάτων</string> + <string name="adbpair_progress_channel_name">Πρόοδος ρύθμισης ασύρματου εντοπισμού σφαλμάτων</string> <string name="adbpair_channel_description">Ζητά τον κωδικό σύζευξης ασύρματου εντοπισμού σφαλμάτων όσο οι Ρυθμίσεις είναι ανοιχτές</string> <string name="adbpair_title_pair">Σύζευξη ασύρματου εντοπισμού σφαλμάτων</string> <string name="adbpair_waiting_text">Ενεργοποιήστε τον ασύρματο εντοπισμό σφαλμάτων και πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης».</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Δεν είναι GPU Adreno</string> <string name="gpuinfo_supported">Υποστηρίζεται</string> <string name="gpuinfo_experimental">Πειραματικό: τα προγράμματα οδήγησής του είναι δοκιμαστικές εκδόσεις</string> + <string name="gpuinfo_a850_experimental">Πειραματική υποστήριξη Adreno 850: απαιτεί συμβατά πειραματικά προγράμματα οδήγησης οθόνης και παιχνιδιών· δεν έχει επαληθευτεί σε αυτή τη συσκευή</string> <string name="gpuinfo_below_tested">Κάτω από το δοκιμασμένο υλικό (Adreno 725 και νεότερα): ίσως να μην εκτελεστεί</string> <string name="gpuinfo_unsupported">Δεν υποστηρίζεται: το DroidDeck χρειάζεται GPU Adreno (Snapdragon)</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Κλιμάκωση %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Εμφάνιση στοιχείων συσκευής</string> <string name="device_info_hide">Απόκρυψη στοιχείων συσκευής</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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">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> <string name="stores_sort">Ταξινόμηση</string> + <string name="setup_rail_labels">Ετικέτες πλαϊνής γραμμής</string> + <string name="setup_rail_labels_hint">Εμφάνιση ονομάτων κάτω από τα εικονίδια της πλαϊνής γραμμής. Απενεργοποιήστε για πιο λεπτή πλαϊνή γραμμή.</string> + <string name="library_display">Προβολή</string> + <string name="library_display_larger">Μεγαλύτερες κάρτες</string> + <string name="library_display_smaller">Μικρότερες κάρτες</string> + <string name="library_display_title">Εμφάνιση τίτλου</string> + <string name="library_display_size">Εμφάνιση μεγέθους</string> <string name="stores_sort_last_played">Παίχτηκαν πρόσφατα</string> <string name="stores_sort_recently_installed">Εγκαταστήθηκαν πρόσφατα</string> <string name="stores_sort_title_asc">Τίτλος Α–Ω</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Διαχείριση λήψεων</string> <string name="stores_parallel">Ταυτόχρονες λήψεις</string> <string name="stores_install_where">Εγκατάσταση σε</string> + <string name="stores_install_language">Γλώσσα παιχνιδιού</string> + <string name="stores_install_language_hint">Τα GOG και Epic εγκαθιστούν αυτή τη γλώσσα. Το Σύστημα ακολουθεί τη γλώσσα της εφαρμογής.</string> + <string name="stores_install_language_system">Σύστημα</string> <string name="stores_install_title">Εγκατάσταση %1$s:</string> <string name="stores_target_internal">Εσωτερική</string> <string name="stores_target_free">%1$s ελεύθερα</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Προορισμός</string> <string name="edit_start_in">Εκκίνηση σε</string> <string name="edit_launch_options">Επιλογές εκκίνησης</string> + <string name="edit_launch_options_steam_hint">Κοινές με τις Ιδιότητες του Steam: μια αλλαγή στο ένα σημείο εμφανίζεται και στα δύο.</string> + <string name="edit_launch_options_not_saved">Δεν ήταν δυνατή η αποθήκευση των επιλογών εκκίνησης στο Steam. Δοκιμάστε ξανά.</string> + <string name="edit_launch_options_desktop">Το Steam μπορεί να είναι ανοιχτό στη συνεδρία επιφάνειας εργασίας. Αλλάξτε τις επιλογές εκκίνησης από τις Ιδιότητές του ή κλείστε πρώτα τη συνεδρία.</string> <string name="edit_artwork">Γραφικά</string> <string name="edit_other_exe">Άλλο exe…</string> <string name="edit_remove">Κατάργηση</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Δικό σου prefix</string> <string name="setup_download_mirror">Ιστότοπος</string> <string name="setup_download_prefix">Πρόθεμα</string> + <string name="setup_download_proxy">Διακομιστής μεσολάβησης HTTP</string> <string name="flathub_eyebrow">ΕΦΑΡΜΟΓΕΣ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Εφαρμογές επιφάνειας εργασίας για την επιφάνεια εργασίας Linux, ανοίγουν από την Επιφάνεια εργασίας.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Το «Αυτόματο» κρατά αυτό το παιχνίδι 2D σταθερό στο οπτικό πεδίο. Επιλέξτε «Εικονική οθόνη» στην ενότητα «Οθόνη» για να χρησιμοποιήσετε παρακολούθηση κεφαλιού.</string> <string name="glasses_tracking_sbs_hint">Η παρακολούθηση κεφαλιού ισχύει για εικονική οθόνη ή για παιχνίδι SteamVR που εκτελείται.</string> <string name="glasses_hardware">Συσκευή</string> + <string name="vr_controllers_tab">Χειριστήρια</string> + <string name="vr_controllers_group">Χειριστήρια SteamVR</string> + <string name="vr_controllers_emulate">Χειριστήριο στο VR</string> + <string name="vr_controllers_emulate_hint">Τα δύο χέρια VR που παίζει το χειριστήριό σας. Οι αλλαγές εφαρμόζονται αμέσως, και όσο τρέχει το SteamVR. Τα Joy-Con και τα χέρια με παρακολούθηση εξακολουθούν να αναλαμβάνουν τη δική τους πλευρά.</string> + <string name="vr_controllers_off">Κανονικό χειριστήριο</string> + <string name="vr_controllers_index">Χειριστήρια Valve Index</string> + <string name="vr_controllers_touch">Χειριστήρια Meta Quest 3</string> + <string name="vr_controllers_vive">Χειριστήρια HTC Vive</string> + <string name="vr_controllers_sticks">Τα αναλογικά ξεκινούν</string> + <string name="vr_controllers_sticks_hint">Πατήστε μαζί και τα δύο αναλογικά κατά το VR για εναλλαγή.</string> + <string name="vr_controllers_sticks_game">Μετακινώντας εσάς στο παιχνίδι</string> + <string name="vr_controllers_sticks_hands">Μετακινώντας τα χέρια</string> + <string name="vr_controllers_buttons">Κουμπιά</string> + <string name="vr_controllers_buttons_stick">Οι σκανδάλες είναι σκανδάλες, οι προφυλακτήρες πιάνουν, τα A/B και X/Y είναι τα πρόσθια κουμπιά κάθε χεριού, το πάτημα των αναλογικών πατά τα thumbsticks, το Guide ανοίγει το μενού SteamVR. Το D-pad πάνω και κάτω φέρνει τα χέρια πιο κοντά ή πιο μακριά.</string> + <string name="vr_controllers_buttons_vive">Τα αναλογικά είναι trackpads· το A/X ή το πάτημα του αναλογικού τα πατά. Οι σκανδάλες είναι σκανδάλες, οι προφυλακτήρες πιάνουν, τα Start και Select είναι μενού, το Guide ανοίγει το μενού SteamVR.</string> + <string name="vr_controllers_buttons_off">Χωρίς χέρια VR. Τα παιχνίδια που υποστηρίζουν χειριστήριο, καθώς και το μενού SteamVR, λαμβάνουν το χειριστήριό σας ως συνήθως.</string> <string name="glasses_brightness">Φωτεινότητα</string> <string name="glasses_volume">Ένταση ήχου</string> <string name="glasses_sunblock">Σκίαση</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Τοποθέτηση κάμερας</string> <string name="hand_camera_placement_hint">Βεβαιωθείτε ότι η κάμερα σάς βλέπει πριν παίξετε.</string> <string name="hand_camera_check">Έλεγχος</string> + <string name="tracking_pack_title">Λήψη παρακολούθησης χεριών</string> + <string name="tracking_pack_hint">Η παρακολούθηση χεριών χρειάζεται εφάπαξ λήψη %1$s.</string> + <string name="tracking_pack_download">Λήψη</string> + <string name="tracking_pack_retry">Επανάληψη</string> + <string name="tracking_pack_downloading">Λήψη παρακολούθησης χεριών… %1$d%%</string> + <string name="tracking_pack_failed">Δεν ήταν δυνατή η λήψη της παρακολούθησης χεριών. Ελέγξτε τη σύνδεσή σας και δοκιμάστε ξανά.</string> <string name="hand_camera_check_title">Τοποθέτηση κάμερας</string> <string name="hand_camera_how_rear">Στήστε τη συσκευή όρθια σε απόσταση 1,5 έως 2 μέτρων, περίπου στο ύψος του στήθους, με την πίσω κάμερα στραμμένη προς εσάς. Έπειτα μπείτε στο οπτικό πεδίο με τα χέρια τεντωμένα.</string> <string name="hand_camera_how_front">Στήστε τη συσκευή όρθια σε απόσταση 1,5 έως 2 μέτρων, περίπου στο ύψος του στήθους, με την οθόνη στραμμένη προς εσάς. Έπειτα μπείτε στο οπτικό πεδίο με τα χέρια τεντωμένα.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Αχρησιμοποίητα περιβάλλοντα, υπολείμματα, παλιά αρχεία καταγραφής</string> <string name="storage_clean_up">Καθαρισμός…</string> <string name="storage_session_running">Σταμάτησε τη συνεδρία για να καθαρίσεις ή να διαγράψεις κάτι. Τα μεγέθη παραμένουν ορατά.</string> + <string name="storage_default_group">Τοποθεσία εγκατάστασης</string> + <string name="storage_default_title">Προεπιλεγμένος αποθηκευτικός χώρος</string> + <string name="storage_default_hint">Οι νέες εγκαταστάσεις από καταστήματα πηγαίνουν στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια μένουν όπου είναι. Οι βιβλιοθήκες Steam διατηρούν τη δική τους ρύθμιση.</string> + <string name="storage_default_ask">Ερώτηση κάθε φορά</string> + <string name="storage_default_ask_detail">Επιλογή προορισμού για κάθε εγκατάσταση</string> + <string name="storage_default_internal">Εσωτερικός αποθηκευτικός χώρος</string> + <string name="storage_default_external">Εξωτερικός αποθηκευτικός χώρος</string> + <string name="storage_default_external_detail">%1$s · %2$s ελεύθερα</string> + <string name="storage_default_external_missing">Δεν είναι συνδεδεμένο</string> + <string name="storage_default_folder">Φάκελος · %1$s</string> + <string name="storage_default_folder_free">%1$s ελεύθερα</string> + <string name="storage_default_folder_missing">Δεν είναι συνδεδεμένο</string> + <string name="storage_default_choose_folder">Επιλογή φακέλου…</string> + <string name="storage_default_choose_folder_detail">Χρησιμοποιήστε οποιονδήποτε φάκελο σε κάρτα SD ή μονάδα USB</string> + <string name="storage_default_note">Τα παιχνίδια μπαίνουν σε φάκελο Games μέσα στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια δεν μετακινούνται.</string> <string name="storage_where">Πού πηγαίνει</string> <string name="storage_games">Παιχνίδια Steam</string> <string name="storage_game_data">Δεδομένα παιχνιδιών</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Εγκατεστημένα παιχνίδια</string> <string name="storage_data_parts">Πρόθεμα %1$s · σκιαστές %2$s · εργαστήριο %3$s</string> <string name="storage_clear_shaders">Εκκαθάριση shaders</string> + <string name="storage_reset_prefix">Επαναφορά prefix</string> + <string name="storage_reset_prefix_title">Επαναφορά prefix για %1$s;</string> + <string name="storage_reset_prefix_confirm">Διαγράφει το prefix Wine του (%1$s) στο %2$s και το δημιουργεί ξανά στην επόμενη εκκίνηση. Οι αποθηκεύσεις, οι ρυθμίσεις και τα εγκατεστημένα redistributables μέσα του χάνονται· οι αποθηκεύσεις Steam Cloud παραμένουν στον λογαριασμό σας.</string> <string name="storage_data_leftovers">Διαγραμμένα παιχνίδια</string> <string name="storage_steam_app">Εφαρμογή Steam %1$d</string> <string name="storage_leftover_unsure_detail">Το prefix περιέχει ακόμη αρχεία, ίσως τοπικές αποθηκεύσεις</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Συγχρονισμός με Syncthing</string> + <string name="sync_enable_hint">Βασίζεται στο Syncthing-Fork: μια υλοποίηση του Syncthing που σας επιτρέπει να συγχρονίζετε αρχεία του εσωτερικού συστήματος αρχείων του DroidDeck με άλλες εγκαταστάσεις Syncthing. Αφορά μόνο αρχεία που αποθηκεύετε στο εσωτερικό σύστημα αρχείων του DroidDeck.</string> + <string name="sync_missing">Αυτή η έκδοση δεν περιλαμβάνει το Syncthing.</string> + <string name="sync_starting">Εκκίνηση του Syncthing</string> + <string name="sync_status_starting">Εκκίνηση</string> + <string name="sync_status_up_to_date">Ενημερωμένο</string> + <string name="sync_status_syncing">Συγχρονισμός</string> + <string name="sync_status_paused">Σε παύση</string> + <string name="sync_status_pausing">Γίνεται παύση</string> + <string name="sync_status_resuming">Γίνεται συνέχιση</string> + <string name="sync_status_attention">Χρειάζεται προσοχή</string> + <string name="sync_status_failed">Το Syncthing σταμάτησε</string> + <string name="sync_failed_retry">Δοκιμάστε ξανά</string> + <string name="sync_paused_wifi">Σε παύση έως ότου υπάρξει Wi-Fi</string> + <string name="sync_paused_game">Σε παύση κατά τη διάρκεια του παιχνιδιού</string> + <string name="sync_summary">%1$d φάκελοι · %2$d από %3$d συσκευές συνδεδεμένες</string> + <string name="sync_left">Απομένουν %1$s</string> + <string name="sync_open_web_ui">Άνοιγμα διεπαφής web</string> + <string name="sync_pause">Παύση</string> + <string name="sync_resume">Συνέχιση</string> + <string name="sync_running">Σε λειτουργία</string> + <string name="sync_running_hint">Απενεργοποιήστε το για να σταματήσει εντελώς το Syncthing.</string> + <string name="sync_this_device">Αυτή η συσκευή</string> + <string name="sync_device_id">Ταυτότητα συσκευής</string> + <string name="sync_show_qr">Εμφάνιση QR</string> + <string name="sync_advanced">Για προχωρημένους</string> + <string name="sync_advanced_hint">Θύρες, πότε εκτελείται, επαναφορά</string> + <string name="sync_open">Άνοιγμα</string> + <string name="sync_waiting">Σας περιμένει</string> + <string name="sync_pending_device">Η συσκευή %1$s θέλει να συνδεθεί</string> + <string name="sync_pending_folder">Η συσκευή %1$s θέλει να μοιραστεί τον φάκελο «%2$s»</string> + <string name="sync_pending_folder_hint">Αποδεχτείτε για να επιλέξετε πού θα αποθηκευτεί στο DroidDeck.</string> + <string name="sync_review">Έλεγχος στη διεπαφή web</string> + <string name="sync_folders">Φάκελοι</string> + <string name="sync_no_folders">Δεν υπάρχουν ακόμα φάκελοι.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Ενημερωμένος</string> + <string name="sync_folder_syncing">Συγχρονισμός %1$d%%</string> + <string name="sync_folder_scanning">Σάρωση</string> + <string name="sync_folder_paused">Σε παύση</string> + <string name="sync_folder_out_of_sync">Μη συγχρονισμένος</string> + <string name="sync_folder_errors">Δεν ήταν δυνατός ο συγχρονισμός %1$d αρχείων</string> + <string name="sync_folder_blocked">Αποκλεισμένος</string> + <string name="sync_folder_blocked_hint">Αυτός ο φάκελος βρίσκεται εκτός του αποθηκευτικού χώρου του DroidDeck, γι\' αυτό το DroidDeck τον έθεσε σε παύση. Για να συγχρονίσετε φακέλους εκτός DroidDeck, χρησιμοποιήστε την εφαρμογή Syncthing-Fork.</string> + <string name="sync_remove_folder">Αφαίρεση από το Syncthing</string> + <string name="sync_remove_folder_hint">Η αφαίρεση δεν διαγράφει κανένα αρχείο.</string> + <string name="sync_devices">Συσκευές</string> + <string name="sync_no_devices">Δεν υπάρχουν ακόμα συσκευές.</string> + <string name="sync_connected">Συνδεδεμένη</string> + <string name="sync_offline">Εκτός σύνδεσης</string> + <string name="sync_last_seen">Τελευταία εμφάνιση %1$s</string> + <string name="sync_device_id_title">Ταυτότητα αυτής της συσκευής</string> + <string name="sync_device_id_hint">Στην άλλη σας συσκευή, προσθέστε μια συσκευή στο Syncthing και σαρώστε αυτόν τον κωδικό ή επικολλήστε την ταυτότητα. Στη συνέχεια, αποδεχτείτε την εδώ στη διεπαφή web.</string> + <string name="sync_copy">Αντιγραφή</string> + <string name="sync_share">Κοινή χρήση</string> + <string name="sync_done">Έγινε</string> + <string name="sync_off_title">Απενεργοποίηση του Syncthing;</string> + <string name="sync_off_body">Το Syncthing σταματά τώρα και παραμένει σταματημένο μέχρι να το ενεργοποιήσετε ξανά. Τα συγχρονισμένα αρχεία παραμένουν εκεί που βρίσκονται.</string> + <string name="sync_off_forget">Διαγραφή και των ρυθμίσεων του Syncthing</string> + <string name="sync_off_forget_hint">Αφαιρεί την ταυτότητα αυτής της συσκευής, τους φακέλους και τις συσκευές. Με την επανενεργοποίηση ξεκινά από την αρχή.</string> + <string name="sync_turn_off">Απενεργοποίηση</string> + <string name="sync_ports">Θύρες</string> + <string name="sync_port_sync">Συγχρονισμός</string> + <string name="sync_port_discovery">Τοπική ανακάλυψη</string> + <string name="sync_repick">Επιλογή νέων θυρών</string> + <string name="sync_repick_hint">Ελέγχεται ξανά σε κάθε εκκίνηση.</string> + <string name="sync_repick_button">Νέα επιλογή</string> + <string name="sync_reset_group">Επαναφορά</string> + <string name="sync_api_key">Κλειδί API</string> + <string name="sync_regenerate">Αναδημιουργία</string> + <string name="sync_reset">Επαναφορά του Syncthing</string> + <string name="sync_reset_hint">Νέα ταυτότητα συσκευής, αφαίρεση φακέλων και συσκευών. Τα αρχεία στον αποθηκευτικό χώρο του DroidDeck διατηρούνται.</string> + <string name="sync_reset_button">Επαναφορά</string> + <string name="sync_reset_confirm_title">Επαναφορά του Syncthing;</string> + <string name="sync_running_group">Λειτουργία</string> + <string name="sync_run">Εκτέλεση</string> + <string name="sync_run_open">Όσο το DroidDeck είναι ανοιχτό</string> + <string name="sync_run_background">Στο παρασκήνιο</string> + <string name="sync_wifi_only">Μόνο μέσω Wi-Fi</string> + <string name="sync_pause_games">Παύση κατά τη διάρκεια παιχνιδιών</string> + <string name="sync_logs">Αρχεία καταγραφής</string> + <string name="sync_logs_hint">Έξοδος του Syncthing για αυτή τη συνεδρία</string> + <string name="sync_logs_share">Κοινή χρήση</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Ρυθμίστε πρώτα το runtime Linux.</string> + <string name="sync_accept">Αποδοχή</string> + <string name="sync_accept_title">Αποθήκευση του «%1$s» σε</string> + <string name="sync_add_folder">Προσθήκη φακέλου</string> + <string name="sync_add_folder_hint">Συγχρονισμός ενός φακέλου στον αποθηκευτικό χώρο του DroidDeck</string> + <string name="sync_choose">Επιλογή</string> + <string name="sync_add">Προσθήκη</string> + <string name="sync_add_failed">Δεν ήταν δυνατή η προσθήκη του φακέλου.</string> + <string name="sync_share_with">Κοινή χρήση με</string> + <string name="sync_share_none">Δεν υπάρχουν ακόμα συσκευές. Μπορείτε να μοιραστείτε αυτόν τον φάκελο αργότερα από τη διεπαφή web.</string> + <string name="sync_use_folder">Χρήση αυτού του φακέλου</string> + <string name="sync_new_folder">Νέος φάκελος</string> + <string name="sync_location_home">Αρχικός φάκελος του container</string> + <string name="sync_location_sync">Φάκελος συγχρονισμού</string> + <string name="sync_location_shared">Κοινόχρηστος χώρος DroidDeck</string> + <string name="sync_location_card">DroidDeck σε %1$s</string> + <string name="sync_location_app">Δεδομένα εφαρμογής DroidDeck</string> + <string name="sync_web_path_locked">Οι νέοι φάκελοι αποθηκεύονται στον φάκελο συγχρονισμού του DroidDeck. Για να συγχρονίσετε άλλον φάκελο του DroidDeck, χρησιμοποιήστε την Προσθήκη φακέλου στην καρτέλα Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Επαναφόρτωση</string> + <string name="sync_not_running">Το Syncthing δεν εκτελείται.</string> + <string name="session_end_steam_sigill">Το Steam σταμάτησε με μη έγκυρη εντολή (SIGILL). Μπορεί να είναι πρόβλημα συμβατότητας εντολών CPU ή κατάρρευση του πελάτη. Μοιραστείτε τα αρχεία καταγραφής με τα στοιχεία της συσκευής σας.</string> + <string name="session_end_steam_try_x64">Μπορείτε να δοκιμάσετε Ρυθμίσεις Steam → Πελάτης Steam → x86-64 (πειραματικό). Απαιτεί επιπλέον λήψη και μπορεί να είναι πιο αργό.</string> + <string name="session_end_vulkan_device">Το πρόγραμμα οδήγησης γραφικών Linux δεν βρήκε χρησιμοποιήσιμη συσκευή Vulkan. Ελέγξτε ότι το επιλεγμένο πρόγραμμα οδήγησης GPU Linux υποστηρίζει αυτή τη GPU.</string> + <string name="session_end_gpu_unsupported">Αυτή η συνεδρία δεν μπορεί να ξεκινήσει επειδή αυτή η GPU δεν έχει συμβατό πρόγραμμα οδήγησης Vulkan για Linux στην τρέχουσα ρύθμιση. Τα προγράμματα οδήγησης Adreno Turnip δεν μπορούν να ενεργοποιήσουν υποστήριξη για GPU MediaTek/Mali.</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_resources_browser">Ανοίγει στο πρόγραμμα περιήγησης</string> + <string name="game_resource_guides">Οδηγοί</string> + <string name="game_resource_protondb_detail">Αναφορές συμβατότητας Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Για παιχνίδια με αποθηκεύσεις στον λογαριασμό σας Steam</string> + <string name="game_resource_search">Αναζήτηση στον ιστό</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="library_filter">Φίλτρο</string> + <string name="library_filter_installed">Μόνο εγκατεστημένα</string> + <string name="library_filter_all_owned">Όλα τα παιχνίδια που διαθέτετε</string> + <string name="library_no_installed_matches">Κανένα εγκατεστημένο παιχνίδι δεν ταιριάζει με αυτά τα φίλτρα.</string> + <string name="library_browse_owned">Περιήγηση στα παιχνίδια που διαθέτετε</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="stores_itch_updates_found">Διαθέσιμες ενημερώσεις: %1$d</string> + <string name="stores_itch_update_replaced">Ο προγραμματιστής αντικατέστησε αυτήν την έκδοση με %1$s. Να γίνει ενημέρωση σε αυτήν;</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Ρυθμίσεις cloud</string> + <string name="integration_title">Ενσωμάτωση Steam</string> + <string name="integration_count">%1$d από %2$d ενεργά</string> + <string name="integration_set_up">Ρύθμιση</string> + <string name="integration_location">Τοποθεσία</string> + <string name="integration_app_info">Πληροφορίες εφαρμογής</string> + <string name="integration_wifi">Ονόματα Wi-Fi</string> + <string name="integration_brightness">Φωτεινότητα</string> + <string name="integration_home">DroidDeck ως Αρχική</string> + <string name="integration_shortcuts">Συντομεύσεις κουμπιού Αρχικής</string> + <string name="integration_wifi_hint">Εμφάνιση δικτύων στο Steam · χρειάζεται πρόσβαση στην Τοποθεσία, χωρίς ποτέ παρακολούθηση</string> + <string name="integration_wifi_on">Τα δίκτυα εμφανίζονται στο Steam</string> + <string name="integration_wifi_location_off">Η Τοποθεσία είναι απενεργοποιημένη</string> + <string name="integration_wifi_denied">Η Τοποθεσία απορρίφθηκε · επιτρέψτε την στις Πληροφορίες εφαρμογής</string> + <string name="integration_brightness_hint">Το ρυθμιστικό του Steam ορίζει τη φωτεινότητα οθόνης</string> + <string name="integration_home_hint">Η Αρχική ανοίγει το μενού Steam σε συνεδρία</string> + <string name="integration_shortcuts_hint">Κρατήστε πατημένη την Αρχική για συνδυασμούς Steam Guide</string> + <string name="integration_shortcuts_needs_home">Απαιτεί το DroidDeck ως Αρχική</string> + <string name="integration_shortcuts_maybe_restricted">Γκρίζο στο Android; Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις</string> + <string name="integration_shortcuts_restricted">Αποκλείεται από το Android · Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις</string> + <string name="integration_shortcuts_service">Κουμπί Αρχικής DroidDeck</string> + <string name="integration_shortcuts_service_description">Μεταβιβάζει τα πατήματα του κουμπιού Αρχικής στο Steam Guide όσο μια συνεδρία Steam είναι εστιασμένη και το DroidDeck είναι η προεπιλεγμένη εφαρμογή Αρχικής. Δεν διαβάζει το περιεχόμενο της οθόνης.</string> + <string name="integration_brightness_needed">Ενεργοποιήστε τη Φωτεινότητα στη Ρύθμιση → Ενσωμάτωση Steam</string> + <string name="apps_search_hint">Αναζήτηση εφαρμογών</string> + <string name="apps_no_match">Καμία εφαρμογή δεν ταιριάζει με «%1$s».</string> + <string name="apps_add_widget">Προσθήκη γραφικού στοιχείου</string> + <string name="apps_widgets_loading">Φόρτωση γραφικών στοιχείων…</string> + <string name="apps_widgets_none">Καμία εφαρμογή στη συσκευή δεν προσφέρει γραφικά στοιχεία.</string> + <string name="apps_widget_wider">Πλατύτερο</string> + <string name="apps_widget_narrower">Στενότερο</string> + <string name="apps_widget_taller">Ψηλότερο</string> + <string name="apps_widget_shorter">Χαμηλότερο</string> + <string name="apps_widget_move_earlier">Μετακίνηση νωρίτερα</string> + <string name="apps_widget_move_later">Μετακίνηση αργότερα</string> + <string name="apps_widget_configure">Ρυθμίσεις γραφικού στοιχείου</string> + <string name="apps_widget_remove">Αφαίρεση γραφικού στοιχείου</string> + <string name="apps_add_to_folder">Προσθήκη σε φάκελο</string> + <string name="apps_new_folder">Νέος φάκελος</string> + <string name="apps_remove_from_folder">Αφαίρεση από φάκελο</string> + <string name="apps_app_info">Πληροφορίες εφαρμογής</string> + <string name="apps_uninstall">Απεγκατάσταση</string> + <string name="apps_folder_rename">Μετονομασία</string> + <string name="apps_folder_ungroup">Κατάργηση ομάδας</string> + <string name="apps_folder_default">Φάκελος</string> + <string name="apps_folder_name">Όνομα φακέλου</string> + <string name="apps_filter">Εμφάνιση</string> + <string name="apps_filter_all">Όλες οι εφαρμογές</string> + <string name="apps_filter_games">Παιχνίδια</string> + <string name="apps_filter_downloaded">Ληφθείσες</string> + <string name="apps_filter_system">Συστήματος</string> + <string name="apps_filter_hidden">Κρυφές</string> + <string name="apps_hide">Απόκρυψη</string> + <string name="apps_unhide">Εμφάνιση στις εφαρμογές</string> + <string name="apps_shortcut_remove">Αφαίρεση συντόμευσης</string> + <string name="apps_pin_title">Προσθήκη στις Εφαρμογές</string> + <string name="apps_pin_add">Προσθήκη</string> + <string name="apps_hidden_none">Δεν υπάρχουν κρυφές εφαρμογές.</string> + <string name="apps_sort_name_asc">Όνομα Α–Ω</string> + <string name="apps_sort_name_desc">Όνομα Ω–Α</string> + <string name="apps_sort_installed">Πρόσφατα εγκατεστημένες</string> + <string name="apps_sort_updated">Πρόσφατα ενημερωμένες</string> + <plurals name="apps_count"> + <item quantity="one">%d εφαρμογή</item> + <item quantity="other">%d εφαρμογές</item> + </plurals> + <string name="desktop_restore_title">Επαναφορά του λογισμικού σας</string> + <string name="desktop_restore_body">Επανεγκατάσταση των εφαρμογών που προσθέσατε μετά από ενημέρωση του DroidDeck.</string> + <string name="desktop_restore_done_title">Το λογισμικό επαναφέρθηκε</string> + <string name="desktop_restore_done_body">Οι εφαρμογές που προσθέσατε εγκαταστάθηκαν ξανά.</string> + <string name="desktop_restore_failed_title">Δεν ήταν δυνατή η επαναφορά ορισμένου λογισμικού</string> + <string name="desktop_restore_failed_body">Δείτε το ~/.cache/droiddeck/apt-restore.log και μετά δοκιμάστε sudo apt install στο Konsole.</string> + <string name="gog_full_files">Οι εγγενείς βελτιστοποιήσεις δεν είναι διαθέσιμες. Η λήψη περιλαμβάνει πλήρη αρχεία αντικατάστασης.</string> + <string name="gog_recover">Επαλήθευση αποτελέσματος ενημέρωσης</string> + <string name="slow_usb_title">Αργή σύνδεση USB</string> + <string name="slow_usb_cable">Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s), οπότε τα παιχνίδια θα φορτώνουν αργά. Χρησιμοποιήστε καλώδιο USB 3 των 5 Gbps ή περισσότερο, αναποδογυρίστε το βύσμα USB-C ή χρησιμοποιήστε ταχύτερο δίσκο.</string> + <string name="slow_usb_port">Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s). Η θύρα USB αυτής της συσκευής δεν υποστηρίζει μεγαλύτερη ταχύτητα, οπότε τα παιχνίδια θα φορτώνουν αργά. Ο εσωτερικός χώρος ή μια κάρτα microSD μπορεί να είναι ταχύτερα.</string> + <string name="slow_usb_never">Να μην εμφανιστεί ξανά</string> + <string name="slow_usb_dismiss">Κλείσιμο</string> + <string name="steam_import_title">Επανεκκίνηση του Steam για να προστεθούν τα παιχνίδια σας;</string> + <string name="steam_import_body">Το Steam μπορεί να εμφανίσει αυτά τα παιχνίδια που έχετε ως εγκατεστημένα: %1$s. Πρέπει να γίνει επανεκκίνηση για να εμφανιστούν. Κάντε επανεκκίνηση τώρα ή θα προστεθούν την επόμενη φορά που θα ξεκινήσει το Steam.</string> + <string name="steam_import_names_more">%1$s και %2$d ακόμη</string> + <string name="steam_import_now">Επανεκκίνηση τώρα</string> + <string name="steam_import_later">Αργότερα</string> + <string name="gog_maintenance">Διαχείριση εγκατάστασης GOG</string> + <string name="gog_check">Έλεγχος για ενημερώσεις</string> + <string name="gog_repair">Επαλήθευση/Επιδιόρθωση</string> + <string name="gog_patches">Ενημερώσεις κώδικα εκτός σύνδεσης</string> + <string name="gog_refresh">Λήψη πλήρους προγράμματος εγκατάστασης εκτός σύνδεσης</string> + <string name="gog_update">Ενημέρωση σε %1$s</string> + <string name="gog_resume">Συνέχιση συντήρησης GOG</string> + <string name="gog_open_patch">Άνοιγμα προγράμματος εγκατάστασης ενημέρωσης</string> + <string name="gog_patch_in_session">Ολοκληρώστε ή ακυρώστε το πρόγραμμα εγκατάστασης της ενημέρωσης στη συνεδρία Linux.</string> + <string name="gog_patch_requirements">Επιλέξτε ενημέρωση για την εγκατεστημένη έκδοση και γλώσσα. Οι υποστηριζόμενες εκδόσεις προέλευσης μπορεί να μην αναφέρονται.</string> + <string name="gog_no_patches">Το GOG δεν έχει αυτόνομες ενημερώσεις Windows για αυτό το παιχνίδι.</string> + <string name="gog_managed_files">Τα τροποποιημένα αρχεία του παιχνιδιού μπορεί να αντικατασταθούν.</string> + <string name="gog_patch_installer_note">Το πρόγραμμα εγκατάστασης ανοίγει στη συνεδρία Linux σας.</string> + <string name="gog_download_label">Λήψη</string> + <string name="gog_space_label">Επιπλέον χώρος</string> + <string name="gog_space_estimate_label">Εκτίμηση χώρου</string> + <string name="gog_repair_action">Επιδιόρθωση αρχείων</string> + <string name="gog_refresh_action">Ανανέωση εγκατάστασης</string> + <string name="gog_select_patch">Επιλογή</string> + <string name="setup_all_files">Πρόσβαση σε όλα τα αρχεία</string> + <string name="setup_local_network">Τοπικό δίκτυο</string> + <string name="libraries_title">Περισσότερες βιβλιοθήκες Steam</string> + <string name="libraries_hint">Φάκελοι όπου το Steam μπορεί να εγκαθιστά και να εκκινεί παιχνίδια, ο καθένας με δικό του όνομα. Η αφαίρεση διατηρεί τα παιχνίδια στον δίσκο.</string> + <string name="libraries_add">Προσθήκη βιβλιοθήκης</string> + <string name="libraries_rename_title">Όνομα βιβλιοθήκης</string> + <string name="libraries_pick">Επιλέξτε φάκελο βιβλιοθήκης</string> + <string name="libraries_full">Έως %1$d πρόσθετες βιβλιοθήκες</string> + <string name="libraries_overlap">Αυτός ο φάκελος είναι ήδη βιβλιοθήκη ή βρίσκεται μέσα σε μία</string> + <string name="libraries_missing">%1$s · μη διαθέσιμη</string> + <string name="libraries_applies_next">Ισχύει από την επόμενη συνεδρία Steam</string> + <string name="bottom_desktop_start">Εκκίνηση επιφάνειας εργασίας</string> + <string name="bottom_desktop_mode_touch">Άμεση αφή</string> + <string name="bottom_desktop_trackpad">Επιφάνεια αφής. Πατήστε για άμεση αφή</string> + <string name="bottom_desktop_direct_touch">Άμεση αφή. Πατήστε για επιφάνεια αφής</string> + <string name="bottom_desktop_starting">Εκκίνηση επιφάνειας εργασίας KDE…</string> + <string name="bottom_desktop_ended">Η επιφάνεια εργασίας έκλεισε.</string> + <string name="bottom_desktop_failed">Δεν ήταν δυνατή η εκκίνηση της επιφάνειας εργασίας. Τα αρχεία καταγραφής βρίσκονται στον φάκελο bottom-desktop αυτής της συνεδρίας.</string> + <string name="bottom_desktop_off">Η επιφάνεια εργασίας είναι κλειστή.</string> + <string name="libraries_rename">Μετονομασία</string> + <string name="second_mode_desktop">Επιφάνεια εργασίας</string> + <string name="bottom_desktop_mode_trackpad">Πινακίδα αφής</string> + <string name="bottom_desktop_title">Επιφάνεια εργασίας · %1$s</string> </resources> diff --git a/app/src/main/res/values-es/gestures.xml b/app/src/main/res/values-es/gestures.xml index 4f5f49779..d65a5db54 100644 --- a/app/src/main/res/values-es/gestures.xml +++ b/app/src/main/res/values-es/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestos</string> <string name="gesture_settings">Ajustes de gestos táctiles</string> - <string name="gesture_settings_hint">Personaliza los gestos de ratón y teclado. Selecciona Gestos como modo táctil para usarlos.</string> <string name="gesture_tap">Toque</string> <string name="gesture_drag">Arrastre con un dedo</string> <string name="gesture_long_press">Pulsación prolongada</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Pulsación sostenida con tres dedos</string> <string name="gesture_pinch">Pellizcar para ampliar</string> <string name="gesture_hold_button">Mantener el botón pulsado</string> + <string name="gesture_hold_left">Mantener pulsado el botón izquierdo</string> + <string name="gesture_hold_right">Mantener pulsado el botón derecho</string> <string name="gesture_click_once">Hacer clic una vez</string> <string name="gesture_hold_delay">Tiempo de pulsación sostenida</string> <string name="gesture_double_delay">Intervalo de doble toque</string> diff --git a/app/src/main/res/values-es/shortcuts.xml b/app/src/main/res/values-es/shortcuts.xml new file mode 100644 index 000000000..7db4cf53f --- /dev/null +++ b/app/src/main/res/values-es/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Atajos de botones físicos</string> + <string name="shortcuts_dd_menu">Menú de DroidDeck</string> + <string name="shortcuts_capture">Asignar: %1$s</string> + <string name="shortcuts_press">Pulsa y suelta un botón. La asignación se guarda automáticamente.</string> + <string name="shortcuts_release">Suelta el botón para continuar.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Este botón ya está asignado a: %1$s</string> + <string name="shortcuts_save">Reasignar</string> + <string name="shortcuts_retry">Probar otro botón</string> + <string name="shortcuts_limitations">El botón Inicio y algunos botones adicionales pueden no estar disponibles.</string> +</resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ec99ab719..9223b827b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opciones de VKD3D para D3D12. nodxr desactiva el trazado de rayos; úsalo solo en un juego que lo necesite.</string> <string name="game_env_proton_log">Pon 1 para obtener un registro de diagnóstico de Proton. El registro puede reducir el rendimiento y usar almacenamiento.</string> <string name="game_env_wined3d">Pon 1 para usar WineD3D basado en OpenGL en lugar de DXVK, para pruebas de compatibilidad con D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 y los juegos que se ejecutan con WineD3D. Vulkan evita la ruta de OpenGL sobre Zink y es mucho más rápido en juegos antiguos de DirectDraw y Direct3D 7 en Adreno.</string> + <string name="game_env_dxvk_d3d8">Pon 1 para ejecutar Direct3D 8 con DXVK en lugar de WineD3D. Más rápido en la prueba de Direct3D 8 de AIO Graphics Test en Adreno.</string> <string name="game_env_no_ntsync">Pon 1 para que este juego no use ntsync (droiddeck-ntsync o un controlador del kernel); usa droiddeck-esync si hay un paquete y, si no, droiddeck-fsync.</string> <string name="game_env_no_esync">Pon 1 para desactivar droiddeck-esync en este juego; usa droiddeck-fsync en su lugar, o droiddeck-ntsync si fsync también está desactivado.</string> <string name="game_env_no_fsync">Pon 1 para que este juego no use droiddeck-fsync; usa droiddeck-esync si hay un paquete y, si no, droiddeck-ntsync.</string> <string name="game_env_fsync_first">Pon 1 para que este juego use droiddeck-fsync, o 0 para dar prioridad a droiddeck-esync cuando haya un paquete para su Proton.</string> <string name="game_env_xalia">Pon 0 para desactivar el asistente de navegación con mando de Proton en este juego.</string> + <string name="game_env_anticheat_offline">Activado de forma predeterminada. Inicia un juego con Easy Anti-Cheat sin su antitrampas cuando el juego admite el modo sin conexión. Desactívalo para iniciarlo con Easy Anti-Cheat como siempre. Los modos en línea que requieren Easy Anti-Cheat siguen sin estar disponibles.</string> <string name="game_env_hud">Superposición de DXVK para D3D9–11. fps muestra la tasa de fotogramas; sin definir la oculta.</string> <string name="game_env_dxvk_config">Ajustes de DXVK separados por punto y coma. Las versiones recientes usan dxvk.maxFrameRate para limitar fotogramas; para el uso normal prefiere el límite de fotogramas de la sesión.</string> + <string name="game_env_cores">Núcleos de CPU para este juego, como 0-4 o 0,2,4, en lugar de los núcleos de juegos de la sesión. Con menos núcleos se calienta menos.</string> <string name="game_env_vkd3d_limit">Límite de fotogramas de D3D12. 0 desactiva el límite.</string> <string name="game_env_glthread">Subprocesos de OpenGL de Mesa. true puede ayudar a juegos OpenGL limitados por la CPU; pruébalo en cada juego.</string> <string name="sync_backend_title">Sincronización de Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX ejecuta programas Linux x86 en este dispositivo ARM64. Auto lo usa cuando el programa es para x86.</string> <string name="app_fex_x86">%1$s con FEX</string> <string name="app_fex_not_ready">Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá.</string> + <string name="session_proot_missing">No se ha podido descargar el proot de DroidDeck. Comprueba la conexión y vuelve a intentarlo. La sesión no se ha iniciado porque el proot alternativo es demasiado lento para jugar.</string> + <string name="session_directaudio_missing">No se ha podido descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">No se ha podido descargar el cliente de Steam. Puede que tu red o VPN esté bloqueando los servidores de Steam; comprueba la conexión y vuelve a intentarlo.</string> <string name="session_end_steam_setup">No se ha podido configurar el cliente de Steam. Comprueba la conexión y el espacio libre y vuelve a intentarlo.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Mando Xbox 360</string> <string name="mode_controller_note">Deck: botón de Quick Access y giroscopio. Steam Controller: lo mismo, con detección de agarre en los botones traseros. DualShock 4 y DualSense: giroscopio, y los trackpads como su panel táctil. Xbox 360: abre Quick Access con Guide+A.</string> <string name="mode_back">Atrás</string> + <string name="back_hold">Mantener Atrás para atajos de Steam</string> + <string name="back_hold_hint">Mantener Atrás abre Acceso rápido o crea combinaciones de Steam con otros botones. Desactívalo para ignorar Atrás mantenido; pulsar y pulsar dos veces siguen funcionando.</string> + <string name="back_native_qam_hint">Mantén Atrás 700 ms, o mantén Atrás y pulsa otro botón para los atajos de Steam.</string> + <string name="back_double_tap_window">Intervalo de doble toque</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir el control del brillo</string> + <string name="brightness_permission_text">Configura el control del brillo en DroidDeck.</string> <string name="back_menu_then_qam">Menú → QAM</string> <string name="back_qam_then_menu">QAM → Menú</string> <string name="mode_session">Sesión</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Al día · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar la última</string> + <string name="decky_channel">Canal de actualizaciones</string> + <string name="decky_channel_hint">Qué versiones de Decky Loader se instalan. El actualizador propio de Decky usa el mismo canal.</string> + <string name="decky_channel_stable">Estable</string> + <string name="decky_channel_prerelease">Preliminar</string> + <string name="decky_channel_testing">Pruebas</string> + <string name="decky_channel_failed">No se ha podido guardar el canal de actualizaciones de Decky</string> <string name="mode_decky_on">Se inicia con Steam. Mientras esté activado, otras apps de este dispositivo podrían controlar Steam.</string> <string name="mode_decky_off">Desactivado. El puerto de depuración remota de Steam permanece cerrado.</string> <string name="mode_decky_remove_title">¿Desinstalar Decky Loader?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">Desactívalo si los juegos fallan o se quedan en negro en modo Deck. Se aplica en la próxima sesión.</string> <string name="mode_return_after_game">Volver a DroidDeck al cerrar un juego</string> <string name="mode_return_after_game_hint">Cuando se cierra un juego que iniciaste desde DroidDeck u otro lanzador, Steam se cierra correctamente (primero termina de sincronizar las partidas en la nube) y vuelves allí. Desactivado: te quedas en Steam.</string> + <string name="mode_shader_precache">Precarga de shaders</string> + <string name="mode_shader_precache_hint">Steam descarga shaders precompilados para tus juegos y los procesa en segundo plano, para que los juegos tengan menos tirones. Desactivado ahorra datos, almacenamiento y batería; los juegos compilan los shaders mientras juegas. Es el mismo ajuste que Descargas > Precarga de shaders en Steam. Se aplica en la próxima sesión.</string> <string name="mode_steam_repair">Reparar el cliente de Steam</string> <string name="mode_steam_repair_hint">Vuelve a descargar el cliente de Steam la próxima vez que se inicie Steam. Úsalo si Steam se queda en la pantalla de carga. Se conservan los juegos, la sesión iniciada y los ajustes.</string> <string name="mode_steam_repair_queued">El cliente de Steam se volverá a descargar la próxima vez que se inicie Steam.</string> @@ -377,6 +414,8 @@ <string name="mode_directaudio_hint">Evita PulseAudio para menor latencia.</string> <string name="mode_mic">Micrófono</string> <string name="mode_mic_hint">Para el chat de voz.</string> + <string name="drawer_mic_hint">Activa o desactiva la captura del micrófono en esta sesión.</string> + <string name="drawer_mic_failed">No se ha podido cambiar el micrófono. Inténtalo de nuevo.</string> <string name="mode_network">Red</string> <string name="mode_wifi_discovery">Detección de redes Wi-Fi</string> <string name="mode_wifi_discovery_hint">Muestra en Steam los nombres de Wi-Fi y las redes cercanas.</string> @@ -539,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: cola de GPU en tiempo real</string> <string name="perf_gsrealtime_hint">Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Desactivado</string> + <string name="perf_cap_auto">Predeterminado del controlador</string> + <string name="perf_zram_client">Comprimir Steam mientras se ejecuta un juego</string> + <string name="perf_zram_client_hint">20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera.</string> + <string name="perf_ram_cap">Límite de RAM</string> + <string name="perf_ram_cap_hint">Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener tirones mientras se recuperan las páginas.</string> + <string name="perf_ram_cap_unavailable">Requiere swap de zRAM, y este dispositivo no lo tiene.</string> + <string name="perf_vram_cap">Límite de VRAM</string> + <string name="perf_vram_cap_hint">La memoria de vídeo que DXVK indica a los juegos Direct3D, para que calculen sus texturas con menos. Los ajustes de DXVK propios de un juego siguen teniendo prioridad. Se aplica en la próxima sesión.</string> <string name="perf_gpuclock">Mantener la GPU a su reloj máximo</string> <string name="perf_gpuclock_hint">Solo Adreno. Menos tirones, más consumo de batería y calor.</string> <string name="perf_fixes">Correcciones de sesión</string> <string name="perf_sysmem">Turnip: renderizado sysmem</string> <string name="perf_sysmem_hint">Más rápido para el cliente de Steam; en los juegos, el controlador elige entre renderizado por mosaicos o en memoria del sistema en cada pasada. Obligatorio en Adreno 710/720/722.</string> <string name="perf_xalia">Omitir el asistente xalia de Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">Un sustituto en espacio de usuario del controlador ntsync de Linux, para pruebas. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Un sustituto en espacio de usuario del controlador ntsync de Linux. Mientras está activado, Proton lo usa en lugar de droiddeck-esync y droiddeck-fsync. Funciona con Proton Experimental ARM64, GE-Proton y proton-cachyos. Se aplica en la próxima sesión.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync primero</string> <string name="perf_fsync_hint">Usa el fsync propio de Proton con los archivos originales de Proton, con futex_waitv proporcionado en espacio de usuario, así que no necesita paquete y sigue funcionando en cuanto Steam actualiza Proton. Mientras está activado, los juegos lo usan antes que droiddeck-esync, salvo los pocos que Proton mantiene sin fsync. Se aplica en la próxima sesión.</string> @@ -557,6 +606,8 @@ <string name="perf_fastpath">Ruta rápida de proot</string> <string name="perf_fastpath_needs_seccomp">Requiere el filtro seccomp de proot.</string> <string name="perf_fastpath_hint">Búsquedas de archivos más rápidas y menos tirones. Desactívalo si un programa no encuentra sus archivos.</string> + <string name="perf_cursor_composite">Dibujar el cursor dentro de gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dibuja el puntero por sí mismo en lugar de pasárselo a Android. Actívalo para un cursor manejado con el mando. Desactivado es más rápido en un móvil. Se aplica en la próxima sesión.</string> <string name="perf_identity">Identidad de la sesión</string> <string name="perf_hostname">Nombre del host</string> <string name="perf_hostname_hint">El nombre que Steam ve para este dispositivo. En blanco restaura %1$s.</string> @@ -571,6 +622,8 @@ <string name="driver_delete_plain">Sus archivos se eliminan de la app.</string> <string name="driver_delete_in_use">Sus archivos se eliminan. Está en uso, así que pasa a usarse el predeterminado.</string> <string name="drawer_page_display">Pantalla</string> + <string name="drawer_frame_limit">Límite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string> <string name="drawer_page_effects">Efectos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -595,6 +648,66 @@ <string name="drawer_hud_color_amber">Ámbar</string> <string name="drawer_hud_color_violet">Violeta</string> <string name="drawer_hud_opacity">Opacidad</string> + <string name="hud_size">Tamaño</string> + <string name="hud_size_hint">Tocar el HUD también cambia su tamaño.</string> + <string name="hud_size_full">Completo</string> + <string name="hud_size_tiles">Mosaicos</string> + <string name="hud_size_pill">Píldora</string> + <string name="hud_size_minimal">Mínimo</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> + <string name="hud_locked">Fijar posición</string> + <string name="hud_locked_hint">Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando.</string> + <string name="hud_snap">Ajustar a los lados</string> + <string name="hud_snap_hint">Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección.</string> + <string name="hud_group_look">Aspecto</string> + <string name="hud_scale">Tamaño en pantalla</string> + <string name="hud_color_soft">Suave</string> + <string name="hud_color_mid">Medio</string> + <string name="hud_color_vivid">Intenso</string> + <string name="hud_outline">Contorno</string> + <string name="hud_outline_color">Color del contorno</string> + <string name="hud_outline_gray">Gris</string> + <string name="hud_outline_theme">Color del tema</string> + <string name="hud_group_metrics">Lecturas</string> + <string name="hud_metric_graph">Gráfico de tiempos de fotograma</string> + <string name="hud_metric_decimal">Tasa de fotogramas con decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% más bajo</string> + <string name="hud_metric_engine">Motor gráfico</string> + <string name="hud_metric_gpu_model">Nombre de la GPU</string> + <string name="hud_metric_gpu">Carga de la GPU</string> + <string name="hud_metric_gpu_temp">Temperatura de la GPU</string> + <string name="hud_metric_cpu">Carga de la CPU</string> + <string name="hud_metric_per_core">CPU por núcleo</string> + <string name="hud_metric_temp">Temperaturas</string> + <string name="hud_metric_ram">Memoria</string> + <string name="hud_metric_vram">Memoria gráfica</string> + <string name="hud_metric_swap">Memoria de intercambio</string> + <string name="hud_metric_battery">Nivel de batería</string> + <string name="hud_metric_power">Consumo de energía</string> + <string name="hud_metric_network">Red</string> + <string name="hud_metric_resolution">Resolución</string> + <string name="hud_metric_proton">Versión de Proton</string> + <string name="hud_metric_session">Tiempo de sesión</string> + <string name="hud_metric_clock">Reloj</string> + <string name="hud_group_temps">Temperaturas</string> + <string name="hud_temp_unit">Unidad</string> + <string name="hud_temp_bands">Colores de aviso</string> + <string name="hud_temp_bands_hint">Las temperaturas se vuelven ámbar y luego rojas al acercarse al límite.</string> + <string name="hud_temp_bands_off">Desactivado</string> + <string name="hud_temp_bands_auto">Automático</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU en rojo a partir de</string> + <string name="hud_temp_red_gpu">GPU en rojo a partir de</string> + <string name="hud_temp_red_battery">Batería en rojo a partir de</string> + <string name="hud_group_more">Más</string> + <string name="hud_export">Diagnóstico del HUD</string> + <string name="hud_export_hint">Guarda en Downloads/DroidDeck un informe de cada sensor que lee el HUD.</string> + <string name="hud_export_button">Guardar</string> + <string name="hud_export_done">Guardado en %1$s</string> + <string name="hud_export_failed">No se ha podido guardar el informe del HUD.</string> + <string name="hud_reset">Restablecer ajustes del HUD</string> + <string name="hud_reset_button">Restablecer</string> <string name="drawer_scaling">Modo de escalado</string> <string name="drawer_scaling_sharpness">Nitidez del escalado</string> <string name="drawer_effects">Efectos de pantalla</string> @@ -629,10 +742,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latencia</string> + <string name="drawer_low_latency">Modo de baja latencia</string> + <string name="drawer_low_latency_hint">Aumenta el uso de CPU y batería</string> <string name="drawer_low_latency_controller">Mando de baja latencia</string> <string name="drawer_low_latency_controller_hint">El mando informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU.</string> <string name="drawer_low_latency_touch">Táctil de baja latencia</string> <string name="drawer_low_latency_touch_hint">Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU.</string> + <string name="drawer_evdev_mouse">Canal de ratón sin procesar</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Segunda pantalla</string> @@ -720,6 +837,10 @@ <string name="setup_session">Sesión</string> <string name="setup_logs">Registros de sesión</string> <string name="setup_logs_hint">Se guardan tras cada sesión</string> + <string name="setup_game_debug_logs">Registros de depuración de juegos</string> + <string name="setup_game_debug_logs_hint">Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento.</string> + <string name="setup_game_debug_logs_restart">Reinicia esta sesión para guardar los registros de depuración de juegos</string> + <string name="setup_logging_update_failed">No se ha podido actualizar el registro. Comprueba el interruptor y vuelve a intentarlo.</string> <string name="setup_agent_commands">Herramientas de depuración</string> <string name="setup_latest_logs">Últimos registros de sesión</string> <string name="setup_saved_logs">Registros de sesión guardados</string> @@ -752,12 +873,28 @@ <string name="setup_home_on">DroidDeck puede ser la app de inicio</string> <string name="setup_home_off">DroidDeck nunca se ofrece como app de inicio</string> <string name="setup_orientation">Orientación</string> + <string name="setup_launcher_orientation">Orientación del launcher</string> + <string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientación de la sesión</string> + <string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se introdujeron.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> + <string name="setup_dual_screen">Pantalla doble</string> + <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado lo mantiene todo en una pantalla.</string> + <string name="setup_dual_screen_auto">Automático</string> + <string name="setup_dual_screen_on">Activado</string> + <string name="setup_dual_screen_off">Desactivado</string> + <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> + <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y se escribe allí, para que la pantalla superior mantenga la vista completa. L2 y R2 cambian de sección.</string> + <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> + <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión.</string> + <string name="dual_typing_title">Escribiendo en la pantalla superior</string> + <string name="dual_typing_done">Hecho</string> <string name="setup_default_home">App de inicio predeterminada</string> <string name="setup_choose_home">Elige una app de inicio</string> <string name="setup_choose">Elegir</string> @@ -908,6 +1045,14 @@ <string name="gate_step1">Abre Ajustes → Opciones de desarrollador → Depuración inalámbrica y actívala</string> <string name="gate_step2">Toca “Vincular dispositivo con código de vinculación”</string> <string name="gate_step3">Escribe el código en la notificación de DroidDeck</string> + <string name="pairguide_build_number">En Información del teléfono, toca Número de compilación 7 veces</string> + <string name="pairguide_wireless">Activa la Depuración inalámbrica</string> + <string name="pairguide_pair">Abre Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”</string> + <string name="pairguide_child_process">Activa “Inhabilitar restricciones de procesos secundarios”</string> + <string name="pairguide_row_child_process">Inhabilitar restricciones de procesos secundarios</string> + <string name="pairguide_row_build_number">Número de compilación</string> + <string name="pairguide_row_wireless">Depuración inalámbrica</string> + <string name="pairguide_row_pair">Vincular dispositivo con código de vinculación</string> <string name="gate_waiting">Esperando la ventana de vinculación…</string> <string name="gate_code_needed">Ventana encontrada. Introduce su código en la notificación.</string> <string name="gate_status">Estado</string> @@ -1031,8 +1176,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 +1183,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> @@ -1049,10 +1191,8 @@ <string name="games_never_played">Nunca jugado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <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> @@ -1067,6 +1207,9 @@ <string name="gpu_hide_other">Ocultar controladores de otras GPU</string> <string name="gpu_show_other">Mostrar controladores de otras GPU</string> <string name="gpu_advanced">Avanzado</string> + <string name="gpu_ubwc_title">Compatibilidad con UBWC</string> + <string name="gpu_ubwc_hint">Prueba Activado o Desactivado si Steam o Android muestran franjas o parpadeos. Se aplica a ambos controladores después de reiniciar DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicia DroidDeck para aplicarlo.</string> <string name="gpu_set_with_display">Se define junto con el controlador de pantalla: %1$s incluye ambos.</string> <string name="gpu_set_with_runtime">Se define junto con el controlador de runtime: %1$s incluye ambos.</string> <string name="gpu_runtime_hint">Lo usan los juegos y el escritorio.</string> @@ -1121,7 +1264,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> @@ -1175,10 +1318,15 @@ <string name="pip_auto">Entrar en PiP automáticamente</string> <string name="unfolded_controls">Controles con la pantalla desplegada</string> <string name="unfolded_controls_hint">Desplegado, el juego queda encima de los trackpads y los agarres traseros de Steam Deck. Plegado, el juego ocupa toda la pantalla.</string> + <string name="unfolded_controls_with_controller">Mantenerlos con un mando</string> + <string name="unfolded_controls_with_controller_hint">Muestra también estos controles táctiles mientras haya un mando conectado.</string> <string name="pip_suspended">Suspendida</string> <string name="pip_not_ready">Imagen en imagen estará disponible cuando la sesión esté lista.</string> <string name="pip_permission">Permite imagen en imagen para DroidDeck en los ajustes de Android.</string> <string name="pip_unavailable">Android no pudo abrir imagen en imagen.</string> + <string name="game_more">Más</string> + <string name="game_edit_art">Editar imágenes</string> + <string name="stores_in_steam_label">En Steam</string> <string name="game_shortcut">Acceso directo</string> <string name="game_shortcut_add">Añadir a la pantalla de inicio</string> <string name="game_shortcut_choose">Elegir juego</string> @@ -1202,6 +1350,10 @@ <string name="main_wait_runtime">Espera a que termine la operación del runtime</string> <string name="main_wait_proton_install">Espera a que termine la instalación de la herramienta de compatibilidad</string> + <string name="load_compat_title">Preparando las herramientas de compatibilidad</string> + <string name="load_compat_wait">Esperando a que termine la configuración de compatibilidad</string> + <string name="load_compat_hint">Tu sesión se iniciará cuando termine la configuración.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Espera a que termine la instalación de la app de escritorio</string> <string name="main_wait_install_game">Espera a que termine la instalación antes de iniciar un juego</string> <string name="main_saves_close_session">Cierra primero la sesión de Steam para que el juego no guarde encima de lo importado</string> @@ -1242,6 +1394,9 @@ <string name="main_install_anyway">Instalar de todos modos</string> <string name="main_remove_runtime_title">Eliminar el runtime de Linux</string> <string name="main_remove_runtime_text">Esto elimina el runtime, el cliente de Steam que contiene y todos los juegos instalados en él.</string> + <string name="runtime_actions_title">Runtime de Linux</string> + <string name="runtime_actions_text">Reparar reinstala los archivos del sistema del runtime y conserva Steam, tus juegos y tus ajustes. Los extras, como el escritorio, se vuelven a instalar la próxima vez que los uses. Eliminar borra todo.</string> + <string name="runtime_repair">Reparar el runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">No se pudo abrir %1$s en la pantalla principal</string> <string name="android_app_open_failed_on">No se pudo abrir %1$s en %2$s</string> @@ -1374,6 +1529,12 @@ <string name="session_runtime_catalog_unreachable">No se pudo acceder al catálogo del runtime. Revisa la conexión y vuelve a pulsar Jugar.</string> <string name="session_runtime_install_failed">El runtime de Linux no se instaló. Revisa el runtime en Configuración y vuelve a pulsar Jugar.</string> <string name="session_desktop_install_failed">El escritorio no se instaló (%1$s). Revisa la conexión y pulsa Escritorio de nuevo.</string> + <string name="session_package_resume_failed">No se ha podido terminar una instalación interrumpida (%1$s). Comprueba la conexión y el espacio y vuelve a intentarlo.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">El runtime de Linux está dañado: %1$d enlace de biblioteca apunta a un archivo que falta (%2$s), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="many">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="other">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + </plurals> <string name="session_ended_named">%1$s se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_program">El programa se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_desktop">El escritorio se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> @@ -1389,6 +1550,14 @@ <string name="mode_decky_plugins_hint">Instala un ZIP de plugin para la próxima sesión de Steam.</string> <string name="mode_decky_plugin_downloading">Descargando…</string> <string name="mode_decky_plugin_install_zip">Instalar desde ZIP</string> + <string name="decky_zip_warning_title">Instalación de plugin de terceros</string> + <string name="decky_zip_warning_text">El equipo de Decky Loader no ha revisado este plugin. Puede contener malware, como software para robar tu cuenta de Steam o dañar tu dispositivo. Al instalar este plugin, aceptas que asumes todos los riesgos para tu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Espera %1$d segundo</item> + <item quantity="many">Espera %1$d segundos</item> + <item quantity="other">Espera %1$d segundos</item> + </plurals> <string name="store_cat_games">Juegos</string> <string name="store_cat_audio_video">Audio y vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1417,6 +1586,10 @@ <string name="theme_icon_blue_detail">Fondo negro, texto blanco y el azul para todo lo seleccionado, enfocado o pulsado.</string> <string name="theme_electric">Azul marino eléctrico</string> <string name="theme_electric_detail">Un azul más vivo, sobre superficies que tiran a azul marino en vez de gris.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Colores que recorren el arcoíris. Respeta los ajustes de animación de Android.</string> + <string name="theme_rgb_speed">Velocidad</string> + <string name="theme_rgb_speed_hint">Con qué rapidez cambian los colores.</string> <string name="theme_gradient">Degradado</string> <string name="theme_gradient_detail">Tus propios colores primario y secundario, combinados en botones y resaltados.</string> <string name="theme_gradient_primary">Primario</string> @@ -1543,7 +1716,16 @@ <string name="fm_conflict_skip">Omitir</string> <string name="fm_select_this_folder">Seleccionar esta carpeta</string> <string name="fm_back">Atrás</string> + <string name="fm_exit">Salir</string> + <string name="fm_return_to_start">Volver a la carpeta inicial</string> + <string name="fm_start_unavailable">La carpeta inicial ya no está disponible</string> + <string name="fm_cancel_operation_title">¿Cancelar la operación?</string> + <string name="fm_cancel_operation_confirmation">La operación se cancelará. ¿Estás seguro?</string> + <string name="fm_accept">Aceptar</string> + <string name="fm_decline">Rechazar</string> <string name="fm_drive_not_readable">%1$s está montado, pero ahora mismo no se puede leer</string> + <string name="fm_drive_access_title">Permitir acceso a %1$s</string> + <string name="fm_drive_access_text">Android deja que DroidDeck vea esta unidad, pero no que la lea. Activa Acceso a todos los archivos para DroidDeck y vuelve.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de cuadrícula</string> <string name="fm_search">Buscar</string> @@ -1616,6 +1798,93 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Agarres de Deck + trackpads</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Todavía no hay nada que mostrar aquí.</string> + <string name="bottom_page_downloads">Descargas</string> + <string name="bottom_downloads_none">No hay descargas en curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Descargando caché de shaders</string> + <string name="bottom_downloads_paused">En pausa</string> + <string name="bottom_downloads_queued">Esperando para empezar</string> + <string name="bottom_page_notifications">Notificaciones</string> + <string name="bottom_notifications_listener">DroidDeck – pantalla inferior</string> + <string name="bottom_notifications_why">Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola.</string> + <string name="bottom_notifications_allow">Permitir acceso a notificaciones</string> + <string name="bottom_notifications_none">No hay notificaciones.</string> + <string name="bottom_notifications_count">%1$d notificaciones</string> + <string name="bottom_notifications_clear">Borrar</string> + <string name="bottom_page_screenshots">Capturas de pantalla</string> + <string name="stats_fps_needs_hud">Los FPS requieren el HUD activado</string> + <string name="stats_speed">Velocidad</string> + <string name="stats_pedals">Pedales</string> + <string name="stats_gforce">Fuerza G</string> + <string name="stats_timing">Tiempos</string> + <string name="stats_best_lap">Mejor vuelta</string> + <string name="stats_tires">Neumáticos °C</string> + <string name="stats_trace">Acelerador y freno, últimos 10 s</string> + <string name="stats_speed_chart">Velocidad, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_speed_units">Unidades de velocidad</string> + <string name="stats_speed_units_auto">Automático (%1$s)</string> + <string name="stats_steam_client_arm">Cliente de Steam ARM</string> + <string name="stats_steam_client_x86">Cliente de Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Testigos</string> + <string name="stats_lamp_shift">Cambio</string> + <string name="stats_lamp_handbrake">Freno de mano</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Aceite %1$s °C</string> + <string name="stats_power">Distribuidor de energía</string> + <string name="stats_fuel_t">Combustible, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="stats_tap_hint">Toca la franja superior o el cuadro de instrumentos para cambiar su estilo.</string> + <string name="bottom_telemetry_send_title">Enviar datos al panel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> + <string name="bottom_telemetry_send_note">Esto cambia el ajuste de salida de datos del propio juego. Se aplica la próxima vez que se inicie el juego; al desactivarlo se restaura el ajuste anterior.</string> + <string name="bottom_telemetry_send_close">Cierra %1$s para cambiar esto.</string> + <string name="bottom_telemetry_send_failed">No se han podido cambiar los ajustes de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activa %2$s en los ajustes del juego con la IP 127.0.0.1 y el puerto %3$d.</string> + <string name="bottom_shots_where">Se guardan en Pictures/DroidDeck. Las capturas de Steam también aparecen aquí.</string> + <string name="bottom_shots_take">Hacer captura de pantalla</string> + <string name="bottom_shots_saved">Captura de pantalla guardada.</string> + <string name="bottom_shots_failed">No se ha podido hacer la captura de pantalla.</string> + <string name="bottom_shots_none">Todavía no hay capturas de pantalla.</string> + <string name="bottom_page_chat">Chat y voz</string> + <string name="bottom_chat_why">Lee y responde el chat de Steam aquí mientras el juego sigue en la pantalla principal. Usa la cuenta con la que se ha iniciado sesión en Steam.</string> + <string name="bottom_chat_not_signed_in">Steam todavía no tiene una sesión web que compartir, así que inicia sesión aquí una vez.</string> + <string name="bottom_chat_stopped">Android cerró la página del chat mientras DroidDeck estaba en segundo plano. Se volverá a abrir cuando regreses a DroidDeck.</string> + <string name="bottom_chat_open">Abrir Steam Chat</string> + <string name="bottom_chat_close">Cerrar chat</string> + <string name="bottom_chat_mic_on">Micro activado</string> + <string name="bottom_chat_mic_off">Micro desactivado</string> + <string name="bottom_chat_mic_unavailable">El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego.</string> + <string name="bottom_chat_volume">Volumen %1$d%%</string> + <string name="bottom_page_telemetry">Estadísticas del juego</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batería</string> + <string name="bottom_telemetry_lap">Vuelta</string> + <string name="bottom_telemetry_position">Posición</string> + <string name="bottom_telemetry_this_lap">Vuelta actual</string> + <string name="bottom_telemetry_last_lap">Última vuelta</string> + <string name="bottom_telemetry_fuel">Combustible</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Activa la salida de datos de un juego de carreras (a menudo llamada telemetría o UDP) para ver aquí un panel en directo. Los datos no salen de este dispositivo.</string> + <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> + <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> <string name="rtinst_removing">Eliminando el runtime de Linux</string> <plurals name="rtinst_removing_entries"> @@ -1647,6 +1916,7 @@ <string name="flatpakmgr_not_ready">Configura Flatpak primero</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">Flatpak terminó con el código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s está compilado para %2$s, que DroidDeck no puede ejecutar. Aquí las apps Flatpak necesitan una versión para ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Actualizando %1$s</string> <string name="flatpakmgr_removing">Quitando %1$s</string> @@ -1740,6 +2010,7 @@ <string name="adbpair_applying">Aplicando el ajuste…</string> <string name="adbpair_command_failed">Falló el comando de la Depuración inalámbrica</string> <string name="adbpair_channel_name">Configuración de la Depuración inalámbrica</string> + <string name="adbpair_progress_channel_name">Progreso de la configuración de la Depuración inalámbrica</string> <string name="adbpair_channel_description">Pide el código de vinculación de la Depuración inalámbrica mientras Ajustes está abierto</string> <string name="adbpair_title_pair">Vincular Depuración inalámbrica</string> <string name="adbpair_waiting_text">Activa la Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”.</string> @@ -1848,6 +2119,7 @@ <string name="gpuinfo_not_adreno">La GPU no es Adreno</string> <string name="gpuinfo_supported">Compatible</string> <string name="gpuinfo_experimental">Experimental: sus controladores son versiones de prueba</string> + <string name="gpuinfo_a850_experimental">Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo</string> <string name="gpuinfo_below_tested">Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione</string> <string name="gpuinfo_unsupported">No compatible: DroidDeck necesita una GPU Adreno (Snapdragon)</string> @@ -1941,10 +2213,10 @@ <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> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalles del dispositivo</string> <string name="device_info_hide">Ocultar detalles del dispositivo</string> @@ -1959,7 +2231,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> @@ -1973,11 +2244,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> @@ -1995,9 +2264,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> @@ -2016,12 +2293,43 @@ <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> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas de la barra lateral</string> + <string name="setup_rail_labels_hint">Muestra los nombres debajo de los iconos de la barra lateral. Desactívalo para una barra lateral más estrecha.</string> + <string name="library_display">Vista</string> + <string name="library_display_larger">Tarjetas más grandes</string> + <string name="library_display_smaller">Tarjetas más pequeñas</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamaño</string> <string name="stores_sort_last_played">Jugados recientemente</string> <string name="stores_sort_recently_installed">Instalados recientemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2148,6 +2456,9 @@ <string name="stores_download_manager">Gestor de descargas</string> <string name="stores_parallel">Descargas simultáneas</string> <string name="stores_install_where">Instalar en</string> + <string name="stores_install_language">Idioma del juego</string> + <string name="stores_install_language_hint">GOG y Epic instalan este idioma. Sistema sigue el idioma de la app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s libres</string> @@ -2167,6 +2478,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> @@ -2182,6 +2494,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar en</string> <string name="edit_launch_options">Opciones de lanzamiento</string> + <string name="edit_launch_options_steam_hint">Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos.</string> + <string name="edit_launch_options_not_saved">No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo.</string> + <string name="edit_launch_options_desktop">Puede que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra antes la sesión.</string> <string name="edit_artwork">Ilustraciones</string> <string name="edit_other_exe">Otro exe…</string> <string name="edit_remove">Quitar</string> @@ -2311,6 +2626,7 @@ <string name="setup_download_source_custom">Prefijo propio</string> <string name="setup_download_mirror">Sitio</string> <string name="setup_download_prefix">Prefijo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS DE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para el escritorio de Linux, que se abren desde Escritorio.</string> @@ -2442,6 +2758,22 @@ <string name="glasses_tracking_flat_hint">Automático mantiene este juego 2D fijo en la vista. Elige Pantalla virtual en la sección Pantalla para usar el seguimiento de cabeza.</string> <string name="glasses_tracking_sbs_hint">El seguimiento de cabeza se aplica a una pantalla virtual o a un juego de SteamVR en marcha.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Mandos</string> + <string name="vr_controllers_group">Mandos de SteamVR</string> + <string name="vr_controllers_emulate">Mando en RV</string> + <string name="vr_controllers_emulate_hint">Las dos manos de RV que imita tu mando. Los cambios se aplican al instante, también mientras se ejecuta SteamVR. Los Joy-Con y las manos con seguimiento siguen controlando su lado.</string> + <string name="vr_controllers_off">Mando normal</string> + <string name="vr_controllers_index">Mandos de Valve Index</string> + <string name="vr_controllers_touch">Mandos de Meta Quest 3</string> + <string name="vr_controllers_vive">Mandos de HTC Vive</string> + <string name="vr_controllers_sticks">Al empezar, los sticks</string> + <string name="vr_controllers_sticks_hint">Pulsa ambos sticks a la vez durante la RV para cambiar.</string> + <string name="vr_controllers_sticks_game">Te mueven en el juego</string> + <string name="vr_controllers_sticks_hands">Mueven las manos</string> + <string name="vr_controllers_buttons">Botones</string> + <string name="vr_controllers_buttons_stick">Los gatillos son gatillos, los bumpers agarran, A/B y X/Y son los botones frontales de cada mano, al pulsar los sticks se pulsan los joysticks, Guide abre el menú de SteamVR. Arriba y abajo en la cruceta acercan o alejan las manos.</string> + <string name="vr_controllers_buttons_vive">Los sticks son trackpads; A/X o pulsar un stick los pulsa. Los gatillos son gatillos, los bumpers agarran, Start y Select son menú, Guide abre el menú de SteamVR.</string> + <string name="vr_controllers_buttons_off">Sin manos de RV. Los juegos compatibles con mando, y el menú de SteamVR, reciben tu mando como siempre.</string> <string name="glasses_brightness">Brillo</string> <string name="glasses_volume">Volumen</string> <string name="glasses_sunblock">Bloqueo solar</string> @@ -2499,6 +2831,12 @@ <string name="hand_camera_placement">Posición de la cámara</string> <string name="hand_camera_placement_hint">Comprueba que la cámara pueda verte antes de jugar.</string> <string name="hand_camera_check">Comprobar</string> + <string name="tracking_pack_title">Descarga del seguimiento de manos</string> + <string name="tracking_pack_hint">El seguimiento de manos necesita una descarga única de %1$s.</string> + <string name="tracking_pack_download">Descargar</string> + <string name="tracking_pack_retry">Reintentar</string> + <string name="tracking_pack_downloading">Descargando el seguimiento de manos… %1$d%%</string> + <string name="tracking_pack_failed">No se ha podido descargar el seguimiento de manos. Comprueba tu conexión y vuelve a intentarlo.</string> <string name="hand_camera_check_title">Posición de la cámara</string> <string name="hand_camera_how_rear">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la cámara trasera hacia ti. Luego entra en el encuadre con las manos extendidas.</string> <string name="hand_camera_how_front">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la pantalla hacia ti. Luego entra en el encuadre con las manos extendidas.</string> @@ -2584,6 +2922,21 @@ <string name="storage_safe_hint">Runtimes sin usar, restos, registros antiguos</string> <string name="storage_clean_up">Limpiar…</string> <string name="storage_session_running">Detén la sesión para limpiar o eliminar algo. Los tamaños se siguen mostrando.</string> + <string name="storage_default_group">Ubicación de instalación</string> + <string name="storage_default_title">Almacenamiento predeterminado</string> + <string name="storage_default_hint">Las nuevas instalaciones de las tiendas van a la ubicación seleccionada. Los juegos existentes se quedan donde están. Las bibliotecas de Steam conservan su propio ajuste.</string> + <string name="storage_default_ask">Preguntar siempre</string> + <string name="storage_default_ask_detail">Elige un destino para cada instalación</string> + <string name="storage_default_internal">Almacenamiento interno</string> + <string name="storage_default_external">Almacenamiento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">No conectado</string> + <string name="storage_default_folder">Carpeta · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">No conectada</string> + <string name="storage_default_choose_folder">Elegir carpeta…</string> + <string name="storage_default_choose_folder_detail">Usa cualquier carpeta de una tarjeta SD o unidad USB</string> + <string name="storage_default_note">Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven.</string> <string name="storage_where">Dónde va</string> <string name="storage_games">Juegos de Steam</string> <string name="storage_game_data">Datos de juegos</string> @@ -2712,6 +3065,9 @@ <string name="storage_data_installed">Juegos instalados</string> <string name="storage_data_parts">Prefijo %1$s · shaders %2$s · taller %3$s</string> <string name="storage_clear_shaders">Borrar shaders</string> + <string name="storage_reset_prefix">Restablecer prefijo</string> + <string name="storage_reset_prefix_title">¿Restablecer el prefijo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Borra su prefijo de Wine (%1$s) en %2$s y lo vuelve a crear en el próximo inicio. Se pierden las partidas, los ajustes y los redistribuibles instalados dentro; las partidas de Steam Cloud se conservan en tu cuenta.</string> <string name="storage_data_leftovers">Juegos desinstalados</string> <string name="storage_steam_app">App de Steam %1$d</string> <string name="storage_leftover_unsure_detail">Su prefijo aún contiene archivos, que pueden incluir partidas guardadas locales</string> @@ -3015,4 +3371,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar con Syncthing</string> + <string name="sync_enable_hint">Basada en Syncthing-Fork, es una implementación de Syncthing que te permite sincronizar archivos del sistema de archivos interno de DroidDeck con otras instancias de Syncthing. Solo sirve para los archivos que guardas en el sistema de archivos interno de DroidDeck.</string> + <string name="sync_missing">Esta compilación no incluye Syncthing.</string> + <string name="sync_starting">Iniciando Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Actualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">En pausa</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Reanudando</string> + <string name="sync_status_attention">Requiere atención</string> + <string name="sync_status_failed">Syncthing se detuvo</string> + <string name="sync_failed_retry">Reintentar</string> + <string name="sync_paused_wifi">En pausa hasta tener Wi-Fi</string> + <string name="sync_paused_game">En pausa durante el juego</string> + <string name="sync_summary">%1$d carpetas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltan %1$s</string> + <string name="sync_open_web_ui">Abrir la interfaz web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Reanudar</string> + <string name="sync_running">En ejecución</string> + <string name="sync_running_hint">Desactívalo para detener Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID del dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avanzado</string> + <string name="sync_advanced_hint">Puertos, cuándo se ejecuta, restablecer</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Esperando tu respuesta</string> + <string name="sync_pending_device">%1$s quiere conectarse</string> + <string name="sync_pending_folder">%1$s quiere compartir “%2$s”</string> + <string name="sync_pending_folder_hint">Acepta para elegir dónde se guarda en DroidDeck.</string> + <string name="sync_review">Revisar en la interfaz web</string> + <string name="sync_folders">Carpetas</string> + <string name="sync_no_folders">Aún no hay carpetas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Escaneando</string> + <string name="sync_folder_paused">En pausa</string> + <string name="sync_folder_out_of_sync">No sincronizada</string> + <string name="sync_folder_errors">No se pudieron sincronizar %1$d archivos</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta carpeta está fuera del almacenamiento de DroidDeck, así que DroidDeck la puso en pausa. Para sincronizar carpetas fuera de DroidDeck, usa la app Syncthing-Fork.</string> + <string name="sync_remove_folder">Quitar de Syncthing</string> + <string name="sync_remove_folder_hint">Quitarla no borra ningún archivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Aún no hay dispositivos.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Sin conexión</string> + <string name="sync_last_seen">Visto por última vez %1$s</string> + <string name="sync_device_id_title">ID de este dispositivo</string> + <string name="sync_device_id_hint">En tu otro dispositivo, añade un dispositivo en Syncthing y escanea este código o pega el ID. Después, acéptalo aquí en la interfaz web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartir</string> + <string name="sync_done">Hecho</string> + <string name="sync_off_title">¿Desactivar Syncthing?</string> + <string name="sync_off_body">Syncthing se detiene ahora y seguirá detenido hasta que vuelvas a activarlo. Los archivos sincronizados se quedan donde están.</string> + <string name="sync_off_forget">Borrar también la configuración de Syncthing</string> + <string name="sync_off_forget_hint">Quita el ID de este dispositivo, las carpetas y los dispositivos. Al volver a activarlo, empieza desde cero.</string> + <string name="sync_turn_off">Desactivar</string> + <string name="sync_ports">Puertos</string> + <string name="sync_port_sync">Sincronización</string> + <string name="sync_port_discovery">Descubrimiento local</string> + <string name="sync_repick">Elegir puertos nuevos</string> + <string name="sync_repick_hint">Se vuelve a comprobar en cada inicio.</string> + <string name="sync_repick_button">Volver a elegir</string> + <string name="sync_reset_group">Restablecer</string> + <string name="sync_api_key">Clave API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Restablecer Syncthing</string> + <string name="sync_reset_hint">ID de dispositivo nuevo; se quitan las carpetas y los dispositivos. Los archivos del almacenamiento de DroidDeck se conservan.</string> + <string name="sync_reset_button">Restablecer</string> + <string name="sync_reset_confirm_title">¿Restablecer Syncthing?</string> + <string name="sync_running_group">Ejecución</string> + <string name="sync_run">Ejecutar</string> + <string name="sync_run_open">Mientras DroidDeck está abierto</string> + <string name="sync_run_background">En segundo plano</string> + <string name="sync_wifi_only">Solo con Wi-Fi</string> + <string name="sync_pause_games">Pausar durante los juegos</string> + <string name="sync_logs">Registros</string> + <string name="sync_logs_hint">Salida de Syncthing de esta sesión</string> + <string name="sync_logs_share">Compartir</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura primero el runtime de Linux.</string> + <string name="sync_accept">Aceptar</string> + <string name="sync_accept_title">Guardar “%1$s” en</string> + <string name="sync_add_folder">Añadir carpeta</string> + <string name="sync_add_folder_hint">Sincroniza una carpeta del almacenamiento de DroidDeck</string> + <string name="sync_choose">Elegir</string> + <string name="sync_add">Añadir</string> + <string name="sync_add_failed">No se pudo añadir la carpeta.</string> + <string name="sync_share_with">Compartir con</string> + <string name="sync_share_none">Aún no hay dispositivos. Puedes compartir esta carpeta más tarde desde la interfaz web.</string> + <string name="sync_use_folder">Usar esta carpeta</string> + <string name="sync_new_folder">Carpeta nueva</string> + <string name="sync_location_home">Carpeta personal del contenedor</string> + <string name="sync_location_sync">Carpeta Sync</string> + <string name="sync_location_shared">Almacenamiento compartido de DroidDeck</string> + <string name="sync_location_card">DroidDeck en %1$s</string> + <string name="sync_location_app">Datos de la app DroidDeck</string> + <string name="sync_web_path_locked">Las carpetas nuevas se guardan en la carpeta Sync de DroidDeck. Para sincronizar otra carpeta de DroidDeck, usa Añadir carpeta en la pestaña Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recargar</string> + <string name="sync_not_running">Syncthing no se está ejecutando.</string> + <string name="session_end_steam_sigill">Steam se detuvo por una instrucción ilegal (SIGILL). Puede ser un problema de compatibilidad con instrucciones de la CPU o un fallo del cliente. Comparte los registros con los datos de tu dispositivo.</string> + <string name="session_end_steam_try_x64">Puedes probar Ajustes de Steam → Cliente de Steam → x86-64 (experimental). Requiere una descarga adicional y puede ir más lento.</string> + <string name="session_end_vulkan_device">El controlador gráfico de Linux no ha encontrado un dispositivo Vulkan utilizable. Comprueba que el controlador de GPU de Linux seleccionado sea compatible con esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sesión no puede iniciarse porque esta GPU no tiene un controlador Vulkan de Linux compatible en la configuración actual. Los controladores Turnip de Adreno no pueden habilitar la compatibilidad con GPU MediaTek/Mali.</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_resources_browser">Se abre en tu navegador</string> + <string name="game_resource_guides">Guías</string> + <string name="game_resource_protondb_detail">Informes de compatibilidad de Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para juegos con partidas guardadas en tu cuenta de Steam</string> + <string name="game_resource_search">Búsqueda web</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="library_filter">Filtro</string> + <string name="library_filter_installed">Solo instalados</string> + <string name="library_filter_all_owned">Todos los juegos que tienes</string> + <string name="library_no_installed_matches">Ningún juego instalado coincide con estos filtros.</string> + <string name="library_browse_owned">Explorar los juegos que tienes</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="stores_itch_updates_found">Actualizaciones disponibles: %1$d</string> + <string name="stores_itch_update_replaced">El desarrollador reemplazó esta versión por %1$s. ¿Actualizar a ella?</string> + <string name="xbox_filter_cloud">Nube</string> + <string name="stores_xbox_cloud_settings">Ajustes de nube</string> + <string name="integration_title">Integración con Steam</string> + <string name="integration_count">%1$d de %2$d activadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Ubicación</string> + <string name="integration_app_info">Información de la aplicación</string> + <string name="integration_wifi">Nombres de Wi-Fi</string> + <string name="integration_brightness">Brillo</string> + <string name="integration_home">DroidDeck como inicio</string> + <string name="integration_shortcuts">Atajos del botón de inicio</string> + <string name="integration_wifi_hint">Muestra las redes en Steam · requiere acceso a la ubicación, nunca se rastrea</string> + <string name="integration_wifi_on">Las redes se muestran en Steam</string> + <string name="integration_wifi_location_off">La ubicación está desactivada</string> + <string name="integration_wifi_denied">Ubicación denegada · permítela en Información de la aplicación</string> + <string name="integration_brightness_hint">El control deslizante de Steam ajusta el brillo de la pantalla</string> + <string name="integration_home_hint">Inicio abre el menú de Steam en una sesión</string> + <string name="integration_shortcuts_hint">Mantén Inicio para las combinaciones de Steam Guide</string> + <string name="integration_shortcuts_needs_home">Requiere DroidDeck como inicio</string> + <string name="integration_shortcuts_maybe_restricted">¿Aparece en gris en Android? Información de la aplicación → ⋮ → Permitir ajustes restringidos</string> + <string name="integration_shortcuts_restricted">Bloqueado por Android · Información de la aplicación → ⋮ → Permitir ajustes restringidos</string> + <string name="integration_shortcuts_service">Botón de inicio de DroidDeck</string> + <string name="integration_shortcuts_service_description">Pasa las pulsaciones del botón de inicio a Steam Guide mientras una sesión de Steam está en primer plano y DroidDeck es la app de inicio predeterminada. No lee el contenido de la pantalla.</string> + <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="apps_search_hint">Buscar aplicaciones</string> + <string name="apps_no_match">Ninguna aplicación coincide con «%1$s».</string> + <string name="apps_add_widget">Añadir widget</string> + <string name="apps_widgets_loading">Cargando widgets…</string> + <string name="apps_widgets_none">Ninguna aplicación de este dispositivo ofrece widgets.</string> + <string name="apps_widget_wider">Más ancho</string> + <string name="apps_widget_narrower">Más estrecho</string> + <string name="apps_widget_taller">Más alto</string> + <string name="apps_widget_shorter">Más bajo</string> + <string name="apps_widget_move_earlier">Mover antes</string> + <string name="apps_widget_move_later">Mover después</string> + <string name="apps_widget_configure">Ajustes del widget</string> + <string name="apps_widget_remove">Quitar widget</string> + <string name="apps_add_to_folder">Añadir a carpeta</string> + <string name="apps_new_folder">Carpeta nueva</string> + <string name="apps_remove_from_folder">Quitar de la carpeta</string> + <string name="apps_app_info">Información de la aplicación</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Cambiar nombre</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Carpeta</string> + <string name="apps_folder_name">Nombre de la carpeta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas las aplicaciones</string> + <string name="apps_filter_games">Juegos</string> + <string name="apps_filter_downloaded">Descargadas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar en aplicaciones</string> + <string name="apps_shortcut_remove">Quitar acceso directo</string> + <string name="apps_pin_title">Añadir a Aplicaciones</string> + <string name="apps_pin_add">Añadir</string> + <string name="apps_hidden_none">No hay aplicaciones ocultas.</string> + <string name="apps_sort_name_asc">Nombre A–Z</string> + <string name="apps_sort_name_desc">Nombre Z–A</string> + <string name="apps_sort_installed">Instaladas recientemente</string> + <string name="apps_sort_updated">Actualizadas recientemente</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicación</item> + <item quantity="many">%d aplicaciones</item> + <item quantity="other">%d aplicaciones</item> + </plurals> + <string name="desktop_restore_title">Restaurando tu software</string> + <string name="desktop_restore_body">Reinstalando las apps que añadiste tras una actualización de DroidDeck.</string> + <string name="desktop_restore_done_title">Software restaurado</string> + <string name="desktop_restore_done_body">Las apps que añadiste vuelven a estar instaladas.</string> + <string name="desktop_restore_failed_title">No se ha podido restaurar parte del software</string> + <string name="desktop_restore_failed_body">Consulta ~/.cache/droiddeck/apt-restore.log y después prueba sudo apt install en Konsole.</string> + <string name="gog_full_files">Las optimizaciones nativas no están disponibles. La descarga incluye archivos de reemplazo completos.</string> + <string name="gog_recover">Verificar el resultado del parche</string> + <string name="slow_usb_title">Conexión USB lenta</string> + <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán despacio. Usa un cable USB 3 de 5 Gbps o más, prueba a girar el conector USB-C o usa una unidad más rápida.</string> + <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no va más rápido, así que los juegos cargarán despacio. El almacenamiento interno o una microSD pueden ser más rápidos.</string> + <string name="slow_usb_never">No volver a mostrar</string> + <string name="slow_usb_dismiss">Descartar</string> + <string name="steam_import_title">¿Reiniciar Steam para añadir tus juegos?</string> + <string name="steam_import_body">Steam puede mostrar como instalados estos juegos que tienes: %1$s. Tiene que reiniciarse para mostrarlos. Reinicia ahora o se añadirán la próxima vez que se inicie Steam.</string> + <string name="steam_import_names_more">%1$s y %2$d más</string> + <string name="steam_import_now">Reiniciar ahora</string> + <string name="steam_import_later">Más tarde</string> + <string name="gog_maintenance">Administrar la instalación de GOG</string> + <string name="gog_check">Buscar actualizaciones</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Parches sin conexión</string> + <string name="gog_refresh">Descargar el instalador sin conexión completo</string> + <string name="gog_update">Actualizar a %1$s</string> + <string name="gog_resume">Reanudar el mantenimiento de GOG</string> + <string name="gog_open_patch">Abrir el instalador del parche</string> + <string name="gog_patch_in_session">Termina o cancela el instalador del parche en la sesión de Linux.</string> + <string name="gog_patch_requirements">Elige un parche para tu versión instalada y tu idioma. Puede que no aparezcan todas las versiones de origen compatibles.</string> + <string name="gog_no_patches">GOG no tiene parches independientes de Windows para este juego.</string> + <string name="gog_managed_files">Los archivos del juego modificados pueden reemplazarse.</string> + <string name="gog_patch_installer_note">El instalador se abre en tu sesión de Linux.</string> + <string name="gog_download_label">Descarga</string> + <string name="gog_space_label">Espacio adicional</string> + <string name="gog_space_estimate_label">Espacio estimado</string> + <string name="gog_repair_action">Reparar archivos</string> + <string name="gog_refresh_action">Renovar la instalación</string> + <string name="gog_select_patch">Seleccionar</string> + <string name="setup_all_files">Acceso a todos los archivos</string> + <string name="setup_local_network">Red local</string> + <string name="libraries_title">Más bibliotecas de Steam</string> + <string name="libraries_hint">Carpetas donde Steam puede instalar y ejecutar juegos, cada una con su propio nombre. Quitarlas conserva los juegos en el disco.</string> + <string name="libraries_add">Añadir biblioteca</string> + <string name="libraries_rename_title">Nombre de la biblioteca</string> + <string name="libraries_pick">Elige una carpeta para la biblioteca</string> + <string name="libraries_full">Como máximo %1$d bibliotecas adicionales</string> + <string name="libraries_overlap">Esa carpeta ya es una biblioteca o está dentro de una</string> + <string name="libraries_missing">%1$s · no disponible</string> + <string name="libraries_applies_next">Se aplica a partir de la próxima sesión de Steam</string> + <string name="bottom_desktop_start">Iniciar el escritorio</string> + <string name="bottom_desktop_mode_touch">Toque directo</string> + <string name="bottom_desktop_trackpad">Panel táctil. Toca para usar el toque directo</string> + <string name="bottom_desktop_direct_touch">Toque directo. Toca para usar el panel táctil</string> + <string name="bottom_desktop_starting">Iniciando el escritorio KDE…</string> + <string name="bottom_desktop_ended">El escritorio se cerró.</string> + <string name="bottom_desktop_failed">El escritorio no pudo iniciarse. Sus registros están en la carpeta bottom-desktop de esta sesión.</string> + <string name="bottom_desktop_off">El escritorio está cerrado.</string> + <string name="libraries_rename">Renombrar</string> + <string name="second_mode_desktop">Escritorio</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Escritorio · %1$s</string> </resources> diff --git a/app/src/main/res/values-fi/gestures.xml b/app/src/main/res/values-fi/gestures.xml index c92357b99..d575b7ff7 100644 --- a/app/src/main/res/values-fi/gestures.xml +++ b/app/src/main/res/values-fi/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Eleet</string> <string name="gesture_settings">Kosketuseleiden asetukset</string> - <string name="gesture_settings_hint">Mukauta hiiri- ja näppäimistöeleitä. Ota ne käyttöön valitsemalla kosketustilaksi Eleet.</string> <string name="gesture_tap">Napautus</string> <string name="gesture_drag">Veto yhdellä sormella</string> <string name="gesture_long_press">Pitkä painallus</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Pito kolmella sormella</string> <string name="gesture_pinch">Zoomaa nipistämällä</string> <string name="gesture_hold_button">Pidä painike painettuna</string> + <string name="gesture_hold_left">Pidä vasen painike painettuna</string> + <string name="gesture_hold_right">Pidä oikea painike painettuna</string> <string name="gesture_click_once">Napsauta kerran</string> <string name="gesture_hold_delay">Pidon viive</string> <string name="gesture_double_delay">Kaksoisnapautuksen aikaväli</string> diff --git a/app/src/main/res/values-fi/shortcuts.xml b/app/src/main/res/values-fi/shortcuts.xml new file mode 100644 index 000000000..b88d130f4 --- /dev/null +++ b/app/src/main/res/values-fi/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Fyysisten painikkeiden pikavalinnat</string> + <string name="shortcuts_dd_menu">DroidDeck-valikko</string> + <string name="shortcuts_capture">Määritä: %1$s</string> + <string name="shortcuts_press">Paina painiketta ja vapauta se. Määritys tallennetaan automaattisesti.</string> + <string name="shortcuts_release">Jatka vapauttamalla painike.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Tämä painike on jo määritetty toimintoon: %1$s</string> + <string name="shortcuts_save">Määritä uudelleen</string> + <string name="shortcuts_retry">Kokeile toista painiketta</string> + <string name="shortcuts_limitations">Koti-painike ja jotkin lisäpainikkeet eivät ehkä ole käytettävissä.</string> +</resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ac12cc7e8..0ce25cc6d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-asetukset D3D12:lle. nodxr poistaa säteenseurannan käytöstä; käytä vain peleissä, jotka sitä tarvitsevat.</string> <string name="game_env_proton_log">Aseta arvoon 1 Proton-diagnostiikkalokia varten. Lokitus voi heikentää suorituskykyä ja käyttää tallennustilaa.</string> <string name="game_env_wined3d">Aseta arvoon 1 käyttääksesi OpenGL-pohjaista WineD3D:tä DXVK:n sijaan D3D9–11-yhteensopivuuden testaamiseen.</string> + <string name="game_env_wined3d_renderer">Renderöijä DirectDraw-, Direct3D 1-7- ja WineD3D:llä ajettaville peleille. Vulkan ohittaa OpenGL-Zink-reitin ja on paljon nopeampi vanhoissa DirectDraw- ja Direct3D 7 -peleissä Adrenolla.</string> + <string name="game_env_dxvk_d3d8">Aseta arvoon 1 ajaaksesi Direct3D 8:n DXVK:n kautta WineD3D:n sijaan. Nopeampi AIO Graphics Testin Direct3D 8 -testissä Adrenolla.</string> <string name="game_env_no_ntsync">Aseta arvoon 1 pitääksesi tämän pelin poissa ntsyncistä (droiddeck-ntsync tai ydinajuri); se käyttää droiddeck-esynciä, jos paketti on olemassa, muuten droiddeck-fsynciä.</string> <string name="game_env_no_esync">Aseta arvoon 1 poistaaksesi droiddeck-esyncin käytöstä tälle pelille; se käyttää sen sijaan droiddeck-fsynciä, tai droiddeck-ntsynciä, jos fsync on myös pois käytöstä.</string> <string name="game_env_no_fsync">Aseta arvoon 1 pitääksesi tämän pelin poissa droiddeck-fsyncistä; se käyttää droiddeck-esynciä, jos paketti on olemassa, muuten droiddeck-ntsynciä.</string> <string name="game_env_fsync_first">Aseta arvoon 1 ajaaksesi tämän pelin droiddeck-fsyncillä, tai 0 asettaaksesi droiddeck-esyncin etusijalle, jos paketti sopii sen Protoniin.</string> <string name="game_env_xalia">Aseta arvoon 0 poistaaksesi käytöstä Protonin ohjaimen navigointiavustimen tälle pelille.</string> + <string name="game_env_anticheat_offline">Oletuksena päällä. Käynnistää Easy Anti-Cheat -pelin ilman huijauksenestoa, kun peli tukee offline-pelaamista. Poista käytöstä käynnistääksesi Easy Anti-Cheatin kautta tavalliseen tapaan. Easy Anti-Cheatia vaativat verkkotilat eivät ole käytettävissä.</string> <string name="game_env_hud">DXVK-peittokuva D3D9–11:lle. fps näyttää ruudunpäivitysnopeuden; tyhjänä piilottaa sen.</string> <string name="game_env_dxvk_config">DXVK-asetukset erotettuna puolipisteillä. Uudemmat versiot käyttävät dxvk.maxFrameRate-asetusta kuvanopeuden rajoittamiseen; käytä tavallisessa pelaamisessa ennemmin istunnon kuvanopeusrajoitinta.</string> + <string name="game_env_cores">Tämän pelin CPU-ytimet, esimerkiksi 0-4 tai 0,2,4, istunnon peliytimien sijaan. Vähemmän ytimiä pysyy viileämpänä.</string> <string name="game_env_vkd3d_limit">D3D12-kuvanopeusraja. 0 poistaa rajan käytöstä.</string> <string name="game_env_glthread">Mesan OpenGL-säikeistys. true voi auttaa CPU-rajoitteisissa OpenGL-peleissä; testaa pelikohtaisesti.</string> <string name="sync_backend_title">Wine-synkronointi</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX suorittaa x86-Linux-ohjelmia tällä ARM64-laitteella. Automaattinen käyttää sitä, kun ohjelma on tehty x86:lle.</string> <string name="app_fex_x86">%1$s FEXin kautta</string> <string name="app_fex_not_ready">Tämä ohjelma on tehty %1$s-tietokoneille ja käynnistyy FEXin kautta, jota ei ole vielä määritetty. Avaa Steam kerran kirjautuneena: DroidDeck lataa sen myötä FEXin ja tarvittavan Steam Linux Runtimen, jonka jälkeen tämä avautuu.</string> + <string name="session_proot_missing">DroidDeckin proota ei voitu ladata. Tarkista yhteys ja yritä uudelleen. Istuntoa ei käynnistetty, koska varaproot on liian hidas pelaamiseen.</string> + <string name="session_directaudio_missing">DirectAudiota ei voitu ladata, joten pelin ääni käyttää tässä istunnossa hitaampaa reittiä.</string> <string name="session_end_program">Tämä ohjelma</string> <string name="session_end_steam_download">Steam-asiakasohjelmaa ei voitu ladata. Verkkosi tai VPN saattaa estää Steamin palvelimet; tarkista yhteys ja yritä uudelleen.</string> <string name="session_end_steam_setup">Steam-asiakasohjelmaa ei voitu ottaa käyttöön. Tarkista yhteys ja vapaa tallennustila ja yritä uudelleen.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 -ohjain</string> <string name="mode_controller_note">Deck: pikavalikkopainike ja gyroskooppi. Steam Controller: samat, ja takapainikkeissa puristustunnistus. DualShock 4 ja DualSense: gyroskooppi, ja kosketuslevyt toimivat kosketuslevynä. Xbox 360: avaa pikavalikko Guide+A:lla.</string> <string name="mode_back">Back</string> + <string name="back_hold">Pidä Takaisin pohjassa Steam-pikanäppäimille</string> + <string name="back_hold_hint">Takaisin pohjassa pitäminen avaa pikavalikon tai tekee Steam-yhdistelmiä muiden painikkeiden kanssa. Poista käytöstä ohittaaksesi pitkän painalluksen; napautus ja kaksoisnapautus toimivat yhä.</string> + <string name="back_native_qam_hint">Pidä Back-painiketta 700 ms, tai pidä Back-painiketta ja paina toista painiketta Steam-pikanäppäimiä varten.</string> + <string name="back_double_tap_window">Kaksoisnapautuksen aikaikkuna</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Salli kirkkauden säätö</string> + <string name="brightness_permission_text">Ota kirkkauden säätö käyttöön DroidDeckissä.</string> <string name="back_menu_then_qam">Valikko → QAM</string> <string name="back_qam_then_menu">QAM → Valikko</string> <string name="mode_session">Istunto</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Ajan tasalla · %1$s</string> <string name="mode_decky_loader">Lataaja</string> <string name="mode_decky_install_latest">Asenna uusin</string> + <string name="decky_channel">Päivityskanava</string> + <string name="decky_channel_hint">Mitkä Decky Loader -julkaisut asennetaan. Deckyn oma päivitysohjelma käyttää samaa kanavaa.</string> + <string name="decky_channel_stable">Vakaa</string> + <string name="decky_channel_prerelease">Esijulkaisu</string> + <string name="decky_channel_testing">Testaus</string> + <string name="decky_channel_failed">Deckyn päivityskanavaa ei voitu tallentaa</string> <string name="mode_decky_on">Käynnistyy Steamin kanssa. Päällä ollessaan muut tämän laitteen sovellukset voivat pystyä ohjaamaan Steamia.</string> <string name="mode_decky_off">Pois. Steamin etävianmääritysportti pysyy suljettuna.</string> <string name="mode_decky_remove_title">Poistetaanko Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Asiakasohjelma</string> <string name="mode_mangoapp">Suorituskyvyn peittokuva</string> <string name="mode_mangoapp_hint">Poista käytöstä, jos pelit kaatuvat tai näyttö mustuu Deck-tilassa. Tulee voimaan seuraavassa istunnossa.</string> + <string name="mode_return_after_game">Palaa DroidDeckiin pelin jälkeen</string> + <string name="mode_return_after_game_hint">Kun DroidDeckistä tai muusta käynnistimestä aloittamasi peli sulkeutuu, Steam sulkeutuu hallitusti (pilvitallennukset valmistuvat ensin) ja palaat sinne. Pois: pysy Steamissa.</string> + <string name="mode_shader_precache">Sävyttimien esivälimuistitus</string> + <string name="mode_shader_precache_hint">Steam lataa peleillesi valmiiksi käännetyt sävyttimet ja käsittelee ne taustalla, joten pelit nykivät vähemmän. Pois päältä säästää dataa, tallennustilaa ja akkua; pelit kääntävät sävyttimet pelatessa. Sama asetus kuin Steamin Lataukset > Shader Pre-Caching. Tulee voimaan seuraavassa istunnossa.</string> <string name="mode_steam_repair">Korjaa Steam-asiakasohjelma</string> <string name="mode_steam_repair_hint">Lataa Steam-asiakasohjelman uudelleen, kun Steam käynnistyy seuraavan kerran. Käytä tätä, jos Steam jää lataus­näytölle. Pelit, kirjautuminen ja asetukset säilyvät.</string> <string name="mode_steam_repair_queued">Steam-asiakasohjelma ladataan uudelleen, kun Steam käynnistyy seuraavan kerran.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Ohittaa PulseAudion pienempää viivettä varten.</string> <string name="mode_mic">Mikrofoni</string> <string name="mode_mic_hint">Äänichattia varten.</string> + <string name="drawer_mic_hint">Kytke mikrofonin äänitys päälle tai pois tässä istunnossa.</string> + <string name="drawer_mic_failed">Mikrofonia ei voitu muuttaa. Yritä uudelleen.</string> <string name="mode_network">Verkko</string> <string name="mode_wifi_discovery">Wi-Fi-haku</string> <string name="mode_wifi_discovery_hint">Näytä Wi-Fi-nimet ja lähellä olevat verkot Steamissa.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: reaaliaikainen GPU-jono</string> <string name="perf_gsrealtime_hint">Priorisoi kompositorin GPU-työtä. Voi tasoittaa kuvanopeuden tahditusta pelien kustannuksella.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Muisti</string> + <string name="perf_cap_off">Pois</string> + <string name="perf_cap_auto">Ajurin oletus</string> + <string name="perf_zram_client">Pakkaa Steam pelin ollessa käynnissä</string> + <string name="perf_zram_client_hint">20 s pelin käynnistymisen jälkeen Steam-asiakasohjelma pakataan zRAMiin, jotta pelille jää enemmän muistia, ja luetaan takaisin, kun peli sulkeutuu. Poista tämä käytöstä, jos istunto sulkeutuu pian pelien käynnistymisen jälkeen. Yllä oleva RAM-raja pakkaa silti Steamin, kun istunto ylittää sen.</string> + <string name="perf_ram_cap">RAM-raja</string> + <string name="perf_ram_cap_hint">Koskee aikaa, jolloin Steam-asiakasohjelma on käynnissä, Steam-tilassa tai työpöydältä. Kun istunto käyttää tätä enemmän, Steam ja sen jälkeen istunnon muut tuetut prosessit pakataan zRAMiin. Pehmeä raja: mitään ei suljeta, mutta pelit voivat nykiä, kun sivuja luetaan takaisin.</string> + <string name="perf_ram_cap_unavailable">Vaatii zRAM-swapin, jota tässä laitteessa ei ole.</string> + <string name="perf_vram_cap">VRAM-raja</string> + <string name="perf_vram_cap_hint">Videomuisti, jonka DXVK ilmoittaa Direct3D-peleille, jotta ne mitoittavat tekstuurit pienemmälle. Pelin omat DXVK-asetukset menevät edelle. Tulee voimaan seuraavassa istunnossa.</string> <string name="perf_gpuclock">Pidä GPU huippukellotaajuudessaan</string> <string name="perf_gpuclock_hint">Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä.</string> <string name="perf_fixes">Istunnon korjaukset</string> <string name="perf_sysmem">Turnip: sysmem-renderöinti</string> <string name="perf_sysmem_hint">Nopeampi Steam-asiakasohjelmalle; peleissä ajuri valitsee jokaiselle vaiheelle ruuduittaisen tai järjestelmämuistiin tehtävän renderöinnin. Pakollinen Adreno 710/720/722:lla.</string> <string name="perf_xalia">Ohita Steamin xalia-avustaja</string> - <string name="perf_fastsync">droiddeck-ntsync (kokeellinen)</string> - <string name="perf_fastsync_hint">Käyttäjätilainen korvike Linuxin ntsync-ajurille, testausta varten. Kun se on päällä, Proton käyttää sitä droiddeck-esyncin ja droiddeck-fsyncin sijaan. Toimii Proton Experimental ARM64:n, GE-Protonin ja proton-cachyosin kanssa. Tulee voimaan seuraavassa istunnossa.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Käyttäjätilainen korvike Linuxin ntsync-ajurille. Kun se on päällä, Proton käyttää sitä droiddeck-esyncin ja droiddeck-fsyncin sijaan. Toimii Proton Experimental ARM64:n, GE-Protonin ja proton-cachyosin kanssa. Tulee voimaan seuraavassa istunnossa.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync etusijalle</string> <string name="perf_fsync_hint">Käynnistää Protonin omaa fsynciä vakiotiedostoilla, futex_waitv tarjottuna käyttäjätilassa, niin se ei tarvitse pakettia ja toimii edelleen heti kun Steam päivittää Protonin. Kun se on päällä, pelit käyttävät sitä droiddeck-esyncin edellä, paitsi harvat, jotka Proton pitää pois fsyncistä. Tulee voimaan seuraavassa istunnossa.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot-pikareitti</string> <string name="perf_fastpath_needs_seccomp">Vaatii prootin seccomp-suodattimen.</string> <string name="perf_fastpath_hint">Nopeampi tiedostojen hakeminen ja vähemmän nykimistä. Poista käytöstä, jos ohjelma ei löydä tiedostojaan.</string> + <string name="perf_cursor_composite">Piirrä osoitin gamescopessa</string> + <string name="perf_cursor_composite_hint">Gamescope piirtää osoittimen itse sen sijaan, että antaisi sen Androidille. Ota käyttöön ohjaimella ohjattavaa osoitinta varten. Pois päältä on nopeampi puhelimessa. Tulee voimaan seuraavassa istunnossa.</string> <string name="perf_identity">Istunnon identiteetti</string> <string name="perf_hostname">Isäntänimi</string> <string name="perf_hostname_hint">Nimi, jonka Steam näkee tälle laitteelle. Tyhjä palauttaa arvon %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Sen tiedostot poistetaan sovelluksesta.</string> <string name="driver_delete_in_use">Sen tiedostot poistetaan. Se on käytössä, joten oletus ottaa sen paikan.</string> <string name="drawer_page_display">Näyttö</string> + <string name="drawer_frame_limit">Kuvanopeusraja</string> + <string name="drawer_frame_limit_note">Rajoittaa tätä peliä. Näyttö vaihtaa virkistystaajuuteen, joka on rajan tasakerrannainen, jos sellainen on; muut rajat voivat näyttää epätasaisilta. Steam-pelit käyttävät Steamin Frame Limit -asetusta Pikavalikossa.</string> <string name="drawer_page_effects">Tehosteet</string> <string name="drawer_page_controls">Ohjaimet</string> <string name="drawer_page_components">Komponentit</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Meripihka</string> <string name="drawer_hud_color_violet">Violetti</string> <string name="drawer_hud_opacity">Peittävyys</string> + <string name="hud_size">Koko</string> + <string name="hud_size_hint">HUD:n napauttaminen muuttaa myös sen kokoa.</string> + <string name="hud_size_full">Täysi</string> + <string name="hud_size_tiles">Ruudut</string> + <string name="hud_size_pill">Kapseli</string> + <string name="hud_size_minimal">Minimaalinen</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Palkki</string> + <string name="hud_locked">Lukitse paikalleen</string> + <string name="hud_locked_hint">Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen.</string> + <string name="hud_snap">Kiinnitä sivuille</string> + <string name="hud_snap_hint">Kun päästät HUDista irti, se siirtyy näytön lähempään reunaan. Nopea pyyhkäisy heittää sen siihen suuntaan.</string> + <string name="hud_group_look">Ulkoasu</string> + <string name="hud_scale">Koko näytöllä</string> + <string name="hud_color_soft">Pehmeä</string> + <string name="hud_color_mid">Keskitaso</string> + <string name="hud_color_vivid">Kirkas</string> + <string name="hud_outline">Ääriviiva</string> + <string name="hud_outline_color">Ääriviivan väri</string> + <string name="hud_outline_gray">Harmaa</string> + <string name="hud_outline_theme">Teeman väri</string> + <string name="hud_group_metrics">Lukemat</string> + <string name="hud_metric_graph">Kuva-aikakäyrä</string> + <string name="hud_metric_decimal">Kuvataajuus desimaalilla</string> + <string name="hud_metric_low001" formatted="false">0.01% alin</string> + <string name="hud_metric_engine">Grafiikkamoottori</string> + <string name="hud_metric_gpu_model">GPU:n nimi</string> + <string name="hud_metric_gpu">GPU:n kuorma</string> + <string name="hud_metric_gpu_temp">GPU:n lämpötila</string> + <string name="hud_metric_cpu">CPU:n kuorma</string> + <string name="hud_metric_per_core">CPU ytimittäin</string> + <string name="hud_metric_temp">Lämpötilat</string> + <string name="hud_metric_ram">Muisti</string> + <string name="hud_metric_vram">Näytönohjaimen muisti</string> + <string name="hud_metric_swap">Swap-tila</string> + <string name="hud_metric_battery">Akun varaus</string> + <string name="hud_metric_power">Virrankulutus</string> + <string name="hud_metric_network">Verkko</string> + <string name="hud_metric_resolution">Tarkkuus</string> + <string name="hud_metric_proton">Proton-versio</string> + <string name="hud_metric_session">Istunnon kesto</string> + <string name="hud_metric_clock">Kello</string> + <string name="hud_group_temps">Lämpötilat</string> + <string name="hud_temp_unit">Yksikkö</string> + <string name="hud_temp_bands">Varoitusvärit</string> + <string name="hud_temp_bands_hint">Lämpötilat muuttuvat meripihkanvärisiksi ja sitten punaisiksi, kun ne lähestyvät rajaa.</string> + <string name="hud_temp_bands_off">Pois</string> + <string name="hud_temp_bands_auto">Automaattinen</string> + <string name="hud_temp_bands_manual">Manuaalinen</string> + <string name="hud_temp_red_cpu">CPU:n punainen raja</string> + <string name="hud_temp_red_gpu">GPU:n punainen raja</string> + <string name="hud_temp_red_battery">Akun punainen raja</string> + <string name="hud_group_more">Lisää</string> + <string name="hud_export">HUD-diagnostiikka</string> + <string name="hud_export_hint">Tallentaa raportin kaikista HUD:n lukemista antureista kansioon Downloads/DroidDeck.</string> + <string name="hud_export_button">Tallenna</string> + <string name="hud_export_done">Tallennettu: %1$s</string> + <string name="hud_export_failed">HUD-raporttia ei voitu tallentaa.</string> + <string name="hud_reset">Palauta HUD-asetukset</string> + <string name="hud_reset_button">Palauta</string> <string name="drawer_scaling">Skaalaustila</string> <string name="drawer_scaling_sharpness">Skaalauksen terävyys</string> <string name="drawer_effects">Näyttötehosteet</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Automaattinen (%1$s)</string> <string name="drawer_keyboard">Näppäimistö</string> <string name="drawer_latency">Viive</string> + <string name="drawer_low_latency">Matalan viiveen tila</string> + <string name="drawer_low_latency_hint">Lisää CPU:n ja akun käyttöä</string> <string name="drawer_low_latency_controller">Matalan viiveen ohjain</string> <string name="drawer_low_latency_controller_hint">Ohjain raportoi 1000 Hz:n taajuudella 250 Hz:n sijaan. Hieman enemmän CPU:ta.</string> <string name="drawer_low_latency_touch">Matalan viiveen kosketus</string> <string name="drawer_low_latency_touch_hint">Kosketukset ohittavat ruutujen niputuksen, joten Steamin kosketusohjaus toimii 1000 Hz:llä. Hieman enemmän CPU:ta.</string> + <string name="drawer_evdev_mouse">Raaka hiirikanava</string> + <string name="drawer_direct_cursor">Osoitin</string> <string name="drawer_pc_keyboard">PC-näppäimistö</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Toinen näyttö</string> @@ -715,6 +834,10 @@ <string name="setup_session">Istunto</string> <string name="setup_logs">Istunnon lokit</string> <string name="setup_logs_hint">Tallennetaan joka istunnon jälkeen</string> + <string name="setup_game_debug_logs">Pelien vianmäärityslokit</string> + <string name="setup_game_debug_logs_hint">Sisällytä Protonin, Winen ja grafiikan diagnostiikka seuraavaan pelin käynnistykseen. Voi heikentää suorituskykyä ja käyttää enemmän tallennustilaa.</string> + <string name="setup_game_debug_logs_restart">Käynnistä tämä istunto uudelleen tallentaaksesi pelien vianmäärityslokit</string> + <string name="setup_logging_update_failed">Lokitusta ei voitu päivittää. Tarkista kytkin ja yritä uudelleen.</string> <string name="setup_agent_commands">Vianmääritystyökalut</string> <string name="setup_latest_logs">Viimeisimmät istunnon lokit</string> <string name="setup_saved_logs">Tallennetut istunnon lokit</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck voi olla kotisovellus</string> <string name="setup_home_off">DroidDeckiä ei koskaan tarjota kotisovellukseksi</string> <string name="setup_orientation">Suunta</string> + <string name="setup_launcher_orientation">Käynnistimen suunta</string> + <string name="setup_launcher_orientation_auto">Seuraa laitteen kiertoa</string> + <string name="setup_orientation_portrait">Pystysuunta</string> + <string name="setup_session_orientation">Istunnon suunta</string> + <string name="setup_session_orientation_hint">Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; mukautettu leveys ja korkeus pysyvät syötetyn mukaisina.</string> <string name="setup_orientation_auto">Automaattinen vaakasuunta</string> <string name="setup_orientation_landscape">Vaakasuunta</string> <string name="setup_orientation_reverse">Käänteinen vaakasuunta</string> <string name="setup_fullscreen">Koko näyttö</string> <string name="setup_fullscreen_on">Piilottaa Androidin tila- ja navigointipalkit</string> <string name="setup_fullscreen_off">Näyttää Androidin tila- ja navigointipalkit</string> + <string name="setup_dual_screen">Kaksi näyttöä</string> + <string name="setup_dual_screen_hint">Automaattinen käyttää toista näyttöä kämmenlaitteissa, joissa sellainen on sisäänrakennettuna. Päällä käyttää mitä tahansa toista näyttöä. Pois pitää kaiken yhdellä näytöllä.</string> + <string name="setup_dual_screen_auto">Automaattinen</string> + <string name="setup_dual_screen_on">Päällä</string> + <string name="setup_dual_screen_off">Pois</string> + <string name="setup_dual_screen_menu">Alanäytön valikko</string> + <string name="setup_dual_screen_menu_hint">Siirtää osiot ja pelin aikaisen valikon toiselle näytölle ja kirjoitus tehdään siellä, joten yläruutu säilyttää koko näkymän. L2 ja R2 vaihtavat osiota.</string> + <string name="setup_dual_screen_controls">Alanäytön ohjaimet peleissä</string> + <string name="setup_dual_screen_controls_hint">Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa.</string> + <string name="dual_typing_title">Kirjoitus yläruudulle</string> + <string name="dual_typing_done">Valmis</string> <string name="setup_default_home">Oletuskotisovellus</string> <string name="setup_choose_home">Valitse kotisovellus</string> <string name="setup_choose">Valitse</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Avaa Asetukset → Kehittäjäasetukset → Langaton virheenkorjaus ja kytke se päälle</string> <string name="gate_step2">Napauta ”Pariuta laite pariutuskoodilla”</string> <string name="gate_step3">Kirjoita koodi DroidDeckin ilmoitukseen</string> + <string name="pairguide_build_number">Napauta Tietoa puhelimesta -kohdassa Koontiversiota 7 kertaa</string> + <string name="pairguide_wireless">Ota Langaton virheenkorjaus käyttöön</string> + <string name="pairguide_pair">Avaa Langaton virheenkorjaus ja napauta ”Muodosta laitepari laiteparikoodilla”</string> + <string name="pairguide_child_process">Ota käyttöön ”Poista käytöstä alatason prosessirajoitukset”</string> + <string name="pairguide_row_child_process">Poista käytöstä alatason prosessirajoitukset</string> + <string name="pairguide_row_build_number">Koontiversio</string> + <string name="pairguide_row_wireless">Langaton virheenkorjaus</string> + <string name="pairguide_row_pair">Muodosta laitepari laiteparikoodilla</string> <string name="gate_waiting">Odotetaan pariutuksen ponnahdusikkunaa…</string> <string name="gate_code_needed">Ponnahdusikkuna löytyi. Syötä sen koodi ilmoitukseen.</string> <string name="gate_status">Tila</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Ei pelattu koskaan</string> <string name="games_runtime_busy_percent">Ajoympäristö varattu · %1$d %%</string> <string name="games_runtime_busy">Ajoympäristö varattu</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Piilota muiden GPU:iden ajurit</string> <string name="gpu_show_other">Näytä muiden GPU:iden ajurit</string> <string name="gpu_advanced">Lisäasetukset</string> + <string name="gpu_ubwc_title">UBWC-yhteensopivuus</string> + <string name="gpu_ubwc_hint">Kokeile Päällä tai Pois, jos Steamissa tai Androidissa näkyy raitoja tai välkyntää. Koskee molempia ajureita DroidDeckin uudelleenkäynnistyksen jälkeen.</string> + <string name="gpu_ubwc_restart">Käynnistä DroidDeck uudelleen, jotta muutos tulee voimaan.</string> <string name="gpu_set_with_display">Asetetaan yhdessä näyttöajurin kanssa: %1$s kattaa molemmat.</string> <string name="gpu_set_with_runtime">Asetetaan yhdessä ajoympäristöajurin kanssa: %1$s kattaa molemmat.</string> <string name="gpu_runtime_hint">Käytetään peleissä ja työpöydällä.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Siirry automaattisesti kuva kuvassa -tilaan</string> <string name="unfolded_controls">Ohjaimet avattuna näytöllä</string> <string name="unfolded_controls_hint">Avattuna peli sijaitsee Steam Deckin kosketuslevyjen ja takakahvojen yläpuolella. Taitettuna peli on koko näytön kokoinen.</string> + <string name="unfolded_controls_with_controller">Pidä ne ohjaimen kanssa</string> + <string name="unfolded_controls_with_controller_hint">Näytä nämä kosketusohjaimet myös, kun ohjain on kytketty.</string> <string name="pip_suspended">Keskeytetty</string> <string name="pip_not_ready">Kuva kuvassa -tila on käytettävissä, kun istunto on valmis.</string> <string name="pip_permission">Salli kuva kuvassa -tila DroidDeckille Android-asetuksissa.</string> <string name="pip_unavailable">Android ei pystynyt avaamaan kuva kuvassa -tilaa.</string> + <string name="game_more">Lisää</string> + <string name="game_edit_art">Muokkaa kuvitusta</string> + <string name="stores_in_steam_label">Steamissa</string> <string name="game_shortcut">Pikakuvake</string> <string name="game_shortcut_add">Lisää aloitusnäytölle</string> <string name="game_shortcut_choose">Valitse peli</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Odota, että ajoympäristötoiminto päättyy</string> <string name="main_wait_proton_install">Odota, että yhteensopivuustyökalun asennus päättyy</string> + <string name="load_compat_title">Valmistellaan yhteensopivuustyökaluja</string> + <string name="load_compat_wait">Odotetaan yhteensopivuusasetusten valmistumista</string> + <string name="load_compat_hint">Istuntosi alkaa, kun asennus valmistuu.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Odota, että työpöytäsovelluksen asennus päättyy</string> <string name="main_wait_install_game">Odota, että asennus päättyy ennen pelin käynnistämistä</string> <string name="main_saves_close_session">Sulje Steam-istunto ensin, jotta peli ei voi tallentaa tuonnin päälle</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Asenna silti</string> <string name="main_remove_runtime_title">Poista Linux-ajoympäristö</string> <string name="main_remove_runtime_text">Tämä poistaa ajoympäristön, siihen asennetun Steam-asiakasohjelman ja kaikki sinne asennetut pelit.</string> + <string name="runtime_actions_title">Linux-ajoympäristö</string> + <string name="runtime_actions_text">Korjaa asentaa ajoympäristön järjestelmätiedostot uudelleen ja säilyttää Steamin, pelisi ja asetuksesi. Lisäosat, kuten työpöytä, asennetaan uudelleen, kun seuraavan kerran käytät niitä. Poista poistaa kaiken.</string> + <string name="runtime_repair">Korjaa ajoympäristö</string> <string name="main_applied">Otettu käyttöön: %1$s</string> <string name="android_app_open_failed_primary">Sovelluksen %1$s avaaminen ensisijaisella näytöllä epäonnistui</string> <string name="android_app_open_failed_on">Sovelluksen %1$s avaaminen näytöllä %2$s epäonnistui</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Ajoympäristöluetteloon ei saatu yhteyttä. Tarkista yhteys ja paina Play uudelleen.</string> <string name="session_runtime_install_failed">Linux-ajoympäristö ei asentunut. Tarkista ajoympäristö Asetuksissa ja paina Play uudelleen.</string> <string name="session_desktop_install_failed">Työpöytä ei asentunut (%1$s). Tarkista yhteys ja paina Työpöytä uudelleen.</string> + <string name="session_package_resume_failed">Keskeytynyttä asennusta ei voitu viimeistellä (%1$s). Tarkista yhteys ja vapaa tila ja yritä uudelleen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-ajoympäristö on vaurioitunut: %1$d kirjastolinkki osoittaa puuttuvaan tiedostoon (%2$s), yleensä keskeytyneen asennuksen jälkeen. Korjaus säilyttää pelisi ja asetuksesi.</item> + <item quantity="other">Linux-ajoympäristö on vaurioitunut: %1$d kirjastolinkkiä osoittaa puuttuviin tiedostoihin (%2$s ja muita), yleensä keskeytyneen asennuksen jälkeen. Korjaus säilyttää pelisi ja asetuksesi.</item> + </plurals> <string name="session_ended_named">%1$s pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> <string name="session_ended_program">Ohjelma pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> <string name="session_ended_desktop">Työpöytä pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Asenna laajennuksen ZIP-tiedosto seuraavaa Steam-istuntoa varten.</string> <string name="mode_decky_plugin_downloading">Latautuu…</string> <string name="mode_decky_plugin_install_zip">Asenna ZIP-tiedostosta</string> + <string name="decky_zip_warning_title">Kolmannen osapuolen laajennuksen asennus</string> + <string name="decky_zip_warning_text">Decky Loader -tiimi ei ole tarkistanut tätä laajennusta. Se voi sisältää haittaohjelmia, kuten ohjelmia, jotka varastavat Steam-tilisi tai vahingoittavat laitettasi. Asentamalla tämän laajennuksen hyväksyt, että otat kaikki laitteeseesi kohdistuvat riskit.</string> + <string name="decky_zip_warning_continue">Jatka</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Odota %1$d sekunti</item> + <item quantity="other">Odota %1$d sekuntia</item> + </plurals> <string name="store_cat_games">Pelit</string> <string name="store_cat_audio_video">Ääni ja video</string> <string name="store_cat_graphics">Grafiikka</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Musta pohja, valkoinen teksti, sininen kaikessa valitussa, kohdistetussa tai painetussa.</string> <string name="theme_electric">Sähköinen laivastonsininen</string> <string name="theme_electric_detail">Sininen kirkkaampana pinnoilla, jotka taittuvat harmaan sijaan laivastonsiniseen.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Värit, jotka kiertävät sateenkaaren läpi. Noudattaa Androidin animaatioasetuksia.</string> + <string name="theme_rgb_speed">Nopeus</string> + <string name="theme_rgb_speed_hint">Kuinka nopeasti värit vaihtuvat.</string> <string name="theme_gradient">Liukuväri</string> <string name="theme_gradient_detail">Omat ensisijainen ja toissijainen värisi, sulautettuina painikkeisiin ja korostuksiin.</string> <string name="theme_gradient_primary">Ensisijainen</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Ohita</string> <string name="fm_select_this_folder">Valitse tämä kansio</string> <string name="fm_back">Takaisin</string> + <string name="fm_exit">Poistu</string> + <string name="fm_return_to_start">Palaa aloituskansioon</string> + <string name="fm_start_unavailable">Aloituskansio ei ole enää käytettävissä</string> + <string name="fm_cancel_operation_title">Peruutetaanko toiminto?</string> + <string name="fm_cancel_operation_confirmation">Toiminto peruutetaan. Oletko varma?</string> + <string name="fm_accept">Hyväksy</string> + <string name="fm_decline">Hylkää</string> <string name="fm_drive_not_readable">%1$s on liitetty, mutta ei ole luettavissa juuri nyt</string> + <string name="fm_drive_access_title">Salli pääsy kohteeseen %1$s</string> + <string name="fm_drive_access_text">Android antaa DroidDeckin nähdä tämän aseman mutta ei lukea sitä. Ota DroidDeckille käyttöön Pääsy kaikkiin tiedostoihin ja palaa sitten takaisin.</string> <string name="fm_list_view">Luettelonäkymä</string> <string name="fm_grid_view">Ruudukkonäkymä</string> <string name="fm_search">Hae</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Näppäimistö + kosketuslevy</string> <string name="second_mode_terminal">Pääte</string> <string name="second_mode_deck_controls">Deck-kahvat + kosketuslevyt</string> + <string name="second_mode_dashboard">Kojelauta</string> + <string name="bottom_dashboard_empty">Täällä ei ole vielä mitään näytettävää.</string> + <string name="bottom_page_downloads">Lataukset</string> + <string name="bottom_downloads_none">Latauksia ei ole käynnissä.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Ladataan sävytinvälimuistia</string> + <string name="bottom_downloads_paused">Keskeytetty</string> + <string name="bottom_downloads_queued">Odottaa alkamista</string> + <string name="bottom_page_notifications">Ilmoitukset</string> + <string name="bottom_notifications_listener">DroidDeckin alanäyttö</string> + <string name="bottom_notifications_why">Näytä viestit ja muut ilmoitukset täällä pelatessasi. Ne näkyvät vain tällä näytöllä, eikä niitä tallenneta. Android kysyy kerran: sen ilmoitusten käyttöoikeussivu avautuu tälle näytölle; kytke DroidDeck siellä päälle, niin tämä sivu palaa itsestään.</string> + <string name="bottom_notifications_allow">Salli ilmoitusten käyttö</string> + <string name="bottom_notifications_none">Ei ilmoituksia.</string> + <string name="bottom_notifications_count">Ilmoituksia: %1$d</string> + <string name="bottom_notifications_clear">Tyhjennä</string> + <string name="bottom_page_screenshots">Kuvakaappaukset</string> + <string name="stats_fps_needs_hud">FPS vaatii HUD:n päälle</string> + <string name="stats_speed">Nopeus</string> + <string name="stats_pedals">Polkimet</string> + <string name="stats_gforce">G-voima</string> + <string name="stats_timing">Ajanotto</string> + <string name="stats_best_lap">Paras kierros</string> + <string name="stats_tires">Renkaat °C</string> + <string name="stats_trace">Kaasu ja jarru, viimeiset 10 s</string> + <string name="stats_speed_chart">Nopeus, %1$s</string> + <string name="stats_gear">Vaihde</string> + <string name="stats_speed_units">Nopeuden yksiköt</string> + <string name="stats_speed_units_auto">Automaattinen (%1$s)</string> + <string name="stats_steam_client_arm">Steam-asiakasohjelma ARM</string> + <string name="stats_steam_client_x86">Steam-asiakasohjelma x86</string> + <string name="stats_throttle">Kaasu</string> + <string name="stats_brake">Jarru</string> + <string name="stats_lights">Kojelauta</string> + <string name="stats_lamp_shift">Vaihto</string> + <string name="stats_lamp_handbrake">Käsijarru</string> + <string name="stats_lamp_pit">Varikkorajoitin</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Moottori %1$s °C</string> + <string name="stats_oil_temp">Öljy %1$s °C</string> + <string name="stats_power">Tehonjakaja</string> + <string name="stats_fuel_t">Polttoaine, t</string> + <string name="stats_fuel_main">Päätankki %1$s t</string> + <string name="stats_fuel_reserve">Varatankki %1$s t</string> + <string name="stats_tap_hint">Napauta yläpalkkia tai kojelautaa vaihtaaksesi sen tyyliä.</string> + <string name="bottom_telemetry_send_title">Lähetä kojelaudan tiedot</string> + <string name="bottom_telemetry_send_auto">Automaattinen</string> + <string name="bottom_telemetry_send_auto_hint">Kytkee sen päälle jokaiselle tässä luetellulle pelille, myös myöhemmin löytyville. Pois kytkemäsi pelit pysyvät pois päältä.</string> + <string name="bottom_telemetry_send_note">Tämä muuttaa pelin omaa datan ulostulon asetusta. Muutos tulee voimaan, kun peli käynnistetään seuraavan kerran; pois kytkeminen palauttaa vanhan asetuksen.</string> + <string name="bottom_telemetry_send_close">Sulje %1$s muuttaaksesi tätä.</string> + <string name="bottom_telemetry_send_failed">Pelin %1$s asetuksia ei voitu muuttaa.</string> + <string name="bottom_telemetry_send_menu">%1$s: kytke pelin asetuksista päälle %2$s IP-osoitteella 127.0.0.1 ja portilla %3$d.</string> + <string name="bottom_shots_where">Tallennetaan kansioon Pictures/DroidDeck. Myös Steamin kuvakaappaukset näkyvät täällä.</string> + <string name="bottom_shots_take">Ota kuvakaappaus</string> + <string name="bottom_shots_saved">Kuvakaappaus tallennettu.</string> + <string name="bottom_shots_failed">Kuvakaappausta ei voitu ottaa.</string> + <string name="bottom_shots_none">Ei vielä kuvakaappauksia.</string> + <string name="bottom_page_chat">Chat & ääni</string> + <string name="bottom_chat_why">Lue Steam-chattia ja vastaa siihen täällä, kun peli jatkuu päänäytöllä. Se käyttää tiliä, jolla Steamiin on kirjauduttu.</string> + <string name="bottom_chat_not_signed_in">Steamilla ei ole vielä jaettavaa verkkokirjautumista, joten kirjaudu tässä kerran.</string> + <string name="bottom_chat_stopped">Android sulki chat-sivun, kun DroidDeck oli taustalla. Se avautuu uudelleen, kun palaat DroidDeckiin.</string> + <string name="bottom_chat_open">Avaa Steam Chat</string> + <string name="bottom_chat_close">Sulje chat</string> + <string name="bottom_chat_mic_on">Mikrofoni päällä</string> + <string name="bottom_chat_mic_off">Mikrofoni pois</string> + <string name="bottom_chat_mic_unavailable">Mikrofoni on pois päältä tässä pelissä. Jos haluat puhua, kytke Mikrofoni päälle DroidDeckin Steam-asetuksissa (Ääni) ja käynnistä peli uudelleen.</string> + <string name="bottom_chat_volume">Äänenvoimakkuus %1$d %%</string> + <string name="bottom_page_telemetry">Pelinsisäiset tilastot</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akku</string> + <string name="bottom_telemetry_lap">Kierros</string> + <string name="bottom_telemetry_position">Sijoitus</string> + <string name="bottom_telemetry_this_lap">Tämä kierros</string> + <string name="bottom_telemetry_last_lap">Edellinen kierros</string> + <string name="bottom_telemetry_fuel">Polttoaine</string> + <string name="bottom_telemetry_cargo">Lasti</string> + <string name="bottom_telemetry_pips">Tehopisteet SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Oikeudellinen asema</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Kytke kilpa-ajopelin datan ulostulo päälle (usein nimeltään telemetria tai UDP), niin näet täällä reaaliaikaisen kojelaudan. Tiedot pysyvät tällä laitteella.</string> + <string name="bottom_telemetry_unknown_format">Portti %1$d vastaanottaa dataa (%2$d pakettia, kukin %3$d tavua), mutta muodossa, jota tämä sivu ei vielä osaa lukea.</string> + <string name="bottom_telemetry_port_busy">Toinen ohjelma käyttää jo porttia %1$s, joten peliä ei voida näyttää täällä.</string> <string name="rtinst_removing">Poistetaan Linux-ajoympäristöä</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Asenna Flatpak ensin</string> <string name="flatpakmgr_starting">Käynnistetään</string> <string name="flatpakmgr_exit_status">Flatpak sulkeutui tilakoodilla %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s on tehty alustalle %2$s, jota DroidDeck ei pysty ajamaan. Flatpak-sovelluksista tarvitaan täällä ARM64- tai x86_64-versio.</string> <string name="flatpakmgr_installing">Asennetaan %1$s</string> <string name="flatpakmgr_updating">Päivitetään %1$s</string> <string name="flatpakmgr_removing">Poistetaan %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Otetaan asetusta käyttöön…</string> <string name="adbpair_command_failed">Langattoman virheenkorjauksen komento epäonnistui</string> <string name="adbpair_channel_name">Langattoman virheenkorjauksen käyttöönotto</string> + <string name="adbpair_progress_channel_name">Langattoman virheenkorjauksen käyttöönoton edistyminen</string> <string name="adbpair_channel_description">Kysyy langattoman virheenkorjauksen parituskoodia Asetusten ollessa auki</string> <string name="adbpair_title_pair">Paritä langaton virheenkorjaus</string> <string name="adbpair_waiting_text">Ota langaton virheenkorjaus käyttöön ja napauta ”Yhdistä laite paritunnuksella”.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Ei Adreno-grafiikkapiiri</string> <string name="gpuinfo_supported">Tuettu</string> <string name="gpuinfo_experimental">Kokeellinen: sen ajurit ovat testiversioita</string> + <string name="gpuinfo_a850_experimental">Kokeellinen Adreno 850 -tuki: vaatii yhteensopivat kokeelliset näyttö- ja peliajurit; ei vahvistettu tällä laitteella</string> <string name="gpuinfo_below_tested">Testatun laitteiston alapuolella (Adreno 725 ja uudemmat): ei välttämättä toimi</string> <string name="gpuinfo_unsupported">Ei tuettu: DroidDeck vaatii Adreno (Snapdragon) -grafiikkapiirin</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Skaalattu %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Näytä laitteen tiedot</string> <string name="device_info_hide">Piilota laitteen tiedot</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Järjestä</string> + <string name="setup_rail_labels">Sivupalkin nimikkeet</string> + <string name="setup_rail_labels_hint">Näytä nimet sivupalkin kuvakkeiden alla. Poista käytöstä kapeampaa sivupalkkia varten.</string> + <string name="library_display">Näkymä</string> + <string name="library_display_larger">Suuremmat kortit</string> + <string name="library_display_smaller">Pienemmät kortit</string> + <string name="library_display_title">Näytä nimi</string> + <string name="library_display_size">Näytä koko</string> <string name="stores_sort_last_played">Viimeksi pelatut</string> <string name="stores_sort_recently_installed">Viimeksi asennetut</string> <string name="stores_sort_title_asc">Nimi A–Ö</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Latausten hallinta</string> <string name="stores_parallel">Samanaikaisia latauksia</string> <string name="stores_install_where">Asenna kohteeseen</string> + <string name="stores_install_language">Pelin kieli</string> + <string name="stores_install_language_hint">GOG ja Epic asentavat tämän kielen. Järjestelmä seuraa sovelluksen kieltä.</string> + <string name="stores_install_language_system">Järjestelmä</string> <string name="stores_install_title">Asenna %1$s:</string> <string name="stores_target_internal">Sisäinen</string> <string name="stores_target_free">%1$s vapaana</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Kohde</string> <string name="edit_start_in">Käynnistyskansio</string> <string name="edit_launch_options">Käynnistysasetukset</string> + <string name="edit_launch_options_steam_hint">Jaettu Steamin Ominaisuuksien kanssa: muutos jommassakummassa näkyy molemmissa.</string> + <string name="edit_launch_options_not_saved">Käynnistysasetuksia ei voitu tallentaa Steamiin. Yritä uudelleen.</string> + <string name="edit_launch_options_desktop">Steam voi olla auki työpöytäistunnossa. Muuta käynnistysasetuksia sen Ominaisuuksista tai sulje istunto ensin.</string> <string name="edit_artwork">Kuvitus</string> <string name="edit_other_exe">Toinen exe…</string> <string name="edit_remove">Poista</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Oma etuliite</string> <string name="setup_download_mirror">Sivusto</string> <string name="setup_download_prefix">Etuliite</string> + <string name="setup_download_proxy">HTTP-välityspalvelin</string> <string name="flathub_eyebrow">LINUX-SOVELLUKSET</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Työpöytäsovelluksia Linux-työpöydälle, avataan Työpöydältä.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Automaattinen pitää tämän 2D-pelin paikallaan näkymässä. Valitse Näyttö-kohdasta Virtuaalinen näyttö, jos haluat käyttää pään seurantaa.</string> <string name="glasses_tracking_sbs_hint">Pään seuranta koskee virtuaalista näyttöä tai käynnissä olevaa SteamVR-peliä.</string> <string name="glasses_hardware">Laite</string> + <string name="vr_controllers_tab">Ohjaimet</string> + <string name="vr_controllers_group">SteamVR-ohjaimet</string> + <string name="vr_controllers_emulate">Peliohjain VR:ssä</string> + <string name="vr_controllers_emulate_hint">Kaksi VR-kättä, joina ohjaimesi toimii. Muutokset tulevat voimaan heti, myös SteamVR:n ollessa käynnissä. Joy-Conit ja seuratut kädet ottavat silti oman puolensa hallintaan.</string> + <string name="vr_controllers_off">Tavallinen peliohjain</string> + <string name="vr_controllers_index">Valve Index -ohjaimet</string> + <string name="vr_controllers_touch">Meta Quest 3 -ohjaimet</string> + <string name="vr_controllers_vive">HTC Vive -ohjaimet</string> + <string name="vr_controllers_sticks">Tikut aloittavat</string> + <string name="vr_controllers_sticks_hint">Vaihda painamalla molemmat tikut yhtä aikaa pohjaan VR:n aikana.</string> + <string name="vr_controllers_sticks_game">Liikuttamalla sinua pelissä</string> + <string name="vr_controllers_sticks_hands">Liikuttamalla käsiä</string> + <string name="vr_controllers_buttons">Painikkeet</string> + <string name="vr_controllers_buttons_stick">Liipaisimet ovat liipaisimia, olkapainikkeet tarttuvat, A/B ja X/Y ovat kummankin käden etupainikkeet, tikkujen painallus painaa peukalotikkuja, Guide avaa SteamVR-valikon. Ristiohjaimen ylös ja alas siirtää käsiä lähemmäs tai kauemmas.</string> + <string name="vr_controllers_buttons_vive">Tikut ovat kosketuslevyjä; A/X tai tikun painallus painaa niitä. Liipaisimet ovat liipaisimia, olkapainikkeet tarttuvat, Start ja Select ovat valikko, Guide avaa SteamVR-valikon.</string> + <string name="vr_controllers_buttons_off">Ei VR-käsiä. Peliohjainta tukevat pelit ja SteamVR-valikko saavat ohjaimesi tavalliseen tapaan.</string> <string name="glasses_brightness">Kirkkaus</string> <string name="glasses_volume">Äänenvoimakkuus</string> <string name="glasses_sunblock">Tummennus</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Kameran sijoitus</string> <string name="hand_camera_placement_hint">Tarkista, että kamera näkee sinut ennen pelaamista.</string> <string name="hand_camera_check">Tarkista</string> + <string name="tracking_pack_title">Käsienseurannan lataus</string> + <string name="tracking_pack_hint">Käsienseuranta vaatii kertaluonteisen %1$s:n latauksen.</string> + <string name="tracking_pack_download">Lataa</string> + <string name="tracking_pack_retry">Yritä uudelleen</string> + <string name="tracking_pack_downloading">Ladataan käsienseurantaa… %1$d%%</string> + <string name="tracking_pack_failed">Käsienseurantaa ei voitu ladata. Tarkista yhteys ja yritä uudelleen.</string> <string name="hand_camera_check_title">Kameran sijoitus</string> <string name="hand_camera_how_rear">Aseta laite pystyyn noin rinnan korkeudelle 1,5–2 metrin päähän niin, että takakamera on sinua kohti. Astu sitten näkyviin kädet ojennettuina.</string> <string name="hand_camera_how_front">Aseta laite pystyyn noin rinnan korkeudelle 1,5–2 metrin päähän niin, että näyttö on sinua kohti. Astu sitten näkyviin kädet ojennettuina.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Käyttämättömät ajonaikaympäristöt, jäänteet, vanhat lokit</string> <string name="storage_clean_up">Siivotaan…</string> <string name="storage_session_running">Pysäytä istunto, jos haluat siivota tai poistaa jotain. Koot näkyvät silti.</string> + <string name="storage_default_group">Asennussijainti</string> + <string name="storage_default_title">Oletustallennustila</string> + <string name="storage_default_hint">Uudet kauppa-asennukset menevät valittuun sijaintiin. Nykyiset pelit pysyvät paikoillaan. Steam-kirjastoilla on oma asetuksensa.</string> + <string name="storage_default_ask">Kysy aina</string> + <string name="storage_default_ask_detail">Valitse kohde jokaiselle asennukselle</string> + <string name="storage_default_internal">Sisäinen tallennustila</string> + <string name="storage_default_external">Ulkoinen tallennustila</string> + <string name="storage_default_external_detail">%1$s · %2$s vapaana</string> + <string name="storage_default_external_missing">Ei yhdistetty</string> + <string name="storage_default_folder">Kansio · %1$s</string> + <string name="storage_default_folder_free">%1$s vapaana</string> + <string name="storage_default_folder_missing">Ei yhdistetty</string> + <string name="storage_default_choose_folder">Valitse kansio…</string> + <string name="storage_default_choose_folder_detail">Käytä mitä tahansa kansiota SD-kortilla tai USB-asemalla</string> + <string name="storage_default_note">Pelit tallennetaan valitun sijainnin Games-kansioon. Nykyisiä pelejä ei siirretä.</string> <string name="storage_where">Mihin se menee</string> <string name="storage_games">Steam-pelit</string> <string name="storage_game_data">Pelidata</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Asennetut pelit</string> <string name="storage_data_parts">Etuliite %1$s · shaderit %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Tyhjennä shaderit</string> + <string name="storage_reset_prefix">Nollaa prefix</string> + <string name="storage_reset_prefix_title">Nollataanko pelin %1$s prefix?</string> + <string name="storage_reset_prefix_confirm">Poistaa sen Wine-prefixin (%1$s) sijainnista %2$s ja luo sen uudelleen seuraavalla käynnistyskerralla. Sen sisällä olevat tallennukset, asetukset ja asennetut uudelleenjaettavat paketit menetetään; Steam Cloud -tallennukset säilyvät tililläsi.</string> <string name="storage_data_leftovers">Poistetut pelit</string> <string name="storage_steam_app">Steam-sovellus %1$d</string> <string name="storage_leftover_unsure_detail">Etuliite sisältää yhä tiedostoja, mahdollisesti paikallisia tallennuksia</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkronoi Syncthingillä</string> + <string name="sync_enable_hint">Tämä Syncthing-Forkiin perustuva Syncthing-toteutus synkronoi DroidDeckin sisäisen tiedostojärjestelmän tiedostoja muiden Syncthing-instanssien kanssa. Se koskee vain tiedostoja, joita säilytät DroidDeckin sisäisessä tiedostojärjestelmässä.</string> + <string name="sync_missing">Tämä versio ei sisällä Syncthingiä.</string> + <string name="sync_starting">Käynnistetään Syncthingiä</string> + <string name="sync_status_starting">Käynnistyy</string> + <string name="sync_status_up_to_date">Ajan tasalla</string> + <string name="sync_status_syncing">Synkronoidaan</string> + <string name="sync_status_paused">Keskeytetty</string> + <string name="sync_status_pausing">Keskeytetään</string> + <string name="sync_status_resuming">Jatketaan</string> + <string name="sync_status_attention">Vaatii huomiota</string> + <string name="sync_status_failed">Syncthing pysähtyi</string> + <string name="sync_failed_retry">Yritä uudelleen</string> + <string name="sync_paused_wifi">Keskeytetty, kunnes Wi-Fi on käytettävissä</string> + <string name="sync_paused_game">Keskeytetty pelin ajaksi</string> + <string name="sync_summary">Kansioita %1$d · %2$d/%3$d laitetta yhdistetty</string> + <string name="sync_left">%1$s jäljellä</string> + <string name="sync_open_web_ui">Avaa web-käyttöliittymä</string> + <string name="sync_pause">Keskeytä</string> + <string name="sync_resume">Jatka</string> + <string name="sync_running">Käynnissä</string> + <string name="sync_running_hint">Poista käytöstä pysäyttääksesi Syncthingin kokonaan.</string> + <string name="sync_this_device">Tämä laite</string> + <string name="sync_device_id">Laitteen tunniste</string> + <string name="sync_show_qr">Näytä QR-koodi</string> + <string name="sync_advanced">Lisäasetukset</string> + <string name="sync_advanced_hint">Portit, milloin ajetaan, nollaus</string> + <string name="sync_open">Avaa</string> + <string name="sync_waiting">Odottaa sinua</string> + <string name="sync_pending_device">%1$s haluaa muodostaa yhteyden</string> + <string name="sync_pending_folder">%1$s haluaa jakaa kansion “%2$s”</string> + <string name="sync_pending_folder_hint">Hyväksy ja valitse, mihin se tallennetaan DroidDeckissä.</string> + <string name="sync_review">Tarkista web-käyttöliittymässä</string> + <string name="sync_folders">Kansiot</string> + <string name="sync_no_folders">Ei vielä kansioita.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Ajan tasalla</string> + <string name="sync_folder_syncing">Synkronoidaan %1$d %%</string> + <string name="sync_folder_scanning">Skannataan</string> + <string name="sync_folder_paused">Keskeytetty</string> + <string name="sync_folder_out_of_sync">Ei synkronoitu</string> + <string name="sync_folder_errors">%1$d tiedostoa ei voitu synkronoida</string> + <string name="sync_folder_blocked">Estetty</string> + <string name="sync_folder_blocked_hint">Tämä kansio on DroidDeckin tallennustilan ulkopuolella, joten DroidDeck keskeytti sen. Käytä Syncthing-Fork-sovellusta DroidDeckin ulkopuolisten kansioiden synkronointiin.</string> + <string name="sync_remove_folder">Poista Syncthingistä</string> + <string name="sync_remove_folder_hint">Poistaminen ei poista yhtään tiedostoa.</string> + <string name="sync_devices">Laitteet</string> + <string name="sync_no_devices">Ei vielä laitteita.</string> + <string name="sync_connected">Yhdistetty</string> + <string name="sync_offline">Offline-tilassa</string> + <string name="sync_last_seen">Viimeksi nähty %1$s</string> + <string name="sync_device_id_title">Tämän laitteen tunniste</string> + <string name="sync_device_id_hint">Lisää toisella laitteellasi laite Syncthingissä ja skannaa tämä koodi tai liitä tunniste. Hyväksy se sitten täällä web-käyttöliittymässä.</string> + <string name="sync_copy">Kopioi</string> + <string name="sync_share">Jaa</string> + <string name="sync_done">Valmis</string> + <string name="sync_off_title">Poistetaanko Syncthing käytöstä?</string> + <string name="sync_off_body">Syncthing pysähtyy nyt ja pysyy pysäytettynä, kunnes otat sen uudelleen käyttöön. Synkronoidut tiedostot pysyvät paikoillaan.</string> + <string name="sync_off_forget">Poista myös Syncthingin asetukset</string> + <string name="sync_off_forget_hint">Poistaa tämän laitteen tunnisteen, kansiot ja laitteet. Kun otat sen uudelleen käyttöön, se aloittaa alusta.</string> + <string name="sync_turn_off">Poista käytöstä</string> + <string name="sync_ports">Portit</string> + <string name="sync_port_sync">Synkronointi</string> + <string name="sync_port_discovery">Paikallinen etsintä</string> + <string name="sync_repick">Valitse uudet portit</string> + <string name="sync_repick_hint">Tarkistetaan uudelleen joka käynnistyksessä.</string> + <string name="sync_repick_button">Valitse uudelleen</string> + <string name="sync_reset_group">Nollaus</string> + <string name="sync_api_key">API-avain</string> + <string name="sync_regenerate">Luo uudelleen</string> + <string name="sync_reset">Nollaa Syncthing</string> + <string name="sync_reset_hint">Uusi laitteen tunniste, kansiot ja laitteet poistetaan. DroidDeckin tallennustilan tiedostot säilytetään.</string> + <string name="sync_reset_button">Nollaa</string> + <string name="sync_reset_confirm_title">Nollataanko Syncthing?</string> + <string name="sync_running_group">Suoritus</string> + <string name="sync_run">Käynnissä</string> + <string name="sync_run_open">Kun DroidDeck on auki</string> + <string name="sync_run_background">Taustalla</string> + <string name="sync_wifi_only">Vain Wi-Fi</string> + <string name="sync_pause_games">Keskeytä pelien ajaksi</string> + <string name="sync_logs">Lokit</string> + <string name="sync_logs_hint">Syncthingin tuloste tältä istunnolta</string> + <string name="sync_logs_share">Jaa</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Asenna Linux-ajoympäristö ensin.</string> + <string name="sync_accept">Hyväksy</string> + <string name="sync_accept_title">Tallenna “%1$s” kohteeseen</string> + <string name="sync_add_folder">Lisää kansio</string> + <string name="sync_add_folder_hint">Synkronoi kansio DroidDeckin tallennustilasta</string> + <string name="sync_choose">Valitse</string> + <string name="sync_add">Lisää</string> + <string name="sync_add_failed">Kansiota ei voitu lisätä.</string> + <string name="sync_share_with">Jaa laitteille</string> + <string name="sync_share_none">Ei vielä laitteita. Voit jakaa tämän kansion myöhemmin web-käyttöliittymästä.</string> + <string name="sync_use_folder">Käytä tätä kansiota</string> + <string name="sync_new_folder">Uusi kansio</string> + <string name="sync_location_home">Kontin kotikansio</string> + <string name="sync_location_sync">Sync-kansio</string> + <string name="sync_location_shared">DroidDeckin jaettu tallennustila</string> + <string name="sync_location_card">DroidDeck kohteessa %1$s</string> + <string name="sync_location_app">DroidDeckin sovellustiedot</string> + <string name="sync_web_path_locked">Uudet kansiot tallennetaan DroidDeckin Sync-kansioon. Jos haluat synkronoida toisen DroidDeck-kansion, käytä Syncthing-välilehden Lisää kansio -toimintoa.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Lataa uudelleen</string> + <string name="sync_not_running">Syncthing ei ole käynnissä.</string> + <string name="session_end_steam_sigill">Steam pysähtyi virheelliseen käskyyn (SIGILL). Syynä voi olla CPU-käskyjen yhteensopivuusongelma tai asiakasohjelman kaatuminen. Jaa lokit ja laitteesi tiedot.</string> + <string name="session_end_steam_try_x64">Voit kokeilla Steam-asetukset → Steam-asiakasohjelma → x86-64 (kokeellinen). Se vaatii lisälatauksen ja voi toimia hitaammin.</string> + <string name="session_end_vulkan_device">Linux-grafiikka-ajuri ei löytänyt käyttökelpoista Vulkan-laitetta. Tarkista, että valittu Linux-GPU-ajuri tukee tätä GPU:ta.</string> + <string name="session_end_gpu_unsupported">Tätä istuntoa ei voi käynnistää, koska tälle GPU:lle ei ole yhteensopivaa Linux Vulkan -ajuria nykyisissä asetuksissa. Adreno Turnip -ajurit eivät voi tuoda tukea MediaTek/Mali-GPU:ille.</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_resources_browser">Avautuu selaimessa</string> + <string name="game_resource_guides">Oppaat</string> + <string name="game_resource_protondb_detail">Linux / Proton -yhteensopivuusraportit</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Peleille, joiden tallennukset ovat Steam-tililläsi</string> + <string name="game_resource_search">Verkkohaku</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="library_filter">Suodatin</string> + <string name="library_filter_installed">Vain asennetut</string> + <string name="library_filter_all_owned">Kaikki omistetut pelit</string> + <string name="library_no_installed_matches">Mikään asennettu peli ei vastaa näitä suodattimia.</string> + <string name="library_browse_owned">Selaa omistettuja pelejä</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="stores_itch_updates_found">Päivityksiä saatavilla: %1$d</string> + <string name="stores_itch_update_replaced">Kehittäjä korvasi tämän version tiedostolla %1$s. Päivitetäänkö siihen?</string> + <string name="xbox_filter_cloud">Pilvi</string> + <string name="stores_xbox_cloud_settings">Pilviasetukset</string> + <string name="integration_title">Steam-integraatio</string> + <string name="integration_count">%1$d/%2$d päällä</string> + <string name="integration_set_up">Määritä</string> + <string name="integration_location">Sijainti</string> + <string name="integration_app_info">Sovelluksen tiedot</string> + <string name="integration_wifi">Wi-Fi-nimet</string> + <string name="integration_brightness">Kirkkaus</string> + <string name="integration_home">DroidDeck aloitusnäyttönä</string> + <string name="integration_shortcuts">Koti-painikkeen pikakomennot</string> + <string name="integration_wifi_hint">Näytä verkot Steamissa · vaatii sijaintiluvan, ei koskaan seurata</string> + <string name="integration_wifi_on">Verkot näkyvät Steamissa</string> + <string name="integration_wifi_location_off">Sijainti on pois päältä</string> + <string name="integration_wifi_denied">Sijainti estetty · salli se Sovelluksen tiedoissa</string> + <string name="integration_brightness_hint">Steamin liukusäädin säätää näytön kirkkautta</string> + <string name="integration_home_hint">Koti avaa Steam-valikon istunnossa</string> + <string name="integration_shortcuts_hint">Pidä Koti-painiketta Steam Guide -yhdistelmiä varten</string> + <string name="integration_shortcuts_needs_home">Vaatii DroidDeckin aloitusnäytöksi</string> + <string name="integration_shortcuts_maybe_restricted">Harmaana Androidissa? Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset</string> + <string name="integration_shortcuts_restricted">Androidin estämä · Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset</string> + <string name="integration_shortcuts_service">DroidDeckin Koti-painike</string> + <string name="integration_shortcuts_service_description">Välittää Koti-painikkeen painallukset Steam Guidelle, kun Steam-istunto on aktiivinen ja DroidDeck on oletusaloitusnäyttösovellus. Ei lue näytön sisältöä.</string> + <string name="integration_brightness_needed">Ota Kirkkaus käyttöön kohdassa Käyttöönotto → Steam-integraatio</string> + <string name="apps_search_hint">Hae sovelluksia</string> + <string name="apps_no_match">Mikään sovellus ei vastaa hakua ”%1$s”.</string> + <string name="apps_add_widget">Lisää widget</string> + <string name="apps_widgets_loading">Ladataan widgettejä…</string> + <string name="apps_widgets_none">Mikään tämän laitteen sovellus ei tarjoa widgettejä.</string> + <string name="apps_widget_wider">Leveämpi</string> + <string name="apps_widget_narrower">Kapeampi</string> + <string name="apps_widget_taller">Korkeampi</string> + <string name="apps_widget_shorter">Matalampi</string> + <string name="apps_widget_move_earlier">Siirrä aiemmaksi</string> + <string name="apps_widget_move_later">Siirrä myöhemmäksi</string> + <string name="apps_widget_configure">Widgetin asetukset</string> + <string name="apps_widget_remove">Poista widget</string> + <string name="apps_add_to_folder">Lisää kansioon</string> + <string name="apps_new_folder">Uusi kansio</string> + <string name="apps_remove_from_folder">Poista kansiosta</string> + <string name="apps_app_info">Sovelluksen tiedot</string> + <string name="apps_uninstall">Poista asennus</string> + <string name="apps_folder_rename">Nimeä uudelleen</string> + <string name="apps_folder_ungroup">Pura kansio</string> + <string name="apps_folder_default">Kansio</string> + <string name="apps_folder_name">Kansion nimi</string> + <string name="apps_filter">Näytä</string> + <string name="apps_filter_all">Kaikki sovellukset</string> + <string name="apps_filter_games">Pelit</string> + <string name="apps_filter_downloaded">Ladatut</string> + <string name="apps_filter_system">Järjestelmä</string> + <string name="apps_filter_hidden">Piilotetut</string> + <string name="apps_hide">Piilota</string> + <string name="apps_unhide">Näytä sovelluksissa</string> + <string name="apps_shortcut_remove">Poista pikakuvake</string> + <string name="apps_pin_title">Lisää sovelluksiin</string> + <string name="apps_pin_add">Lisää</string> + <string name="apps_hidden_none">Ei piilotettuja sovelluksia.</string> + <string name="apps_sort_name_asc">Nimi A–Ö</string> + <string name="apps_sort_name_desc">Nimi Ö–A</string> + <string name="apps_sort_installed">Äskettäin asennetut</string> + <string name="apps_sort_updated">Äskettäin päivitetyt</string> + <plurals name="apps_count"> + <item quantity="one">%d sovellus</item> + <item quantity="other">%d sovellusta</item> + </plurals> + <string name="desktop_restore_title">Ohjelmistojasi palautetaan</string> + <string name="desktop_restore_body">Lisäämiäsi sovelluksia asennetaan uudelleen DroidDeck-päivityksen jälkeen.</string> + <string name="desktop_restore_done_title">Ohjelmistot palautettu</string> + <string name="desktop_restore_done_body">Lisäämäsi sovellukset on asennettu uudelleen.</string> + <string name="desktop_restore_failed_title">Joitakin ohjelmistoja ei voitu palauttaa</string> + <string name="desktop_restore_failed_body">Katso ~/.cache/droiddeck/apt-restore.log ja kokeile sitten sudo apt install Konsolessa.</string> + <string name="gog_full_files">Natiivit optimoinnit eivät ole käytettävissä. Lataus sisältää kokonaiset korvaavat tiedostot.</string> + <string name="gog_recover">Tarkista päivityksen tulos</string> + <string name="slow_usb_title">Hidas USB-yhteys</string> + <string name="slow_usb_cable">%1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s), joten pelit latautuvat hitaasti. Käytä vähintään 5 Gbps:n USB 3 -kaapelia, kokeile kääntää USB-C-liitin tai käytä nopeampaa asemaa.</string> + <string name="slow_usb_port">%1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s). Tämän laitteen USB-portti ei ole nopeampi, joten pelit latautuvat hitaasti. Sisäinen tallennustila tai microSD-kortti voi olla nopeampi.</string> + <string name="slow_usb_never">Älä näytä uudelleen</string> + <string name="slow_usb_dismiss">Sulje</string> + <string name="steam_import_title">Käynnistetäänkö Steam uudelleen pelien lisäämiseksi?</string> + <string name="steam_import_body">Steam voi näyttää nämä omistamasi pelit asennettuina: %1$s. Se täytyy käynnistää uudelleen, jotta ne näkyvät. Käynnistä uudelleen nyt, tai ne lisätään, kun Steam käynnistyy seuraavan kerran.</string> + <string name="steam_import_names_more">%1$s ja %2$d muuta</string> + <string name="steam_import_now">Käynnistä uudelleen nyt</string> + <string name="steam_import_later">Myöhemmin</string> + <string name="gog_maintenance">Hallitse GOG-asennusta</string> + <string name="gog_check">Tarkista päivitykset</string> + <string name="gog_repair">Tarkista/korjaa</string> + <string name="gog_patches">Offline-korjauspäivitykset</string> + <string name="gog_refresh">Lataa täysi offline-asennusohjelma</string> + <string name="gog_update">Päivitä versioon %1$s</string> + <string name="gog_resume">Jatka GOG-ylläpitoa</string> + <string name="gog_open_patch">Avaa päivityksen asennusohjelma</string> + <string name="gog_patch_in_session">Viimeistele tai peruuta päivityksen asennusohjelma Linux-istunnossa.</string> + <string name="gog_patch_requirements">Valitse päivitys asennetulle versiollesi ja kielellesi. Tuettuja lähdeversioita ei välttämättä ole lueteltu.</string> + <string name="gog_no_patches">GOG:lla ei ole tälle pelille erillisiä Windows-päivityksiä.</string> + <string name="gog_managed_files">Muokatut pelitiedostot voidaan korvata.</string> + <string name="gog_patch_installer_note">Asennusohjelma avautuu Linux-istunnossasi.</string> + <string name="gog_download_label">Lataus</string> + <string name="gog_space_label">Lisätila</string> + <string name="gog_space_estimate_label">Tila-arvio</string> + <string name="gog_repair_action">Korjaa tiedostot</string> + <string name="gog_refresh_action">Päivitä asennus</string> + <string name="gog_select_patch">Valitse</string> + <string name="setup_all_files">Kaikkien tiedostojen käyttöoikeus</string> + <string name="setup_local_network">Paikallisverkko</string> + <string name="libraries_title">Lisää Steam-kirjastoja</string> + <string name="libraries_hint">Kansiot, joihin Steam voi asentaa pelejä ja joista se voi käynnistää niitä, kukin omalla nimellään. Poistaminen luettelosta säilyttää pelit levyllä.</string> + <string name="libraries_add">Lisää kirjasto</string> + <string name="libraries_rename_title">Kirjaston nimi</string> + <string name="libraries_pick">Valitse kirjaston kansio</string> + <string name="libraries_full">Enintään %1$d lisäkirjastoa</string> + <string name="libraries_overlap">Tämä kansio on jo kirjasto tai sijaitsee kirjastossa</string> + <string name="libraries_missing">%1$s · ei käytettävissä</string> + <string name="libraries_applies_next">Voimassa seuraavasta Steam-istunnosta alkaen</string> + <string name="bottom_desktop_start">Käynnistä työpöytä</string> + <string name="bottom_desktop_mode_touch">Suora kosketus</string> + <string name="bottom_desktop_trackpad">Kosketuslevy. Vaihda suoraan kosketukseen napauttamalla</string> + <string name="bottom_desktop_direct_touch">Suora kosketus. Vaihda kosketuslevyyn napauttamalla</string> + <string name="bottom_desktop_starting">KDE-työpöytää käynnistetään…</string> + <string name="bottom_desktop_ended">Työpöytä sulkeutui.</string> + <string name="bottom_desktop_failed">Työpöytää ei voitu käynnistää. Lokit ovat tämän istunnon bottom-desktop-kansiossa.</string> + <string name="bottom_desktop_off">Työpöytä on suljettu.</string> + <string name="libraries_rename">Nimeä uudelleen</string> + <string name="second_mode_desktop">Työpöytä</string> + <string name="bottom_desktop_mode_trackpad">Kosketuslevy</string> + <string name="bottom_desktop_title">Työpöytä · %1$s</string> </resources> diff --git a/app/src/main/res/values-fr/gestures.xml b/app/src/main/res/values-fr/gestures.xml index 031725fa1..0f1870a76 100644 --- a/app/src/main/res/values-fr/gestures.xml +++ b/app/src/main/res/values-fr/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestes</string> <string name="gesture_settings">Paramètres des gestes tactiles</string> - <string name="gesture_settings_hint">Personnalisez les gestes de souris et de clavier. Sélectionnez Gestes comme mode tactile pour les utiliser.</string> <string name="gesture_tap">Appui</string> <string name="gesture_drag">Glissement à un doigt</string> <string name="gesture_long_press">Appui prolongé</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Maintien à trois doigts</string> <string name="gesture_pinch">Pincer pour zoomer</string> <string name="gesture_hold_button">Maintenir le bouton enfoncé</string> + <string name="gesture_hold_left">Maintenir le bouton gauche enfoncé</string> + <string name="gesture_hold_right">Maintenir le bouton droit enfoncé</string> <string name="gesture_click_once">Cliquer une fois</string> <string name="gesture_hold_delay">Délai de maintien</string> <string name="gesture_double_delay">Intervalle du double appui</string> diff --git a/app/src/main/res/values-fr/shortcuts.xml b/app/src/main/res/values-fr/shortcuts.xml new file mode 100644 index 000000000..103fc2bb5 --- /dev/null +++ b/app/src/main/res/values-fr/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Raccourcis des boutons physiques</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Attribuer : %1$s</string> + <string name="shortcuts_press">Appuyez sur un bouton puis relâchez-le. L’affectation est enregistrée automatiquement.</string> + <string name="shortcuts_release">Relâchez le bouton pour continuer.</string> + <string name="shortcuts_detected">%1$s : %2$s</string> + <string name="shortcuts_conflict">Ce bouton est déjà attribué à : %1$s</string> + <string name="shortcuts_save">Réaffecter</string> + <string name="shortcuts_retry">Essayer un autre bouton</string> + <string name="shortcuts_limitations">Le bouton Accueil et certains boutons supplémentaires peuvent être indisponibles.</string> +</resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 143d11449..317513053 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Options VKD3D pour D3D12. nodxr désactive le ray tracing ; à utiliser uniquement si le jeu le nécessite.</string> <string name="game_env_proton_log">Définir sur 1 pour générer un journal de diagnostic Proton. La journalisation peut réduire les performances et consommer de l\'espace de stockage.</string> <string name="game_env_wined3d">Définir sur 1 pour utiliser WineD3D (basé sur OpenGL) au lieu de DXVK, pour tester la compatibilité D3D9–11.</string> + <string name="game_env_wined3d_renderer">Moteur de rendu pour DirectDraw, Direct3D 1-7 et les jeux exécutés avec WineD3D. Vulkan évite le chemin OpenGL-sur-Zink et est bien plus rapide pour les anciens jeux DirectDraw et Direct3D 7 sur Adreno.</string> + <string name="game_env_dxvk_d3d8">Définir sur 1 pour exécuter Direct3D 8 via DXVK au lieu de WineD3D. Plus rapide dans le test Direct3D 8 d\'AIO Graphics Test sur Adreno.</string> <string name="game_env_no_ntsync">Définir sur 1 pour que ce jeu n\'utilise pas ntsync (droiddeck-ntsync ou un pilote du noyau) ; il utilise droiddeck-esync si un pack existe, sinon droiddeck-fsync.</string> <string name="game_env_no_esync">Définir sur 1 pour désactiver droiddeck-esync pour ce jeu ; il utilise alors droiddeck-fsync, ou droiddeck-ntsync si fsync est aussi désactivé.</string> <string name="game_env_no_fsync">Définir sur 1 pour que ce jeu n\'utilise pas droiddeck-fsync ; il utilise droiddeck-esync si un pack existe, sinon droiddeck-ntsync.</string> <string name="game_env_fsync_first">Définir sur 1 pour exécuter ce jeu avec droiddeck-fsync, ou sur 0 pour donner la priorité à droiddeck-esync si un pack correspond à son Proton.</string> <string name="game_env_xalia">Définir sur 0 pour désactiver l\'assistant de navigation à la manette de Proton pour ce jeu.</string> + <string name="game_env_anticheat_offline">Activé par défaut. Démarre un jeu Easy Anti-Cheat sans son anti-triche lorsque le jeu permet de jouer hors ligne. Désactivez pour lancer via Easy Anti-Cheat comme d\'habitude. Les modes en ligne qui exigent Easy Anti-Cheat restent indisponibles.</string> <string name="game_env_hud">Superposition DXVK pour D3D9–11. fps affiche le taux de rafraîchissement ; annuler la définition masque la superposition.</string> <string name="game_env_dxvk_config">Paramètres DXVK séparés par des points-virgules. Les versions récentes utilisent dxvk.maxFrameRate pour limiter le taux de rafraîchissement ; pour un jeu quotidien, il est recommandé d\'utiliser le limiteur de taux de rafraîchissement de session.</string> + <string name="game_env_cores">Cœurs CPU pour ce jeu, par exemple 0-4 ou 0,2,4, à la place des cœurs de jeu de la session. Moins de cœurs, moins de chaleur.</string> <string name="game_env_vkd3d_limit">Limite de taux de rafraîchissement D3D12. 0 désactive la limite.</string> <string name="game_env_glthread">Mesa OpenGL multithread. Pour les jeux OpenGL limités par le CPU, true peut aider ; à tester jeu par jeu.</string> <string name="sync_backend_title">Synchronisation Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX exécute des programmes Linux x86 sur cet appareil ARM64. En mode Auto, il est utilisé lorsque le programme est conçu pour x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Ce programme est conçu pour les PC %1$s et s\'exécute via FEX, qui n\'est pas encore configuré. Ouvrez Steam une fois en étant connecté : DroidDeck lui fait télécharger FEX et le Steam Linux Runtime nécessaires, puis ce programme s\'ouvre.</string> + <string name="session_proot_missing">Impossible de télécharger le proot de DroidDeck. Vérifiez la connexion et réessayez. La session n\'a pas été démarrée, car le proot de secours est trop lent pour jouer.</string> + <string name="session_directaudio_missing">Impossible de télécharger DirectAudio ; l\'audio des jeux utilise le chemin plus lent pour cette session.</string> <string name="session_end_program">Ce programme</string> <string name="session_end_steam_download">Impossible de télécharger le client Steam. Votre réseau ou votre VPN bloque peut-être les serveurs de Steam ; vérifiez la connexion et réessayez.</string> <string name="session_end_steam_setup">Impossible de configurer le client Steam. Vérifiez la connexion et l\'espace libre, puis réessayez.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Manette Xbox 360</string> <string name="mode_controller_note">Deck : bouton d\'accès rapide et gyroscope. Steam Controller : idem, avec détection de la prise en main sur les boutons arrière. DualShock 4 et DualSense : gyroscope, et les trackpads servent de pavé tactile. Xbox 360 : utilisez Guide+A pour ouvrir l\'accès rapide.</string> <string name="mode_back">Retour</string> + <string name="back_hold">Maintenir Retour pour les raccourcis Steam</string> + <string name="back_hold_hint">Maintenir Retour ouvre l’accès rapide ou crée des combinaisons Steam avec d’autres boutons. Désactivez pour ignorer l’appui long ; l’appui simple et double fonctionnent toujours.</string> + <string name="back_native_qam_hint">Maintenez Retour pendant 700 ms, ou maintenez Retour et appuyez sur un autre bouton pour les raccourcis Steam.</string> + <string name="back_double_tap_window">Délai du double appui</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Autoriser le contrôle de la luminosité</string> + <string name="brightness_permission_text">Configurez le contrôle de la luminosité dans 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> @@ -300,6 +329,12 @@ <string name="mode_decky_current">À jour · %1$s</string> <string name="mode_decky_loader">Chargeur</string> <string name="mode_decky_install_latest">Installer la dernière version</string> + <string name="decky_channel">Canal de mise à jour</string> + <string name="decky_channel_hint">Les versions de Decky Loader à installer. Le programme de mise à jour de Decky utilise le même canal.</string> + <string name="decky_channel_stable">Stable</string> + <string name="decky_channel_prerelease">Préversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Impossible d\'enregistrer le canal de mise à jour de Decky</string> <string name="mode_decky_on">Démarre avec Steam. Une fois activé, d\'autres applications sur cet appareil peuvent contrôler Steam.</string> <string name="mode_decky_off">Désactivé. Le port de débogage distant de Steam reste fermé.</string> <string name="mode_decky_remove_title">Désinstaller Decky Loader ?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">Désactivez cette option si les jeux plantent ou affichent un écran noir en mode Deck. Prendra effet à la prochaine session.</string> <string name="mode_return_after_game">Revenir à DroidDeck après un jeu</string> <string name="mode_return_after_game_hint">Quand un jeu lancé depuis DroidDeck ou un autre lanceur se ferme, Steam se ferme proprement (après la synchronisation des sauvegardes cloud) et vous y revenez. Désactivé : vous restez dans Steam.</string> + <string name="mode_shader_precache">Pré-mise en cache des shaders</string> + <string name="mode_shader_precache_hint">Steam télécharge des shaders précompilés pour vos jeux et les traite en arrière-plan, pour moins de saccades. Désactivé, vous économisez données, stockage et batterie ; les jeux compilent alors leurs shaders en cours de partie. Même paramètre que Téléchargements > Pré-mise en cache des shaders dans Steam. Prendra effet à la prochaine session.</string> <string name="mode_steam_repair">Réparer le client Steam</string> <string name="mode_steam_repair_hint">Retélécharge le client Steam au prochain démarrage de Steam. Utile si Steam reste bloqué sur son écran de chargement. Les jeux, la connexion et les paramètres sont conservés.</string> <string name="mode_steam_repair_queued">Le client Steam sera retéléchargé au prochain démarrage de Steam.</string> @@ -377,6 +414,8 @@ <string name="mode_directaudio_hint">Contourne PulseAudio pour réduire la latence.</string> <string name="mode_mic">Microphone</string> <string name="mode_mic_hint">Utilisé pour le chat vocal.</string> + <string name="drawer_mic_hint">Activer ou désactiver la capture du microphone pour cette session.</string> + <string name="drawer_mic_failed">Impossible de modifier le microphone. Veuillez réessayer.</string> <string name="mode_network">Réseau</string> <string name="mode_wifi_discovery">Découverte Wi-Fi</string> <string name="mode_wifi_discovery_hint">Affiche les noms Wi-Fi et les réseaux à proximité dans Steam.</string> @@ -539,14 +578,24 @@ <string name="perf_gsrealtime">gamescope : file d\'attente GPU temps réel</string> <string name="perf_gsrealtime_hint">Augmente la priorité du travail GPU du compositeur. Peut améliorer la stabilité du temps de frame, mais consomme une partie des performances du jeu.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Mémoire</string> + <string name="perf_cap_off">Désactivé</string> + <string name="perf_cap_auto">Valeur par défaut du pilote</string> + <string name="perf_zram_client">Compresser Steam pendant un jeu</string> + <string name="perf_zram_client_hint">20 s après le démarrage d\'un jeu, le client Steam est compressé dans zRAM pour laisser plus de mémoire au jeu, puis relu à la fermeture du jeu. Désactivez cette option si la session se ferme peu après le démarrage des jeux. Une limite de RAM ci-dessus compresse toujours Steam lorsque la session la dépasse.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">S\'applique tant que le client Steam fonctionne, en mode Steam ou depuis le bureau. Lorsque la session dépasse cette valeur, Steam puis les autres processus pris en charge de la session sont compressés dans zRAM. Limite souple : rien n\'est fermé, mais les jeux peuvent saccader pendant le rechargement des pages.</string> + <string name="perf_ram_cap_unavailable">Nécessite un swap zRAM, dont cet appareil ne dispose pas.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">La mémoire vidéo que DXVK signale aux jeux Direct3D, pour qu\'ils prévoient moins de textures. Les paramètres DXVK propres à un jeu restent prioritaires. Prendra effet à la prochaine session.</string> <string name="perf_gpuclock">Maintenir le GPU à sa fréquence maximale</string> <string name="perf_gpuclock_hint">Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur.</string> <string name="perf_fixes">Correctifs de session</string> <string name="perf_sysmem">Turnip : rendu sysmem</string> <string name="perf_sysmem_hint">Le client Steam sera plus rapide ; en jeu, le pilote choisit à chaque passe entre rendu par tuiles et rendu en mémoire système. Requis pour Adreno 710/720/722.</string> <string name="perf_xalia">Ignorer l\'assistant xalia de Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (expérimental)</string> - <string name="perf_fastsync_hint">Un substitut en espace utilisateur du pilote Linux ntsync, pour les tests. Lorsqu\'il est activé, Proton l\'utilise à la place de droiddeck-esync et de droiddeck-fsync. Fonctionne avec Proton Experimental ARM64, GE-Proton et proton-cachyos. Prendra effet à la prochaine session.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Un substitut en espace utilisateur du pilote Linux ntsync. Lorsqu\'il est activé, Proton l\'utilise à la place de droiddeck-esync et de droiddeck-fsync. Fonctionne avec Proton Experimental ARM64, GE-Proton et proton-cachyos. Prendra effet à la prochaine session.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync en priorité</string> <string name="perf_fsync_hint">Exécute le fsync propre à Proton sur les fichiers Proton d\'origine, avec futex_waitv fourni en espace utilisateur : aucun pack n\'est nécessaire et il continue de fonctionner dès que Steam met à jour Proton. Lorsqu\'il est activé, les jeux l\'utilisent avant droiddeck-esync, sauf les quelques-uns que Proton exclut de fsync. Prendra effet à la prochaine session.</string> @@ -557,6 +606,8 @@ <string name="perf_fastpath">Chemin rapide proot</string> <string name="perf_fastpath_needs_seccomp">Nécessite le filtre seccomp de proot.</string> <string name="perf_fastpath_hint">Recherche de fichiers plus rapide, moins de saccades. Désactivez cette option si un programme ne trouve pas ses fichiers.</string> + <string name="perf_cursor_composite">Dessiner le curseur dans gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dessine lui-même le pointeur au lieu de le confier à Android. Activez pour un curseur piloté à la manette. Désactivé, c\'est plus rapide sur un téléphone. Prendra effet à la prochaine session.</string> <string name="perf_identity">Identité de la session</string> <string name="perf_hostname">Nom d\'hôte</string> <string name="perf_hostname_hint">Le nom sous lequel Steam voit cet appareil. Laisser vide pour restaurer %1$s.</string> @@ -571,6 +622,8 @@ <string name="driver_delete_plain">Ses fichiers seront supprimés de l\'application.</string> <string name="driver_delete_in_use">Ses fichiers seront supprimés. Comme il est en cours d\'utilisation, le pilote par défaut sera utilisé à la place.</string> <string name="drawer_page_display">Affichage</string> + <string name="drawer_frame_limit">Limite d\'images</string> + <string name="drawer_frame_limit_note">Limite ce jeu. L\'écran passe à une fréquence de rafraîchissement multiple de la limite lorsqu\'il en propose une ; les autres limites peuvent paraître irrégulières. Les jeux Steam utilisent la limite d\'images de Steam dans le menu d\'accès rapide.</string> <string name="drawer_page_effects">Effets</string> <string name="drawer_page_controls">Contrôles</string> <string name="drawer_page_components">Composants</string> @@ -595,6 +648,66 @@ <string name="drawer_hud_color_amber">Ambre</string> <string name="drawer_hud_color_violet">Violet</string> <string name="drawer_hud_opacity">Opacité</string> + <string name="hud_size">Taille</string> + <string name="hud_size_hint">Toucher le HUD change aussi sa taille.</string> + <string name="hud_size_full">Complet</string> + <string name="hud_size_tiles">Tuiles</string> + <string name="hud_size_pill">Pilule</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Méga</string> + <string name="hud_size_strip">Bandeau</string> + <string name="hud_locked">Verrouiller la position</string> + <string name="hud_locked_hint">Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables.</string> + <string name="hud_snap">Aimanter sur les côtés</string> + <string name="hud_snap_hint">Relâchez le HUD et il rejoint le côté de l’écran le plus proche. Un geste rapide le lance dans cette direction.</string> + <string name="hud_group_look">Apparence</string> + <string name="hud_scale">Taille à l\'écran</string> + <string name="hud_color_soft">Douce</string> + <string name="hud_color_mid">Moyenne</string> + <string name="hud_color_vivid">Vive</string> + <string name="hud_outline">Contour</string> + <string name="hud_outline_color">Couleur du contour</string> + <string name="hud_outline_gray">Gris</string> + <string name="hud_outline_theme">Couleur du thème</string> + <string name="hud_group_metrics">Mesures</string> + <string name="hud_metric_graph">Graphique des temps d\'image</string> + <string name="hud_metric_decimal">Fréquence d\'images avec une décimale</string> + <string name="hud_metric_low001" formatted="false">0.01% les plus bas</string> + <string name="hud_metric_engine">Moteur graphique</string> + <string name="hud_metric_gpu_model">Nom du GPU</string> + <string name="hud_metric_gpu">Charge du GPU</string> + <string name="hud_metric_gpu_temp">Température du GPU</string> + <string name="hud_metric_cpu">Charge du CPU</string> + <string name="hud_metric_per_core">CPU par cœur</string> + <string name="hud_metric_temp">Températures</string> + <string name="hud_metric_ram">Mémoire</string> + <string name="hud_metric_vram">Mémoire graphique</string> + <string name="hud_metric_swap">Mémoire d\'échange</string> + <string name="hud_metric_battery">Niveau de batterie</string> + <string name="hud_metric_power">Consommation</string> + <string name="hud_metric_network">Réseau</string> + <string name="hud_metric_resolution">Résolution</string> + <string name="hud_metric_proton">Version de Proton</string> + <string name="hud_metric_session">Durée de session</string> + <string name="hud_metric_clock">Horloge</string> + <string name="hud_group_temps">Températures</string> + <string name="hud_temp_unit">Unité</string> + <string name="hud_temp_bands">Couleurs d\'alerte</string> + <string name="hud_temp_bands_hint">Les températures passent à l\'ambre, puis au rouge, à l\'approche de la limite.</string> + <string name="hud_temp_bands_off">Désactivé</string> + <string name="hud_temp_bands_auto">Automatique</string> + <string name="hud_temp_bands_manual">Manuel</string> + <string name="hud_temp_red_cpu">CPU en rouge à</string> + <string name="hud_temp_red_gpu">GPU en rouge à</string> + <string name="hud_temp_red_battery">Batterie en rouge à</string> + <string name="hud_group_more">Plus</string> + <string name="hud_export">Diagnostic du HUD</string> + <string name="hud_export_hint">Enregistre dans Downloads/DroidDeck un rapport sur chaque capteur lu par le HUD.</string> + <string name="hud_export_button">Enregistrer</string> + <string name="hud_export_done">Enregistré dans %1$s</string> + <string name="hud_export_failed">Impossible d\'enregistrer le rapport du HUD.</string> + <string name="hud_reset">Réinitialiser les paramètres du HUD</string> + <string name="hud_reset_button">Réinitialiser</string> <string name="drawer_scaling">Mode de mise à l\'échelle</string> <string name="drawer_scaling_sharpness">Netteté de la mise à l\'échelle</string> <string name="drawer_effects">Effets d\'écran</string> @@ -629,10 +742,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Clavier</string> <string name="drawer_latency">Latence</string> + <string name="drawer_low_latency">Mode faible latence</string> + <string name="drawer_low_latency_hint">Augmente l\'utilisation du CPU et de la batterie</string> <string name="drawer_low_latency_controller">Manette à faible latence</string> <string name="drawer_low_latency_controller_hint">La manette émet à 1000 Hz au lieu de 250 Hz. Un peu plus de CPU.</string> <string name="drawer_low_latency_touch">Tactile à faible latence</string> <string name="drawer_low_latency_touch_hint">Les touchers ignorent le regroupement d\'images ; les commandes tactiles Steam passent à 1000 Hz. Un peu plus de CPU.</string> + <string name="drawer_evdev_mouse">Canal souris brut</string> + <string name="drawer_direct_cursor">Curseur</string> <string name="drawer_pc_keyboard">Clavier PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Deuxième écran</string> @@ -720,6 +837,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Journaux de session</string> <string name="setup_logs_hint">Enregistré après chaque fin de session</string> + <string name="setup_game_debug_logs">Journaux de débogage des jeux</string> + <string name="setup_game_debug_logs_hint">Inclure les diagnostics Proton, Wine et graphiques au prochain lancement d\'un jeu. Peut réduire les performances et utiliser plus de stockage.</string> + <string name="setup_game_debug_logs_restart">Redémarrez cette session pour enregistrer les journaux de débogage des jeux</string> + <string name="setup_logging_update_failed">Impossible de modifier la journalisation. Vérifiez l\'interrupteur et réessayez.</string> <string name="setup_agent_commands">Outils de débogage</string> <string name="setup_latest_logs">Derniers journaux de session</string> <string name="setup_saved_logs">Journaux de session enregistrés</string> @@ -752,12 +873,28 @@ <string name="setup_home_on">DroidDeck peut être utilisé comme application d\'écran d\'accueil</string> <string name="setup_home_off">DroidDeck ne sera pas proposé comme application d\'écran d\'accueil</string> <string name="setup_orientation">Orientation</string> + <string name="setup_launcher_orientation">Orientation du lanceur</string> + <string name="setup_launcher_orientation_auto">Suivre la rotation de l\'appareil</string> + <string name="setup_orientation_portrait">Portrait</string> + <string name="setup_session_orientation">Orientation de la session</string> + <string name="setup_session_orientation_hint">S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; la largeur et la hauteur personnalisées restent telles que saisies.</string> <string name="setup_orientation_auto">Paysage automatique</string> <string name="setup_orientation_landscape">Paysage</string> <string name="setup_orientation_reverse">Paysage inversé</string> <string name="setup_fullscreen">Plein écran</string> <string name="setup_fullscreen_on">Masquer la barre d\'état et la barre de navigation Android</string> <string name="setup_fullscreen_off">Afficher la barre d\'état et la barre de navigation Android</string> + <string name="setup_dual_screen">Double écran</string> + <string name="setup_dual_screen_hint">Automatique utilise le second écran sur les consoles portables qui en ont un intégré. Activé utilise n\'importe quel second écran. Désactivé garde tout sur un seul écran.</string> + <string name="setup_dual_screen_auto">Automatique</string> + <string name="setup_dual_screen_on">Activé</string> + <string name="setup_dual_screen_off">Désactivé</string> + <string name="setup_dual_screen_menu">Menu sur l\'écran du bas</string> + <string name="setup_dual_screen_menu_hint">Déplace les sections et le menu en jeu sur le second écran et la saisie s\'y fait, pour que l\'écran du haut garde toute la vue. L2 et R2 changent de section.</string> + <string name="setup_dual_screen_controls">Commandes sur l\'écran du bas en jeu</string> + <string name="setup_dual_screen_controls_hint">Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session.</string> + <string name="dual_typing_title">Saisie pour l\'écran du haut</string> + <string name="dual_typing_done">Terminé</string> <string name="setup_default_home">Application d\'écran d\'accueil par défaut</string> <string name="setup_choose_home">Choisir l\'application d\'écran d\'accueil</string> <string name="setup_choose">Choisir</string> @@ -908,6 +1045,14 @@ <string name="gate_step1">Ouvrez Paramètres → Options pour les développeurs → Débogage sans fil, et activez-le</string> <string name="gate_step2">Appuyez sur « Associer l\'appareil avec un code d\'appairage »</string> <string name="gate_step3">Saisissez le code d\'appairage dans la notification DroidDeck</string> + <string name="pairguide_build_number">Dans À propos du téléphone, appuyez 7 fois sur Numéro de build</string> + <string name="pairguide_wireless">Activez Débogage sans fil</string> + <string name="pairguide_pair">Ouvrez Débogage sans fil, puis appuyez sur « Associer l\'appareil avec un code d\'appairage »</string> + <string name="pairguide_child_process">Activez « Désactiver les limites pour les processus enfant »</string> + <string name="pairguide_row_child_process">Désactiver les limites pour les processus enfant</string> + <string name="pairguide_row_build_number">Numéro de build</string> + <string name="pairguide_row_wireless">Débogage sans fil</string> + <string name="pairguide_row_pair">Associer l\'appareil avec un code d\'appairage</string> <string name="gate_waiting">En attente de la fenêtre d\'appairage…</string> <string name="gate_code_needed">Fenêtre trouvée. Veuillez saisir le code d\'appairage affiché dans la notification.</string> <string name="gate_status">État</string> @@ -1031,8 +1176,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 +1183,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> @@ -1049,10 +1191,8 @@ <string name="games_never_played">Jamais lancé</string> <string name="games_runtime_busy_percent">Environnement d\'exécution occupé · %1$d%%</string> <string name="games_runtime_busy">Environnement d\'exécution occupé</string> - <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> @@ -1067,6 +1207,9 @@ <string name="gpu_hide_other">Masquer les pilotes des autres GPU</string> <string name="gpu_show_other">Afficher les pilotes des autres GPU</string> <string name="gpu_advanced">Avancé</string> + <string name="gpu_ubwc_title">Compatibilité UBWC</string> + <string name="gpu_ubwc_hint">Essayez Activé ou Désactivé si Steam ou Android affiche des bandes ou des scintillements. S\'applique aux deux pilotes après le redémarrage de DroidDeck.</string> + <string name="gpu_ubwc_restart">Redémarrez DroidDeck pour appliquer.</string> <string name="gpu_set_with_display">Configuré avec le pilote d\'affichage : %1$s inclut les deux.</string> <string name="gpu_set_with_runtime">Configuré avec le pilote d\'exécution : %1$s inclut les deux.</string> <string name="gpu_runtime_hint">Utilisé par les jeux et le bureau.</string> @@ -1121,7 +1264,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> @@ -1175,10 +1318,15 @@ <string name="pip_auto">Passer automatiquement en PiP</string> <string name="unfolded_controls">Commandes sur l\'écran déplié</string> <string name="unfolded_controls_hint">Déplié, le jeu s\'affiche au-dessus des pavés tactiles et des poignées arrière du Steam Deck. Plié, le jeu est en plein écran.</string> + <string name="unfolded_controls_with_controller">Les garder avec une manette</string> + <string name="unfolded_controls_with_controller_hint">Afficher aussi ces commandes tactiles lorsqu\'une manette est connectée.</string> <string name="pip_suspended">En pause</string> <string name="pip_not_ready">Le mode PiP sera disponible une fois la session prête.</string> <string name="pip_permission">Veuillez autoriser DroidDeck à utiliser le mode PiP dans les paramètres Android.</string> <string name="pip_unavailable">Android ne peut pas ouvrir le mode PiP.</string> + <string name="game_more">Plus</string> + <string name="game_edit_art">Modifier les illustrations</string> + <string name="stores_in_steam_label">Dans Steam</string> <string name="game_shortcut">Raccourci</string> <string name="game_shortcut_add">Ajouter à l\'écran d\'accueil</string> <string name="game_shortcut_choose">Choisir un jeu</string> @@ -1202,6 +1350,10 @@ <string name="main_wait_runtime">Attendez la fin de l\'opération sur l\'environnement d\'exécution</string> <string name="main_wait_proton_install">Attendez la fin de l\'installation de l\'outil de compatibilité</string> + <string name="load_compat_title">Préparation des outils de compatibilité</string> + <string name="load_compat_wait">En attente de la fin de la configuration de compatibilité</string> + <string name="load_compat_hint">Votre session démarrera une fois la configuration terminée.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Attendez la fin de l\'installation de l\'application de bureau</string> <string name="main_wait_install_game">Attendez la fin de l\'installation avant de lancer un jeu</string> <string name="main_saves_close_session">Fermez d\'abord la session Steam, pour que le jeu ne puisse pas écraser l\'importation</string> @@ -1242,6 +1394,9 @@ <string name="main_install_anyway">Installer quand même</string> <string name="main_remove_runtime_title">Supprimer l\'environnement d\'exécution Linux</string> <string name="main_remove_runtime_text">Cela supprime l\'environnement d\'exécution, le client Steam qu\'il contient et tous les jeux qui y sont installés.</string> + <string name="runtime_actions_title">Environnement d\'exécution Linux</string> + <string name="runtime_actions_text">Réparer réinstalle les fichiers système de l\'environnement d\'exécution et conserve Steam, vos jeux et vos paramètres. Les extras comme le bureau se réinstallent à leur prochaine utilisation. Supprimer efface tout.</string> + <string name="runtime_repair">Réparer l\'environnement d\'exécution</string> <string name="main_applied">Appliqué : %1$s</string> <string name="android_app_open_failed_primary">Impossible d\'ouvrir %1$s sur l\'écran principal</string> <string name="android_app_open_failed_on">Impossible d\'ouvrir %1$s sur %2$s</string> @@ -1374,6 +1529,12 @@ <string name="session_runtime_catalog_unreachable">Impossible d\'accéder au catalogue des environnements d\'exécution. Vérifiez la connexion et appuyez à nouveau sur Play.</string> <string name="session_runtime_install_failed">L\'environnement d\'exécution Linux ne s\'est pas installé. Vérifiez-le dans « Paramètres » et appuyez à nouveau sur Play.</string> <string name="session_desktop_install_failed">Le bureau ne s\'est pas installé (%1$s). Vérifiez la connexion et appuyez à nouveau sur Bureau.</string> + <string name="session_package_resume_failed">Une installation interrompue n\'a pas pu être terminée (%1$s). Vérifiez la connexion et l\'espace libre, puis réessayez.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">L\'environnement d\'exécution Linux est endommagé : %1$d lien de bibliothèque pointe vers un fichier manquant (%2$s), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + <item quantity="many">L\'environnement d\'exécution Linux est endommagé : %1$d liens de bibliothèque pointent vers des fichiers manquants (%2$s et d\'autres), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + <item quantity="other">L\'environnement d\'exécution Linux est endommagé : %1$d liens de bibliothèque pointent vers des fichiers manquants (%2$s et d\'autres), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + </plurals> <string name="session_ended_named">%1$s s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> <string name="session_ended_program">Le programme s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> <string name="session_ended_desktop">Le bureau s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> @@ -1389,6 +1550,14 @@ <string name="mode_decky_plugins_hint">Installez un ZIP de plugin pour la prochaine session Steam.</string> <string name="mode_decky_plugin_downloading">Téléchargement…</string> <string name="mode_decky_plugin_install_zip">Installer depuis un ZIP</string> + <string name="decky_zip_warning_title">Installation d\'un plugin tiers</string> + <string name="decky_zip_warning_text">L\'équipe de Decky Loader n\'a pas examiné ce plugin. Il peut contenir des logiciels malveillants, par exemple pour voler votre compte Steam ou endommager votre appareil. En installant ce plugin, vous acceptez d\'assumer tous les risques pour votre appareil.</string> + <string name="decky_zip_warning_continue">Continuer</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Veuillez patienter %1$d seconde</item> + <item quantity="many">Veuillez patienter %1$d secondes</item> + <item quantity="other">Veuillez patienter %1$d secondes</item> + </plurals> <string name="store_cat_games">Jeux</string> <string name="store_cat_audio_video">Audio et vidéo</string> <string name="store_cat_graphics">Graphisme</string> @@ -1417,6 +1586,10 @@ <string name="theme_icon_blue_detail">Fond noir, texte blanc, et le bleu pour tout élément sélectionné, ciblé ou pressé.</string> <string name="theme_electric">Marine électrique</string> <string name="theme_electric_detail">Un bleu plus vif, sur des surfaces qui tirent vers le marine plutôt que vers le gris.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Des couleurs qui parcourent l\'arc-en-ciel. Respecte les réglages d\'animation d\'Android.</string> + <string name="theme_rgb_speed">Vitesse</string> + <string name="theme_rgb_speed_hint">La vitesse de défilement des couleurs.</string> <string name="theme_gradient">Dégradé</string> <string name="theme_gradient_detail">Vos propres couleurs primaire et secondaire, fondues sur les boutons et les éléments en surbrillance.</string> <string name="theme_gradient_primary">Primaire</string> @@ -1543,7 +1716,16 @@ <string name="fm_conflict_skip">Ignorer</string> <string name="fm_select_this_folder">Sélectionner ce dossier</string> <string name="fm_back">Retour</string> + <string name="fm_exit">Quitter</string> + <string name="fm_return_to_start">Revenir au dossier de départ</string> + <string name="fm_start_unavailable">Le dossier de départ est indisponible</string> + <string name="fm_cancel_operation_title">Annuler l’opération ?</string> + <string name="fm_cancel_operation_confirmation">Cette opération sera annulée. Confirmez-vous ?</string> + <string name="fm_accept">Accepter</string> + <string name="fm_decline">Refuser</string> <string name="fm_drive_not_readable">%1$s est monté, mais illisible pour le moment</string> + <string name="fm_drive_access_title">Autoriser l\'accès à %1$s</string> + <string name="fm_drive_access_text">Android permet à DroidDeck de voir ce lecteur, mais pas de le lire. Activez l\'accès à tous les fichiers pour DroidDeck, puis revenez.</string> <string name="fm_list_view">Vue en liste</string> <string name="fm_grid_view">Vue en grille</string> <string name="fm_search">Rechercher</string> @@ -1616,6 +1798,93 @@ <string name="second_mode_keyboard_trackpad">Clavier + pavé tactile</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Poignées Deck + pavés tactiles</string> + <string name="second_mode_dashboard">Tableau de bord</string> + <string name="bottom_dashboard_empty">Rien à afficher pour l\'instant.</string> + <string name="bottom_page_downloads">Téléchargements</string> + <string name="bottom_downloads_none">Aucun téléchargement en cours.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Téléchargement du cache de shaders</string> + <string name="bottom_downloads_paused">En pause</string> + <string name="bottom_downloads_queued">En attente de démarrage</string> + <string name="bottom_page_notifications">Notifications</string> + <string name="bottom_notifications_listener">Écran inférieur DroidDeck</string> + <string name="bottom_notifications_why">Affichez ici les messages et autres notifications pendant que vous jouez. Ils restent uniquement sur cet écran et ne sont pas enregistrés. Android ne le demande qu\'une fois : sa page d\'accès aux notifications s\'ouvre sur cet écran ; activez-y DroidDeck et cette page reviendra d\'elle-même.</string> + <string name="bottom_notifications_allow">Autoriser l\'accès aux notifications</string> + <string name="bottom_notifications_none">Aucune notification.</string> + <string name="bottom_notifications_count">%1$d notifications</string> + <string name="bottom_notifications_clear">Effacer</string> + <string name="bottom_page_screenshots">Captures d\'écran</string> + <string name="stats_fps_needs_hud">Les FPS nécessitent d\'activer le HUD</string> + <string name="stats_speed">Vitesse</string> + <string name="stats_pedals">Pédales</string> + <string name="stats_gforce">Force G</string> + <string name="stats_timing">Chronométrage</string> + <string name="stats_best_lap">Meilleur tour</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Accélérateur et frein, 10 dernières s</string> + <string name="stats_speed_chart">Vitesse, %1$s</string> + <string name="stats_gear">Rapport</string> + <string name="stats_speed_units">Unités de vitesse</string> + <string name="stats_speed_units_auto">Automatique (%1$s)</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Accélérateur</string> + <string name="stats_brake">Frein</string> + <string name="stats_lights">Tableau de bord</string> + <string name="stats_lamp_shift">Passage de rapport</string> + <string name="stats_lamp_handbrake">Frein à main</string> + <string name="stats_lamp_pit">Limiteur des stands</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Moteur %1$s °C</string> + <string name="stats_oil_temp">Huile %1$s °C</string> + <string name="stats_power">Répartiteur d\'énergie</string> + <string name="stats_fuel_t">Carburant, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Réserve %1$s t</string> + <string name="stats_tap_hint">Appuyez sur la bande supérieure ou sur le tableau de bord pour changer son style.</string> + <string name="bottom_telemetry_send_title">Envoyer les données du tableau de bord</string> + <string name="bottom_telemetry_send_auto">Automatique</string> + <string name="bottom_telemetry_send_auto_hint">L\'active pour chaque jeu listé ici, y compris les jeux trouvés plus tard. Les jeux que vous désactivez restent désactivés.</string> + <string name="bottom_telemetry_send_note">Cela modifie le paramètre de sortie de données propre au jeu. Le changement prend effet au prochain lancement du jeu ; le désactiver rétablit l\'ancien paramètre.</string> + <string name="bottom_telemetry_send_close">Fermez %1$s pour modifier ce réglage.</string> + <string name="bottom_telemetry_send_failed">Impossible de modifier les paramètres de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s : activez %2$s dans les paramètres du jeu avec l\'IP 127.0.0.1 et le port %3$d.</string> + <string name="bottom_shots_where">Enregistrées dans Pictures/DroidDeck. Les captures d\'écran Steam s\'affichent aussi ici.</string> + <string name="bottom_shots_take">Prendre une capture d\'écran</string> + <string name="bottom_shots_saved">Capture d\'écran enregistrée.</string> + <string name="bottom_shots_failed">Impossible de prendre une capture d\'écran.</string> + <string name="bottom_shots_none">Aucune capture d\'écran pour l\'instant.</string> + <string name="bottom_page_chat">Chat et voix</string> + <string name="bottom_chat_why">Lisez le chat Steam et répondez-y ici pendant que le jeu continue de tourner sur l\'écran principal. Le compte connecté à Steam est utilisé.</string> + <string name="bottom_chat_not_signed_in">Steam n\'a pas encore de connexion web à partager, connectez-vous donc ici une fois.</string> + <string name="bottom_chat_stopped">Android a fermé la page de chat pendant que DroidDeck était en arrière-plan. Elle se rouvre lorsque vous revenez sur DroidDeck.</string> + <string name="bottom_chat_open">Ouvrir Steam Chat</string> + <string name="bottom_chat_close">Fermer le chat</string> + <string name="bottom_chat_mic_on">Micro activé</string> + <string name="bottom_chat_mic_off">Micro désactivé</string> + <string name="bottom_chat_mic_unavailable">Le micro est désactivé pour ce jeu. Pour parler, activez Microphone dans les paramètres Steam de DroidDeck (Audio), puis relancez le jeu.</string> + <string name="bottom_chat_volume">Volume %1$d %%</string> + <string name="bottom_page_telemetry">Statistiques en jeu</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batterie</string> + <string name="bottom_telemetry_lap">Tour</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">Tour actuel</string> + <string name="bottom_telemetry_last_lap">Dernier tour</string> + <string name="bottom_telemetry_fuel">Carburant</string> + <string name="bottom_telemetry_cargo">Cargaison</string> + <string name="bottom_telemetry_pips">Points SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Statut légal</string> + <string name="bottom_telemetry_balance">Solde</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Activez la sortie de données d\'un jeu de course (souvent appelée télémétrie ou UDP) pour voir ici un tableau de bord en direct. Les données restent sur cet appareil.</string> + <string name="bottom_telemetry_unknown_format">Le port %1$d reçoit des données (%2$d paquets de %3$d octets), mais dans un format que cette page ne sait pas encore lire.</string> + <string name="bottom_telemetry_port_busy">Un autre programme utilise déjà le port %1$s ; ce jeu ne peut donc pas s\'afficher ici.</string> <string name="rtinst_removing">Suppression de l\'environnement d\'exécution Linux</string> <plurals name="rtinst_removing_entries"> @@ -1647,6 +1916,7 @@ <string name="flatpakmgr_not_ready">Configurez d\'abord Flatpak</string> <string name="flatpakmgr_starting">Démarrage</string> <string name="flatpakmgr_exit_status">Flatpak s\'est arrêté avec le code %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s est compilée pour %2$s, que DroidDeck ne peut pas exécuter. Ici, les applis Flatpak doivent exister en version ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">Installation : %1$s</string> <string name="flatpakmgr_updating">Mise à jour : %1$s</string> <string name="flatpakmgr_removing">Suppression : %1$s</string> @@ -1740,6 +2010,7 @@ <string name="adbpair_applying">Application du paramètre…</string> <string name="adbpair_command_failed">Échec de la commande de débogage sans fil</string> <string name="adbpair_channel_name">Configuration du débogage sans fil</string> + <string name="adbpair_progress_channel_name">Progression de la configuration du débogage sans fil</string> <string name="adbpair_channel_description">Demande le code d\'appairage du débogage sans fil pendant que les paramètres sont ouverts</string> <string name="adbpair_title_pair">Appairer le débogage sans fil</string> <string name="adbpair_waiting_text">Activez le débogage sans fil, puis appuyez sur « Associer l\'appareil avec un code d\'appairage ».</string> @@ -1848,6 +2119,7 @@ <string name="gpuinfo_not_adreno">GPU non Adreno</string> <string name="gpuinfo_supported">Pris en charge</string> <string name="gpuinfo_experimental">Expérimental : ses pilotes sont des versions de test</string> + <string name="gpuinfo_a850_experimental">Prise en charge expérimentale de l\'Adreno 850 : nécessite des pilotes d\'affichage et de jeu expérimentaux compatibles ; non vérifiée sur cet appareil</string> <string name="gpuinfo_below_tested">En dessous du matériel testé (Adreno 725 et plus récent) : risque de ne pas fonctionner</string> <string name="gpuinfo_unsupported">Non pris en charge : DroidDeck nécessite un GPU Adreno (Snapdragon)</string> @@ -1941,10 +2213,10 @@ <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> + <string name="display_follow_screen_scaled">Mis à l\'échelle %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Afficher les détails de l\'appareil</string> <string name="device_info_hide">Masquer les détails de l\'appareil</string> @@ -1959,7 +2231,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> @@ -1973,11 +2244,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> @@ -1995,9 +2264,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> @@ -2016,12 +2293,43 @@ <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> <string name="stores_sort">Trier</string> + <string name="setup_rail_labels">Libellés de la barre latérale</string> + <string name="setup_rail_labels_hint">Afficher les noms sous les icônes de la barre latérale. Désactivez pour une barre latérale plus fine.</string> + <string name="library_display">Affichage</string> + <string name="library_display_larger">Cartes plus grandes</string> + <string name="library_display_smaller">Cartes plus petites</string> + <string name="library_display_title">Afficher le titre</string> + <string name="library_display_size">Afficher la taille</string> <string name="stores_sort_last_played">Joués récemment</string> <string name="stores_sort_recently_installed">Installés récemment</string> <string name="stores_sort_title_asc">Titre A–Z</string> @@ -2148,6 +2456,9 @@ <string name="stores_download_manager">Gestionnaire de téléchargements</string> <string name="stores_parallel">Téléchargements simultanés</string> <string name="stores_install_where">Installer dans</string> + <string name="stores_install_language">Langue du jeu</string> + <string name="stores_install_language_hint">GOG et Epic installent cette langue. Système suit la langue de l\'application.</string> + <string name="stores_install_language_system">Système</string> <string name="stores_install_title">Installer %1$s :</string> <string name="stores_target_internal">Interne</string> <string name="stores_target_free">%1$s libres</string> @@ -2167,6 +2478,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> @@ -2182,6 +2494,9 @@ <string name="edit_target">Cible</string> <string name="edit_start_in">Démarrer dans</string> <string name="edit_launch_options">Options de lancement</string> + <string name="edit_launch_options_steam_hint">Partagées avec les Propriétés de Steam : une modification d’un côté apparaît des deux.</string> + <string name="edit_launch_options_not_saved">Impossible d’enregistrer les options de lancement dans Steam. Réessayez.</string> + <string name="edit_launch_options_desktop">Steam est peut-être ouvert dans la session Bureau. Modifiez les options de lancement dans ses Propriétés, ou fermez d’abord la session.</string> <string name="edit_artwork">Illustrations</string> <string name="edit_other_exe">Autre exe…</string> <string name="edit_remove">Retirer</string> @@ -2311,6 +2626,7 @@ <string name="setup_download_source_custom">Préfixe personnalisé</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Préfixe</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPLICATIONS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Applications pour le bureau Linux, à ouvrir depuis l\'onglet Bureau.</string> @@ -2453,6 +2769,22 @@ <string name="glasses_tracking_flat_hint">Automatique garde ce jeu 2D fixe dans la vue. Choisissez Écran virtuel dans Affichage pour utiliser le suivi de la tête.</string> <string name="glasses_tracking_sbs_hint">Le suivi de la tête s\'applique à un écran virtuel ou à un jeu SteamVR en cours.</string> <string name="glasses_hardware">Appareil</string> + <string name="vr_controllers_tab">Manettes</string> + <string name="vr_controllers_group">Manettes SteamVR</string> + <string name="vr_controllers_emulate">Manette en VR</string> + <string name="vr_controllers_emulate_hint">Les deux mains VR que votre manette incarne. Les changements s\'appliquent immédiatement, même pendant que SteamVR tourne. Les Joy-Con et les mains suivies reprennent toujours la main de leur côté.</string> + <string name="vr_controllers_off">Manette classique</string> + <string name="vr_controllers_index">Manettes Valve Index</string> + <string name="vr_controllers_touch">Manettes Meta Quest 3</string> + <string name="vr_controllers_vive">Manettes HTC Vive</string> + <string name="vr_controllers_sticks">Au départ, les sticks</string> + <string name="vr_controllers_sticks_hint">Enfoncez les deux sticks en même temps pendant la VR pour basculer.</string> + <string name="vr_controllers_sticks_game">Vous déplacent dans le jeu</string> + <string name="vr_controllers_sticks_hands">Déplacent les mains</string> + <string name="vr_controllers_buttons">Boutons</string> + <string name="vr_controllers_buttons_stick">Les gâchettes restent des gâchettes, les boutons latéraux servent à saisir, A/B et X/Y sont les boutons frontaux de chaque main, un clic de stick clique le joystick, Guide ouvre le menu SteamVR. Haut et bas sur la croix rapprochent ou éloignent les mains.</string> + <string name="vr_controllers_buttons_vive">Les sticks servent de pavés tactiles ; A/X ou un clic de stick les enfonce. Les gâchettes restent des gâchettes, les boutons latéraux servent à saisir, Start et Select font office de menu, Guide ouvre le menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Pas de mains VR. Les jeux compatibles manette, ainsi que le menu SteamVR, reçoivent votre manette normalement.</string> <string name="glasses_brightness">Luminosité</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Pare-soleil</string> @@ -2510,6 +2842,12 @@ <string name="hand_camera_placement">Positionnement de la caméra</string> <string name="hand_camera_placement_hint">Vérifiez que la caméra peut vous voir avant de jouer.</string> <string name="hand_camera_check">Vérifier</string> + <string name="tracking_pack_title">Téléchargement du suivi des mains</string> + <string name="tracking_pack_hint">Le suivi des mains nécessite un téléchargement unique de %1$s.</string> + <string name="tracking_pack_download">Télécharger</string> + <string name="tracking_pack_retry">Réessayer</string> + <string name="tracking_pack_downloading">Téléchargement du suivi des mains… %1$d%%</string> + <string name="tracking_pack_failed">Impossible de télécharger le suivi des mains. Vérifiez votre connexion et réessayez.</string> <string name="hand_camera_check_title">Positionnement de la caméra</string> <string name="hand_camera_how_rear">Installez l\'appareil debout, entre 1,5 et 2 mètres de vous, à hauteur de poitrine, caméra arrière tournée vers vous. Puis entrez dans le champ, les mains tendues.</string> <string name="hand_camera_how_front">Installez l\'appareil debout, entre 1,5 et 2 mètres de vous, à hauteur de poitrine, écran tourné vers vous. Puis entrez dans le champ, les mains tendues.</string> @@ -2584,6 +2922,21 @@ <string name="storage_safe_hint">Environnements d\'exécution inutilisés, résidus, anciens journaux</string> <string name="storage_clean_up">Nettoyer…</string> <string name="storage_session_running">Arrêtez la session pour nettoyer ou supprimer quoi que ce soit. Les tailles restent affichées.</string> + <string name="storage_default_group">Emplacement d\'installation</string> + <string name="storage_default_title">Stockage par défaut</string> + <string name="storage_default_hint">Les nouvelles installations depuis les boutiques vont à l\'emplacement sélectionné. Les jeux existants restent où ils sont. Les bibliothèques Steam gardent leur propre réglage.</string> + <string name="storage_default_ask">Toujours demander</string> + <string name="storage_default_ask_detail">Choisir une destination pour chaque installation</string> + <string name="storage_default_internal">Stockage interne</string> + <string name="storage_default_external">Stockage externe</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">Non connecté</string> + <string name="storage_default_folder">Dossier · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">Non connecté</string> + <string name="storage_default_choose_folder">Choisir un dossier…</string> + <string name="storage_default_choose_folder_detail">Utiliser n\'importe quel dossier sur une carte SD ou une clé USB</string> + <string name="storage_default_note">Les jeux sont placés dans un dossier Games à l\'emplacement sélectionné. Les jeux existants ne sont pas déplacés.</string> <string name="storage_where">Où ça va</string> <string name="storage_games">Jeux Steam</string> <string name="storage_game_data">Données de jeu</string> @@ -2712,6 +3065,9 @@ <string name="storage_data_installed">Jeux installés</string> <string name="storage_data_parts">Préfixe %1$s · shaders %2$s · atelier %3$s</string> <string name="storage_clear_shaders">Effacer les shaders</string> + <string name="storage_reset_prefix">Réinitialiser le préfixe</string> + <string name="storage_reset_prefix_title">Réinitialiser le préfixe de %1$s ?</string> + <string name="storage_reset_prefix_confirm">Supprime son préfixe Wine (%1$s) dans %2$s et le recrée au prochain lancement. Les sauvegardes, paramètres et composants redistribuables installés à l\'intérieur sont perdus ; les sauvegardes Steam Cloud restent dans votre compte.</string> <string name="storage_data_leftovers">Jeux désinstallés</string> <string name="storage_steam_app">Application Steam %1$d</string> <string name="storage_leftover_unsure_detail">Son préfixe contient encore des fichiers, dont d\'éventuelles sauvegardes locales</string> @@ -3015,4 +3371,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchroniser avec Syncthing</string> + <string name="sync_enable_hint">Basée sur Syncthing-Fork, cette implémentation de Syncthing vous permet de synchroniser les fichiers du système de fichiers interne de DroidDeck avec d\'autres instances Syncthing. Elle ne concerne que les fichiers que vous stockez dans le système de fichiers interne de DroidDeck.</string> + <string name="sync_missing">Cette version n\'inclut pas Syncthing.</string> + <string name="sync_starting">Démarrage de Syncthing</string> + <string name="sync_status_starting">Démarrage</string> + <string name="sync_status_up_to_date">À jour</string> + <string name="sync_status_syncing">Synchronisation</string> + <string name="sync_status_paused">En pause</string> + <string name="sync_status_pausing">Mise en pause</string> + <string name="sync_status_resuming">Reprise</string> + <string name="sync_status_attention">Intervention requise</string> + <string name="sync_status_failed">Syncthing s\'est arrêté</string> + <string name="sync_failed_retry">Réessayer</string> + <string name="sync_paused_wifi">En pause jusqu\'à la connexion Wi-Fi</string> + <string name="sync_paused_game">En pause pendant le jeu</string> + <string name="sync_summary">%1$d dossiers · %2$d appareils connectés sur %3$d</string> + <string name="sync_left">%1$s restants</string> + <string name="sync_open_web_ui">Ouvrir l\'interface web</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Reprendre</string> + <string name="sync_running">En cours d\'exécution</string> + <string name="sync_running_hint">Désactivez pour arrêter complètement Syncthing.</string> + <string name="sync_this_device">Cet appareil</string> + <string name="sync_device_id">ID de l\'appareil</string> + <string name="sync_show_qr">Afficher le QR code</string> + <string name="sync_advanced">Avancé</string> + <string name="sync_advanced_hint">Ports, moment d\'exécution, réinitialisation</string> + <string name="sync_open">Ouvrir</string> + <string name="sync_waiting">En attente de votre réponse</string> + <string name="sync_pending_device">%1$s souhaite se connecter</string> + <string name="sync_pending_folder">%1$s souhaite partager « %2$s »</string> + <string name="sync_pending_folder_hint">Acceptez pour choisir où l\'enregistrer dans DroidDeck.</string> + <string name="sync_review">Vérifier dans l\'interface web</string> + <string name="sync_folders">Dossiers</string> + <string name="sync_no_folders">Aucun dossier pour l\'instant.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">À jour</string> + <string name="sync_folder_syncing">Synchronisation %1$d %%</string> + <string name="sync_folder_scanning">Analyse</string> + <string name="sync_folder_paused">En pause</string> + <string name="sync_folder_out_of_sync">Non synchronisé</string> + <string name="sync_folder_errors">Échec de la synchronisation de %1$d fichiers</string> + <string name="sync_folder_blocked">Bloqué</string> + <string name="sync_folder_blocked_hint">Ce dossier se trouve en dehors du stockage de DroidDeck, DroidDeck l\'a donc mis en pause. Pour synchroniser des dossiers en dehors de DroidDeck, utilisez l\'application Syncthing-Fork.</string> + <string name="sync_remove_folder">Retirer de Syncthing</string> + <string name="sync_remove_folder_hint">Le retirer ne supprime aucun fichier.</string> + <string name="sync_devices">Appareils</string> + <string name="sync_no_devices">Aucun appareil pour l\'instant.</string> + <string name="sync_connected">Connecté</string> + <string name="sync_offline">Hors ligne</string> + <string name="sync_last_seen">Vu pour la dernière fois : %1$s</string> + <string name="sync_device_id_title">ID de cet appareil</string> + <string name="sync_device_id_hint">Sur votre autre appareil, ajoutez un appareil dans Syncthing et scannez ce code ou collez l\'ID. Acceptez-le ensuite ici dans l\'interface web.</string> + <string name="sync_copy">Copier</string> + <string name="sync_share">Partager</string> + <string name="sync_done">Terminé</string> + <string name="sync_off_title">Désactiver Syncthing ?</string> + <string name="sync_off_body">Syncthing s\'arrête maintenant et reste arrêté jusqu\'à ce que vous le réactiviez. Les fichiers synchronisés restent à leur place.</string> + <string name="sync_off_forget">Supprimer aussi la configuration de Syncthing</string> + <string name="sync_off_forget_hint">Supprime l\'ID de cet appareil, les dossiers et les appareils. À la réactivation, tout repart de zéro.</string> + <string name="sync_turn_off">Désactiver</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Synchronisation</string> + <string name="sync_port_discovery">Découverte locale</string> + <string name="sync_repick">Choisir de nouveaux ports</string> + <string name="sync_repick_hint">Vérifié de nouveau à chaque démarrage.</string> + <string name="sync_repick_button">Choisir à nouveau</string> + <string name="sync_reset_group">Réinitialisation</string> + <string name="sync_api_key">Clé d\'API</string> + <string name="sync_regenerate">Régénérer</string> + <string name="sync_reset">Réinitialiser Syncthing</string> + <string name="sync_reset_hint">Nouvel ID d\'appareil, dossiers et appareils supprimés. Les fichiers du stockage de DroidDeck sont conservés.</string> + <string name="sync_reset_button">Réinitialiser</string> + <string name="sync_reset_confirm_title">Réinitialiser Syncthing ?</string> + <string name="sync_running_group">Exécution</string> + <string name="sync_run">Exécuter</string> + <string name="sync_run_open">Quand DroidDeck est ouvert</string> + <string name="sync_run_background">En arrière-plan</string> + <string name="sync_wifi_only">Wi-Fi uniquement</string> + <string name="sync_pause_games">Mettre en pause pendant les jeux</string> + <string name="sync_logs">Journaux</string> + <string name="sync_logs_hint">Sortie de Syncthing pour cette session</string> + <string name="sync_logs_share">Partager</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Veuillez d\'abord installer l\'environnement d\'exécution Linux.</string> + <string name="sync_accept">Accepter</string> + <string name="sync_accept_title">Enregistrer « %1$s » dans</string> + <string name="sync_add_folder">Ajouter un dossier</string> + <string name="sync_add_folder_hint">Synchroniser un dossier du stockage de DroidDeck</string> + <string name="sync_choose">Choisir</string> + <string name="sync_add">Ajouter</string> + <string name="sync_add_failed">Impossible d\'ajouter le dossier.</string> + <string name="sync_share_with">Partager avec</string> + <string name="sync_share_none">Aucun appareil pour l\'instant. Vous pourrez partager ce dossier plus tard depuis l\'interface web.</string> + <string name="sync_use_folder">Utiliser ce dossier</string> + <string name="sync_new_folder">Nouveau dossier</string> + <string name="sync_location_home">Dossier personnel du conteneur</string> + <string name="sync_location_sync">Dossier Sync</string> + <string name="sync_location_shared">Stockage partagé de DroidDeck</string> + <string name="sync_location_card">DroidDeck sur %1$s</string> + <string name="sync_location_app">Données de l\'application DroidDeck</string> + <string name="sync_web_path_locked">Les nouveaux dossiers sont enregistrés dans le dossier Sync de DroidDeck. Pour synchroniser un autre dossier de DroidDeck, utilisez « Ajouter un dossier » dans l\'onglet Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recharger</string> + <string name="sync_not_running">Syncthing n\'est pas en cours d\'exécution.</string> + <string name="session_end_steam_sigill">Steam s\'est arrêté sur une instruction illégale (SIGILL). Il peut s\'agir d\'un problème de compatibilité des instructions CPU ou d\'un plantage du client. Partagez les journaux avec les détails de votre appareil.</string> + <string name="session_end_steam_try_x64">Vous pouvez essayer Paramètres Steam → Client Steam → x86-64 (expérimental). Cela nécessite un téléchargement supplémentaire et peut être plus lent.</string> + <string name="session_end_vulkan_device">Le pilote graphique Linux n\'a trouvé aucun périphérique Vulkan utilisable. Vérifiez que le pilote GPU Linux sélectionné prend en charge ce GPU.</string> + <string name="session_end_gpu_unsupported">Cette session ne peut pas démarrer, car ce GPU n\'a aucun pilote Vulkan Linux compatible dans la configuration actuelle. Les pilotes Adreno Turnip ne peuvent pas prendre en charge les GPU MediaTek/Mali.</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_resources_browser">S\'ouvre dans votre navigateur</string> + <string name="game_resource_guides">Guides</string> + <string name="game_resource_protondb_detail">Rapports de compatibilité Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pour les jeux dont les sauvegardes sont sur votre compte Steam</string> + <string name="game_resource_search">Recherche web</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="library_filter">Filtrer</string> + <string name="library_filter_installed">Installés uniquement</string> + <string name="library_filter_all_owned">Tous les jeux possédés</string> + <string name="library_no_installed_matches">Aucun jeu installé ne correspond à ces filtres.</string> + <string name="library_browse_owned">Parcourir les jeux possédé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="stores_itch_updates_found">Mises à jour disponibles : %1$d</string> + <string name="stores_itch_update_replaced">Le développeur a remplacé cette version par %1$s. Mettre à jour vers celle-ci ?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Paramètres cloud</string> + <string name="integration_title">Intégration Steam</string> + <string name="integration_count">%1$d sur %2$d activés</string> + <string name="integration_set_up">Configurer</string> + <string name="integration_location">Position</string> + <string name="integration_app_info">Infos sur l\'appli</string> + <string name="integration_wifi">Noms des réseaux Wi-Fi</string> + <string name="integration_brightness">Luminosité</string> + <string name="integration_home">DroidDeck comme écran d\'accueil</string> + <string name="integration_shortcuts">Raccourcis du bouton Accueil</string> + <string name="integration_wifi_hint">Afficher les réseaux dans Steam · nécessite l\'accès à la position, jamais suivie</string> + <string name="integration_wifi_on">Les réseaux s\'affichent dans Steam</string> + <string name="integration_wifi_location_off">La localisation est désactivée</string> + <string name="integration_wifi_denied">Position refusée · autorisez-la dans Infos sur l\'appli</string> + <string name="integration_brightness_hint">Le curseur de Steam règle la luminosité de l\'écran</string> + <string name="integration_home_hint">Accueil ouvre le menu Steam pendant une session</string> + <string name="integration_shortcuts_hint">Maintenez Accueil pour les combinaisons Steam Guide</string> + <string name="integration_shortcuts_needs_home">Nécessite DroidDeck comme écran d\'accueil</string> + <string name="integration_shortcuts_maybe_restricted">Grisé dans Android ? Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints</string> + <string name="integration_shortcuts_restricted">Bloqué par Android · Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints</string> + <string name="integration_shortcuts_service">Bouton Accueil DroidDeck</string> + <string name="integration_shortcuts_service_description">Transmet les appuis sur le bouton Accueil à Steam Guide lorsqu\'une session Steam est au premier plan et que DroidDeck est l\'application d\'écran d\'accueil par défaut. Ne lit pas le contenu de l\'écran.</string> + <string name="integration_brightness_needed">Activez Luminosité dans Paramètres → Intégration Steam</string> + <string name="apps_search_hint">Rechercher des applications</string> + <string name="apps_no_match">Aucune application ne correspond à « %1$s ».</string> + <string name="apps_add_widget">Ajouter un widget</string> + <string name="apps_widgets_loading">Chargement des widgets…</string> + <string name="apps_widgets_none">Aucune application de cet appareil ne propose de widgets.</string> + <string name="apps_widget_wider">Plus large</string> + <string name="apps_widget_narrower">Plus étroit</string> + <string name="apps_widget_taller">Plus haut</string> + <string name="apps_widget_shorter">Moins haut</string> + <string name="apps_widget_move_earlier">Avancer</string> + <string name="apps_widget_move_later">Reculer</string> + <string name="apps_widget_configure">Paramètres du widget</string> + <string name="apps_widget_remove">Retirer le widget</string> + <string name="apps_add_to_folder">Ajouter à un dossier</string> + <string name="apps_new_folder">Nouveau dossier</string> + <string name="apps_remove_from_folder">Retirer du dossier</string> + <string name="apps_app_info">Infos sur l’application</string> + <string name="apps_uninstall">Désinstaller</string> + <string name="apps_folder_rename">Renommer</string> + <string name="apps_folder_ungroup">Dégrouper</string> + <string name="apps_folder_default">Dossier</string> + <string name="apps_folder_name">Nom du dossier</string> + <string name="apps_filter">Afficher</string> + <string name="apps_filter_all">Toutes les applications</string> + <string name="apps_filter_games">Jeux</string> + <string name="apps_filter_downloaded">Téléchargées</string> + <string name="apps_filter_system">Système</string> + <string name="apps_filter_hidden">Masquées</string> + <string name="apps_hide">Masquer</string> + <string name="apps_unhide">Afficher dans les applications</string> + <string name="apps_shortcut_remove">Retirer le raccourci</string> + <string name="apps_pin_title">Ajouter aux applications</string> + <string name="apps_pin_add">Ajouter</string> + <string name="apps_hidden_none">Aucune application masquée.</string> + <string name="apps_sort_name_asc">Nom A–Z</string> + <string name="apps_sort_name_desc">Nom Z–A</string> + <string name="apps_sort_installed">Installées récemment</string> + <string name="apps_sort_updated">Mises à jour récemment</string> + <plurals name="apps_count"> + <item quantity="one">%d application</item> + <item quantity="many">%d applications</item> + <item quantity="other">%d applications</item> + </plurals> + <string name="desktop_restore_title">Restauration de vos logiciels</string> + <string name="desktop_restore_body">Réinstallation des applis que vous avez ajoutées après une mise à jour de DroidDeck.</string> + <string name="desktop_restore_done_title">Logiciels restaurés</string> + <string name="desktop_restore_done_body">Les applis que vous avez ajoutées sont de nouveau installées.</string> + <string name="desktop_restore_failed_title">Certains logiciels n\'ont pas pu être restaurés</string> + <string name="desktop_restore_failed_body">Consultez ~/.cache/droiddeck/apt-restore.log, puis essayez sudo apt install dans Konsole.</string> + <string name="gog_full_files">Les optimisations natives ne sont pas disponibles. Le téléchargement inclut des fichiers de remplacement complets.</string> + <string name="gog_recover">Vérifier le résultat du correctif</string> + <string name="slow_usb_title">Connexion USB lente</string> + <string name="slow_usb_cable">%1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s), les jeux qu\'il contient se chargeront donc lentement. Utilisez un câble USB 3 de 5 Gbit/s ou plus, retournez la prise USB-C ou utilisez un disque plus rapide.</string> + <string name="slow_usb_port">%1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s). Le port USB de cet appareil ne va pas plus vite, les jeux se chargeront donc lentement. Le stockage interne ou une carte microSD peut être plus rapide.</string> + <string name="slow_usb_never">Ne plus afficher</string> + <string name="slow_usb_dismiss">Fermer</string> + <string name="steam_import_title">Redémarrer Steam pour ajouter vos jeux ?</string> + <string name="steam_import_body">Steam peut afficher comme installés ces jeux que vous possédez : %1$s. Il doit redémarrer pour les afficher. Redémarrez maintenant, ou ils seront ajoutés au prochain démarrage de Steam.</string> + <string name="steam_import_names_more">%1$s et %2$d de plus</string> + <string name="steam_import_now">Redémarrer maintenant</string> + <string name="steam_import_later">Plus tard</string> + <string name="gog_maintenance">Gérer l\'installation GOG</string> + <string name="gog_check">Rechercher des mises à jour</string> + <string name="gog_repair">Vérifier/Réparer</string> + <string name="gog_patches">Correctifs hors ligne</string> + <string name="gog_refresh">Télécharger l\'installateur hors ligne complet</string> + <string name="gog_update">Mettre à jour vers %1$s</string> + <string name="gog_resume">Reprendre la maintenance GOG</string> + <string name="gog_open_patch">Ouvrir l\'installateur du correctif</string> + <string name="gog_patch_in_session">Terminez ou annulez l\'installateur du correctif dans la session Linux.</string> + <string name="gog_patch_requirements">Choisissez un correctif adapté à votre version installée et à votre langue. Les versions sources prises en charge peuvent ne pas être indiquées.</string> + <string name="gog_no_patches">GOG ne propose aucun correctif Windows autonome pour ce jeu.</string> + <string name="gog_managed_files">Les fichiers de jeu modifiés peuvent être remplacés.</string> + <string name="gog_patch_installer_note">L\'installateur s\'ouvre dans votre session Linux.</string> + <string name="gog_download_label">Téléchargement</string> + <string name="gog_space_label">Espace supplémentaire</string> + <string name="gog_space_estimate_label">Espace estimé</string> + <string name="gog_repair_action">Réparer les fichiers</string> + <string name="gog_refresh_action">Actualiser l\'installation</string> + <string name="gog_select_patch">Sélectionner</string> + <string name="setup_all_files">Accès à tous les fichiers</string> + <string name="setup_local_network">Réseau local</string> + <string name="libraries_title">Autres bibliothèques Steam</string> + <string name="libraries_hint">Dossiers où Steam peut installer et lancer des jeux, chacun avec son propre nom. Retirer un dossier conserve ses jeux sur le disque.</string> + <string name="libraries_add">Ajouter une bibliothèque</string> + <string name="libraries_rename_title">Nom de la bibliothèque</string> + <string name="libraries_pick">Choisir un dossier pour la bibliothèque</string> + <string name="libraries_full">%1$d bibliothèques supplémentaires au maximum</string> + <string name="libraries_overlap">Ce dossier est déjà une bibliothèque ou se trouve dans une bibliothèque</string> + <string name="libraries_missing">%1$s · indisponible</string> + <string name="libraries_applies_next">Prend effet à la prochaine session Steam</string> + <string name="bottom_desktop_start">Démarrer le bureau</string> + <string name="bottom_desktop_mode_touch">Toucher direct</string> + <string name="bottom_desktop_trackpad">Pavé tactile. Touchez pour passer au toucher direct</string> + <string name="bottom_desktop_direct_touch">Toucher direct. Touchez pour passer au pavé tactile</string> + <string name="bottom_desktop_starting">Démarrage du bureau KDE…</string> + <string name="bottom_desktop_ended">Le bureau s’est fermé.</string> + <string name="bottom_desktop_failed">Le bureau n’a pas pu démarrer. Ses journaux se trouvent dans le dossier bottom-desktop de cette session.</string> + <string name="bottom_desktop_off">Le bureau est fermé.</string> + <string name="libraries_rename">Renommer</string> + <string name="second_mode_desktop">Bureau</string> + <string name="bottom_desktop_mode_trackpad">Pavé tactile</string> + <string name="bottom_desktop_title">Bureau · %1$s</string> </resources> diff --git a/app/src/main/res/values-hi/gestures.xml b/app/src/main/res/values-hi/gestures.xml index 12bdd6381..5eea6440b 100644 --- a/app/src/main/res/values-hi/gestures.xml +++ b/app/src/main/res/values-hi/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">जेस्चर</string> <string name="gesture_settings">टच जेस्चर सेटिंग</string> - <string name="gesture_settings_hint">माउस और कीबोर्ड जेस्चर बदलें। इस्तेमाल करने के लिए टच मोड में जेस्चर चुनें।</string> <string name="gesture_tap">टैप</string> <string name="gesture_drag">एक उँगली से खींचना</string> <string name="gesture_long_press">देर तक दबाना</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">तीन उँगलियों से दबाए रखना</string> <string name="gesture_pinch">पिंच करके ज़ूम करें</string> <string name="gesture_hold_button">बटन दबाए रखें</string> + <string name="gesture_hold_left">बायाँ बटन दबाए रखें</string> + <string name="gesture_hold_right">दायाँ बटन दबाए रखें</string> <string name="gesture_click_once">एक बार क्लिक करें</string> <string name="gesture_hold_delay">दबाए रखने का विलंब</string> <string name="gesture_double_delay">दो टैप के बीच का अंतराल</string> diff --git a/app/src/main/res/values-hi/shortcuts.xml b/app/src/main/res/values-hi/shortcuts.xml new file mode 100644 index 000000000..70b2dcb36 --- /dev/null +++ b/app/src/main/res/values-hi/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">भौतिक बटन शॉर्टकट</string> + <string name="shortcuts_dd_menu">DroidDeck मेनू</string> + <string name="shortcuts_capture">असाइन करें: %1$s</string> + <string name="shortcuts_press">कोई बटन दबाकर छोड़ें। असाइनमेंट अपने आप सहेजा जाता है।</string> + <string name="shortcuts_release">जारी रखने के लिए बटन छोड़ें।</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">यह बटन पहले से असाइन है: %1$s</string> + <string name="shortcuts_save">फिर से असाइन करें</string> + <string name="shortcuts_retry">दूसरा बटन आज़माएँ</string> + <string name="shortcuts_limitations">होम और कुछ अतिरिक्त बटन उपलब्ध नहीं हो सकते हैं।</string> +</resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 113507232..3fb8d3471 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 के लिए VKD3D विकल्प। nodxr रे ट्रेसिंग बंद करता है; इसका उपयोग सिर्फ़ उन गेम के लिए करें जिन्हें इसकी ज़रूरत हो।</string> <string name="game_env_proton_log">Proton डायग्नोस्टिक लॉग के लिए 1 सेट करें। लॉगिंग से परफ़ॉर्मेंस घट सकता है और स्टोरेज लगता है।</string> <string name="game_env_wined3d">D3D9–11 संगतता जांच के लिए DXVK के बजाय OpenGL-आधारित WineD3D इस्तेमाल करने के लिए 1 सेट करें।</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 और WineD3D से चलने वाले गेम के लिए रेंडरर। Vulkan, OpenGL-on-Zink पाथ को छोड़ देता है और Adreno पर पुराने DirectDraw और Direct3D 7 गेम के लिए काफ़ी तेज़ है।</string> + <string name="game_env_dxvk_d3d8">Direct3D 8 को WineD3D के बजाय DXVK से चलाने के लिए 1 सेट करें। Adreno पर AIO Graphics Test के Direct3D 8 टेस्ट में ज़्यादा तेज़।</string> <string name="game_env_no_ntsync">इस गेम को ntsync (droiddeck-ntsync या कर्नेल ड्राइवर) से दूर रखने के लिए 1 सेट करें; जहां पैक मौजूद है वहां यह droiddeck-esync इस्तेमाल करता है, वरना droiddeck-fsync।</string> <string name="game_env_no_esync">इस गेम के लिए droiddeck-esync बंद करने के लिए 1 सेट करें; इसके बदले यह droiddeck-fsync इस्तेमाल करता है, या जहां fsync भी बंद है वहां droiddeck-ntsync।</string> <string name="game_env_no_fsync">इस गेम को droiddeck-fsync से दूर रखने के लिए 1 सेट करें; जहां पैक मौजूद है वहां यह droiddeck-esync इस्तेमाल करता है, वरना droiddeck-ntsync।</string> <string name="game_env_fsync_first">इस गेम को droiddeck-fsync पर चलाने के लिए 1 सेट करें, या droiddeck-esync को पहले रखने के लिए 0 — जहां कोई पैक इसके Proton से मेल खाता हो।</string> <string name="game_env_xalia">इस गेम के लिए Proton के गेमपैड-नेविगेशन हेल्पर को बंद करने के लिए 0 सेट करें।</string> + <string name="game_env_anticheat_offline">डिफ़ॉल्ट रूप से चालू। जब गेम ऑफ़लाइन खेलने का समर्थन करता है, तो Easy Anti-Cheat गेम को उसके एंटी-चीट के बिना शुरू करता है। हमेशा की तरह Easy Anti-Cheat से लॉन्च करने के लिए बंद करें। Easy Anti-Cheat की ज़रूरत वाले ऑनलाइन मोड उपलब्ध नहीं रहते।</string> <string name="game_env_hud">D3D9–11 के लिए DXVK ओवरले। fps फ़्रेम रेट दिखाता है; अनसेट करने पर यह छिप जाता है।</string> <string name="game_env_dxvk_config">सेमीकोलन से अलग की गई DXVK सेटिंग। नए बिल्ड फ़्रेम सीमित करने के लिए dxvk.maxFrameRate इस्तेमाल करते हैं; सामान्य खेल के लिए सेशन का फ़्रेम लिमिटर इस्तेमाल करना बेहतर है।</string> + <string name="game_env_cores">सेशन के गेम कोर की जगह इस गेम के लिए CPU कोर, जैसे 0-4 या 0,2,4। कम कोर ठंडे चलते हैं।</string> <string name="game_env_vkd3d_limit">D3D12 फ़्रेम-रेट सीमा। 0 सीमा को बंद कर देता है।</string> <string name="game_env_glthread">Mesa OpenGL थ्रेडिंग। true, CPU-सीमित OpenGL गेम में मदद कर सकता है; हर गेम पर जांच लें।</string> <string name="sync_backend_title">Wine सिंक</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX इस ARM64 डिवाइस पर x86 Linux प्रोग्राम चलाता है। प्रोग्राम x86 के लिए बना होने पर ऑटो इसे इस्तेमाल करता है।</string> <string name="app_fex_x86">FEX के ज़रिए %1$s</string> <string name="app_fex_not_ready">यह प्रोग्राम %1$s पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी सेट नहीं है। साइन इन रहते हुए Steam एक बार खोलें: DroidDeck इससे FEX और ज़रूरी Steam Linux Runtime डाउनलोड करवा लेगा, फिर यह खुल जाएगा।</string> + <string name="session_proot_missing">DroidDeck का proot डाउनलोड नहीं हो सका। कनेक्शन जांचें और फिर कोशिश करें। सेशन शुरू नहीं किया गया, क्योंकि बैकअप proot खेलने के लिए बहुत धीमा है।</string> + <string name="session_directaudio_missing">DirectAudio डाउनलोड नहीं हो सका, इसलिए इस सेशन में गेम ऑडियो धीमा पाथ इस्तेमाल करता है।</string> <string name="session_end_program">यह प्रोग्राम</string> <string name="session_end_steam_download">Steam क्लाइंट डाउनलोड नहीं हो सका। हो सकता है आपका नेटवर्क या VPN Steam के सर्वर ब्लॉक कर रहा हो; कनेक्शन जांचें और फिर से कोशिश करें।</string> <string name="session_end_steam_setup">Steam क्लाइंट सेट अप नहीं हो सका। कनेक्शन और खाली स्टोरेज जांचें, फिर से कोशिश करें।</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 कंट्रोलर</string> <string name="mode_controller_note">Deck: Quick Access बटन और gyro। Steam Controller: वही, साथ में पीछे के बटन पर ग्रिप सेंस। DualShock 4 और DualSense: gyro, और ट्रैकपैड उनके टचपैड के तौर पर। Xbox 360: Guide+A से Quick Access खोलें।</string> <string name="mode_back">बैक</string> + <string name="back_hold">Steam शॉर्टकट के लिए बैक दबाकर रखें</string> + <string name="back_hold_hint">बैक दबाकर रखने से क्विक एक्सेस खुलता है या दूसरे बटनों के साथ Steam कॉम्बो बनते हैं। दबाकर रखने को अनदेखा करने के लिए बंद करें; टैप और डबल-टैप काम करते रहेंगे।</string> + <string name="back_native_qam_hint">Steam शॉर्टकट के लिए Back को 700 ms तक दबाए रखें, या Back दबाए रखकर कोई दूसरा बटन दबाएं।</string> + <string name="back_double_tap_window">डबल-टैप विंडो</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">ब्राइटनेस कंट्रोल की अनुमति दें</string> + <string name="brightness_permission_text">DroidDeck में ब्राइटनेस कंट्रोल सेट अप करें।</string> <string name="back_menu_then_qam">मेनू → QAM</string> <string name="back_qam_then_menu">QAM → मेनू</string> <string name="mode_session">सेशन</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">नवीनतम · %1$s</string> <string name="mode_decky_loader">लोडर</string> <string name="mode_decky_install_latest">नवीनतम इंस्टॉल करें</string> + <string name="decky_channel">अपडेट चैनल</string> + <string name="decky_channel_hint">कौन-सी Decky Loader रिलीज़ इंस्टॉल करनी हैं। Decky का अपना अपडेटर भी यही चैनल इस्तेमाल करता है।</string> + <string name="decky_channel_stable">स्टेबल</string> + <string name="decky_channel_prerelease">प्री-रिलीज़</string> + <string name="decky_channel_testing">टेस्टिंग</string> + <string name="decky_channel_failed">Decky अपडेट चैनल सेव नहीं हो सका</string> <string name="mode_decky_on">Steam के साथ शुरू होता है। चालू रहते हुए, इस डिवाइस के दूसरे ऐप Steam को नियंत्रित कर सकते हैं।</string> <string name="mode_decky_off">बंद। Steam का रिमोट डिबगिंग पोर्ट बंद रहता है।</string> <string name="mode_decky_remove_title">Decky Loader अनइंस्टॉल करें?</string> @@ -307,6 +342,10 @@ <string name="mode_client">क्लाइंट</string> <string name="mode_mangoapp">परफ़ॉर्मेंस ओवरले</string> <string name="mode_mangoapp_hint">Deck मोड में गेम क्रैश होने या काली स्क्रीन होने पर इसे बंद करें। अगले सेशन से लागू होता है।</string> + <string name="mode_return_after_game">गेम के बाद DroidDeck पर लौटें</string> + <string name="mode_return_after_game_hint">जब DroidDeck या किसी दूसरे लॉन्चर से शुरू किया गेम बंद होता है, तो Steam ठीक से बंद होता है (क्लाउड सेव पहले पूरे होते हैं) और आप वहीं लौट जाते हैं। बंद: Steam में ही रहें।</string> + <string name="mode_shader_precache">शेडर प्री-कैशिंग</string> + <string name="mode_shader_precache_hint">Steam आपके गेम के लिए पहले से बने शेडर डाउनलोड करता है और उन्हें बैकग्राउंड में प्रोसेस करता है, ताकि गेम कम अटकें। बंद करने पर डेटा, स्टोरेज और बैटरी बचती है; गेम खेलते समय ही शेडर बनाते हैं। यह Steam की Downloads > Shader Pre-Caching वाली ही सेटिंग है। अगले सेशन से लागू होता है।</string> <string name="mode_steam_repair">Steam क्लाइंट रिपेयर करें</string> <string name="mode_steam_repair_hint">अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होता है। इसे इस्तेमाल करें जब Steam अपनी लोडिंग स्क्रीन पर अटका रह जाए। गेम, साइन-इन और सेटिंग बनी रहती हैं।</string> <string name="mode_steam_repair_queued">अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होगा।</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">कम लेटेंसी के लिए PulseAudio को बायपास करता है।</string> <string name="mode_mic">माइक्रोफ़ोन</string> <string name="mode_mic_hint">वॉइस चैट के लिए।</string> + <string name="drawer_mic_hint">इस सेशन के लिए माइक्रोफ़ोन कैप्चर चालू या बंद करें।</string> + <string name="drawer_mic_failed">माइक्रोफ़ोन बदला नहीं जा सका। कृपया फिर कोशिश करें।</string> <string name="mode_network">नेटवर्क</string> <string name="mode_wifi_discovery">Wi-Fi खोज</string> <string name="mode_wifi_discovery_hint">Steam में Wi-Fi नाम और आस-पास के नेटवर्क दिखाएं।</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: रीयलटाइम GPU क्यू</string> <string name="perf_gsrealtime_hint">कम्पोज़िटर के GPU काम को प्राथमिकता देता है। गेम की कुछ कीमत पर फ़्रेम पेसिंग को स्मूथ कर सकता है।</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">मेमोरी</string> + <string name="perf_cap_off">बंद</string> + <string name="perf_cap_auto">ड्राइवर डिफ़ॉल्ट</string> + <string name="perf_zram_client">गेम चलते समय Steam को कंप्रेस करें</string> + <string name="perf_zram_client_hint">गेम शुरू होने के 20 s बाद, Steam क्लाइंट को zRAM में कंप्रेस किया जाता है ताकि गेम को ज़्यादा मेमोरी मिले, और गेम बंद होने पर वापस पढ़ा जाता है। अगर गेम शुरू होने के कुछ देर बाद सेशन बंद हो जाता है तो इसे बंद करें। ऊपर दी गई RAM सीमा पार होने पर भी Steam कंप्रेस होता है।</string> + <string name="perf_ram_cap">RAM सीमा</string> + <string name="perf_ram_cap_hint">Steam क्लाइंट चलते समय लागू होती है, Steam मोड में या डेस्कटॉप से। जब सेशन इससे ज़्यादा इस्तेमाल करता है, तो Steam और फिर सेशन की दूसरी समर्थित प्रोसेस zRAM में कंप्रेस होती हैं। यह सॉफ़्ट सीमा है: कुछ बंद नहीं होता, लेकिन पेज वापस आते समय गेम अटक सकते हैं।</string> + <string name="perf_ram_cap_unavailable">zRAM स्वैप चाहिए, जो इस डिवाइस में नहीं है।</string> + <string name="perf_vram_cap">VRAM सीमा</string> + <string name="perf_vram_cap_hint">वह वीडियो मेमोरी जो DXVK, Direct3D गेम को बताता है, ताकि वे टेक्सचर के लिए कम बजट रखें। गेम की अपनी DXVK सेटिंग को प्राथमिकता मिलती है। अगले सेशन से लागू होता है।</string> <string name="perf_gpuclock">GPU को उसकी टॉप क्लॉक पर बनाए रखें</string> <string name="perf_gpuclock_hint">सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी।</string> <string name="perf_fixes">सेशन फ़िक्स</string> <string name="perf_sysmem">Turnip: sysmem रेंडरिंग</string> <string name="perf_sysmem_hint">Steam क्लाइंट के लिए तेज़; गेम में ड्राइवर हर पास के लिए टाइल या सिस्टम मेमोरी रेंडरिंग चुनता है। Adreno 710/720/722 पर ज़रूरी।</string> <string name="perf_xalia">Steam के xalia हेल्पर को छोड़ें</string> - <string name="perf_fastsync">droiddeck-ntsync (एक्सपेरिमेंटल)</string> - <string name="perf_fastsync_hint">जांच के लिए Linux ntsync ड्राइवर की यूज़रस्पेस जगह लेने वाली चीज़। चालू रहते हुए, Proton इसे droiddeck-esync और droiddeck-fsync के बदले इस्तेमाल करता है। यह Proton Experimental ARM64, GE-Proton और proton-cachyos के साथ काम करता है। अगले सेशन से लागू होता है।</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Linux ntsync ड्राइवर की यूज़रस्पेस जगह लेने वाली चीज़। चालू रहते हुए, Proton इसे droiddeck-esync और droiddeck-fsync के बदले इस्तेमाल करता है। यह Proton Experimental ARM64, GE-Proton और proton-cachyos के साथ काम करता है। अगले सेशन से लागू होता है।</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync पहले</string> <string name="perf_fsync_hint">स्टॉक Proton फ़ाइलों पर Proton का अपना fsync चलाता है, futex_waitv यूज़रस्पेस में दिया जाता है, इसलिए इसे किसी पैक की ज़रूरत नहीं और Steam के Proton अपडेट करते ही यह काम करता रहता है। चालू रहते हुए, गेम इसे droiddeck-esync से पहले इस्तेमाल करते हैं, सिवाय उन कुछ के जिन्हें Proton fsync से दूर रखता है। अगले सेशन से लागू होता है।</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot फ़ास्ट पाथ</string> <string name="perf_fastpath_needs_seccomp">proot के seccomp फ़िल्टर की ज़रूरत है।</string> <string name="perf_fastpath_hint">तेज़ फ़ाइल लुकअप और कम अटकाव। अगर कोई प्रोग्राम अपनी फ़ाइलें न खोज पाए तो इसे बंद करें।</string> + <string name="perf_cursor_composite">gamescope के अंदर कर्सर बनाएं</string> + <string name="perf_cursor_composite_hint">Gamescope पॉइंटर को Android को देने के बजाय खुद बनाता है। कंट्रोलर से चलने वाले कर्सर के लिए चालू करें। फ़ोन पर बंद रखना तेज़ है। अगले सेशन से लागू होता है।</string> <string name="perf_identity">सेशन पहचान</string> <string name="perf_hostname">होस्ट नाम</string> <string name="perf_hostname_hint">वह नाम जो Steam इस डिवाइस के लिए देखता है। खाली छोड़ने पर %1$s वापस आ जाता है।</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">इसकी फ़ाइलें ऐप से हटा दी जाती हैं।</string> <string name="driver_delete_in_use">इसकी फ़ाइलें हटा दी जाती हैं। यह उपयोग में है, इसलिए डिफ़ॉल्ट इसकी जगह ले लेता है।</string> <string name="drawer_page_display">डिस्प्ले</string> + <string name="drawer_frame_limit">फ़्रेम सीमा</string> + <string name="drawer_frame_limit_note">इस गेम को सीमित करता है। अगर डिस्प्ले में ऐसा रिफ़्रेश रेट है जिसे सीमा बराबर भाग देती है, तो वह उस पर चला जाता है; दूसरी सीमाएं असमान लग सकती हैं। Steam गेम, Quick Access मेनू में Steam की Frame Limit इस्तेमाल करते हैं।</string> <string name="drawer_page_effects">इफ़ेक्ट</string> <string name="drawer_page_controls">कंट्रोल</string> <string name="drawer_page_components">कॉम्पोनेंट</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">एम्बर</string> <string name="drawer_hud_color_violet">वायलेट</string> <string name="drawer_hud_opacity">ओपैसिटी</string> + <string name="hud_size">आकार</string> + <string name="hud_size_hint">HUD पर टैप करने से भी उसका आकार बदलता है।</string> + <string name="hud_size_full">फ़ुल</string> + <string name="hud_size_tiles">टाइल्स</string> + <string name="hud_size_pill">पिल</string> + <string name="hud_size_minimal">मिनिमल</string> + <string name="hud_size_mega">मेगा</string> + <string name="hud_size_strip">पट्टी</string> + <string name="hud_locked">जगह पर लॉक करें</string> + <string name="hud_locked_hint">HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं।</string> + <string name="hud_snap">किनारों पर चिपकाएँ</string> + <string name="hud_snap_hint">HUD छोड़ने पर यह स्क्रीन की पास वाली ओर चला जाता है। तेज़ी से झटकने पर यह उसी दिशा में जाता है।</string> + <string name="hud_group_look">लुक</string> + <string name="hud_scale">स्क्रीन पर आकार</string> + <string name="hud_color_soft">हल्का</string> + <string name="hud_color_mid">मध्यम</string> + <string name="hud_color_vivid">चटख</string> + <string name="hud_outline">आउटलाइन</string> + <string name="hud_outline_color">आउटलाइन का रंग</string> + <string name="hud_outline_gray">ग्रे</string> + <string name="hud_outline_theme">थीम का रंग</string> + <string name="hud_group_metrics">रीडिंग</string> + <string name="hud_metric_graph">फ़्रेम टाइम ग्राफ़</string> + <string name="hud_metric_decimal">दशमलव सहित फ़्रेम दर</string> + <string name="hud_metric_low001" formatted="false">0.01% लो</string> + <string name="hud_metric_engine">ग्राफ़िक्स इंजन</string> + <string name="hud_metric_gpu_model">GPU का नाम</string> + <string name="hud_metric_gpu">GPU लोड</string> + <string name="hud_metric_gpu_temp">GPU तापमान</string> + <string name="hud_metric_cpu">CPU लोड</string> + <string name="hud_metric_per_core">प्रति कोर CPU</string> + <string name="hud_metric_temp">तापमान</string> + <string name="hud_metric_ram">मेमोरी</string> + <string name="hud_metric_vram">ग्राफ़िक्स मेमोरी</string> + <string name="hud_metric_swap">स्वैप</string> + <string name="hud_metric_battery">बैटरी लेवल</string> + <string name="hud_metric_power">पावर खपत</string> + <string name="hud_metric_network">नेटवर्क</string> + <string name="hud_metric_resolution">रिज़ॉल्यूशन</string> + <string name="hud_metric_proton">Proton वर्शन</string> + <string name="hud_metric_session">सेशन का समय</string> + <string name="hud_metric_clock">घड़ी</string> + <string name="hud_group_temps">तापमान</string> + <string name="hud_temp_unit">इकाई</string> + <string name="hud_temp_bands">चेतावनी रंग</string> + <string name="hud_temp_bands_hint">सीमा के पास पहुंचने पर तापमान पहले एम्बर, फिर लाल हो जाता है।</string> + <string name="hud_temp_bands_off">बंद</string> + <string name="hud_temp_bands_auto">ऑटोमैटिक</string> + <string name="hud_temp_bands_manual">मैनुअल</string> + <string name="hud_temp_red_cpu">CPU लाल सीमा</string> + <string name="hud_temp_red_gpu">GPU लाल सीमा</string> + <string name="hud_temp_red_battery">बैटरी लाल सीमा</string> + <string name="hud_group_more">ज़्यादा</string> + <string name="hud_export">HUD डायग्नोस्टिक्स</string> + <string name="hud_export_hint">HUD जिन सेंसर को पढ़ता है, उन सबकी रिपोर्ट Downloads/DroidDeck में सेव करता है।</string> + <string name="hud_export_button">सेव करें</string> + <string name="hud_export_done">%1$s में सहेजा गया</string> + <string name="hud_export_failed">HUD रिपोर्ट सेव नहीं हो सकी।</string> + <string name="hud_reset">HUD सेटिंग रीसेट करें</string> + <string name="hud_reset_button">रीसेट करें</string> <string name="drawer_scaling">स्केलिंग मोड</string> <string name="drawer_scaling_sharpness">स्केलिंग शार्पनेस</string> <string name="drawer_effects">स्क्रीन इफ़ेक्ट</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">ऑटो (%1$s)</string> <string name="drawer_keyboard">कीबोर्ड</string> <string name="drawer_latency">लेटेंसी</string> + <string name="drawer_low_latency">लो लेटेंसी मोड</string> + <string name="drawer_low_latency_hint">CPU और बैटरी का इस्तेमाल बढ़ाता है</string> <string name="drawer_low_latency_controller">कम लेटेंसी कंट्रोलर</string> <string name="drawer_low_latency_controller_hint">कंट्रोलर 250 Hz के बजाय 1000 Hz पर रिपोर्ट करता है। थोड़ा ज़्यादा CPU।</string> <string name="drawer_low_latency_touch">कम लेटेंसी टच</string> <string name="drawer_low_latency_touch_hint">टच फ़्रेम बैचिंग छोड़ देते हैं, इसलिए Steam का टच कंट्रोल 1000 Hz पर चलता है। थोड़ा ज़्यादा CPU।</string> + <string name="drawer_evdev_mouse">रॉ माउस चैनल</string> + <string name="drawer_direct_cursor">कर्सर</string> <string name="drawer_pc_keyboard">पीसी कीबोर्ड</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">दूसरी स्क्रीन</string> @@ -715,6 +834,10 @@ <string name="setup_session">सेशन</string> <string name="setup_logs">सेशन लॉग</string> <string name="setup_logs_hint">हर सेशन के बाद सेव होता है</string> + <string name="setup_game_debug_logs">गेम डीबग लॉग</string> + <string name="setup_game_debug_logs_hint">अगली बार गेम लॉन्च होने पर Proton, Wine और ग्राफ़िक्स डायग्नोस्टिक्स शामिल करें। परफ़ॉर्मेंस घटा सकता है और ज़्यादा स्टोरेज ले सकता है।</string> + <string name="setup_game_debug_logs_restart">गेम डीबग लॉग सेव करने के लिए यह सेशन रीस्टार्ट करें</string> + <string name="setup_logging_update_failed">लॉगिंग अपडेट नहीं हो सकी। स्विच जांचें और फिर कोशिश करें।</string> <string name="setup_agent_commands">डिबगिंग टूल</string> <string name="setup_latest_logs">नवीनतम सेशन लॉग</string> <string name="setup_saved_logs">सेव किए सेशन लॉग</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck होम ऐप हो सकता है</string> <string name="setup_home_off">DroidDeck को होम ऐप के तौर पर कभी नहीं दिखाया जाता</string> <string name="setup_orientation">ओरिएंटेशन</string> + <string name="setup_launcher_orientation">लॉन्चर ओरिएंटेशन</string> + <string name="setup_launcher_orientation_auto">डिवाइस रोटेशन के अनुसार</string> + <string name="setup_orientation_portrait">पोर्ट्रेट</string> + <string name="setup_session_orientation">सेशन ओरिएंटेशन</string> + <string name="setup_session_orientation_hint">Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; कस्टम चौड़ाई और ऊंचाई जैसी डाली गई वैसी ही रहती हैं।</string> <string name="setup_orientation_auto">ऑटोमैटिक लैंडस्केप</string> <string name="setup_orientation_landscape">लैंडस्केप</string> <string name="setup_orientation_reverse">उलटा लैंडस्केप</string> <string name="setup_fullscreen">फ़ुलस्क्रीन</string> <string name="setup_fullscreen_on">Android स्टेटस और नेविगेशन बार छिपाता है</string> <string name="setup_fullscreen_off">Android स्टेटस और नेविगेशन बार दिखाता है</string> + <string name="setup_dual_screen">डुअल स्क्रीन</string> + <string name="setup_dual_screen_hint">ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है।</string> + <string name="setup_dual_screen_auto">ऑटोमैटिक</string> + <string name="setup_dual_screen_on">चालू</string> + <string name="setup_dual_screen_off">बंद</string> + <string name="setup_dual_screen_menu">नीचे की स्क्रीन पर मेनू</string> + <string name="setup_dual_screen_menu_hint">सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं।</string> + <string name="setup_dual_screen_controls">गेम में नीचे की स्क्रीन के कंट्रोल</string> + <string name="setup_dual_screen_controls_hint">सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है।</string> + <string name="dual_typing_title">ऊपर की स्क्रीन के लिए टाइपिंग</string> + <string name="dual_typing_done">हो गया</string> <string name="setup_default_home">डिफ़ॉल्ट होम ऐप</string> <string name="setup_choose_home">होम ऐप चुनें</string> <string name="setup_choose">चुनें</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Settings → डेवलपर विकल्प → वायरलेस डीबगिंग खोलें और उसे चालू करें</string> <string name="gate_step2">“Pair device with pairing code” पर टैप करें</string> <string name="gate_step3">DroidDeck नोटिफ़िकेशन में कोड टाइप करें</string> + <string name="pairguide_build_number">फ़ोन के बारे में में, बिल्ड नंबर पर 7 बार टैप करें</string> + <string name="pairguide_wireless">वायरलेस डीबगिंग चालू करें</string> + <string name="pairguide_pair">वायरलेस डीबगिंग खोलें, फिर “पेयरिंग कोड से डिवाइस को पेयर करें” पर टैप करें</string> + <string name="pairguide_child_process">“चाइल्ड प्रोसेस से जुड़ी पाबंदियां हटाएं” चालू करें</string> + <string name="pairguide_row_child_process">चाइल्ड प्रोसेस से जुड़ी पाबंदियां हटाएं</string> + <string name="pairguide_row_build_number">बिल्ड नंबर</string> + <string name="pairguide_row_wireless">वायरलेस डीबगिंग</string> + <string name="pairguide_row_pair">पेयरिंग कोड से डिवाइस को पेयर करें</string> <string name="gate_waiting">पेयरिंग पॉप-अप का इंतज़ार हो रहा है…</string> <string name="gate_code_needed">पॉप-अप मिल गया। इसका कोड नोटिफ़िकेशन में डालें।</string> <string name="gate_status">स्थिति</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">कभी नहीं खेला</string> <string name="games_runtime_busy_percent">रनटाइम व्यस्त · %1$d%%</string> <string name="games_runtime_busy">रनटाइम व्यस्त</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">दूसरे GPU के ड्राइवर छिपाएं</string> <string name="gpu_show_other">दूसरे GPU के ड्राइवर दिखाएं</string> <string name="gpu_advanced">एडवांस्ड</string> + <string name="gpu_ubwc_title">UBWC कम्पैटिबिलिटी</string> + <string name="gpu_ubwc_hint">अगर Steam या Android में धारियां या झिलमिलाहट दिखे तो चालू या बंद आज़माएं। DroidDeck रीस्टार्ट करने के बाद दोनों ड्राइवर पर लागू होता है।</string> + <string name="gpu_ubwc_restart">लागू करने के लिए DroidDeck रीस्टार्ट करें।</string> <string name="gpu_set_with_display">डिस्प्ले ड्राइवर के साथ सेट: %1$s दोनों साथ लाता है।</string> <string name="gpu_set_with_runtime">रनटाइम ड्राइवर के साथ सेट: %1$s दोनों साथ लाता है।</string> <string name="gpu_runtime_hint">गेम और डेस्कटॉप में उपयोग होता है।</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">अपने आप PiP में जाएं</string> <string name="unfolded_controls">खुली हुई स्क्रीन पर कंट्रोल</string> <string name="unfolded_controls_hint">खुली होने पर, गेम Steam Deck के ट्रैकपैड और पीछे की ग्रिप के ऊपर दिखता है। बंद होने पर, गेम फ़ुल स्क्रीन में रहता है।</string> + <string name="unfolded_controls_with_controller">कंट्रोलर के साथ भी रखें</string> + <string name="unfolded_controls_with_controller_hint">कंट्रोलर कनेक्ट होने पर भी ये टच कंट्रोल दिखाएं।</string> <string name="pip_suspended">सस्पेंडेड</string> <string name="pip_not_ready">सेशन तैयार होने पर पिक्चर इन पिक्चर उपलब्ध होता है।</string> <string name="pip_permission">Android सेटिंग में DroidDeck के लिए पिक्चर इन पिक्चर की अनुमति दें।</string> <string name="pip_unavailable">Android पिक्चर इन पिक्चर नहीं खोल सका।</string> + <string name="game_more">और</string> + <string name="game_edit_art">आर्ट एडिट करें</string> + <string name="stores_in_steam_label">Steam में</string> <string name="game_shortcut">शॉर्टकट</string> <string name="game_shortcut_add">होम स्क्रीन पर जोड़ें</string> <string name="game_shortcut_choose">गेम चुनें</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">रनटाइम ऑपरेशन खत्म होने का इंतज़ार करें</string> <string name="main_wait_proton_install">कम्पैटिबिलिटी टूल इंस्टॉल खत्म होने का इंतज़ार करें</string> + <string name="load_compat_title">कम्पैटिबिलिटी टूल तैयार हो रहे हैं</string> + <string name="load_compat_wait">कम्पैटिबिलिटी सेटअप पूरा होने का इंतज़ार</string> + <string name="load_compat_hint">सेटअप पूरा होते ही आपका सेशन शुरू होगा।</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">डेस्कटॉप ऐप इंस्टॉल खत्म होने का इंतज़ार करें</string> <string name="main_wait_install_game">गेम लॉन्च करने से पहले इंस्टॉल खत्म होने का इंतज़ार करें</string> <string name="main_saves_close_session">पहले Steam सेशन बंद करें, ताकि गेम इंपोर्ट के ऊपर सेव न कर सके</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">फिर भी इंस्टॉल करें</string> <string name="main_remove_runtime_title">Linux रनटाइम हटाएं</string> <string name="main_remove_runtime_text">यह रनटाइम, इसके भीतर का Steam क्लाइंट, और वहां इंस्टॉल हर गेम हटा देता है।</string> + <string name="runtime_actions_title">Linux रनटाइम</string> + <string name="runtime_actions_text">रिपेयर रनटाइम की सिस्टम फ़ाइलें फिर से इंस्टॉल करता है और Steam, आपके गेम और सेटिंग रखता है। डेस्कटॉप जैसी अतिरिक्त चीज़ें अगली बार इस्तेमाल करने पर फिर से इंस्टॉल होती हैं। हटाएं सब कुछ डिलीट करता है।</string> + <string name="runtime_repair">रनटाइम रिपेयर करें</string> <string name="main_applied">लागू हुआ: %1$s</string> <string name="android_app_open_failed_primary">%1$s प्राइमरी स्क्रीन पर नहीं खुल सका</string> <string name="android_app_open_failed_on">%1$s %2$s पर नहीं खुल सका</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">रनटाइम कैटलॉग तक नहीं पहुंचा जा सका। कनेक्शन जांचें और फिर से Play दबाएं।</string> <string name="session_runtime_install_failed">Linux रनटाइम इंस्टॉल नहीं हुआ। सेटअप में रनटाइम जांचें और फिर से Play दबाएं।</string> <string name="session_desktop_install_failed">डेस्कटॉप इंस्टॉल नहीं हुआ (%1$s)। कनेक्शन जांचें और फिर से Desktop दबाएं।</string> + <string name="session_package_resume_failed">बीच में रुका एक इंस्टॉल पूरा नहीं हो सका (%1$s)। कनेक्शन और जगह जांचें, फिर कोशिश करें।</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux रनटाइम खराब है: %1$d लाइब्रेरी लिंक एक गायब फ़ाइल (%2$s) की ओर इशारा करता है, आमतौर पर इंस्टॉल बीच में रुकने के बाद। रिपेयर आपके गेम और सेटिंग रखता है।</item> + <item quantity="other">Linux रनटाइम खराब है: %1$d लाइब्रेरी लिंक गायब फ़ाइलों (%2$s और अन्य) की ओर इशारा करते हैं, आमतौर पर इंस्टॉल बीच में रुकने के बाद। रिपेयर आपके गेम और सेटिंग रखता है।</item> + </plurals> <string name="session_ended_named">%1$s अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> <string name="session_ended_program">प्रोग्राम अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> <string name="session_ended_desktop">डेस्कटॉप अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">अगले Steam सेशन के लिए एक प्लगइन ZIP इंस्टॉल करें।</string> <string name="mode_decky_plugin_downloading">डाउनलोड हो रहा है…</string> <string name="mode_decky_plugin_install_zip">ZIP से इंस्टॉल करें</string> + <string name="decky_zip_warning_title">थर्ड-पार्टी प्लगइन इंस्टॉलेशन</string> + <string name="decky_zip_warning_text">Decky Loader टीम ने इस प्लगइन की समीक्षा नहीं की है। इसमें मैलवेयर हो सकता है, जैसे आपका Steam अकाउंट चुराने या आपके डिवाइस को नुकसान पहुंचाने वाला सॉफ़्टवेयर। इस प्लगइन को इंस्टॉल करके, आप सहमत होते हैं कि आपने अपने डिवाइस के सभी जोखिम स्वीकार किए हैं।</string> + <string name="decky_zip_warning_continue">जारी रखें</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">कृपया %1$d सेकंड रुकें</item> + <item quantity="other">कृपया %1$d सेकंड रुकें</item> + </plurals> <string name="store_cat_games">गेम</string> <string name="store_cat_audio_video">ऑडियो और वीडियो</string> <string name="store_cat_graphics">ग्राफ़िक्स</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">काली ज़मीन, सफ़ेद टाइप, चुने, फ़ोकस या दबाए गए हर चीज़ के लिए ब्लू रंग।</string> <string name="theme_electric">इलेक्ट्रिक नेवी</string> <string name="theme_electric_detail">ब्लू रंग ज़्यादा चमकीला, उन सतहों पर जो ग्रे के बजाय नेवी की ओर झुकती हैं।</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">इंद्रधनुष के रंगों में बदलते रंग। Android की एनिमेशन सेटिंग का पालन करती है।</string> + <string name="theme_rgb_speed">गति</string> + <string name="theme_rgb_speed_hint">रंग कितनी तेज़ी से बदलें।</string> <string name="theme_gradient">ग्रेडिएंट</string> <string name="theme_gradient_detail">आपके अपने प्राथमिक और द्वितीयक रंग, बटनों और हाइलाइट पर मिश्रित।</string> <string name="theme_gradient_primary">प्राथमिक</string> @@ -1449,7 +1622,7 @@ <string name="fm_copy">कॉपी करें</string> <string name="fm_cut">कट करें</string> <string name="fm_actions">एक्शन</string> - <string name="fm_favorites">Favorites</string> + <string name="fm_favorites">पसंदीदा</string> <string name="fm_pin_current">मौजूदा फ़ोल्डर पिन करें</string> <string name="fm_no_favorites">अभी कोई favorite नहीं है - किसी फ़ोल्डर को उसके ⋮ मेनू से पिन करें ताकि यहां जल्दी वापस आ सकें।</string> <string name="fm_unpin_favorite">favorites से हटाएं</string> @@ -1465,7 +1638,7 @@ <string name="fm_read_only">रीड-ओनली</string> <string name="fm_read_only_hint">गेम (और Wine) को इस फ़ाइल को ओवरराइट या डिलीट करने से रोकता है।</string> <string name="fm_read_only_failed">रीड-ओनली नहीं बदला जा सका</string> - <string name="fm_hidden">Hidden</string> + <string name="fm_hidden">छिपी हुई</string> <string name="fm_hidden_unsupported">यह स्टोरेज hidden फ़्लैग सेव नहीं कर सकता।</string> <string name="fm_hidden_hint">फ़ाइल को Windows में hidden के तौर पर चिह्नित करता है (Wine का hidden एट्रिब्यूट)।</string> <string name="fm_hidden_failed">इस स्टोरेज पर Hidden नहीं बदला जा सका</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">छोड़ें</string> <string name="fm_select_this_folder">यह फ़ोल्डर चुनें</string> <string name="fm_back">बैक</string> + <string name="fm_exit">बाहर निकलें</string> + <string name="fm_return_to_start">शुरुआती फ़ोल्डर पर लौटें</string> + <string name="fm_start_unavailable">शुरुआती फ़ोल्डर अब उपलब्ध नहीं है</string> + <string name="fm_cancel_operation_title">कार्रवाई रद्द करें?</string> + <string name="fm_cancel_operation_confirmation">कार्रवाई रद्द कर दी जाएगी। क्या आप सुनिश्चित हैं?</string> + <string name="fm_accept">स्वीकार करें</string> + <string name="fm_decline">अस्वीकार करें</string> <string name="fm_drive_not_readable">%1$s माउंट है लेकिन अभी पढ़ा नहीं जा सकता</string> + <string name="fm_drive_access_title">%1$s तक पहुँच दें</string> + <string name="fm_drive_access_text">Android, DroidDeck को यह ड्राइव दिखाता है पर पढ़ने नहीं देता। DroidDeck के लिए सभी फ़ाइलों का ऐक्सेस चालू करें, फिर वापस आएँ।</string> <string name="fm_list_view">लिस्ट व्यू</string> <string name="fm_grid_view">ग्रिड व्यू</string> <string name="fm_search">सर्च</string> @@ -1550,7 +1732,7 @@ <string name="fm_rail_title">फ़ाइलें</string> <string name="fm_rail_storage">स्टोरेज</string> <string name="fm_rail_quick">क्विक</string> - <string name="fm_rail_favorites">FAVORITES</string> + <string name="fm_rail_favorites">पसंदीदा</string> <string name="fm_rail_downloads">डाउनलोड</string> <string name="fm_rail_downloads_short">डाउनलोड</string> <string name="fm_rail_roms">ROM</string> @@ -1586,7 +1768,7 @@ <string name="ctrl_target_down">D-pad नीचे</string> <string name="ctrl_target_left">D-pad बायां</string> <string name="ctrl_target_right">D-pad दायां</string> - <string name="ctrl_target_hidden">Hidden</string> + <string name="ctrl_target_hidden">छिपा हुआ</string> <string name="ctrl_editor_drag">ले जाने के लिए ड्रैग करें</string> <string name="ctrl_editor_snap">स्नैप</string> <string name="ctrl_editor_save">सेव करें</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">कीबोर्ड + ट्रैकपैड</string> <string name="second_mode_terminal">टर्मिनल</string> <string name="second_mode_deck_controls">Deck ग्रिप + ट्रैकपैड</string> + <string name="second_mode_dashboard">डैशबोर्ड</string> + <string name="bottom_dashboard_empty">यहां दिखाने के लिए अभी कुछ नहीं है।</string> + <string name="bottom_page_downloads">डाउनलोड</string> + <string name="bottom_downloads_none">कोई डाउनलोड नहीं चल रहा है।</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">शेडर कैश डाउनलोड हो रहा है</string> + <string name="bottom_downloads_paused">रुका हुआ</string> + <string name="bottom_downloads_queued">शुरू होने का इंतज़ार</string> + <string name="bottom_page_notifications">नोटिफ़िकेशन</string> + <string name="bottom_notifications_listener">DroidDeck नीचे की स्क्रीन</string> + <string name="bottom_notifications_why">खेलते समय मैसेज और अन्य नोटिफ़िकेशन यहां दिखाएं। वे सिर्फ़ इसी स्क्रीन पर रहते हैं और सेव नहीं होते। Android एक बार पूछता है: उसका नोटिफ़िकेशन ऐक्सेस पेज इसी स्क्रीन पर खुलता है; वहां DroidDeck चालू करें और यह पेज अपने-आप वापस आ जाएगा।</string> + <string name="bottom_notifications_allow">नोटिफ़िकेशन ऐक्सेस की अनुमति दें</string> + <string name="bottom_notifications_none">कोई नोटिफ़िकेशन नहीं।</string> + <string name="bottom_notifications_count">%1$d नोटिफ़िकेशन</string> + <string name="bottom_notifications_clear">साफ़ करें</string> + <string name="bottom_page_screenshots">स्क्रीनशॉट</string> + <string name="stats_fps_needs_hud">FPS के लिए HUD चालू होना चाहिए</string> + <string name="stats_speed">स्पीड</string> + <string name="stats_pedals">पैडल</string> + <string name="stats_gforce">G-फ़ोर्स</string> + <string name="stats_timing">टाइमिंग</string> + <string name="stats_best_lap">सबसे अच्छा लैप</string> + <string name="stats_tires">टायर °C</string> + <string name="stats_trace">थ्रॉटल और ब्रेक, पिछले 10 s</string> + <string name="stats_speed_chart">स्पीड, %1$s</string> + <string name="stats_gear">गियर</string> + <string name="stats_speed_units">स्पीड की इकाई</string> + <string name="stats_speed_units_auto">ऑटोमैटिक (%1$s)</string> + <string name="stats_steam_client_arm">Steam क्लाइंट ARM</string> + <string name="stats_steam_client_x86">Steam क्लाइंट x86</string> + <string name="stats_throttle">थ्रॉटल</string> + <string name="stats_brake">ब्रेक</string> + <string name="stats_lights">डैशबोर्ड</string> + <string name="stats_lamp_shift">शिफ़्ट</string> + <string name="stats_lamp_handbrake">हैंडब्रेक</string> + <string name="stats_lamp_pit">पिट लिमिटर</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">टर्बो %1$s bar</string> + <string name="stats_engine_temp">इंजन %1$s °C</string> + <string name="stats_oil_temp">ऑयल %1$s °C</string> + <string name="stats_power">पावर डिस्ट्रीब्यूटर</string> + <string name="stats_fuel_t">फ़्यूल, t</string> + <string name="stats_fuel_main">मुख्य %1$s t</string> + <string name="stats_fuel_reserve">रिज़र्व %1$s t</string> + <string name="stats_tap_hint">स्टाइल बदलने के लिए ऊपर की पट्टी या डैश पर टैप करें।</string> + <string name="bottom_telemetry_send_title">डैशबोर्ड डेटा भेजें</string> + <string name="bottom_telemetry_send_auto">ऑटोमैटिक</string> + <string name="bottom_telemetry_send_auto_hint">यहां दिए हर गेम के लिए इसे चालू करता है, बाद में मिलने वाले गेम भी शामिल हैं। जिन गेम को आप बंद करते हैं, वे बंद ही रहते हैं।</string> + <string name="bottom_telemetry_send_note">यह गेम की अपनी डेटा आउटपुट सेटिंग बदलता है। यह अगली बार गेम शुरू होने पर लागू होता है; इसे बंद करने पर पुरानी सेटिंग वापस आ जाती है।</string> + <string name="bottom_telemetry_send_close">इसे बदलने के लिए %1$s बंद करें।</string> + <string name="bottom_telemetry_send_failed">%1$s की सेटिंग बदली नहीं जा सकीं।</string> + <string name="bottom_telemetry_send_menu">%1$s: गेम की सेटिंग में IP 127.0.0.1 और पोर्ट %3$d के साथ %2$s चालू करें।</string> + <string name="bottom_shots_where">Pictures/DroidDeck में सेव होते हैं। Steam स्क्रीनशॉट भी यहां दिखते हैं।</string> + <string name="bottom_shots_take">स्क्रीनशॉट लें</string> + <string name="bottom_shots_saved">स्क्रीनशॉट सेव हो गया।</string> + <string name="bottom_shots_failed">स्क्रीनशॉट नहीं लिया जा सका।</string> + <string name="bottom_shots_none">अभी कोई स्क्रीनशॉट नहीं।</string> + <string name="bottom_page_chat">चैट और वॉइस</string> + <string name="bottom_chat_why">मुख्य स्क्रीन पर गेम चलते हुए यहां Steam चैट पढ़ें और जवाब दें। यह उसी अकाउंट का इस्तेमाल करता है जिससे Steam में साइन इन है।</string> + <string name="bottom_chat_not_signed_in">Steam के पास अभी शेयर करने के लिए कोई वेब साइन-इन नहीं है, इसलिए यहां एक बार साइन इन करें।</string> + <string name="bottom_chat_stopped">DroidDeck बैकग्राउंड में था, तब Android ने चैट पेज बंद कर दिया। DroidDeck पर वापस आने पर यह फिर से खुल जाता है।</string> + <string name="bottom_chat_open">Steam Chat खोलें</string> + <string name="bottom_chat_close">चैट बंद करें</string> + <string name="bottom_chat_mic_on">माइक चालू</string> + <string name="bottom_chat_mic_off">माइक बंद</string> + <string name="bottom_chat_mic_unavailable">इस गेम के लिए माइक बंद है। बात करने के लिए DroidDeck की Steam सेटिंग (ऑडियो) में माइक्रोफ़ोन चालू करें और गेम फिर से शुरू करें।</string> + <string name="bottom_chat_volume">वॉल्यूम %1$d%%</string> + <string name="bottom_page_telemetry">इन-गेम आंकड़े</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">बैटरी</string> + <string name="bottom_telemetry_lap">लैप</string> + <string name="bottom_telemetry_position">पोज़िशन</string> + <string name="bottom_telemetry_this_lap">यह लैप</string> + <string name="bottom_telemetry_last_lap">पिछला लैप</string> + <string name="bottom_telemetry_fuel">फ़्यूल</string> + <string name="bottom_telemetry_cargo">कार्गो</string> + <string name="bottom_telemetry_pips">पिप्स SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">कानूनी स्थिति</string> + <string name="bottom_telemetry_balance">बैलेंस</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">यहां लाइव डैश देखने के लिए किसी रेसिंग गेम का डेटा आउटपुट (अक्सर टेलीमेट्री या UDP कहलाता है) चालू करें। यह इसी डिवाइस पर रहता है।</string> + <string name="bottom_telemetry_unknown_format">पोर्ट %1$d पर डेटा आ रहा है (%3$d बाइट के %2$d पैकेट), लेकिन ऐसे फ़ॉर्मैट में जिसे यह पेज अभी पढ़ नहीं सकता।</string> + <string name="bottom_telemetry_port_busy">पोर्ट %1$s को कोई दूसरा प्रोग्राम पहले से इस्तेमाल कर रहा है, इसलिए वह गेम यहां नहीं दिख सकता।</string> <string name="rtinst_removing">Linux रनटाइम हटाया जा रहा है</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">पहले Flatpak सेट करें</string> <string name="flatpakmgr_starting">शुरू हो रहा है</string> <string name="flatpakmgr_exit_status">Flatpak status %1$d के साथ बंद हुआ</string> + <string name="flatpakmgr_wrong_arch">%1$s %2$s के लिए बना है, जिसे DroidDeck नहीं चला सकता। यहाँ Flatpak ऐप ARM64 या x86_64 के लिए बने होने चाहिए।</string> <string name="flatpakmgr_installing">%1$s इंस्टॉल हो रहा है</string> <string name="flatpakmgr_updating">%1$s अपडेट हो रहा है</string> <string name="flatpakmgr_removing">%1$s हटाया जा रहा है</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">सेटिंग लागू की जा रही है…</string> <string name="adbpair_command_failed">वायरलेस डीबगिंग कमांड विफल रहा</string> <string name="adbpair_channel_name">वायरलेस डीबगिंग सेटअप</string> + <string name="adbpair_progress_channel_name">वायरलेस डीबगिंग सेटअप की प्रगति</string> <string name="adbpair_channel_description">Settings खुली रहते हुए वायरलेस डीबगिंग का पेयरिंग कोड मांगता है</string> <string name="adbpair_title_pair">वायरलेस डीबगिंग पेयर करें</string> <string name="adbpair_waiting_text">वायरलेस डीबगिंग चालू करें, फिर “Pair device with pairing code” पर टैप करें।</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU नहीं है</string> <string name="gpuinfo_supported">समर्थित</string> <string name="gpuinfo_experimental">एक्सपेरिमेंटल: इसके ड्राइवर टेस्ट बिल्ड हैं</string> + <string name="gpuinfo_a850_experimental">प्रयोगात्मक Adreno 850 समर्थन: कम्पैटिबल प्रयोगात्मक डिस्प्ले और गेम ड्राइवर चाहिए; इस डिवाइस पर जांचा नहीं गया</string> <string name="gpuinfo_below_tested">जांचे गए हार्डवेयर से नीचे (Adreno 725 और नए): यह शायद न चले</string> <string name="gpuinfo_unsupported">समर्थित नहीं: DroidDeck को Adreno (Snapdragon) GPU चाहिए</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">स्केल %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">डिवाइस जानकारी दिखाएं</string> <string name="device_info_hide">डिवाइस जानकारी छिपाएं</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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_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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">क्रमबद्ध करें</string> + <string name="setup_rail_labels">साइडबार लेबल</string> + <string name="setup_rail_labels_hint">साइडबार आइकन के नीचे नाम दिखाएं। पतले साइडबार के लिए बंद करें।</string> + <string name="library_display">डिस्प्ले</string> + <string name="library_display_larger">बड़े कार्ड</string> + <string name="library_display_smaller">छोटे कार्ड</string> + <string name="library_display_title">टाइटल दिखाएं</string> + <string name="library_display_size">साइज़ दिखाएं</string> <string name="stores_sort_last_played">हाल में खेले गए</string> <string name="stores_sort_recently_installed">हाल में इंस्टॉल किए गए</string> <string name="stores_sort_title_asc">शीर्षक A–Z</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">डाउनलोड मैनेजर</string> <string name="stores_parallel">एक साथ डाउनलोड</string> <string name="stores_install_where">कहां इंस्टॉल करें</string> + <string name="stores_install_language">गेम की भाषा</string> + <string name="stores_install_language_hint">GOG और Epic यह भाषा इंस्टॉल करते हैं। सिस्टम, ऐप की भाषा के अनुसार चलता है।</string> + <string name="stores_install_language_system">सिस्टम</string> <string name="stores_install_title">%1$s इंस्टॉल करें:</string> <string name="stores_target_internal">इंटरनल</string> <string name="stores_target_free">%1$s खाली</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">टार्गेट</string> <string name="edit_start_in">यहां शुरू करें</string> <string name="edit_launch_options">लॉन्च विकल्प</string> + <string name="edit_launch_options_steam_hint">Steam की Properties के साथ साझा: किसी एक जगह किया गया बदलाव दोनों में दिखता है।</string> + <string name="edit_launch_options_not_saved">लॉन्च विकल्प Steam में सहेजे नहीं जा सके। फिर से कोशिश करें।</string> + <string name="edit_launch_options_desktop">Steam डेस्कटॉप सेशन में खुला हो सकता है। लॉन्च विकल्प उसकी Properties में बदलें, या पहले सेशन बंद करें।</string> <string name="edit_artwork">आर्टवर्क</string> <string name="edit_other_exe">दूसरा exe…</string> <string name="edit_remove">हटाएं</string> @@ -2289,6 +2604,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="flathub_eyebrow">LINUX ऐप</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux डेस्कटॉप के लिए डेस्कटॉप ऐप, डेस्कटॉप से खोले जाते हैं।</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">ऑटोमैटिक इस 2D गेम को व्यू में एक जगह टिकाए रखता है। हेड ट्रैकिंग इस्तेमाल करने के लिए डिस्प्ले में वर्चुअल स्क्रीन चुनें।</string> <string name="glasses_tracking_sbs_hint">हेड ट्रैकिंग वर्चुअल स्क्रीन या चल रहे SteamVR गेम पर लागू होती है।</string> <string name="glasses_hardware">डिवाइस</string> + <string name="vr_controllers_tab">कंट्रोलर</string> + <string name="vr_controllers_group">SteamVR कंट्रोलर</string> + <string name="vr_controllers_emulate">VR में गेम पैड</string> + <string name="vr_controllers_emulate_hint">वे दो VR हाथ जिनके रूप में आपका कंट्रोलर खेलता है। बदलाव तुरंत लागू होते हैं, SteamVR चलते समय भी। Joy-Con और ट्रैक किए गए हाथ अब भी अपनी तरफ़ का नियंत्रण ले लेते हैं।</string> + <string name="vr_controllers_off">सामान्य गेम पैड</string> + <string name="vr_controllers_index">Valve Index कंट्रोलर</string> + <string name="vr_controllers_touch">Meta Quest 3 कंट्रोलर</string> + <string name="vr_controllers_vive">HTC Vive वैंड</string> + <string name="vr_controllers_sticks">स्टिक शुरू में</string> + <string name="vr_controllers_sticks_hint">बदलने के लिए VR के दौरान दोनों स्टिक एक साथ दबाएं।</string> + <string name="vr_controllers_sticks_game">आपको गेम में चलाती हैं</string> + <string name="vr_controllers_sticks_hands">हाथों को हिलाती हैं</string> + <string name="vr_controllers_buttons">बटन</string> + <string name="vr_controllers_buttons_stick">ट्रिगर ट्रिगर ही हैं, बंपर ग्रिप हैं, A/B और X/Y हर हाथ के फ़ेस बटन हैं, स्टिक क्लिक थंबस्टिक क्लिक करते हैं, Guide SteamVR मेनू खोलता है। D-pad ऊपर और नीचे हाथों को पास या दूर ले जाते हैं।</string> + <string name="vr_controllers_buttons_vive">स्टिक ट्रैकपैड हैं; A/X या स्टिक क्लिक उन्हें दबाता है। ट्रिगर ट्रिगर ही हैं, बंपर ग्रिप हैं, Start और Select मेनू हैं, Guide SteamVR मेनू खोलता है।</string> + <string name="vr_controllers_buttons_off">कोई VR हाथ नहीं। गेम पैड का समर्थन करने वाले गेम और SteamVR मेनू को आपका कंट्रोलर हमेशा की तरह मिलता है।</string> <string name="glasses_brightness">ब्राइटनेस</string> <string name="glasses_volume">वॉल्यूम</string> <string name="glasses_sunblock">सनब्लॉक</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">कैमरे की स्थिति</string> <string name="hand_camera_placement_hint">खेलने से पहले जांच लें कि कैमरा आपको देख पा रहा है।</string> <string name="hand_camera_check">जांचें</string> + <string name="tracking_pack_title">हैंड ट्रैकिंग डाउनलोड</string> + <string name="tracking_pack_hint">हैंड ट्रैकिंग के लिए एक बार %1$s डाउनलोड करना होगा।</string> + <string name="tracking_pack_download">डाउनलोड करें</string> + <string name="tracking_pack_retry">फिर कोशिश करें</string> + <string name="tracking_pack_downloading">हैंड ट्रैकिंग डाउनलोड हो रही है… %1$d%%</string> + <string name="tracking_pack_failed">हैंड ट्रैकिंग डाउनलोड नहीं हो सकी। अपना कनेक्शन जांचें और फिर कोशिश करें।</string> <string name="hand_camera_check_title">कैमरे की स्थिति</string> <string name="hand_camera_how_rear">डिवाइस को करीब सीने की ऊंचाई पर, 1.5 से 2 मीटर दूर खड़ा करें, जिसमें रियर कैमरा आपकी ओर हो। फिर हाथ फैलाकर नज़र के दायरे में आएं।</string> <string name="hand_camera_how_front">डिवाइस को करीब सीने की ऊंचाई पर, 1.5 से 2 मीटर दूर खड़ा करें, जिसमें स्क्रीन आपकी ओर हो। फिर हाथ फैलाकर नज़र के दायरे में आएं।</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">अप्रयुक्त रनटाइम, बचे अवशेष, पुराने लॉग</string> <string name="storage_clean_up">साफ़ कर रहे हैं…</string> <string name="storage_session_running">साफ़ करने या कुछ हटाने के लिए सेशन रोकें। आकार दिखते रहेंगे।</string> + <string name="storage_default_group">इंस्टॉल की जगह</string> + <string name="storage_default_title">डिफ़ॉल्ट स्टोरेज</string> + <string name="storage_default_hint">स्टोर से नए इंस्टॉल चुनी गई जगह पर जाते हैं। मौजूदा गेम जहां हैं वहीं रहते हैं। Steam लाइब्रेरी अपनी सेटिंग रखती हैं।</string> + <string name="storage_default_ask">हर बार पूछें</string> + <string name="storage_default_ask_detail">हर इंस्टॉल के लिए जगह चुनें</string> + <string name="storage_default_internal">इंटरनल स्टोरेज</string> + <string name="storage_default_external">एक्सटर्नल स्टोरेज</string> + <string name="storage_default_external_detail">%1$s · %2$s खाली</string> + <string name="storage_default_external_missing">कनेक्ट नहीं है</string> + <string name="storage_default_folder">फ़ोल्डर · %1$s</string> + <string name="storage_default_folder_free">%1$s खाली</string> + <string name="storage_default_folder_missing">कनेक्ट नहीं है</string> + <string name="storage_default_choose_folder">फ़ोल्डर चुनें…</string> + <string name="storage_default_choose_folder_detail">SD कार्ड या USB ड्राइव पर कोई भी फ़ोल्डर इस्तेमाल करें</string> + <string name="storage_default_note">गेम चुनी गई जगह के अंदर एक Games फ़ोल्डर में जाते हैं। मौजूदा गेम मूव नहीं किए जाते।</string> <string name="storage_where">कहाँ जाता है</string> <string name="storage_games">Steam गेम</string> <string name="storage_game_data">गेम डेटा</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">इंस्टॉल किए गेम</string> <string name="storage_data_parts">प्रीफ़िक्स %1$s · शेडर %2$s · वर्कशॉप %3$s</string> <string name="storage_clear_shaders">शेडर साफ़ करें</string> + <string name="storage_reset_prefix">प्रीफ़िक्स रीसेट करें</string> + <string name="storage_reset_prefix_title">%1$s का प्रीफ़िक्स रीसेट करें?</string> + <string name="storage_reset_prefix_confirm">%2$s में इसका Wine प्रीफ़िक्स (%1$s) डिलीट करता है और अगले लॉन्च पर इसे फिर से बनाता है। इसके अंदर के सेव, सेटिंग और इंस्टॉल किए रीडिस्ट्रीब्यूटेबल खो जाते हैं; Steam Cloud सेव आपके अकाउंट में रहते हैं।</string> <string name="storage_data_leftovers">हटाए गए गेम</string> <string name="storage_steam_app">Steam ऐप %1$d</string> <string name="storage_leftover_unsure_detail">प्रीफ़िक्स में अब भी फ़ाइलें हैं, शायद लोकल सेव</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing से सिंक करें</string> + <string name="sync_enable_hint">Syncthing-Fork पर आधारित यह Syncthing इम्प्लीमेंटेशन आपको DroidDeck के इंटरनल फ़ाइल सिस्टम की फ़ाइलें दूसरे Syncthing इंस्टेंस के साथ सिंक करने देता है। यह सिर्फ़ उन फ़ाइलों के लिए है जिन्हें आप DroidDeck के इंटरनल फ़ाइल सिस्टम में रखते हैं।</string> + <string name="sync_missing">इस बिल्ड में Syncthing शामिल नहीं है।</string> + <string name="sync_starting">Syncthing शुरू हो रहा है</string> + <string name="sync_status_starting">शुरू हो रहा है</string> + <string name="sync_status_up_to_date">अप टू डेट</string> + <string name="sync_status_syncing">सिंक हो रहा है</string> + <string name="sync_status_paused">रोका गया</string> + <string name="sync_status_pausing">रोका जा रहा है</string> + <string name="sync_status_resuming">फिर से शुरू हो रहा है</string> + <string name="sync_status_attention">ध्यान देने की ज़रूरत है</string> + <string name="sync_status_failed">Syncthing बंद हो गया</string> + <string name="sync_failed_retry">फिर से कोशिश करें</string> + <string name="sync_paused_wifi">Wi-Fi मिलने तक रोका गया</string> + <string name="sync_paused_game">गेम के दौरान रोका गया</string> + <string name="sync_summary">%1$d फ़ोल्डर · %3$d में से %2$d डिवाइस कनेक्टेड</string> + <string name="sync_left">%1$s बाकी</string> + <string name="sync_open_web_ui">वेब UI खोलें</string> + <string name="sync_pause">रोकें</string> + <string name="sync_resume">फिर से शुरू करें</string> + <string name="sync_running">चल रहा है</string> + <string name="sync_running_hint">Syncthing को पूरी तरह रोकने के लिए बंद करें।</string> + <string name="sync_this_device">यह डिवाइस</string> + <string name="sync_device_id">डिवाइस ID</string> + <string name="sync_show_qr">QR दिखाएं</string> + <string name="sync_advanced">एडवांस्ड</string> + <string name="sync_advanced_hint">पोर्ट, कब चलाना है, रीसेट</string> + <string name="sync_open">खोलें</string> + <string name="sync_waiting">आपका इंतज़ार है</string> + <string name="sync_pending_device">%1$s कनेक्ट करना चाहता है</string> + <string name="sync_pending_folder">%1$s “%2$s” शेयर करना चाहता है</string> + <string name="sync_pending_folder_hint">DroidDeck में इसे कहां सेव करना है, यह चुनने के लिए स्वीकार करें।</string> + <string name="sync_review">वेब UI में देखें</string> + <string name="sync_folders">फ़ोल्डर</string> + <string name="sync_no_folders">अभी कोई फ़ोल्डर नहीं।</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">अप टू डेट</string> + <string name="sync_folder_syncing">सिंक हो रहा है %1$d%%</string> + <string name="sync_folder_scanning">स्कैन हो रहा है</string> + <string name="sync_folder_paused">रोका गया</string> + <string name="sync_folder_out_of_sync">सिंक नहीं है</string> + <string name="sync_folder_errors">%1$d फ़ाइलें सिंक नहीं हो सकीं</string> + <string name="sync_folder_blocked">ब्लॉक किया गया</string> + <string name="sync_folder_blocked_hint">यह फ़ोल्डर DroidDeck के स्टोरेज से बाहर है, इसलिए DroidDeck ने इसे रोक दिया। DroidDeck से बाहर के फ़ोल्डर सिंक करने के लिए Syncthing-Fork ऐप इस्तेमाल करें।</string> + <string name="sync_remove_folder">Syncthing से हटाएं</string> + <string name="sync_remove_folder_hint">इसे हटाने से कोई फ़ाइल डिलीट नहीं होती।</string> + <string name="sync_devices">डिवाइस</string> + <string name="sync_no_devices">अभी कोई डिवाइस नहीं।</string> + <string name="sync_connected">कनेक्टेड</string> + <string name="sync_offline">ऑफ़लाइन</string> + <string name="sync_last_seen">आख़िरी बार देखा गया: %1$s</string> + <string name="sync_device_id_title">इस डिवाइस की ID</string> + <string name="sync_device_id_hint">अपने दूसरे डिवाइस पर Syncthing में एक डिवाइस जोड़ें और यह कोड स्कैन करें या ID पेस्ट करें। फिर यहां वेब UI में उसे स्वीकार करें।</string> + <string name="sync_copy">कॉपी करें</string> + <string name="sync_share">शेयर करें</string> + <string name="sync_done">पूरा हुआ</string> + <string name="sync_off_title">Syncthing बंद करें?</string> + <string name="sync_off_body">Syncthing अभी रुक जाएगा और दोबारा चालू करने तक बंद रहेगा। सिंक की गई फ़ाइलें जहां हैं वहीं रहेंगी।</string> + <string name="sync_off_forget">Syncthing का कॉन्फ़िग भी डिलीट करें</string> + <string name="sync_off_forget_hint">इस डिवाइस की ID, फ़ोल्डर और डिवाइस हटा देता है। दोबारा चालू करने पर सब नए सिरे से शुरू होगा।</string> + <string name="sync_turn_off">बंद करें</string> + <string name="sync_ports">पोर्ट</string> + <string name="sync_port_sync">सिंक</string> + <string name="sync_port_discovery">लोकल डिस्कवरी</string> + <string name="sync_repick">नए पोर्ट चुनें</string> + <string name="sync_repick_hint">हर बार शुरू होने पर फिर से जांचा जाता है।</string> + <string name="sync_repick_button">फिर से चुनें</string> + <string name="sync_reset_group">रीसेट</string> + <string name="sync_api_key">API कुंजी</string> + <string name="sync_regenerate">फिर से बनाएं</string> + <string name="sync_reset">Syncthing रीसेट करें</string> + <string name="sync_reset_hint">नई डिवाइस ID, फ़ोल्डर और डिवाइस हटा दिए जाते हैं। DroidDeck के स्टोरेज की फ़ाइलें रखी जाती हैं।</string> + <string name="sync_reset_button">रीसेट करें</string> + <string name="sync_reset_confirm_title">Syncthing रीसेट करें?</string> + <string name="sync_running_group">चलना</string> + <string name="sync_run">चलाएं</string> + <string name="sync_run_open">जब DroidDeck खुला हो</string> + <string name="sync_run_background">बैकग्राउंड में</string> + <string name="sync_wifi_only">सिर्फ़ Wi-Fi</string> + <string name="sync_pause_games">गेम के दौरान रोकें</string> + <string name="sync_logs">लॉग</string> + <string name="sync_logs_hint">इस सेशन का Syncthing आउटपुट</string> + <string name="sync_logs_share">शेयर करें</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">पहले Linux रनटाइम सेट अप करें।</string> + <string name="sync_accept">स्वीकार करें</string> + <string name="sync_accept_title">“%1$s” यहां सेव करें</string> + <string name="sync_add_folder">फ़ोल्डर जोड़ें</string> + <string name="sync_add_folder_hint">DroidDeck के स्टोरेज का कोई फ़ोल्डर सिंक करें</string> + <string name="sync_choose">चुनें</string> + <string name="sync_add">जोड़ें</string> + <string name="sync_add_failed">फ़ोल्डर नहीं जोड़ा जा सका।</string> + <string name="sync_share_with">इनके साथ शेयर करें</string> + <string name="sync_share_none">अभी कोई डिवाइस नहीं। आप बाद में वेब UI से यह फ़ोल्डर शेयर कर सकते हैं।</string> + <string name="sync_use_folder">यह फ़ोल्डर इस्तेमाल करें</string> + <string name="sync_new_folder">नया फ़ोल्डर</string> + <string name="sync_location_home">कंटेनर होम</string> + <string name="sync_location_sync">Sync फ़ोल्डर</string> + <string name="sync_location_shared">DroidDeck शेयर्ड स्टोरेज</string> + <string name="sync_location_card">%1$s पर DroidDeck</string> + <string name="sync_location_app">DroidDeck ऐप डेटा</string> + <string name="sync_web_path_locked">नए फ़ोल्डर DroidDeck के Sync फ़ोल्डर में सेव होते हैं। DroidDeck का कोई दूसरा फ़ोल्डर सिंक करने के लिए Syncthing टैब पर फ़ोल्डर जोड़ें इस्तेमाल करें।</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">रीलोड करें</string> + <string name="sync_not_running">Syncthing नहीं चल रहा है।</string> + <string name="session_end_steam_sigill">Steam एक अवैध निर्देश (SIGILL) के साथ रुक गया। यह CPU निर्देश कम्पैटिबिलिटी की समस्या या क्लाइंट क्रैश हो सकता है। अपने डिवाइस की जानकारी के साथ लॉग शेयर करें।</string> + <string name="session_end_steam_try_x64">आप Steam सेटिंग → Steam क्लाइंट → x86-64 (प्रयोगात्मक) आज़मा सकते हैं। इसके लिए अतिरिक्त डाउनलोड चाहिए और यह धीमा चल सकता है।</string> + <string name="session_end_vulkan_device">Linux ग्राफ़िक्स ड्राइवर को इस्तेमाल लायक Vulkan डिवाइस नहीं मिला। जांचें कि चुना गया Linux GPU ड्राइवर इस GPU का समर्थन करता है।</string> + <string name="session_end_gpu_unsupported">यह सेशन शुरू नहीं हो सकता क्योंकि मौजूदा सेटअप में इस GPU के लिए कोई कम्पैटिबल Linux Vulkan ड्राइवर नहीं है। Adreno Turnip ड्राइवर MediaTek/Mali GPU का समर्थन चालू नहीं कर सकते।</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_resources_browser">आपके ब्राउज़र में खुलता है</string> + <string name="game_resource_guides">गाइड</string> + <string name="game_resource_protondb_detail">Linux / Proton कम्पैटिबिलिटी रिपोर्ट</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">उन गेम के लिए जिनके सेव आपके Steam अकाउंट पर हैं</string> + <string name="game_resource_search">वेब सर्च</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="library_filter">फ़िल्टर</string> + <string name="library_filter_installed">सिर्फ़ इंस्टॉल किए</string> + <string name="library_filter_all_owned">आपके सभी गेम</string> + <string name="library_no_installed_matches">इन फ़िल्टर से कोई इंस्टॉल किया गेम मेल नहीं खाता।</string> + <string name="library_browse_owned">आपके गेम देखें</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="stores_itch_updates_found">उपलब्ध अपडेट: %1$d</string> + <string name="stores_itch_update_replaced">डेवलपर ने इस बिल्ड को %1$s से बदल दिया है। क्या उस पर अपडेट करें?</string> + <string name="xbox_filter_cloud">क्लाउड</string> + <string name="stores_xbox_cloud_settings">क्लाउड सेटिंग्स</string> + <string name="integration_title">Steam इंटीग्रेशन</string> + <string name="integration_count">%2$d में से %1$d चालू</string> + <string name="integration_set_up">सेट अप करें</string> + <string name="integration_location">लोकेशन</string> + <string name="integration_app_info">ऐप्लिकेशन की जानकारी</string> + <string name="integration_wifi">Wi-Fi नाम</string> + <string name="integration_brightness">ब्राइटनेस</string> + <string name="integration_home">DroidDeck होम के रूप में</string> + <string name="integration_shortcuts">होम बटन शॉर्टकट</string> + <string name="integration_wifi_hint">Steam में नेटवर्क दिखाएं · लोकेशन ऐक्सेस चाहिए, कभी ट्रैक नहीं किया जाता</string> + <string name="integration_wifi_on">नेटवर्क Steam में दिखते हैं</string> + <string name="integration_wifi_location_off">लोकेशन बंद है</string> + <string name="integration_wifi_denied">लोकेशन अस्वीकार · ऐप्लिकेशन की जानकारी में इसकी अनुमति दें</string> + <string name="integration_brightness_hint">Steam का स्लाइडर स्क्रीन ब्राइटनेस सेट करता है</string> + <string name="integration_home_hint">सेशन में होम, Steam मेनू खोलता है</string> + <string name="integration_shortcuts_hint">Steam Guide कॉर्ड के लिए होम दबाए रखें</string> + <string name="integration_shortcuts_needs_home">DroidDeck को होम के रूप में होना चाहिए</string> + <string name="integration_shortcuts_maybe_restricted">Android में धूसर है? ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें</string> + <string name="integration_shortcuts_restricted">Android ने ब्लॉक किया · ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें</string> + <string name="integration_shortcuts_service">DroidDeck होम बटन</string> + <string name="integration_shortcuts_service_description">जब Steam सेशन फ़ोकस में हो और DroidDeck डिफ़ॉल्ट होम ऐप हो, तब होम बटन दबाने को Steam Guide तक भेजता है। स्क्रीन की सामग्री नहीं पढ़ता।</string> + <string name="integration_brightness_needed">Setup → Steam इंटीग्रेशन में ब्राइटनेस चालू करें</string> + <string name="apps_search_hint">ऐप खोजें</string> + <string name="apps_no_match">“%1$s” से कोई ऐप मेल नहीं खाता।</string> + <string name="apps_add_widget">विजेट जोड़ें</string> + <string name="apps_widgets_loading">विजेट लोड हो रहे हैं…</string> + <string name="apps_widgets_none">इस डिवाइस पर कोई ऐप विजेट नहीं देता।</string> + <string name="apps_widget_wider">चौड़ा</string> + <string name="apps_widget_narrower">पतला</string> + <string name="apps_widget_taller">लंबा</string> + <string name="apps_widget_shorter">छोटा</string> + <string name="apps_widget_move_earlier">पहले ले जाएँ</string> + <string name="apps_widget_move_later">बाद में ले जाएँ</string> + <string name="apps_widget_configure">विजेट सेटिंग</string> + <string name="apps_widget_remove">विजेट हटाएँ</string> + <string name="apps_add_to_folder">फ़ोल्डर में जोड़ें</string> + <string name="apps_new_folder">नया फ़ोल्डर</string> + <string name="apps_remove_from_folder">फ़ोल्डर से हटाएँ</string> + <string name="apps_app_info">ऐप की जानकारी</string> + <string name="apps_uninstall">अनइंस्टॉल करें</string> + <string name="apps_folder_rename">नाम बदलें</string> + <string name="apps_folder_ungroup">समूह तोड़ें</string> + <string name="apps_folder_default">फ़ोल्डर</string> + <string name="apps_folder_name">फ़ोल्डर का नाम</string> + <string name="apps_filter">दिखाएँ</string> + <string name="apps_filter_all">सभी ऐप</string> + <string name="apps_filter_games">गेम</string> + <string name="apps_filter_downloaded">डाउनलोड किए गए</string> + <string name="apps_filter_system">सिस्टम</string> + <string name="apps_filter_hidden">छिपे हुए</string> + <string name="apps_hide">छिपाएँ</string> + <string name="apps_unhide">ऐप में दिखाएँ</string> + <string name="apps_shortcut_remove">शॉर्टकट हटाएँ</string> + <string name="apps_pin_title">ऐप में जोड़ें</string> + <string name="apps_pin_add">जोड़ें</string> + <string name="apps_hidden_none">कोई छिपा हुआ ऐप नहीं।</string> + <string name="apps_sort_name_asc">नाम A–Z</string> + <string name="apps_sort_name_desc">नाम Z–A</string> + <string name="apps_sort_installed">हाल ही में इंस्टॉल किए गए</string> + <string name="apps_sort_updated">हाल ही में अपडेट किए गए</string> + <plurals name="apps_count"> + <item quantity="one">%d ऐप</item> + <item quantity="other">%d ऐप</item> + </plurals> + <string name="desktop_restore_title">आपका सॉफ़्टवेयर वापस लाया जा रहा है</string> + <string name="desktop_restore_body">DroidDeck अपडेट के बाद आपके जोड़े गए ऐप्स फिर से इंस्टॉल किए जा रहे हैं।</string> + <string name="desktop_restore_done_title">सॉफ़्टवेयर वापस आ गया</string> + <string name="desktop_restore_done_body">आपके जोड़े गए ऐप्स फिर से इंस्टॉल हो गए हैं।</string> + <string name="desktop_restore_failed_title">कुछ सॉफ़्टवेयर वापस नहीं लाया जा सका</string> + <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log देखें, फिर Konsole में sudo apt install आज़माएँ।</string> + <string name="gog_full_files">नेटिव ऑप्टिमाइज़ेशन उपलब्ध नहीं हैं। डाउनलोड में पूरी बदली जाने वाली फ़ाइलें शामिल हैं।</string> + <string name="gog_recover">पैच का नतीजा जांचें</string> + <string name="slow_usb_title">धीमा USB कनेक्शन</string> + <string name="slow_usb_cable">%1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है, इसलिए इस पर गेम धीरे लोड होंगे। 5 Gbps या तेज़ USB 3 केबल इस्तेमाल करें, USB-C प्लग पलटकर देखें, या तेज़ ड्राइव इस्तेमाल करें।</string> + <string name="slow_usb_port">%1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है। इस डिवाइस का USB पोर्ट इससे तेज़ नहीं चलता, इसलिए गेम धीरे लोड होंगे। आंतरिक स्टोरेज या microSD कार्ड तेज़ हो सकता है।</string> + <string name="slow_usb_never">फिर से न दिखाएँ</string> + <string name="slow_usb_dismiss">बंद करें</string> + <string name="steam_import_title">अपने गेम जोड़ने के लिए Steam फिर से शुरू करें?</string> + <string name="steam_import_body">Steam आपके इन गेम को इंस्टॉल के रूप में दिखा सकता है: %1$s. इन्हें दिखाने के लिए इसे फिर से शुरू करना होगा। अभी फिर से शुरू करें, या ये अगली बार Steam शुरू होने पर जुड़ जाएंगे।</string> + <string name="steam_import_names_more">%1$s और %2$d और</string> + <string name="steam_import_now">अभी फिर से शुरू करें</string> + <string name="steam_import_later">बाद में</string> + <string name="gog_maintenance">GOG इंस्टॉलेशन मैनेज करें</string> + <string name="gog_check">अपडेट जांचें</string> + <string name="gog_repair">जांचें/रिपेयर करें</string> + <string name="gog_patches">ऑफ़लाइन पैच</string> + <string name="gog_refresh">पूरा ऑफ़लाइन इंस्टॉलर डाउनलोड करें</string> + <string name="gog_update">%1$s पर अपडेट करें</string> + <string name="gog_resume">GOG मेंटेनेंस फिर से शुरू करें</string> + <string name="gog_open_patch">पैच इंस्टॉलर खोलें</string> + <string name="gog_patch_in_session">Linux सेशन में पैच इंस्टॉलर पूरा या रद्द करें।</string> + <string name="gog_patch_requirements">अपने इंस्टॉल किए वर्शन और भाषा के लिए पैच चुनें। समर्थित सोर्स वर्शन शायद सूची में न हों।</string> + <string name="gog_no_patches">इस गेम के लिए GOG के पास कोई अलग Windows पैच नहीं है।</string> + <string name="gog_managed_files">संशोधित गेम फ़ाइलें बदली जा सकती हैं।</string> + <string name="gog_patch_installer_note">इंस्टॉलर आपके Linux सेशन में खुलता है।</string> + <string name="gog_download_label">डाउनलोड</string> + <string name="gog_space_label">अतिरिक्त जगह</string> + <string name="gog_space_estimate_label">अनुमानित जगह</string> + <string name="gog_repair_action">फ़ाइलें रिपेयर करें</string> + <string name="gog_refresh_action">इंस्टॉलेशन रिफ़्रेश करें</string> + <string name="gog_select_patch">चुनें</string> + <string name="setup_all_files">सभी फ़ाइलों का ऐक्सेस</string> + <string name="setup_local_network">स्थानीय नेटवर्क</string> + <string name="libraries_title">और Steam लाइब्रेरी</string> + <string name="libraries_hint">ऐसे फ़ोल्डर जहाँ Steam गेम इंस्टॉल और शुरू कर सकता है, हर एक का अपना नाम है। सूची से हटाने पर गेम डिस्क पर बने रहते हैं।</string> + <string name="libraries_add">लाइब्रेरी जोड़ें</string> + <string name="libraries_rename_title">लाइब्रेरी का नाम</string> + <string name="libraries_pick">लाइब्रेरी के लिए फ़ोल्डर चुनें</string> + <string name="libraries_full">अधिकतम %1$d अतिरिक्त लाइब्रेरी</string> + <string name="libraries_overlap">यह फ़ोल्डर पहले से लाइब्रेरी है या किसी लाइब्रेरी के अंदर है</string> + <string name="libraries_missing">%1$s · उपलब्ध नहीं</string> + <string name="libraries_applies_next">अगले Steam सत्र से लागू होगा</string> + <string name="bottom_desktop_start">डेस्कटॉप शुरू करें</string> + <string name="bottom_desktop_mode_touch">सीधा स्पर्श</string> + <string name="bottom_desktop_trackpad">ट्रैकपैड। सीधे स्पर्श के लिए टैप करें</string> + <string name="bottom_desktop_direct_touch">सीधा स्पर्श। ट्रैकपैड के लिए टैप करें</string> + <string name="bottom_desktop_starting">KDE डेस्कटॉप शुरू हो रहा है…</string> + <string name="bottom_desktop_ended">डेस्कटॉप बंद हो गया।</string> + <string name="bottom_desktop_failed">डेस्कटॉप शुरू नहीं हो सका। इसके लॉग इस सत्र के bottom-desktop फ़ोल्डर में हैं।</string> + <string name="bottom_desktop_off">डेस्कटॉप बंद है।</string> + <string name="libraries_rename">नाम बदलें</string> + <string name="second_mode_desktop">डेस्कटॉप</string> + <string name="bottom_desktop_mode_trackpad">ट्रैकपैड</string> + <string name="bottom_desktop_title">डेस्कटॉप · %1$s</string> </resources> diff --git a/app/src/main/res/values-hu/gestures.xml b/app/src/main/res/values-hu/gestures.xml index e5279c2e2..946b4351a 100644 --- a/app/src/main/res/values-hu/gestures.xml +++ b/app/src/main/res/values-hu/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesztusok</string> <string name="gesture_settings">Érintési gesztusok beállításai</string> - <string name="gesture_settings_hint">Szabd testre az egér- és billentyűzetgesztusokat. Használatukhoz válaszd a Gesztusok érintési módot.</string> <string name="gesture_tap">Koppintás</string> <string name="gesture_drag">Húzás egy ujjal</string> <string name="gesture_long_press">Hosszú nyomás</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Nyomva tartás három ujjal</string> <string name="gesture_pinch">Csippentéses nagyítás</string> <string name="gesture_hold_button">Gomb nyomva tartása</string> + <string name="gesture_hold_left">Bal gomb nyomva tartása</string> + <string name="gesture_hold_right">Jobb gomb nyomva tartása</string> <string name="gesture_click_once">Egyszeri kattintás</string> <string name="gesture_hold_delay">Nyomva tartás késleltetése</string> <string name="gesture_double_delay">Dupla koppintás időköze</string> diff --git a/app/src/main/res/values-hu/shortcuts.xml b/app/src/main/res/values-hu/shortcuts.xml new file mode 100644 index 000000000..8f8ee108f --- /dev/null +++ b/app/src/main/res/values-hu/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Fizikai gombok parancsikonjai</string> + <string name="shortcuts_dd_menu">DroidDeck-menü</string> + <string name="shortcuts_capture">Hozzárendelés: %1$s</string> + <string name="shortcuts_press">Nyomj meg és engedj fel egy gombot. A hozzárendelés automatikusan mentődik.</string> + <string name="shortcuts_release">A folytatáshoz engedje fel a gombot.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Ez a gomb már ehhez van rendelve: %1$s</string> + <string name="shortcuts_save">Új hozzárendelés</string> + <string name="shortcuts_retry">Másik gomb kipróbálása</string> + <string name="shortcuts_limitations">A Kezdőlap és egyes extra gombok nem feltétlenül érhetők el.</string> +</resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a1638350a..ee5adbb5a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-beállítások D3D12-höz. A nodxr kikapcsolja a sugárkövetést; csak olyan játéknál használja, amelynek szüksége van rá.</string> <string name="game_env_proton_log">Állítsa 1-re a Proton diagnosztikai napló bekapcsolásához. A naplózás csökkentheti a teljesítményt, és tárhelyet használ.</string> <string name="game_env_wined3d">Állítsa 1-re, hogy a DXVK helyett az OpenGL-alapú WineD3D-t használja D3D9–11 kompatibilitási teszteléshez.</string> + <string name="game_env_wined3d_renderer">Renderelő DirectDraw, Direct3D 1-7 és WineD3D-vel futó játékokhoz. A Vulkan kihagyja az OpenGL-Zinken útvonalat, és Adrenón sokkal gyorsabb a régi DirectDraw és Direct3D 7 játékoknál.</string> + <string name="game_env_dxvk_d3d8">Állítsa 1-re, hogy a Direct3D 8 a WineD3D helyett DXVK-n keresztül fusson. Gyorsabb az AIO Graphics Test Direct3D 8 tesztjében Adrenón.</string> <string name="game_env_no_ntsync">Állítsa 1-re, hogy ez a játék ne használja az ntsyncet (droiddeck-ntsync vagy kernelillesztőprogram); ekkor a droiddeck-esynct használja, ha van csomag, egyébként a droiddeck-fsynct.</string> <string name="game_env_no_esync">Állítsa 1-re a droiddeck-esync kikapcsolásához ennél a játéknál; helyette a droiddeck-fsynct használja, vagy a droiddeck-ntsynct, ha az fsync is ki van kapcsolva.</string> <string name="game_env_no_fsync">Állítsa 1-re, hogy ez a játék ne használja a droiddeck-fsynct; ekkor a droiddeck-esynct használja, ha van csomag, egyébként a droiddeck-ntsynct.</string> <string name="game_env_fsync_first">Állítsa 1-re, hogy ez a játék a droiddeck-fsyncen fusson, vagy 0-ra, hogy a droiddeck-esync kerüljön előre, ha van csomag a Protonjához.</string> <string name="game_env_xalia">Állítsa 0-ra a Proton kontroller-navigációs segédjének kikapcsolásához ennél a játéknál.</string> + <string name="game_env_anticheat_offline">Alapértelmezetten be. Az Easy Anti-Cheat-játékot csalásvédelem nélkül indítja, ha a játék támogatja az offline játékot. Kapcsolja ki, hogy a szokásos módon az Easy Anti-Cheaten keresztül induljon. Az Easy Anti-Cheatet igénylő online módok továbbra sem érhetők el.</string> <string name="game_env_hud">DXVK overlay D3D9–11-hez. Az fps megjeleníti a képkockasebességet; beállítás nélkül elrejti.</string> <string name="game_env_dxvk_config">Pontosvesszővel elválasztott DXVK-beállítások. A legújabb buildek a dxvk.maxFrameRate beállítást használják a képkocka-korlátozáshoz; szokásos játékhoz a munkamenet képkocka-korlátozóját érdemes használni.</string> + <string name="game_env_cores">CPU-magok ehhez a játékhoz, például 0-4 vagy 0,2,4, a munkamenet játékmagjai helyett. Kevesebb mag hűvösebben fut.</string> <string name="game_env_vkd3d_limit">D3D12 képkockasebesség-korlát. A 0 kikapcsolja a korlátot.</string> <string name="game_env_glthread">Mesa OpenGL szálkezelés. A true érték segíthet a CPU-korlátozott OpenGL-játékoknál; tesztelje játékonként.</string> <string name="sync_backend_title">Wine-szinkronizálás</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">A FEX x86-os Linux-programokat futtat ezen az ARM64-es eszközön. Az Automatikus akkor használja, ha a program x86-ra készült.</string> <string name="app_fex_x86">%1$s a FEX-en keresztül</string> <string name="app_fex_not_ready">Ez a program %1$s PC-khez készült, és a FEX-en keresztül fut, amely még nincs beállítva. Nyissa meg egyszer a Steamet bejelentkezve: a DroidDeck ekkor letölti a FEX-et és a szükséges Steam Linux Runtime-ot, majd ez megnyílik.</string> + <string name="session_proot_missing">A DroidDeck proot nem tölthető le. Ellenőrizze a kapcsolatot, és próbálja újra. A munkamenet nem indult el, mert a tartalék proot túl lassú a játékhoz.</string> + <string name="session_directaudio_missing">A DirectAudio nem tölthető le, ezért a játékhang ebben a munkamenetben a lassabb útvonalat használja.</string> <string name="session_end_program">Ez a program</string> <string name="session_end_steam_download">A Steam-klienst nem sikerült letölteni. Lehet, hogy a hálózat vagy a VPN blokkolja a Steam szervereit; ellenőrizd a kapcsolatot, és próbáld újra.</string> <string name="session_end_steam_setup">A Steam-klienst nem sikerült beállítani. Ellenőrizd a kapcsolatot és a szabad tárhelyet, majd próbáld újra.</string> @@ -247,8 +253,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 +271,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">Ravasz</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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 kontroller</string> <string name="mode_controller_note">Deck: Gyors hozzáférés gomb és gyroszkóp. Steam Controller: ugyanez, a hátsó gombok fogásérzékelésével. DualShock 4 és DualSense: gyroszkóp, és az érintőpadok mint touchpad. Xbox 360: a Gyors hozzáférés megnyitása Guide+A-val.</string> <string name="mode_back">Vissza gomb</string> + <string name="back_hold">Vissza nyomva tartása Steam parancsokhoz</string> + <string name="back_hold_hint">A Vissza nyomva tartása megnyitja a Gyors elérést, vagy más gombokkal Steam kombinációkat ad. Kapcsold ki, hogy a nyomva tartást figyelmen kívül hagyja; a koppintás és dupla koppintás továbbra is működik.</string> + <string name="back_native_qam_hint">Tartsa lenyomva a Vissza gombot 700 ms-ig, vagy tartsa lenyomva a Vissza gombot és nyomjon meg egy másik gombot a Steam-parancsikonokhoz.</string> + <string name="back_double_tap_window">Dupla koppintás időablaka</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Fényerő-szabályozás engedélyezése</string> + <string name="brightness_permission_text">Fényerő-szabályozás beállítása a DroidDeckben.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Munkamenet</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Naprakész · %1$s</string> <string name="mode_decky_loader">Betöltő</string> <string name="mode_decky_install_latest">Legújabb telepítése</string> + <string name="decky_channel">Frissítési csatorna</string> + <string name="decky_channel_hint">Mely Decky Loader-kiadások települjenek. A Decky saját frissítője ugyanezt a csatornát használja.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Előzetes kiadás</string> + <string name="decky_channel_testing">Tesztelés</string> + <string name="decky_channel_failed">Nem sikerült menteni a Decky frissítési csatornáját</string> <string name="mode_decky_on">A Steammel együtt indul. Amíg be van kapcsolva, az eszközön lévő más alkalmazások is irányíthatják a Steamet.</string> <string name="mode_decky_off">Ki. A Steam távoli hibakeresési portja zárva marad.</string> <string name="mode_decky_remove_title">Eltávolítja a Decky Loadert?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Kliens</string> <string name="mode_mangoapp">Teljesítmény-overlay</string> <string name="mode_mangoapp_hint">Kapcsolja ki, ha a játékok összeomlanak vagy elfeketednek Deck módban. A következő munkamenettől érvényes.</string> + <string name="mode_return_after_game">Visszatérés a DroidDeckbe játék után</string> + <string name="mode_return_after_game_hint">Amikor egy a DroidDeckből vagy más indítóból elindított játék bezárul, a Steam szabályosan kilép (előbb befejeződnek a felhőmentések), és oda tér vissza. Ki: a Steamben marad.</string> + <string name="mode_shader_precache">Shader-előgyorsítótárazás</string> + <string name="mode_shader_precache_hint">A Steam előre lefordított shadereket tölt le a játékaihoz, és a háttérben feldolgozza őket, így a játékok kevésbé akadnak. Kikapcsolva adatforgalmat, tárhelyet és akkumulátort takarít meg; a játékok ehelyett játék közben fordítják a shadereket. Ugyanaz a beállítás, mint a Steam Letöltések > Shader-előgyorsítótárazás opciója. A következő munkamenettől érvényes.</string> <string name="mode_steam_repair">Steam-kliens javítása</string> <string name="mode_steam_repair_hint">A Steam kliens újbóli letöltése a Steam következő indításakor. Használja, ha a Steam a betöltő képernyőn ragad. A játékok, a bejelentkezés és a beállítások megmaradnak.</string> <string name="mode_steam_repair_queued">A Steam kliens újra letöltődik a Steam következő indításakor.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Megkerüli a PulseAudiót a kisebb késleltetés érdekében.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Hangos csevegéshez.</string> + <string name="drawer_mic_hint">A mikrofonrögzítés be- vagy kikapcsolása ebben a munkamenetben.</string> + <string name="drawer_mic_failed">Nem sikerült módosítani a mikrofont. Próbálja újra.</string> <string name="mode_network">Hálózat</string> <string name="mode_wifi_discovery">Wi-Fi felderítés</string> <string name="mode_wifi_discovery_hint">Wi-Fi nevek és közeli hálózatok megjelenítése a Steamben.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: valós idejű GPU-sor</string> <string name="perf_gsrealtime_hint">Előnyben részesíti a kompozitor GPU-munkáját. Egyenletesebbé teheti a képkocka-ütemezést, kisebb költséggel a játékoknak.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Ki</string> + <string name="perf_cap_auto">Illesztőprogram alapértéke</string> + <string name="perf_zram_client">A Steam tömörítése játék közben</string> + <string name="perf_zram_client_hint">20 mp-cel a játék indulása után a Steam-kliens a zRAM-ba tömörül, hogy több memória maradjon a játéknak, és a játék bezárásakor visszaolvasódik. Kapcsolja ki, ha a munkamenet röviddel a játékok indulása után bezárul. A fenti RAM-korlát akkor is tömöríti a Steamet, ha a munkamenet túllépi.</string> + <string name="perf_ram_cap">RAM-korlát</string> + <string name="perf_ram_cap_hint">Akkor érvényes, amikor a Steam-kliens fut, Steam módban vagy az asztalról. Ha a munkamenet ennél többet használ, a Steam, majd a munkamenet többi támogatott folyamata a zRAM-ba tömörül. Puha korlát: semmi sem zárul be, de a játékok akadhatnak, amíg a lapok visszatöltődnek.</string> + <string name="perf_ram_cap_unavailable">zRAM swap szükséges, amely ezen az eszközön nincs.</string> + <string name="perf_vram_cap">VRAM-korlát</string> + <string name="perf_vram_cap_hint">A DXVK által a Direct3D-játékoknak jelentett videomemória, így azok kevesebbel számolnak a textúráknál. A játék saját DXVK-beállításai elsőbbséget élveznek. A következő munkamenettől érvényes.</string> <string name="perf_gpuclock">A GPU legmagasabb órajelen tartása</string> <string name="perf_gpuclock_hint">Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés.</string> <string name="perf_fixes">Munkamenet-javítások</string> <string name="perf_sysmem">Turnip: sysmem renderelés</string> <string name="perf_sysmem_hint">Gyorsabb a Steam kliensnek; játékokban a meghajtó menetenként választ a csempés és a rendszermemóriás renderelés között. Adreno 710/720/722-n szükséges.</string> <string name="perf_xalia">A Steam xalia segítőjének kihagyása</string> - <string name="perf_fastsync">droiddeck-ntsync (kísérleti)</string> - <string name="perf_fastsync_hint">A Linux ntsync illesztőprogram felhasználói szintű helyettesítője, teszteléshez. Amíg be van kapcsolva, a Proton ezt használja a droiddeck-esync és a droiddeck-fsync helyett. A Proton Experimental ARM64-gyel, a GE-Protonnal és a proton-cachyosszal működik. A következő munkamenettől érvényes.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">A Linux ntsync illesztőprogram felhasználói szintű helyettesítője. Amíg be van kapcsolva, a Proton ezt használja a droiddeck-esync és a droiddeck-fsync helyett. A Proton Experimental ARM64-gyel, a GE-Protonnal és a proton-cachyosszal működik. A következő munkamenettől érvényes.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync előre</string> <string name="perf_fsync_hint">A Proton saját fsyncjét futtatja az eredeti Proton-fájlokon, felhasználói szinten biztosított futex_waitv-vel, így nincs szükség csomagra, és azonnal működik, amint a Steam frissíti a Protont. Amíg be van kapcsolva, a játékok ezt használják a droiddeck-esync előtt, kivéve azt a néhányat, amelyet a Proton kizár az fsyncből. A következő munkamenettől érvényes.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot gyors útvonal</string> <string name="perf_fastpath_needs_seccomp">A proot seccomp-szűrőjét igényli.</string> <string name="perf_fastpath_hint">Gyorsabb fájlkeresés és kevesebb akadás. Kapcsolja ki, ha egy program nem találja a fájljait.</string> + <string name="perf_cursor_composite">A kurzor rajzolása a gamescope-on belül</string> + <string name="perf_cursor_composite_hint">A Gamescope maga rajzolja a mutatót ahelyett, hogy átadná az Androidnak. Kapcsolja be kontrollerrel vezérelt kurzorhoz. Telefonon kikapcsolva gyorsabb. A következő munkamenettől érvényes.</string> <string name="perf_identity">Munkamenet-azonosítás</string> <string name="perf_hostname">Hosztnév</string> <string name="perf_hostname_hint">A név, amelyet a Steam ehhez az eszközhöz lát. Üresen hagyva visszaállítja: %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">A fájljai eltávolításra kerülnek az alkalmazásból.</string> <string name="driver_delete_in_use">A fájljai eltávolításra kerülnek. Használatban van, ezért az alapértelmezett veszi át a szerepét.</string> <string name="drawer_page_display">Kijelző</string> + <string name="drawer_frame_limit">Képkockakorlát</string> + <string name="drawer_frame_limit_note">Korlátozza ezt a játékot. A kijelző olyan frissítési frekvenciára vált, amelyet a korlát egyenletesen oszt, ha van ilyen; más korlátok egyenetlennek tűnhetnek. A Steam-játékok a Steam képkockakorlátját használják a Gyors hozzáférés menüben.</string> <string name="drawer_page_effects">Effektek</string> <string name="drawer_page_controls">Vezérlők</string> <string name="drawer_page_components">Összetevők</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Borostyán</string> <string name="drawer_hud_color_violet">Lila</string> <string name="drawer_hud_opacity">Átlátszatlanság</string> + <string name="hud_size">Méret</string> + <string name="hud_size_hint">A HUD-ra koppintva is változik a mérete.</string> + <string name="hud_size_full">Teljes</string> + <string name="hud_size_tiles">Csempék</string> + <string name="hud_size_pill">Kapszula</string> + <string name="hud_size_minimal">Minimális</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Sáv</string> + <string name="hud_locked">Rögzítés a helyén</string> + <string name="hud_locked_hint">Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. Rögzítve is működnek az alatta lévő képernyős vezérlők.</string> + <string name="hud_snap">Igazítás az oldalakhoz</string> + <string name="hud_snap_hint">Engedd el a HUD-ot, és a képernyő közelebbi oldalára ugrik. Egy gyors pöccintés abba az irányba dobja.</string> + <string name="hud_group_look">Megjelenés</string> + <string name="hud_scale">Méret a képernyőn</string> + <string name="hud_color_soft">Lágy</string> + <string name="hud_color_mid">Közepes</string> + <string name="hud_color_vivid">Élénk</string> + <string name="hud_outline">Körvonal</string> + <string name="hud_outline_color">Körvonal színe</string> + <string name="hud_outline_gray">Szürke</string> + <string name="hud_outline_theme">Témaszín</string> + <string name="hud_group_metrics">Mért értékek</string> + <string name="hud_metric_graph">Képkockaidő-grafikon</string> + <string name="hud_metric_decimal">Képkockasebesség tizedesjeggyel</string> + <string name="hud_metric_low001" formatted="false">0.01% legalacsonyabb</string> + <string name="hud_metric_engine">Grafikus motor</string> + <string name="hud_metric_gpu_model">GPU neve</string> + <string name="hud_metric_gpu">GPU-terhelés</string> + <string name="hud_metric_gpu_temp">GPU-hőmérséklet</string> + <string name="hud_metric_cpu">CPU-terhelés</string> + <string name="hud_metric_per_core">CPU magonként</string> + <string name="hud_metric_temp">Hőmérsékletek</string> + <string name="hud_metric_ram">Memória</string> + <string name="hud_metric_vram">Grafikus memória</string> + <string name="hud_metric_swap">Swap-memória</string> + <string name="hud_metric_battery">Akkuszint</string> + <string name="hud_metric_power">Energiafelvétel</string> + <string name="hud_metric_network">Hálózat</string> + <string name="hud_metric_resolution">Felbontás</string> + <string name="hud_metric_proton">Proton-verzió</string> + <string name="hud_metric_session">Munkamenet ideje</string> + <string name="hud_metric_clock">Óra</string> + <string name="hud_group_temps">Hőmérsékletek</string> + <string name="hud_temp_unit">Mértékegység</string> + <string name="hud_temp_bands">Figyelmeztető színek</string> + <string name="hud_temp_bands_hint">A hőmérsékletek a határhoz közeledve előbb borostyánszínűre, majd pirosra váltanak.</string> + <string name="hud_temp_bands_off">Ki</string> + <string name="hud_temp_bands_auto">Automatikus</string> + <string name="hud_temp_bands_manual">Manuális</string> + <string name="hud_temp_red_cpu">CPU piros határa</string> + <string name="hud_temp_red_gpu">GPU piros határa</string> + <string name="hud_temp_red_battery">Akku piros határa</string> + <string name="hud_group_more">Több</string> + <string name="hud_export">HUD-diagnosztika</string> + <string name="hud_export_hint">Jelentést ment a HUD által olvasott összes érzékelőről a Downloads/DroidDeck mappába.</string> + <string name="hud_export_button">Mentés</string> + <string name="hud_export_done">Mentve: %1$s</string> + <string name="hud_export_failed">Nem sikerült menteni a HUD-jelentést.</string> + <string name="hud_reset">HUD-beállítások visszaállítása</string> + <string name="hud_reset_button">Visszaállítás</string> <string name="drawer_scaling">Méretezési mód</string> <string name="drawer_scaling_sharpness">Méretezési élesség</string> <string name="drawer_effects">Képernyőeffektek</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Automatikus (%1$s)</string> <string name="drawer_keyboard">Billentyűzet</string> <string name="drawer_latency">Késleltetés</string> + <string name="drawer_low_latency">Alacsony késleltetésű mód</string> + <string name="drawer_low_latency_hint">Növeli a CPU- és akkumulátorhasználatot</string> <string name="drawer_low_latency_controller">Alacsony késleltetésű kontroller</string> <string name="drawer_low_latency_controller_hint">A kontroller 250 Hz helyett 1000 Hz-en jelent. Kicsit több CPU.</string> <string name="drawer_low_latency_touch">Alacsony késleltetésű érintés</string> <string name="drawer_low_latency_touch_hint">Az érintések kihagyják a képkockák kötegelését, így a Steam érintésvezérlése 1000 Hz-en fut. Kicsit több CPU.</string> + <string name="drawer_evdev_mouse">Nyers egércsatorna</string> + <string name="drawer_direct_cursor">Kurzor</string> <string name="drawer_pc_keyboard">PC-billentyűzet</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Második képernyő</string> @@ -715,6 +834,10 @@ <string name="setup_session">Munkamenet</string> <string name="setup_logs">Munkamenet-naplók</string> <string name="setup_logs_hint">Minden munkamenet után mentve</string> + <string name="setup_game_debug_logs">Játék-hibakeresési naplók</string> + <string name="setup_game_debug_logs_hint">Proton-, Wine- és grafikai diagnosztika a következő játékindításkor. Csökkentheti a teljesítményt, és több tárhelyet használ.</string> + <string name="setup_game_debug_logs_restart">Indítsa újra ezt a munkamenetet a játék-hibakeresési naplók mentéséhez</string> + <string name="setup_logging_update_failed">Nem sikerült frissíteni a naplózást. Ellenőrizze a kapcsolót, és próbálja újra.</string> <string name="setup_agent_commands">Hibakeresési eszközök</string> <string name="setup_latest_logs">Legutóbbi munkamenet-naplók</string> <string name="setup_saved_logs">Mentett munkamenet-naplók</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">A DroidDeck lehet a kezdőképernyő alkalmazás</string> <string name="setup_home_off">A DroidDeck soha nem jelenik meg kezdőképernyő alkalmazásként</string> <string name="setup_orientation">Tájolás</string> + <string name="setup_launcher_orientation">Az indító tájolása</string> + <string name="setup_launcher_orientation_auto">Az eszköz elforgatásának követése</string> + <string name="setup_orientation_portrait">Álló</string> + <string name="setup_session_orientation">Munkamenet tájolása</string> + <string name="setup_session_orientation_hint">A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; az egyéni szélesség és magasság a megadott módon marad.</string> <string name="setup_orientation_auto">Automatikus fekvő</string> <string name="setup_orientation_landscape">Fekvő</string> <string name="setup_orientation_reverse">Fordított fekvő</string> <string name="setup_fullscreen">Teljes képernyő</string> <string name="setup_fullscreen_on">Elrejti az Android állapot- és navigációs sávokat</string> <string name="setup_fullscreen_off">Megjeleníti az Android állapot- és navigációs sávokat</string> + <string name="setup_dual_screen">Két képernyő</string> + <string name="setup_dual_screen_hint">Az Automatikus a beépített második képernyővel rendelkező kézikonzolokon használja a második képernyőt. A Be bármilyen második kijelzőt használ. A Ki mindent egy képernyőn tart.</string> + <string name="setup_dual_screen_auto">Automatikus</string> + <string name="setup_dual_screen_on">Be</string> + <string name="setup_dual_screen_off">Ki</string> + <string name="setup_dual_screen_menu">Menü az alsó képernyőn</string> + <string name="setup_dual_screen_menu_hint">A szakaszokat és a játék közbeni menüt a második képernyőre helyezi, és ott történik a gépelés, így a felső képernyő teljes nézetet kap. Az L2 és R2 vált szakaszt.</string> + <string name="setup_dual_screen_controls">Alsó képernyős vezérlők játékokban</string> + <string name="setup_dual_screen_controls_hint">Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn.</string> + <string name="dual_typing_title">Gépelés a felső képernyőre</string> + <string name="dual_typing_done">Kész</string> <string name="setup_default_home">Alapértelmezett kezdőképernyő alkalmazás</string> <string name="setup_choose_home">Válasszon kezdőképernyő alkalmazást</string> <string name="setup_choose">Kiválasztás</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Nyissa meg: Beállítások → Fejlesztői beállítások → Vezeték nélküli hibakeresés, és kapcsolja be</string> <string name="gate_step2">Koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre</string> <string name="gate_step3">Írja be a kódot a DroidDeck értesítésébe</string> + <string name="pairguide_build_number">A Telefon névjegye menüben koppintson hétszer a Buildszámra</string> + <string name="pairguide_wireless">Kapcsolja be a Vezeték nélküli hibakeresést</string> + <string name="pairguide_pair">Nyissa meg a Vezeték nélküli hibakeresést, majd koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre</string> + <string name="pairguide_child_process">Kapcsolja be az „Alárendelt folyamatok korlátozásának kikapcsolása” lehetőséget</string> + <string name="pairguide_row_child_process">Alárendelt folyamatok korlátozásának kikapcsolása</string> + <string name="pairguide_row_build_number">Buildszám</string> + <string name="pairguide_row_wireless">Vezeték nélküli hibakeresés</string> + <string name="pairguide_row_pair">Eszköz párosítása párosítási kóddal</string> <string name="gate_waiting">Várakozás a párosítási felugró ablakra…</string> <string name="gate_code_needed">Felugró ablak megtalálva. Írja be a kódját az értesítésbe.</string> <string name="gate_status">Állapot</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Még nem játszott</string> <string name="games_runtime_busy_percent">Futtatókörnyezet dolgozik · %1$d%%</string> <string name="games_runtime_busy">Futtatókörnyezet dolgozik</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Más GPU-k illesztőprogramjainak elrejtése</string> <string name="gpu_show_other">Más GPU-k illesztőprogramjainak megjelenítése</string> <string name="gpu_advanced">Speciális</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitás</string> + <string name="gpu_ubwc_hint">Próbálja a Be vagy Ki beállítást, ha a Steam vagy az Android csíkokat vagy villódzást mutat. A DroidDeck újraindítása után mindkét illesztőprogramra érvényes.</string> + <string name="gpu_ubwc_restart">Indítsa újra a DroidDecket az alkalmazáshoz.</string> <string name="gpu_set_with_display">A megjelenítő-illesztőprogrammal együtt beállítva: a %1$s mindkettőt tartalmazza.</string> <string name="gpu_set_with_runtime">A futtatókörnyezet-illesztőprogrammal együtt beállítva: a %1$s mindkettőt tartalmazza.</string> <string name="gpu_runtime_hint">A játékok és az asztal használja.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Automatikus belépés a kép a képben módba</string> <string name="unfolded_controls">Vezérlők a kinyitott képernyőn</string> <string name="unfolded_controls_hint">Kinyitva a játék a Steam Deck érintőpadjai és hátsó fogói fölött jelenik meg. Összecsukva a játék teljes képernyős.</string> + <string name="unfolded_controls_with_controller">Megtartás kontrollerrel is</string> + <string name="unfolded_controls_with_controller_hint">Ezeket az érintéses vezérlőket akkor is megjeleníti, ha kontroller van csatlakoztatva.</string> <string name="pip_suspended">Felfüggesztve</string> <string name="pip_not_ready">A kép a képben mód csak a munkamenet elkészülése után érhető el.</string> <string name="pip_permission">Engedélyezze a kép a képben módot a DroidDeck számára az Android beállításaiban.</string> <string name="pip_unavailable">Az Android nem tudta megnyitni a kép a képben módot.</string> + <string name="game_more">Továbbiak</string> + <string name="game_edit_art">Illusztrációk szerkesztése</string> + <string name="stores_in_steam_label">A Steamben</string> <string name="game_shortcut">Parancsikon</string> <string name="game_shortcut_add">Hozzáadás a kezdőképernyőhöz</string> <string name="game_shortcut_choose">Játék kiválasztása</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Várja meg a futtatókörnyezet-művelet befejezését</string> <string name="main_wait_proton_install">Várja meg a kompatibilitási eszköz telepítésének befejezését</string> + <string name="load_compat_title">Kompatibilitási eszközök előkészítése</string> + <string name="load_compat_wait">Várakozás a kompatibilitási beállítás befejezésére</string> + <string name="load_compat_hint">A munkamenet a beállítás befejezése után indul.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Várja meg az asztali alkalmazás telepítésének befejezését</string> <string name="main_wait_install_game">Várja meg a telepítés befejezését, mielőtt elindít egy játékot</string> <string name="main_saves_close_session">Előbb zárja be a Steam-munkamenetet, hogy a játék ne írhassa felül az importált mentést</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Telepítés mindenképpen</string> <string name="main_remove_runtime_title">Linux futtatókörnyezet eltávolítása</string> <string name="main_remove_runtime_text">Ez törli a futtatókörnyezetet, a benne lévő Steam-klienst és az összes ott telepített játékot.</string> + <string name="runtime_actions_title">Linux futtatókörnyezet</string> + <string name="runtime_actions_text">A javítás újratelepíti a futtatókörnyezet rendszerfájljait, a Steam, a játékok és a beállítások megmaradnak. Az extrák, például az asztal, a következő használatkor újra települnek. Az eltávolítás mindent töröl.</string> + <string name="runtime_repair">Futtatókörnyezet javítása</string> <string name="main_applied">Alkalmazva: %1$s</string> <string name="android_app_open_failed_primary">Nem sikerült megnyitni a %1$s alkalmazást az elsődleges képernyőn</string> <string name="android_app_open_failed_on">Nem sikerült megnyitni a %1$s alkalmazást itt: %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Nem sikerült elérni a futtatókörnyezet-katalógust. Ellenőrizze a kapcsolatot, és nyomja meg újra a Játék gombot.</string> <string name="session_runtime_install_failed">A Linux futtatókörnyezet telepítése sikertelen. Ellenőrizze a futtatókörnyezetet a Beállításban, és nyomja meg újra a Játék gombot.</string> <string name="session_desktop_install_failed">Az asztal telepítése sikertelen (%1$s). Ellenőrizze a kapcsolatot, és nyomja meg újra az Asztal gombot.</string> + <string name="session_package_resume_failed">Egy megszakadt telepítést nem sikerült befejezni (%1$s). Ellenőrizze a kapcsolatot és a tárhelyet, majd próbálja újra.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">A Linux futtatókörnyezet sérült: %1$d könyvtárhivatkozás hiányzó fájlra mutat (%2$s), általában egy megszakadt telepítés után. A javítás megtartja a játékokat és a beállításokat.</item> + <item quantity="other">A Linux futtatókörnyezet sérült: %1$d könyvtárhivatkozás hiányzó fájlokra mutat (%2$s és mások), általában egy megszakadt telepítés után. A javítás megtartja a játékokat és a beállításokat.</item> + </plurals> <string name="session_ended_named">%1$s váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> <string name="session_ended_program">A program váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> <string name="session_ended_desktop">Az asztal váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Telepítsen egy bővítmény ZIP-et a következő Steam-munkamenethez.</string> <string name="mode_decky_plugin_downloading">Letöltés…</string> <string name="mode_decky_plugin_install_zip">Telepítés ZIP-ből</string> + <string name="decky_zip_warning_title">Harmadik féltől származó bővítmény telepítése</string> + <string name="decky_zip_warning_text">A Decky Loader csapata nem vizsgálta meg ezt a bővítményt. Kártevőt tartalmazhat, például olyan szoftvert, amely ellopja a Steam-fiókját vagy kárt tesz az eszközében. A bővítmény telepítésével elfogadja, hogy az eszközét érintő minden kockázatot Ön vállal.</string> + <string name="decky_zip_warning_continue">Folytatás</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Várjon %1$d másodpercet</item> + <item quantity="other">Várjon %1$d másodpercet</item> + </plurals> <string name="store_cat_games">Játékok</string> <string name="store_cat_audio_video">Hang és videó</string> <string name="store_cat_graphics">Grafika</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Fekete alap, fehér betűk, a kék minden kijelölt, fókuszált vagy lenyomott elemhez.</string> <string name="theme_electric">Elektromos tengerészkék</string> <string name="theme_electric_detail">Fényesebb kék, szürke helyett tengerészkék felületeken.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">A szivárvány színein végigfutó színek. Követi az Android animációs beállításait.</string> + <string name="theme_rgb_speed">Sebesség</string> + <string name="theme_rgb_speed_hint">Milyen gyorsan váltanak a színek.</string> <string name="theme_gradient">Színátmenet</string> <string name="theme_gradient_detail">Saját elsődleges és másodlagos színed, átmenettel a gombokon és a kiemeléseken.</string> <string name="theme_gradient_primary">Elsődleges</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Kihagyás</string> <string name="fm_select_this_folder">Ennek a mappának a kiválasztása</string> <string name="fm_back">Vissza</string> + <string name="fm_exit">Kilépés</string> + <string name="fm_return_to_start">Vissza a kezdőmappába</string> + <string name="fm_start_unavailable">A kezdőmappa már nem érhető el</string> + <string name="fm_cancel_operation_title">Művelet megszakítása?</string> + <string name="fm_cancel_operation_confirmation">A művelet megszakad. Biztos benne?</string> + <string name="fm_accept">Elfogadom</string> + <string name="fm_decline">Elutasítom</string> <string name="fm_drive_not_readable">A %1$s csatolva van, de jelenleg nem olvasható</string> + <string name="fm_drive_access_title">Hozzáférés engedélyezése: %1$s</string> + <string name="fm_drive_access_text">Az Android látni engedi a DroidDecknek ezt a meghajtót, de olvasni nem. Kapcsold be a DroidDecknél az Összes fájlhoz való hozzáférést, majd gyere vissza.</string> <string name="fm_list_view">Listanézet</string> <string name="fm_grid_view">Rácsnézet</string> <string name="fm_search">Keresés</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Billentyűzet + érintőpad</string> <string name="second_mode_terminal">Terminál</string> <string name="second_mode_deck_controls">Deck fogók + érintőpadok</string> + <string name="second_mode_dashboard">Irányítópult</string> + <string name="bottom_dashboard_empty">Itt még nincs mit megjeleníteni.</string> + <string name="bottom_page_downloads">Letöltések</string> + <string name="bottom_downloads_none">Nincs folyamatban lévő letöltés.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shader-gyorsítótár letöltése</string> + <string name="bottom_downloads_paused">Szüneteltetve</string> + <string name="bottom_downloads_queued">Indításra vár</string> + <string name="bottom_page_notifications">Értesítések</string> + <string name="bottom_notifications_listener">DroidDeck alsó képernyő</string> + <string name="bottom_notifications_why">Itt jelenítheti meg az üzeneteket és más értesítéseket játék közben. Csak ezen a képernyőn láthatók, és nem kerülnek mentésre. Az Android egyszer kérdez rá: az értesítési hozzáférés oldala ezen a képernyőn nyílik meg; kapcsolja be ott a DroidDecket, és ez az oldal magától visszatér.</string> + <string name="bottom_notifications_allow">Értesítési hozzáférés engedélyezése</string> + <string name="bottom_notifications_none">Nincsenek értesítések.</string> + <string name="bottom_notifications_count">%1$d értesítés</string> + <string name="bottom_notifications_clear">Törlés</string> + <string name="bottom_page_screenshots">Képernyőképek</string> + <string name="stats_fps_needs_hud">Az FPS-hez be kell kapcsolni a HUD-ot</string> + <string name="stats_speed">Sebesség</string> + <string name="stats_pedals">Pedálok</string> + <string name="stats_gforce">G-erő</string> + <string name="stats_timing">Időmérés</string> + <string name="stats_best_lap">Legjobb kör</string> + <string name="stats_tires">Gumik °C</string> + <string name="stats_trace">Gáz és fék, utolsó 10 s</string> + <string name="stats_speed_chart">Sebesség, %1$s</string> + <string name="stats_gear">Fokozat</string> + <string name="stats_speed_units">Sebesség mértékegysége</string> + <string name="stats_speed_units_auto">Automatikus (%1$s)</string> + <string name="stats_steam_client_arm">Steam-kliens ARM</string> + <string name="stats_steam_client_x86">Steam-kliens x86</string> + <string name="stats_throttle">Gáz</string> + <string name="stats_brake">Fék</string> + <string name="stats_lights">Műszerfal</string> + <string name="stats_lamp_shift">Váltás</string> + <string name="stats_lamp_handbrake">Kézifék</string> + <string name="stats_lamp_pit">Bokszutcai limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbó %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olaj %1$s °C</string> + <string name="stats_power">Energiaelosztó</string> + <string name="stats_fuel_t">Üzemanyag, t</string> + <string name="stats_fuel_main">Fő %1$s t</string> + <string name="stats_fuel_reserve">Tartalék %1$s t</string> + <string name="stats_tap_hint">Koppintson a felső sávra vagy a műszerfalra a stílus módosításához.</string> + <string name="bottom_telemetry_send_title">Műszerfal-adatok küldése</string> + <string name="bottom_telemetry_send_auto">Automatikus</string> + <string name="bottom_telemetry_send_auto_hint">Bekapcsolja az itt felsorolt összes játéknál, a később talált játékokat is beleértve. A kikapcsolt játékok kikapcsolva maradnak.</string> + <string name="bottom_telemetry_send_note">Ez a játék saját adatkimeneti beállítását módosítja. A játék következő indításakor lép érvénybe; kikapcsoláskor visszaáll a régi beállítás.</string> + <string name="bottom_telemetry_send_close">A módosításhoz zárja be ezt: %1$s.</string> + <string name="bottom_telemetry_send_failed">Nem sikerült módosítani a következő beállításait: %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: kapcsolja be a(z) %2$s opciót a játék beállításaiban, 127.0.0.1 IP-címmel és %3$d porttal.</string> + <string name="bottom_shots_where">Mentés helye: Pictures/DroidDeck. A Steam-képernyőképek is itt jelennek meg.</string> + <string name="bottom_shots_take">Képernyőkép készítése</string> + <string name="bottom_shots_saved">Képernyőkép mentve.</string> + <string name="bottom_shots_failed">Nem sikerült képernyőképet készíteni.</string> + <string name="bottom_shots_none">Még nincsenek képernyőképek.</string> + <string name="bottom_page_chat">Csevegés és hang</string> + <string name="bottom_chat_why">Itt olvashatja a Steam-csevegést és válaszolhat rá, miközben a játék tovább fut a fő képernyőn. Azt a fiókot használja, amellyel a Steambe bejelentkezett.</string> + <string name="bottom_chat_not_signed_in">A Steam még nem rendelkezik megosztható webes bejelentkezéssel, ezért egyszer jelentkezzen be itt.</string> + <string name="bottom_chat_stopped">Az Android bezárta a csevegőoldalt, amíg a DroidDeck a háttérben volt. Újra megnyílik, amikor visszatér a DroidDeckhez.</string> + <string name="bottom_chat_open">Steam Chat megnyitása</string> + <string name="bottom_chat_close">Csevegés bezárása</string> + <string name="bottom_chat_mic_on">Mikrofon be</string> + <string name="bottom_chat_mic_off">Mikrofon ki</string> + <string name="bottom_chat_mic_unavailable">A mikrofon ki van kapcsolva ennél a játéknál. A beszédhez kapcsolja be a Mikrofon opciót a DroidDeck Steam-beállításaiban (Hang), majd indítsa újra a játékot.</string> + <string name="bottom_chat_volume">Hangerő %1$d%%</string> + <string name="bottom_page_telemetry">Játékon belüli statisztikák</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akkumulátor</string> + <string name="bottom_telemetry_lap">Kör</string> + <string name="bottom_telemetry_position">Helyezés</string> + <string name="bottom_telemetry_this_lap">Aktuális kör</string> + <string name="bottom_telemetry_last_lap">Előző kör</string> + <string name="bottom_telemetry_fuel">Üzemanyag</string> + <string name="bottom_telemetry_cargo">Rakomány</string> + <string name="bottom_telemetry_pips">Pontok SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Jogi státusz</string> + <string name="bottom_telemetry_balance">Egyenleg</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Kapcsolja be egy autóversenyes játék adatkimenetét (gyakran telemetria vagy UDP néven szerepel), hogy itt élő műszerfalat lásson. Az adatok ezen az eszközön maradnak.</string> + <string name="bottom_telemetry_unknown_format">A(z) %1$d port adatokat fogad (%2$d csomag, egyenként %3$d bájt), de olyan formátumban, amelyet ez az oldal még nem tud olvasni.</string> + <string name="bottom_telemetry_port_busy">A(z) %1$s portot már egy másik program használja, ezért az a játék itt nem jeleníthető meg.</string> <string name="rtinst_removing">Linux futtatókörnyezet eltávolítása</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Előbb állítsa be a Flatpakot</string> <string name="flatpakmgr_starting">Indítás</string> <string name="flatpakmgr_exit_status">A Flatpak %1$d állapotkóddal lépett ki</string> + <string name="flatpakmgr_wrong_arch">A(z) %1$s %2$s rendszerre készült, ezt a DroidDeck nem tudja futtatni. Az itteni Flatpak-alkalmazásoknak ARM64- vagy x86_64-változat kell.</string> <string name="flatpakmgr_installing">%1$s telepítése</string> <string name="flatpakmgr_updating">%1$s frissítése</string> <string name="flatpakmgr_removing">%1$s eltávolítása</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">A beállítás alkalmazása…</string> <string name="adbpair_command_failed">A vezeték nélküli hibakeresés parancsa sikertelen</string> <string name="adbpair_channel_name">Vezeték nélküli hibakeresés beállítása</string> + <string name="adbpair_progress_channel_name">Vezeték nélküli hibakeresés beállításának állapota</string> <string name="adbpair_channel_description">A vezeték nélküli hibakeresés párosítási kódját kéri, amíg a Beállítások meg van nyitva</string> <string name="adbpair_title_pair">Vezeték nélküli hibakeresés párosítása</string> <string name="adbpair_waiting_text">Kapcsolja be a vezeték nélküli hibakeresést, majd koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Nem Adreno GPU</string> <string name="gpuinfo_supported">Támogatott</string> <string name="gpuinfo_experimental">Kísérleti: az illesztőprogramjai teszt buildek</string> + <string name="gpuinfo_a850_experimental">Kísérleti Adreno 850-támogatás: kompatibilis kísérleti kijelző- és játék-illesztőprogramokat igényel; ezen az eszközön nincs ellenőrizve</string> <string name="gpuinfo_below_tested">A tesztelt hardver alatt (Adreno 725 és újabb): lehet, hogy nem fut</string> <string name="gpuinfo_unsupported">Nem támogatott: a DroidDecknek Adreno (Snapdragon) GPU szükséges</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Skálázva %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Eszközrészletek megjelenítése</string> <string name="device_info_hide">Eszközrészletek elrejtése</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Rendezés</string> + <string name="setup_rail_labels">Oldalsáv-feliratok</string> + <string name="setup_rail_labels_hint">Nevek megjelenítése az oldalsáv ikonjai alatt. Kapcsolja ki a keskenyebb oldalsávhoz.</string> + <string name="library_display">Megjelenítés</string> + <string name="library_display_larger">Nagyobb kártyák</string> + <string name="library_display_smaller">Kisebb kártyák</string> + <string name="library_display_title">Cím megjelenítése</string> + <string name="library_display_size">Méret megjelenítése</string> <string name="stores_sort_last_played">Nemrég játszott</string> <string name="stores_sort_recently_installed">Nemrég telepített</string> <string name="stores_sort_title_asc">Cím A–Z</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Letöltéskezelő</string> <string name="stores_parallel">Egyszerre futó letöltések</string> <string name="stores_install_where">Telepítés ide</string> + <string name="stores_install_language">Játék nyelve</string> + <string name="stores_install_language_hint">A GOG és az Epic ezen a nyelven telepít. A Rendszer az alkalmazás nyelvét követi.</string> + <string name="stores_install_language_system">Rendszer</string> <string name="stores_install_title">%1$s telepítése:</string> <string name="stores_target_internal">Belső</string> <string name="stores_target_free">%1$s szabad</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Cél</string> <string name="edit_start_in">Indítás innen</string> <string name="edit_launch_options">Indítási beállítások</string> + <string name="edit_launch_options_steam_hint">Közös a Steam Tulajdonságaival: az egyik helyen végzett módosítás mindkettőben megjelenik.</string> + <string name="edit_launch_options_not_saved">Az indítási beállításokat nem sikerült menteni a Steambe. Próbáld újra.</string> + <string name="edit_launch_options_desktop">Lehet, hogy a Steam nyitva van az asztali munkamenetben. Módosítsd az indítási beállításokat a Tulajdonságaiban, vagy előbb zárd be a munkamenetet.</string> <string name="edit_artwork">Illusztráció</string> <string name="edit_other_exe">Másik exe…</string> <string name="edit_remove">Eltávolítás</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Saját prefix</string> <string name="setup_download_mirror">Webhely</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-ALKALMAZÁSOK</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Asztali alkalmazások a Linux-asztalhoz, az Asztalról megnyitva.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Az Automatikus mód rögzítve tartja ezt a 2D-s játékot a látótérben. A fejkövetéshez válassza a Kijelző részben a Virtuális képernyő lehetőséget.</string> <string name="glasses_tracking_sbs_hint">A fejkövetés virtuális képernyőre vagy futó SteamVR-játékra vonatkozik.</string> <string name="glasses_hardware">Eszköz</string> + <string name="vr_controllers_tab">Kontrollerek</string> + <string name="vr_controllers_group">SteamVR-kontrollerek</string> + <string name="vr_controllers_emulate">Gamepad VR-ben</string> + <string name="vr_controllers_emulate_hint">A két VR-kéz, amelyként a kontrollere működik. A módosítások azonnal érvényesek, akkor is, ha a SteamVR fut. A Joy-Conok és a követett kezek továbbra is átveszik a saját oldalukat.</string> + <string name="vr_controllers_off">Normál gamepad</string> + <string name="vr_controllers_index">Valve Index kontrollerek</string> + <string name="vr_controllers_touch">Meta Quest 3 kontrollerek</string> + <string name="vr_controllers_vive">HTC Vive pálcák</string> + <string name="vr_controllers_sticks">A karok kezdetben</string> + <string name="vr_controllers_sticks_hint">VR közben nyomja be egyszerre mindkét kart a váltáshoz.</string> + <string name="vr_controllers_sticks_game">Önt mozgatják a játékban</string> + <string name="vr_controllers_sticks_hands">A kezeket mozgatják</string> + <string name="vr_controllers_buttons">Gombok</string> + <string name="vr_controllers_buttons_stick">A ravaszok ravaszok, a vállgombok fognak, az A/B és X/Y az egyes kezek előlapi gombjai, a karok benyomása a hüvelykujjkarokat nyomja be, a Guide megnyitja a SteamVR menüt. A D-pad fel és le közelebb vagy távolabb viszi a kezeket.</string> + <string name="vr_controllers_buttons_vive">A karok érintőpadok; az A/X vagy egy kar benyomása nyomja meg őket. A ravaszok ravaszok, a vállgombok fognak, a Start és a Select a menü, a Guide megnyitja a SteamVR menüt.</string> + <string name="vr_controllers_buttons_off">Nincsenek VR-kezek. A gamepadet támogató játékok és a SteamVR menü a szokásos módon kapják meg a kontrollert.</string> <string name="glasses_brightness">Fényerő</string> <string name="glasses_volume">Hangerő</string> <string name="glasses_sunblock">Elsötétítés</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Kamera elhelyezése</string> <string name="hand_camera_placement_hint">Játék előtt ellenőrizze, hogy a kamera látja-e Önt.</string> <string name="hand_camera_check">Ellenőrzés</string> + <string name="tracking_pack_title">Kézkövetés letöltése</string> + <string name="tracking_pack_hint">A kézkövetéshez egyszeri, %1$s méretű letöltés szükséges.</string> + <string name="tracking_pack_download">Letöltés</string> + <string name="tracking_pack_retry">Újra</string> + <string name="tracking_pack_downloading">Kézkövetés letöltése… %1$d%%</string> + <string name="tracking_pack_failed">Nem sikerült letölteni a kézkövetést. Ellenőrizze a kapcsolatot, és próbálja újra.</string> <string name="hand_camera_check_title">Kamera elhelyezése</string> <string name="hand_camera_how_rear">Állítsa az eszközt függőlegesen 1,5–2 méter távolságra, nagyjából mellkasmagasságban úgy, hogy a hátlapi kamera Ön felé nézzen. Ezután lépjen a látótérbe kinyújtott kezekkel.</string> <string name="hand_camera_how_front">Állítsa az eszközt függőlegesen 1,5–2 méter távolságra, nagyjából mellkasmagasságban úgy, hogy a képernyő Ön felé nézzen. Ezután lépjen a látótérbe kinyújtott kezekkel.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Nem használt futtatókörnyezetek, maradványok, régi naplók</string> <string name="storage_clean_up">Takarítás…</string> <string name="storage_session_running">A takarításhoz vagy törléshez állítsd le a munkamenetet. A méretek láthatók maradnak.</string> + <string name="storage_default_group">Telepítési hely</string> + <string name="storage_default_title">Alapértelmezett tárhely</string> + <string name="storage_default_hint">Az új áruházi telepítések a kiválasztott helyre kerülnek. A meglévő játékok a helyükön maradnak. A Steam-könyvtárak megtartják saját beállításukat.</string> + <string name="storage_default_ask">Kérdezzen rá minden alkalommal</string> + <string name="storage_default_ask_detail">Célhely választása minden telepítésnél</string> + <string name="storage_default_internal">Belső tárhely</string> + <string name="storage_default_external">Külső tárhely</string> + <string name="storage_default_external_detail">%1$s · %2$s szabad</string> + <string name="storage_default_external_missing">Nincs csatlakoztatva</string> + <string name="storage_default_folder">Mappa · %1$s</string> + <string name="storage_default_folder_free">%1$s szabad</string> + <string name="storage_default_folder_missing">Nincs csatlakoztatva</string> + <string name="storage_default_choose_folder">Mappa kiválasztása…</string> + <string name="storage_default_choose_folder_detail">Bármely mappa használata SD-kártyán vagy USB-meghajtón</string> + <string name="storage_default_note">A játékok a kiválasztott helyen belüli Games mappába kerülnek. A meglévő játékok nem kerülnek áthelyezésre.</string> <string name="storage_where">Hova kerül</string> <string name="storage_games">Steam-játékok</string> <string name="storage_game_data">Játékadatok</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Telepített játékok</string> <string name="storage_data_parts">Prefix %1$s · shaderek %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Shaderek törlése</string> + <string name="storage_reset_prefix">Prefix visszaállítása</string> + <string name="storage_reset_prefix_title">Visszaállítja a(z) %1$s prefixét?</string> + <string name="storage_reset_prefix_confirm">Törli a Wine-prefixet (%1$s) itt: %2$s, és a következő indításkor újra létrehozza. A benne lévő mentések, beállítások és telepített újraterjeszthető csomagok elvesznek; a Steam Cloud-mentések a fiókjában maradnak.</string> <string name="storage_data_leftovers">Törölt játékok</string> <string name="storage_steam_app">Steam-alkalmazás %1$d</string> <string name="storage_leftover_unsure_detail">A prefix még tartalmaz fájlokat, talán helyi mentéseket</string> @@ -2977,6 +3333,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Szinkronizálás Syncthinggel</string> + <string name="sync_enable_hint">Ez a Syncthing-Forkon alapuló Syncthing-megvalósítás lehetővé teszi, hogy a DroidDeck belső fájlrendszerében lévő fájlokat más Syncthing-példányokkal szinkronizálja. Csak a DroidDeck belső fájlrendszerében tárolt fájlokra vonatkozik.</string> + <string name="sync_missing">Ez a kiadás nem tartalmazza a Syncthinget.</string> + <string name="sync_starting">A Syncthing indítása</string> + <string name="sync_status_starting">Indítás</string> + <string name="sync_status_up_to_date">Naprakész</string> + <string name="sync_status_syncing">Szinkronizálás</string> + <string name="sync_status_paused">Szüneteltetve</string> + <string name="sync_status_pausing">Szüneteltetés</string> + <string name="sync_status_resuming">Folytatás</string> + <string name="sync_status_attention">Beavatkozást igényel</string> + <string name="sync_status_failed">A Syncthing leállt</string> + <string name="sync_failed_retry">Újrapróbálás</string> + <string name="sync_paused_wifi">Szüneteltetve Wi-Fi-kapcsolatig</string> + <string name="sync_paused_game">Szüneteltetve a játék alatt</string> + <string name="sync_summary">%1$d mappa · %2$d/%3$d eszköz csatlakoztatva</string> + <string name="sync_left">Még %1$s</string> + <string name="sync_open_web_ui">Webes felület megnyitása</string> + <string name="sync_pause">Szüneteltetés</string> + <string name="sync_resume">Folytatás</string> + <string name="sync_running">Fut</string> + <string name="sync_running_hint">Kapcsolja ki a Syncthing teljes leállításához.</string> + <string name="sync_this_device">Ez az eszköz</string> + <string name="sync_device_id">Eszközazonosító</string> + <string name="sync_show_qr">QR-kód megjelenítése</string> + <string name="sync_advanced">Speciális</string> + <string name="sync_advanced_hint">Portok, futtatás ideje, visszaállítás</string> + <string name="sync_open">Megnyitás</string> + <string name="sync_waiting">Önre vár</string> + <string name="sync_pending_device">%1$s csatlakozni szeretne</string> + <string name="sync_pending_folder">%1$s meg szeretné osztani ezt: „%2$s”</string> + <string name="sync_pending_folder_hint">Fogadja el, hogy kiválaszthassa, hová mentse a DroidDeckben.</string> + <string name="sync_review">Áttekintés a webes felületen</string> + <string name="sync_folders">Mappák</string> + <string name="sync_no_folders">Még nincsenek mappák.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Naprakész</string> + <string name="sync_folder_syncing">Szinkronizálás: %1$d%%</string> + <string name="sync_folder_scanning">Vizsgálat</string> + <string name="sync_folder_paused">Szüneteltetve</string> + <string name="sync_folder_out_of_sync">Nincs szinkronban</string> + <string name="sync_folder_errors">%1$d fájlt nem sikerült szinkronizálni</string> + <string name="sync_folder_blocked">Letiltva</string> + <string name="sync_folder_blocked_hint">Ez a mappa a DroidDeck tárhelyén kívül van, ezért a DroidDeck szüneteltette. A DroidDecken kívüli mappák szinkronizálásához használja a Syncthing-Fork alkalmazást.</string> + <string name="sync_remove_folder">Eltávolítás a Syncthingből</string> + <string name="sync_remove_folder_hint">Az eltávolítás nem töröl fájlokat.</string> + <string name="sync_devices">Eszközök</string> + <string name="sync_no_devices">Még nincsenek eszközök.</string> + <string name="sync_connected">Csatlakoztatva</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Utoljára látva: %1$s</string> + <string name="sync_device_id_title">Az eszköz azonosítója</string> + <string name="sync_device_id_hint">A másik eszközén adjon hozzá egy eszközt a Syncthingben, és olvassa be ezt a kódot, vagy illessze be az azonosítót. Ezután fogadja el itt, a webes felületen.</string> + <string name="sync_copy">Másolás</string> + <string name="sync_share">Megosztás</string> + <string name="sync_done">Kész</string> + <string name="sync_off_title">Kikapcsolja a Syncthinget?</string> + <string name="sync_off_body">A Syncthing most leáll, és leállítva marad, amíg újra be nem kapcsolja. A szinkronizált fájlok a helyükön maradnak.</string> + <string name="sync_off_forget">A Syncthing konfigurációjának törlése is</string> + <string name="sync_off_forget_hint">Eltávolítja az eszköz azonosítóját, a mappákat és az eszközöket. Újbóli bekapcsoláskor elölről kezdi.</string> + <string name="sync_turn_off">Kikapcsolás</string> + <string name="sync_ports">Portok</string> + <string name="sync_port_sync">Szinkronizálás</string> + <string name="sync_port_discovery">Helyi felfedezés</string> + <string name="sync_repick">Új portok választása</string> + <string name="sync_repick_hint">Minden indításkor újra ellenőrizve.</string> + <string name="sync_repick_button">Újraválasztás</string> + <string name="sync_reset_group">Visszaállítás</string> + <string name="sync_api_key">API-kulcs</string> + <string name="sync_regenerate">Újragenerálás</string> + <string name="sync_reset">A Syncthing visszaállítása</string> + <string name="sync_reset_hint">Új eszközazonosító, a mappák és eszközök eltávolítva. A DroidDeck tárhelyén lévő fájlok megmaradnak.</string> + <string name="sync_reset_button">Visszaállítás</string> + <string name="sync_reset_confirm_title">Visszaállítja a Syncthinget?</string> + <string name="sync_running_group">Futtatás</string> + <string name="sync_run">Futtatás</string> + <string name="sync_run_open">Amíg a DroidDeck nyitva van</string> + <string name="sync_run_background">A háttérben</string> + <string name="sync_wifi_only">Csak Wi-Fi</string> + <string name="sync_pause_games">Szüneteltetés játék közben</string> + <string name="sync_logs">Naplók</string> + <string name="sync_logs_hint">A Syncthing kimenete ebben a munkamenetben</string> + <string name="sync_logs_share">Megosztás</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Előbb állítsa be a Linux futtatókörnyezetet.</string> + <string name="sync_accept">Elfogadás</string> + <string name="sync_accept_title">„%1$s” mentése ide:</string> + <string name="sync_add_folder">Mappa hozzáadása</string> + <string name="sync_add_folder_hint">Egy mappa szinkronizálása a DroidDeck tárhelyén</string> + <string name="sync_choose">Kiválasztás</string> + <string name="sync_add">Hozzáadás</string> + <string name="sync_add_failed">Nem sikerült hozzáadni a mappát.</string> + <string name="sync_share_with">Megosztás ezekkel:</string> + <string name="sync_share_none">Még nincsenek eszközök. Ezt a mappát később a webes felületről is megoszthatja.</string> + <string name="sync_use_folder">Ennek a mappának a használata</string> + <string name="sync_new_folder">Új mappa</string> + <string name="sync_location_home">Konténer saját mappája</string> + <string name="sync_location_sync">Sync mappa</string> + <string name="sync_location_shared">DroidDeck megosztott tárhely</string> + <string name="sync_location_card">DroidDeck itt: %1$s</string> + <string name="sync_location_app">DroidDeck alkalmazásadatok</string> + <string name="sync_web_path_locked">Az új mappák a DroidDeck Sync mappájába kerülnek. Másik DroidDeck-mappa szinkronizálásához használja a Mappa hozzáadása lehetőséget a Syncthing lapon.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Újratöltés</string> + <string name="sync_not_running">A Syncthing nem fut.</string> + <string name="session_end_steam_sigill">A Steam érvénytelen utasítással leállt (SIGILL). Ez CPU-utasítás-kompatibilitási probléma vagy a kliens összeomlása lehet. Ossza meg a naplókat az eszköz adataival együtt.</string> + <string name="session_end_steam_try_x64">Kipróbálhatja a Steam-beállítások → Steam-kliens → x86-64 (kísérleti) lehetőséget. További letöltést igényel, és lassabban futhat.</string> + <string name="session_end_vulkan_device">A Linux grafikus illesztőprogram nem talált használható Vulkan-eszközt. Ellenőrizze, hogy a kiválasztott Linux GPU-illesztőprogram támogatja-e ezt a GPU-t.</string> + <string name="session_end_gpu_unsupported">Ez a munkamenet nem indulhat el, mert ehhez a GPU-hoz nincs kompatibilis Linux Vulkan-illesztőprogram a jelenlegi beállításban. Az Adreno Turnip illesztőprogramok nem tudják engedélyezni a MediaTek/Mali GPU-k támogatását.</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_resources_browser">A böngészőben nyílik meg</string> + <string name="game_resource_guides">Útmutatók</string> + <string name="game_resource_protondb_detail">Linux / Proton kompatibilitási jelentések</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">A Steam-fiókjában mentéseket tároló játékokhoz</string> + <string name="game_resource_search">Webes keresés</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="library_filter">Szűrő</string> + <string name="library_filter_installed">Csak telepítettek</string> + <string name="library_filter_all_owned">Összes birtokolt játék</string> + <string name="library_no_installed_matches">Egyetlen telepített játék sem felel meg ezeknek a szűrőknek.</string> + <string name="library_browse_owned">Birtokolt játékok böngészése</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="stores_itch_updates_found">Elérhető frissítések: %1$d</string> + <string name="stores_itch_update_replaced">A fejlesztő lecserélte ezt a buildet erre: %1$s. Frissít rá?</string> + <string name="xbox_filter_cloud">Felhő</string> + <string name="stores_xbox_cloud_settings">Felhőbeállítások</string> + <string name="integration_title">Steam-integráció</string> + <string name="integration_count">%1$d / %2$d bekapcsolva</string> + <string name="integration_set_up">Beállítás</string> + <string name="integration_location">Hely</string> + <string name="integration_app_info">Alkalmazásinformáció</string> + <string name="integration_wifi">Wi-Fi-nevek</string> + <string name="integration_brightness">Fényerő</string> + <string name="integration_home">DroidDeck kezdőképernyőként</string> + <string name="integration_shortcuts">Kezdőképernyő gomb parancsikonjai</string> + <string name="integration_wifi_hint">Hálózatok megjelenítése a Steamben · helyhozzáférést igényel, követés nélkül</string> + <string name="integration_wifi_on">A hálózatok megjelennek a Steamben</string> + <string name="integration_wifi_location_off">A hely ki van kapcsolva</string> + <string name="integration_wifi_denied">Hely megtagadva · engedélyezze az Alkalmazásinformációban</string> + <string name="integration_brightness_hint">A Steam csúszkája állítja a képernyő fényerejét</string> + <string name="integration_home_hint">A Kezdőképernyő gomb megnyitja a Steam menüt egy munkamenetben</string> + <string name="integration_shortcuts_hint">Tartsa lenyomva a Kezdőképernyő gombot a Steam Guide-kombinációkhoz</string> + <string name="integration_shortcuts_needs_home">A DroidDecknek kell kezdőképernyőnek lennie</string> + <string name="integration_shortcuts_maybe_restricted">Szürke az Androidban? Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése</string> + <string name="integration_shortcuts_restricted">Az Android letiltotta · Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése</string> + <string name="integration_shortcuts_service">DroidDeck Kezdőképernyő gomb</string> + <string name="integration_shortcuts_service_description">A Kezdőképernyő gomb lenyomásait továbbítja a Steam Guide-nak, amíg egy Steam-munkamenet van fókuszban, és a DroidDeck az alapértelmezett kezdőképernyő alkalmazás. Nem olvassa a képernyő tartalmát.</string> + <string name="integration_brightness_needed">Kapcsolja be a Fényerőt itt: Beállítás → Steam-integráció</string> + <string name="apps_search_hint">Alkalmazások keresése</string> + <string name="apps_no_match">Egy alkalmazás sem felel meg ennek: „%1$s”.</string> + <string name="apps_add_widget">Modul hozzáadása</string> + <string name="apps_widgets_loading">Modulok betöltése…</string> + <string name="apps_widgets_none">Az eszközön egyik alkalmazás sem kínál modult.</string> + <string name="apps_widget_wider">Szélesebb</string> + <string name="apps_widget_narrower">Keskenyebb</string> + <string name="apps_widget_taller">Magasabb</string> + <string name="apps_widget_shorter">Alacsonyabb</string> + <string name="apps_widget_move_earlier">Előrébb</string> + <string name="apps_widget_move_later">Hátrébb</string> + <string name="apps_widget_configure">Modulbeállítások</string> + <string name="apps_widget_remove">Modul eltávolítása</string> + <string name="apps_add_to_folder">Hozzáadás mappához</string> + <string name="apps_new_folder">Új mappa</string> + <string name="apps_remove_from_folder">Eltávolítás a mappából</string> + <string name="apps_app_info">Alkalmazásinformáció</string> + <string name="apps_uninstall">Eltávolítás</string> + <string name="apps_folder_rename">Átnevezés</string> + <string name="apps_folder_ungroup">Szétbontás</string> + <string name="apps_folder_default">Mappa</string> + <string name="apps_folder_name">Mappa neve</string> + <string name="apps_filter">Megjelenítés</string> + <string name="apps_filter_all">Összes alkalmazás</string> + <string name="apps_filter_games">Játékok</string> + <string name="apps_filter_downloaded">Letöltött</string> + <string name="apps_filter_system">Rendszer</string> + <string name="apps_filter_hidden">Rejtett</string> + <string name="apps_hide">Elrejtés</string> + <string name="apps_unhide">Megjelenítés az alkalmazások között</string> + <string name="apps_shortcut_remove">Parancsikon eltávolítása</string> + <string name="apps_pin_title">Hozzáadás az alkalmazásokhoz</string> + <string name="apps_pin_add">Hozzáadás</string> + <string name="apps_hidden_none">Nincsenek rejtett alkalmazások.</string> + <string name="apps_sort_name_asc">Név A–Z</string> + <string name="apps_sort_name_desc">Név Z–A</string> + <string name="apps_sort_installed">Nemrég telepített</string> + <string name="apps_sort_updated">Nemrég frissített</string> + <plurals name="apps_count"> + <item quantity="one">%d alkalmazás</item> + <item quantity="other">%d alkalmazás</item> + </plurals> + <string name="desktop_restore_title">Szoftverek visszaállítása</string> + <string name="desktop_restore_body">A hozzáadott alkalmazások újratelepítése egy DroidDeck-frissítés után.</string> + <string name="desktop_restore_done_title">Szoftverek visszaállítva</string> + <string name="desktop_restore_done_body">A hozzáadott alkalmazások újra telepítve vannak.</string> + <string name="desktop_restore_failed_title">Néhány szoftvert nem sikerült visszaállítani</string> + <string name="desktop_restore_failed_body">Nézd meg a ~/.cache/droiddeck/apt-restore.log fájlt, majd próbáld a sudo apt install parancsot a Konsole-ban.</string> + <string name="gog_full_files">A natív optimalizálások nem érhetők el. A letöltés teljes csere-fájlokat tartalmaz.</string> + <string name="gog_recover">Javítócsomag eredményének ellenőrzése</string> + <string name="slow_usb_title">Lassú USB-kapcsolat</string> + <string name="slow_usb_cable">A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s), ezért a rajta lévő játékok lassan töltődnek be. Használj legalább 5 Gbps-os USB 3 kábelt, fordítsd meg az USB-C csatlakozót, vagy használj gyorsabb meghajtót.</string> + <string name="slow_usb_port">A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s). Az eszköz USB-portja nem tud gyorsabb lenni, ezért a játékok lassan töltődnek be. A belső tárhely vagy egy microSD-kártya gyorsabb lehet.</string> + <string name="slow_usb_never">Ne jelenjen meg többé</string> + <string name="slow_usb_dismiss">Bezárás</string> + <string name="steam_import_title">Újraindítod a Steamet a játékaid hozzáadásához?</string> + <string name="steam_import_body">A Steam telepítettként mutathatja ezeket a saját játékaidat: %1$s. Ehhez újra kell indulnia. Indítsd újra most, vagy a Steam következő indításakor kerülnek be.</string> + <string name="steam_import_names_more">%1$s és még %2$d</string> + <string name="steam_import_now">Újraindítás most</string> + <string name="steam_import_later">Később</string> + <string name="gog_maintenance">GOG-telepítés kezelése</string> + <string name="gog_check">Frissítések keresése</string> + <string name="gog_repair">Ellenőrzés/javítás</string> + <string name="gog_patches">Offline javítócsomagok</string> + <string name="gog_refresh">Teljes offline telepítő letöltése</string> + <string name="gog_update">Frissítés erre: %1$s</string> + <string name="gog_resume">GOG-karbantartás folytatása</string> + <string name="gog_open_patch">Javítócsomag-telepítő megnyitása</string> + <string name="gog_patch_in_session">Fejezze be vagy szakítsa meg a javítócsomag telepítését a Linux-munkamenetben.</string> + <string name="gog_patch_requirements">Válasszon javítócsomagot a telepített verzióhoz és nyelvhez. Előfordulhat, hogy a támogatott kiinduló verziók nem szerepelnek a listában.</string> + <string name="gog_no_patches">A GOG-nál nincs önálló Windows-javítócsomag ehhez a játékhoz.</string> + <string name="gog_managed_files">A módosított játékfájlok felülíródhatnak.</string> + <string name="gog_patch_installer_note">A telepítő a Linux-munkamenetben nyílik meg.</string> + <string name="gog_download_label">Letöltés</string> + <string name="gog_space_label">Extra tárhely</string> + <string name="gog_space_estimate_label">Becsült tárhely</string> + <string name="gog_repair_action">Fájlok javítása</string> + <string name="gog_refresh_action">Telepítés frissítése</string> + <string name="gog_select_patch">Kiválasztás</string> + <string name="setup_all_files">Hozzáférés minden fájlhoz</string> + <string name="setup_local_network">Helyi hálózat</string> + <string name="libraries_title">További Steam-könyvtárak</string> + <string name="libraries_hint">Mappák, amelyekbe a Steam játékokat telepíthet és ahonnan elindíthatja őket, mind saját névvel. Az eltávolítás megtartja a játékokat a lemezen.</string> + <string name="libraries_add">Könyvtár hozzáadása</string> + <string name="libraries_rename_title">Könyvtár neve</string> + <string name="libraries_pick">Válasszon mappát a könyvtárhoz</string> + <string name="libraries_full">Legfeljebb %1$d további könyvtár</string> + <string name="libraries_overlap">Ez a mappa már könyvtár, vagy egy könyvtáron belül van</string> + <string name="libraries_missing">%1$s · nem érhető el</string> + <string name="libraries_applies_next">A következő Steam-munkamenettől érvényes</string> + <string name="bottom_desktop_start">Asztal indítása</string> + <string name="bottom_desktop_mode_touch">Közvetlen érintés</string> + <string name="bottom_desktop_trackpad">Érintőpad. Koppintson a közvetlen érintéshez</string> + <string name="bottom_desktop_direct_touch">Közvetlen érintés. Koppintson az érintőpadhoz</string> + <string name="bottom_desktop_starting">A KDE-asztal indítása…</string> + <string name="bottom_desktop_ended">Az asztal bezárult.</string> + <string name="bottom_desktop_failed">Az asztal nem indult el. A naplók a munkamenet bottom-desktop mappájában vannak.</string> + <string name="bottom_desktop_off">Az asztal be van zárva.</string> + <string name="libraries_rename">Átnevezés</string> + <string name="second_mode_desktop">Asztal</string> + <string name="bottom_desktop_mode_trackpad">Érintőpad</string> + <string name="bottom_desktop_title">Asztal · %1$s</string> </resources> diff --git a/app/src/main/res/values-in/gestures.xml b/app/src/main/res/values-in/gestures.xml index 3bf4b33e5..923583c75 100644 --- a/app/src/main/res/values-in/gestures.xml +++ b/app/src/main/res/values-in/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestur</string> <string name="gesture_settings">Setelan gestur layar sentuh</string> - <string name="gesture_settings_hint">Sesuaikan gestur mouse dan keyboard. Pilih Gestur sebagai mode sentuh untuk menggunakannya.</string> <string name="gesture_tap">Ketuk</string> <string name="gesture_drag">Seret dengan satu jari</string> <string name="gesture_long_press">Tekan lama</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Tahan dengan tiga jari</string> <string name="gesture_pinch">Cubit untuk memperbesar</string> <string name="gesture_hold_button">Tetap tekan tombol</string> + <string name="gesture_hold_left">Tetap tekan tombol kiri</string> + <string name="gesture_hold_right">Tetap tekan tombol kanan</string> <string name="gesture_click_once">Klik sekali</string> <string name="gesture_hold_delay">Jeda sebelum menahan</string> <string name="gesture_double_delay">Interval ketuk dua kali</string> diff --git a/app/src/main/res/values-in/shortcuts.xml b/app/src/main/res/values-in/shortcuts.xml new file mode 100644 index 000000000..b3e99c4de --- /dev/null +++ b/app/src/main/res/values-in/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Pintasan tombol fisik</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Tetapkan: %1$s</string> + <string name="shortcuts_press">Tekan lalu lepaskan tombol. Penetapan disimpan otomatis.</string> + <string name="shortcuts_release">Lepaskan tombol untuk melanjutkan.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Tombol ini sudah ditetapkan untuk: %1$s</string> + <string name="shortcuts_save">Tetapkan ulang</string> + <string name="shortcuts_retry">Coba tombol lain</string> + <string name="shortcuts_limitations">Tombol Beranda dan beberapa tombol tambahan mungkin tidak tersedia.</string> +</resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 61bb207a0..66f55727a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opsi VKD3D untuk D3D12. nodxr menonaktifkan ray tracing; gunakan hanya untuk gim yang membutuhkannya.</string> <string name="game_env_proton_log">Atur ke 1 untuk log diagnostik Proton. Pencatatan log dapat mengurangi performa dan menggunakan penyimpanan.</string> <string name="game_env_wined3d">Atur ke 1 untuk menggunakan WineD3D berbasis OpenGL sebagai pengganti DXVK untuk pengujian kompatibilitas D3D9–11.</string> + <string name="game_env_wined3d_renderer">Perender untuk DirectDraw, Direct3D 1-7, dan gim yang berjalan dengan WineD3D. Vulkan melewati jalur OpenGL-di-Zink dan jauh lebih cepat untuk gim DirectDraw dan Direct3D 7 lama di Adreno.</string> + <string name="game_env_dxvk_d3d8">Atur ke 1 untuk menjalankan Direct3D 8 melalui DXVK sebagai pengganti WineD3D. Lebih cepat dalam uji Direct3D 8 milik AIO Graphics Test di Adreno.</string> <string name="game_env_no_ntsync">Atur ke 1 untuk menjaga gim ini di luar ntsync (droiddeck-ntsync atau driver kernel); gim ini menggunakan droiddeck-esync jika ada paket yang tersedia, jika tidak droiddeck-fsync.</string> <string name="game_env_no_esync">Atur ke 1 untuk menonaktifkan droiddeck-esync bagi gim ini; gim ini menggunakan droiddeck-fsync, atau droiddeck-ntsync jika fsync juga nonaktif.</string> <string name="game_env_no_fsync">Atur ke 1 untuk menjaga gim ini di luar droiddeck-fsync; gim ini menggunakan droiddeck-esync jika ada paket yang tersedia, jika tidak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Atur ke 1 untuk menjalankan gim ini pada droiddeck-fsync, atau 0 untuk mengutamakan droiddeck-esync jika ada paket yang cocok dengan Proton-nya.</string> <string name="game_env_xalia">Atur ke 0 untuk menonaktifkan fitur bantu navigasi gamepad milik Proton untuk gim ini.</string> + <string name="game_env_anticheat_offline">Aktif secara default. Memulai gim Easy Anti-Cheat tanpa anti-cheat-nya jika gim mendukung permainan offline. Nonaktifkan untuk meluncurkan melalui Easy Anti-Cheat seperti biasa. Mode online yang memerlukan Easy Anti-Cheat tetap tidak tersedia.</string> <string name="game_env_hud">Overlay DXVK untuk D3D9–11. fps menampilkan frame rate; kosongkan untuk menyembunyikannya.</string> <string name="game_env_dxvk_config">Setelan DXVK dipisahkan dengan titik koma. Versi terbaru menggunakan dxvk.maxFrameRate untuk membatasi frame rate; gunakan pembatas frame rate sesi untuk permainan biasa.</string> + <string name="game_env_cores">Core CPU untuk gim ini, seperti 0-4 atau 0,2,4, sebagai pengganti core gim sesi. Lebih sedikit core berarti lebih dingin.</string> <string name="game_env_vkd3d_limit">Batas frame rate D3D12. 0 menonaktifkan batas.</string> <string name="game_env_glthread">Threading OpenGL Mesa. true dapat membantu gim OpenGL yang terbatas CPU; uji per gim.</string> <string name="sync_backend_title">Sinkronisasi Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX menjalankan program Linux x86 di perangkat ARM64 ini. Otomatis menggunakannya saat program dibuat untuk x86.</string> <string name="app_fex_x86">%1$s melalui FEX</string> <string name="app_fex_not_ready">Program ini dibuat untuk PC %1$s dan berjalan melalui FEX, yang belum disiapkan. Buka Steam sekali saat masuk: DroidDeck akan mengunduh FEX dan Steam Linux Runtime yang diperlukan, lalu ini akan terbuka.</string> + <string name="session_proot_missing">proot DroidDeck tidak dapat diunduh. Periksa koneksi lalu coba lagi. Sesi tidak dimulai karena proot cadangan terlalu lambat untuk bermain.</string> + <string name="session_directaudio_missing">DirectAudio tidak dapat diunduh, jadi audio gim menggunakan jalur yang lebih lambat di sesi ini.</string> <string name="session_end_program">Program ini</string> <string name="session_end_steam_download">Tidak dapat mengunduh klien Steam. Jaringan atau VPN Anda mungkin memblokir server Steam; periksa koneksi lalu coba lagi.</string> <string name="session_end_steam_setup">Tidak dapat menyiapkan klien Steam. Periksa koneksi dan ruang penyimpanan kosong, lalu coba lagi.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Pengontrol Xbox 360</string> <string name="mode_controller_note">Deck: tombol Quick Access dan giroskop. Steam Controller: sama, dengan grip sense pada tombol belakang. DualShock 4 dan DualSense: giroskop, dan trackpad sebagai touchpad-nya. Xbox 360: buka Quick Access dengan Guide+A.</string> <string name="mode_back">Kembali</string> + <string name="back_hold">Tahan Kembali untuk pintasan Steam</string> + <string name="back_hold_hint">Menahan Kembali membuka Akses Cepat atau membuat kombinasi Steam dengan tombol lain. Matikan untuk mengabaikan Kembali yang ditahan; ketuk dan ketuk dua kali tetap berfungsi.</string> + <string name="back_native_qam_hint">Tahan Back selama 700 ms, atau tahan Back dan tekan tombol lain untuk pintasan Steam.</string> + <string name="back_double_tap_window">Jeda ketuk dua kali</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Izinkan kontrol kecerahan</string> + <string name="brightness_permission_text">Siapkan kontrol kecerahan di DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesi</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Terbaru · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instal versi terbaru</string> + <string name="decky_channel">Saluran Pembaruan</string> + <string name="decky_channel_hint">Rilis Decky Loader mana yang akan diinstal. Pembaru bawaan Decky menggunakan saluran yang sama.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Prarilis</string> + <string name="decky_channel_testing">Pengujian</string> + <string name="decky_channel_failed">Tidak dapat menyimpan saluran pembaruan Decky</string> <string name="mode_decky_on">Dimulai bersama Steam. Saat aktif, aplikasi lain di perangkat ini mungkin dapat mengendalikan Steam.</string> <string name="mode_decky_off">Nonaktif. Port debugging jarak jauh Steam tetap tertutup.</string> <string name="mode_decky_remove_title">Hapus instalasi Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klien</string> <string name="mode_mangoapp">Overlay performa</string> <string name="mode_mangoapp_hint">Nonaktifkan jika gim crash atau layar menjadi hitam di mode Deck. Berlaku pada sesi berikutnya.</string> + <string name="mode_return_after_game">Kembali ke DroidDeck setelah bermain</string> + <string name="mode_return_after_game_hint">Saat gim yang Anda mulai dari DroidDeck atau peluncur lain ditutup, Steam keluar dengan rapi (save cloud selesai lebih dulu) dan Anda kembali ke sana. Nonaktif: tetap di Steam.</string> + <string name="mode_shader_precache">Pra-cache shader</string> + <string name="mode_shader_precache_hint">Steam mengunduh shader siap pakai untuk gim Anda dan memprosesnya di latar belakang, sehingga gim lebih jarang tersendat. Menonaktifkannya menghemat data, penyimpanan, dan baterai; gim membuat shader sambil dimainkan. Sama dengan setelan Downloads > Shader Pre-Caching di Steam. Berlaku pada sesi berikutnya.</string> <string name="mode_steam_repair">Perbaiki klien Steam</string> <string name="mode_steam_repair_hint">Mengunduh ulang klien Steam saat Steam dimulai lagi. Gunakan ini jika Steam tetap berada di layar pemuatannya. Gim, status masuk, dan setelan tetap disimpan.</string> <string name="mode_steam_repair_queued">Klien Steam akan diunduh ulang saat Steam dimulai lagi.</string> @@ -373,6 +412,8 @@ <string name="mode_directaudio_hint">Melewati PulseAudio untuk latensi yang lebih rendah.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Untuk obrolan suara.</string> + <string name="drawer_mic_hint">Aktifkan atau nonaktifkan perekaman mikrofon untuk sesi ini.</string> + <string name="drawer_mic_failed">Tidak dapat mengubah mikrofon. Coba lagi.</string> <string name="mode_network">Jaringan</string> <string name="mode_wifi_discovery">Pencarian Wi-Fi</string> <string name="mode_wifi_discovery_hint">Menampilkan nama Wi-Fi dan jaringan di sekitar di Steam.</string> @@ -533,14 +574,24 @@ <string name="perf_gsrealtime">gamescope: antrean GPU realtime</string> <string name="perf_gsrealtime_hint">Memprioritaskan kerja GPU compositor. Dapat menghaluskan pacing frame dengan sedikit mengorbankan gim.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memori</string> + <string name="perf_cap_off">Nonaktif</string> + <string name="perf_cap_auto">Default driver</string> + <string name="perf_zram_client">Kompres Steam saat gim berjalan</string> + <string name="perf_zram_client_hint">20 detik setelah gim dimulai, klien Steam dikompres ke zRAM agar gim mendapat lebih banyak memori, lalu dibaca kembali saat gim ditutup. Nonaktifkan jika sesi tertutup sesaat setelah gim dimulai. Batas RAM di atas tetap mengompres Steam saat sesi melampauinya.</string> + <string name="perf_ram_cap">Batas RAM</string> + <string name="perf_ram_cap_hint">Berlaku saat klien Steam berjalan, di mode Steam atau dari desktop. Saat sesi menggunakan lebih dari ini, Steam lalu proses lain yang didukung dalam sesi dikompres ke zRAM. Batas lunak: tidak ada yang ditutup, tetapi gim dapat tersendat saat halaman dimuat kembali.</string> + <string name="perf_ram_cap_unavailable">Memerlukan swap zRAM, yang tidak dimiliki perangkat ini.</string> + <string name="perf_vram_cap">Batas VRAM</string> + <string name="perf_vram_cap_hint">Memori video yang dilaporkan DXVK ke gim Direct3D, sehingga gim menganggarkan tekstur lebih sedikit. Setelan DXVK milik gim tetap diutamakan. Berlaku pada sesi berikutnya.</string> <string name="perf_gpuclock">Pertahankan GPU pada clock tertingginya</string> <string name="perf_gpuclock_hint">Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas.</string> <string name="perf_fixes">Perbaikan sesi</string> <string name="perf_sysmem">Turnip: rendering sysmem</string> <string name="perf_sysmem_hint">Lebih cepat untuk klien Steam; di gim, driver memilih rendering ubin atau memori sistem untuk setiap pass. Diperlukan pada Adreno 710/720/722.</string> <string name="perf_xalia">Lewati bantuan xalia milik Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (eksperimental)</string> - <string name="perf_fastsync_hint">Pengganti userspace untuk driver ntsync Linux, untuk pengujian. Saat aktif, Proton menggunakannya sebagai pengganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton, dan proton-cachyos. Berlaku pada sesi berikutnya.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Pengganti userspace untuk driver ntsync Linux. Saat aktif, Proton menggunakannya sebagai pengganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton, dan proton-cachyos. Berlaku pada sesi berikutnya.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync lebih dulu</string> <string name="perf_fsync_hint">Menjalankan fsync milik Proton sendiri pada file Proton standar, dengan futex_waitv yang disediakan di userspace, sehingga tidak memerlukan paket dan tetap berfungsi begitu Steam memperbarui Proton. Saat aktif, gim menggunakannya sebelum droiddeck-esync, kecuali beberapa gim yang oleh Proton dijaga tetap di luar fsync. Berlaku pada sesi berikutnya.</string> @@ -551,6 +602,8 @@ <string name="perf_fastpath">Jalur cepat proot</string> <string name="perf_fastpath_needs_seccomp">Memerlukan filter seccomp milik proot.</string> <string name="perf_fastpath_hint">Pencarian file lebih cepat dan lebih sedikit tersendat. Nonaktifkan jika program tidak dapat menemukan filenya.</string> + <string name="perf_cursor_composite">Gambar kursor di dalam gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope menggambar penunjuk sendiri alih-alih menyerahkannya ke Android. Aktifkan untuk kursor yang dikendalikan pengontrol. Nonaktif lebih cepat di ponsel. Berlaku pada sesi berikutnya.</string> <string name="perf_identity">Identitas sesi</string> <string name="perf_hostname">Nama host</string> <string name="perf_hostname_hint">Nama yang dilihat Steam untuk perangkat ini. Kosongkan untuk memulihkan %1$s.</string> @@ -565,6 +618,8 @@ <string name="driver_delete_plain">Filenya dihapus dari aplikasi.</string> <string name="driver_delete_in_use">Filenya dihapus. Driver ini sedang digunakan, jadi default akan mengambil alih.</string> <string name="drawer_page_display">Tampilan</string> + <string name="drawer_frame_limit">Batas frame</string> + <string name="drawer_frame_limit_note">Membatasi gim ini. Layar beralih ke refresh rate yang habis dibagi batas tersebut jika ada; batas lain bisa terlihat tidak rata. Gim Steam menggunakan Frame Limit milik Steam di menu Quick Access.</string> <string name="drawer_page_effects">Efek</string> <string name="drawer_page_controls">Kontrol</string> <string name="drawer_page_components">Komponen</string> @@ -589,6 +644,66 @@ <string name="drawer_hud_color_amber">Ambar</string> <string name="drawer_hud_color_violet">Ungu</string> <string name="drawer_hud_opacity">Opasitas</string> + <string name="hud_size">Ukuran</string> + <string name="hud_size_hint">Mengetuk HUD juga mengubah ukurannya.</string> + <string name="hud_size_full">Penuh</string> + <string name="hud_size_tiles">Ubin</string> + <string name="hud_size_pill">Pil</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bilah</string> + <string name="hud_locked">Kunci posisi</string> + <string name="hud_locked_hint">Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi.</string> + <string name="hud_snap">Tempel ke sisi</string> + <string name="hud_snap_hint">Lepaskan HUD dan HUD akan pindah ke sisi layar yang lebih dekat. Jentikan cepat melemparnya ke arah itu.</string> + <string name="hud_group_look">Tampilan</string> + <string name="hud_scale">Ukuran di layar</string> + <string name="hud_color_soft">Lembut</string> + <string name="hud_color_mid">Sedang</string> + <string name="hud_color_vivid">Cerah</string> + <string name="hud_outline">Garis tepi</string> + <string name="hud_outline_color">Warna garis tepi</string> + <string name="hud_outline_gray">Abu-abu</string> + <string name="hud_outline_theme">Warna tema</string> + <string name="hud_group_metrics">Pembacaan</string> + <string name="hud_metric_graph">Grafik waktu bingkai</string> + <string name="hud_metric_decimal">Laju bingkai dengan desimal</string> + <string name="hud_metric_low001" formatted="false">0.01% terendah</string> + <string name="hud_metric_engine">Mesin grafis</string> + <string name="hud_metric_gpu_model">Nama GPU</string> + <string name="hud_metric_gpu">Beban GPU</string> + <string name="hud_metric_gpu_temp">Suhu GPU</string> + <string name="hud_metric_cpu">Beban CPU</string> + <string name="hud_metric_per_core">CPU per inti</string> + <string name="hud_metric_temp">Suhu</string> + <string name="hud_metric_ram">Memori</string> + <string name="hud_metric_vram">Memori grafis</string> + <string name="hud_metric_swap">Memori swap</string> + <string name="hud_metric_battery">Level baterai</string> + <string name="hud_metric_power">Konsumsi daya</string> + <string name="hud_metric_network">Jaringan</string> + <string name="hud_metric_resolution">Resolusi</string> + <string name="hud_metric_proton">Versi Proton</string> + <string name="hud_metric_session">Durasi sesi</string> + <string name="hud_metric_clock">Jam</string> + <string name="hud_group_temps">Suhu</string> + <string name="hud_temp_unit">Satuan</string> + <string name="hud_temp_bands">Warna peringatan</string> + <string name="hud_temp_bands_hint">Suhu berubah menjadi ambar, lalu merah, saat mendekati batas.</string> + <string name="hud_temp_bands_off">Nonaktif</string> + <string name="hud_temp_bands_auto">Otomatis</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU merah pada</string> + <string name="hud_temp_red_gpu">GPU merah pada</string> + <string name="hud_temp_red_battery">Baterai merah pada</string> + <string name="hud_group_more">Lainnya</string> + <string name="hud_export">Diagnostik HUD</string> + <string name="hud_export_hint">Menyimpan laporan semua sensor yang dibaca HUD ke Downloads/DroidDeck.</string> + <string name="hud_export_button">Simpan</string> + <string name="hud_export_done">Disimpan di %1$s</string> + <string name="hud_export_failed">Tidak dapat menyimpan laporan HUD.</string> + <string name="hud_reset">Setel ulang setelan HUD</string> + <string name="hud_reset_button">Setel ulang</string> <string name="drawer_scaling">Mode penskalaan</string> <string name="drawer_scaling_sharpness">Ketajaman penskalaan</string> <string name="drawer_effects">Efek layar</string> @@ -623,10 +738,14 @@ <string name="drawer_touch_auto">Otomatis (%1$s)</string> <string name="drawer_keyboard">Keyboard</string> <string name="drawer_latency">Latensi</string> + <string name="drawer_low_latency">Mode latensi rendah</string> + <string name="drawer_low_latency_hint">Meningkatkan penggunaan CPU dan baterai</string> <string name="drawer_low_latency_controller">Pengontrol latensi rendah</string> <string name="drawer_low_latency_controller_hint">Pengontrol melapor pada 1000 Hz, bukan 250 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_low_latency_touch">Sentuh latensi rendah</string> <string name="drawer_low_latency_touch_hint">Sentuhan melewati pengelompokan frame, jadi kontrol sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU.</string> + <string name="drawer_evdev_mouse">Kanal mouse mentah</string> + <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Keyboard PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Layar kedua</string> @@ -712,6 +831,10 @@ <string name="setup_session">Sesi</string> <string name="setup_logs">Log sesi</string> <string name="setup_logs_hint">Disimpan setelah setiap sesi</string> + <string name="setup_game_debug_logs">Log debug gim</string> + <string name="setup_game_debug_logs_hint">Sertakan diagnostik Proton, Wine, dan grafis pada peluncuran gim berikutnya. Dapat mengurangi performa dan memakai lebih banyak penyimpanan.</string> + <string name="setup_game_debug_logs_restart">Mulai ulang sesi ini untuk menyimpan log debug gim</string> + <string name="setup_logging_update_failed">Tidak dapat memperbarui pencatatan log. Periksa tombolnya lalu coba lagi.</string> <string name="setup_agent_commands">Alat debug</string> <string name="setup_latest_logs">Log sesi terbaru</string> <string name="setup_saved_logs">Log sesi tersimpan</string> @@ -744,12 +867,28 @@ <string name="setup_home_on">DroidDeck dapat menjadi aplikasi Utama</string> <string name="setup_home_off">DroidDeck tidak pernah ditawarkan sebagai aplikasi Utama</string> <string name="setup_orientation">Orientasi</string> + <string name="setup_launcher_orientation">Orientasi peluncur</string> + <string name="setup_launcher_orientation_auto">Ikuti rotasi perangkat</string> + <string name="setup_orientation_portrait">Potret</string> + <string name="setup_session_orientation">Orientasi sesi</string> + <string name="setup_session_orientation_hint">Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; lebar dan tinggi kustom tetap seperti yang dimasukkan.</string> <string name="setup_orientation_auto">Lanskap otomatis</string> <string name="setup_orientation_landscape">Lanskap</string> <string name="setup_orientation_reverse">Lanskap terbalik</string> <string name="setup_fullscreen">Layar penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bilah status dan navigasi Android</string> <string name="setup_fullscreen_off">Menampilkan bilah status dan navigasi Android</string> + <string name="setup_dual_screen">Layar ganda</string> + <string name="setup_dual_screen_hint">Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar.</string> + <string name="setup_dual_screen_auto">Otomatis</string> + <string name="setup_dual_screen_on">Aktif</string> + <string name="setup_dual_screen_off">Nonaktif</string> + <string name="setup_dual_screen_menu">Menu layar bawah</string> + <string name="setup_dual_screen_menu_hint">Memindahkan bagian dan menu dalam game ke layar kedua dan mengetik di sana, agar layar atas tetap menampilkan tampilan penuh. L2 dan R2 berpindah bagian.</string> + <string name="setup_dual_screen_controls">Kontrol layar bawah dalam game</string> + <string name="setup_dual_screen_controls_hint">Membuka trackpad dan keyboard di layar kedua saat sesi dimulai.</string> + <string name="dual_typing_title">Mengetik untuk layar atas</string> + <string name="dual_typing_done">Selesai</string> <string name="setup_default_home">Aplikasi Utama default</string> <string name="setup_choose_home">Pilih aplikasi Utama</string> <string name="setup_choose">Pilih</string> @@ -894,6 +1033,14 @@ <string name="gate_step1">Buka Setelan → Opsi pengembang → Debugging nirkabel dan aktifkan</string> <string name="gate_step2">Ketuk “Pasangkan perangkat dengan kode pemasangan”</string> <string name="gate_step3">Masukkan kode ke notifikasi DroidDeck</string> + <string name="pairguide_build_number">Di Tentang ponsel, ketuk Nomor build 7 kali</string> + <string name="pairguide_wireless">Aktifkan Proses debug nirkabel</string> + <string name="pairguide_pair">Buka Proses debug nirkabel, lalu ketuk “Sambungkan perangkat dengan kode penyambungan”</string> + <string name="pairguide_child_process">Aktifkan “Nonaktifkan pembatasan proses turunan”</string> + <string name="pairguide_row_child_process">Nonaktifkan pembatasan proses turunan</string> + <string name="pairguide_row_build_number">Nomor build</string> + <string name="pairguide_row_wireless">Proses debug nirkabel</string> + <string name="pairguide_row_pair">Sambungkan perangkat dengan kode penyambungan</string> <string name="gate_waiting">Menunggu jendela pemasangan…</string> <string name="gate_code_needed">Jendela ditemukan. Masukkan kodenya di notifikasi.</string> <string name="gate_status">Status</string> @@ -1017,8 +1164,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 +1171,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> @@ -1035,10 +1179,8 @@ <string name="games_never_played">Belum pernah dimainkan</string> <string name="games_runtime_busy_percent">Runtime sibuk · %1$d%%</string> <string name="games_runtime_busy">Runtime sibuk</string> - <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> @@ -1053,6 +1195,9 @@ <string name="gpu_hide_other">Sembunyikan driver untuk GPU lain</string> <string name="gpu_show_other">Tampilkan driver untuk GPU lain</string> <string name="gpu_advanced">Lanjutan</string> + <string name="gpu_ubwc_title">Kompatibilitas UBWC</string> + <string name="gpu_ubwc_hint">Coba Aktif atau Nonaktif jika Steam atau Android menampilkan garis-garis atau berkedip. Berlaku untuk kedua driver setelah DroidDeck dimulai ulang.</string> + <string name="gpu_ubwc_restart">Mulai ulang DroidDeck untuk menerapkan.</string> <string name="gpu_set_with_display">Diatur bersama driver tampilan: %1$s membawa keduanya.</string> <string name="gpu_set_with_runtime">Diatur bersama driver runtime: %1$s membawa keduanya.</string> <string name="gpu_runtime_hint">Digunakan oleh gim dan desktop.</string> @@ -1107,7 +1252,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> @@ -1161,10 +1306,15 @@ <string name="pip_auto">Otomatis masuk ke mode PiP</string> <string name="unfolded_controls">Kontrol di layar saat dibuka</string> <string name="unfolded_controls_hint">Saat dibuka, game berada di atas trackpad dan grip belakang Steam Deck. Saat dilipat, game tampil layar penuh.</string> + <string name="unfolded_controls_with_controller">Tetap tampil dengan pengontrol</string> + <string name="unfolded_controls_with_controller_hint">Tetap tampilkan kontrol sentuh ini saat pengontrol terhubung.</string> <string name="pip_suspended">Ditangguhkan</string> <string name="pip_not_ready">Gambar dalam gambar tersedia setelah sesi siap.</string> <string name="pip_permission">Izinkan gambar dalam gambar untuk DroidDeck di setelan Android.</string> <string name="pip_unavailable">Android tidak dapat membuka gambar dalam gambar.</string> + <string name="game_more">Lainnya</string> + <string name="game_edit_art">Edit gambar</string> + <string name="stores_in_steam_label">Di Steam</string> <string name="game_shortcut">Pintasan</string> <string name="game_shortcut_add">Tambahkan ke layar utama</string> <string name="game_shortcut_choose">Pilih game</string> @@ -1188,6 +1338,10 @@ <string name="main_wait_runtime">Tunggu operasi runtime selesai</string> <string name="main_wait_proton_install">Tunggu instalasi alat kompatibilitas selesai</string> + <string name="load_compat_title">Menyiapkan alat kompatibilitas</string> + <string name="load_compat_wait">Menunggu penyiapan kompatibilitas selesai</string> + <string name="load_compat_hint">Sesi Anda akan dimulai setelah penyiapan selesai.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Tunggu instalasi aplikasi desktop selesai</string> <string name="main_wait_install_game">Tunggu instalasi selesai sebelum meluncurkan game</string> <string name="main_saves_close_session">Tutup sesi Steam dulu, agar game tidak menyimpan dan menimpa hasil impor</string> @@ -1220,6 +1374,9 @@ <string name="main_install_anyway">Tetap instal</string> <string name="main_remove_runtime_title">Hapus runtime Linux</string> <string name="main_remove_runtime_text">Ini menghapus runtime, klien Steam di dalamnya, dan setiap game yang terinstal di sana.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Perbaiki menginstal ulang file sistem runtime dan mempertahankan Steam, gim, serta setelan Anda. Tambahan seperti desktop diinstal lagi saat Anda menggunakannya berikutnya. Hapus menghapus semuanya.</string> + <string name="runtime_repair">Perbaiki runtime</string> <string name="main_applied">Diterapkan: %1$s</string> <string name="android_app_open_failed_primary">Tidak dapat membuka %1$s di layar utama</string> <string name="android_app_open_failed_on">Tidak dapat membuka %1$s di %2$s</string> @@ -1346,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">Tidak dapat menghubungi katalog runtime. Periksa koneksi dan tekan Mainkan lagi.</string> <string name="session_runtime_install_failed">Runtime Linux tidak terinstal. Periksa runtime di Penyiapan dan tekan Mainkan lagi.</string> <string name="session_desktop_install_failed">Desktop tidak terinstal (%1$s). Periksa koneksi dan tekan Desktop lagi.</string> + <string name="session_package_resume_failed">Instalasi yang terputus tidak dapat diselesaikan (%1$s). Periksa koneksi dan ruang penyimpanan, lalu coba lagi.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Runtime Linux rusak: %1$d tautan pustaka mengarah ke file yang hilang (%2$s dan lainnya), biasanya setelah instalasi terputus. Perbaiki tetap mempertahankan gim dan setelan Anda.</item> + </plurals> <string name="session_ended_named">%1$s berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> <string name="session_ended_program">Program berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> <string name="session_ended_desktop">Desktop berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> @@ -1359,6 +1520,12 @@ <string name="mode_decky_plugins_hint">Instal file ZIP plugin untuk sesi Steam berikutnya.</string> <string name="mode_decky_plugin_downloading">Mengunduh…</string> <string name="mode_decky_plugin_install_zip">Instal dari ZIP</string> + <string name="decky_zip_warning_title">Instalasi Plugin Pihak Ketiga</string> + <string name="decky_zip_warning_text">Tim Decky Loader belum meninjau plugin ini. Plugin ini mungkin berisi malware, seperti perangkat lunak untuk mencuri akun Steam Anda atau merusak perangkat Anda. Dengan menginstal plugin ini, Anda setuju menanggung semua risiko terhadap perangkat Anda.</string> + <string name="decky_zip_warning_continue">Lanjutkan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Harap tunggu %1$d detik</item> + </plurals> <string name="store_cat_games">Gim</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafis</string> @@ -1387,6 +1554,10 @@ <string name="theme_icon_blue_detail">Dasar hitam, tipe putih, biru untuk semua yang dipilih, difokuskan, atau ditekan.</string> <string name="theme_electric">Navy elektrik</string> <string name="theme_electric_detail">Biru yang lebih cerah, pada permukaan yang condong ke navy, bukan abu-abu.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Warna yang berganti menyusuri pelangi. Mengikuti pengaturan animasi Android.</string> + <string name="theme_rgb_speed">Kecepatan</string> + <string name="theme_rgb_speed_hint">Seberapa cepat warna berganti.</string> <string name="theme_gradient">Gradasi</string> <string name="theme_gradient_detail">Warna primer dan sekunder pilihan Anda, dipadukan pada tombol dan sorotan.</string> <string name="theme_gradient_primary">Primer</string> @@ -1503,7 +1674,16 @@ <string name="fm_conflict_skip">Lewati</string> <string name="fm_select_this_folder">Pilih folder ini</string> <string name="fm_back">Kembali</string> + <string name="fm_exit">Keluar</string> + <string name="fm_return_to_start">Kembali ke folder awal</string> + <string name="fm_start_unavailable">Folder awal tidak lagi tersedia</string> + <string name="fm_cancel_operation_title">Batalkan operasi?</string> + <string name="fm_cancel_operation_confirmation">Operasi akan dibatalkan. Anda yakin?</string> + <string name="fm_accept">Terima</string> + <string name="fm_decline">Tolak</string> <string name="fm_drive_not_readable">%1$s terpasang tetapi tidak dapat dibaca saat ini</string> + <string name="fm_drive_access_title">Izinkan akses ke %1$s</string> + <string name="fm_drive_access_text">Android mengizinkan DroidDeck melihat drive ini tetapi tidak membacanya. Aktifkan Akses semua file untuk DroidDeck, lalu kembali.</string> <string name="fm_list_view">Tampilan daftar</string> <string name="fm_grid_view">Tampilan kisi</string> <string name="fm_search">Cari</string> @@ -1574,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">Keyboard + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pegangan Deck + trackpad</string> + <string name="second_mode_dashboard">Dasbor</string> + <string name="bottom_dashboard_empty">Belum ada yang bisa ditampilkan di sini.</string> + <string name="bottom_page_downloads">Unduhan</string> + <string name="bottom_downloads_none">Tidak ada unduhan yang berjalan.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Mengunduh cache shader</string> + <string name="bottom_downloads_paused">Dijeda</string> + <string name="bottom_downloads_queued">Menunggu dimulai</string> + <string name="bottom_page_notifications">Notifikasi</string> + <string name="bottom_notifications_listener">Layar bawah DroidDeck</string> + <string name="bottom_notifications_why">Tampilkan pesan dan notifikasi lain di sini saat Anda bermain. Notifikasi hanya muncul di layar ini dan tidak disimpan. Android hanya meminta sekali: halaman akses notifikasinya terbuka di layar ini; aktifkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya.</string> + <string name="bottom_notifications_allow">Izinkan akses notifikasi</string> + <string name="bottom_notifications_none">Tidak ada notifikasi.</string> + <string name="bottom_notifications_count">%1$d notifikasi</string> + <string name="bottom_notifications_clear">Hapus</string> + <string name="bottom_page_screenshots">Tangkapan layar</string> + <string name="stats_fps_needs_hud">FPS memerlukan HUD aktif</string> + <string name="stats_speed">Kecepatan</string> + <string name="stats_pedals">Pedal</string> + <string name="stats_gforce">Gaya G</string> + <string name="stats_timing">Waktu</string> + <string name="stats_best_lap">Lap terbaik</string> + <string name="stats_tires">Ban °C</string> + <string name="stats_trace">Gas dan rem, 10 s terakhir</string> + <string name="stats_speed_chart">Kecepatan, %1$s</string> + <string name="stats_gear">Gigi</string> + <string name="stats_speed_units">Satuan kecepatan</string> + <string name="stats_speed_units_auto">Otomatis (%1$s)</string> + <string name="stats_steam_client_arm">Klien Steam ARM</string> + <string name="stats_steam_client_x86">Klien Steam x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Rem</string> + <string name="stats_lights">Lampu indikator</string> + <string name="stats_lamp_shift">Pindah gigi</string> + <string name="stats_lamp_handbrake">Rem tangan</string> + <string name="stats_lamp_pit">Pembatas pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Mesin %1$s °C</string> + <string name="stats_oil_temp">Oli %1$s °C</string> + <string name="stats_power">Distributor daya</string> + <string name="stats_fuel_t">Bahan bakar, t</string> + <string name="stats_fuel_main">Utama %1$s t</string> + <string name="stats_fuel_reserve">Cadangan %1$s t</string> + <string name="stats_tap_hint">Ketuk bilah atas atau dasbor untuk mengubah gayanya.</string> + <string name="bottom_telemetry_send_title">Kirim data dasbor</string> + <string name="bottom_telemetry_send_auto">Otomatis</string> + <string name="bottom_telemetry_send_auto_hint">Mengaktifkannya untuk setiap gim yang tercantum di sini, termasuk gim yang ditemukan nanti. Gim yang Anda matikan tetap mati.</string> + <string name="bottom_telemetry_send_note">Ini mengubah setelan keluaran data milik gim itu sendiri. Perubahan berlaku saat gim dimulai berikutnya; mematikannya mengembalikan setelan lama.</string> + <string name="bottom_telemetry_send_close">Tutup %1$s untuk mengubah ini.</string> + <string name="bottom_telemetry_send_failed">Tidak dapat mengubah setelan %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: aktifkan %2$s di setelan gim dengan IP 127.0.0.1 dan port %3$d.</string> + <string name="bottom_shots_where">Disimpan ke Pictures/DroidDeck. Tangkapan layar Steam juga muncul di sini.</string> + <string name="bottom_shots_take">Ambil tangkapan layar</string> + <string name="bottom_shots_saved">Tangkapan layar disimpan.</string> + <string name="bottom_shots_failed">Tidak dapat mengambil tangkapan layar.</string> + <string name="bottom_shots_none">Belum ada tangkapan layar.</string> + <string name="bottom_page_chat">Obrolan & suara</string> + <string name="bottom_chat_why">Baca dan balas obrolan Steam di sini sementara gim tetap berjalan di layar utama. Fitur ini menggunakan akun yang dipakai untuk masuk ke Steam.</string> + <string name="bottom_chat_not_signed_in">Steam belum memiliki info masuk web untuk dibagikan, jadi masuklah di sini sekali.</string> + <string name="bottom_chat_stopped">Android menutup halaman obrolan saat DroidDeck berada di latar belakang. Halaman akan terbuka lagi saat Anda kembali ke DroidDeck.</string> + <string name="bottom_chat_open">Buka Steam Chat</string> + <string name="bottom_chat_close">Tutup obrolan</string> + <string name="bottom_chat_mic_on">Mik aktif</string> + <string name="bottom_chat_mic_off">Mik mati</string> + <string name="bottom_chat_mic_unavailable">Mik mati untuk gim ini. Untuk berbicara, aktifkan Mikrofon di setelan Steam DroidDeck (Audio) lalu mulai gim lagi.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Statistik dalam gim</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterai</string> + <string name="bottom_telemetry_lap">Lap</string> + <string name="bottom_telemetry_position">Posisi</string> + <string name="bottom_telemetry_this_lap">Lap ini</string> + <string name="bottom_telemetry_last_lap">Lap terakhir</string> + <string name="bottom_telemetry_fuel">Bahan bakar</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status hukum</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Aktifkan keluaran data gim balap (sering disebut telemetri atau UDP) untuk melihat dasbor langsung di sini. Data tetap berada di perangkat ini.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket berukuran %3$d byte), tetapi dalam format yang belum dapat dibaca halaman ini.</string> + <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi gim tersebut tidak dapat ditampilkan di sini.</string> <string name="rtinst_removing">Menghapus runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1603,6 +1870,7 @@ <string name="flatpakmgr_not_ready">Siapkan Flatpak terlebih dahulu</string> <string name="flatpakmgr_starting">Memulai</string> <string name="flatpakmgr_exit_status">Flatpak keluar dengan status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s dibuat untuk %2$s, yang tidak dapat dijalankan DroidDeck. Aplikasi Flatpak di sini memerlukan versi ARM64 atau x86_64.</string> <string name="flatpakmgr_installing">Menginstal %1$s</string> <string name="flatpakmgr_updating">Memperbarui %1$s</string> <string name="flatpakmgr_removing">Menghapus %1$s</string> @@ -1696,6 +1964,7 @@ <string name="adbpair_applying">Menerapkan setelan…</string> <string name="adbpair_command_failed">Perintah Debugging nirkabel gagal</string> <string name="adbpair_channel_name">Penyiapan Debugging nirkabel</string> + <string name="adbpair_progress_channel_name">Progres penyiapan proses debug nirkabel</string> <string name="adbpair_channel_description">Meminta kode pemasangan Debugging nirkabel saat Setelan terbuka</string> <string name="adbpair_title_pair">Pasangkan Debugging nirkabel</string> <string name="adbpair_waiting_text">Aktifkan Debugging nirkabel, lalu ketuk “Pasangkan perangkat dengan kode pemasangan”.</string> @@ -1804,6 +2073,7 @@ <string name="gpuinfo_not_adreno">Bukan GPU Adreno</string> <string name="gpuinfo_supported">Didukung</string> <string name="gpuinfo_experimental">Eksperimental: drivernya adalah build uji</string> + <string name="gpuinfo_a850_experimental">Dukungan eksperimental Adreno 850: memerlukan driver tampilan dan driver gim eksperimental yang kompatibel; belum diverifikasi di perangkat ini</string> <string name="gpuinfo_below_tested">Di bawah perangkat keras yang diuji (Adreno 725 dan lebih baru): mungkin tidak dapat berjalan</string> <string name="gpuinfo_unsupported">Tidak didukung: DroidDeck memerlukan GPU Adreno (Snapdragon)</string> @@ -1897,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">Diskalakan %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Tampilkan detail perangkat</string> <string name="device_info_hide">Sembunyikan detail perangkat</string> @@ -1915,7 +2185,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> @@ -1929,11 +2198,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> @@ -1951,9 +2218,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> @@ -1972,12 +2247,43 @@ <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> <string name="stores_sort">Urutkan</string> + <string name="setup_rail_labels">Label bilah samping</string> + <string name="setup_rail_labels_hint">Tampilkan nama di bawah ikon bilah samping. Nonaktifkan untuk bilah samping yang lebih ramping.</string> + <string name="library_display">Tampilan</string> + <string name="library_display_larger">Kartu lebih besar</string> + <string name="library_display_smaller">Kartu lebih kecil</string> + <string name="library_display_title">Tampilkan judul</string> + <string name="library_display_size">Tampilkan ukuran</string> <string name="stores_sort_last_played">Baru dimainkan</string> <string name="stores_sort_recently_installed">Baru dipasang</string> <string name="stores_sort_title_asc">Judul A–Z</string> @@ -2104,6 +2410,9 @@ <string name="stores_download_manager">Manajer unduhan</string> <string name="stores_parallel">Unduhan sekaligus</string> <string name="stores_install_where">Instal ke</string> + <string name="stores_install_language">Bahasa gim</string> + <string name="stores_install_language_hint">GOG dan Epic menginstal bahasa ini. Sistem mengikuti bahasa aplikasi.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Instal %1$s:</string> <string name="stores_target_internal">Internal</string> <string name="stores_target_free">%1$s tersedia</string> @@ -2126,6 +2435,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> @@ -2141,6 +2451,9 @@ <string name="edit_target">Target</string> <string name="edit_start_in">Mulai di</string> <string name="edit_launch_options">Opsi peluncuran</string> + <string name="edit_launch_options_steam_hint">Dibagikan dengan Properti Steam: perubahan di salah satunya muncul di keduanya.</string> + <string name="edit_launch_options_not_saved">Tidak dapat menyimpan opsi peluncuran ke Steam. Coba lagi.</string> + <string name="edit_launch_options_desktop">Steam mungkin terbuka di sesi desktop. Ubah opsi peluncuran di Properti Steam, atau tutup sesinya terlebih dahulu.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Exe lain…</string> <string name="edit_remove">Hapus</string> @@ -2266,6 +2579,7 @@ <string name="setup_download_source_custom">Prefix sendiri</string> <string name="setup_download_mirror">Situs</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APLIKASI LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplikasi desktop untuk desktop Linux, dibuka dari Desktop.</string> @@ -2380,7 +2694,7 @@ <string name="glasses_game_on">Game di kacamata</string> <string name="glasses_game_on_hint">Tampilkan game hanya di kacamata. Nonaktif: ponsel menampilkannya dan Android mencerminkan layar ponsel.</string> <string name="glasses_display">Tampilan</string> - <string name="glasses_refresh">Refresh rate</string> + <string name="glasses_refresh">Kecepatan refresh</string> <string name="glasses_3d">3D (berdampingan)</string> <string name="glasses_3d_hint">Alihkan kacamata pintar ke 3D berdampingan. Pelacakan kepala dikontrol secara terpisah.</string> <string name="glasses_3d_failed">Sinyal 3D belum terkonfirmasi. Coba lagi setelah gambar 2D kembali.</string> @@ -2404,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">Otomatis menjaga game 2D ini tetap diam dalam pandangan. Pilih Layar virtual di Tampilan untuk menggunakan pelacakan kepala.</string> <string name="glasses_tracking_sbs_hint">Pelacakan kepala berlaku untuk layar virtual atau game SteamVR yang sedang berjalan.</string> <string name="glasses_hardware">Perangkat</string> + <string name="vr_controllers_tab">Pengontrol</string> + <string name="vr_controllers_group">Pengontrol SteamVR</string> + <string name="vr_controllers_emulate">Gamepad di VR</string> + <string name="vr_controllers_emulate_hint">Dua tangan VR yang diperankan pengontrol Anda. Perubahan langsung berlaku, juga saat SteamVR berjalan. Joy-Con dan tangan yang dilacak tetap mengambil alih sisinya.</string> + <string name="vr_controllers_off">Gamepad biasa</string> + <string name="vr_controllers_index">Pengontrol Valve Index</string> + <string name="vr_controllers_touch">Pengontrol Meta Quest 3</string> + <string name="vr_controllers_vive">Tongkat HTC Vive</string> + <string name="vr_controllers_sticks">Stik awalnya untuk</string> + <string name="vr_controllers_sticks_hint">Tekan kedua stik bersamaan saat di VR untuk beralih.</string> + <string name="vr_controllers_sticks_game">Menggerakkan Anda di gim</string> + <string name="vr_controllers_sticks_hands">Menggerakkan tangan</string> + <string name="vr_controllers_buttons">Tombol</string> + <string name="vr_controllers_buttons_stick">Trigger menjadi trigger, bumper menjadi grip, A/B dan X/Y adalah tombol muka tiap tangan, klik stik mengeklik thumbstick, Guide membuka menu SteamVR. D-pad atas dan bawah mendekatkan atau menjauhkan tangan.</string> + <string name="vr_controllers_buttons_vive">Stik menjadi trackpad; A/X atau klik stik menekannya. Trigger menjadi trigger, bumper menjadi grip, Start dan Select menjadi menu, Guide membuka menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Tanpa tangan VR. Gim yang mendukung gamepad, serta menu SteamVR, menerima pengontrol Anda seperti biasa.</string> <string name="glasses_brightness">Kecerahan</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Peredup lensa</string> @@ -2461,6 +2791,12 @@ <string name="hand_camera_placement">Posisi kamera</string> <string name="hand_camera_placement_hint">Pastikan kamera bisa melihat Anda sebelum bermain.</string> <string name="hand_camera_check">Periksa</string> + <string name="tracking_pack_title">Unduhan pelacakan tangan</string> + <string name="tracking_pack_hint">Pelacakan tangan memerlukan unduhan %1$s satu kali.</string> + <string name="tracking_pack_download">Unduh</string> + <string name="tracking_pack_retry">Coba lagi</string> + <string name="tracking_pack_downloading">Mengunduh pelacakan tangan… %1$d%%</string> + <string name="tracking_pack_failed">Pelacakan tangan tidak dapat diunduh. Periksa koneksi Anda lalu coba lagi.</string> <string name="hand_camera_check_title">Posisi kamera</string> <string name="hand_camera_how_rear">Dirikan perangkat sejauh 1,5 hingga 2 meter kira-kira setinggi dada, dengan kamera belakang menghadap Anda. Lalu masuk ke bidang pandang dengan tangan terentang.</string> <string name="hand_camera_how_front">Dirikan perangkat sejauh 1,5 hingga 2 meter kira-kira setinggi dada, dengan layar menghadap Anda. Lalu masuk ke bidang pandang dengan tangan terentang.</string> @@ -2532,6 +2868,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> @@ -2653,6 +3004,9 @@ <string name="storage_data_installed">Gim terpasang</string> <string name="storage_data_parts">Prefix %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Bersihkan shader</string> + <string name="storage_reset_prefix">Reset prefix</string> + <string name="storage_reset_prefix_title">Reset prefix untuk %1$s?</string> + <string name="storage_reset_prefix_confirm">Menghapus prefix Wine (%1$s) di %2$s dan membuatnya ulang saat peluncuran berikutnya. Save, setelan, dan redistributable yang terinstal di dalamnya akan hilang; save Steam Cloud tetap di akun Anda.</string> <string name="storage_data_leftovers">Gim yang dihapus</string> <string name="storage_steam_app">Aplikasi Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix masih berisi berkas, mungkin save lokal</string> @@ -2954,4 +3308,305 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sinkronkan dengan Syncthing</string> + <string name="sync_enable_hint">Berbasis Syncthing-Fork, ini adalah implementasi Syncthing yang memungkinkan Anda menyinkronkan file di sistem file internal DroidDeck dengan instans Syncthing lain. Ini hanya untuk file yang Anda simpan di dalam sistem file internal DroidDeck.</string> + <string name="sync_missing">Build ini tidak menyertakan Syncthing.</string> + <string name="sync_starting">Memulai Syncthing</string> + <string name="sync_status_starting">Memulai</string> + <string name="sync_status_up_to_date">Terbaru</string> + <string name="sync_status_syncing">Menyinkronkan</string> + <string name="sync_status_paused">Dijeda</string> + <string name="sync_status_pausing">Menjeda</string> + <string name="sync_status_resuming">Melanjutkan</string> + <string name="sync_status_attention">Perlu perhatian</string> + <string name="sync_status_failed">Syncthing berhenti</string> + <string name="sync_failed_retry">Coba lagi</string> + <string name="sync_paused_wifi">Dijeda hingga ada Wi-Fi</string> + <string name="sync_paused_game">Dijeda selama gim berjalan</string> + <string name="sync_summary">%1$d folder · %2$d dari %3$d perangkat terhubung</string> + <string name="sync_left">%1$s lagi</string> + <string name="sync_open_web_ui">Buka UI web</string> + <string name="sync_pause">Jeda</string> + <string name="sync_resume">Lanjutkan</string> + <string name="sync_running">Berjalan</string> + <string name="sync_running_hint">Matikan untuk menghentikan Syncthing sepenuhnya.</string> + <string name="sync_this_device">Perangkat ini</string> + <string name="sync_device_id">ID Perangkat</string> + <string name="sync_show_qr">Tampilkan QR</string> + <string name="sync_advanced">Lanjutan</string> + <string name="sync_advanced_hint">Port, kapan berjalan, atur ulang</string> + <string name="sync_open">Buka</string> + <string name="sync_waiting">Menunggu Anda</string> + <string name="sync_pending_device">%1$s ingin terhubung</string> + <string name="sync_pending_folder">%1$s ingin berbagi “%2$s”</string> + <string name="sync_pending_folder_hint">Terima untuk memilih lokasi penyimpanannya di DroidDeck.</string> + <string name="sync_review">Tinjau di UI web</string> + <string name="sync_folders">Folder</string> + <string name="sync_no_folders">Belum ada folder.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Terbaru</string> + <string name="sync_folder_syncing">Menyinkronkan %1$d%%</string> + <string name="sync_folder_scanning">Memindai</string> + <string name="sync_folder_paused">Dijeda</string> + <string name="sync_folder_out_of_sync">Tidak sinkron</string> + <string name="sync_folder_errors">%1$d file tidak dapat disinkronkan</string> + <string name="sync_folder_blocked">Diblokir</string> + <string name="sync_folder_blocked_hint">Folder ini berada di luar penyimpanan DroidDeck, jadi DroidDeck menjedanya. Untuk menyinkronkan folder di luar DroidDeck, gunakan aplikasi Syncthing-Fork.</string> + <string name="sync_remove_folder">Hapus dari Syncthing</string> + <string name="sync_remove_folder_hint">Menghapusnya tidak akan menghapus file apa pun.</string> + <string name="sync_devices">Perangkat</string> + <string name="sync_no_devices">Belum ada perangkat.</string> + <string name="sync_connected">Terhubung</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Terakhir terlihat %1$s</string> + <string name="sync_device_id_title">ID perangkat ini</string> + <string name="sync_device_id_hint">Di perangkat Anda yang lain, tambahkan perangkat di Syncthing lalu pindai kode ini atau tempel ID-nya. Kemudian terima di sini melalui UI web.</string> + <string name="sync_copy">Salin</string> + <string name="sync_share">Bagikan</string> + <string name="sync_done">Selesai</string> + <string name="sync_off_title">Matikan Syncthing?</string> + <string name="sync_off_body">Syncthing berhenti sekarang dan tetap berhenti hingga dinyalakan kembali. File yang telah disinkronkan tetap di tempatnya.</string> + <string name="sync_off_forget">Hapus juga konfigurasi Syncthing</string> + <string name="sync_off_forget_hint">Menghapus ID, folder, dan perangkat milik perangkat ini. Menyalakannya lagi akan memulai dari awal.</string> + <string name="sync_turn_off">Matikan</string> + <string name="sync_ports">Port</string> + <string name="sync_port_sync">Sinkronisasi</string> + <string name="sync_port_discovery">Penemuan lokal</string> + <string name="sync_repick">Pilih port baru</string> + <string name="sync_repick_hint">Diperiksa lagi setiap kali dimulai.</string> + <string name="sync_repick_button">Pilih ulang</string> + <string name="sync_reset_group">Atur ulang</string> + <string name="sync_api_key">Kunci API</string> + <string name="sync_regenerate">Buat ulang</string> + <string name="sync_reset">Atur ulang Syncthing</string> + <string name="sync_reset_hint">ID perangkat baru, folder dan perangkat dihapus. File di penyimpanan DroidDeck tetap disimpan.</string> + <string name="sync_reset_button">Atur ulang</string> + <string name="sync_reset_confirm_title">Atur ulang Syncthing?</string> + <string name="sync_running_group">Berjalan</string> + <string name="sync_run">Jalankan</string> + <string name="sync_run_open">Saat DroidDeck terbuka</string> + <string name="sync_run_background">Di latar belakang</string> + <string name="sync_wifi_only">Hanya Wi-Fi</string> + <string name="sync_pause_games">Jeda selama bermain gim</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output Syncthing untuk sesi ini</string> + <string name="sync_logs_share">Bagikan</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Siapkan runtime Linux terlebih dahulu.</string> + <string name="sync_accept">Terima</string> + <string name="sync_accept_title">Simpan “%1$s” ke</string> + <string name="sync_add_folder">Tambah folder</string> + <string name="sync_add_folder_hint">Sinkronkan folder di penyimpanan DroidDeck</string> + <string name="sync_choose">Pilih</string> + <string name="sync_add">Tambah</string> + <string name="sync_add_failed">Folder tidak dapat ditambahkan.</string> + <string name="sync_share_with">Bagikan dengan</string> + <string name="sync_share_none">Belum ada perangkat. Anda dapat membagikan folder ini dari UI web nanti.</string> + <string name="sync_use_folder">Gunakan folder ini</string> + <string name="sync_new_folder">Folder baru</string> + <string name="sync_location_home">Folder home kontainer</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Penyimpanan bersama DroidDeck</string> + <string name="sync_location_card">DroidDeck di %1$s</string> + <string name="sync_location_app">Data aplikasi DroidDeck</string> + <string name="sync_web_path_locked">Folder baru disimpan di folder Sync DroidDeck. Untuk menyinkronkan folder DroidDeck lain, gunakan Tambah folder di tab Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Muat ulang</string> + <string name="sync_not_running">Syncthing tidak berjalan.</string> + <string name="session_end_steam_sigill">Steam berhenti karena instruksi ilegal (SIGILL). Ini bisa berupa masalah kompatibilitas instruksi CPU atau klien mengalami crash. Bagikan log beserta detail perangkat Anda.</string> + <string name="session_end_steam_try_x64">Anda dapat mencoba Setelan Steam → Klien Steam → x86-64 (eksperimental). Ini memerlukan unduhan tambahan dan mungkin berjalan lebih lambat.</string> + <string name="session_end_vulkan_device">Driver grafis Linux tidak dapat menemukan perangkat Vulkan yang dapat digunakan. Pastikan driver GPU Linux yang dipilih mendukung GPU ini.</string> + <string name="session_end_gpu_unsupported">Sesi ini tidak dapat dimulai karena GPU ini tidak memiliki driver Vulkan Linux yang kompatibel dalam konfigurasi saat ini. Driver Adreno Turnip tidak dapat mengaktifkan dukungan untuk GPU MediaTek/Mali.</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_resources_browser">Terbuka di browser Anda</string> + <string name="game_resource_guides">Panduan</string> + <string name="game_resource_protondb_detail">Laporan kompatibilitas Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Untuk gim dengan save di akun Steam Anda</string> + <string name="game_resource_search">Penelusuran web</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="library_filter">Filter</string> + <string name="library_filter_installed">Hanya yang terinstal</string> + <string name="library_filter_all_owned">Semua gim yang dimiliki</string> + <string name="library_no_installed_matches">Tidak ada gim terinstal yang cocok dengan filter ini.</string> + <string name="library_browse_owned">Telusuri gim yang dimiliki</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="stores_itch_updates_found">Pembaruan tersedia: %1$d</string> + <string name="stores_itch_update_replaced">Pengembang mengganti build ini dengan %1$s. Perbarui ke build itu?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Pengaturan cloud</string> + <string name="integration_title">Integrasi Steam</string> + <string name="integration_count">%1$d dari %2$d aktif</string> + <string name="integration_set_up">Siapkan</string> + <string name="integration_location">Lokasi</string> + <string name="integration_app_info">Info aplikasi</string> + <string name="integration_wifi">Nama Wi-Fi</string> + <string name="integration_brightness">Kecerahan</string> + <string name="integration_home">DroidDeck sebagai Beranda</string> + <string name="integration_shortcuts">Pintasan tombol Home</string> + <string name="integration_wifi_hint">Tampilkan jaringan di Steam · memerlukan akses Lokasi, tidak pernah dilacak</string> + <string name="integration_wifi_on">Jaringan tampil di Steam</string> + <string name="integration_wifi_location_off">Lokasi nonaktif</string> + <string name="integration_wifi_denied">Lokasi ditolak · izinkan di Info aplikasi</string> + <string name="integration_brightness_hint">Penggeser Steam mengatur kecerahan layar</string> + <string name="integration_home_hint">Home membuka menu Steam dalam sesi</string> + <string name="integration_shortcuts_hint">Tahan Home untuk kombinasi Steam Guide</string> + <string name="integration_shortcuts_needs_home">Memerlukan DroidDeck sebagai Beranda</string> + <string name="integration_shortcuts_maybe_restricted">Berwarna abu-abu di Android? Info aplikasi → ⋮ → Izinkan setelan terbatas</string> + <string name="integration_shortcuts_restricted">Diblokir oleh Android · Info aplikasi → ⋮ → Izinkan setelan terbatas</string> + <string name="integration_shortcuts_service">Tombol Home DroidDeck</string> + <string name="integration_shortcuts_service_description">Meneruskan tekanan tombol Home ke Steam Guide saat sesi Steam sedang aktif dan DroidDeck adalah aplikasi Beranda default. Tidak membaca konten layar.</string> + <string name="integration_brightness_needed">Aktifkan Kecerahan di Penyiapan → Integrasi Steam</string> + <string name="apps_search_hint">Cari aplikasi</string> + <string name="apps_no_match">Tidak ada aplikasi yang cocok dengan “%1$s”.</string> + <string name="apps_add_widget">Tambahkan widget</string> + <string name="apps_widgets_loading">Memuat widget…</string> + <string name="apps_widgets_none">Tidak ada aplikasi di perangkat ini yang menyediakan widget.</string> + <string name="apps_widget_wider">Lebih lebar</string> + <string name="apps_widget_narrower">Lebih sempit</string> + <string name="apps_widget_taller">Lebih tinggi</string> + <string name="apps_widget_shorter">Lebih pendek</string> + <string name="apps_widget_move_earlier">Pindahkan ke depan</string> + <string name="apps_widget_move_later">Pindahkan ke belakang</string> + <string name="apps_widget_configure">Setelan widget</string> + <string name="apps_widget_remove">Hapus widget</string> + <string name="apps_add_to_folder">Tambahkan ke folder</string> + <string name="apps_new_folder">Folder baru</string> + <string name="apps_remove_from_folder">Keluarkan dari folder</string> + <string name="apps_app_info">Info aplikasi</string> + <string name="apps_uninstall">Uninstal</string> + <string name="apps_folder_rename">Ganti nama</string> + <string name="apps_folder_ungroup">Pisahkan</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nama folder</string> + <string name="apps_filter">Tampilkan</string> + <string name="apps_filter_all">Semua aplikasi</string> + <string name="apps_filter_games">Game</string> + <string name="apps_filter_downloaded">Didownload</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Tersembunyi</string> + <string name="apps_hide">Sembunyikan</string> + <string name="apps_unhide">Tampilkan di aplikasi</string> + <string name="apps_shortcut_remove">Hapus pintasan</string> + <string name="apps_pin_title">Tambahkan ke Aplikasi</string> + <string name="apps_pin_add">Tambahkan</string> + <string name="apps_hidden_none">Tidak ada aplikasi tersembunyi.</string> + <string name="apps_sort_name_asc">Nama A–Z</string> + <string name="apps_sort_name_desc">Nama Z–A</string> + <string name="apps_sort_installed">Baru diinstal</string> + <string name="apps_sort_updated">Baru diperbarui</string> + <plurals name="apps_count"> + <item quantity="other">%d aplikasi</item> + </plurals> + <string name="desktop_restore_title">Memulihkan perangkat lunak Anda</string> + <string name="desktop_restore_body">Menginstal ulang aplikasi yang Anda tambahkan setelah pembaruan DroidDeck.</string> + <string name="desktop_restore_done_title">Perangkat lunak dipulihkan</string> + <string name="desktop_restore_done_body">Aplikasi yang Anda tambahkan sudah terinstal lagi.</string> + <string name="desktop_restore_failed_title">Beberapa perangkat lunak tidak dapat dipulihkan</string> + <string name="desktop_restore_failed_body">Lihat ~/.cache/droiddeck/apt-restore.log, lalu coba sudo apt install di Konsole.</string> + <string name="gog_full_files">Optimasi native tidak tersedia. Unduhan mencakup file pengganti lengkap.</string> + <string name="gog_recover">Verifikasi hasil patch</string> + <string name="slow_usb_title">Koneksi USB lambat</string> + <string name="slow_usb_cable">%1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s), jadi game di dalamnya akan dimuat lambat. Gunakan kabel USB 3 berkecepatan 5 Gbps atau lebih, coba balik colokan USB-C, atau gunakan drive yang lebih cepat.</string> + <string name="slow_usb_port">%1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s). Port USB perangkat ini tidak bisa lebih cepat, jadi game akan dimuat lambat. Penyimpanan internal atau kartu microSD mungkin lebih cepat.</string> + <string name="slow_usb_never">Jangan tampilkan lagi</string> + <string name="slow_usb_dismiss">Tutup</string> + <string name="steam_import_title">Mulai ulang Steam untuk menambahkan game Anda?</string> + <string name="steam_import_body">Steam dapat menampilkan game milik Anda ini sebagai terpasang: %1$s. Steam harus dimulai ulang untuk menampilkannya. Mulai ulang sekarang, atau game akan ditambahkan saat Steam dimulai berikutnya.</string> + <string name="steam_import_names_more">%1$s dan %2$d lainnya</string> + <string name="steam_import_now">Mulai ulang sekarang</string> + <string name="steam_import_later">Nanti</string> + <string name="gog_maintenance">Kelola instalasi GOG</string> + <string name="gog_check">Periksa pembaruan</string> + <string name="gog_repair">Verifikasi/Perbaiki</string> + <string name="gog_patches">Patch offline</string> + <string name="gog_refresh">Unduh penginstal offline lengkap</string> + <string name="gog_update">Perbarui ke %1$s</string> + <string name="gog_resume">Lanjutkan pemeliharaan GOG</string> + <string name="gog_open_patch">Buka penginstal patch</string> + <string name="gog_patch_in_session">Selesaikan atau batalkan penginstal patch di sesi Linux.</string> + <string name="gog_patch_requirements">Pilih patch untuk versi dan bahasa yang Anda instal. Versi sumber yang didukung mungkin tidak tercantum.</string> + <string name="gog_no_patches">GOG tidak memiliki patch Windows mandiri untuk gim ini.</string> + <string name="gog_managed_files">File gim yang diubah dapat diganti.</string> + <string name="gog_patch_installer_note">Penginstal terbuka di sesi Linux Anda.</string> + <string name="gog_download_label">Unduhan</string> + <string name="gog_space_label">Ruang tambahan</string> + <string name="gog_space_estimate_label">Perkiraan ruang</string> + <string name="gog_repair_action">Perbaiki file</string> + <string name="gog_refresh_action">Segarkan instalasi</string> + <string name="gog_select_patch">Pilih</string> + <string name="setup_all_files">Akses semua file</string> + <string name="setup_local_network">Jaringan lokal</string> + <string name="libraries_title">Pustaka Steam lainnya</string> + <string name="libraries_hint">Folder tempat Steam dapat memasang dan menjalankan gim, masing-masing dengan nama sendiri. Menghapus dari daftar tetap menyimpan gim di disk.</string> + <string name="libraries_add">Tambah pustaka</string> + <string name="libraries_rename_title">Nama pustaka</string> + <string name="libraries_pick">Pilih folder untuk pustaka</string> + <string name="libraries_full">Maksimal %1$d pustaka tambahan</string> + <string name="libraries_overlap">Folder itu sudah menjadi pustaka atau berada di dalamnya</string> + <string name="libraries_missing">%1$s · tidak tersedia</string> + <string name="libraries_applies_next">Berlaku mulai sesi Steam berikutnya</string> + <string name="bottom_desktop_start">Mulai desktop</string> + <string name="bottom_desktop_mode_touch">Sentuhan langsung</string> + <string name="bottom_desktop_trackpad">Trackpad. Ketuk untuk sentuhan langsung</string> + <string name="bottom_desktop_direct_touch">Sentuhan langsung. Ketuk untuk trackpad</string> + <string name="bottom_desktop_starting">Memulai desktop KDE…</string> + <string name="bottom_desktop_ended">Desktop telah ditutup.</string> + <string name="bottom_desktop_failed">Desktop tidak dapat dimulai. Lognya berada di folder bottom-desktop sesi ini.</string> + <string name="bottom_desktop_off">Desktop ditutup.</string> + <string name="libraries_rename">Ganti nama</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-it/gestures.xml b/app/src/main/res/values-it/gestures.xml index b9a3147f4..b3a530b23 100644 --- a/app/src/main/res/values-it/gestures.xml +++ b/app/src/main/res/values-it/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesti</string> <string name="gesture_settings">Impostazioni dei gesti tattili</string> - <string name="gesture_settings_hint">Personalizza i gesti di mouse e tastiera. Seleziona Gesti come modalità tattile per usarli.</string> <string name="gesture_tap">Tocco</string> <string name="gesture_drag">Trascinamento con un dito</string> <string name="gesture_long_press">Pressione prolungata</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Pressione con tre dita</string> <string name="gesture_pinch">Pizzica per ingrandire</string> <string name="gesture_hold_button">Tieni premuto il pulsante</string> + <string name="gesture_hold_left">Tieni premuto il pulsante sinistro</string> + <string name="gesture_hold_right">Tieni premuto il pulsante destro</string> <string name="gesture_click_once">Clic singolo</string> <string name="gesture_hold_delay">Ritardo della pressione</string> <string name="gesture_double_delay">Intervallo del doppio tocco</string> diff --git a/app/src/main/res/values-it/shortcuts.xml b/app/src/main/res/values-it/shortcuts.xml new file mode 100644 index 000000000..7b77d0e12 --- /dev/null +++ b/app/src/main/res/values-it/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Scorciatoie dei pulsanti fisici</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Assegna: %1$s</string> + <string name="shortcuts_press">Premi e rilascia un pulsante. L’assegnazione viene salvata automaticamente.</string> + <string name="shortcuts_release">Rilascia il pulsante per continuare.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Questo pulsante è già assegnato a: %1$s</string> + <string name="shortcuts_save">Riassegna</string> + <string name="shortcuts_retry">Prova un altro pulsante</string> + <string name="shortcuts_limitations">Il pulsante Home e alcuni pulsanti aggiuntivi potrebbero non essere disponibili.</string> +</resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0d8fd5882..17d491f2e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opzioni VKD3D per D3D12. nodxr disattiva il ray tracing; usalo solo per un gioco che lo richiede.</string> <string name="game_env_proton_log">Imposta 1 per un log diagnostico di Proton. Il log può ridurre le prestazioni e occupare spazio.</string> <string name="game_env_wined3d">Imposta 1 per usare WineD3D basato su OpenGL invece di DXVK, per test di compatibilità D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer per DirectDraw, Direct3D 1-7 e i giochi eseguiti con WineD3D. Vulkan salta il percorso OpenGL-su-Zink ed è molto più veloce per i vecchi giochi DirectDraw e Direct3D 7 su Adreno.</string> + <string name="game_env_dxvk_d3d8">Imposta 1 per eseguire Direct3D 8 tramite DXVK invece di WineD3D. Più veloce nel test Direct3D 8 di AIO Graphics Test su Adreno.</string> <string name="game_env_no_ntsync">Imposta 1 per non usare ntsync (droiddeck-ntsync o un driver del kernel) in questo gioco; userà droiddeck-esync se esiste un pacchetto, altrimenti droiddeck-fsync.</string> <string name="game_env_no_esync">Imposta 1 per disattivare droiddeck-esync in questo gioco; userà invece droiddeck-fsync, o droiddeck-ntsync se anche fsync è disattivato.</string> <string name="game_env_no_fsync">Imposta 1 per non usare droiddeck-fsync in questo gioco; userà droiddeck-esync se esiste un pacchetto, altrimenti droiddeck-ntsync.</string> <string name="game_env_fsync_first">Imposta 1 per eseguire questo gioco con droiddeck-fsync, o 0 per dare priorità a droiddeck-esync se c\'è un pacchetto adatto al suo Proton.</string> <string name="game_env_xalia">Imposta 0 per disattivare l\'assistente di navigazione con gamepad di Proton in questo gioco.</string> + <string name="game_env_anticheat_offline">Attivo per impostazione predefinita. Avvia un gioco con Easy Anti-Cheat senza il suo anti-cheat quando il gioco supporta il gioco offline. Disattivalo per avviarlo tramite Easy Anti-Cheat come al solito. Le modalità online che richiedono Easy Anti-Cheat restano non disponibili.</string> <string name="game_env_hud">Overlay DXVK per D3D9–11. fps mostra il frame rate; se vuota, l\'overlay è nascosto.</string> <string name="game_env_dxvk_config">Impostazioni DXVK separate da punto e virgola. Le build recenti usano dxvk.maxFrameRate per limitare i frame; per giocare normalmente è meglio il limitatore di frame della sessione.</string> + <string name="game_env_cores">Core della CPU per questo gioco, ad esempio 0-4 o 0,2,4, al posto dei core dei giochi della sessione. Meno core scaldano meno.</string> <string name="game_env_vkd3d_limit">Limite di frame rate D3D12. 0 disattiva il limite.</string> <string name="game_env_glthread">Threading OpenGL di Mesa. true può aiutare i giochi OpenGL limitati dalla CPU; provalo gioco per gioco.</string> <string name="sync_backend_title">Sincronizzazione Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX esegue programmi Linux x86 su questo dispositivo ARM64. Auto lo usa quando il programma è compilato per x86.</string> <string name="app_fex_x86">%1$s tramite FEX</string> <string name="app_fex_not_ready">Questo programma è compilato per PC %1$s e viene eseguito tramite FEX, che non è ancora configurato. Apri Steam una volta dopo aver eseguito l\'accesso: DroidDeck gli farà scaricare FEX e lo Steam Linux Runtime necessario, poi il programma si aprirà.</string> + <string name="session_proot_missing">Impossibile scaricare il proot di DroidDeck. Controlla la connessione e riprova. La sessione non è stata avviata perché il proot di riserva è troppo lento per giocare.</string> + <string name="session_directaudio_missing">Impossibile scaricare DirectAudio, quindi l\'audio dei giochi usa il percorso più lento in questa sessione.</string> <string name="session_end_program">Questo programma</string> <string name="session_end_steam_download">Impossibile scaricare il client Steam. La rete o la VPN potrebbe bloccare i server di Steam; controlla la connessione e riprova.</string> <string name="session_end_steam_setup">Impossibile configurare il client Steam. Controlla la connessione e lo spazio libero, poi riprova.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Controller Xbox 360</string> <string name="mode_controller_note">Deck: tasto Accesso rapido e giroscopio. Steam Controller: lo stesso, con il rilevamento della presa sui tasti posteriori. DualShock 4 e DualSense: giroscopio, con i trackpad usati come touchpad. Xbox 360: apri Accesso rapido con Guide+A.</string> <string name="mode_back">Indietro</string> + <string name="back_hold">Tieni premuto Indietro per le scorciatoie Steam</string> + <string name="back_hold_hint">Tenere premuto Indietro apre l’Accesso rapido o crea combinazioni Steam con altri tasti. Disattiva per ignorare la pressione prolungata; tocco e doppio tocco funzionano ancora.</string> + <string name="back_native_qam_hint">Tieni premuto Indietro per 700 ms, oppure tieni premuto Indietro e premi un altro tasto per le scorciatoie di Steam.</string> + <string name="back_double_tap_window">Intervallo doppio tocco</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Consenti il controllo della luminosità</string> + <string name="brightness_permission_text">Configura il controllo della luminosità 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">Sessione</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Ultima versione · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installa l\'ultima versione</string> + <string name="decky_channel">Canale di aggiornamento</string> + <string name="decky_channel_hint">Quali release di Decky Loader installare. Anche l\'aggiornamento integrato di Decky usa lo stesso canale.</string> + <string name="decky_channel_stable">Stabile</string> + <string name="decky_channel_prerelease">Pre-release</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Impossibile salvare il canale di aggiornamento di Decky</string> <string name="mode_decky_on">Si avvia con Steam. Quando è attivo, altre app su questo dispositivo potrebbero controllare Steam.</string> <string name="mode_decky_off">Disattivato. La porta di debug remoto di Steam resta chiusa.</string> <string name="mode_decky_remove_title">Disinstallare Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Overlay prestazioni</string> <string name="mode_mangoapp_hint">Disattivalo se i giochi vanno in crash o diventano neri in modalità Deck. Si applica dalla prossima sessione.</string> + <string name="mode_return_after_game">Torna a DroidDeck dopo un gioco</string> + <string name="mode_return_after_game_hint">Quando si chiude un gioco avviato da DroidDeck o da un altro launcher, Steam esce in modo pulito (prima termina il salvataggio nel cloud) e torni lì. Disattivo: resti in Steam.</string> + <string name="mode_shader_precache">Pre-caching degli shader</string> + <string name="mode_shader_precache_hint">Steam scarica shader precompilati per i tuoi giochi e li elabora in background, così i giochi scattano meno. Disattivato risparmia dati, spazio e batteria; i giochi compilano gli shader mentre giochi. È la stessa impostazione di Download > Pre-caching degli shader in Steam. Si applica dalla prossima sessione.</string> <string name="mode_steam_repair">Ripara il client Steam</string> <string name="mode_steam_repair_hint">Scarica di nuovo il client Steam al prossimo avvio di Steam. Usalo se Steam resta sulla schermata di caricamento. Giochi, accesso e impostazioni vengono mantenuti.</string> <string name="mode_steam_repair_queued">Il client Steam verrà scaricato di nuovo al prossimo avvio di Steam.</string> @@ -375,6 +414,8 @@ <string name="mode_directaudio_hint">Bypassa PulseAudio per ridurre la latenza.</string> <string name="mode_mic">Microfono</string> <string name="mode_mic_hint">Per la chat vocale.</string> + <string name="drawer_mic_hint">Attiva o disattiva l\'acquisizione del microfono per questa sessione.</string> + <string name="drawer_mic_failed">Impossibile cambiare il microfono. Riprova.</string> <string name="mode_network">Rete</string> <string name="mode_wifi_discovery">Rilevamento Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostra in Steam i nomi delle reti Wi-Fi e le reti vicine.</string> @@ -537,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: coda GPU in tempo reale</string> <string name="perf_gsrealtime_hint">Dà priorità al lavoro GPU del compositor. Può rendere più regolare il frame pacing, a scapito dei giochi.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Disattivo</string> + <string name="perf_cap_auto">Predefinito del driver</string> + <string name="perf_zram_client">Comprimi Steam durante il gioco</string> + <string name="perf_zram_client_hint">20 s dopo l\'avvio di un gioco, il client Steam viene compresso in zRAM per lasciare più memoria al gioco e viene riletto quando il gioco si chiude. Disattivalo se la sessione si chiude poco dopo l\'avvio dei giochi. Un limite di RAM impostato sopra comprime comunque Steam quando la sessione lo supera.</string> + <string name="perf_ram_cap">Limite RAM</string> + <string name="perf_ram_cap_hint">Si applica mentre il client Steam è in esecuzione, in modalità Steam o dal desktop. Quando la sessione usa più di questo valore, Steam e poi gli altri processi supportati della sessione vengono compressi in zRAM. È un limite morbido: non viene chiuso nulla, ma i giochi possono scattare mentre le pagine vengono recuperate.</string> + <string name="perf_ram_cap_unavailable">Richiede lo swap zRAM, che questo dispositivo non ha.</string> + <string name="perf_vram_cap">Limite VRAM</string> + <string name="perf_vram_cap_hint">La memoria video che DXVK comunica ai giochi Direct3D, così usano meno texture. Le impostazioni DXVK del gioco hanno comunque la priorità. Si applica dalla prossima sessione.</string> <string name="perf_gpuclock">Mantieni la GPU alla frequenza massima</string> <string name="perf_gpuclock_hint">Solo Adreno. Meno scatti, più consumo di batteria e più calore.</string> <string name="perf_fixes">Correzioni della sessione</string> <string name="perf_sysmem">Turnip: rendering sysmem</string> <string name="perf_sysmem_hint">Più veloce per il client di Steam; nei giochi il driver sceglie per ogni passata tra rendering a tile e in memoria di sistema. Necessario su Adreno 710/720/722.</string> <string name="perf_xalia">Salta l\'assistente xalia di Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (sperimentale)</string> - <string name="perf_fastsync_hint">Un sostituto in userspace del driver ntsync di Linux, per i test. Quando è attivo, Proton lo usa al posto di droiddeck-esync e droiddeck-fsync. Funziona con Proton Experimental ARM64, GE-Proton e proton-cachyos. Si applica dalla prossima sessione.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Un sostituto in userspace del driver ntsync di Linux. Quando è attivo, Proton lo usa al posto di droiddeck-esync e droiddeck-fsync. Funziona con Proton Experimental ARM64, GE-Proton e proton-cachyos. Si applica dalla prossima sessione.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">Prima droiddeck-fsync</string> <string name="perf_fsync_hint">Esegue il fsync di Proton sui file Proton originali, con futex_waitv fornito in userspace, quindi non richiede pacchetti e continua a funzionare appena Steam aggiorna Proton. Quando è attivo, i giochi lo usano prima di droiddeck-esync, tranne i pochi che Proton esclude da fsync. Si applica dalla prossima sessione.</string> @@ -555,6 +606,8 @@ <string name="perf_fastpath">Percorso veloce di proot</string> <string name="perf_fastpath_needs_seccomp">Richiede il filtro seccomp di proot.</string> <string name="perf_fastpath_hint">Ricerca dei file più veloce e meno scatti. Disattivalo se un programma non trova i suoi file.</string> + <string name="perf_cursor_composite">Disegna il cursore in gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope disegna il puntatore da sé invece di passarlo ad Android. Attivalo per un cursore controllato dal controller. Disattivo è più veloce su un telefono. Si applica dalla prossima sessione.</string> <string name="perf_identity">Identità della sessione</string> <string name="perf_hostname">Nome host</string> <string name="perf_hostname_hint">Il nome con cui Steam vede questo dispositivo. Se vuoto, torna a %1$s.</string> @@ -569,6 +622,8 @@ <string name="driver_delete_plain">I suoi file vengono rimossi dall\'app.</string> <string name="driver_delete_in_use">I suoi file vengono rimossi. È in uso, quindi subentra quello predefinito.</string> <string name="drawer_page_display">Schermo</string> + <string name="drawer_frame_limit">Limite frame</string> + <string name="drawer_frame_limit_note">Limita questo gioco. Lo schermo passa a una frequenza di aggiornamento divisibile per il limite, se disponibile; altri limiti possono risultare irregolari. I giochi Steam usano il Limite frame di Steam nel menu di accesso rapido.</string> <string name="drawer_page_effects">Effetti</string> <string name="drawer_page_controls">Controlli</string> <string name="drawer_page_components">Componenti</string> @@ -593,6 +648,66 @@ <string name="drawer_hud_color_amber">Ambra</string> <string name="drawer_hud_color_violet">Viola</string> <string name="drawer_hud_opacity">Opacità</string> + <string name="hud_size">Dimensione</string> + <string name="hud_size_hint">Toccare l\'HUD ne cambia anche la dimensione.</string> + <string name="hud_size_full">Completo</string> + <string name="hud_size_tiles">Riquadri</string> + <string name="hud_size_pill">Pillola</string> + <string name="hud_size_minimal">Minimo</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> + <string name="hud_locked">Blocca in posizione</string> + <string name="hud_locked_hint">Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare.</string> + <string name="hud_snap">Aggancia ai lati</string> + <string name="hud_snap_hint">Rilascia l\'HUD e si sposta sul lato più vicino dello schermo. Un gesto rapido lo lancia in quella direzione.</string> + <string name="hud_group_look">Aspetto</string> + <string name="hud_scale">Dimensione sullo schermo</string> + <string name="hud_color_soft">Tenue</string> + <string name="hud_color_mid">Medio</string> + <string name="hud_color_vivid">Vivace</string> + <string name="hud_outline">Contorno</string> + <string name="hud_outline_color">Colore contorno</string> + <string name="hud_outline_gray">Grigio</string> + <string name="hud_outline_theme">Colore del tema</string> + <string name="hud_group_metrics">Valori</string> + <string name="hud_metric_graph">Grafico tempi fotogramma</string> + <string name="hud_metric_decimal">Frequenza fotogrammi con decimale</string> + <string name="hud_metric_low001" formatted="false">0.01% più basso</string> + <string name="hud_metric_engine">Motore grafico</string> + <string name="hud_metric_gpu_model">Nome GPU</string> + <string name="hud_metric_gpu">Carico GPU</string> + <string name="hud_metric_gpu_temp">Temperatura GPU</string> + <string name="hud_metric_cpu">Carico CPU</string> + <string name="hud_metric_per_core">CPU per core</string> + <string name="hud_metric_temp">Temperature</string> + <string name="hud_metric_ram">Memoria</string> + <string name="hud_metric_vram">Memoria grafica</string> + <string name="hud_metric_swap">Memoria swap</string> + <string name="hud_metric_battery">Livello batteria</string> + <string name="hud_metric_power">Consumo energetico</string> + <string name="hud_metric_network">Rete</string> + <string name="hud_metric_resolution">Risoluzione</string> + <string name="hud_metric_proton">Versione Proton</string> + <string name="hud_metric_session">Durata sessione</string> + <string name="hud_metric_clock">Orologio</string> + <string name="hud_group_temps">Temperature</string> + <string name="hud_temp_unit">Unità</string> + <string name="hud_temp_bands">Colori di avviso</string> + <string name="hud_temp_bands_hint">Le temperature diventano ambra, poi rosse, man mano che si avvicinano al limite.</string> + <string name="hud_temp_bands_off">Disattivato</string> + <string name="hud_temp_bands_auto">Automatico</string> + <string name="hud_temp_bands_manual">Manuale</string> + <string name="hud_temp_red_cpu">CPU in rosso da</string> + <string name="hud_temp_red_gpu">GPU in rosso da</string> + <string name="hud_temp_red_battery">Batteria in rosso da</string> + <string name="hud_group_more">Altro</string> + <string name="hud_export">Diagnostica HUD</string> + <string name="hud_export_hint">Salva in Downloads/DroidDeck un rapporto su ogni sensore letto dall\'HUD.</string> + <string name="hud_export_button">Salva</string> + <string name="hud_export_done">Salvato in %1$s</string> + <string name="hud_export_failed">Impossibile salvare il rapporto dell\'HUD.</string> + <string name="hud_reset">Ripristina impostazioni HUD</string> + <string name="hud_reset_button">Ripristina</string> <string name="drawer_scaling">Modalità di ridimensionamento</string> <string name="drawer_scaling_sharpness">Nitidezza del ridimensionamento</string> <string name="drawer_effects">Effetti schermo</string> @@ -627,10 +742,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastiera</string> <string name="drawer_latency">Latenza</string> + <string name="drawer_low_latency">Modalità bassa latenza</string> + <string name="drawer_low_latency_hint">Aumenta l\'uso di CPU e batteria</string> <string name="drawer_low_latency_controller">Controller a bassa latenza</string> <string name="drawer_low_latency_controller_hint">Il controller invia dati a 1000 Hz invece di 250 Hz. Un po\' più di CPU.</string> <string name="drawer_low_latency_touch">Touch a bassa latenza</string> <string name="drawer_low_latency_touch_hint">I tocchi saltano il raggruppamento dei frame; i controlli touch di Steam passano a 1000 Hz. Un po\' più di CPU.</string> + <string name="drawer_evdev_mouse">Canale mouse grezzo</string> + <string name="drawer_direct_cursor">Cursore</string> <string name="drawer_pc_keyboard">Tastiera PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Secondo schermo</string> @@ -718,6 +837,10 @@ <string name="setup_session">Sessione</string> <string name="setup_logs">Log della sessione</string> <string name="setup_logs_hint">Salvati dopo ogni sessione</string> + <string name="setup_game_debug_logs">Log di debug dei giochi</string> + <string name="setup_game_debug_logs_hint">Includi la diagnostica di Proton, Wine e grafica al prossimo avvio di un gioco. Può ridurre le prestazioni e occupare più spazio.</string> + <string name="setup_game_debug_logs_restart">Riavvia questa sessione per salvare i log di debug dei giochi</string> + <string name="setup_logging_update_failed">Impossibile aggiornare i log. Controlla l\'interruttore e riprova.</string> <string name="setup_agent_commands">Strumenti di debug</string> <string name="setup_latest_logs">Log dell\'ultima sessione</string> <string name="setup_saved_logs">Log delle sessioni salvati</string> @@ -742,12 +865,28 @@ <string name="setup_home_on">DroidDeck può essere l\'app Home</string> <string name="setup_home_off">DroidDeck non viene mai proposta come app Home</string> <string name="setup_orientation">Orientamento</string> + <string name="setup_launcher_orientation">Orientamento del launcher</string> + <string name="setup_launcher_orientation_auto">Segui la rotazione del dispositivo</string> + <string name="setup_orientation_portrait">Verticale</string> + <string name="setup_session_orientation">Orientamento della sessione</string> + <string name="setup_session_orientation_hint">Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; larghezza e altezza personalizzate restano come inserite.</string> <string name="setup_orientation_auto">Orizzontale automatico</string> <string name="setup_orientation_landscape">Orizzontale</string> <string name="setup_orientation_reverse">Orizzontale invertito</string> <string name="setup_fullscreen">Schermo intero</string> <string name="setup_fullscreen_on">Nasconde la barra di stato e la barra di navigazione di Android</string> <string name="setup_fullscreen_off">Mostra la barra di stato e la barra di navigazione di Android</string> + <string name="setup_dual_screen">Doppio schermo</string> + <string name="setup_dual_screen_hint">Automatico usa il secondo schermo sulle console portatili che ne hanno uno integrato. Attivo usa qualsiasi secondo schermo. Disattivo tiene tutto su un solo schermo.</string> + <string name="setup_dual_screen_auto">Automatico</string> + <string name="setup_dual_screen_on">Attivo</string> + <string name="setup_dual_screen_off">Disattivo</string> + <string name="setup_dual_screen_menu">Menu sullo schermo inferiore</string> + <string name="setup_dual_screen_menu_hint">Sposta le sezioni e il menu di gioco sul secondo schermo e si digita lì, così lo schermo superiore mantiene la vista completa. L2 e R2 cambiano sezione.</string> + <string name="setup_dual_screen_controls">Controlli sullo schermo inferiore nei giochi</string> + <string name="setup_dual_screen_controls_hint">Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione.</string> + <string name="dual_typing_title">Digitazione per lo schermo superiore</string> + <string name="dual_typing_done">Fine</string> <string name="setup_default_home">App Home predefinita</string> <string name="setup_choose_home">Scegli un\'app Home</string> <string name="setup_choose">Scegli</string> @@ -898,6 +1037,14 @@ <string name="gate_step1">Apri Impostazioni → Opzioni sviluppatore → Debug wireless e attivalo</string> <string name="gate_step2">Tocca “Accoppia dispositivo con codice di accoppiamento”</string> <string name="gate_step3">Digita il codice nella notifica di DroidDeck</string> + <string name="pairguide_build_number">In Informazioni sul telefono, tocca 7 volte Numero build</string> + <string name="pairguide_wireless">Attiva Debug wireless</string> + <string name="pairguide_pair">Apri Debug wireless, poi tocca “Accoppia dispositivo con codice di accoppiamento”</string> + <string name="pairguide_child_process">Attiva “Disattiva limitazioni per i processi secondari”</string> + <string name="pairguide_row_child_process">Disattiva limitazioni per i processi secondari</string> + <string name="pairguide_row_build_number">Numero build</string> + <string name="pairguide_row_wireless">Debug wireless</string> + <string name="pairguide_row_pair">Accoppia dispositivo con codice di accoppiamento</string> <string name="gate_waiting">In attesa del popup di accoppiamento…</string> <string name="gate_code_needed">Popup trovato. Inserisci il codice nella notifica.</string> <string name="gate_status">Stato</string> @@ -1021,8 +1168,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 +1175,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> @@ -1039,10 +1183,8 @@ <string name="games_never_played">Mai giocato</string> <string name="games_runtime_busy_percent">Runtime occupato · %1$d%%</string> <string name="games_runtime_busy">Runtime occupato</string> - <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> @@ -1057,6 +1199,9 @@ <string name="gpu_hide_other">Nascondi i driver per altre GPU</string> <string name="gpu_show_other">Mostra i driver per altre GPU</string> <string name="gpu_advanced">Avanzate</string> + <string name="gpu_ubwc_title">Compatibilità UBWC</string> + <string name="gpu_ubwc_hint">Prova Attivo o Disattivo se Steam o Android mostrano strisce o sfarfallii. Si applica a entrambi i driver dopo il riavvio di DroidDeck.</string> + <string name="gpu_ubwc_restart">Riavvia DroidDeck per applicare.</string> <string name="gpu_set_with_display">Impostato insieme al driver video: %1$s include entrambi.</string> <string name="gpu_set_with_runtime">Impostato insieme al driver del runtime: %1$s include entrambi.</string> <string name="gpu_runtime_hint">Usato dai giochi e dal desktop.</string> @@ -1111,7 +1256,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> @@ -1165,10 +1310,15 @@ <string name="pip_auto">Passa automaticamente in PiP</string> <string name="unfolded_controls">Controlli sullo schermo aperto</string> <string name="unfolded_controls_hint">Da aperto, il gioco sta sopra i trackpad e le impugnature posteriori di Steam Deck. Da chiuso, il gioco è a schermo intero.</string> + <string name="unfolded_controls_with_controller">Mantienili con un controller</string> + <string name="unfolded_controls_with_controller_hint">Mostra questi controlli touch anche quando è collegato un controller.</string> <string name="pip_suspended">Sospeso</string> <string name="pip_not_ready">Il picture in picture è disponibile quando la sessione è pronta.</string> <string name="pip_permission">Consenti il picture in picture per DroidDeck nelle impostazioni di Android.</string> <string name="pip_unavailable">Android non è riuscito ad aprire il picture in picture.</string> + <string name="game_more">Altro</string> + <string name="game_edit_art">Modifica grafica</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Scorciatoia</string> <string name="game_shortcut_add">Aggiungi alla schermata Home</string> <string name="game_shortcut_choose">Scegli gioco</string> @@ -1192,6 +1342,10 @@ <string name="main_wait_runtime">Attendi la fine dell\'operazione sul runtime</string> <string name="main_wait_proton_install">Attendi la fine dell\'installazione dello strumento di compatibilità</string> + <string name="load_compat_title">Preparazione degli strumenti di compatibilità</string> + <string name="load_compat_wait">In attesa del completamento della configurazione di compatibilità</string> + <string name="load_compat_hint">La sessione si avvierà al termine della configurazione.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Attendi la fine dell\'installazione dell\'app desktop</string> <string name="main_wait_install_game">Attendi la fine dell\'installazione prima di avviare un gioco</string> <string name="main_saves_close_session">Chiudi prima la sessione Steam, così il gioco non potrà sovrascrivere i dati importati</string> @@ -1232,6 +1386,9 @@ <string name="main_install_anyway">Installa comunque</string> <string name="main_remove_runtime_title">Rimuovi runtime Linux</string> <string name="main_remove_runtime_text">Verranno eliminati il runtime, il client Steam al suo interno e tutti i giochi installati lì.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Ripara reinstalla i file di sistema del runtime e mantiene Steam, i tuoi giochi e le impostazioni. Gli extra come il desktop si reinstallano al prossimo utilizzo. Rimuovi elimina tutto.</string> + <string name="runtime_repair">Ripara runtime</string> <string name="main_applied">Applicato: %1$s</string> <string name="android_app_open_failed_primary">Impossibile aprire %1$s sullo schermo principale</string> <string name="android_app_open_failed_on">Impossibile aprire %1$s su %2$s</string> @@ -1364,6 +1521,12 @@ <string name="session_runtime_catalog_unreachable">Impossibile raggiungere il catalogo dei runtime. Controlla la connessione e premi di nuovo Gioca.</string> <string name="session_runtime_install_failed">Il runtime Linux non è stato installato. Controlla il runtime in Configurazione e premi di nuovo Gioca.</string> <string name="session_desktop_install_failed">Il desktop non è stato installato (%1$s). Controlla la connessione e premi di nuovo Desktop.</string> + <string name="session_package_resume_failed">Impossibile completare un\'installazione interrotta (%1$s). Controlla la connessione e lo spazio, poi riprova.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Il runtime Linux è danneggiato: %1$d collegamento di libreria punta a un file mancante (%2$s), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + <item quantity="many">Il runtime Linux è danneggiato: %1$d collegamenti di libreria puntano a file mancanti (%2$s e altri), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + <item quantity="other">Il runtime Linux è danneggiato: %1$d collegamenti di libreria puntano a file mancanti (%2$s e altri), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + </plurals> <string name="session_ended_named">%1$s si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> <string name="session_ended_program">Il programma si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> <string name="session_ended_desktop">Il desktop si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> @@ -1379,6 +1542,14 @@ <string name="mode_decky_plugins_hint">Installa uno ZIP di plugin per la prossima sessione Steam.</string> <string name="mode_decky_plugin_downloading">Download…</string> <string name="mode_decky_plugin_install_zip">Installa da ZIP</string> + <string name="decky_zip_warning_title">Installazione di plugin di terze parti</string> + <string name="decky_zip_warning_text">Il team di Decky Loader non ha esaminato questo plugin. Potrebbe contenere malware, ad esempio software per rubare il tuo account Steam o danneggiare il dispositivo. Installando questo plugin, accetti di assumerti tutti i rischi per il tuo dispositivo.</string> + <string name="decky_zip_warning_continue">Continua</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Attendi %1$d secondo</item> + <item quantity="many">Attendi %1$d secondi</item> + <item quantity="other">Attendi %1$d secondi</item> + </plurals> <string name="store_cat_games">Giochi</string> <string name="store_cat_audio_video">Audio e video</string> <string name="store_cat_graphics">Grafica</string> @@ -1407,6 +1578,10 @@ <string name="theme_icon_blue_detail">Fondo nero, testo bianco, il blu per tutto ciò che è selezionato, attivo o premuto.</string> <string name="theme_electric">Blu elettrico</string> <string name="theme_electric_detail">Il blu più brillante, su superfici che tendono al blu navy invece che al grigio.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Colori che scorrono lungo l\'arcobaleno. Rispetta le impostazioni di animazione di Android.</string> + <string name="theme_rgb_speed">Velocità</string> + <string name="theme_rgb_speed_hint">Quanto velocemente cambiano i colori.</string> <string name="theme_gradient">Gradiente</string> <string name="theme_gradient_detail">I tuoi colori primario e secondario, sfumati su pulsanti ed evidenziazioni.</string> <string name="theme_gradient_primary">Primario</string> @@ -1533,7 +1708,16 @@ <string name="fm_conflict_skip">Salta</string> <string name="fm_select_this_folder">Seleziona questa cartella</string> <string name="fm_back">Indietro</string> + <string name="fm_exit">Esci</string> + <string name="fm_return_to_start">Torna alla cartella iniziale</string> + <string name="fm_start_unavailable">La cartella iniziale non è più disponibile</string> + <string name="fm_cancel_operation_title">Annullare operazione?</string> + <string name="fm_cancel_operation_confirmation">Questa operazione verrà annullata. Confermi?</string> + <string name="fm_accept">Accetta</string> + <string name="fm_decline">Rifiuta</string> <string name="fm_drive_not_readable">%1$s: montata ma al momento non leggibile</string> + <string name="fm_drive_access_title">Consenti l\'accesso a %1$s</string> + <string name="fm_drive_access_text">Android permette a DroidDeck di vedere questa unità ma non di leggerla. Attiva Accesso a tutti i file per DroidDeck, poi torna qui.</string> <string name="fm_list_view">Visualizzazione elenco</string> <string name="fm_grid_view">Visualizzazione griglia</string> <string name="fm_search">Cerca</string> @@ -1606,6 +1790,93 @@ <string name="second_mode_keyboard_trackpad">Tastiera + trackpad</string> <string name="second_mode_terminal">Terminale</string> <string name="second_mode_deck_controls">Impugnature Deck + trackpad</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Ancora niente da mostrare qui.</string> + <string name="bottom_page_downloads">Download</string> + <string name="bottom_downloads_none">Nessun download in corso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Download della cache degli shader</string> + <string name="bottom_downloads_paused">In pausa</string> + <string name="bottom_downloads_queued">In attesa di avvio</string> + <string name="bottom_page_notifications">Notifiche</string> + <string name="bottom_notifications_listener">Schermo inferiore DroidDeck</string> + <string name="bottom_notifications_why">Mostra qui messaggi e altre notifiche mentre giochi. Restano solo su questo schermo e non vengono salvate. Android lo chiede una sola volta: la sua pagina di accesso alle notifiche si apre su questo schermo; attiva DroidDeck lì e questa pagina torna da sola.</string> + <string name="bottom_notifications_allow">Consenti accesso alle notifiche</string> + <string name="bottom_notifications_none">Nessuna notifica.</string> + <string name="bottom_notifications_count">%1$d notifiche</string> + <string name="bottom_notifications_clear">Cancella</string> + <string name="bottom_page_screenshots">Screenshot</string> + <string name="stats_fps_needs_hud">Gli FPS richiedono l\'HUD attivo</string> + <string name="stats_speed">Velocità</string> + <string name="stats_pedals">Pedali</string> + <string name="stats_gforce">Forza G</string> + <string name="stats_timing">Tempi</string> + <string name="stats_best_lap">Giro migliore</string> + <string name="stats_tires">Pneumatici °C</string> + <string name="stats_trace">Acceleratore e freno, ultimi 10 s</string> + <string name="stats_speed_chart">Velocità, %1$s</string> + <string name="stats_gear">Marcia</string> + <string name="stats_speed_units">Unità di velocità</string> + <string name="stats_speed_units_auto">Automatico (%1$s)</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Acceleratore</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Spie</string> + <string name="stats_lamp_shift">Cambio marcia</string> + <string name="stats_lamp_handbrake">Freno a mano</string> + <string name="stats_lamp_pit">Limitatore pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motore %1$s °C</string> + <string name="stats_oil_temp">Olio %1$s °C</string> + <string name="stats_power">Distribuzione energia</string> + <string name="stats_fuel_t">Carburante, t</string> + <string name="stats_fuel_main">Principale %1$s t</string> + <string name="stats_fuel_reserve">Riserva %1$s t</string> + <string name="stats_tap_hint">Tocca la barra superiore o il cruscotto per cambiarne lo stile.</string> + <string name="bottom_telemetry_send_title">Invia dati al cruscotto</string> + <string name="bottom_telemetry_send_auto">Automatico</string> + <string name="bottom_telemetry_send_auto_hint">Lo attiva per ogni gioco elencato qui, compresi i giochi trovati in seguito. I giochi che disattivi restano disattivati.</string> + <string name="bottom_telemetry_send_note">Modifica l\'impostazione di output dati del gioco stesso. Ha effetto al prossimo avvio del gioco; disattivandola viene ripristinata l\'impostazione precedente.</string> + <string name="bottom_telemetry_send_close">Chiudi %1$s per modificarlo.</string> + <string name="bottom_telemetry_send_failed">Impossibile modificare le impostazioni di %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: attiva %2$s nelle impostazioni del gioco con IP 127.0.0.1 e porta %3$d.</string> + <string name="bottom_shots_where">Salvati in Pictures/DroidDeck. Qui compaiono anche gli screenshot di Steam.</string> + <string name="bottom_shots_take">Acquisisci screenshot</string> + <string name="bottom_shots_saved">Screenshot salvato.</string> + <string name="bottom_shots_failed">Impossibile acquisire uno screenshot.</string> + <string name="bottom_shots_none">Ancora nessuno screenshot.</string> + <string name="bottom_page_chat">Chat & voce</string> + <string name="bottom_chat_why">Leggi e rispondi alla chat di Steam qui mentre il gioco continua sullo schermo principale. Usa l\'account con cui è stato effettuato l\'accesso a Steam.</string> + <string name="bottom_chat_not_signed_in">Steam non ha ancora un accesso web da condividere, quindi accedi qui una volta.</string> + <string name="bottom_chat_stopped">Android ha chiuso la pagina della chat mentre DroidDeck era in background. Si riapre quando torni su DroidDeck.</string> + <string name="bottom_chat_open">Apri Steam Chat</string> + <string name="bottom_chat_close">Chiudi chat</string> + <string name="bottom_chat_mic_on">Microfono attivo</string> + <string name="bottom_chat_mic_off">Microfono disattivato</string> + <string name="bottom_chat_mic_unavailable">Il microfono è disattivato per questo gioco. Per parlare, attiva Microfono nelle impostazioni Steam di DroidDeck (Audio) e riavvia il gioco.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Statistiche di gioco</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteria</string> + <string name="bottom_telemetry_lap">Giro</string> + <string name="bottom_telemetry_position">Posizione</string> + <string name="bottom_telemetry_this_lap">Giro attuale</string> + <string name="bottom_telemetry_last_lap">Ultimo giro</string> + <string name="bottom_telemetry_fuel">Carburante</string> + <string name="bottom_telemetry_cargo">Carico</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Stato legale</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Attiva l\'output dati di un gioco di corse (spesso chiamato telemetria o UDP) per vedere qui un cruscotto in tempo reale. I dati restano su questo dispositivo.</string> + <string name="bottom_telemetry_unknown_format">La porta %1$d riceve dati (%2$d pacchetti da %3$d byte), ma in un formato che questa pagina non sa ancora leggere.</string> + <string name="bottom_telemetry_port_busy">Un altro programma usa già la porta %1$s, quindi quel gioco non può essere mostrato qui.</string> <string name="rtinst_removing">Rimozione del runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1637,6 +1908,7 @@ <string name="flatpakmgr_not_ready">Configura prima Flatpak</string> <string name="flatpakmgr_starting">Avvio</string> <string name="flatpakmgr_exit_status">Flatpak è terminato con stato %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s è compilata per %2$s, che DroidDeck non può eseguire. Qui le app Flatpak richiedono una versione per ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Installazione di %1$s</string> <string name="flatpakmgr_updating">Aggiornamento di %1$s</string> <string name="flatpakmgr_removing">Rimozione di %1$s</string> @@ -1730,6 +2002,7 @@ <string name="adbpair_applying">Applicazione dell\'impostazione…</string> <string name="adbpair_command_failed">Comando di debug wireless non riuscito</string> <string name="adbpair_channel_name">Configurazione del debug wireless</string> + <string name="adbpair_progress_channel_name">Avanzamento della configurazione del Debug wireless</string> <string name="adbpair_channel_description">Chiede il codice di accoppiamento del debug wireless mentre Impostazioni è aperto</string> <string name="adbpair_title_pair">Accoppia il debug wireless</string> <string name="adbpair_waiting_text">Attiva Debug wireless, poi tocca “Accoppia dispositivo con codice di accoppiamento”.</string> @@ -1838,6 +2111,7 @@ <string name="gpuinfo_not_adreno">Non è una GPU Adreno</string> <string name="gpuinfo_supported">Supportata</string> <string name="gpuinfo_experimental">Sperimentale: i suoi driver sono build di test</string> + <string name="gpuinfo_a850_experimental">Supporto sperimentale per Adreno 850: richiede driver di visualizzazione e di gioco sperimentali compatibili; non verificato su questo dispositivo</string> <string name="gpuinfo_below_tested">Inferiore all\'hardware testato (Adreno 725 e successive): potrebbe non funzionare</string> <string name="gpuinfo_unsupported">Non supportata: DroidDeck richiede una GPU Adreno (Snapdragon)</string> @@ -1931,10 +2205,10 @@ <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> + <string name="display_follow_screen_scaled">Scalato %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostra dettagli dispositivo</string> <string name="device_info_hide">Nascondi dettagli dispositivo</string> @@ -1949,7 +2223,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> @@ -1963,11 +2236,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> @@ -1985,9 +2256,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> @@ -2006,12 +2285,43 @@ <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> <string name="stores_sort">Ordina</string> + <string name="setup_rail_labels">Etichette della barra laterale</string> + <string name="setup_rail_labels_hint">Mostra i nomi sotto le icone della barra laterale. Disattivalo per una barra laterale più sottile.</string> + <string name="library_display">Visualizzazione</string> + <string name="library_display_larger">Schede più grandi</string> + <string name="library_display_smaller">Schede più piccole</string> + <string name="library_display_title">Mostra titolo</string> + <string name="library_display_size">Mostra dimensione</string> <string name="stores_sort_last_played">Giocate di recente</string> <string name="stores_sort_recently_installed">Installate di recente</string> <string name="stores_sort_title_asc">Titolo A–Z</string> @@ -2138,6 +2448,9 @@ <string name="stores_download_manager">Gestione download</string> <string name="stores_parallel">Download simultanei</string> <string name="stores_install_where">Installa in</string> + <string name="stores_install_language">Lingua del gioco</string> + <string name="stores_install_language_hint">GOG ed Epic installano questa lingua. Sistema segue la lingua dell\'app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Installa %1$s:</string> <string name="stores_target_internal">Interna</string> <string name="stores_target_free">%1$s liberi</string> @@ -2157,6 +2470,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> @@ -2172,6 +2486,9 @@ <string name="edit_target">Destinazione</string> <string name="edit_start_in">Avvia in</string> <string name="edit_launch_options">Opzioni di avvio</string> + <string name="edit_launch_options_steam_hint">Condivise con le Proprietà di Steam: una modifica in uno dei due punti compare in entrambi.</string> + <string name="edit_launch_options_not_saved">Impossibile salvare le opzioni di avvio in Steam. Riprova.</string> + <string name="edit_launch_options_desktop">Steam potrebbe essere aperto nella sessione desktop. Cambia le opzioni di avvio nelle sue Proprietà o chiudi prima la sessione.</string> <string name="edit_artwork">Illustrazioni</string> <string name="edit_other_exe">Altro exe…</string> <string name="edit_remove">Rimuovi</string> @@ -2301,6 +2618,7 @@ <string name="setup_download_source_custom">Prefisso personalizzato</string> <string name="setup_download_mirror">Sito</string> <string name="setup_download_prefix">Prefisso</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APP LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">App per il desktop Linux, da aprire in Desktop.</string> @@ -2443,6 +2761,22 @@ <string name="glasses_tracking_flat_hint">Con Automatico questo gioco 2D resta fisso nella vista. Scegli Schermo virtuale nella sezione Schermo per usare il tracciamento della testa.</string> <string name="glasses_tracking_sbs_hint">Il tracciamento della testa si applica a uno schermo virtuale o a un gioco SteamVR in esecuzione.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controller</string> + <string name="vr_controllers_group">Controller SteamVR</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">Le due mani VR che il tuo controller impersona. Le modifiche si applicano subito, anche mentre SteamVR è in esecuzione. I Joy-Con e le mani tracciate prendono comunque il controllo del loro lato.</string> + <string name="vr_controllers_off">Gamepad normale</string> + <string name="vr_controllers_index">Controller Valve Index</string> + <string name="vr_controllers_touch">Controller Meta Quest 3</string> + <string name="vr_controllers_vive">Controller HTC Vive</string> + <string name="vr_controllers_sticks">All\'inizio le levette</string> + <string name="vr_controllers_sticks_hint">Premi entrambe le levette insieme durante la VR per cambiare.</string> + <string name="vr_controllers_sticks_game">Ti muovono nel gioco</string> + <string name="vr_controllers_sticks_hands">Muovono le mani</string> + <string name="vr_controllers_buttons">Tasti</string> + <string name="vr_controllers_buttons_stick">I grilletti sono grilletti, i dorsali afferrano, A/B e X/Y sono i tasti frontali di ciascuna mano, il clic delle levette clicca le levette VR, Guide apre il menu SteamVR. Su e giù sulla croce direzionale avvicinano o allontanano le mani.</string> + <string name="vr_controllers_buttons_vive">Le levette fanno da trackpad; A/X o il clic di una levetta li preme. I grilletti sono grilletti, i dorsali afferrano, Start e Select fanno da menu, Guide apre il menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Nessuna mano VR. I giochi che supportano un gamepad, e il menu SteamVR, ricevono il controller come al solito.</string> <string name="glasses_brightness">Luminosità</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Oscuramento</string> @@ -2500,6 +2834,12 @@ <string name="hand_camera_placement">Posizione della fotocamera</string> <string name="hand_camera_placement_hint">Controlla che la fotocamera possa vederti prima di giocare.</string> <string name="hand_camera_check">Controlla</string> + <string name="tracking_pack_title">Download del tracciamento delle mani</string> + <string name="tracking_pack_hint">Il tracciamento delle mani richiede un download una tantum di %1$s.</string> + <string name="tracking_pack_download">Scarica</string> + <string name="tracking_pack_retry">Riprova</string> + <string name="tracking_pack_downloading">Download del tracciamento delle mani… %1$d%%</string> + <string name="tracking_pack_failed">Impossibile scaricare il tracciamento delle mani. Controlla la connessione e riprova.</string> <string name="hand_camera_check_title">Posizione della fotocamera</string> <string name="hand_camera_how_rear">Metti il dispositivo in piedi a una distanza di 1,5-2 metri, all\'altezza del petto, con la fotocamera posteriore rivolta verso di te. Poi entra nell\'inquadratura con le mani tese.</string> <string name="hand_camera_how_front">Metti il dispositivo in piedi a una distanza di 1,5-2 metri, all\'altezza del petto, con lo schermo rivolto verso di te. Poi entra nell\'inquadratura con le mani tese.</string> @@ -2582,6 +2922,21 @@ <string name="storage_safe_hint">Runtime inutilizzati, residui, vecchi log</string> <string name="storage_clean_up">Pulisci…</string> <string name="storage_session_running">Interrompi la sessione per pulire o rimuovere qualcosa. Le dimensioni restano visibili.</string> + <string name="storage_default_group">Posizione di installazione</string> + <string name="storage_default_title">Archiviazione predefinita</string> + <string name="storage_default_hint">Le nuove installazioni dai negozi vanno nella posizione selezionata. I giochi esistenti restano dove sono. Le librerie di Steam mantengono la propria impostazione.</string> + <string name="storage_default_ask">Chiedi ogni volta</string> + <string name="storage_default_ask_detail">Scegli una destinazione per ogni installazione</string> + <string name="storage_default_internal">Memoria interna</string> + <string name="storage_default_external">Memoria esterna</string> + <string name="storage_default_external_detail">%1$s · %2$s liberi</string> + <string name="storage_default_external_missing">Non collegata</string> + <string name="storage_default_folder">Cartella · %1$s</string> + <string name="storage_default_folder_free">%1$s liberi</string> + <string name="storage_default_folder_missing">Non collegata</string> + <string name="storage_default_choose_folder">Scegli cartella…</string> + <string name="storage_default_choose_folder_detail">Usa qualsiasi cartella su una scheda SD o un\'unità USB</string> + <string name="storage_default_note">I giochi vanno in una cartella Games all\'interno della posizione selezionata. I giochi esistenti non vengono spostati.</string> <string name="storage_where">Dove finisce</string> <string name="storage_games">Giochi Steam</string> <string name="storage_game_data">Dati dei giochi</string> @@ -2710,6 +3065,9 @@ <string name="storage_data_installed">Giochi installati</string> <string name="storage_data_parts">Prefisso %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Elimina shader</string> + <string name="storage_reset_prefix">Reimposta prefisso</string> + <string name="storage_reset_prefix_title">Reimpostare il prefisso di %1$s?</string> + <string name="storage_reset_prefix_confirm">Elimina il suo prefisso Wine (%1$s) in %2$s e lo ricrea al prossimo avvio. Salvataggi, impostazioni e redistribuibili installati al suo interno vanno persi; i salvataggi di Steam Cloud restano nel tuo account.</string> <string name="storage_data_leftovers">Giochi disinstallati</string> <string name="storage_steam_app">App Steam %1$d</string> <string name="storage_leftover_unsure_detail">Il suo prefisso contiene ancora file, che possono includere salvataggi locali</string> @@ -3011,6 +3369,309 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizza con Syncthing</string> + <string name="sync_enable_hint">Basata su Syncthing-Fork, è un\'implementazione di Syncthing che ti permette di sincronizzare i file del file system interno di DroidDeck con altre istanze di Syncthing. Vale solo per i file che conservi all\'interno del file system interno di DroidDeck.</string> + <string name="sync_missing">Questa build non include Syncthing.</string> + <string name="sync_starting">Avvio di Syncthing</string> + <string name="sync_status_starting">Avvio in corso</string> + <string name="sync_status_up_to_date">Aggiornato</string> + <string name="sync_status_syncing">Sincronizzazione</string> + <string name="sync_status_paused">In pausa</string> + <string name="sync_status_pausing">Messa in pausa</string> + <string name="sync_status_resuming">Ripresa in corso</string> + <string name="sync_status_attention">Richiede attenzione</string> + <string name="sync_status_failed">Syncthing si è fermato</string> + <string name="sync_failed_retry">Riprova</string> + <string name="sync_paused_wifi">In pausa fino al Wi-Fi</string> + <string name="sync_paused_game">In pausa durante il gioco</string> + <string name="sync_summary">%1$d cartelle · %2$d di %3$d dispositivi connessi</string> + <string name="sync_left">%1$s rimanenti</string> + <string name="sync_open_web_ui">Apri l\'interfaccia web</string> + <string name="sync_pause">Pausa</string> + <string name="sync_resume">Riprendi</string> + <string name="sync_running">In esecuzione</string> + <string name="sync_running_hint">Disattiva per fermare completamente Syncthing.</string> + <string name="sync_this_device">Questo dispositivo</string> + <string name="sync_device_id">ID dispositivo</string> + <string name="sync_show_qr">Mostra QR</string> + <string name="sync_advanced">Avanzate</string> + <string name="sync_advanced_hint">Porte, quando eseguire, ripristino</string> + <string name="sync_open">Apri</string> + <string name="sync_waiting">In attesa di te</string> + <string name="sync_pending_device">%1$s vuole connettersi</string> + <string name="sync_pending_folder">%1$s vuole condividere “%2$s”</string> + <string name="sync_pending_folder_hint">Accetta per scegliere dove salvarla in DroidDeck.</string> + <string name="sync_review">Controlla nell\'interfaccia web</string> + <string name="sync_folders">Cartelle</string> + <string name="sync_no_folders">Ancora nessuna cartella.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aggiornata</string> + <string name="sync_folder_syncing">Sincronizzazione %1$d%%</string> + <string name="sync_folder_scanning">Scansione</string> + <string name="sync_folder_paused">In pausa</string> + <string name="sync_folder_out_of_sync">Non sincronizzata</string> + <string name="sync_folder_errors">Impossibile sincronizzare %1$d file</string> + <string name="sync_folder_blocked">Bloccata</string> + <string name="sync_folder_blocked_hint">Questa cartella è fuori dall\'archiviazione di DroidDeck, quindi DroidDeck l\'ha messa in pausa. Per sincronizzare cartelle fuori da DroidDeck, usa l\'app Syncthing-Fork.</string> + <string name="sync_remove_folder">Rimuovi da Syncthing</string> + <string name="sync_remove_folder_hint">La rimozione non elimina alcun file.</string> + <string name="sync_devices">Dispositivi</string> + <string name="sync_no_devices">Ancora nessun dispositivo.</string> + <string name="sync_connected">Connesso</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Ultima connessione %1$s</string> + <string name="sync_device_id_title">ID di questo dispositivo</string> + <string name="sync_device_id_hint">Sull\'altro dispositivo, aggiungi un dispositivo in Syncthing e scansiona questo codice o incolla l\'ID. Poi accettalo qui nell\'interfaccia web.</string> + <string name="sync_copy">Copia</string> + <string name="sync_share">Condividi</string> + <string name="sync_done">Fatto</string> + <string name="sync_off_title">Disattivare Syncthing?</string> + <string name="sync_off_body">Syncthing si ferma ora e resta fermo finché non lo riattivi. I file sincronizzati restano dove sono.</string> + <string name="sync_off_forget">Elimina anche la configurazione di Syncthing</string> + <string name="sync_off_forget_hint">Rimuove l\'ID, le cartelle e i dispositivi di questo dispositivo. Riattivandolo si riparte da zero.</string> + <string name="sync_turn_off">Disattiva</string> + <string name="sync_ports">Porte</string> + <string name="sync_port_sync">Sincronizzazione</string> + <string name="sync_port_discovery">Rilevamento locale</string> + <string name="sync_repick">Scegli nuove porte</string> + <string name="sync_repick_hint">Ricontrollate a ogni avvio.</string> + <string name="sync_repick_button">Riscegli</string> + <string name="sync_reset_group">Ripristino</string> + <string name="sync_api_key">Chiave API</string> + <string name="sync_regenerate">Rigenera</string> + <string name="sync_reset">Ripristina Syncthing</string> + <string name="sync_reset_hint">Nuovo ID dispositivo, cartelle e dispositivi rimossi. I file nell\'archiviazione di DroidDeck vengono mantenuti.</string> + <string name="sync_reset_button">Ripristina</string> + <string name="sync_reset_confirm_title">Ripristinare Syncthing?</string> + <string name="sync_running_group">Esecuzione</string> + <string name="sync_run">Esegui</string> + <string name="sync_run_open">Mentre DroidDeck è aperto</string> + <string name="sync_run_background">In background</string> + <string name="sync_wifi_only">Solo Wi-Fi</string> + <string name="sync_pause_games">Pausa durante i giochi</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output di Syncthing per questa sessione</string> + <string name="sync_logs_share">Condividi</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura prima il runtime Linux.</string> + <string name="sync_accept">Accetta</string> + <string name="sync_accept_title">Salva “%1$s” in</string> + <string name="sync_add_folder">Aggiungi cartella</string> + <string name="sync_add_folder_hint">Sincronizza una cartella nell\'archiviazione di DroidDeck</string> + <string name="sync_choose">Scegli</string> + <string name="sync_add">Aggiungi</string> + <string name="sync_add_failed">Impossibile aggiungere la cartella.</string> + <string name="sync_share_with">Condividi con</string> + <string name="sync_share_none">Ancora nessun dispositivo. Potrai condividere questa cartella dall\'interfaccia web in seguito.</string> + <string name="sync_use_folder">Usa questa cartella</string> + <string name="sync_new_folder">Nuova cartella</string> + <string name="sync_location_home">Home del container</string> + <string name="sync_location_sync">Cartella Sync</string> + <string name="sync_location_shared">Archiviazione condivisa di DroidDeck</string> + <string name="sync_location_card">DroidDeck su %1$s</string> + <string name="sync_location_app">Dati dell\'app DroidDeck</string> + <string name="sync_web_path_locked">Le nuove cartelle vengono salvate nella cartella Sync di DroidDeck. Per sincronizzare un\'altra cartella di DroidDeck, usa Aggiungi cartella nella scheda Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Ricarica</string> + <string name="sync_not_running">Syncthing non è in esecuzione.</string> + <string name="session_end_steam_sigill">Steam si è arrestato con un\'istruzione non valida (SIGILL). Può trattarsi di un problema di compatibilità delle istruzioni della CPU o di un crash del client. Condividi i log con i dettagli del tuo dispositivo.</string> + <string name="session_end_steam_try_x64">Puoi provare Impostazioni di Steam → Client Steam → x86-64 (sperimentale). Richiede un download aggiuntivo e potrebbe essere più lento.</string> + <string name="session_end_vulkan_device">Il driver grafico Linux non ha trovato un dispositivo Vulkan utilizzabile. Verifica che il driver GPU Linux selezionato supporti questa GPU.</string> + <string name="session_end_gpu_unsupported">Questa sessione non può avviarsi perché questa GPU non ha un driver Vulkan Linux compatibile nella configurazione attuale. I driver Adreno Turnip non possono abilitare il supporto per le GPU MediaTek/Mali.</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_resources_browser">Si apre nel browser</string> + <string name="game_resource_guides">Guide</string> + <string name="game_resource_protondb_detail">Rapporti di compatibilità Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Per i giochi con salvataggi nel tuo account Steam</string> + <string name="game_resource_search">Ricerca web</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="library_filter">Filtro</string> + <string name="library_filter_installed">Solo installati</string> + <string name="library_filter_all_owned">Tutti i giochi posseduti</string> + <string name="library_no_installed_matches">Nessun gioco installato corrisponde a questi filtri.</string> + <string name="library_browse_owned">Sfoglia i giochi posseduti</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="stores_itch_updates_found">Aggiornamenti disponibili: %1$d</string> + <string name="stores_itch_update_replaced">Lo sviluppatore ha sostituito questa build con %1$s. Aggiornare a quella?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Impostazioni cloud</string> + <string name="integration_title">Integrazione con Steam</string> + <string name="integration_count">%1$d di %2$d attive</string> + <string name="integration_set_up">Configura</string> + <string name="integration_location">Posizione</string> + <string name="integration_app_info">Informazioni app</string> + <string name="integration_wifi">Nomi Wi-Fi</string> + <string name="integration_brightness">Luminosità</string> + <string name="integration_home">DroidDeck come Home</string> + <string name="integration_shortcuts">Scorciatoie del tasto Home</string> + <string name="integration_wifi_hint">Mostra le reti in Steam · richiede l\'accesso alla posizione, mai tracciata</string> + <string name="integration_wifi_on">Le reti sono visibili in Steam</string> + <string name="integration_wifi_location_off">La posizione è disattivata</string> + <string name="integration_wifi_denied">Posizione negata · consentila in Informazioni app</string> + <string name="integration_brightness_hint">Il cursore di Steam regola la luminosità dello schermo</string> + <string name="integration_home_hint">Home apre il menu di Steam durante una sessione</string> + <string name="integration_shortcuts_hint">Tieni premuto Home per le combinazioni di Steam Guide</string> + <string name="integration_shortcuts_needs_home">Richiede DroidDeck come Home</string> + <string name="integration_shortcuts_maybe_restricted">Disattivato in grigio su Android? Informazioni app → ⋮ → Consenti impostazioni con limitazioni</string> + <string name="integration_shortcuts_restricted">Bloccato da Android · Informazioni app → ⋮ → Consenti impostazioni con limitazioni</string> + <string name="integration_shortcuts_service">Tasto Home di DroidDeck</string> + <string name="integration_shortcuts_service_description">Inoltra le pressioni del tasto Home a Steam Guide mentre una sessione Steam è in primo piano e DroidDeck è l\'app Home predefinita. Non legge il contenuto dello schermo.</string> + <string name="integration_brightness_needed">Attiva Luminosità in Configurazione → Integrazione con Steam</string> + <string name="apps_search_hint">Cerca app</string> + <string name="apps_no_match">Nessuna app corrisponde a «%1$s».</string> + <string name="apps_add_widget">Aggiungi widget</string> + <string name="apps_widgets_loading">Caricamento widget…</string> + <string name="apps_widgets_none">Nessuna app su questo dispositivo offre widget.</string> + <string name="apps_widget_wider">Più largo</string> + <string name="apps_widget_narrower">Più stretto</string> + <string name="apps_widget_taller">Più alto</string> + <string name="apps_widget_shorter">Più basso</string> + <string name="apps_widget_move_earlier">Sposta prima</string> + <string name="apps_widget_move_later">Sposta dopo</string> + <string name="apps_widget_configure">Impostazioni widget</string> + <string name="apps_widget_remove">Rimuovi widget</string> + <string name="apps_add_to_folder">Aggiungi a cartella</string> + <string name="apps_new_folder">Nuova cartella</string> + <string name="apps_remove_from_folder">Rimuovi dalla cartella</string> + <string name="apps_app_info">Info app</string> + <string name="apps_uninstall">Disinstalla</string> + <string name="apps_folder_rename">Rinomina</string> + <string name="apps_folder_ungroup">Separa</string> + <string name="apps_folder_default">Cartella</string> + <string name="apps_folder_name">Nome cartella</string> + <string name="apps_filter">Mostra</string> + <string name="apps_filter_all">Tutte le app</string> + <string name="apps_filter_games">Giochi</string> + <string name="apps_filter_downloaded">Scaricate</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Nascoste</string> + <string name="apps_hide">Nascondi</string> + <string name="apps_unhide">Mostra nelle app</string> + <string name="apps_shortcut_remove">Rimuovi scorciatoia</string> + <string name="apps_pin_title">Aggiungi ad App</string> + <string name="apps_pin_add">Aggiungi</string> + <string name="apps_hidden_none">Nessuna app nascosta.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Installate di recente</string> + <string name="apps_sort_updated">Aggiornate di recente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d app</item> + <item quantity="other">%d app</item> + </plurals> + <string name="desktop_restore_title">Ripristino del software</string> + <string name="desktop_restore_body">Reinstallazione delle app che hai aggiunto dopo un aggiornamento di DroidDeck.</string> + <string name="desktop_restore_done_title">Software ripristinato</string> + <string name="desktop_restore_done_body">Le app che hai aggiunto sono di nuovo installate.</string> + <string name="desktop_restore_failed_title">Non è stato possibile ripristinare alcuni software</string> + <string name="desktop_restore_failed_body">Controlla ~/.cache/droiddeck/apt-restore.log, poi prova sudo apt install in Konsole.</string> + <string name="gog_full_files">Le ottimizzazioni native non sono disponibili. Il download include file sostitutivi completi.</string> + <string name="gog_recover">Verifica il risultato della patch</string> + <string name="slow_usb_title">Connessione USB lenta</string> + <string name="slow_usb_cable">%1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s), quindi i giochi si caricheranno lentamente. Usa un cavo USB 3 da 5 Gbps o più, prova a girare il connettore USB-C o usa un\'unità più veloce.</string> + <string name="slow_usb_port">%1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s). La porta USB di questo dispositivo non va più veloce, quindi i giochi si caricheranno lentamente. La memoria interna o una microSD potrebbero essere più veloci.</string> + <string name="slow_usb_never">Non mostrare più</string> + <string name="slow_usb_dismiss">Chiudi</string> + <string name="steam_import_title">Riavviare Steam per aggiungere i tuoi giochi?</string> + <string name="steam_import_body">Steam può mostrare come installati questi giochi che possiedi: %1$s. Deve riavviarsi per mostrarli. Riavvia ora, oppure verranno aggiunti al prossimo avvio di Steam.</string> + <string name="steam_import_names_more">%1$s e altri %2$d</string> + <string name="steam_import_now">Riavvia ora</string> + <string name="steam_import_later">Più tardi</string> + <string name="gog_maintenance">Gestisci installazione GOG</string> + <string name="gog_check">Cerca aggiornamenti</string> + <string name="gog_repair">Verifica/Ripara</string> + <string name="gog_patches">Patch offline</string> + <string name="gog_refresh">Scarica il programma di installazione offline completo</string> + <string name="gog_update">Aggiorna a %1$s</string> + <string name="gog_resume">Riprendi la manutenzione GOG</string> + <string name="gog_open_patch">Apri il programma di installazione della patch</string> + <string name="gog_patch_in_session">Completa o annulla l\'installazione della patch nella sessione Linux.</string> + <string name="gog_patch_requirements">Scegli una patch per la versione installata e la lingua. Le versioni di partenza supportate potrebbero non essere elencate.</string> + <string name="gog_no_patches">GOG non ha patch Windows autonome per questo gioco.</string> + <string name="gog_managed_files">I file di gioco modificati potrebbero essere sostituiti.</string> + <string name="gog_patch_installer_note">Il programma di installazione si apre nella sessione Linux.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Spazio aggiuntivo</string> + <string name="gog_space_estimate_label">Spazio stimato</string> + <string name="gog_repair_action">Ripara file</string> + <string name="gog_refresh_action">Aggiorna installazione</string> + <string name="gog_select_patch">Seleziona</string> + <string name="setup_all_files">Accesso a tutti i file</string> + <string name="setup_local_network">Rete locale</string> + <string name="libraries_title">Altre librerie Steam</string> + <string name="libraries_hint">Cartelle in cui Steam può installare e avviare giochi, ciascuna con il proprio nome. Rimuoverle mantiene i giochi sul disco.</string> + <string name="libraries_add">Aggiungi libreria</string> + <string name="libraries_rename_title">Nome della libreria</string> + <string name="libraries_pick">Scegli una cartella per la libreria</string> + <string name="libraries_full">Al massimo %1$d librerie aggiuntive</string> + <string name="libraries_overlap">Questa cartella è già una libreria o si trova al suo interno</string> + <string name="libraries_missing">%1$s · non disponibile</string> + <string name="libraries_applies_next">Si applica dalla prossima sessione Steam</string> + <string name="bottom_desktop_start">Avvia il desktop</string> + <string name="bottom_desktop_mode_touch">Tocco diretto</string> + <string name="bottom_desktop_trackpad">Trackpad. Tocca per il tocco diretto</string> + <string name="bottom_desktop_direct_touch">Tocco diretto. Tocca per il trackpad</string> + <string name="bottom_desktop_starting">Avvio del desktop KDE…</string> + <string name="bottom_desktop_ended">Il desktop si è chiuso.</string> + <string name="bottom_desktop_failed">Impossibile avviare il desktop. I registri si trovano nella cartella bottom-desktop di questa sessione.</string> + <string name="bottom_desktop_off">Il desktop è chiuso.</string> + <string name="libraries_rename">Rinomina</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-ja/gestures.xml b/app/src/main/res/values-ja/gestures.xml index 961a4ec21..eca0f4910 100644 --- a/app/src/main/res/values-ja/gestures.xml +++ b/app/src/main/res/values-ja/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">ジェスチャー</string> <string name="gesture_settings">タッチジェスチャーの設定</string> - <string name="gesture_settings_hint">マウスとキーボードのジェスチャーを設定します。使用するにはタッチモードで「ジェスチャー」を選択してください。</string> <string name="gesture_tap">タップ</string> <string name="gesture_drag">1本指でドラッグ</string> <string name="gesture_long_press">長押し</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">3本指で長押し</string> <string name="gesture_pinch">ピンチで拡大・縮小</string> <string name="gesture_hold_button">ボタンを押したままにする</string> + <string name="gesture_hold_left">左ボタンを押したままにする</string> + <string name="gesture_hold_right">右ボタンを押したままにする</string> <string name="gesture_click_once">1回クリック</string> <string name="gesture_hold_delay">長押しの待ち時間</string> <string name="gesture_double_delay">ダブルタップの間隔</string> diff --git a/app/src/main/res/values-ja/shortcuts.xml b/app/src/main/res/values-ja/shortcuts.xml new file mode 100644 index 000000000..6890b83d1 --- /dev/null +++ b/app/src/main/res/values-ja/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">物理ボタンのショートカット</string> + <string name="shortcuts_dd_menu">DroidDeck メニュー</string> + <string name="shortcuts_capture">割り当て:%1$s</string> + <string name="shortcuts_press">ボタンを押して離してください。割り当ては自動的に保存されます。</string> + <string name="shortcuts_release">ボタンを離して続行してください。</string> + <string name="shortcuts_detected">%1$s:%2$s</string> + <string name="shortcuts_conflict">このボタンはすでに次の操作に割り当てられています:%1$s</string> + <string name="shortcuts_save">再割り当て</string> + <string name="shortcuts_retry">別のボタンを試す</string> + <string name="shortcuts_limitations">ホームボタンや一部の追加ボタンは使用できない場合があります。</string> +</resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7b719791f..06fede7bd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12のVKD3Dオプション。nodxrはレイトレーシングを無効にします。ゲームが必要とする場合のみ使用してください。</string> <string name="game_env_proton_log">1に設定するとProtonの診断ログを生成します。ログ記録はパフォーマンスを低下させ、ストレージを消費する可能性があります。</string> <string name="game_env_wined3d">1に設定すると、D3D9~11の互換性テストのためにDXVKの代わりにOpenGLベースのWineD3Dを使用します。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1~7、およびWineD3Dで実行するゲームのレンダラー。VulkanはOpenGL-on-Zinkの経路を使わないため、Adrenoでは古いDirectDrawやDirect3D 7のゲームが大幅に高速になります。</string> + <string name="game_env_dxvk_d3d8">1に設定すると、Direct3D 8をWineD3Dの代わりにDXVKで実行します。AdrenoではAIO Graphics TestのDirect3D 8テストで高速です。</string> <string name="game_env_no_ntsync">1に設定すると、このゲームでntsync(droiddeck-ntsyncまたはカーネルドライバー)を使用しません。パックがある場合はdroiddeck-esync、ない場合はdroiddeck-fsyncを使用します。</string> <string name="game_env_no_esync">1に設定すると、このゲームでdroiddeck-esyncをオフにします。代わりにdroiddeck-fsyncを使用し、fsyncもオフの場合はdroiddeck-ntsyncを使用します。</string> <string name="game_env_no_fsync">1に設定すると、このゲームでdroiddeck-fsyncを使用しません。パックがある場合はdroiddeck-esync、ない場合はdroiddeck-ntsyncを使用します。</string> <string name="game_env_fsync_first">1に設定するとこのゲームをdroiddeck-fsyncで実行します。0に設定すると、Protonに合うパックがある場合はdroiddeck-esyncを優先します。</string> <string name="game_env_xalia">0に設定すると、このゲームのProtonコントローラーナビゲーション補助を無効にします。</string> + <string name="game_env_anticheat_offline">デフォルトでオンです。ゲームがオフラインプレイに対応している場合、Easy Anti-Cheatのゲームをアンチチートなしで起動します。オフにすると、通常どおりEasy Anti-Cheat経由で起動します。Easy Anti-Cheatが必要なオンラインモードは引き続き利用できません。</string> <string name="game_env_hud">D3D9~11のDXVKオーバーレイ。fpsはフレームレートを表示します。設定を解除するとオーバーレイが非表示になります。</string> <string name="game_env_dxvk_config">セミコロンで区切られたDXVK設定。最近のバージョンではdxvk.maxFrameRateでフレームレートを制限します。通常のプレイにはセッションフレームレートリミッターを推奨します。</string> + <string name="game_env_cores">このゲームで使用するCPUコア(例:0-4、0,2,4)。セッションのゲームコアの代わりに使用されます。コアが少ないほど発熱が抑えられます。</string> <string name="game_env_vkd3d_limit">D3D12のフレームレート制限。0で制限を無効にします。</string> <string name="game_env_glthread">Mesa OpenGLマルチスレッド。CPUに制限のあるOpenGLゲームではtrueが有効な場合があります。ゲームごとにテストしてください。</string> <string name="sync_backend_title">Wine同期</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEXはx86 LinuxプログラムをこのARM64デバイスで実行します。自動では、x86向けにビルドされたプログラムでFEXを使用します。</string> <string name="app_fex_x86">%1$s(FEX経由)</string> <string name="app_fex_not_ready">このプログラムは%1$s PC向けにビルドされており、FEX経由で実行されますが、FEXはまだセットアップされていません。ログインした状態で一度Steamを開いてください。DroidDeckがFEXと必要なSteam Linux Runtimeをダウンロードした後、このプログラムが開きます。</string> + <string name="session_proot_missing">DroidDeckのprootをダウンロードできませんでした。接続を確認して、もう一度お試しください。代替のprootではプレイするには遅すぎるため、セッションは開始されませんでした。</string> + <string name="session_directaudio_missing">DirectAudioをダウンロードできなかったため、このセッションではゲーム音声に低速な経路を使用します。</string> <string name="session_end_program">このプログラム</string> <string name="session_end_steam_download">Steamクライアントをダウンロードできませんでした。ネットワークまたはVPNがSteamのサーバーをブロックしている可能性があります。接続を確認して、もう一度お試しください。</string> <string name="session_end_steam_setup">Steamクライアントをセットアップできませんでした。接続と空き容量を確認して、もう一度お試しください。</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360コントローラー</string> <string name="mode_controller_note">Deck:クイックアクセスボタンとジャイロを提供します。Xbox 360:Guide+Aでクイックアクセスを開きます。</string> <string name="mode_back">戻る</string> + <string name="back_hold">戻る長押しでSteamショートカット</string> + <string name="back_hold_hint">戻るを長押しするとクイックアクセスを開くか、他のボタンとSteamの同時押しになります。オフにすると長押しを無視します。タップとダブルタップは引き続き使えます。</string> + <string name="back_native_qam_hint">戻るを700ミリ秒長押しするか、戻るを押したまま別のボタンを押すとSteamのショートカットを使用できます。</string> + <string name="back_double_tap_window">ダブルタップの間隔</string> + <string name="back_tap_ms">%1$dミリ秒</string> + <string name="brightness_permission_title">明るさの調整を許可</string> + <string name="brightness_permission_text">DroidDeckで明るさの調整を設定します。</string> <string name="back_menu_then_qam">メニュー → QAM</string> <string name="back_qam_then_menu">QAM → メニュー</string> <string name="mode_session">セッション</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">最新です · %1$s</string> <string name="mode_decky_loader">ローダー</string> <string name="mode_decky_install_latest">最新バージョンをインストール</string> + <string name="decky_channel">アップデートチャンネル</string> + <string name="decky_channel_hint">インストールするDecky Loaderのリリースです。Decky自身のアップデーターも同じチャンネルを使用します。</string> + <string name="decky_channel_stable">安定版</string> + <string name="decky_channel_prerelease">プレリリース版</string> + <string name="decky_channel_testing">テスト版</string> + <string name="decky_channel_failed">Deckyのアップデートチャンネルを保存できませんでした</string> <string name="mode_decky_on">Steamと共に起動します。有効にすると、このデバイス上の他のアプリがSteamを制御できる場合があります。</string> <string name="mode_decky_off">オフ。Steamのリモートデバッグポートは閉じたままになります。</string> <string name="mode_decky_remove_title">Decky Loaderをアンインストールしますか?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">Deckモードでゲームがクラッシュしたり画面が真っ暗になる場合は、これをオフにしてください。次回のセッションで有効になります。</string> <string name="mode_return_after_game">ゲーム終了後にDroidDeckへ戻る</string> <string name="mode_return_after_game_hint">DroidDeckや他のランチャーから起動したゲームを閉じると、Steamが正しく終了し(クラウドセーブの同期を先に完了)、起動元に戻ります。オフ:Steamに留まります。</string> + <string name="mode_shader_precache">シェーダーの事前キャッシュ</string> + <string name="mode_shader_precache_hint">Steamがゲーム用にビルド済みのシェーダーをダウンロードしてバックグラウンドで処理するため、ゲームのカクつきが減ります。オフにするとデータ通信量、ストレージ、バッテリーを節約できますが、ゲームはプレイ中にシェーダーをビルドします。Steamの「ダウンロード」>「シェーダーの事前キャッシュ」と同じ設定です。次回のセッションから適用されます。</string> <string name="mode_steam_repair">Steamクライアントを修復</string> <string name="mode_steam_repair_hint">次回Steamの起動時にSteamクライアントを再ダウンロードします。Steamが読み込み画面のまま進まない場合に使用してください。ゲーム、ログイン情報、設定は保持されます。</string> <string name="mode_steam_repair_queued">次回Steamの起動時にSteamクライアントを再ダウンロードします。</string> @@ -375,6 +412,8 @@ <string name="mode_directaudio_hint">PulseAudioをバイパスして遅延を減らします。</string> <string name="mode_mic">マイク</string> <string name="mode_mic_hint">ボイスチャットに使用します。</string> + <string name="drawer_mic_hint">このセッションのマイク入力をオンまたはオフにします。</string> + <string name="drawer_mic_failed">マイクを変更できませんでした。もう一度お試しください。</string> <string name="mode_network">ネットワーク</string> <string name="mode_wifi_discovery">Wi-Fi検出</string> <string name="mode_wifi_discovery_hint">SteamにWi-Fi名と付近のネットワークを表示します。</string> @@ -535,14 +574,24 @@ <string name="perf_gsrealtime">gamescope:リアルタイムGPUキュー</string> <string name="perf_gsrealtime_hint">コンポジタのGPU作業の優先度を上げます。フレームタイムの安定性が向上する場合がありますが、ゲームのパフォーマンスの一部を消費します。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">メモリ</string> + <string name="perf_cap_off">オフ</string> + <string name="perf_cap_auto">ドライバーのデフォルト</string> + <string name="perf_zram_client">ゲーム実行中はSteamを圧縮</string> + <string name="perf_zram_client_hint">ゲーム開始の20秒後、SteamクライアントをzRAMに圧縮してゲームに使えるメモリを増やし、ゲーム終了時に読み戻します。ゲーム開始直後にセッションが終了する場合はオフにしてください。上のRAM上限を設定している場合は、セッションが上限を超えるとSteamは引き続き圧縮されます。</string> + <string name="perf_ram_cap">RAM上限</string> + <string name="perf_ram_cap_hint">Steamモードでもデスクトップからでも、Steamクライアントの実行中に適用されます。セッションの使用量がこの値を超えると、Steam、次にセッション内の対応する他のプロセスがzRAMに圧縮されます。ソフトな上限のため何も終了されませんが、ページの読み戻し中にゲームがカクつくことがあります。</string> + <string name="perf_ram_cap_unavailable">zRAMスワップが必要ですが、このデバイスにはありません。</string> + <string name="perf_vram_cap">VRAM上限</string> + <string name="perf_vram_cap_hint">DXVKがDirect3Dゲームに報告するビデオメモリ量です。ゲームはこれに合わせてテクスチャ量を抑えます。ゲーム独自のDXVK設定が優先されます。次回のセッションから有効になります。</string> <string name="perf_gpuclock">GPUを最高クロックに保つ</string> <string name="perf_gpuclock_hint">Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。</string> <string name="perf_fixes">セッション修正</string> <string name="perf_sysmem">Turnip:sysmemレンダリング</string> <string name="perf_sysmem_hint">Steamクライアントが高速になります。ゲームではドライバーがパスごとにタイルレンダリングとシステムメモリレンダリングを選びます。Adreno 710/720/722では必須です。</string> <string name="perf_xalia">Steamのxalia補助をスキップ</string> - <string name="perf_fastsync">droiddeck-ntsync(実験的)</string> - <string name="perf_fastsync_hint">Linuxのntsyncドライバーをユーザー空間で代替するテスト用機能です。オンの間、Protonはdroiddeck-esyncとdroiddeck-fsyncの代わりにこれを使用します。Proton Experimental ARM64、GE-Proton、proton-cachyosで動作します。次回のセッションで有効になります。</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Linuxのntsyncドライバーをユーザー空間で代替する機能です。オンの間、Protonはdroiddeck-esyncとdroiddeck-fsyncの代わりにこれを使用します。Proton Experimental ARM64、GE-Proton、proton-cachyosで動作します。次回のセッションで有効になります。</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsyncを優先</string> <string name="perf_fsync_hint">futex_waitvをユーザー空間で提供し、標準のProtonファイルのままProton自身のfsyncを実行します。パックが不要なため、SteamがProtonを更新してもすぐに動作し続けます。オンの間、Protonがfsyncを使わない一部のゲームを除き、ゲームはdroiddeck-esyncよりこちらを優先します。次回のセッションで有効になります。</string> @@ -553,6 +602,8 @@ <string name="perf_fastpath">prootファストパス</string> <string name="perf_fastpath_needs_seccomp">prootのseccompフィルターが必要です。</string> <string name="perf_fastpath_hint">ファイル検索が速くなり、スタッターが減ります。プログラムがファイルを見つけられない場合は、これをオフにしてください。</string> + <string name="perf_cursor_composite">gamescope内でカーソルを描画</string> + <string name="perf_cursor_composite_hint">ポインターをAndroidに任せず、Gamescope自身が描画します。コントローラーで操作するカーソルにはオンにしてください。スマートフォンではオフの方が高速です。次回のセッションから適用されます。</string> <string name="perf_identity">セッションの識別情報</string> <string name="perf_hostname">ホスト名</string> <string name="perf_hostname_hint">Steamがこのデバイスを認識する名前。空にすると%1$sに戻ります。</string> @@ -567,6 +618,8 @@ <string name="driver_delete_plain">ファイルがアプリから削除されます。</string> <string name="driver_delete_in_use">ファイルが削除されます。使用中のため、デフォルトのドライバーに切り替わります。</string> <string name="drawer_page_display">表示</string> + <string name="drawer_frame_limit">フレームレート制限</string> + <string name="drawer_frame_limit_note">このゲームのフレームレートを制限します。上限で割り切れるリフレッシュレートがあれば画面はそれに切り替わり、それ以外の上限では表示が不均一になることがあります。SteamゲームではクイックアクセスメニューにあるSteamのフレームレート制限を使用します。</string> <string name="drawer_page_effects">エフェクト</string> <string name="drawer_page_controls">コントロール</string> <string name="drawer_page_components">コンポーネント</string> @@ -591,6 +644,66 @@ <string name="drawer_hud_color_amber">アンバー</string> <string name="drawer_hud_color_violet">バイオレット</string> <string name="drawer_hud_opacity">不透明度</string> + <string name="hud_size">サイズ</string> + <string name="hud_size_hint">HUDをタップしてもサイズを切り替えられます。</string> + <string name="hud_size_full">フル</string> + <string name="hud_size_tiles">タイル</string> + <string name="hud_size_pill">カプセル</string> + <string name="hud_size_minimal">ミニマル</string> + <string name="hud_size_mega">メガ</string> + <string name="hud_size_strip">バー</string> + <string name="hud_locked">位置を固定</string> + <string name="hud_locked_hint">HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。</string> + <string name="hud_snap">左右に吸着</string> + <string name="hud_snap_hint">HUD を離すと、画面の近い方の端に移動します。はじくとその方向へ飛びます。</string> + <string name="hud_group_look">外観</string> + <string name="hud_scale">画面上のサイズ</string> + <string name="hud_color_soft">ソフト</string> + <string name="hud_color_mid">標準</string> + <string name="hud_color_vivid">ビビッド</string> + <string name="hud_outline">アウトライン</string> + <string name="hud_outline_color">アウトラインの色</string> + <string name="hud_outline_gray">グレー</string> + <string name="hud_outline_theme">テーマカラー</string> + <string name="hud_group_metrics">表示項目</string> + <string name="hud_metric_graph">フレームタイムグラフ</string> + <string name="hud_metric_decimal">フレームレートの小数表示</string> + <string name="hud_metric_low001" formatted="false">0.01%最低値</string> + <string name="hud_metric_engine">グラフィックスエンジン</string> + <string name="hud_metric_gpu_model">GPU名</string> + <string name="hud_metric_gpu">GPU使用率</string> + <string name="hud_metric_gpu_temp">GPU温度</string> + <string name="hud_metric_cpu">CPU使用率</string> + <string name="hud_metric_per_core">コアごとのCPU</string> + <string name="hud_metric_temp">温度</string> + <string name="hud_metric_ram">メモリ</string> + <string name="hud_metric_vram">グラフィックスメモリ</string> + <string name="hud_metric_swap">スワップ</string> + <string name="hud_metric_battery">バッテリー残量</string> + <string name="hud_metric_power">消費電力</string> + <string name="hud_metric_network">ネットワーク</string> + <string name="hud_metric_resolution">解像度</string> + <string name="hud_metric_proton">Protonバージョン</string> + <string name="hud_metric_session">セッション時間</string> + <string name="hud_metric_clock">時計</string> + <string name="hud_group_temps">温度</string> + <string name="hud_temp_unit">単位</string> + <string name="hud_temp_bands">警告色</string> + <string name="hud_temp_bands_hint">温度が上限に近づくと、アンバー、次に赤で表示されます。</string> + <string name="hud_temp_bands_off">オフ</string> + <string name="hud_temp_bands_auto">自動</string> + <string name="hud_temp_bands_manual">手動</string> + <string name="hud_temp_red_cpu">CPUを赤にする温度</string> + <string name="hud_temp_red_gpu">GPUを赤にする温度</string> + <string name="hud_temp_red_battery">バッテリーを赤にする温度</string> + <string name="hud_group_more">その他</string> + <string name="hud_export">HUD診断</string> + <string name="hud_export_hint">HUDが読み取るすべてのセンサーのレポートをDownloads/DroidDeckに保存します。</string> + <string name="hud_export_button">保存</string> + <string name="hud_export_done">%1$s に保存しました</string> + <string name="hud_export_failed">HUDレポートを保存できませんでした。</string> + <string name="hud_reset">HUD設定をリセット</string> + <string name="hud_reset_button">リセット</string> <string name="drawer_scaling">スケーリングモード</string> <string name="drawer_scaling_sharpness">スケーリングのシャープネス</string> <string name="drawer_effects">画面エフェクト</string> @@ -625,10 +738,14 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">キーボード</string> <string name="drawer_latency">遅延</string> + <string name="drawer_low_latency">低遅延モード</string> + <string name="drawer_low_latency_hint">CPUとバッテリーの使用量が増えます</string> <string name="drawer_low_latency_controller">低遅延コントローラー</string> <string name="drawer_low_latency_controller_hint">コントローラーが 250 Hz ではなく 1000 Hz で報告されます。CPU 使用率がわずかに上がります。</string> <string name="drawer_low_latency_touch">低遅延タッチ</string> <string name="drawer_low_latency_touch_hint">タッチはフレームの結合を省略し、Steam のタッチは 1000 Hz で報告されます。CPU 使用率がわずかに上がります。</string> + <string name="drawer_evdev_mouse">生のマウス経路</string> + <string name="drawer_direct_cursor">カーソル</string> <string name="drawer_pc_keyboard">PCキーボード</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">セカンドスクリーン</string> @@ -714,6 +831,10 @@ <string name="setup_session">セッション</string> <string name="setup_logs">セッションログ</string> <string name="setup_logs_hint">各セッション終了後に保存</string> + <string name="setup_game_debug_logs">ゲームのデバッグログ</string> + <string name="setup_game_debug_logs_hint">次回のゲーム起動時にProton、Wine、グラフィックスの診断情報を含めます。パフォーマンスが低下し、ストレージを多く使用する場合があります。</string> + <string name="setup_game_debug_logs_restart">ゲームのデバッグログを保存するにはこのセッションを再起動してください</string> + <string name="setup_logging_update_failed">ログ設定を更新できませんでした。スイッチを確認して、もう一度お試しください。</string> <string name="setup_agent_commands">デバッグツール</string> <string name="setup_latest_logs">最新のセッションログ</string> <string name="setup_saved_logs">保存されたセッションログ</string> @@ -746,12 +867,28 @@ <string name="setup_home_on">DroidDeckをホームアプリとして使用できます</string> <string name="setup_home_off">DroidDeckはホームアプリとして提供されません</string> <string name="setup_orientation">画面の向き</string> + <string name="setup_launcher_orientation">ランチャーの向き</string> + <string name="setup_launcher_orientation_auto">デバイスの回転に合わせる</string> + <string name="setup_orientation_portrait">縦向き</string> + <string name="setup_session_orientation">セッションの向き</string> + <string name="setup_session_orientation_hint">Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、カスタムの幅と高さは入力したとおりになります。</string> <string name="setup_orientation_auto">横向き(自動回転)</string> <string name="setup_orientation_landscape">横向き</string> <string name="setup_orientation_reverse">横向き(反転)</string> <string name="setup_fullscreen">全画面</string> <string name="setup_fullscreen_on">Androidのステータスバーとナビゲーションバーを非表示</string> <string name="setup_fullscreen_off">Androidのステータスバーとナビゲーションバーを表示</string> + <string name="setup_dual_screen">デュアル画面</string> + <string name="setup_dual_screen_hint">自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。</string> + <string name="setup_dual_screen_auto">自動</string> + <string name="setup_dual_screen_on">オン</string> + <string name="setup_dual_screen_off">オフ</string> + <string name="setup_dual_screen_menu">下画面メニュー</string> + <string name="setup_dual_screen_menu_hint">セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。</string> + <string name="setup_dual_screen_controls">ゲーム中の下画面コントロール</string> + <string name="setup_dual_screen_controls_hint">セッション開始時に2画面目にトラックパッドとキーボードを開きます。</string> + <string name="dual_typing_title">上画面に入力中</string> + <string name="dual_typing_done">完了</string> <string name="setup_default_home">デフォルトのホームアプリ</string> <string name="setup_choose_home">ホームアプリを選択</string> <string name="setup_choose">選択</string> @@ -896,6 +1033,14 @@ <string name="gate_step1">設定 → 開発者向けオプション → ワイヤレスデバッグを開き、オンにする</string> <string name="gate_step2">「ペアリングコードでデバイスをペア設定」をタップ</string> <string name="gate_step3">DroidDeckの通知にペアリングコードを入力</string> + <string name="pairguide_build_number">「デバイス情報」で「ビルド番号」を7回タップします</string> + <string name="pairguide_wireless">「ワイヤレス デバッグ」をオンにします</string> + <string name="pairguide_pair">「ワイヤレス デバッグ」を開き、「ペア設定コードによるデバイスのペア設定」をタップします</string> + <string name="pairguide_child_process">「子プロセスの制限を無効にする」をオンにします</string> + <string name="pairguide_row_child_process">子プロセスの制限を無効にする</string> + <string name="pairguide_row_build_number">ビルド番号</string> + <string name="pairguide_row_wireless">ワイヤレス デバッグ</string> + <string name="pairguide_row_pair">ペア設定コードによるデバイスのペア設定</string> <string name="gate_waiting">ペアリングのポップアップを待機中…</string> <string name="gate_code_needed">ポップアップが見つかりました。表示されたペアリングコードを通知に入力してください。</string> <string name="gate_status">ステータス</string> @@ -1019,8 +1164,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 +1171,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> @@ -1037,10 +1179,8 @@ <string name="games_never_played">未プレイ</string> <string name="games_runtime_busy_percent">実行環境は使用中 · %1$d%%</string> <string name="games_runtime_busy">実行環境は使用中</string> - <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> @@ -1055,6 +1195,9 @@ <string name="gpu_hide_other">他のGPUのドライバーを非表示</string> <string name="gpu_show_other">他のGPUのドライバーを表示</string> <string name="gpu_advanced">詳細設定</string> + <string name="gpu_ubwc_title">UBWC互換性</string> + <string name="gpu_ubwc_hint">SteamやAndroidで縞模様やちらつきが出る場合は、オンまたはオフを試してください。DroidDeckの再起動後、両方のドライバーに適用されます。</string> + <string name="gpu_ubwc_restart">適用するにはDroidDeckを再起動してください。</string> <string name="gpu_set_with_display">ディスプレイドライバーと一緒に設定:%1$s は両方を含みます。</string> <string name="gpu_set_with_runtime">ランタイムドライバーと一緒に設定:%1$s は両方を含みます。</string> <string name="gpu_runtime_hint">ゲームとデスクトップで使用されます。</string> @@ -1109,7 +1252,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> @@ -1163,10 +1306,15 @@ <string name="pip_auto">自動でピクチャーインピクチャー</string> <string name="unfolded_controls">開いた状態の画面のコントロール</string> <string name="unfolded_controls_hint">開いた状態では、ゲームがSteam Deckのトラックパッドと背面グリップの上に表示されます。折りたたんだ状態では、ゲームが全画面で表示されます。</string> + <string name="unfolded_controls_with_controller">コントローラー接続時も表示</string> + <string name="unfolded_controls_with_controller_hint">コントローラーが接続されている間も、これらのタッチ操作を表示します。</string> <string name="pip_suspended">一時停止中</string> <string name="pip_not_ready">セッションの準備ができたらピクチャーインピクチャーを使用できます。</string> <string name="pip_permission">Android設定でDroidDeckのピクチャーインピクチャーを許可してください。</string> <string name="pip_unavailable">Androidがピクチャーインピクチャーを開けませんでした。</string> + <string name="game_more">その他</string> + <string name="game_edit_art">アートを編集</string> + <string name="stores_in_steam_label">Steamに追加済み</string> <string name="game_shortcut">ショートカット</string> <string name="game_shortcut_add">ホーム画面に追加</string> <string name="game_shortcut_choose">ゲームを選択</string> @@ -1190,6 +1338,10 @@ <string name="main_wait_runtime">実行環境の処理が完了するまでお待ちください</string> <string name="main_wait_proton_install">互換性ツールのインストールが完了するまでお待ちください</string> + <string name="load_compat_title">互換性ツールを準備しています</string> + <string name="load_compat_wait">互換性のセットアップが完了するのを待っています</string> + <string name="load_compat_hint">セットアップが完了するとセッションが開始します。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">デスクトップアプリのインストールが完了するまでお待ちください</string> <string name="main_wait_install_game">インストールが完了してからゲームを起動してください</string> <string name="main_saves_close_session">インポートしたデータがゲームに上書き保存されないよう、先にSteamセッションを終了してください</string> @@ -1222,6 +1374,9 @@ <string name="main_install_anyway">インストールする</string> <string name="main_remove_runtime_title">Linux実行環境を削除</string> <string name="main_remove_runtime_text">実行環境、その中のSteamクライアント、そこにインストールされたすべてのゲームが削除されます。</string> + <string name="runtime_actions_title">Linux実行環境</string> + <string name="runtime_actions_text">「修復」は実行環境のシステムファイルを再インストールし、Steam、ゲーム、設定は保持します。デスクトップなどの追加機能は、次に使用するときに再度インストールされます。「削除」はすべてを消去します。</string> + <string name="runtime_repair">実行環境を修復</string> <string name="main_applied">適用しました:%1$s</string> <string name="android_app_open_failed_primary">メイン画面で%1$sを開けませんでした</string> <string name="android_app_open_failed_on">%2$sで%1$sを開けませんでした</string> @@ -1348,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">実行環境のカタログに接続できませんでした。接続を確認して、もう一度Playをタップしてください。</string> <string name="session_runtime_install_failed">Linux実行環境をインストールできませんでした。「設定」で実行環境を確認して、もう一度Playをタップしてください。</string> <string name="session_desktop_install_failed">デスクトップをインストールできませんでした(%1$s)。接続を確認して、もう一度「デスクトップ」をタップしてください。</string> + <string name="session_package_resume_failed">中断されたインストールを完了できませんでした(%1$s)。接続と空き容量を確認して、もう一度お試しください。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux実行環境が破損しています。%1$d個のライブラリリンクが存在しないファイルを指しています(%2$sなど)。通常はインストールが中断された後に発生します。修復してもゲームと設定は保持されます。</item> + </plurals> <string name="session_ended_named">%1$sが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> <string name="session_ended_program">プログラムが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> <string name="session_ended_desktop">デスクトップが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> @@ -1361,6 +1520,12 @@ <string name="mode_decky_plugins_hint">次回のSteamセッション用にプラグインのzipをインストールします。</string> <string name="mode_decky_plugin_downloading">ダウンロード中…</string> <string name="mode_decky_plugin_install_zip">zipからインストール</string> + <string name="decky_zip_warning_title">サードパーティ製プラグインのインストール</string> + <string name="decky_zip_warning_text">このプラグインはDecky Loaderチームによる審査を受けていません。Steamアカウントを盗んだりデバイスに害を与えたりするソフトウェアなど、マルウェアが含まれている可能性があります。このプラグインをインストールすることで、デバイスに関するすべてのリスクを負うことに同意したものとみなされます。</string> + <string name="decky_zip_warning_continue">続行</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">%1$d秒お待ちください</item> + </plurals> <string name="store_cat_games">ゲーム</string> <string name="store_cat_audio_video">オーディオ・ビデオ</string> <string name="store_cat_graphics">グラフィック</string> @@ -1389,6 +1554,10 @@ <string name="theme_icon_blue_detail">黒の背景に白の文字、選択・フォーカス・押下時には青を使用します。</string> <string name="theme_electric">エレクトリックネイビー</string> <string name="theme_electric_detail">より明るい青を、グレーではなくネイビー寄りの画面に使用します。</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">虹色に変化し続けるカラー。Android のアニメーション設定に従います。</string> + <string name="theme_rgb_speed">速度</string> + <string name="theme_rgb_speed_hint">色が切り替わる速さ。</string> <string name="theme_gradient">グラデーション</string> <string name="theme_gradient_detail">自分で選んだプライマリとセカンダリの色を、ボタンやハイライトにグラデーションで使います。</string> <string name="theme_gradient_primary">プライマリ</string> @@ -1505,7 +1674,16 @@ <string name="fm_conflict_skip">スキップ</string> <string name="fm_select_this_folder">このフォルダを選択</string> <string name="fm_back">戻る</string> + <string name="fm_exit">終了</string> + <string name="fm_return_to_start">開始フォルダーに戻る</string> + <string name="fm_start_unavailable">開始フォルダーは利用できなくなりました</string> + <string name="fm_cancel_operation_title">操作をキャンセルしますか?</string> + <string name="fm_cancel_operation_confirmation">操作がキャンセルされます。よろしいですか?</string> + <string name="fm_accept">承諾</string> + <string name="fm_decline">拒否</string> <string name="fm_drive_not_readable">%1$sはマウントされていますが、現在読み取れません</string> + <string name="fm_drive_access_title">%1$sへのアクセスを許可</string> + <string name="fm_drive_access_text">Android では DroidDeck がこのドライブを表示できますが、読み取れません。DroidDeck の「全ファイルへのアクセス」をオンにしてから戻ってください。</string> <string name="fm_list_view">リスト表示</string> <string name="fm_grid_view">グリッド表示</string> <string name="fm_search">検索</string> @@ -1576,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">キーボード + トラックパッド</string> <string name="second_mode_terminal">ターミナル</string> <string name="second_mode_deck_controls">Deckグリップ + トラックパッド</string> + <string name="second_mode_dashboard">ダッシュボード</string> + <string name="bottom_dashboard_empty">まだ表示するものはありません。</string> + <string name="bottom_page_downloads">ダウンロード</string> + <string name="bottom_downloads_none">実行中のダウンロードはありません。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">シェーダーキャッシュをダウンロード中</string> + <string name="bottom_downloads_paused">一時停止中</string> + <string name="bottom_downloads_queued">開始待ち</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck下部画面</string> + <string name="bottom_notifications_why">プレイ中、メッセージなどの通知をここに表示します。通知はこの画面にのみ表示され、保存されません。Androidによる確認は一度だけです。この画面に通知へのアクセスのページが開くので、そこでDroidDeckをオンにすると、このページに自動的に戻ります。</string> + <string name="bottom_notifications_allow">通知へのアクセスを許可</string> + <string name="bottom_notifications_none">通知はありません。</string> + <string name="bottom_notifications_count">%1$d件の通知</string> + <string name="bottom_notifications_clear">クリア</string> + <string name="bottom_page_screenshots">スクリーンショット</string> + <string name="stats_fps_needs_hud">FPSの表示にはHUDをオンにする必要があります</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">ペダル</string> + <string name="stats_gforce">Gフォース</string> + <string name="stats_timing">タイム</string> + <string name="stats_best_lap">ベストラップ</string> + <string name="stats_tires">タイヤ °C</string> + <string name="stats_trace">スロットルとブレーキ(直近10 s)</string> + <string name="stats_speed_chart">速度(%1$s)</string> + <string name="stats_gear">ギア</string> + <string name="stats_speed_units">速度の単位</string> + <string name="stats_speed_units_auto">自動(%1$s)</string> + <string name="stats_steam_client_arm">Steamクライアント ARM</string> + <string name="stats_steam_client_x86">Steamクライアント x86</string> + <string name="stats_throttle">スロットル</string> + <string name="stats_brake">ブレーキ</string> + <string name="stats_lights">インジケーター</string> + <string name="stats_lamp_shift">シフト</string> + <string name="stats_lamp_handbrake">サイドブレーキ</string> + <string name="stats_lamp_pit">ピットリミッター</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">ターボ %1$s bar</string> + <string name="stats_engine_temp">エンジン %1$s °C</string> + <string name="stats_oil_temp">油温 %1$s °C</string> + <string name="stats_power">パワーディストリビューター</string> + <string name="stats_fuel_t">燃料(t)</string> + <string name="stats_fuel_main">メイン %1$s t</string> + <string name="stats_fuel_reserve">予備 %1$s t</string> + <string name="stats_tap_hint">上部のバーまたはダッシュをタップすると、表示スタイルを変更できます。</string> + <string name="bottom_telemetry_send_title">ダッシュボード用データを送信</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">ここに表示されているすべてのゲーム(後から見つかったゲームを含む)でオンにします。オフにしたゲームはオフのままです。</string> + <string name="bottom_telemetry_send_note">ゲーム自体のデータ出力設定を変更します。次回ゲームを起動したときに反映されます。オフにすると元の設定に戻ります。</string> + <string name="bottom_telemetry_send_close">変更するには%1$sを終了してください。</string> + <string name="bottom_telemetry_send_failed">%1$sの設定を変更できませんでした。</string> + <string name="bottom_telemetry_send_menu">%1$s:ゲームの設定で%2$sをオンにし、IP 127.0.0.1、ポート%3$dを指定してください。</string> + <string name="bottom_shots_where">Pictures/DroidDeckに保存されます。Steamのスクリーンショットもここに表示されます。</string> + <string name="bottom_shots_take">スクリーンショットを撮る</string> + <string name="bottom_shots_saved">スクリーンショットを保存しました。</string> + <string name="bottom_shots_failed">スクリーンショットを撮れませんでした。</string> + <string name="bottom_shots_none">スクリーンショットはまだありません。</string> + <string name="bottom_page_chat">チャット&ボイス</string> + <string name="bottom_chat_why">ゲームをメイン画面で実行したまま、ここでSteamチャットを読んで返信できます。Steamにサインインしているアカウントを使用します。</string> + <string name="bottom_chat_not_signed_in">Steamにはまだ共有できるWebサインインがないため、ここで一度サインインしてください。</string> + <string name="bottom_chat_stopped">DroidDeckがバックグラウンドにある間に、Androidがチャットページを閉じました。DroidDeckに戻ると再度開きます。</string> + <string name="bottom_chat_open">Steamチャットを開く</string> + <string name="bottom_chat_close">チャットを閉じる</string> + <string name="bottom_chat_mic_on">マイク オン</string> + <string name="bottom_chat_mic_off">マイク オフ</string> + <string name="bottom_chat_mic_unavailable">このゲームではマイクがオフです。話すには、DroidDeckのSteam設定(オーディオ)でマイクをオンにして、ゲームを再起動してください。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">ゲーム内統計</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">バッテリー</string> + <string name="bottom_telemetry_lap">ラップ</string> + <string name="bottom_telemetry_position">順位</string> + <string name="bottom_telemetry_this_lap">現在のラップ</string> + <string name="bottom_telemetry_last_lap">前回のラップ</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">積荷</string> + <string name="bottom_telemetry_pips">電力配分 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法的状態</string> + <string name="bottom_telemetry_balance">残高</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">レースゲームのデータ出力(テレメトリーやUDPと呼ばれることが多い)をオンにすると、ここにライブダッシュが表示されます。データはこのデバイス内にとどまります。</string> + <string name="bottom_telemetry_unknown_format">ポート%1$dでデータを受信していますが(%3$dバイトのパケット%2$d個)、このページではまだ読み取れない形式です。</string> + <string name="bottom_telemetry_port_busy">別のプログラムがすでにポート%1$sを使用しているため、そのゲームはここに表示できません。</string> <string name="rtinst_removing">Linux実行環境を削除中</string> <plurals name="rtinst_removing_entries"> @@ -1605,6 +1870,7 @@ <string name="flatpakmgr_not_ready">先にFlatpakをセットアップしてください</string> <string name="flatpakmgr_starting">開始中</string> <string name="flatpakmgr_exit_status">Flatpakがステータス%1$dで終了しました</string> + <string name="flatpakmgr_wrong_arch">%1$s は DroidDeck で実行できない %2$s 向けにビルドされています。ここでは Flatpak アプリに ARM64 または x86_64 版が必要です。</string> <string name="flatpakmgr_installing">%1$sをインストール中</string> <string name="flatpakmgr_updating">%1$sを更新中</string> <string name="flatpakmgr_removing">%1$sを削除中</string> @@ -1698,6 +1964,7 @@ <string name="adbpair_applying">設定を適用中…</string> <string name="adbpair_command_failed">ワイヤレスデバッグのコマンドに失敗しました</string> <string name="adbpair_channel_name">ワイヤレスデバッグのセットアップ</string> + <string name="adbpair_progress_channel_name">ワイヤレスデバッグのセットアップ状況</string> <string name="adbpair_channel_description">設定を開いている間、ワイヤレスデバッグのペアリングコードを入力するよう求めます</string> <string name="adbpair_title_pair">ワイヤレスデバッグのペアリング</string> <string name="adbpair_waiting_text">ワイヤレスデバッグをオンにして、「ペアリングコードでデバイスをペア設定」をタップしてください。</string> @@ -1806,6 +2073,7 @@ <string name="gpuinfo_not_adreno">Adreno GPUではありません</string> <string name="gpuinfo_supported">サポート対象</string> <string name="gpuinfo_experimental">実験的:ドライバーはテストビルドです</string> + <string name="gpuinfo_a850_experimental">Adreno 850の実験的サポート:互換性のある実験版のディスプレイドライバーとゲームドライバーが必要です。このデバイスでは未検証です</string> <string name="gpuinfo_below_tested">テスト済みハードウェア(Adreno 725以降)未満:動作しない可能性があります</string> <string name="gpuinfo_unsupported">サポート対象外:DroidDeckにはAdreno(Snapdragon)GPUが必要です</string> @@ -1899,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">スケール %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">デバイスの詳細を表示</string> <string name="device_info_hide">デバイスの詳細を非表示</string> @@ -1917,7 +2185,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> @@ -1931,11 +2198,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> @@ -1953,9 +2218,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> @@ -1974,12 +2247,43 @@ <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> <string name="stores_sort">並べ替え</string> + <string name="setup_rail_labels">サイドバーのラベル</string> + <string name="setup_rail_labels_hint">サイドバーのアイコンの下に名前を表示します。オフにするとサイドバーが細くなります。</string> + <string name="library_display">表示</string> + <string name="library_display_larger">大きいカード</string> + <string name="library_display_smaller">小さいカード</string> + <string name="library_display_title">タイトルを表示</string> + <string name="library_display_size">サイズを表示</string> <string name="stores_sort_last_played">最近プレイ</string> <string name="stores_sort_recently_installed">最近インストール</string> <string name="stores_sort_title_asc">タイトル A–Z</string> @@ -2106,6 +2410,9 @@ <string name="stores_download_manager">ダウンロードマネージャー</string> <string name="stores_parallel">同時ダウンロード数</string> <string name="stores_install_where">インストール先</string> + <string name="stores_install_language">ゲームの言語</string> + <string name="stores_install_language_hint">GOGとEpicはこの言語でインストールします。「システム」はアプリの言語に従います。</string> + <string name="stores_install_language_system">システム</string> <string name="stores_install_title">%1$sをインストール:</string> <string name="stores_target_internal">内部ストレージ</string> <string name="stores_target_free">空き %1$s</string> @@ -2128,6 +2435,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> @@ -2143,6 +2451,9 @@ <string name="edit_target">ターゲット</string> <string name="edit_start_in">開始フォルダ</string> <string name="edit_launch_options">起動オプション</string> + <string name="edit_launch_options_steam_hint">Steam のプロパティと共通です。どちらかで変更すると両方に反映されます。</string> + <string name="edit_launch_options_not_saved">起動オプションを Steam に保存できませんでした。もう一度お試しください。</string> + <string name="edit_launch_options_desktop">デスクトップのセッションで Steam が開いている可能性があります。Steam のプロパティで起動オプションを変更するか、先にセッションを終了してください。</string> <string name="edit_artwork">アートワーク</string> <string name="edit_other_exe">別の exe…</string> <string name="edit_remove">削除</string> @@ -2268,6 +2579,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="flathub_eyebrow">Linuxアプリ</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linuxデスクトップ用のアプリ。「デスクトップ」から開きます。</string> @@ -2406,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">「自動」では、この 2D ゲームは視界の中で固定されます。ヘッドトラッキングを使うには、「表示」で「仮想スクリーン」を選んでください。</string> <string name="glasses_tracking_sbs_hint">ヘッドトラッキングは、仮想スクリーンまたは実行中の SteamVR ゲームに適用されます。</string> <string name="glasses_hardware">デバイス</string> + <string name="vr_controllers_tab">コントローラー</string> + <string name="vr_controllers_group">SteamVRコントローラー</string> + <string name="vr_controllers_emulate">VRでのゲームパッド</string> + <string name="vr_controllers_emulate_hint">コントローラーが担当する2つのVRの手です。変更はSteamVRの実行中でもすぐに反映されます。Joy-Conやトラッキングされた手は、引き続きそれぞれの側を優先して操作します。</string> + <string name="vr_controllers_off">通常のゲームパッド</string> + <string name="vr_controllers_index">Valve Indexコントローラー</string> + <string name="vr_controllers_touch">Meta Quest 3コントローラー</string> + <string name="vr_controllers_vive">HTC Viveワンド</string> + <string name="vr_controllers_sticks">スティックの初期動作</string> + <string name="vr_controllers_sticks_hint">VR中に両方のスティックを同時に押し込むと切り替わります。</string> + <string name="vr_controllers_sticks_game">ゲーム内で移動</string> + <string name="vr_controllers_sticks_hands">手を動かす</string> + <string name="vr_controllers_buttons">ボタン</string> + <string name="vr_controllers_buttons_stick">トリガーはトリガー、バンパーはグリップ、A/BとX/Yはそれぞれの手のフェイスボタン、スティック押し込みはサムスティックのクリック、ガイドボタンはSteamVRメニューを開きます。十字キーの上下で手を近づけたり遠ざけたりします。</string> + <string name="vr_controllers_buttons_vive">スティックはトラックパッドとして動作し、A/Xまたはスティック押し込みで押します。トリガーはトリガー、バンパーはグリップ、StartとSelectはメニュー、ガイドボタンはSteamVRメニューを開きます。</string> + <string name="vr_controllers_buttons_off">VRの手はありません。ゲームパッドに対応したゲームとSteamVRメニューでは、通常どおりコントローラーを使用できます。</string> <string name="glasses_brightness">明るさ</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">サンブロック</string> @@ -2463,6 +2791,12 @@ <string name="hand_camera_placement">カメラの位置</string> <string name="hand_camera_placement_hint">プレイ前に、カメラにあなたが映っているか確認してください。</string> <string name="hand_camera_check">確認</string> + <string name="tracking_pack_title">ハンドトラッキングのダウンロード</string> + <string name="tracking_pack_hint">ハンドトラッキングには%1$sの1回限りのダウンロードが必要です。</string> + <string name="tracking_pack_download">ダウンロード</string> + <string name="tracking_pack_retry">再試行</string> + <string name="tracking_pack_downloading">ハンドトラッキングをダウンロード中… %1$d%%</string> + <string name="tracking_pack_failed">ハンドトラッキングをダウンロードできませんでした。接続を確認して、もう一度お試しください。</string> <string name="hand_camera_check_title">カメラの位置</string> <string name="hand_camera_how_rear">デバイスを胸の高さくらいで1.5〜2m離れたところに立て、背面カメラがあなたの方を向くようにしてください。そのあと、手を広げて画面内に入ってください。</string> <string name="hand_camera_how_front">デバイスを胸の高さくらいで1.5〜2m離れたところに立て、画面があなたの方を向くようにしてください。そのあと、手を広げて画面内に入ってください。</string> @@ -2534,6 +2868,21 @@ <string name="storage_safe_hint">未使用のランタイム、残留、古いログ</string> <string name="storage_clean_up">クリーンアップ…</string> <string name="storage_session_running">セッションを停止するとクリーンアップや削除ができます。容量は引き続き表示されます。</string> + <string name="storage_default_group">インストール先</string> + <string name="storage_default_title">デフォルトのストレージ</string> + <string name="storage_default_hint">ストアからの新しいインストールは選択した場所に保存されます。既存のゲームはそのままです。Steamライブラリは独自の設定を使用します。</string> + <string name="storage_default_ask">毎回確認する</string> + <string name="storage_default_ask_detail">インストールごとに保存先を選択します</string> + <string name="storage_default_internal">内部ストレージ</string> + <string name="storage_default_external">外部ストレージ</string> + <string name="storage_default_external_detail">%1$s · 空き %2$s</string> + <string name="storage_default_external_missing">未接続</string> + <string name="storage_default_folder">フォルダー · %1$s</string> + <string name="storage_default_folder_free">空き %1$s</string> + <string name="storage_default_folder_missing">未接続</string> + <string name="storage_default_choose_folder">フォルダーを選択…</string> + <string name="storage_default_choose_folder_detail">SDカードやUSBドライブの任意のフォルダーを使用します</string> + <string name="storage_default_note">ゲームは選択した場所の中のGamesフォルダーに保存されます。既存のゲームは移動されません。</string> <string name="storage_where">使用内訳</string> <string name="storage_games">Steam ゲーム</string> <string name="storage_game_data">ゲームデータ</string> @@ -2655,6 +3004,9 @@ <string name="storage_data_installed">インストール済みゲーム</string> <string name="storage_data_parts">プレフィックス %1$s · シェーダー %2$s · ワークショップ %3$s</string> <string name="storage_clear_shaders">シェーダーを削除</string> + <string name="storage_reset_prefix">プレフィックスをリセット</string> + <string name="storage_reset_prefix_title">%1$sのプレフィックスをリセットしますか?</string> + <string name="storage_reset_prefix_confirm">%2$s内のWineプレフィックス(%1$s)を削除し、次回の起動時に再作成します。その中のセーブデータ、設定、インストール済みの再頒布可能パッケージは失われます。Steam Cloudのセーブデータはアカウントに残ります。</string> <string name="storage_data_leftovers">アンインストールしたゲーム</string> <string name="storage_steam_app">Steam アプリ %1$d</string> <string name="storage_leftover_unsure_detail">プレフィックスにファイルが残っており、ローカルのセーブデータが含まれる可能性があります</string> @@ -2954,6 +3306,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthingで同期</string> + <string name="sync_enable_hint">Syncthing-ForkをベースにしたSyncthingの実装で、DroidDeckの内部ファイルシステム内のファイルを他のSyncthingインスタンスと同期できます。DroidDeckの内部ファイルシステム内に保存しているファイル専用です。</string> + <string name="sync_missing">このビルドにはSyncthingが含まれていません。</string> + <string name="sync_starting">Syncthingを起動中</string> + <string name="sync_status_starting">起動中</string> + <string name="sync_status_up_to_date">最新</string> + <string name="sync_status_syncing">同期中</string> + <string name="sync_status_paused">一時停止中</string> + <string name="sync_status_pausing">一時停止しています</string> + <string name="sync_status_resuming">再開しています</string> + <string name="sync_status_attention">要確認</string> + <string name="sync_status_failed">Syncthingが停止しました</string> + <string name="sync_failed_retry">再試行</string> + <string name="sync_paused_wifi">Wi-Fi接続まで一時停止中</string> + <string name="sync_paused_game">ゲーム中は一時停止中</string> + <string name="sync_summary">%1$d個のフォルダ · %3$d台中%2$d台のデバイスが接続中</string> + <string name="sync_left">残り%1$s</string> + <string name="sync_open_web_ui">Web UIを開く</string> + <string name="sync_pause">一時停止</string> + <string name="sync_resume">再開</string> + <string name="sync_running">実行中</string> + <string name="sync_running_hint">オフにするとSyncthingを完全に停止します。</string> + <string name="sync_this_device">このデバイス</string> + <string name="sync_device_id">デバイスID</string> + <string name="sync_show_qr">QRコードを表示</string> + <string name="sync_advanced">詳細設定</string> + <string name="sync_advanced_hint">ポート、実行タイミング、リセット</string> + <string name="sync_open">開く</string> + <string name="sync_waiting">確認待ち</string> + <string name="sync_pending_device">%1$sが接続を求めています</string> + <string name="sync_pending_folder">%1$sが「%2$s」を共有しようとしています</string> + <string name="sync_pending_folder_hint">承認すると、DroidDeck内の保存先を選択できます。</string> + <string name="sync_review">Web UIで確認</string> + <string name="sync_folders">フォルダ</string> + <string name="sync_no_folders">フォルダはまだありません。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">最新</string> + <string name="sync_folder_syncing">同期中 %1$d%%</string> + <string name="sync_folder_scanning">スキャン中</string> + <string name="sync_folder_paused">一時停止中</string> + <string name="sync_folder_out_of_sync">未同期</string> + <string name="sync_folder_errors">%1$d個のファイルを同期できませんでした</string> + <string name="sync_folder_blocked">ブロック済み</string> + <string name="sync_folder_blocked_hint">このフォルダはDroidDeckのストレージ外にあるため、DroidDeckが一時停止しました。DroidDeck外のフォルダを同期するには、Syncthing-Forkアプリを使用してください。</string> + <string name="sync_remove_folder">Syncthingから削除</string> + <string name="sync_remove_folder_hint">削除してもファイルは消去されません。</string> + <string name="sync_devices">デバイス</string> + <string name="sync_no_devices">デバイスはまだありません。</string> + <string name="sync_connected">接続中</string> + <string name="sync_offline">オフライン</string> + <string name="sync_last_seen">最終接続:%1$s</string> + <string name="sync_device_id_title">このデバイスのID</string> + <string name="sync_device_id_hint">もう一方のデバイスのSyncthingでデバイスを追加し、このコードをスキャンするかIDを貼り付けてください。その後、ここのWeb UIで承認してください。</string> + <string name="sync_copy">コピー</string> + <string name="sync_share">共有</string> + <string name="sync_done">完了</string> + <string name="sync_off_title">Syncthingをオフにしますか?</string> + <string name="sync_off_body">Syncthingはすぐに停止し、再びオンにするまで停止したままになります。同期済みのファイルはそのまま残ります。</string> + <string name="sync_off_forget">Syncthingの設定も削除</string> + <string name="sync_off_forget_hint">このデバイスのID、フォルダ、デバイスを削除します。再びオンにすると最初からやり直しになります。</string> + <string name="sync_turn_off">オフにする</string> + <string name="sync_ports">ポート</string> + <string name="sync_port_sync">同期</string> + <string name="sync_port_discovery">ローカル探索</string> + <string name="sync_repick">新しいポートを選択</string> + <string name="sync_repick_hint">起動のたびに再確認されます。</string> + <string name="sync_repick_button">選び直す</string> + <string name="sync_reset_group">リセット</string> + <string name="sync_api_key">APIキー</string> + <string name="sync_regenerate">再生成</string> + <string name="sync_reset">Syncthingをリセット</string> + <string name="sync_reset_hint">デバイスIDが新しくなり、フォルダとデバイスは削除されます。DroidDeckのストレージ内のファイルは保持されます。</string> + <string name="sync_reset_button">リセット</string> + <string name="sync_reset_confirm_title">Syncthingをリセットしますか?</string> + <string name="sync_running_group">実行</string> + <string name="sync_run">実行タイミング</string> + <string name="sync_run_open">DroidDeckを開いている間</string> + <string name="sync_run_background">バックグラウンドで</string> + <string name="sync_wifi_only">Wi-Fiのみ</string> + <string name="sync_pause_games">ゲーム中は一時停止</string> + <string name="sync_logs">ログ</string> + <string name="sync_logs_hint">このセッションのSyncthing出力</string> + <string name="sync_logs_share">共有</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">先にLinux実行環境をセットアップしてください。</string> + <string name="sync_accept">承認</string> + <string name="sync_accept_title">「%1$s」の保存先</string> + <string name="sync_add_folder">フォルダを追加</string> + <string name="sync_add_folder_hint">DroidDeckのストレージ内のフォルダを同期</string> + <string name="sync_choose">選択</string> + <string name="sync_add">追加</string> + <string name="sync_add_failed">フォルダを追加できませんでした。</string> + <string name="sync_share_with">共有先</string> + <string name="sync_share_none">デバイスはまだありません。このフォルダは後でWeb UIから共有できます。</string> + <string name="sync_use_folder">このフォルダを使用</string> + <string name="sync_new_folder">新しいフォルダ</string> + <string name="sync_location_home">コンテナのホーム</string> + <string name="sync_location_sync">Syncフォルダ</string> + <string name="sync_location_shared">DroidDeckの共有ストレージ</string> + <string name="sync_location_card">%1$s上のDroidDeck</string> + <string name="sync_location_app">DroidDeckのアプリデータ</string> + <string name="sync_web_path_locked">新しいフォルダはDroidDeckのSyncフォルダに保存されます。DroidDeckの別のフォルダを同期するには、「Syncthing」タブの「フォルダを追加」を使用してください。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">再読み込み</string> + <string name="sync_not_running">Syncthingは実行されていません。</string> + <string name="session_end_steam_sigill">Steamが不正な命令(SIGILL)で停止しました。CPU命令の互換性の問題か、クライアントのクラッシュの可能性があります。デバイスの詳細とあわせてログを共有してください。</string> + <string name="session_end_steam_try_x64">Steamの設定 → Steamクライアント → x86-64(試験運用)を試すことができます。追加のダウンロードが必要で、動作が遅くなる場合があります。</string> + <string name="session_end_vulkan_device">Linuxグラフィックスドライバーが使用可能なVulkanデバイスを見つけられませんでした。選択したLinux GPUドライバーがこのGPUに対応しているか確認してください。</string> + <string name="session_end_gpu_unsupported">現在の構成ではこのGPUに対応するLinux Vulkanドライバーがないため、このセッションを開始できません。Adreno TurnipドライバーではMediaTek/Mali GPUに対応させることはできません。</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_resources_browser">ブラウザで開きます</string> + <string name="game_resource_guides">ガイド</string> + <string name="game_resource_protondb_detail">Linux / Protonの互換性レポート</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Steamアカウントにセーブデータがあるゲーム向け</string> + <string name="game_resource_search">ウェブ検索</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="library_filter">フィルター</string> + <string name="library_filter_installed">インストール済みのみ</string> + <string name="library_filter_all_owned">所有するすべてのゲーム</string> + <string name="library_no_installed_matches">フィルターに一致するインストール済みのゲームはありません。</string> + <string name="library_browse_owned">所有するゲームを見る</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="stores_itch_updates_found">利用可能なアップデート: %1$d</string> + <string name="stores_itch_update_replaced">開発者がこのビルドを %1$s に置き換えました。更新しますか?</string> + <string name="xbox_filter_cloud">クラウド</string> + <string name="stores_xbox_cloud_settings">クラウド設定</string> + <string name="integration_title">Steam連携</string> + <string name="integration_count">%2$d件中%1$d件がオン</string> + <string name="integration_set_up">セットアップ</string> + <string name="integration_location">位置情報</string> + <string name="integration_app_info">アプリ情報</string> + <string name="integration_wifi">Wi-Fi名</string> + <string name="integration_brightness">明るさ</string> + <string name="integration_home">DroidDeckをホームに設定</string> + <string name="integration_shortcuts">ホームボタンのショートカット</string> + <string name="integration_wifi_hint">Steamにネットワークを表示 · 位置情報へのアクセスが必要ですが、追跡はしません</string> + <string name="integration_wifi_on">Steamにネットワークが表示されます</string> + <string name="integration_wifi_location_off">位置情報がオフです</string> + <string name="integration_wifi_denied">位置情報が拒否されています · アプリ情報で許可してください</string> + <string name="integration_brightness_hint">Steamのスライダーで画面の明るさを調整します</string> + <string name="integration_home_hint">セッション中はホームでSteamメニューを開きます</string> + <string name="integration_shortcuts_hint">ホームを長押しでSteamガイドの同時押し操作を使用</string> + <string name="integration_shortcuts_needs_home">DroidDeckをホームに設定する必要があります</string> + <string name="integration_shortcuts_maybe_restricted">Androidでグレー表示されていますか?アプリ情報 → ⋮ → 制限付き設定を許可</string> + <string name="integration_shortcuts_restricted">Androidによってブロックされています · アプリ情報 → ⋮ → 制限付き設定を許可</string> + <string name="integration_shortcuts_service">DroidDeckホームボタン</string> + <string name="integration_shortcuts_service_description">Steamセッションがフォーカスされ、DroidDeckがデフォルトのホームアプリの場合に、ホームボタンの操作をSteamガイドに渡します。画面のコンテンツは読み取りません。</string> + <string name="integration_brightness_needed">「セットアップ」→「Steam連携」で明るさをオンにしてください</string> + <string name="apps_search_hint">アプリを検索</string> + <string name="apps_no_match">「%1$s」に一致するアプリはありません。</string> + <string name="apps_add_widget">ウィジェットを追加</string> + <string name="apps_widgets_loading">ウィジェットを読み込み中…</string> + <string name="apps_widgets_none">このデバイスにはウィジェットを提供するアプリがありません。</string> + <string name="apps_widget_wider">幅を広く</string> + <string name="apps_widget_narrower">幅を狭く</string> + <string name="apps_widget_taller">高く</string> + <string name="apps_widget_shorter">低く</string> + <string name="apps_widget_move_earlier">前へ移動</string> + <string name="apps_widget_move_later">後ろへ移動</string> + <string name="apps_widget_configure">ウィジェットの設定</string> + <string name="apps_widget_remove">ウィジェットを削除</string> + <string name="apps_add_to_folder">フォルダに追加</string> + <string name="apps_new_folder">新しいフォルダ</string> + <string name="apps_remove_from_folder">フォルダから削除</string> + <string name="apps_app_info">アプリ情報</string> + <string name="apps_uninstall">アンインストール</string> + <string name="apps_folder_rename">名前を変更</string> + <string name="apps_folder_ungroup">グループを解除</string> + <string name="apps_folder_default">フォルダ</string> + <string name="apps_folder_name">フォルダ名</string> + <string name="apps_filter">表示</string> + <string name="apps_filter_all">すべてのアプリ</string> + <string name="apps_filter_games">ゲーム</string> + <string name="apps_filter_downloaded">ダウンロード済み</string> + <string name="apps_filter_system">システム</string> + <string name="apps_filter_hidden">非表示</string> + <string name="apps_hide">非表示にする</string> + <string name="apps_unhide">アプリに表示</string> + <string name="apps_shortcut_remove">ショートカットを削除</string> + <string name="apps_pin_title">アプリに追加</string> + <string name="apps_pin_add">追加</string> + <string name="apps_hidden_none">非表示のアプリはありません。</string> + <string name="apps_sort_name_asc">名前 A–Z</string> + <string name="apps_sort_name_desc">名前 Z–A</string> + <string name="apps_sort_installed">最近インストール</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個のアプリ</item> + </plurals> + <string name="desktop_restore_title">ソフトウェアを復元しています</string> + <string name="desktop_restore_body">DroidDeck の更新後、追加したアプリを再インストールしています。</string> + <string name="desktop_restore_done_title">ソフトウェアを復元しました</string> + <string name="desktop_restore_done_body">追加したアプリが再びインストールされました。</string> + <string name="desktop_restore_failed_title">一部のソフトウェアを復元できませんでした</string> + <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log を確認してから、Konsole で sudo apt install を試してください。</string> + <string name="gog_full_files">ネイティブの最適化は利用できません。ダウンロードには置き換え用の完全なファイルが含まれます。</string> + <string name="gog_recover">パッチの結果を検証</string> + <string name="slow_usb_title">USB 接続が低速です</string> + <string name="slow_usb_cable">%1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されているため、ゲームの読み込みが遅くなります。5 Gbps 以上の USB 3 ケーブルを使うか、USB-C プラグを裏返すか、より高速なドライブを使ってください。</string> + <string name="slow_usb_port">%1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されています。この端末の USB ポートはこれ以上速くならないため、ゲームの読み込みが遅くなります。内部ストレージや microSD カードの方が速い場合があります。</string> + <string name="slow_usb_never">今後表示しない</string> + <string name="slow_usb_dismiss">閉じる</string> + <string name="steam_import_title">ゲームを追加するために Steam を再起動しますか?</string> + <string name="steam_import_body">所有している次のゲームを Steam でインストール済みとして表示できます: %1$s。表示するには Steam の再起動が必要です。今すぐ再起動するか、次に Steam を起動したときに追加されます。</string> + <string name="steam_import_names_more">%1$s ほか %2$d 件</string> + <string name="steam_import_now">今すぐ再起動</string> + <string name="steam_import_later">後で</string> + <string name="gog_maintenance">GOGのインストールを管理</string> + <string name="gog_check">アップデートを確認</string> + <string name="gog_repair">検証/修復</string> + <string name="gog_patches">オフラインパッチ</string> + <string name="gog_refresh">完全なオフラインインストーラーをダウンロード</string> + <string name="gog_update">%1$sにアップデート</string> + <string name="gog_resume">GOGのメンテナンスを再開</string> + <string name="gog_open_patch">パッチインストーラーを開く</string> + <string name="gog_patch_in_session">Linuxセッションでパッチインストーラーを完了するかキャンセルしてください。</string> + <string name="gog_patch_requirements">インストール済みのバージョンと言語に合うパッチを選択してください。対応する適用元バージョンが表示されない場合があります。</string> + <string name="gog_no_patches">GOGにはこのゲーム用の単体Windowsパッチがありません。</string> + <string name="gog_managed_files">変更したゲームファイルは置き換えられる場合があります。</string> + <string name="gog_patch_installer_note">インストーラーはLinuxセッションで開きます。</string> + <string name="gog_download_label">ダウンロード</string> + <string name="gog_space_label">追加の容量</string> + <string name="gog_space_estimate_label">容量の見積もり</string> + <string name="gog_repair_action">ファイルを修復</string> + <string name="gog_refresh_action">インストールを更新</string> + <string name="gog_select_patch">選択</string> + <string name="setup_all_files">すべてのファイルへのアクセス</string> + <string name="setup_local_network">ローカルネットワーク</string> + <string name="libraries_title">追加のSteamライブラリ</string> + <string name="libraries_hint">Steamでゲームをインストールして起動できるフォルダーです。それぞれに名前を付けられます。リストから削除してもディスク上のゲームは残ります。</string> + <string name="libraries_add">ライブラリを追加</string> + <string name="libraries_rename_title">ライブラリ名</string> + <string name="libraries_pick">ライブラリのフォルダーを選択</string> + <string name="libraries_full">追加できるライブラリは最大%1$d個です</string> + <string name="libraries_overlap">このフォルダーは既にライブラリか、その中にあります</string> + <string name="libraries_missing">%1$s · 利用不可</string> + <string name="libraries_applies_next">次のSteamセッションから適用</string> + <string name="bottom_desktop_start">デスクトップを起動</string> + <string name="bottom_desktop_mode_touch">直接タッチ</string> + <string name="bottom_desktop_trackpad">トラックパッド。タップして直接タッチに切り替え</string> + <string name="bottom_desktop_direct_touch">直接タッチ。タップしてトラックパッドに切り替え</string> + <string name="bottom_desktop_starting">KDEデスクトップを起動中…</string> + <string name="bottom_desktop_ended">デスクトップが終了しました。</string> + <string name="bottom_desktop_failed">デスクトップを起動できませんでした。ログはこのセッションのbottom-desktopフォルダーにあります。</string> + <string name="bottom_desktop_off">デスクトップは終了しています。</string> + <string name="libraries_rename">名前を変更</string> + <string name="second_mode_desktop">デスクトップ</string> + <string name="bottom_desktop_mode_trackpad">トラックパッド</string> + <string name="bottom_desktop_title">デスクトップ · %1$s</string> </resources> diff --git a/app/src/main/res/values-ko/gestures.xml b/app/src/main/res/values-ko/gestures.xml index 9f32380c4..adae0128d 100644 --- a/app/src/main/res/values-ko/gestures.xml +++ b/app/src/main/res/values-ko/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">제스처</string> <string name="gesture_settings">터치 제스처 설정</string> - <string name="gesture_settings_hint">마우스와 키보드 제스처를 맞춤 설정합니다. 사용하려면 터치 모드에서 제스처를 선택하세요.</string> <string name="gesture_tap">탭</string> <string name="gesture_drag">한 손가락 드래그</string> <string name="gesture_long_press">길게 누르기</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">세 손가락 길게 누르기</string> <string name="gesture_pinch">손가락을 모으거나 벌려 확대/축소</string> <string name="gesture_hold_button">버튼을 누른 상태로 유지</string> + <string name="gesture_hold_left">왼쪽 버튼을 누른 상태로 유지</string> + <string name="gesture_hold_right">오른쪽 버튼을 누른 상태로 유지</string> <string name="gesture_click_once">한 번 클릭</string> <string name="gesture_hold_delay">길게 누르기 대기 시간</string> <string name="gesture_double_delay">두 번 탭 간격</string> diff --git a/app/src/main/res/values-ko/shortcuts.xml b/app/src/main/res/values-ko/shortcuts.xml new file mode 100644 index 000000000..dd0457f4a --- /dev/null +++ b/app/src/main/res/values-ko/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">물리 버튼 바로가기</string> + <string name="shortcuts_dd_menu">DroidDeck 메뉴</string> + <string name="shortcuts_capture">지정: %1$s</string> + <string name="shortcuts_press">버튼을 눌렀다 놓으세요. 할당은 자동으로 저장됩니다.</string> + <string name="shortcuts_release">계속하려면 버튼을 놓으세요.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">이 버튼은 이미 다음 동작에 지정되어 있습니다: %1$s</string> + <string name="shortcuts_save">다시 할당</string> + <string name="shortcuts_retry">다른 버튼 시도</string> + <string name="shortcuts_limitations">홈 버튼과 일부 추가 버튼은 사용할 수 없을 수 있습니다.</string> +</resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0ea3c7b1b..4a97faa5b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12의 VKD3D 옵션. nodxr은 레이 트레이싱을 비활성화합니다. 게임에서 필요할 때만 사용하세요.</string> <string name="game_env_proton_log">1로 설정하면 Proton 진단 로그를 생성합니다. 로깅은 성능을 저하시키고 저장 공간을 차지할 수 있습니다.</string> <string name="game_env_wined3d">1로 설정하면 D3D9–11 호환성 테스트를 위해 DXVK 대신 OpenGL 기반 WineD3D를 사용합니다.</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 및 WineD3D로 실행되는 게임의 렌더러입니다. Vulkan은 OpenGL-on-Zink 경로를 건너뛰므로 Adreno에서 오래된 DirectDraw 및 Direct3D 7 게임이 훨씬 빠릅니다.</string> + <string name="game_env_dxvk_d3d8">1로 설정하면 Direct3D 8을 WineD3D 대신 DXVK로 실행합니다. Adreno에서 AIO Graphics Test의 Direct3D 8 테스트가 더 빠릅니다.</string> <string name="game_env_no_ntsync">1로 설정하면 이 게임에서 ntsync(droiddeck-ntsync 또는 커널 드라이버)를 사용하지 않습니다. 팩이 있으면 droiddeck-esync를, 없으면 droiddeck-fsync를 사용합니다.</string> <string name="game_env_no_esync">1로 설정하면 이 게임에서 droiddeck-esync를 끕니다. 대신 droiddeck-fsync를 사용하며, fsync도 꺼져 있으면 droiddeck-ntsync를 사용합니다.</string> <string name="game_env_no_fsync">1로 설정하면 이 게임에서 droiddeck-fsync를 사용하지 않습니다. 팩이 있으면 droiddeck-esync를, 없으면 droiddeck-ntsync를 사용합니다.</string> <string name="game_env_fsync_first">1로 설정하면 이 게임을 droiddeck-fsync로 실행합니다. 0으로 설정하면 해당 Proton에 맞는 팩이 있을 때 droiddeck-esync를 우선 사용합니다.</string> <string name="game_env_xalia">0으로 설정하면 이 게임에 대해 Proton의 컨트롤러 탐색 도우미를 비활성화합니다.</string> + <string name="game_env_anticheat_offline">기본적으로 켜져 있습니다. 게임이 오프라인 플레이를 지원하면 Easy Anti-Cheat 게임을 안티치트 없이 시작합니다. 끄면 평소처럼 Easy Anti-Cheat를 통해 실행합니다. Easy Anti-Cheat가 필요한 온라인 모드는 계속 사용할 수 없습니다.</string> <string name="game_env_hud">D3D9–11의 DXVK 오버레이. fps는 프레임 속도를 표시합니다. 설정을 해제하면 오버레이가 숨겨집니다.</string> <string name="game_env_dxvk_config">세미콜론으로 구분된 DXVK 설정. 최신 버전은 dxvk.maxFrameRate를 사용하여 프레임 속도를 제한합니다. 일상적인 플레이에는 세션 프레임 속도 제한기를 사용하는 것이 좋습니다.</string> + <string name="game_env_cores">이 게임에 사용할 CPU 코어(예: 0-4 또는 0,2,4)로, 세션의 게임 코어 대신 사용됩니다. 코어가 적을수록 발열이 줄어듭니다.</string> <string name="game_env_vkd3d_limit">D3D12 프레임 속도 제한. 0은 제한을 비활성화합니다.</string> <string name="game_env_glthread">Mesa OpenGL 멀티스레딩. CPU에 제한된 OpenGL 게임에서 true가 도움이 될 수 있습니다. 게임별로 테스트하세요.</string> <string name="sync_backend_title">Wine 동기화</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX는 이 ARM64 기기에서 x86 Linux 프로그램을 실행합니다. 자동으로 설정하면 x86용으로 빌드된 프로그램에 FEX를 사용합니다.</string> <string name="app_fex_x86">FEX로 실행되는 %1$s</string> <string name="app_fex_not_ready">이 프로그램은 %1$s PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설정되지 않았습니다. 로그인한 상태로 Steam을 한 번 열면 DroidDeck이 FEX와 필요한 Steam Linux Runtime을 다운로드한 후 이 프로그램을 엽니다.</string> + <string name="session_proot_missing">DroidDeck의 proot를 다운로드할 수 없습니다. 연결을 확인하고 다시 시도하세요. 대체 proot는 플레이하기에 너무 느리므로 세션을 시작하지 않았습니다.</string> + <string name="session_directaudio_missing">DirectAudio를 다운로드할 수 없어 이번 세션에서는 게임 오디오가 더 느린 경로를 사용합니다.</string> <string name="session_end_program">이 프로그램</string> <string name="session_end_steam_download">Steam 클라이언트를 다운로드할 수 없습니다. 네트워크나 VPN이 Steam 서버를 차단하고 있을 수 있습니다. 연결을 확인하고 다시 시도하세요.</string> <string name="session_end_steam_setup">Steam 클라이언트를 설정할 수 없습니다. 연결과 남은 저장 공간을 확인한 뒤 다시 시도하세요.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 컨트롤러</string> <string name="mode_controller_note">Deck: 빠른 액세스 버튼과 자이로스코프를 제공합니다. Xbox 360: Guide+A로 빠른 액세스를 엽니다.</string> <string name="mode_back">뒤로</string> + <string name="back_hold">뒤로 길게 눌러 Steam 단축키</string> + <string name="back_hold_hint">뒤로를 길게 누르면 빠른 실행이 열리거나 다른 버튼과 Steam 조합이 됩니다. 끄면 길게 누르기를 무시합니다. 탭과 두 번 탭은 계속 작동합니다.</string> + <string name="back_native_qam_hint">뒤로 버튼을 700ms 동안 누르거나, 뒤로 버튼을 누른 채 다른 버튼을 누르면 Steam 단축키를 사용할 수 있습니다.</string> + <string name="back_double_tap_window">두 번 탭 간격</string> + <string name="back_tap_ms">%1$dms</string> + <string name="brightness_permission_title">밝기 제어 허용</string> + <string name="brightness_permission_text">DroidDeck에서 밝기 제어를 설정하세요.</string> <string name="back_menu_then_qam">메뉴 → QAM</string> <string name="back_qam_then_menu">QAM → 메뉴</string> <string name="mode_session">세션</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">최신 버전 · %1$s</string> <string name="mode_decky_loader">로더</string> <string name="mode_decky_install_latest">최신 버전 설치</string> + <string name="decky_channel">업데이트 채널</string> + <string name="decky_channel_hint">설치할 Decky Loader 릴리스입니다. Decky 자체 업데이터도 같은 채널을 사용합니다.</string> + <string name="decky_channel_stable">안정판</string> + <string name="decky_channel_prerelease">사전 출시판</string> + <string name="decky_channel_testing">테스트판</string> + <string name="decky_channel_failed">Decky 업데이트 채널을 저장할 수 없습니다</string> <string name="mode_decky_on">Steam과 함께 시작됩니다. 활성화하면 이 기기의 다른 앱이 Steam을 제어할 수 있습니다.</string> <string name="mode_decky_off">끔. Steam의 원격 디버깅 포트가 닫힌 상태로 유지됩니다.</string> <string name="mode_decky_remove_title">Decky Loader를 제거하시겠습니까?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">Deck 모드에서 게임이 충돌하거나 화면이 검게 변하면 이 옵션을 끄세요. 다음 세션에 적용됩니다.</string> <string name="mode_return_after_game">게임 종료 후 DroidDeck으로 돌아가기</string> <string name="mode_return_after_game_hint">DroidDeck 또는 다른 런처에서 실행한 게임을 닫으면 Steam이 정상적으로 종료되고(클라우드 저장 동기화를 먼저 완료) 실행한 곳으로 돌아갑니다. 끄면 Steam에 머무릅니다.</string> + <string name="mode_shader_precache">셰이더 사전 캐싱</string> + <string name="mode_shader_precache_hint">Steam이 게임용으로 미리 빌드된 셰이더를 다운로드해 백그라운드에서 처리하므로 게임 끊김이 줄어듭니다. 끄면 데이터, 저장 공간, 배터리를 절약하지만 게임이 플레이 중에 셰이더를 빌드합니다. Steam의 다운로드 > 셰이더 사전 캐싱과 같은 설정입니다. 다음 세션에 적용됩니다.</string> <string name="mode_steam_repair">Steam 클라이언트 복구</string> <string name="mode_steam_repair_hint">다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. Steam이 로딩 화면에서 넘어가지 않을 때 사용하세요. 게임, 로그인 정보 및 설정은 유지됩니다.</string> <string name="mode_steam_repair_queued">다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다.</string> @@ -375,6 +412,8 @@ <string name="mode_directaudio_hint">PulseAudio를 우회하여 지연 시간을 줄입니다.</string> <string name="mode_mic">마이크</string> <string name="mode_mic_hint">음성 채팅에 사용됩니다.</string> + <string name="drawer_mic_hint">이 세션의 마이크 캡처를 켜거나 끕니다.</string> + <string name="drawer_mic_failed">마이크를 변경할 수 없습니다. 다시 시도하세요.</string> <string name="mode_network">네트워크</string> <string name="mode_wifi_discovery">Wi-Fi 검색</string> <string name="mode_wifi_discovery_hint">Steam에 Wi-Fi 이름과 주변 네트워크를 표시합니다.</string> @@ -535,14 +574,24 @@ <string name="perf_gsrealtime">gamescope: 실시간 GPU 큐</string> <string name="perf_gsrealtime_hint">컴포지터 GPU 작업의 우선순위를 높입니다. 프레임 타임 안정성을 개선할 수 있지만 게임 성능의 일부를 소모합니다.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">메모리</string> + <string name="perf_cap_off">끄기</string> + <string name="perf_cap_auto">드라이버 기본값</string> + <string name="perf_zram_client">게임 실행 중 Steam 압축</string> + <string name="perf_zram_client_hint">게임이 시작되고 20초 후 Steam 클라이언트를 zRAM으로 압축해 게임에 더 많은 메모리를 남기고, 게임이 종료되면 다시 읽어 들입니다. 게임 시작 직후 세션이 종료되면 이 옵션을 끄세요. 위의 RAM 제한을 설정하면 세션이 이를 초과할 때 여전히 Steam을 압축합니다.</string> + <string name="perf_ram_cap">RAM 제한</string> + <string name="perf_ram_cap_hint">Steam 모드나 데스크톱에서 Steam 클라이언트가 실행되는 동안 적용됩니다. 세션이 이 값보다 많이 사용하면 Steam과 세션의 다른 지원 프로세스를 차례로 zRAM으로 압축합니다. 소프트 제한이므로 종료되는 것은 없지만, 페이지를 다시 읽어 들이는 동안 게임이 끊길 수 있습니다.</string> + <string name="perf_ram_cap_unavailable">zRAM 스왑이 필요하지만 이 기기에는 없습니다.</string> + <string name="perf_vram_cap">VRAM 제한</string> + <string name="perf_vram_cap_hint">DXVK가 Direct3D 게임에 보고하는 비디오 메모리로, 게임이 더 적은 양에 맞춰 텍스처를 할당합니다. 게임 자체의 DXVK 설정이 우선합니다. 다음 세션에 적용됩니다.</string> <string name="perf_gpuclock">GPU를 최고 클럭으로 유지</string> <string name="perf_gpuclock_hint">Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다.</string> <string name="perf_fixes">세션 수정</string> <string name="perf_sysmem">Turnip: sysmem 렌더링</string> <string name="perf_sysmem_hint">Steam 클라이언트가 빨라집니다. 게임에서는 드라이버가 패스마다 타일 렌더링과 시스템 메모리 렌더링 중 하나를 고릅니다. Adreno 710/720/722에 필수입니다.</string> <string name="perf_xalia">Steam의 xalia 도우미 건너뛰기</string> - <string name="perf_fastsync">droiddeck-ntsync(실험적)</string> - <string name="perf_fastsync_hint">테스트용으로 Linux ntsync 드라이버를 사용자 공간에서 대신하는 기능입니다. 켜져 있으면 Proton이 droiddeck-esync와 droiddeck-fsync 대신 이 기능을 사용합니다. Proton Experimental ARM64, GE-Proton 및 proton-cachyos에서 작동합니다. 다음 세션에 적용됩니다.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Linux ntsync 드라이버를 사용자 공간에서 대신하는 기능입니다. 켜져 있으면 Proton이 droiddeck-esync와 droiddeck-fsync 대신 이 기능을 사용합니다. Proton Experimental ARM64, GE-Proton 및 proton-cachyos에서 작동합니다. 다음 세션에 적용됩니다.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync 우선</string> <string name="perf_fsync_hint">futex_waitv를 사용자 공간에서 제공하여 기본 Proton 파일로 Proton 자체의 fsync를 실행하므로, 팩이 필요 없고 Steam이 Proton을 업데이트해도 바로 작동합니다. 켜져 있으면 게임이 droiddeck-esync보다 이 기능을 우선 사용합니다. 단, Proton이 fsync를 끄는 일부 게임은 예외입니다. 다음 세션에 적용됩니다.</string> @@ -553,6 +602,8 @@ <string name="perf_fastpath">proot 빠른 경로</string> <string name="perf_fastpath_needs_seccomp">proot의 seccomp 필터가 필요합니다.</string> <string name="perf_fastpath_hint">파일 검색이 빨라지고 끊김이 줄어듭니다. 프로그램이 파일을 찾지 못하면 이 옵션을 끄세요.</string> + <string name="perf_cursor_composite">gamescope 안에서 커서 그리기</string> + <string name="perf_cursor_composite_hint">Gamescope가 포인터를 Android에 넘기지 않고 직접 그립니다. 컨트롤러로 조작하는 커서에는 켜세요. 휴대전화에서는 끄는 것이 더 빠릅니다. 다음 세션에 적용됩니다.</string> <string name="perf_identity">세션 ID</string> <string name="perf_hostname">호스트 이름</string> <string name="perf_hostname_hint">Steam이 이 기기를 인식하는 이름입니다. 비워 두면 %1$s(으)로 복원됩니다.</string> @@ -567,6 +618,8 @@ <string name="driver_delete_plain">파일이 앱에서 제거됩니다.</string> <string name="driver_delete_in_use">파일이 제거됩니다. 사용 중이므로 기본 드라이버로 전환됩니다.</string> <string name="drawer_page_display">디스플레이</string> + <string name="drawer_frame_limit">프레임 제한</string> + <string name="drawer_frame_limit_note">이 게임의 프레임을 제한합니다. 제한값으로 나누어떨어지는 주사율이 있으면 디스플레이가 그 주사율로 전환되며, 그 밖의 제한값은 고르지 않게 보일 수 있습니다. Steam 게임은 빠른 액세스 메뉴의 Steam 프레임 제한을 사용합니다.</string> <string name="drawer_page_effects">효과</string> <string name="drawer_page_controls">컨트롤</string> <string name="drawer_page_components">구성 요소</string> @@ -591,6 +644,66 @@ <string name="drawer_hud_color_amber">호박색</string> <string name="drawer_hud_color_violet">보라색</string> <string name="drawer_hud_opacity">불투명도</string> + <string name="hud_size">크기</string> + <string name="hud_size_hint">HUD를 탭해도 크기가 바뀝니다.</string> + <string name="hud_size_full">전체</string> + <string name="hud_size_tiles">타일</string> + <string name="hud_size_pill">캡슐</string> + <string name="hud_size_minimal">미니멀</string> + <string name="hud_size_mega">메가</string> + <string name="hud_size_strip">바</string> + <string name="hud_locked">위치 고정</string> + <string name="hud_locked_hint">HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다.</string> + <string name="hud_snap">양옆에 맞추기</string> + <string name="hud_snap_hint">HUD를 놓으면 화면에서 더 가까운 쪽으로 이동합니다. 튕기면 그 방향으로 이동합니다.</string> + <string name="hud_group_look">외관</string> + <string name="hud_scale">화면상 크기</string> + <string name="hud_color_soft">은은함</string> + <string name="hud_color_mid">보통</string> + <string name="hud_color_vivid">선명함</string> + <string name="hud_outline">외곽선</string> + <string name="hud_outline_color">외곽선 색상</string> + <string name="hud_outline_gray">회색</string> + <string name="hud_outline_theme">테마 색상</string> + <string name="hud_group_metrics">측정값</string> + <string name="hud_metric_graph">프레임 타임 그래프</string> + <string name="hud_metric_decimal">소수점 프레임 속도</string> + <string name="hud_metric_low001" formatted="false">0.01% 최저</string> + <string name="hud_metric_engine">그래픽 엔진</string> + <string name="hud_metric_gpu_model">GPU 이름</string> + <string name="hud_metric_gpu">GPU 사용률</string> + <string name="hud_metric_gpu_temp">GPU 온도</string> + <string name="hud_metric_cpu">CPU 사용률</string> + <string name="hud_metric_per_core">코어별 CPU</string> + <string name="hud_metric_temp">온도</string> + <string name="hud_metric_ram">메모리</string> + <string name="hud_metric_vram">그래픽 메모리</string> + <string name="hud_metric_swap">스왑</string> + <string name="hud_metric_battery">배터리 잔량</string> + <string name="hud_metric_power">소비 전력</string> + <string name="hud_metric_network">네트워크</string> + <string name="hud_metric_resolution">해상도</string> + <string name="hud_metric_proton">Proton 버전</string> + <string name="hud_metric_session">세션 시간</string> + <string name="hud_metric_clock">시계</string> + <string name="hud_group_temps">온도</string> + <string name="hud_temp_unit">단위</string> + <string name="hud_temp_bands">경고 색상</string> + <string name="hud_temp_bands_hint">온도가 한도에 가까워지면 호박색, 그다음 빨간색으로 바뀝니다.</string> + <string name="hud_temp_bands_off">끔</string> + <string name="hud_temp_bands_auto">자동</string> + <string name="hud_temp_bands_manual">수동</string> + <string name="hud_temp_red_cpu">CPU 빨간색 기준</string> + <string name="hud_temp_red_gpu">GPU 빨간색 기준</string> + <string name="hud_temp_red_battery">배터리 빨간색 기준</string> + <string name="hud_group_more">기타</string> + <string name="hud_export">HUD 진단</string> + <string name="hud_export_hint">HUD가 읽는 모든 센서의 보고서를 Downloads/DroidDeck에 저장합니다.</string> + <string name="hud_export_button">저장</string> + <string name="hud_export_done">%1$s에 저장됨</string> + <string name="hud_export_failed">HUD 보고서를 저장할 수 없습니다.</string> + <string name="hud_reset">HUD 설정 초기화</string> + <string name="hud_reset_button">초기화</string> <string name="drawer_scaling">스케일링 모드</string> <string name="drawer_scaling_sharpness">스케일링 선명도</string> <string name="drawer_effects">화면 효과</string> @@ -625,10 +738,14 @@ <string name="drawer_touch_auto">자동(%1$s)</string> <string name="drawer_keyboard">키보드</string> <string name="drawer_latency">지연</string> + <string name="drawer_low_latency">저지연 모드</string> + <string name="drawer_low_latency_hint">CPU 및 배터리 사용량이 늘어납니다</string> <string name="drawer_low_latency_controller">저지연 컨트롤러</string> <string name="drawer_low_latency_controller_hint">컨트롤러가 250 Hz 대신 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다.</string> <string name="drawer_low_latency_touch">저지연 터치</string> <string name="drawer_low_latency_touch_hint">터치가 프레임 병합을 건너뛰고 Steam 터치가 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다.</string> + <string name="drawer_evdev_mouse">원시 마우스 채널</string> + <string name="drawer_direct_cursor">커서</string> <string name="drawer_pc_keyboard">PC 키보드</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">보조 화면</string> @@ -714,6 +831,10 @@ <string name="setup_session">세션</string> <string name="setup_logs">세션 로그</string> <string name="setup_logs_hint">각 세션 종료 후 저장</string> + <string name="setup_game_debug_logs">게임 디버그 로그</string> + <string name="setup_game_debug_logs_hint">다음 게임 실행 시 Proton, Wine 및 그래픽 진단 정보를 포함합니다. 성능이 저하되고 저장 공간을 더 사용할 수 있습니다.</string> + <string name="setup_game_debug_logs_restart">게임 디버그 로그를 저장하려면 이 세션을 다시 시작하세요</string> + <string name="setup_logging_update_failed">로깅을 업데이트할 수 없습니다. 스위치를 확인하고 다시 시도하세요.</string> <string name="setup_agent_commands">디버깅 도구</string> <string name="setup_latest_logs">최신 세션 로그</string> <string name="setup_saved_logs">저장된 세션 로그</string> @@ -746,12 +867,28 @@ <string name="setup_home_on">DroidDeck을 홈 앱으로 사용할 수 있습니다</string> <string name="setup_home_off">DroidDeck은 홈 앱으로 제공되지 않습니다</string> <string name="setup_orientation">화면 방향</string> + <string name="setup_launcher_orientation">런처 방향</string> + <string name="setup_launcher_orientation_auto">기기 회전 따르기</string> + <string name="setup_orientation_portrait">세로</string> + <string name="setup_session_orientation">세션 방향</string> + <string name="setup_session_orientation_hint">Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 사용자 정의 너비와 높이는 입력한 그대로 유지됩니다.</string> <string name="setup_orientation_auto">자동 가로 모드</string> <string name="setup_orientation_landscape">가로 모드</string> <string name="setup_orientation_reverse">역방향 가로 모드</string> <string name="setup_fullscreen">전체 화면</string> <string name="setup_fullscreen_on">Android 상태 표시줄 및 탐색 표시줄 숨기기</string> <string name="setup_fullscreen_off">Android 상태 표시줄 및 탐색 표시줄 표시</string> + <string name="setup_dual_screen">듀얼 화면</string> + <string name="setup_dual_screen_hint">자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다.</string> + <string name="setup_dual_screen_auto">자동</string> + <string name="setup_dual_screen_on">켜기</string> + <string name="setup_dual_screen_off">끄기</string> + <string name="setup_dual_screen_menu">하단 화면 메뉴</string> + <string name="setup_dual_screen_menu_hint">섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다.</string> + <string name="setup_dual_screen_controls">게임 중 하단 화면 컨트롤</string> + <string name="setup_dual_screen_controls_hint">세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다.</string> + <string name="dual_typing_title">상단 화면에 입력 중</string> + <string name="dual_typing_done">완료</string> <string name="setup_default_home">기본 홈 앱</string> <string name="setup_choose_home">홈 앱 선택</string> <string name="setup_choose">선택</string> @@ -896,6 +1033,14 @@ <string name="gate_step1">설정 → 개발자 옵션 → 무선 디버깅을 열고 켜기</string> <string name="gate_step2">\"페어링 코드로 기기 페어링\" 탭</string> <string name="gate_step3">DroidDeck 알림에 페어링 코드 입력</string> + <string name="pairguide_build_number">휴대전화 정보에서 빌드 번호를 7번 탭하세요</string> + <string name="pairguide_wireless">무선 디버깅을 켜세요</string> + <string name="pairguide_pair">무선 디버깅을 연 다음 “페어링 코드로 기기 페어링”을 탭하세요</string> + <string name="pairguide_child_process">“하위 프로세스 제한 사용 중지”를 켜세요</string> + <string name="pairguide_row_child_process">하위 프로세스 제한 사용 중지</string> + <string name="pairguide_row_build_number">빌드 번호</string> + <string name="pairguide_row_wireless">무선 디버깅</string> + <string name="pairguide_row_pair">페어링 코드로 기기 페어링</string> <string name="gate_waiting">페어링 팝업을 기다리는 중…</string> <string name="gate_code_needed">팝업을 찾았습니다. 표시된 페어링 코드를 알림에 입력하세요.</string> <string name="gate_status">상태</string> @@ -1019,8 +1164,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 +1171,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> @@ -1037,10 +1179,8 @@ <string name="games_never_played">플레이한 적 없음</string> <string name="games_runtime_busy_percent">런타임 사용 중 · %1$d%%</string> <string name="games_runtime_busy">런타임 사용 중</string> - <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> @@ -1055,6 +1195,9 @@ <string name="gpu_hide_other">다른 GPU의 드라이버 숨기기</string> <string name="gpu_show_other">다른 GPU의 드라이버 표시</string> <string name="gpu_advanced">고급</string> + <string name="gpu_ubwc_title">UBWC 호환성</string> + <string name="gpu_ubwc_hint">Steam이나 Android에 줄무늬나 깜박임이 보이면 켜기 또는 끄기를 시도하세요. DroidDeck을 다시 시작한 후 두 드라이버 모두에 적용됩니다.</string> + <string name="gpu_ubwc_restart">적용하려면 DroidDeck을 다시 시작하세요.</string> <string name="gpu_set_with_display">디스플레이 드라이버와 함께 설정: %1$s에 둘 다 포함됩니다.</string> <string name="gpu_set_with_runtime">런타임 드라이버와 함께 설정: %1$s에 둘 다 포함됩니다.</string> <string name="gpu_runtime_hint">게임 및 데스크톱에서 사용됩니다.</string> @@ -1109,7 +1252,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> @@ -1163,10 +1306,15 @@ <string name="pip_auto">자동으로 PIP 시작</string> <string name="unfolded_controls">펼친 화면의 컨트롤</string> <string name="unfolded_controls_hint">펼치면 게임이 Steam Deck 터치패드와 뒷면 그립 위에 표시됩니다. 접으면 게임이 전체 화면으로 표시됩니다.</string> + <string name="unfolded_controls_with_controller">컨트롤러 사용 시에도 유지</string> + <string name="unfolded_controls_with_controller_hint">컨트롤러가 연결되어 있을 때도 이 터치 컨트롤을 표시합니다.</string> <string name="pip_suspended">일시 중지됨</string> <string name="pip_not_ready">세션이 준비되면 PIP를 사용할 수 있습니다.</string> <string name="pip_permission">Android 설정에서 DroidDeck의 PIP 사용을 허용하세요.</string> <string name="pip_unavailable">Android에서 PIP를 열 수 없습니다.</string> + <string name="game_more">더보기</string> + <string name="game_edit_art">아트 편집</string> + <string name="stores_in_steam_label">Steam에 있음</string> <string name="game_shortcut">바로 가기</string> <string name="game_shortcut_add">홈 화면에 추가</string> <string name="game_shortcut_choose">게임 선택</string> @@ -1190,6 +1338,10 @@ <string name="main_wait_runtime">런타임 작업이 끝날 때까지 기다려 주세요</string> <string name="main_wait_proton_install">호환성 도구 설치가 끝날 때까지 기다려 주세요</string> + <string name="load_compat_title">호환성 도구 준비 중</string> + <string name="load_compat_wait">호환성 설정이 끝나기를 기다리는 중</string> + <string name="load_compat_hint">설정이 끝나면 세션이 시작됩니다.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">데스크톱 앱 설치가 끝날 때까지 기다려 주세요</string> <string name="main_wait_install_game">설치가 끝난 후 게임을 실행하세요</string> <string name="main_saves_close_session">게임이 가져온 데이터를 덮어쓰지 않도록 먼저 Steam 세션을 종료하세요</string> @@ -1222,6 +1374,9 @@ <string name="main_install_anyway">그래도 설치</string> <string name="main_remove_runtime_title">Linux 런타임 제거</string> <string name="main_remove_runtime_text">런타임과 그 안의 Steam 클라이언트, 그리고 런타임에 설치된 모든 게임이 삭제됩니다.</string> + <string name="runtime_actions_title">Linux 런타임</string> + <string name="runtime_actions_text">복구는 런타임의 시스템 파일을 다시 설치하며 Steam, 게임 및 설정은 유지합니다. 데스크톱 같은 추가 기능은 다음에 사용할 때 다시 설치됩니다. 제거는 모든 것을 삭제합니다.</string> + <string name="runtime_repair">런타임 복구</string> <string name="main_applied">적용됨: %1$s</string> <string name="android_app_open_failed_primary">메인 화면에서 %1$s을(를) 열 수 없습니다</string> <string name="android_app_open_failed_on">%2$s에서 %1$s을(를) 열 수 없습니다</string> @@ -1348,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">런타임 카탈로그에 연결할 수 없습니다. 연결을 확인한 후 \"Steam 실행\"을 다시 누르세요.</string> <string name="session_runtime_install_failed">Linux 런타임이 설치되지 않았습니다. \"설정\"에서 런타임을 확인한 후 \"Steam 실행\"을 다시 누르세요.</string> <string name="session_desktop_install_failed">데스크톱이 설치되지 않았습니다(%1$s). 연결을 확인한 후 \"데스크톱\"을 다시 누르세요.</string> + <string name="session_package_resume_failed">중단된 설치를 완료할 수 없습니다(%1$s). 연결과 저장 공간을 확인한 후 다시 시도하세요.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 런타임이 손상되었습니다. 라이브러리 링크 %1$d개가 없는 파일(%2$s 등)을 가리킵니다. 보통 설치가 중단된 후에 발생합니다. 복구해도 게임과 설정은 유지됩니다.</item> + </plurals> <string name="session_ended_named">%1$s이(가) 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> <string name="session_ended_program">프로그램이 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> <string name="session_ended_desktop">데스크톱이 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> @@ -1361,6 +1520,12 @@ <string name="mode_decky_plugins_hint">다음 Steam 세션에 사용할 플러그인 ZIP을 설치합니다.</string> <string name="mode_decky_plugin_downloading">다운로드 중…</string> <string name="mode_decky_plugin_install_zip">ZIP에서 설치</string> + <string name="decky_zip_warning_title">타사 플러그인 설치</string> + <string name="decky_zip_warning_text">Decky Loader 팀이 이 플러그인을 검토하지 않았습니다. Steam 계정을 탈취하거나 기기를 손상시키는 소프트웨어 같은 악성 코드가 포함되어 있을 수 있습니다. 이 플러그인을 설치하면 기기에 대한 모든 위험을 본인이 감수하는 데 동의하는 것입니다.</string> + <string name="decky_zip_warning_continue">계속</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">%1$d초 기다려 주세요</item> + </plurals> <string name="store_cat_games">게임</string> <string name="store_cat_audio_video">오디오 및 비디오</string> <string name="store_cat_graphics">그래픽</string> @@ -1389,6 +1554,10 @@ <string name="theme_icon_blue_detail">검은색 배경에 흰색 글자, 선택·포커스·누름 상태에는 파란색을 사용합니다.</string> <string name="theme_electric">일렉트릭 네이비</string> <string name="theme_electric_detail">회색 대신 네이비 톤의 화면에 더 밝은 파란색을 사용합니다.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">무지개 색으로 계속 바뀌는 색상입니다. Android의 애니메이션 설정을 따릅니다.</string> + <string name="theme_rgb_speed">속도</string> + <string name="theme_rgb_speed_hint">색상이 바뀌는 속도입니다.</string> <string name="theme_gradient">그라데이션</string> <string name="theme_gradient_detail">직접 고른 기본색과 보조색이 버튼과 강조 표시에 섞여 적용됩니다.</string> <string name="theme_gradient_primary">기본색</string> @@ -1505,7 +1674,16 @@ <string name="fm_conflict_skip">건너뛰기</string> <string name="fm_select_this_folder">이 폴더 선택</string> <string name="fm_back">뒤로</string> + <string name="fm_exit">종료</string> + <string name="fm_return_to_start">시작 폴더로 돌아가기</string> + <string name="fm_start_unavailable">시작 폴더를 더 이상 사용할 수 없습니다</string> + <string name="fm_cancel_operation_title">작업을 취소할까요?</string> + <string name="fm_cancel_operation_confirmation">작업이 취소됩니다. 계속하시겠습니까?</string> + <string name="fm_accept">수락</string> + <string name="fm_decline">거절</string> <string name="fm_drive_not_readable">%1$s이(가) 마운트되었지만 지금은 읽을 수 없습니다</string> + <string name="fm_drive_access_title">%1$s 액세스 허용</string> + <string name="fm_drive_access_text">Android에서 DroidDeck이 이 드라이브를 볼 수는 있지만 읽을 수는 없습니다. DroidDeck의 모든 파일 액세스를 켠 다음 돌아오세요.</string> <string name="fm_list_view">목록 보기</string> <string name="fm_grid_view">격자 보기</string> <string name="fm_search">검색</string> @@ -1576,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">키보드 + 터치패드</string> <string name="second_mode_terminal">터미널</string> <string name="second_mode_deck_controls">Deck 그립 + 터치패드</string> + <string name="second_mode_dashboard">대시보드</string> + <string name="bottom_dashboard_empty">아직 표시할 내용이 없습니다.</string> + <string name="bottom_page_downloads">다운로드</string> + <string name="bottom_downloads_none">진행 중인 다운로드가 없습니다.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">셰이더 캐시 다운로드 중</string> + <string name="bottom_downloads_paused">일시 중지됨</string> + <string name="bottom_downloads_queued">시작 대기 중</string> + <string name="bottom_page_notifications">알림</string> + <string name="bottom_notifications_listener">DroidDeck 하단 화면</string> + <string name="bottom_notifications_why">플레이하는 동안 메시지와 기타 알림을 여기에 표시합니다. 알림은 이 화면에만 표시되며 저장되지 않습니다. Android에서 한 번만 묻습니다. 이 화면에 알림 접근 권한 페이지가 열리면 DroidDeck을 켜세요. 그러면 이 페이지로 자동으로 돌아옵니다.</string> + <string name="bottom_notifications_allow">알림 접근 허용</string> + <string name="bottom_notifications_none">알림이 없습니다.</string> + <string name="bottom_notifications_count">알림 %1$d개</string> + <string name="bottom_notifications_clear">지우기</string> + <string name="bottom_page_screenshots">스크린샷</string> + <string name="stats_fps_needs_hud">FPS를 보려면 HUD를 켜야 합니다</string> + <string name="stats_speed">속도</string> + <string name="stats_pedals">페달</string> + <string name="stats_gforce">G-포스</string> + <string name="stats_timing">타이밍</string> + <string name="stats_best_lap">베스트 랩</string> + <string name="stats_tires">타이어 °C</string> + <string name="stats_trace">스로틀 및 브레이크, 최근 10 s</string> + <string name="stats_speed_chart">속도, %1$s</string> + <string name="stats_gear">기어</string> + <string name="stats_speed_units">속도 단위</string> + <string name="stats_speed_units_auto">자동(%1$s)</string> + <string name="stats_steam_client_arm">Steam 클라이언트 ARM</string> + <string name="stats_steam_client_x86">Steam 클라이언트 x86</string> + <string name="stats_throttle">스로틀</string> + <string name="stats_brake">브레이크</string> + <string name="stats_lights">계기판 표시등</string> + <string name="stats_lamp_shift">변속</string> + <string name="stats_lamp_handbrake">핸드브레이크</string> + <string name="stats_lamp_pit">피트 리미터</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">터보 %1$s bar</string> + <string name="stats_engine_temp">엔진 %1$s °C</string> + <string name="stats_oil_temp">오일 %1$s °C</string> + <string name="stats_power">파워 분배기</string> + <string name="stats_fuel_t">연료, t</string> + <string name="stats_fuel_main">메인 %1$s t</string> + <string name="stats_fuel_reserve">예비 %1$s t</string> + <string name="stats_tap_hint">상단 막대나 계기판을 탭하면 스타일이 바뀝니다.</string> + <string name="bottom_telemetry_send_title">계기판 데이터 보내기</string> + <string name="bottom_telemetry_send_auto">자동</string> + <string name="bottom_telemetry_send_auto_hint">나중에 발견된 게임을 포함해 여기에 나열된 모든 게임에서 켭니다. 직접 끈 게임은 꺼진 상태로 유지됩니다.</string> + <string name="bottom_telemetry_send_note">게임 자체의 데이터 출력 설정을 변경합니다. 다음에 게임을 시작할 때 적용되며, 끄면 이전 설정으로 되돌립니다.</string> + <string name="bottom_telemetry_send_close">이 설정을 변경하려면 %1$s을(를) 종료하세요.</string> + <string name="bottom_telemetry_send_failed">%1$s의 설정을 변경할 수 없습니다.</string> + <string name="bottom_telemetry_send_menu">%1$s: 게임 설정에서 IP 127.0.0.1, 포트 %3$d(으)로 %2$s을(를) 켜세요.</string> + <string name="bottom_shots_where">Pictures/DroidDeck에 저장됩니다. Steam 스크린샷도 여기에 표시됩니다.</string> + <string name="bottom_shots_take">스크린샷 찍기</string> + <string name="bottom_shots_saved">스크린샷이 저장되었습니다.</string> + <string name="bottom_shots_failed">스크린샷을 찍을 수 없습니다.</string> + <string name="bottom_shots_none">아직 스크린샷이 없습니다.</string> + <string name="bottom_page_chat">채팅 및 음성</string> + <string name="bottom_chat_why">게임이 메인 화면에서 계속 실행되는 동안 여기에서 Steam 채팅을 읽고 답장하세요. Steam에 로그인된 계정을 사용합니다.</string> + <string name="bottom_chat_not_signed_in">Steam에 아직 공유할 웹 로그인이 없으므로 여기에서 한 번 로그인하세요.</string> + <string name="bottom_chat_stopped">DroidDeck이 백그라운드에 있는 동안 Android가 채팅 페이지를 닫았습니다. DroidDeck으로 돌아오면 다시 열립니다.</string> + <string name="bottom_chat_open">Steam Chat 열기</string> + <string name="bottom_chat_close">채팅 닫기</string> + <string name="bottom_chat_mic_on">마이크 켜짐</string> + <string name="bottom_chat_mic_off">마이크 꺼짐</string> + <string name="bottom_chat_mic_unavailable">이 게임에서는 마이크가 꺼져 있습니다. 대화하려면 DroidDeck의 Steam 설정(오디오)에서 마이크를 켜고 게임을 다시 시작하세요.</string> + <string name="bottom_chat_volume">볼륨 %1$d%%</string> + <string name="bottom_page_telemetry">게임 내 통계</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">배터리</string> + <string name="bottom_telemetry_lap">랩</string> + <string name="bottom_telemetry_position">순위</string> + <string name="bottom_telemetry_this_lap">현재 랩</string> + <string name="bottom_telemetry_last_lap">지난 랩</string> + <string name="bottom_telemetry_fuel">연료</string> + <string name="bottom_telemetry_cargo">화물</string> + <string name="bottom_telemetry_pips">파워 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">법적 상태</string> + <string name="bottom_telemetry_balance">잔액</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">레이싱 게임의 데이터 출력(흔히 텔레메트리 또는 UDP라고 함)을 켜면 여기에서 실시간 계기판을 볼 수 있습니다. 데이터는 이 기기에만 남습니다.</string> + <string name="bottom_telemetry_unknown_format">포트 %1$d에서 데이터를 받고 있지만(%3$d바이트 패킷 %2$d개), 이 페이지가 아직 읽을 수 없는 형식입니다.</string> + <string name="bottom_telemetry_port_busy">다른 프로그램이 이미 포트 %1$s을(를) 사용하고 있어 해당 게임을 여기에 표시할 수 없습니다.</string> <string name="rtinst_removing">Linux 런타임 제거 중</string> <plurals name="rtinst_removing_entries"> @@ -1605,6 +1870,7 @@ <string name="flatpakmgr_not_ready">먼저 Flatpak을 설정하세요</string> <string name="flatpakmgr_starting">시작 중</string> <string name="flatpakmgr_exit_status">Flatpak이 종료되었습니다(상태 %1$d)</string> + <string name="flatpakmgr_wrong_arch">%1$s은(는) DroidDeck이 실행할 수 없는 %2$s용으로 빌드되었습니다. 여기서 Flatpak 앱은 ARM64 또는 x86_64 빌드여야 합니다.</string> <string name="flatpakmgr_installing">%1$s 설치 중</string> <string name="flatpakmgr_updating">%1$s 업데이트 중</string> <string name="flatpakmgr_removing">%1$s 제거 중</string> @@ -1698,6 +1964,7 @@ <string name="adbpair_applying">설정을 적용하는 중…</string> <string name="adbpair_command_failed">무선 디버깅 명령 실패</string> <string name="adbpair_channel_name">무선 디버깅 설정</string> + <string name="adbpair_progress_channel_name">무선 디버깅 설정 진행률</string> <string name="adbpair_channel_description">설정이 열려 있는 동안 무선 디버깅 페어링 코드를 요청</string> <string name="adbpair_title_pair">무선 디버깅 페어링</string> <string name="adbpair_waiting_text">무선 디버깅을 켠 다음 “페어링 코드로 기기 페어링”을 탭하세요.</string> @@ -1806,6 +2073,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU가 아님</string> <string name="gpuinfo_supported">지원됨</string> <string name="gpuinfo_experimental">실험적: 드라이버가 테스트 빌드입니다</string> + <string name="gpuinfo_a850_experimental">실험적 Adreno 850 지원: 호환되는 실험용 디스플레이 및 게임 드라이버가 필요하며, 이 기기에서 검증되지 않았습니다</string> <string name="gpuinfo_below_tested">테스트된 하드웨어(Adreno 725 이상)보다 낮음: 실행되지 않을 수 있습니다</string> <string name="gpuinfo_unsupported">지원되지 않음: DroidDeck에는 Adreno(Snapdragon) GPU가 필요합니다</string> @@ -1899,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">배율 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">기기 세부 정보 표시</string> <string name="device_info_hide">기기 세부 정보 숨기기</string> @@ -1917,7 +2185,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> @@ -1931,11 +2198,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> @@ -1953,9 +2218,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> @@ -1974,12 +2247,43 @@ <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> <string name="stores_sort">정렬</string> + <string name="setup_rail_labels">사이드바 레이블</string> + <string name="setup_rail_labels_hint">사이드바 아이콘 아래에 이름을 표시합니다. 끄면 사이드바가 더 슬림해집니다.</string> + <string name="library_display">표시</string> + <string name="library_display_larger">카드 크게</string> + <string name="library_display_smaller">카드 작게</string> + <string name="library_display_title">제목 표시</string> + <string name="library_display_size">크기 표시</string> <string name="stores_sort_last_played">최근 플레이</string> <string name="stores_sort_recently_installed">최근 설치</string> <string name="stores_sort_title_asc">제목 A–Z</string> @@ -2106,6 +2410,9 @@ <string name="stores_download_manager">다운로드 관리자</string> <string name="stores_parallel">동시 다운로드 수</string> <string name="stores_install_where">설치 위치</string> + <string name="stores_install_language">게임 언어</string> + <string name="stores_install_language_hint">GOG와 Epic은 이 언어로 설치합니다. 시스템은 앱 언어를 따릅니다.</string> + <string name="stores_install_language_system">시스템</string> <string name="stores_install_title">%1$s 설치:</string> <string name="stores_target_internal">내부 저장 공간</string> <string name="stores_target_free">%1$s 사용 가능</string> @@ -2128,6 +2435,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> @@ -2143,6 +2451,9 @@ <string name="edit_target">대상</string> <string name="edit_start_in">시작 위치</string> <string name="edit_launch_options">실행 옵션</string> + <string name="edit_launch_options_steam_hint">Steam 속성과 공유됩니다. 어느 한쪽에서 바꾸면 양쪽에 모두 반영됩니다.</string> + <string name="edit_launch_options_not_saved">실행 옵션을 Steam에 저장하지 못했습니다. 다시 시도하세요.</string> + <string name="edit_launch_options_desktop">데스크톱 세션에서 Steam이 열려 있을 수 있습니다. Steam 속성에서 실행 옵션을 바꾸거나 먼저 세션을 닫으세요.</string> <string name="edit_artwork">아트워크</string> <string name="edit_other_exe">다른 exe…</string> <string name="edit_remove">제거</string> @@ -2268,6 +2579,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="flathub_eyebrow">LINUX 앱</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux 데스크톱용 앱으로, 데스크톱에서 엽니다.</string> @@ -2406,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">“자동”에서는 이 2D 게임이 시야에 고정됩니다. 헤드 트래킹을 사용하려면 “디스플레이”에서 “가상 화면”을 선택하세요.</string> <string name="glasses_tracking_sbs_hint">헤드 트래킹은 가상 화면이나 실행 중인 SteamVR 게임에 적용됩니다.</string> <string name="glasses_hardware">장치</string> + <string name="vr_controllers_tab">컨트롤러</string> + <string name="vr_controllers_group">SteamVR 컨트롤러</string> + <string name="vr_controllers_emulate">VR에서의 게임패드</string> + <string name="vr_controllers_emulate_hint">컨트롤러가 대신하는 두 VR 손입니다. 변경 사항은 SteamVR 실행 중에도 즉시 적용됩니다. Joy-Con과 추적된 손은 여전히 해당 쪽을 우선합니다.</string> + <string name="vr_controllers_off">일반 게임패드</string> + <string name="vr_controllers_index">Valve Index 컨트롤러</string> + <string name="vr_controllers_touch">Meta Quest 3 컨트롤러</string> + <string name="vr_controllers_vive">HTC Vive 완드</string> + <string name="vr_controllers_sticks">스틱 시작 동작</string> + <string name="vr_controllers_sticks_hint">VR 중에 두 스틱을 함께 누르면 전환됩니다.</string> + <string name="vr_controllers_sticks_game">게임에서 이동</string> + <string name="vr_controllers_sticks_hands">손 움직이기</string> + <string name="vr_controllers_buttons">버튼</string> + <string name="vr_controllers_buttons_stick">트리거는 트리거, 범퍼는 그립, A/B와 X/Y는 각 손의 페이스 버튼, 스틱 클릭은 썸스틱 클릭이며, Guide는 SteamVR 메뉴를 엽니다. 방향 패드 위아래로 손을 가깝게 또는 멀리 움직입니다.</string> + <string name="vr_controllers_buttons_vive">스틱은 트랙패드가 되며, A/X 또는 스틱 클릭으로 누릅니다. 트리거는 트리거, 범퍼는 그립, Start와 Select는 메뉴이며, Guide는 SteamVR 메뉴를 엽니다.</string> + <string name="vr_controllers_buttons_off">VR 손이 없습니다. 게임패드를 지원하는 게임과 SteamVR 메뉴에서는 평소처럼 컨트롤러를 사용합니다.</string> <string name="glasses_brightness">밝기</string> <string name="glasses_volume">볼륨</string> <string name="glasses_sunblock">선블록</string> @@ -2463,6 +2791,12 @@ <string name="hand_camera_placement">카메라 위치</string> <string name="hand_camera_placement_hint">플레이하기 전에 카메라에 당신이 보이는지 확인하세요.</string> <string name="hand_camera_check">확인</string> + <string name="tracking_pack_title">핸드 트래킹 다운로드</string> + <string name="tracking_pack_hint">핸드 트래킹을 사용하려면 %1$s를 한 번 다운로드해야 합니다.</string> + <string name="tracking_pack_download">다운로드</string> + <string name="tracking_pack_retry">다시 시도</string> + <string name="tracking_pack_downloading">핸드 트래킹 다운로드 중… %1$d%%</string> + <string name="tracking_pack_failed">핸드 트래킹을 다운로드할 수 없습니다. 연결을 확인하고 다시 시도하세요.</string> <string name="hand_camera_check_title">카메라 위치</string> <string name="hand_camera_how_rear">기기를 가슴 높이쯤에서 1.5~2m 떨어진 곳에 세우고, 후면 카메라가 당신을 향하게 하세요. 그런 다음 손을 벌리고 화면 안으로 들어오세요.</string> <string name="hand_camera_how_front">기기를 가슴 높이쯤에서 1.5~2m 떨어진 곳에 세우고, 화면이 당신을 향하게 하세요. 그런 다음 손을 벌리고 화면 안으로 들어오세요.</string> @@ -2534,6 +2868,21 @@ <string name="storage_safe_hint">사용하지 않는 런타임, 잔여물, 오래된 로그</string> <string name="storage_clean_up">정리…</string> <string name="storage_session_running">세션을 중지해야 정리하거나 제거할 수 있습니다. 용량은 계속 표시됩니다.</string> + <string name="storage_default_group">설치 위치</string> + <string name="storage_default_title">기본 저장소</string> + <string name="storage_default_hint">새 스토어 설치는 선택한 위치에 저장됩니다. 기존 게임은 그대로 유지됩니다. Steam 라이브러리는 자체 설정을 따릅니다.</string> + <string name="storage_default_ask">매번 묻기</string> + <string name="storage_default_ask_detail">설치할 때마다 위치 선택</string> + <string name="storage_default_internal">내부 저장소</string> + <string name="storage_default_external">외부 저장소</string> + <string name="storage_default_external_detail">%1$s · %2$s 남음</string> + <string name="storage_default_external_missing">연결되지 않음</string> + <string name="storage_default_folder">폴더 · %1$s</string> + <string name="storage_default_folder_free">%1$s 남음</string> + <string name="storage_default_folder_missing">연결되지 않음</string> + <string name="storage_default_choose_folder">폴더 선택…</string> + <string name="storage_default_choose_folder_detail">SD 카드나 USB 드라이브의 아무 폴더나 사용</string> + <string name="storage_default_note">게임은 선택한 위치 안의 Games 폴더에 저장됩니다. 기존 게임은 이동되지 않습니다.</string> <string name="storage_where">사용 내역</string> <string name="storage_games">Steam 게임</string> <string name="storage_game_data">게임 데이터</string> @@ -2655,6 +3004,9 @@ <string name="storage_data_installed">설치된 게임</string> <string name="storage_data_parts">프리픽스 %1$s · 셰이더 %2$s · 워크숍 %3$s</string> <string name="storage_clear_shaders">셰이더 지우기</string> + <string name="storage_reset_prefix">프리픽스 초기화</string> + <string name="storage_reset_prefix_title">%1$s의 프리픽스를 초기화하시겠습니까?</string> + <string name="storage_reset_prefix_confirm">%2$s에 있는 Wine 프리픽스(%1$s)를 삭제하고 다음 실행 시 다시 만듭니다. 그 안의 저장 파일, 설정 및 설치된 재배포 패키지는 사라지며, Steam Cloud 저장 파일은 계정에 남아 있습니다.</string> <string name="storage_data_leftovers">제거한 게임</string> <string name="storage_steam_app">Steam 앱 %1$d</string> <string name="storage_leftover_unsure_detail">프리픽스에 파일이 남아 있고 로컬 저장 파일이 있을 수 있습니다</string> @@ -2871,6 +3223,117 @@ <string name="spatial_distance_passed">거리 확인이 통과되었습니다.</string> <string name="spatial_model_checksum_error">손 모델 체크섬 불일치</string> <string name="spatial_opencv_load_error">OpenCV를 로드할 수 없습니다.</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing으로 동기화</string> + <string name="sync_enable_hint">Syncthing-Fork를 기반으로 한 Syncthing 구현으로, DroidDeck 내부 파일 시스템의 파일을 다른 Syncthing 인스턴스와 동기화할 수 있습니다. DroidDeck 내부 파일 시스템에 저장한 파일에만 적용됩니다.</string> + <string name="sync_missing">이 빌드에는 Syncthing이 포함되어 있지 않습니다.</string> + <string name="sync_starting">Syncthing 시작 중</string> + <string name="sync_status_starting">시작 중</string> + <string name="sync_status_up_to_date">최신 상태</string> + <string name="sync_status_syncing">동기화 중</string> + <string name="sync_status_paused">일시 중지됨</string> + <string name="sync_status_pausing">일시 중지 중</string> + <string name="sync_status_resuming">재개 중</string> + <string name="sync_status_attention">확인 필요</string> + <string name="sync_status_failed">Syncthing이 중지됨</string> + <string name="sync_failed_retry">다시 시도</string> + <string name="sync_paused_wifi">Wi-Fi 연결 시까지 일시 중지됨</string> + <string name="sync_paused_game">게임 중 일시 중지됨</string> + <string name="sync_summary">폴더 %1$d개 · 기기 %3$d대 중 %2$d대 연결됨</string> + <string name="sync_left">%1$s 남음</string> + <string name="sync_open_web_ui">웹 UI 열기</string> + <string name="sync_pause">일시 중지</string> + <string name="sync_resume">재개</string> + <string name="sync_running">실행 중</string> + <string name="sync_running_hint">끄면 Syncthing이 완전히 중지됩니다.</string> + <string name="sync_this_device">이 기기</string> + <string name="sync_device_id">기기 ID</string> + <string name="sync_show_qr">QR 코드 표시</string> + <string name="sync_advanced">고급</string> + <string name="sync_advanced_hint">포트, 실행 시점, 초기화</string> + <string name="sync_open">열기</string> + <string name="sync_waiting">확인 대기 중</string> + <string name="sync_pending_device">%1$s에서 연결을 요청합니다</string> + <string name="sync_pending_folder">%1$s에서 “%2$s” 폴더를 공유하려고 합니다</string> + <string name="sync_pending_folder_hint">수락하면 DroidDeck에서 저장할 위치를 선택할 수 있습니다.</string> + <string name="sync_review">웹 UI에서 검토</string> + <string name="sync_folders">폴더</string> + <string name="sync_no_folders">아직 폴더가 없습니다.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">최신 상태</string> + <string name="sync_folder_syncing">동기화 중 %1$d%%</string> + <string name="sync_folder_scanning">스캔 중</string> + <string name="sync_folder_paused">일시 중지됨</string> + <string name="sync_folder_out_of_sync">동기화되지 않음</string> + <string name="sync_folder_errors">파일 %1$d개를 동기화하지 못했습니다</string> + <string name="sync_folder_blocked">차단됨</string> + <string name="sync_folder_blocked_hint">이 폴더는 DroidDeck 저장 공간 밖에 있어서 DroidDeck이 일시 중지했습니다. DroidDeck 밖의 폴더를 동기화하려면 Syncthing-Fork 앱을 사용하세요.</string> + <string name="sync_remove_folder">Syncthing에서 제거</string> + <string name="sync_remove_folder_hint">제거해도 파일은 삭제되지 않습니다.</string> + <string name="sync_devices">기기</string> + <string name="sync_no_devices">아직 기기가 없습니다.</string> + <string name="sync_connected">연결됨</string> + <string name="sync_offline">오프라인</string> + <string name="sync_last_seen">마지막 접속: %1$s</string> + <string name="sync_device_id_title">이 기기의 ID</string> + <string name="sync_device_id_hint">다른 기기의 Syncthing에서 기기를 추가하고 이 코드를 스캔하거나 ID를 붙여넣으세요. 그런 다음 여기 웹 UI에서 수락하세요.</string> + <string name="sync_copy">복사</string> + <string name="sync_share">공유</string> + <string name="sync_done">완료</string> + <string name="sync_off_title">Syncthing을 끄시겠습니까?</string> + <string name="sync_off_body">Syncthing이 지금 중지되며 다시 켤 때까지 중지된 상태로 유지됩니다. 동기화된 파일은 그대로 유지됩니다.</string> + <string name="sync_off_forget">Syncthing 구성도 삭제</string> + <string name="sync_off_forget_hint">이 기기의 ID, 폴더 및 기기를 제거합니다. 다시 켜면 처음부터 시작합니다.</string> + <string name="sync_turn_off">끄기</string> + <string name="sync_ports">포트</string> + <string name="sync_port_sync">동기화</string> + <string name="sync_port_discovery">로컬 탐색</string> + <string name="sync_repick">새 포트 선택</string> + <string name="sync_repick_hint">시작할 때마다 다시 확인합니다.</string> + <string name="sync_repick_button">다시 선택</string> + <string name="sync_reset_group">초기화</string> + <string name="sync_api_key">API 키</string> + <string name="sync_regenerate">다시 생성</string> + <string name="sync_reset">Syncthing 초기화</string> + <string name="sync_reset_hint">새 기기 ID가 생성되고 폴더와 기기가 제거됩니다. DroidDeck 저장 공간의 파일은 유지됩니다.</string> + <string name="sync_reset_button">초기화</string> + <string name="sync_reset_confirm_title">Syncthing을 초기화하시겠습니까?</string> + <string name="sync_running_group">실행</string> + <string name="sync_run">실행</string> + <string name="sync_run_open">DroidDeck이 열려 있는 동안</string> + <string name="sync_run_background">백그라운드에서</string> + <string name="sync_wifi_only">Wi-Fi에서만</string> + <string name="sync_pause_games">게임 중 일시 중지</string> + <string name="sync_logs">로그</string> + <string name="sync_logs_hint">이 세션의 Syncthing 출력</string> + <string name="sync_logs_share">공유</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">먼저 Linux 런타임을 설치하세요.</string> + <string name="sync_accept">수락</string> + <string name="sync_accept_title">“%1$s” 저장 위치</string> + <string name="sync_add_folder">폴더 추가</string> + <string name="sync_add_folder_hint">DroidDeck 저장 공간의 폴더 동기화</string> + <string name="sync_choose">선택</string> + <string name="sync_add">추가</string> + <string name="sync_add_failed">폴더를 추가할 수 없습니다.</string> + <string name="sync_share_with">공유 대상</string> + <string name="sync_share_none">아직 기기가 없습니다. 나중에 웹 UI에서 이 폴더를 공유할 수 있습니다.</string> + <string name="sync_use_folder">이 폴더 사용</string> + <string name="sync_new_folder">새 폴더</string> + <string name="sync_location_home">컨테이너 홈</string> + <string name="sync_location_sync">Sync 폴더</string> + <string name="sync_location_shared">DroidDeck 공유 저장 공간</string> + <string name="sync_location_card">%1$s의 DroidDeck</string> + <string name="sync_location_app">DroidDeck 앱 데이터</string> + <string name="sync_web_path_locked">새 폴더는 DroidDeck의 Sync 폴더에 저장됩니다. 다른 DroidDeck 폴더를 동기화하려면 Syncthing 탭에서 \"폴더 추가\"를 사용하세요.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">새로고침</string> + <string name="sync_not_running">Syncthing이 실행 중이 아닙니다.</string> + <string name="session_end_steam_sigill">Steam이 잘못된 명령어(SIGILL)로 중지되었습니다. CPU 명령어 호환성 문제이거나 클라이언트 충돌일 수 있습니다. 기기 정보와 함께 로그를 공유하세요.</string> + <string name="session_end_steam_try_x64">Steam 설정 → Steam 클라이언트 → x86-64(실험적)를 시도해 볼 수 있습니다. 추가 다운로드가 필요하며 더 느리게 실행될 수 있습니다.</string> + <string name="session_end_vulkan_device">Linux 그래픽 드라이버가 사용 가능한 Vulkan 장치를 찾지 못했습니다. 선택한 Linux GPU 드라이버가 이 GPU를 지원하는지 확인하세요.</string> + <string name="session_end_gpu_unsupported">현재 설정에 이 GPU와 호환되는 Linux Vulkan 드라이버가 없어 세션을 시작할 수 없습니다. Adreno Turnip 드라이버로는 MediaTek/Mali GPU를 지원할 수 없습니다.</string> <string name="glasses_6dof">6DoF 가상 화면</string> <string name="tracking_recovery_look">조명이 밝은 방에서 천천히 주변을 둘러보세요.\n추적 카메라를 가리지 말고 가구처럼 특징이 뚜렷한 곳을 바라보세요.</string> <string name="tracking_recovery_restart_help">아직도 막혔나요? 휴대폰에서: 스마트 안경 → 추적 → 설정 열기 → 진단 표시 → 추적 다시 시작.</string> @@ -2956,4 +3419,194 @@ <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_resources_browser">브라우저에서 열림</string> + <string name="game_resource_guides">가이드</string> + <string name="game_resource_protondb_detail">Linux / Proton 호환성 보고서</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Steam 계정에 저장 파일이 있는 게임용</string> + <string name="game_resource_search">웹 검색</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="library_filter">필터</string> + <string name="library_filter_installed">설치된 게임만</string> + <string name="library_filter_all_owned">보유한 모든 게임</string> + <string name="library_no_installed_matches">이 필터와 일치하는 설치된 게임이 없습니다.</string> + <string name="library_browse_owned">보유한 게임 둘러보기</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="stores_itch_updates_found">사용 가능한 업데이트: %1$d</string> + <string name="stores_itch_update_replaced">개발자가 이 빌드를 %1$s(으)로 교체했습니다. 업데이트할까요?</string> + <string name="xbox_filter_cloud">클라우드</string> + <string name="stores_xbox_cloud_settings">클라우드 설정</string> + <string name="integration_title">Steam 연동</string> + <string name="integration_count">%2$d개 중 %1$d개 켜짐</string> + <string name="integration_set_up">설정</string> + <string name="integration_location">위치</string> + <string name="integration_app_info">앱 정보</string> + <string name="integration_wifi">Wi-Fi 이름</string> + <string name="integration_brightness">밝기</string> + <string name="integration_home">DroidDeck을 홈으로</string> + <string name="integration_shortcuts">홈 버튼 단축키</string> + <string name="integration_wifi_hint">Steam에 네트워크 표시 · 위치 접근 권한 필요, 위치는 추적하지 않음</string> + <string name="integration_wifi_on">Steam에 네트워크가 표시됨</string> + <string name="integration_wifi_location_off">위치가 꺼져 있음</string> + <string name="integration_wifi_denied">위치 거부됨 · 앱 정보에서 허용하세요</string> + <string name="integration_brightness_hint">Steam 슬라이더로 화면 밝기 조절</string> + <string name="integration_home_hint">세션 중 홈 버튼으로 Steam 메뉴 열기</string> + <string name="integration_shortcuts_hint">홈 버튼을 길게 눌러 Steam Guide 조합 사용</string> + <string name="integration_shortcuts_needs_home">DroidDeck을 홈으로 설정해야 함</string> + <string name="integration_shortcuts_maybe_restricted">Android에서 회색으로 표시되나요? 앱 정보 → ⋮ → 제한된 설정 허용</string> + <string name="integration_shortcuts_restricted">Android에서 차단됨 · 앱 정보 → ⋮ → 제한된 설정 허용</string> + <string name="integration_shortcuts_service">DroidDeck 홈 버튼</string> + <string name="integration_shortcuts_service_description">Steam 세션에 포커스가 있고 DroidDeck이 기본 홈 앱일 때 홈 버튼 입력을 Steam Guide로 전달합니다. 화면 콘텐츠는 읽지 않습니다.</string> + <string name="integration_brightness_needed">설정 → Steam 연동에서 밝기를 켜세요</string> + <string name="apps_search_hint">앱 검색</string> + <string name="apps_no_match">‘%1$s’와(과) 일치하는 앱이 없습니다.</string> + <string name="apps_add_widget">위젯 추가</string> + <string name="apps_widgets_loading">위젯 불러오는 중…</string> + <string name="apps_widgets_none">이 기기에 위젯을 제공하는 앱이 없습니다.</string> + <string name="apps_widget_wider">더 넓게</string> + <string name="apps_widget_narrower">더 좁게</string> + <string name="apps_widget_taller">더 높게</string> + <string name="apps_widget_shorter">더 낮게</string> + <string name="apps_widget_move_earlier">앞으로 이동</string> + <string name="apps_widget_move_later">뒤로 이동</string> + <string name="apps_widget_configure">위젯 설정</string> + <string name="apps_widget_remove">위젯 삭제</string> + <string name="apps_add_to_folder">폴더에 추가</string> + <string name="apps_new_folder">새 폴더</string> + <string name="apps_remove_from_folder">폴더에서 제거</string> + <string name="apps_app_info">앱 정보</string> + <string name="apps_uninstall">제거</string> + <string name="apps_folder_rename">이름 변경</string> + <string name="apps_folder_ungroup">그룹 해제</string> + <string name="apps_folder_default">폴더</string> + <string name="apps_folder_name">폴더 이름</string> + <string name="apps_filter">표시</string> + <string name="apps_filter_all">모든 앱</string> + <string name="apps_filter_games">게임</string> + <string name="apps_filter_downloaded">다운로드됨</string> + <string name="apps_filter_system">시스템</string> + <string name="apps_filter_hidden">숨김</string> + <string name="apps_hide">숨기기</string> + <string name="apps_unhide">앱에 표시</string> + <string name="apps_shortcut_remove">바로가기 삭제</string> + <string name="apps_pin_title">앱에 추가</string> + <string name="apps_pin_add">추가</string> + <string name="apps_hidden_none">숨긴 앱이 없습니다.</string> + <string name="apps_sort_name_asc">이름 A–Z</string> + <string name="apps_sort_name_desc">이름 Z–A</string> + <string name="apps_sort_installed">최근 설치</string> + <string name="apps_sort_updated">최근 업데이트</string> + <plurals name="apps_count"> + <item quantity="other">앱 %d개</item> + </plurals> + <string name="desktop_restore_title">소프트웨어 복원 중</string> + <string name="desktop_restore_body">DroidDeck 업데이트 후 추가한 앱을 다시 설치하고 있습니다.</string> + <string name="desktop_restore_done_title">소프트웨어 복원됨</string> + <string name="desktop_restore_done_body">추가한 앱이 다시 설치되었습니다.</string> + <string name="desktop_restore_failed_title">일부 소프트웨어를 복원하지 못했습니다</string> + <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log를 확인한 다음 Konsole에서 sudo apt install을 시도하세요.</string> + <string name="gog_full_files">기본 최적화를 사용할 수 없습니다. 다운로드에 완전한 교체 파일이 포함됩니다.</string> + <string name="gog_recover">패치 결과 확인</string> + <string name="slow_usb_title">USB 연결이 느립니다</string> + <string name="slow_usb_cable">%1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 게임 로딩이 느립니다. 5 Gbps 이상의 USB 3 케이블을 사용하거나, USB-C 플러그를 뒤집어 꽂거나, 더 빠른 드라이브를 사용하세요.</string> + <string name="slow_usb_port">%1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 있습니다. 이 기기의 USB 포트는 더 빠르게 동작하지 않아 게임 로딩이 느립니다. 내부 저장소나 microSD 카드가 더 빠를 수 있습니다.</string> + <string name="slow_usb_never">다시 표시 안 함</string> + <string name="slow_usb_dismiss">닫기</string> + <string name="steam_import_title">게임을 추가하려면 Steam을 다시 시작할까요?</string> + <string name="steam_import_body">보유한 다음 게임을 Steam에서 설치됨으로 표시할 수 있습니다: %1$s. 표시하려면 Steam을 다시 시작해야 합니다. 지금 다시 시작하거나, 다음에 Steam을 시작할 때 추가됩니다.</string> + <string name="steam_import_names_more">%1$s 외 %2$d개</string> + <string name="steam_import_now">지금 다시 시작</string> + <string name="steam_import_later">나중에</string> + <string name="gog_maintenance">GOG 설치 관리</string> + <string name="gog_check">업데이트 확인</string> + <string name="gog_repair">확인/복구</string> + <string name="gog_patches">오프라인 패치</string> + <string name="gog_refresh">전체 오프라인 설치 프로그램 다운로드</string> + <string name="gog_update">%1$s(으)로 업데이트</string> + <string name="gog_resume">GOG 유지 관리 재개</string> + <string name="gog_open_patch">패치 설치 프로그램 열기</string> + <string name="gog_patch_in_session">Linux 세션에서 패치 설치 프로그램을 완료하거나 취소하세요.</string> + <string name="gog_patch_requirements">설치된 버전과 언어에 맞는 패치를 선택하세요. 지원되는 원본 버전이 목록에 없을 수 있습니다.</string> + <string name="gog_no_patches">GOG에는 이 게임의 독립형 Windows 패치가 없습니다.</string> + <string name="gog_managed_files">수정된 게임 파일이 교체될 수 있습니다.</string> + <string name="gog_patch_installer_note">설치 프로그램이 Linux 세션에서 열립니다.</string> + <string name="gog_download_label">다운로드</string> + <string name="gog_space_label">추가 공간</string> + <string name="gog_space_estimate_label">예상 공간</string> + <string name="gog_repair_action">파일 복구</string> + <string name="gog_refresh_action">설치 새로 고침</string> + <string name="gog_select_patch">선택</string> + <string name="setup_all_files">모든 파일 접근</string> + <string name="setup_local_network">로컬 네트워크</string> + <string name="libraries_title">추가 Steam 라이브러리</string> + <string name="libraries_hint">Steam이 게임을 설치하고 실행할 수 있는 폴더이며 각각 이름을 지정할 수 있습니다. 목록에서 제거해도 디스크의 게임은 유지됩니다.</string> + <string name="libraries_add">라이브러리 추가</string> + <string name="libraries_rename_title">라이브러리 이름</string> + <string name="libraries_pick">라이브러리 폴더 선택</string> + <string name="libraries_full">추가 라이브러리는 최대 %1$d개</string> + <string name="libraries_overlap">이 폴더는 이미 라이브러리이거나 라이브러리 안에 있습니다</string> + <string name="libraries_missing">%1$s · 사용할 수 없음</string> + <string name="libraries_applies_next">다음 Steam 세션부터 적용</string> + <string name="bottom_desktop_start">데스크톱 시작</string> + <string name="bottom_desktop_mode_touch">직접 터치</string> + <string name="bottom_desktop_trackpad">터치패드. 탭하여 직접 터치로 전환</string> + <string name="bottom_desktop_direct_touch">직접 터치. 탭하여 터치패드로 전환</string> + <string name="bottom_desktop_starting">KDE 데스크톱 시작 중…</string> + <string name="bottom_desktop_ended">데스크톱이 종료되었습니다.</string> + <string name="bottom_desktop_failed">데스크톱을 시작하지 못했습니다. 로그는 이 세션의 bottom-desktop 폴더에 있습니다.</string> + <string name="bottom_desktop_off">데스크톱이 닫혀 있습니다.</string> + <string name="libraries_rename">이름 바꾸기</string> + <string name="second_mode_desktop">데스크톱</string> + <string name="bottom_desktop_mode_trackpad">터치패드</string> + <string name="bottom_desktop_title">데스크톱 · %1$s</string> </resources> diff --git a/app/src/main/res/values-ms/gestures.xml b/app/src/main/res/values-ms/gestures.xml index 67f5d2091..d47bfc09e 100644 --- a/app/src/main/res/values-ms/gestures.xml +++ b/app/src/main/res/values-ms/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gerak isyarat</string> <string name="gesture_settings">Tetapan gerak isyarat sentuhan</string> - <string name="gesture_settings_hint">Sesuaikan gerak isyarat tetikus dan papan kekunci. Pilih Gerak isyarat sebagai mod sentuhan untuk menggunakannya.</string> <string name="gesture_tap">Ketik</string> <string name="gesture_drag">Seret dengan satu jari</string> <string name="gesture_long_press">Tekan lama</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Tahan dengan tiga jari</string> <string name="gesture_pinch">Cubit untuk zum</string> <string name="gesture_hold_button">Kekalkan butang ditekan</string> + <string name="gesture_hold_left">Kekalkan butang kiri ditekan</string> + <string name="gesture_hold_right">Kekalkan butang kanan ditekan</string> <string name="gesture_click_once">Klik sekali</string> <string name="gesture_hold_delay">Lengah sebelum menahan</string> <string name="gesture_double_delay">Sela ketikan dua kali</string> diff --git a/app/src/main/res/values-ms/shortcuts.xml b/app/src/main/res/values-ms/shortcuts.xml new file mode 100644 index 000000000..63942381b --- /dev/null +++ b/app/src/main/res/values-ms/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Pintasan butang fizikal</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Tetapkan: %1$s</string> + <string name="shortcuts_press">Tekan dan lepaskan butang. Penetapan disimpan secara automatik.</string> + <string name="shortcuts_release">Lepaskan butang untuk meneruskan.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Butang ini sudah ditetapkan kepada: %1$s</string> + <string name="shortcuts_save">Tukar penetapan</string> + <string name="shortcuts_retry">Cuba butang lain</string> + <string name="shortcuts_limitations">Butang Utama dan sesetengah butang tambahan mungkin tidak tersedia.</string> +</resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 2e3eb1205..a475981cb 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Pilihan VKD3D untuk D3D12. nodxr melumpuhkan ray tracing; gunakan hanya untuk permainan yang memerlukannya.</string> <string name="game_env_proton_log">Tetapkan kepada 1 untuk log diagnostik Proton. Pengelogan boleh mengurangkan prestasi dan menggunakan storan.</string> <string name="game_env_wined3d">Tetapkan kepada 1 untuk menggunakan WineD3D berasaskan OpenGL dan bukan DXVK, untuk pengujian keserasian D3D9–11.</string> + <string name="game_env_wined3d_renderer">Pemapar untuk DirectDraw, Direct3D 1-7 dan permainan yang dijalankan dengan WineD3D. Vulkan melangkau laluan OpenGL-pada-Zink dan jauh lebih pantas untuk permainan DirectDraw dan Direct3D 7 lama pada Adreno.</string> + <string name="game_env_dxvk_d3d8">Tetapkan kepada 1 untuk menjalankan Direct3D 8 melalui DXVK dan bukan WineD3D. Lebih pantas dalam ujian Direct3D 8 AIO Graphics Test pada Adreno.</string> <string name="game_env_no_ntsync">Tetapkan kepada 1 untuk mengekalkan permainan ini di luar ntsync (droiddeck-ntsync atau pemacu kernel); ia menggunakan droiddeck-esync jika pek wujud, jika tidak droiddeck-fsync.</string> <string name="game_env_no_esync">Tetapkan kepada 1 untuk mematikan droiddeck-esync bagi permainan ini; ia menggunakan droiddeck-fsync sebagai ganti, atau droiddeck-ntsync jika fsync juga dimatikan.</string> <string name="game_env_no_fsync">Tetapkan kepada 1 untuk mengekalkan permainan ini di luar droiddeck-fsync; ia menggunakan droiddeck-esync jika pek wujud, jika tidak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Tetapkan kepada 1 untuk menjalankan permainan ini pada droiddeck-fsync, atau 0 untuk meletakkan droiddeck-esync dahulu jika pek sepadan dengan Protonnya.</string> <string name="game_env_xalia">Tetapkan kepada 0 untuk melumpuhkan pembantu navigasi pad permainan Proton bagi permainan ini.</string> + <string name="game_env_anticheat_offline">Hidup secara lalai. Memulakan permainan Easy Anti-Cheat tanpa anti-tipunya apabila permainan menyokong main luar talian. Matikan untuk melancarkan melalui Easy Anti-Cheat seperti biasa. Mod dalam talian yang memerlukan Easy Anti-Cheat kekal tidak tersedia.</string> <string name="game_env_hud">Overlay DXVK untuk D3D9–11. fps memaparkan kadar bingkai; nyahtetapkan untuk menyembunyikannya.</string> <string name="game_env_dxvk_config">Tetapan DXVK diasingkan dengan tanda koma bertitik. Binaan terkini menggunakan dxvk.maxFrameRate untuk pengehadan bingkai; lebih baik gunakan pengehad bingkai sesi untuk permainan biasa.</string> + <string name="game_env_cores">Teras CPU untuk permainan ini, seperti 0-4 atau 0,2,4, menggantikan teras permainan sesi. Lebih sedikit teras berjalan lebih sejuk.</string> <string name="game_env_vkd3d_limit">Had kadar bingkai D3D12. 0 melumpuhkan had.</string> <string name="game_env_glthread">Threading OpenGL Mesa. true boleh membantu permainan OpenGL yang terhad oleh CPU; uji bagi setiap permainan.</string> <string name="sync_backend_title">Segerak Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX menjalankan program Linux x86 pada peranti ARM64 ini. Auto menggunakannya apabila program dibina untuk x86.</string> <string name="app_fex_x86">%1$s melalui FEX</string> <string name="app_fex_not_ready">Program ini dibina untuk PC %1$s dan berjalan melalui FEX, yang belum disediakan lagi. Buka Steam sekali semasa anda log masuk: DroidDeck akan memuat turun FEX dan Steam Linux Runtime yang diperlukan, kemudian ini akan dibuka.</string> + <string name="session_proot_missing">proot DroidDeck tidak dapat dimuat turun. Semak sambungan dan cuba lagi. Sesi tidak dimulakan kerana proot sandaran terlalu perlahan untuk bermain.</string> + <string name="session_directaudio_missing">DirectAudio tidak dapat dimuat turun, jadi audio permainan menggunakan laluan yang lebih perlahan untuk sesi ini.</string> <string name="session_end_program">Program ini</string> <string name="session_end_steam_download">Tidak dapat memuat turun klien Steam. Rangkaian atau VPN anda mungkin menyekat pelayan Steam; semak sambungan dan cuba lagi.</string> <string name="session_end_steam_setup">Tidak dapat menyediakan klien Steam. Semak sambungan dan ruang storan kosong, kemudian cuba lagi.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Pengawal Xbox 360</string> <string name="mode_controller_note">Deck: butang Quick Access dan giro. Steam Controller: sama, dengan grip sense pada butang belakang. DualShock 4 dan DualSense: giro, dan trackpad sebagai pad sentuhnya. Xbox 360: buka Quick Access dengan Guide+A.</string> <string name="mode_back">Kembali</string> + <string name="back_hold">Tahan Kembali untuk pintasan Steam</string> + <string name="back_hold_hint">Menahan Kembali membuka Akses Pantas atau membuat kombinasi Steam dengan butang lain. Matikan untuk mengabaikan Kembali yang ditahan; ketik dan ketik dua kali masih berfungsi.</string> + <string name="back_native_qam_hint">Tahan Kembali selama 700 ms, atau tahan Kembali dan tekan butang lain untuk pintasan Steam.</string> + <string name="back_double_tap_window">Tempoh ketik dua kali</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Benarkan kawalan kecerahan</string> + <string name="brightness_permission_text">Sediakan kawalan kecerahan dalam DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesi</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Terkini · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Pasang yang terbaharu</string> + <string name="decky_channel">Saluran Kemas Kini</string> + <string name="decky_channel_hint">Keluaran Decky Loader yang hendak dipasang. Pengemas kini Decky sendiri menggunakan saluran yang sama.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Prakeluaran</string> + <string name="decky_channel_testing">Pengujian</string> + <string name="decky_channel_failed">Tidak dapat menyimpan saluran kemas kini Decky</string> <string name="mode_decky_on">Bermula bersama Steam. Semasa dihidupkan, apl lain pada peranti ini mungkin boleh mengawal Steam.</string> <string name="mode_decky_off">Mati. Port debug jauh Steam kekal tertutup.</string> <string name="mode_decky_remove_title">Nyahpasang Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klien</string> <string name="mode_mangoapp">Overlay prestasi</string> <string name="mode_mangoapp_hint">Matikan jika permainan ranap atau skrin hitam dalam mod Deck. Berkuat kuasa pada sesi seterusnya.</string> + <string name="mode_return_after_game">Kembali ke DroidDeck selepas permainan</string> + <string name="mode_return_after_game_hint">Apabila permainan yang anda mulakan dari DroidDeck atau pelancar lain ditutup, Steam keluar dengan bersih (simpanan awan selesai dahulu) dan anda kembali ke sana. Mati: kekal dalam Steam.</string> + <string name="mode_shader_precache">Pra-cache shader</string> + <string name="mode_shader_precache_hint">Steam memuat turun shader yang telah dibina untuk permainan anda dan memprosesnya di latar belakang, jadi permainan kurang tersekat-sekat. Mati menjimatkan data, storan dan bateri; permainan membina shader semasa dimainkan. Tetapan yang sama seperti Downloads > Shader Pre-Caching dalam Steam. Berkuat kuasa pada sesi seterusnya.</string> <string name="mode_steam_repair">Baik pulih klien Steam</string> <string name="mode_steam_repair_hint">Memuat turun semula klien Steam pada permulaan Steam seterusnya. Gunakan jika Steam tersekat pada skrin pemuatannya. Permainan, log masuk dan tetapan dikekalkan.</string> <string name="mode_steam_repair_queued">Klien Steam akan dimuat turun semula pada permulaan Steam seterusnya.</string> @@ -373,6 +412,8 @@ <string name="mode_directaudio_hint">Memintas PulseAudio untuk kependaman yang lebih rendah.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Untuk sembang suara.</string> + <string name="drawer_mic_hint">Hidupkan atau matikan tangkapan mikrofon untuk sesi ini.</string> + <string name="drawer_mic_failed">Tidak dapat menukar mikrofon. Sila cuba lagi.</string> <string name="mode_network">Rangkaian</string> <string name="mode_wifi_discovery">Penemuan Wi-Fi</string> <string name="mode_wifi_discovery_hint">Tunjukkan nama Wi-Fi dan rangkaian berdekatan dalam Steam.</string> @@ -533,14 +574,24 @@ <string name="perf_gsrealtime">gamescope: baris gilir GPU masa nyata</string> <string name="perf_gsrealtime_hint">Mengutamakan kerja GPU compositor. Boleh melicinkan rentak bingkai dengan sedikit kos kepada permainan.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memori</string> + <string name="perf_cap_off">Mati</string> + <string name="perf_cap_auto">Lalai pemacu</string> + <string name="perf_zram_client">Mampatkan Steam semasa permainan berjalan</string> + <string name="perf_zram_client_hint">20 s selepas permainan bermula, klien Steam dimampatkan ke dalam zRAM untuk memberi permainan lebih banyak memori, dan dibaca semula apabila permainan ditutup. Matikan ini jika sesi tertutup sejurus selepas permainan bermula. Had RAM di atas masih memampatkan Steam apabila sesi melebihinya.</string> + <string name="perf_ram_cap">Had RAM</string> + <string name="perf_ram_cap_hint">Berkuat kuasa semasa klien Steam berjalan, dalam mod Steam atau dari desktop. Apabila sesi menggunakan lebih daripada ini, Steam dan kemudian proses lain sesi yang disokong dimampatkan ke dalam zRAM. Had lembut: tiada apa yang ditutup, tetapi permainan mungkin tersekat-sekat semasa halaman dibaca semula.</string> + <string name="perf_ram_cap_unavailable">Memerlukan swap zRAM, yang tiada pada peranti ini.</string> + <string name="perf_vram_cap">Had VRAM</string> + <string name="perf_vram_cap_hint">Memori video yang dilaporkan DXVK kepada permainan Direct3D, supaya ia memperuntukkan tekstur untuk jumlah yang lebih kecil. Tetapan DXVK permainan itu sendiri tetap diutamakan. Berkuat kuasa pada sesi seterusnya.</string> <string name="perf_gpuclock">Kekalkan GPU pada kelajuan tertinggi</string> <string name="perf_gpuclock_hint">Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba.</string> <string name="perf_fixes">Pembetulan sesi</string> <string name="perf_sysmem">Turnip: rendering sysmem</string> <string name="perf_sysmem_hint">Lebih pantas untuk klien Steam; dalam permainan, pemacu memilih pemaparan jubin atau memori sistem bagi setiap laluan. Diperlukan pada Adreno 710/720/722.</string> <string name="perf_xalia">Langkau pembantu xalia Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (eksperimen)</string> - <string name="perf_fastsync_hint">Pengganti ruang pengguna untuk pemacu ntsync Linux, untuk pengujian. Semasa ia hidup, Proton menggunakannya sebagai ganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton dan proton-cachyos. Berkuat kuasa pada sesi seterusnya.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Pengganti ruang pengguna untuk pemacu ntsync Linux. Semasa ia hidup, Proton menggunakannya sebagai ganti droiddeck-esync dan droiddeck-fsync. Berfungsi dengan Proton Experimental ARM64, GE-Proton dan proton-cachyos. Berkuat kuasa pada sesi seterusnya.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync dahulu</string> <string name="perf_fsync_hint">Menjalankan fsync Proton sendiri pada fail Proton standard, dengan futex_waitv dibekalkan dalam ruang pengguna, jadi ia tidak memerlukan pek dan terus berfungsi sebaik sahaja Steam mengemas kini Proton. Semasa ia hidup, permainan menggunakannya mendahului droiddeck-esync, kecuali beberapa Proton yang mematikan fsync. Berkuat kuasa pada sesi seterusnya.</string> @@ -551,6 +602,8 @@ <string name="perf_fastpath">Laluan pantas proot</string> <string name="perf_fastpath_needs_seccomp">Memerlukan penapis seccomp proot.</string> <string name="perf_fastpath_hint">Carian fail lebih pantas dan kurang tersekat-sekat. Matikan jika sesuatu program tidak dapat mencari failnya.</string> + <string name="perf_cursor_composite">Lukis kursor di dalam gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope melukis penuding sendiri dan bukan menyerahkannya kepada Android. Hidupkan untuk kursor yang dikawal pengawal. Mati lebih pantas pada telefon. Berkuat kuasa pada sesi seterusnya.</string> <string name="perf_identity">Identiti sesi</string> <string name="perf_hostname">Nama hos</string> <string name="perf_hostname_hint">Nama yang dilihat Steam untuk peranti ini. Kosongkan untuk memulihkan %1$s.</string> @@ -565,6 +618,8 @@ <string name="driver_delete_plain">Failnya dialih keluar daripada apl.</string> <string name="driver_delete_in_use">Failnya dialih keluar. Ia sedang digunakan, jadi lalai mengambil alih.</string> <string name="drawer_page_display">Paparan</string> + <string name="drawer_frame_limit">Had bingkai</string> + <string name="drawer_frame_limit_note">Mengehadkan permainan ini. Paparan bertukar kepada kadar segar semula yang boleh dibahagi sama rata dengan had jika ada; had lain mungkin kelihatan tidak sekata. Permainan Steam menggunakan Frame Limit Steam dalam menu Akses Pantas.</string> <string name="drawer_page_effects">Kesan</string> <string name="drawer_page_controls">Kawalan</string> <string name="drawer_page_components">Komponen</string> @@ -589,6 +644,66 @@ <string name="drawer_hud_color_amber">Ambar</string> <string name="drawer_hud_color_violet">Ungu</string> <string name="drawer_hud_opacity">Kelegapan</string> + <string name="hud_size">Saiz</string> + <string name="hud_size_hint">Mengetik HUD juga menukar saiznya.</string> + <string name="hud_size_full">Penuh</string> + <string name="hud_size_tiles">Jubin</string> + <string name="hud_size_pill">Pil</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Jalur</string> + <string name="hud_locked">Kunci di tempat</string> + <string name="hud_locked_hint">Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi.</string> + <string name="hud_snap">Lekap ke sisi</string> + <string name="hud_snap_hint">Lepaskan HUD dan ia akan beralih ke sisi skrin yang lebih dekat. Kuis pantas melemparkannya ke arah itu.</string> + <string name="hud_group_look">Rupa</string> + <string name="hud_scale">Saiz pada skrin</string> + <string name="hud_color_soft">Lembut</string> + <string name="hud_color_mid">Sederhana</string> + <string name="hud_color_vivid">Terang</string> + <string name="hud_outline">Garis luar</string> + <string name="hud_outline_color">Warna garis luar</string> + <string name="hud_outline_gray">Kelabu</string> + <string name="hud_outline_theme">Warna tema</string> + <string name="hud_group_metrics">Bacaan</string> + <string name="hud_metric_graph">Graf masa bingkai</string> + <string name="hud_metric_decimal">Kadar bingkai dengan perpuluhan</string> + <string name="hud_metric_low001" formatted="false">0.01% terendah</string> + <string name="hud_metric_engine">Enjin grafik</string> + <string name="hud_metric_gpu_model">Nama GPU</string> + <string name="hud_metric_gpu">Beban GPU</string> + <string name="hud_metric_gpu_temp">Suhu GPU</string> + <string name="hud_metric_cpu">Beban CPU</string> + <string name="hud_metric_per_core">CPU setiap teras</string> + <string name="hud_metric_temp">Suhu</string> + <string name="hud_metric_ram">Memori</string> + <string name="hud_metric_vram">Memori grafik</string> + <string name="hud_metric_swap">Memori swap</string> + <string name="hud_metric_battery">Tahap bateri</string> + <string name="hud_metric_power">Penggunaan kuasa</string> + <string name="hud_metric_network">Rangkaian</string> + <string name="hud_metric_resolution">Resolusi</string> + <string name="hud_metric_proton">Versi Proton</string> + <string name="hud_metric_session">Tempoh sesi</string> + <string name="hud_metric_clock">Jam</string> + <string name="hud_group_temps">Suhu</string> + <string name="hud_temp_unit">Unit</string> + <string name="hud_temp_bands">Warna amaran</string> + <string name="hud_temp_bands_hint">Suhu bertukar ambar, kemudian merah, apabila menghampiri had.</string> + <string name="hud_temp_bands_off">Mati</string> + <string name="hud_temp_bands_auto">Automatik</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU merah pada</string> + <string name="hud_temp_red_gpu">GPU merah pada</string> + <string name="hud_temp_red_battery">Bateri merah pada</string> + <string name="hud_group_more">Lagi</string> + <string name="hud_export">Diagnostik HUD</string> + <string name="hud_export_hint">Menyimpan laporan setiap sensor yang dibaca HUD ke Downloads/DroidDeck.</string> + <string name="hud_export_button">Simpan</string> + <string name="hud_export_done">Disimpan di %1$s</string> + <string name="hud_export_failed">Tidak dapat menyimpan laporan HUD.</string> + <string name="hud_reset">Set semula tetapan HUD</string> + <string name="hud_reset_button">Set semula</string> <string name="drawer_scaling">Mod penskalaan</string> <string name="drawer_scaling_sharpness">Ketajaman penskalaan</string> <string name="drawer_effects">Kesan skrin</string> @@ -623,10 +738,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Papan kekunci</string> <string name="drawer_latency">Kependaman</string> + <string name="drawer_low_latency">Mod kependaman rendah</string> + <string name="drawer_low_latency_hint">Meningkatkan penggunaan CPU dan bateri</string> <string name="drawer_low_latency_controller">Pengawal kependaman rendah</string> <string name="drawer_low_latency_controller_hint">Pengawal melapor pada 1000 Hz dan bukan 250 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_low_latency_touch">Sentuh kependaman rendah</string> <string name="drawer_low_latency_touch_hint">Sentuhan melangkau pengumpulan bingkai, jadi kawalan sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU.</string> + <string name="drawer_evdev_mouse">Saluran tetikus mentah</string> + <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Papan kekunci PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Skrin kedua</string> @@ -712,6 +831,10 @@ <string name="setup_session">Sesi</string> <string name="setup_logs">Log sesi</string> <string name="setup_logs_hint">Disimpan selepas setiap sesi</string> + <string name="setup_game_debug_logs">Log nyahpepijat permainan</string> + <string name="setup_game_debug_logs_hint">Sertakan diagnostik Proton, Wine dan grafik pada pelancaran permainan seterusnya. Boleh mengurangkan prestasi dan menggunakan lebih banyak storan.</string> + <string name="setup_game_debug_logs_restart">Mulakan semula sesi ini untuk menyimpan log nyahpepijat permainan</string> + <string name="setup_logging_update_failed">Tidak dapat mengemas kini pengelogan. Semak suis dan cuba lagi.</string> <string name="setup_agent_commands">Alatan penyahpepijatan</string> <string name="setup_latest_logs">Log sesi terkini</string> <string name="setup_saved_logs">Log sesi tersimpan</string> @@ -744,12 +867,28 @@ <string name="setup_home_on">DroidDeck boleh menjadi apl Utama</string> <string name="setup_home_off">DroidDeck tidak sekali-kali ditawarkan sebagai apl Utama</string> <string name="setup_orientation">Orientasi</string> + <string name="setup_launcher_orientation">Orientasi pelancar</string> + <string name="setup_launcher_orientation_auto">Ikut putaran peranti</string> + <string name="setup_orientation_portrait">Potret</string> + <string name="setup_session_orientation">Orientasi sesi</string> + <string name="setup_session_orientation_hint">Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; lebar dan tinggi tersuai kekal seperti yang dimasukkan.</string> <string name="setup_orientation_auto">Lanskap automatik</string> <string name="setup_orientation_landscape">Lanskap</string> <string name="setup_orientation_reverse">Lanskap songsang</string> <string name="setup_fullscreen">Skrin penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bar status dan navigasi Android</string> <string name="setup_fullscreen_off">Memaparkan bar status dan navigasi Android</string> + <string name="setup_dual_screen">Dwi skrin</string> + <string name="setup_dual_screen_hint">Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin.</string> + <string name="setup_dual_screen_auto">Automatik</string> + <string name="setup_dual_screen_on">Hidup</string> + <string name="setup_dual_screen_off">Mati</string> + <string name="setup_dual_screen_menu">Menu skrin bawah</string> + <string name="setup_dual_screen_menu_hint">Memindahkan bahagian dan menu dalam permainan ke skrin kedua dan menaip di sana, supaya skrin atas kekal dengan paparan penuh. L2 dan R2 menukar bahagian.</string> + <string name="setup_dual_screen_controls">Kawalan skrin bawah dalam permainan</string> + <string name="setup_dual_screen_controls_hint">Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula.</string> + <string name="dual_typing_title">Menaip untuk skrin atas</string> + <string name="dual_typing_done">Selesai</string> <string name="setup_default_home">Apl Utama lalai</string> <string name="setup_choose_home">Pilih apl Utama</string> <string name="setup_choose">Pilih</string> @@ -894,6 +1033,14 @@ <string name="gate_step1">Buka Tetapan → Pilihan pembangun → Debugging Wayarles dan hidupkannya</string> <string name="gate_step2">Ketik “Gandingkan peranti dengan kod gandingan”</string> <string name="gate_step3">Taip kod itu ke dalam pemberitahuan DroidDeck</string> + <string name="pairguide_build_number">Dalam Perihal telefon, ketik Nombor binaan 7 kali</string> + <string name="pairguide_wireless">Hidupkan Penyahpepijatan wayarles</string> + <string name="pairguide_pair">Buka Penyahpepijatan wayarles, kemudian ketik “Gandingkan peranti dengan kod gandingan”</string> + <string name="pairguide_child_process">Hidupkan “Lumpuhkan sekatan proses anak”</string> + <string name="pairguide_row_child_process">Lumpuhkan sekatan proses anak</string> + <string name="pairguide_row_build_number">Nombor binaan</string> + <string name="pairguide_row_wireless">Penyahpepijatan wayarles</string> + <string name="pairguide_row_pair">Gandingkan peranti dengan kod gandingan</string> <string name="gate_waiting">Menunggu tetingkap timbul gandingan…</string> <string name="gate_code_needed">Tetingkap timbul dijumpai. Masukkan kodnya dalam pemberitahuan.</string> <string name="gate_status">Status</string> @@ -1017,8 +1164,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 +1171,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> @@ -1035,10 +1179,8 @@ <string name="games_never_played">Belum pernah dimainkan</string> <string name="games_runtime_busy_percent">Masa jalan sibuk · %1$d%%</string> <string name="games_runtime_busy">Masa jalan sibuk</string> - <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> @@ -1053,6 +1195,9 @@ <string name="gpu_hide_other">Sembunyikan pemacu untuk GPU lain</string> <string name="gpu_show_other">Papar pemacu untuk GPU lain</string> <string name="gpu_advanced">Lanjutan</string> + <string name="gpu_ubwc_title">Keserasian UBWC</string> + <string name="gpu_ubwc_hint">Cuba Hidup atau Mati jika Steam atau Android memaparkan jalur atau kelipan. Berkuat kuasa pada kedua-dua pemacu selepas DroidDeck dimulakan semula.</string> + <string name="gpu_ubwc_restart">Mulakan semula DroidDeck untuk menggunakannya.</string> <string name="gpu_set_with_display">Ditetapkan bersama pemacu paparan: %1$s membawa kedua-duanya.</string> <string name="gpu_set_with_runtime">Ditetapkan bersama pemacu masa jalan: %1$s membawa kedua-duanya.</string> <string name="gpu_runtime_hint">Digunakan oleh permainan dan desktop.</string> @@ -1107,7 +1252,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> @@ -1161,10 +1306,15 @@ <string name="pip_auto">Masuk ke PiP secara automatik</string> <string name="unfolded_controls">Kawalan pada skrin terbuka</string> <string name="unfolded_controls_hint">Terbuka, permainan terletak di atas trackpad dan pemegang belakang Steam Deck. Dilipat, permainan menjadi skrin penuh.</string> + <string name="unfolded_controls_with_controller">Kekalkan dengan pengawal</string> + <string name="unfolded_controls_with_controller_hint">Juga paparkan kawalan sentuh ini semasa pengawal disambungkan.</string> <string name="pip_suspended">Digantung</string> <string name="pip_not_ready">Gambar dalam gambar tersedia sebaik sahaja sesi sedia.</string> <string name="pip_permission">Benarkan gambar dalam gambar untuk DroidDeck dalam tetapan Android.</string> <string name="pip_unavailable">Android tidak dapat membuka gambar dalam gambar.</string> + <string name="game_more">Lagi</string> + <string name="game_edit_art">Sunting seni</string> + <string name="stores_in_steam_label">Dalam Steam</string> <string name="game_shortcut">Pintasan</string> <string name="game_shortcut_add">Tambah ke skrin utama</string> <string name="game_shortcut_choose">Pilih permainan</string> @@ -1188,6 +1338,10 @@ <string name="main_wait_runtime">Tunggu operasi masa jalan selesai</string> <string name="main_wait_proton_install">Tunggu pemasangan alat keserasian selesai</string> + <string name="load_compat_title">Menyediakan alat keserasian</string> + <string name="load_compat_wait">Menunggu persediaan keserasian selesai</string> + <string name="load_compat_hint">Sesi anda akan bermula apabila persediaan selesai.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Tunggu pemasangan apl desktop selesai</string> <string name="main_wait_install_game">Tunggu pemasangan selesai sebelum melancarkan permainan</string> <string name="main_saves_close_session">Tutup sesi Steam dahulu, supaya permainan tidak dapat menyimpan di atas import</string> @@ -1220,6 +1374,9 @@ <string name="main_install_anyway">Pasang juga</string> <string name="main_remove_runtime_title">Alih keluar masa jalan Linux</string> <string name="main_remove_runtime_text">Ini memadam masa jalan, klien Steam di dalamnya, dan setiap permainan yang dipasang di sana.</string> + <string name="runtime_actions_title">Masa jalan Linux</string> + <string name="runtime_actions_text">Baik pulih memasang semula fail sistem masa jalan dan mengekalkan Steam, permainan dan tetapan anda. Tambahan seperti desktop dipasang semula apabila anda menggunakannya nanti. Alih keluar memadam segala-galanya.</string> + <string name="runtime_repair">Baik pulih masa jalan</string> <string name="main_applied">Digunakan: %1$s</string> <string name="android_app_open_failed_primary">Tidak dapat membuka %1$s pada skrin utama</string> <string name="android_app_open_failed_on">Tidak dapat membuka %1$s pada %2$s</string> @@ -1346,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">Tidak dapat menghubungi katalog masa jalan. Semak sambungan dan tekan Main semula.</string> <string name="session_runtime_install_failed">Masa jalan Linux tidak berjaya dipasang. Semak masa jalan dalam Persediaan dan tekan Main semula.</string> <string name="session_desktop_install_failed">Desktop tidak berjaya dipasang (%1$s). Semak sambungan dan tekan Desktop semula.</string> + <string name="session_package_resume_failed">Pemasangan yang terganggu tidak dapat diselesaikan (%1$s). Semak sambungan dan ruang, kemudian cuba lagi.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Masa jalan Linux rosak: %1$d pautan pustaka menghala ke fail yang tiada (%2$s dan lain-lain), biasanya selepas pemasangan terganggu. Baik pulih mengekalkan permainan dan tetapan anda.</item> + </plurals> <string name="session_ended_named">%1$s terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> <string name="session_ended_program">Program terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> <string name="session_ended_desktop">Desktop terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> @@ -1359,6 +1520,12 @@ <string name="mode_decky_plugins_hint">Pasang ZIP pemalam untuk sesi Steam seterusnya.</string> <string name="mode_decky_plugin_downloading">Memuat turun…</string> <string name="mode_decky_plugin_install_zip">Pasang daripada ZIP</string> + <string name="decky_zip_warning_title">Pemasangan Pemalam Pihak Ketiga</string> + <string name="decky_zip_warning_text">Pasukan Decky Loader belum menyemak pemalam ini. Ia mungkin mengandungi perisian hasad, seperti perisian untuk mencuri akaun Steam anda atau merosakkan peranti anda. Dengan memasang pemalam ini, anda bersetuju bahawa anda menanggung semua risiko terhadap peranti anda.</string> + <string name="decky_zip_warning_continue">Teruskan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Sila tunggu %1$d saat</item> + </plurals> <string name="store_cat_games">Permainan</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1387,6 +1554,10 @@ <string name="theme_icon_blue_detail">Latar hitam, teks putih, biru untuk semua yang dipilih, difokus atau ditekan.</string> <string name="theme_electric">Navy elektrik</string> <string name="theme_electric_detail">Biru lebih cerah, pada permukaan yang lebih cenderung navy daripada kelabu.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Warna yang bertukar merentasi pelangi. Mengikut tetapan animasi Android.</string> + <string name="theme_rgb_speed">Kelajuan</string> + <string name="theme_rgb_speed_hint">Seberapa pantas warna bertukar.</string> <string name="theme_gradient">Kecerunan</string> <string name="theme_gradient_detail">Warna utama dan sekunder pilihan anda, diadun pada butang dan sorotan.</string> <string name="theme_gradient_primary">Utama</string> @@ -1503,7 +1674,16 @@ <string name="fm_conflict_skip">Langkau</string> <string name="fm_select_this_folder">Pilih folder ini</string> <string name="fm_back">Kembali</string> + <string name="fm_exit">Keluar</string> + <string name="fm_return_to_start">Kembali ke folder asal</string> + <string name="fm_start_unavailable">Folder asal tidak lagi tersedia</string> + <string name="fm_cancel_operation_title">Batalkan operasi?</string> + <string name="fm_cancel_operation_confirmation">Operasi akan dibatalkan. Adakah anda pasti?</string> + <string name="fm_accept">Terima</string> + <string name="fm_decline">Tolak</string> <string name="fm_drive_not_readable">%1$s dilekapkan tetapi tidak dapat dibaca sekarang</string> + <string name="fm_drive_access_title">Benarkan akses kepada %1$s</string> + <string name="fm_drive_access_text">Android membenarkan DroidDeck melihat pemacu ini tetapi tidak membacanya. Hidupkan Akses semua fail untuk DroidDeck, kemudian kembali.</string> <string name="fm_list_view">Paparan senarai</string> <string name="fm_grid_view">Paparan grid</string> <string name="fm_search">Cari</string> @@ -1574,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">Papan kekunci + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pemegang Deck + trackpad</string> + <string name="second_mode_dashboard">Papan pemuka</string> + <string name="bottom_dashboard_empty">Belum ada apa-apa untuk dipaparkan di sini.</string> + <string name="bottom_page_downloads">Muat turun</string> + <string name="bottom_downloads_none">Tiada muat turun yang sedang berjalan.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Memuat turun cache shader</string> + <string name="bottom_downloads_paused">Dijeda</string> + <string name="bottom_downloads_queued">Menunggu untuk bermula</string> + <string name="bottom_page_notifications">Pemberitahuan</string> + <string name="bottom_notifications_listener">Skrin bawah DroidDeck</string> + <string name="bottom_notifications_why">Paparkan mesej dan pemberitahuan lain di sini semasa anda bermain. Ia hanya kekal pada skrin ini dan tidak disimpan. Android bertanya sekali sahaja: halaman akses pemberitahuannya dibuka pada skrin ini; hidupkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya.</string> + <string name="bottom_notifications_allow">Benarkan akses pemberitahuan</string> + <string name="bottom_notifications_none">Tiada pemberitahuan.</string> + <string name="bottom_notifications_count">%1$d pemberitahuan</string> + <string name="bottom_notifications_clear">Kosongkan</string> + <string name="bottom_page_screenshots">Tangkapan skrin</string> + <string name="stats_fps_needs_hud">FPS memerlukan HUD dihidupkan</string> + <string name="stats_speed">Kelajuan</string> + <string name="stats_pedals">Pedal</string> + <string name="stats_gforce">Daya G</string> + <string name="stats_timing">Masa</string> + <string name="stats_best_lap">Pusingan terbaik</string> + <string name="stats_tires">Tayar °C</string> + <string name="stats_trace">Pendikit dan brek, 10 s terakhir</string> + <string name="stats_speed_chart">Kelajuan, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_speed_units">Unit kelajuan</string> + <string name="stats_speed_units_auto">Automatik (%1$s)</string> + <string name="stats_steam_client_arm">Klien Steam ARM</string> + <string name="stats_steam_client_x86">Klien Steam x86</string> + <string name="stats_throttle">Pendikit</string> + <string name="stats_brake">Brek</string> + <string name="stats_lights">Lampu penunjuk</string> + <string name="stats_lamp_shift">Tukar gear</string> + <string name="stats_lamp_handbrake">Brek tangan</string> + <string name="stats_lamp_pit">Pengehad pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Enjin %1$s °C</string> + <string name="stats_oil_temp">Minyak %1$s °C</string> + <string name="stats_power">Pengagih kuasa</string> + <string name="stats_fuel_t">Bahan api, t</string> + <string name="stats_fuel_main">Utama %1$s t</string> + <string name="stats_fuel_reserve">Simpanan %1$s t</string> + <string name="stats_tap_hint">Ketik jalur atas atau papan pemuka untuk menukar gayanya.</string> + <string name="bottom_telemetry_send_title">Hantar data papan pemuka</string> + <string name="bottom_telemetry_send_auto">Automatik</string> + <string name="bottom_telemetry_send_auto_hint">Menghidupkannya untuk setiap permainan yang disenaraikan di sini, termasuk permainan yang ditemui kemudian. Permainan yang anda matikan kekal mati.</string> + <string name="bottom_telemetry_send_note">Ini menukar tetapan output data permainan itu sendiri. Ia berkuat kuasa apabila permainan dimulakan seterusnya; mematikannya memulihkan tetapan lama.</string> + <string name="bottom_telemetry_send_close">Tutup %1$s untuk menukar ini.</string> + <string name="bottom_telemetry_send_failed">Tidak dapat menukar tetapan %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: hidupkan %2$s dalam tetapan permainan dengan IP 127.0.0.1 dan port %3$d.</string> + <string name="bottom_shots_where">Disimpan ke Pictures/DroidDeck. Tangkapan skrin Steam juga dipaparkan di sini.</string> + <string name="bottom_shots_take">Ambil tangkapan skrin</string> + <string name="bottom_shots_saved">Tangkapan skrin disimpan.</string> + <string name="bottom_shots_failed">Tidak dapat mengambil tangkapan skrin.</string> + <string name="bottom_shots_none">Belum ada tangkapan skrin.</string> + <string name="bottom_page_chat">Sembang & suara</string> + <string name="bottom_chat_why">Baca dan balas sembang Steam di sini sementara permainan terus berjalan pada skrin utama. Ia menggunakan akaun yang digunakan untuk log masuk ke Steam.</string> + <string name="bottom_chat_not_signed_in">Steam belum mempunyai log masuk web untuk dikongsi, jadi log masuk di sini sekali.</string> + <string name="bottom_chat_stopped">Android menutup halaman sembang semasa DroidDeck berada di latar belakang. Ia dibuka semula apabila anda kembali ke DroidDeck.</string> + <string name="bottom_chat_open">Buka Steam Chat</string> + <string name="bottom_chat_close">Tutup sembang</string> + <string name="bottom_chat_mic_on">Mikrofon hidup</string> + <string name="bottom_chat_mic_off">Mikrofon mati</string> + <string name="bottom_chat_mic_unavailable">Mikrofon dimatikan untuk permainan ini. Untuk bercakap, hidupkan Mikrofon dalam tetapan Steam DroidDeck (Audio) dan mulakan permainan semula.</string> + <string name="bottom_chat_volume">Kelantangan %1$d%%</string> + <string name="bottom_page_telemetry">Statistik dalam permainan</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateri</string> + <string name="bottom_telemetry_lap">Pusingan</string> + <string name="bottom_telemetry_position">Kedudukan</string> + <string name="bottom_telemetry_this_lap">Pusingan ini</string> + <string name="bottom_telemetry_last_lap">Pusingan terakhir</string> + <string name="bottom_telemetry_fuel">Bahan api</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status undang-undang</string> + <string name="bottom_telemetry_balance">Baki</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Hidupkan output data permainan lumba (sering dipanggil telemetri atau UDP) untuk melihat papan pemuka langsung di sini. Data kekal pada peranti ini.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket bersaiz %3$d bait), tetapi dalam format yang belum dapat dibaca oleh halaman ini.</string> + <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi permainan itu tidak dapat dipaparkan di sini.</string> <string name="rtinst_removing">Mengalih keluar masa jalan Linux</string> <plurals name="rtinst_removing_entries"> @@ -1603,6 +1870,7 @@ <string name="flatpakmgr_not_ready">Sediakan Flatpak dahulu</string> <string name="flatpakmgr_starting">Memulakan</string> <string name="flatpakmgr_exit_status">Flatpak keluar dengan status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s dibina untuk %2$s, yang tidak dapat dijalankan oleh DroidDeck. Apl Flatpak di sini memerlukan binaan ARM64 atau x86_64.</string> <string name="flatpakmgr_installing">Memasang %1$s</string> <string name="flatpakmgr_updating">Mengemas kini %1$s</string> <string name="flatpakmgr_removing">Mengalih keluar %1$s</string> @@ -1696,6 +1964,7 @@ <string name="adbpair_applying">Menggunakan tetapan…</string> <string name="adbpair_command_failed">Arahan Debugging Wayarles gagal</string> <string name="adbpair_channel_name">Persediaan Debugging Wayarles</string> + <string name="adbpair_progress_channel_name">Kemajuan persediaan Penyahpepijatan wayarles</string> <string name="adbpair_channel_description">Meminta kod gandingan Debugging Wayarles semasa Tetapan dibuka</string> <string name="adbpair_title_pair">Gandingkan Debugging Wayarles</string> <string name="adbpair_waiting_text">Hidupkan Debugging Wayarles, kemudian ketik “Gandingkan peranti dengan kod gandingan”.</string> @@ -1804,6 +2073,7 @@ <string name="gpuinfo_not_adreno">Bukan GPU Adreno</string> <string name="gpuinfo_supported">Disokong</string> <string name="gpuinfo_experimental">Eksperimen: pemacunya ialah binaan ujian</string> + <string name="gpuinfo_a850_experimental">Sokongan eksperimen Adreno 850: memerlukan pemacu paparan dan permainan eksperimen yang serasi; belum disahkan pada peranti ini</string> <string name="gpuinfo_below_tested">Di bawah perkakasan yang diuji (Adreno 725 dan lebih baharu): mungkin tidak dapat berjalan</string> <string name="gpuinfo_unsupported">Tidak disokong: DroidDeck memerlukan GPU Adreno (Snapdragon)</string> @@ -1897,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">Diskalakan %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Papar butiran peranti</string> <string name="device_info_hide">Sembunyikan butiran peranti</string> @@ -1915,7 +2185,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> @@ -1929,11 +2198,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> @@ -1951,9 +2218,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> @@ -1972,12 +2247,43 @@ <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> <string name="stores_sort">Isih</string> + <string name="setup_rail_labels">Label bar sisi</string> + <string name="setup_rail_labels_hint">Paparkan nama di bawah ikon bar sisi. Matikan untuk bar sisi yang lebih ramping.</string> + <string name="library_display">Paparan</string> + <string name="library_display_larger">Kad lebih besar</string> + <string name="library_display_smaller">Kad lebih kecil</string> + <string name="library_display_title">Paparkan tajuk</string> + <string name="library_display_size">Paparkan saiz</string> <string name="stores_sort_last_played">Baru dimainkan</string> <string name="stores_sort_recently_installed">Baru dipasang</string> <string name="stores_sort_title_asc">Tajuk A–Z</string> @@ -2104,6 +2410,9 @@ <string name="stores_download_manager">Pengurus muat turun</string> <string name="stores_parallel">Muat turun pada satu masa</string> <string name="stores_install_where">Pasang ke</string> + <string name="stores_install_language">Bahasa permainan</string> + <string name="stores_install_language_hint">GOG dan Epic memasang bahasa ini. Sistem mengikut bahasa apl.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Pasang %1$s:</string> <string name="stores_target_internal">Dalaman</string> <string name="stores_target_free">%1$s bebas</string> @@ -2126,6 +2435,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> @@ -2141,6 +2451,9 @@ <string name="edit_target">Sasaran</string> <string name="edit_start_in">Mula dalam</string> <string name="edit_launch_options">Pilihan pelancaran</string> + <string name="edit_launch_options_steam_hint">Dikongsi dengan Properties dalam Steam: perubahan di salah satu tempat dipaparkan di kedua-duanya.</string> + <string name="edit_launch_options_not_saved">Tidak dapat menyimpan pilihan pelancaran ke Steam. Cuba lagi.</string> + <string name="edit_launch_options_desktop">Steam mungkin terbuka dalam sesi desktop. Tukar pilihan pelancaran dalam Properties Steam, atau tutup sesi itu dahulu.</string> <string name="edit_artwork">Seni</string> <string name="edit_other_exe">Exe lain…</string> <string name="edit_remove">Alih keluar</string> @@ -2266,6 +2579,7 @@ <string name="setup_download_source_custom">Awalan sendiri</string> <string name="setup_download_mirror">Laman</string> <string name="setup_download_prefix">Awalan</string> + <string name="setup_download_proxy">Proksi HTTP</string> <string name="flathub_eyebrow">APL LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apl desktop untuk desktop Linux, dibuka daripada Desktop.</string> @@ -2404,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">Automatik mengekalkan permainan 2D ini tetap dalam pandangan. Pilih Skrin maya dalam Paparan untuk menggunakan penjejakan kepala.</string> <string name="glasses_tracking_sbs_hint">Penjejakan kepala digunakan untuk skrin maya atau permainan SteamVR yang sedang berjalan.</string> <string name="glasses_hardware">Peranti</string> + <string name="vr_controllers_tab">Pengawal</string> + <string name="vr_controllers_group">Pengawal SteamVR</string> + <string name="vr_controllers_emulate">Pad permainan dalam VR</string> + <string name="vr_controllers_emulate_hint">Dua tangan VR yang dimainkan oleh pengawal anda. Perubahan berkuat kuasa serta-merta, juga semasa SteamVR berjalan. Joy-Con dan tangan yang dijejak masih mengambil alih sisi masing-masing.</string> + <string name="vr_controllers_off">Pad permainan biasa</string> + <string name="vr_controllers_index">Pengawal Valve Index</string> + <string name="vr_controllers_touch">Pengawal Meta Quest 3</string> + <string name="vr_controllers_vive">Tongkat HTC Vive</string> + <string name="vr_controllers_sticks">Kayu bedik bermula dengan</string> + <string name="vr_controllers_sticks_hint">Tekan kedua-dua kayu bedik serentak semasa VR untuk bertukar.</string> + <string name="vr_controllers_sticks_game">Menggerakkan anda dalam permainan</string> + <string name="vr_controllers_sticks_hands">Menggerakkan tangan</string> + <string name="vr_controllers_buttons">Butang</string> + <string name="vr_controllers_buttons_stick">Picu kekal picu, bumper ialah genggaman, A/B dan X/Y ialah butang muka setiap tangan, klik kayu bedik mengklik thumbstick, Guide membuka menu SteamVR. D-pad atas dan bawah menggerakkan tangan lebih dekat atau lebih jauh.</string> + <string name="vr_controllers_buttons_vive">Kayu bedik menjadi pad jejak; A/X atau klik kayu bedik menekannya. Picu kekal picu, bumper ialah genggaman, Start dan Select ialah menu, Guide membuka menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Tiada tangan VR. Permainan yang menyokong pad permainan, dan menu SteamVR, menerima pengawal anda seperti biasa.</string> <string name="glasses_brightness">Kecerahan</string> <string name="glasses_volume">Kelantangan</string> <string name="glasses_sunblock">Peredup kanta</string> @@ -2461,6 +2791,12 @@ <string name="hand_camera_placement">Kedudukan kamera</string> <string name="hand_camera_placement_hint">Pastikan kamera boleh melihat anda sebelum bermain.</string> <string name="hand_camera_check">Semak</string> + <string name="tracking_pack_title">Muat turun penjejakan tangan</string> + <string name="tracking_pack_hint">Penjejakan tangan memerlukan muat turun sekali sahaja sebanyak %1$s.</string> + <string name="tracking_pack_download">Muat turun</string> + <string name="tracking_pack_retry">Cuba semula</string> + <string name="tracking_pack_downloading">Memuat turun penjejakan tangan… %1$d%%</string> + <string name="tracking_pack_failed">Penjejakan tangan tidak dapat dimuat turun. Semak sambungan anda dan cuba lagi.</string> <string name="hand_camera_check_title">Kedudukan kamera</string> <string name="hand_camera_how_rear">Dirikan peranti sejauh 1.5 hingga 2 meter kira-kira pada paras dada, dengan kamera belakang menghadap anda. Kemudian masuk ke pandangan dengan tangan terhulur.</string> <string name="hand_camera_how_front">Dirikan peranti sejauh 1.5 hingga 2 meter kira-kira pada paras dada, dengan skrin menghadap anda. Kemudian masuk ke pandangan dengan tangan terhulur.</string> @@ -2532,6 +2868,21 @@ <string name="storage_safe_hint">Runtime tidak digunakan, sisa, log lama</string> <string name="storage_clean_up">Membersihkan…</string> <string name="storage_session_running">Hentikan sesi untuk membersihkan atau memadam apa-apa. Saiz kekal kelihatan.</string> + <string name="storage_default_group">Lokasi pemasangan</string> + <string name="storage_default_title">Storan lalai</string> + <string name="storage_default_hint">Pemasangan kedai baharu pergi ke lokasi yang dipilih. Permainan sedia ada kekal di tempatnya. Pustaka Steam mengekalkan tetapan sendiri.</string> + <string name="storage_default_ask">Tanya setiap kali</string> + <string name="storage_default_ask_detail">Pilih destinasi bagi setiap pemasangan</string> + <string name="storage_default_internal">Storan dalaman</string> + <string name="storage_default_external">Storan luaran</string> + <string name="storage_default_external_detail">%1$s · %2$s kosong</string> + <string name="storage_default_external_missing">Tidak disambungkan</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s kosong</string> + <string name="storage_default_folder_missing">Tidak disambungkan</string> + <string name="storage_default_choose_folder">Pilih folder…</string> + <string name="storage_default_choose_folder_detail">Gunakan mana-mana folder pada kad SD atau pemacu USB</string> + <string name="storage_default_note">Permainan dimasukkan ke dalam folder Games di dalam lokasi yang dipilih. Permainan sedia ada tidak dipindahkan.</string> <string name="storage_where">Ke mana perginya</string> <string name="storage_games">Permainan Steam</string> <string name="storage_game_data">Data permainan</string> @@ -2653,6 +3004,9 @@ <string name="storage_data_installed">Permainan dipasang</string> <string name="storage_data_parts">Awalan %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Kosongkan shader</string> + <string name="storage_reset_prefix">Set semula prefix</string> + <string name="storage_reset_prefix_title">Set semula prefix untuk %1$s?</string> + <string name="storage_reset_prefix_confirm">Memadam prefix Wine-nya (%1$s) dalam %2$s dan menciptanya semula pada pelancaran seterusnya. Simpanan, tetapan dan redistributable yang dipasang di dalamnya akan hilang; simpanan Steam Cloud kekal dalam akaun anda.</string> <string name="storage_data_leftovers">Permainan dialih keluar</string> <string name="storage_steam_app">Aplikasi Steam %1$d</string> <string name="storage_leftover_unsure_detail">Awalan masih mengandungi fail, mungkin simpanan setempat</string> @@ -2952,6 +3306,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Segerakkan dengan Syncthing</string> + <string name="sync_enable_hint">Berasaskan Syncthing-Fork, ini ialah pelaksanaan Syncthing yang membolehkan anda menyegerakkan fail dalam sistem fail dalaman DroidDeck dengan tika Syncthing lain. Ini hanya untuk fail yang anda simpan dalam sistem fail dalaman DroidDeck.</string> + <string name="sync_missing">Binaan ini tidak menyertakan Syncthing.</string> + <string name="sync_starting">Memulakan Syncthing</string> + <string name="sync_status_starting">Memulakan</string> + <string name="sync_status_up_to_date">Terkini</string> + <string name="sync_status_syncing">Menyegerakkan</string> + <string name="sync_status_paused">Dijeda</string> + <string name="sync_status_pausing">Menjeda</string> + <string name="sync_status_resuming">Menyambung semula</string> + <string name="sync_status_attention">Perlu perhatian</string> + <string name="sync_status_failed">Syncthing berhenti</string> + <string name="sync_failed_retry">Cuba lagi</string> + <string name="sync_paused_wifi">Dijeda sehingga ada Wi-Fi</string> + <string name="sync_paused_game">Dijeda semasa permainan</string> + <string name="sync_summary">%1$d folder · %2$d daripada %3$d peranti disambungkan</string> + <string name="sync_left">%1$s lagi</string> + <string name="sync_open_web_ui">Buka UI web</string> + <string name="sync_pause">Jeda</string> + <string name="sync_resume">Sambung semula</string> + <string name="sync_running">Berjalan</string> + <string name="sync_running_hint">Matikan untuk menghentikan Syncthing sepenuhnya.</string> + <string name="sync_this_device">Peranti ini</string> + <string name="sync_device_id">ID Peranti</string> + <string name="sync_show_qr">Tunjukkan QR</string> + <string name="sync_advanced">Lanjutan</string> + <string name="sync_advanced_hint">Port, bila hendak dijalankan, tetapkan semula</string> + <string name="sync_open">Buka</string> + <string name="sync_waiting">Menunggu anda</string> + <string name="sync_pending_device">%1$s mahu bersambung</string> + <string name="sync_pending_folder">%1$s mahu berkongsi “%2$s”</string> + <string name="sync_pending_folder_hint">Terima untuk memilih tempat ia disimpan dalam DroidDeck.</string> + <string name="sync_review">Semak dalam UI web</string> + <string name="sync_folders">Folder</string> + <string name="sync_no_folders">Belum ada folder.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Terkini</string> + <string name="sync_folder_syncing">Menyegerakkan %1$d%%</string> + <string name="sync_folder_scanning">Mengimbas</string> + <string name="sync_folder_paused">Dijeda</string> + <string name="sync_folder_out_of_sync">Tidak segerak</string> + <string name="sync_folder_errors">%1$d fail tidak dapat disegerakkan</string> + <string name="sync_folder_blocked">Disekat</string> + <string name="sync_folder_blocked_hint">Folder ini berada di luar storan DroidDeck, jadi DroidDeck menjedanya. Untuk menyegerakkan folder di luar DroidDeck, gunakan apl Syncthing-Fork.</string> + <string name="sync_remove_folder">Alih keluar daripada Syncthing</string> + <string name="sync_remove_folder_hint">Mengalih keluarnya tidak memadamkan sebarang fail.</string> + <string name="sync_devices">Peranti</string> + <string name="sync_no_devices">Belum ada peranti.</string> + <string name="sync_connected">Disambungkan</string> + <string name="sync_offline">Luar talian</string> + <string name="sync_last_seen">Kali terakhir dilihat %1$s</string> + <string name="sync_device_id_title">ID peranti ini</string> + <string name="sync_device_id_hint">Pada peranti anda yang lain, tambah peranti dalam Syncthing dan imbas kod ini atau tampal ID. Kemudian terimanya di sini dalam UI web.</string> + <string name="sync_copy">Salin</string> + <string name="sync_share">Kongsi</string> + <string name="sync_done">Selesai</string> + <string name="sync_off_title">Matikan Syncthing?</string> + <string name="sync_off_body">Syncthing berhenti sekarang dan kekal berhenti sehingga dihidupkan semula. Fail yang disegerakkan kekal di tempatnya.</string> + <string name="sync_off_forget">Padamkan juga konfigurasi Syncthing</string> + <string name="sync_off_forget_hint">Mengalih keluar ID, folder dan peranti bagi peranti ini. Menghidupkannya semula akan bermula dari awal.</string> + <string name="sync_turn_off">Matikan</string> + <string name="sync_ports">Port</string> + <string name="sync_port_sync">Penyegerakan</string> + <string name="sync_port_discovery">Penemuan setempat</string> + <string name="sync_repick">Pilih port baharu</string> + <string name="sync_repick_hint">Disemak semula pada setiap permulaan.</string> + <string name="sync_repick_button">Pilih semula</string> + <string name="sync_reset_group">Tetapkan semula</string> + <string name="sync_api_key">Kunci API</string> + <string name="sync_regenerate">Jana semula</string> + <string name="sync_reset">Tetapkan semula Syncthing</string> + <string name="sync_reset_hint">ID peranti baharu, folder dan peranti dialih keluar. Fail dalam storan DroidDeck dikekalkan.</string> + <string name="sync_reset_button">Tetapkan semula</string> + <string name="sync_reset_confirm_title">Tetapkan semula Syncthing?</string> + <string name="sync_running_group">Berjalan</string> + <string name="sync_run">Jalankan</string> + <string name="sync_run_open">Semasa DroidDeck dibuka</string> + <string name="sync_run_background">Di latar belakang</string> + <string name="sync_wifi_only">Wi-Fi sahaja</string> + <string name="sync_pause_games">Jeda semasa permainan</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output Syncthing untuk sesi ini</string> + <string name="sync_logs_share">Kongsi</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Sediakan runtime Linux dahulu.</string> + <string name="sync_accept">Terima</string> + <string name="sync_accept_title">Simpan “%1$s” ke</string> + <string name="sync_add_folder">Tambah folder</string> + <string name="sync_add_folder_hint">Segerakkan folder dalam storan DroidDeck</string> + <string name="sync_choose">Pilih</string> + <string name="sync_add">Tambah</string> + <string name="sync_add_failed">Folder tidak dapat ditambah.</string> + <string name="sync_share_with">Kongsi dengan</string> + <string name="sync_share_none">Belum ada peranti. Anda boleh berkongsi folder ini daripada UI web kemudian.</string> + <string name="sync_use_folder">Gunakan folder ini</string> + <string name="sync_new_folder">Folder baharu</string> + <string name="sync_location_home">Folder rumah kontena</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Storan kongsi DroidDeck</string> + <string name="sync_location_card">DroidDeck pada %1$s</string> + <string name="sync_location_app">Data apl DroidDeck</string> + <string name="sync_web_path_locked">Folder baharu disimpan dalam folder Sync DroidDeck. Untuk menyegerakkan folder DroidDeck yang lain, gunakan Tambah folder pada tab Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Muat semula</string> + <string name="sync_not_running">Syncthing tidak berjalan.</string> + <string name="session_end_steam_sigill">Steam berhenti dengan arahan tidak sah (SIGILL). Ini mungkin masalah keserasian arahan CPU atau ranap klien. Kongsi log bersama butiran peranti anda.</string> + <string name="session_end_steam_try_x64">Anda boleh cuba Tetapan Steam → Klien Steam → x86-64 (eksperimen). Ia memerlukan muat turun tambahan dan mungkin berjalan lebih perlahan.</string> + <string name="session_end_vulkan_device">Pemacu grafik Linux tidak menemui peranti Vulkan yang boleh digunakan. Pastikan pemacu GPU Linux yang dipilih menyokong GPU ini.</string> + <string name="session_end_gpu_unsupported">Sesi ini tidak dapat bermula kerana GPU ini tiada pemacu Vulkan Linux yang serasi dalam persediaan semasa. Pemacu Adreno Turnip tidak dapat mendayakan sokongan untuk GPU MediaTek/Mali.</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_resources_browser">Dibuka dalam pelayar anda</string> + <string name="game_resource_guides">Panduan</string> + <string name="game_resource_protondb_detail">Laporan keserasian Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Untuk permainan dengan simpanan pada akaun Steam anda</string> + <string name="game_resource_search">Carian web</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="library_filter">Penapis</string> + <string name="library_filter_installed">Dipasang sahaja</string> + <string name="library_filter_all_owned">Semua permainan dimiliki</string> + <string name="library_no_installed_matches">Tiada permainan dipasang yang sepadan dengan penapis ini.</string> + <string name="library_browse_owned">Semak imbas permainan dimiliki</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="stores_itch_updates_found">Kemas kini tersedia: %1$d</string> + <string name="stores_itch_update_replaced">Pembangun telah menggantikan binaan ini dengan %1$s. Kemas kini kepadanya?</string> + <string name="xbox_filter_cloud">Awan</string> + <string name="stores_xbox_cloud_settings">Tetapan awan</string> + <string name="integration_title">Integrasi Steam</string> + <string name="integration_count">%1$d daripada %2$d hidup</string> + <string name="integration_set_up">Sediakan</string> + <string name="integration_location">Lokasi</string> + <string name="integration_app_info">Maklumat apl</string> + <string name="integration_wifi">Nama Wi-Fi</string> + <string name="integration_brightness">Kecerahan</string> + <string name="integration_home">DroidDeck sebagai Laman Utama</string> + <string name="integration_shortcuts">Pintasan butang Laman Utama</string> + <string name="integration_wifi_hint">Paparkan rangkaian dalam Steam · memerlukan akses Lokasi, tidak pernah dijejak</string> + <string name="integration_wifi_on">Rangkaian dipaparkan dalam Steam</string> + <string name="integration_wifi_location_off">Lokasi dimatikan</string> + <string name="integration_wifi_denied">Lokasi ditolak · benarkannya dalam Maklumat apl</string> + <string name="integration_brightness_hint">Peluncur Steam menetapkan kecerahan skrin</string> + <string name="integration_home_hint">Laman Utama membuka menu Steam dalam sesi</string> + <string name="integration_shortcuts_hint">Tahan Laman Utama untuk kord Steam Guide</string> + <string name="integration_shortcuts_needs_home">Memerlukan DroidDeck sebagai Laman Utama</string> + <string name="integration_shortcuts_maybe_restricted">Dikelabukan dalam Android? Maklumat apl → ⋮ → Benarkan tetapan terhad</string> + <string name="integration_shortcuts_restricted">Disekat oleh Android · Maklumat apl → ⋮ → Benarkan tetapan terhad</string> + <string name="integration_shortcuts_service">Butang Laman Utama DroidDeck</string> + <string name="integration_shortcuts_service_description">Menghantar tekanan butang Laman Utama kepada Steam Guide semasa sesi Steam difokuskan dan DroidDeck ialah apl Laman Utama lalai. Tidak membaca kandungan skrin.</string> + <string name="integration_brightness_needed">Hidupkan Kecerahan dalam Persediaan → Integrasi Steam</string> + <string name="apps_search_hint">Cari apl</string> + <string name="apps_no_match">Tiada apl sepadan dengan “%1$s”.</string> + <string name="apps_add_widget">Tambah widget</string> + <string name="apps_widgets_loading">Memuatkan widget…</string> + <string name="apps_widgets_none">Tiada apl pada peranti ini yang menawarkan widget.</string> + <string name="apps_widget_wider">Lebih lebar</string> + <string name="apps_widget_narrower">Lebih sempit</string> + <string name="apps_widget_taller">Lebih tinggi</string> + <string name="apps_widget_shorter">Lebih rendah</string> + <string name="apps_widget_move_earlier">Alih ke depan</string> + <string name="apps_widget_move_later">Alih ke belakang</string> + <string name="apps_widget_configure">Tetapan widget</string> + <string name="apps_widget_remove">Alih keluar widget</string> + <string name="apps_add_to_folder">Tambah pada folder</string> + <string name="apps_new_folder">Folder baharu</string> + <string name="apps_remove_from_folder">Alih keluar daripada folder</string> + <string name="apps_app_info">Maklumat apl</string> + <string name="apps_uninstall">Nyahpasang</string> + <string name="apps_folder_rename">Namakan semula</string> + <string name="apps_folder_ungroup">Leraikan</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nama folder</string> + <string name="apps_filter">Tunjukkan</string> + <string name="apps_filter_all">Semua apl</string> + <string name="apps_filter_games">Permainan</string> + <string name="apps_filter_downloaded">Dimuat turun</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Tersembunyi</string> + <string name="apps_hide">Sembunyikan</string> + <string name="apps_unhide">Tunjukkan dalam apl</string> + <string name="apps_shortcut_remove">Alih keluar pintasan</string> + <string name="apps_pin_title">Tambah pada Apl</string> + <string name="apps_pin_add">Tambah</string> + <string name="apps_hidden_none">Tiada apl tersembunyi.</string> + <string name="apps_sort_name_asc">Nama A–Z</string> + <string name="apps_sort_name_desc">Nama Z–A</string> + <string name="apps_sort_installed">Dipasang baru-baru ini</string> + <string name="apps_sort_updated">Dikemas kini baru-baru ini</string> + <plurals name="apps_count"> + <item quantity="other">%d apl</item> + </plurals> + <string name="desktop_restore_title">Memulihkan perisian anda</string> + <string name="desktop_restore_body">Memasang semula apl yang anda tambah selepas kemas kini DroidDeck.</string> + <string name="desktop_restore_done_title">Perisian dipulihkan</string> + <string name="desktop_restore_done_body">Apl yang anda tambah dipasang semula.</string> + <string name="desktop_restore_failed_title">Sesetengah perisian tidak dapat dipulihkan</string> + <string name="desktop_restore_failed_body">Lihat ~/.cache/droiddeck/apt-restore.log, kemudian cuba sudo apt install dalam Konsole.</string> + <string name="gog_full_files">Pengoptimuman asli tidak tersedia. Muat turun termasuk fail gantian lengkap.</string> + <string name="gog_recover">Sahkan hasil tampalan</string> + <string name="slow_usb_title">Sambungan USB perlahan</string> + <string name="slow_usb_cable">%1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s), jadi permainan padanya akan dimuatkan perlahan. Gunakan kabel USB 3 berkadar 5 Gbps atau lebih, cuba terbalikkan palam USB-C atau gunakan pemacu yang lebih pantas.</string> + <string name="slow_usb_port">%1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s). Port USB peranti ini tidak boleh lebih pantas, jadi permainan akan dimuatkan perlahan. Storan dalaman atau kad microSD mungkin lebih pantas.</string> + <string name="slow_usb_never">Jangan tunjukkan lagi</string> + <string name="slow_usb_dismiss">Tutup</string> + <string name="steam_import_title">Mulakan semula Steam untuk menambah permainan anda?</string> + <string name="steam_import_body">Steam boleh menyenaraikan permainan milik anda ini sebagai dipasang: %1$s. Steam perlu dimulakan semula untuk menunjukkannya. Mulakan semula sekarang, atau ia akan ditambah apabila Steam dimulakan seterusnya.</string> + <string name="steam_import_names_more">%1$s dan %2$d lagi</string> + <string name="steam_import_now">Mulakan semula sekarang</string> + <string name="steam_import_later">Kemudian</string> + <string name="gog_maintenance">Urus pemasangan GOG</string> + <string name="gog_check">Semak kemas kini</string> + <string name="gog_repair">Sahkan/Baik pulih</string> + <string name="gog_patches">Tampalan luar talian</string> + <string name="gog_refresh">Muat turun pemasang luar talian penuh</string> + <string name="gog_update">Kemas kini kepada %1$s</string> + <string name="gog_resume">Sambung penyelenggaraan GOG</string> + <string name="gog_open_patch">Buka pemasang tampalan</string> + <string name="gog_patch_in_session">Selesaikan atau batalkan pemasang tampalan dalam sesi Linux.</string> + <string name="gog_patch_requirements">Pilih tampalan untuk versi dan bahasa yang dipasang. Versi sumber yang disokong mungkin tidak disenaraikan.</string> + <string name="gog_no_patches">GOG tiada tampalan Windows berasingan untuk permainan ini.</string> + <string name="gog_managed_files">Fail permainan yang diubah suai mungkin digantikan.</string> + <string name="gog_patch_installer_note">Pemasang dibuka dalam sesi Linux anda.</string> + <string name="gog_download_label">Muat turun</string> + <string name="gog_space_label">Ruang tambahan</string> + <string name="gog_space_estimate_label">Anggaran ruang</string> + <string name="gog_repair_action">Baik pulih fail</string> + <string name="gog_refresh_action">Segar semula pemasangan</string> + <string name="gog_select_patch">Pilih</string> + <string name="setup_all_files">Akses semua fail</string> + <string name="setup_local_network">Rangkaian setempat</string> + <string name="libraries_title">Pustaka Steam lain</string> + <string name="libraries_hint">Folder tempat Steam boleh memasang dan menjalankan permainan, setiap satu dengan nama sendiri. Mengalih keluar mengekalkan permainan pada cakera.</string> + <string name="libraries_add">Tambah pustaka</string> + <string name="libraries_rename_title">Nama pustaka</string> + <string name="libraries_pick">Pilih folder untuk pustaka</string> + <string name="libraries_full">Paling banyak %1$d pustaka tambahan</string> + <string name="libraries_overlap">Folder itu sudah menjadi pustaka atau berada di dalamnya</string> + <string name="libraries_missing">%1$s · tidak tersedia</string> + <string name="libraries_applies_next">Berkuat kuasa mulai sesi Steam seterusnya</string> + <string name="bottom_desktop_start">Mulakan desktop</string> + <string name="bottom_desktop_mode_touch">Sentuhan langsung</string> + <string name="bottom_desktop_trackpad">Pad jejak. Ketik untuk sentuhan langsung</string> + <string name="bottom_desktop_direct_touch">Sentuhan langsung. Ketik untuk pad jejak</string> + <string name="bottom_desktop_starting">Memulakan desktop KDE…</string> + <string name="bottom_desktop_ended">Desktop telah ditutup.</string> + <string name="bottom_desktop_failed">Desktop tidak dapat dimulakan. Lognya berada dalam folder bottom-desktop sesi ini.</string> + <string name="bottom_desktop_off">Desktop ditutup.</string> + <string name="libraries_rename">Namakan semula</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-nb/gestures.xml b/app/src/main/res/values-nb/gestures.xml index 4f4143850..ee01f0e3a 100644 --- a/app/src/main/res/values-nb/gestures.xml +++ b/app/src/main/res/values-nb/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Bevegelser</string> <string name="gesture_settings">Innstillinger for berøringsbevegelser</string> - <string name="gesture_settings_hint">Tilpass muse- og tastaturbevegelser. Velg Bevegelser som berøringsmodus for å bruke dem.</string> <string name="gesture_tap">Trykk</string> <string name="gesture_drag">Dra med én finger</string> <string name="gesture_long_press">Langt trykk</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Hold med tre fingre</string> <string name="gesture_pinch">Knip for å zoome</string> <string name="gesture_hold_button">Hold knappen nede</string> + <string name="gesture_hold_left">Hold venstre knapp nede</string> + <string name="gesture_hold_right">Hold høyre knapp nede</string> <string name="gesture_click_once">Klikk én gang</string> <string name="gesture_hold_delay">Forsinkelse før hold</string> <string name="gesture_double_delay">Intervall for dobbelttrykk</string> diff --git a/app/src/main/res/values-nb/shortcuts.xml b/app/src/main/res/values-nb/shortcuts.xml new file mode 100644 index 000000000..712de7c6e --- /dev/null +++ b/app/src/main/res/values-nb/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Snarveier for fysiske knapper</string> + <string name="shortcuts_dd_menu">DroidDeck-meny</string> + <string name="shortcuts_capture">Tilordne: %1$s</string> + <string name="shortcuts_press">Trykk på en knapp og slipp den. Tilordningen lagres automatisk.</string> + <string name="shortcuts_release">Slipp knappen for å fortsette.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Denne knappen er allerede tilordnet: %1$s</string> + <string name="shortcuts_save">Tilordne på nytt</string> + <string name="shortcuts_retry">Prøv en annen knapp</string> + <string name="shortcuts_limitations">Hjem-knappen og enkelte ekstraknapper er kanskje ikke tilgjengelige.</string> +</resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index e0ee85176..841134884 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-innstillinger for D3D12. nodxr slår av ray tracing; bruk bare for spill som krever det.</string> <string name="game_env_proton_log">Sett til 1 for en Proton-diagnostikklogg. Logging kan redusere ytelsen og bruke lagringsplass.</string> <string name="game_env_wined3d">Sett til 1 for å bruke OpenGL-baserte WineD3D i stedet for DXVK til kompatibilitetstesting av D3D9–11.</string> + <string name="game_env_wined3d_renderer">Gjengiver for DirectDraw, Direct3D 1-7 og spill som kjører med WineD3D. Vulkan hopper over OpenGL-via-Zink og er mye raskere for gamle DirectDraw- og Direct3D 7-spill på Adreno.</string> + <string name="game_env_dxvk_d3d8">Sett til 1 for å kjøre Direct3D 8 via DXVK i stedet for WineD3D. Raskere i Direct3D 8-testen i AIO Graphics Test på Adreno.</string> <string name="game_env_no_ntsync">Sett til 1 for å holde dette spillet unna ntsync (droiddeck-ntsync eller en kjernedriver); det bruker droiddeck-esync der en pakke finnes, ellers droiddeck-fsync.</string> <string name="game_env_no_esync">Sett til 1 for å slå av droiddeck-esync for dette spillet; det bruker droiddeck-fsync i stedet, eller droiddeck-ntsync der fsync også er av.</string> <string name="game_env_no_fsync">Sett til 1 for å holde dette spillet unna droiddeck-fsync; det bruker droiddeck-esync der en pakke finnes, ellers droiddeck-ntsync.</string> <string name="game_env_fsync_first">Sett til 1 for å kjøre dette spillet på droiddeck-fsync, eller 0 for å sette droiddeck-esync først der en pakke passer Protonen.</string> <string name="game_env_xalia">Sett til 0 for å slå av Protons hjelper for kontrollernavigasjon for dette spillet.</string> + <string name="game_env_anticheat_offline">På som standard. Starter et Easy Anti-Cheat-spill uten antijuks når spillet støtter frakoblet spilling. Slå av for å starte via Easy Anti-Cheat som vanlig. Nettmoduser som krever Easy Anti-Cheat er fortsatt utilgjengelige.</string> <string name="game_env_hud">DXVK-overlegg for D3D9–11. fps viser bildefrekvens; uten verdi skjules det.</string> <string name="game_env_dxvk_config">DXVK-innstillinger skilt med semikolon. Nyere versjoner bruker dxvk.maxFrameRate for bildefrekvensbegrensning; bruk heller sesjonens bildefrekvensbegrensning for vanlig spilling.</string> + <string name="game_env_cores">CPU-kjerner for dette spillet, for eksempel 0-4 eller 0,2,4, i stedet for sesjonens spillkjerner. Færre kjerner gir mindre varme.</string> <string name="game_env_vkd3d_limit">Bildefrekvensgrense for D3D12. 0 slår av grensen.</string> <string name="game_env_glthread">Mesa OpenGL-tråding. true kan hjelpe CPU-begrensede OpenGL-spill; test per spill.</string> <string name="sync_backend_title">Wine-synkronisering</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kjører x86-Linux-programmer på denne ARM64-enheten. Auto bruker det når programmet er bygget for x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dette programmet er bygget for %1$s-PC-er og kjører via FEX, som ikke er satt opp ennå. Åpne Steam én gang mens du er innlogget: DroidDeck lar den laste ned FEX og Steam Linux Runtime den trenger, og så åpnes dette.</string> + <string name="session_proot_missing">Kunne ikke laste ned DroidDecks proot. Sjekk tilkoblingen og prøv igjen. Sesjonen ble ikke startet, fordi reserve-proot er for treg til å spille på.</string> + <string name="session_directaudio_missing">Kunne ikke laste ned DirectAudio, så spillyd bruker den tregere veien i denne sesjonen.</string> <string name="session_end_program">Dette programmet</string> <string name="session_end_steam_download">Kunne ikke laste ned Steam-klienten. Nettverket eller VPN-en din blokkerer kanskje Steams servere; sjekk tilkoblingen og prøv igjen.</string> <string name="session_end_steam_setup">Kunne ikke sette opp Steam-klienten. Sjekk tilkoblingen og ledig lagringsplass, og prøv igjen.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-kontroller</string> <string name="mode_controller_note">Deck: Hurtigmeny-knapp og gyro. Steam Controller: det samme, med gripesensor på bakknappene. DualShock 4 og DualSense: gyro, og styreflatene som styreflate. Xbox 360: åpne Hurtigmenyen med Guide+A.</string> <string name="mode_back">Tilbake</string> + <string name="back_hold">Hold Tilbake for Steam-snarveier</string> + <string name="back_hold_hint">Hold Tilbake for å åpne Hurtigtilgang eller lage Steam-kombinasjoner med andre knapper. Slå av for å ignorere holdt Tilbake; trykk og dobbelttrykk virker fortsatt.</string> + <string name="back_native_qam_hint">Hold Tilbake i 700 ms, eller hold Tilbake og trykk en annen knapp for Steam-snarveier.</string> + <string name="back_double_tap_window">Tidsvindu for dobbelttrykk</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillat lysstyrkekontroll</string> + <string name="brightness_permission_text">Sett opp lysstyrkekontroll i DroidDeck.</string> <string name="back_menu_then_qam">Meny → QAM</string> <string name="back_qam_then_menu">QAM → Meny</string> <string name="mode_session">Sesjon</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Oppdatert · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installer nyeste</string> + <string name="decky_channel">Oppdateringskanal</string> + <string name="decky_channel_hint">Hvilke Decky Loader-utgivelser som installeres. Deckys egen oppdatering bruker samme kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Forhåndsutgivelse</string> + <string name="decky_channel_testing">Testing</string> + <string name="decky_channel_failed">Kunne ikke lagre oppdateringskanalen for Decky</string> <string name="mode_decky_on">Starter med Steam. Mens på, kan andre apper på denne enheten kanskje styre Steam.</string> <string name="mode_decky_off">Av. Steams fjernsøkeport for feilsøking forblir stengt.</string> <string name="mode_decky_remove_title">Avinstaller Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Ytelsesoverlegg</string> <string name="mode_mangoapp_hint">Slå av hvis spill krasjer eller blir svarte i Deck-modus. Gjelder fra neste sesjon.</string> + <string name="mode_return_after_game">Gå tilbake til DroidDeck etter et spill</string> + <string name="mode_return_after_game_hint">Når et spill du startet fra DroidDeck eller en annen launcher lukkes, avslutter Steam ryddig (skylagringer fullføres først) og du går tilbake dit. Av: bli i Steam.</string> + <string name="mode_shader_precache">Forhåndsbufring av shadere</string> + <string name="mode_shader_precache_hint">Steam laster ned ferdigbygde shadere for spillene dine og behandler dem i bakgrunnen, så spillene hakker mindre. Av sparer data, lagringsplass og batteri; spillene bygger shadere mens du spiller i stedet. Samme innstilling som Steams Nedlastinger > Shader Pre-Caching. Gjelder fra neste sesjon.</string> <string name="mode_steam_repair">Reparer Steam-klienten</string> <string name="mode_steam_repair_hint">Laster ned Steam-klienten igjen neste gang Steam starter. Bruk dette hvis Steam blir hengende på lasteskjermen. Spill, innlogging og innstillinger beholdes.</string> <string name="mode_steam_repair_queued">Steam-klienten lastes ned igjen neste gang Steam starter.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Går forbi PulseAudio for lavere ventetid.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">For talechat.</string> + <string name="drawer_mic_hint">Slå mikrofonopptak av eller på for denne sesjonen.</string> + <string name="drawer_mic_failed">Kunne ikke endre mikrofonen. Prøv igjen.</string> <string name="mode_network">Nettverk</string> <string name="mode_wifi_discovery">Wi-Fi-oppdagelse</string> <string name="mode_wifi_discovery_hint">Vis Wi-Fi-navn og nettverk i nærheten i Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: realtime GPU-kø</string> <string name="perf_gsrealtime_hint">Prioriterer kompositørens GPU-arbeid. Kan jevne ut bildetakten, på bekostning av spillene.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Minne</string> + <string name="perf_cap_off">Av</string> + <string name="perf_cap_auto">Driverstandard</string> + <string name="perf_zram_client">Komprimer Steam mens et spill kjører</string> + <string name="perf_zram_client_hint">20 s etter at et spill starter, komprimeres Steam-klienten til zRAM for å gi spillet mer minne, og leses inn igjen når spillet lukkes. Slå av hvis sesjonen lukkes kort tid etter at spill starter. En RAM-grense ovenfor komprimerer fortsatt Steam når sesjonen går over den.</string> + <string name="perf_ram_cap">RAM-grense</string> + <string name="perf_ram_cap_hint">Gjelder mens Steam-klienten kjører, i Steam-modus eller fra skrivebordet. Når sesjonen bruker mer enn dette, komprimeres Steam og deretter sesjonens andre støttede prosesser til zRAM. En myk grense: ingenting lukkes, men spill kan hakke mens sider hentes tilbake.</string> + <string name="perf_ram_cap_unavailable">Krever zRAM-swap, som denne enheten ikke har.</string> + <string name="perf_vram_cap">VRAM-grense</string> + <string name="perf_vram_cap_hint">Videominnet DXVK rapporterer til Direct3D-spill, slik at de beregner teksturer for mindre. Spillets egne DXVK-innstillinger har forrang. Trer i kraft fra neste sesjon.</string> <string name="perf_gpuclock">Hold GPU-en på toppfrekvens</string> <string name="perf_gpuclock_hint">Bare Adreno. Færre hikk, mer batteribruk og varme.</string> <string name="perf_fixes">Sesjonsfikser</string> <string name="perf_sysmem">Turnip: sysmem-rendering</string> <string name="perf_sysmem_hint">Raskere for Steam-klienten; i spill velger driveren flis- eller systemminnerendering for hvert pass. Påkrevd på Adreno 710/720/722.</string> <string name="perf_xalia">Hopp over Steams xalia-hjelper</string> - <string name="perf_fastsync">droiddeck-ntsync (eksperimentell)</string> - <string name="perf_fastsync_hint">En erstatning i brukerrom for Linux-driveren ntsync, for testing. Mens dette er på, bruker Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gjelder fra neste sesjon.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">En erstatning i brukerrom for Linux-driveren ntsync. Mens dette er på, bruker Proton den i stedet for droiddeck-esync og droiddeck-fsync. Fungerer med Proton Experimental ARM64, GE-Proton og proton-cachyos. Gjelder fra neste sesjon.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync først</string> <string name="perf_fsync_hint">Kjører Protons egen fsync på de uendrede Proton-filene, med futex_waitv levert i brukerrom, så den trenger ingen pakke og fortsetter å fungere i det Steam oppdaterer Proton. Mens dette er på, bruker spill den foran droiddeck-esync, med unntak av de få Proton holder utenfor fsync. Gjelder fra neste sesjon.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot-hurtigvei</string> <string name="perf_fastpath_needs_seccomp">Krever prootens seccomp-filter.</string> <string name="perf_fastpath_hint">Raskere filoppslag og mindre hakking. Slå av hvis et program ikke finner filene sine.</string> + <string name="perf_cursor_composite">Tegn markøren i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tegner pekeren selv i stedet for å overlate den til Android. Slå på for en markør styrt med kontroller. Av er raskere på en telefon. Gjelder fra neste sesjon.</string> <string name="perf_identity">Sesjonsidentitet</string> <string name="perf_hostname">Vertsnavn</string> <string name="perf_hostname_hint">Navnet Steam ser for denne enheten. Tomt gjenoppretter %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Filene fjernes fra appen.</string> <string name="driver_delete_in_use">Filene fjernes. Den er i bruk, så standarden tar over.</string> <string name="drawer_page_display">Skjerm</string> + <string name="drawer_frame_limit">Bildefrekvensgrense</string> + <string name="drawer_frame_limit_note">Begrenser dette spillet. Skjermen bytter til en oppdateringsfrekvens som grensen går opp i når det finnes en; andre grenser kan se ujevne ut. Steam-spill bruker Steams Frame Limit i Hurtigmenyen.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Amber</string> <string name="drawer_hud_color_violet">Fiolett</string> <string name="drawer_hud_opacity">Opasitet</string> + <string name="hud_size">Størrelse</string> + <string name="hud_size_hint">Et trykk på HUD-en endrer også størrelsen.</string> + <string name="hud_size_full">Full</string> + <string name="hud_size_tiles">Fliser</string> + <string name="hud_size_pill">Pille</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Linje</string> + <string name="hud_locked">Lås på plass</string> + <string name="hud_locked_hint">Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. Mens den er låst, fungerer skjermkontrollene under den fortsatt.</string> + <string name="hud_snap">Fest til sidene</string> + <string name="hud_snap_hint">Slipp HUD-en, så flytter den seg til nærmeste side av skjermen. Et raskt sveip kaster den den veien.</string> + <string name="hud_group_look">Utseende</string> + <string name="hud_scale">Størrelse på skjermen</string> + <string name="hud_color_soft">Myk</string> + <string name="hud_color_mid">Middels</string> + <string name="hud_color_vivid">Kraftig</string> + <string name="hud_outline">Kontur</string> + <string name="hud_outline_color">Konturfarge</string> + <string name="hud_outline_gray">Grå</string> + <string name="hud_outline_theme">Temafarge</string> + <string name="hud_group_metrics">Måleverdier</string> + <string name="hud_metric_graph">Bildetidsgraf</string> + <string name="hud_metric_decimal">Bildefrekvens med desimal</string> + <string name="hud_metric_low001" formatted="false">0.01% laveste</string> + <string name="hud_metric_engine">Grafikkmotor</string> + <string name="hud_metric_gpu_model">GPU-navn</string> + <string name="hud_metric_gpu">GPU-belastning</string> + <string name="hud_metric_gpu_temp">GPU-temperatur</string> + <string name="hud_metric_cpu">CPU-belastning</string> + <string name="hud_metric_per_core">CPU per kjerne</string> + <string name="hud_metric_temp">Temperaturer</string> + <string name="hud_metric_ram">Minne</string> + <string name="hud_metric_vram">Grafikkminne</string> + <string name="hud_metric_swap">Swap-minne</string> + <string name="hud_metric_battery">Batterinivå</string> + <string name="hud_metric_power">Strømforbruk</string> + <string name="hud_metric_network">Nettverk</string> + <string name="hud_metric_resolution">Oppløsning</string> + <string name="hud_metric_proton">Proton-versjon</string> + <string name="hud_metric_session">Sesjonstid</string> + <string name="hud_metric_clock">Klokke</string> + <string name="hud_group_temps">Temperaturer</string> + <string name="hud_temp_unit">Enhet</string> + <string name="hud_temp_bands">Varselfarger</string> + <string name="hud_temp_bands_hint">Temperaturer blir ravgule og så røde når de nærmer seg grensen.</string> + <string name="hud_temp_bands_off">Av</string> + <string name="hud_temp_bands_auto">Automatisk</string> + <string name="hud_temp_bands_manual">Manuell</string> + <string name="hud_temp_red_cpu">CPU rød ved</string> + <string name="hud_temp_red_gpu">GPU rød ved</string> + <string name="hud_temp_red_battery">Batteri rødt ved</string> + <string name="hud_group_more">Mer</string> + <string name="hud_export">HUD-diagnostikk</string> + <string name="hud_export_hint">Lagrer en rapport over alle sensorer HUD-en leser, i Downloads/DroidDeck.</string> + <string name="hud_export_button">Lagre</string> + <string name="hud_export_done">Lagret i %1$s</string> + <string name="hud_export_failed">Kunne ikke lagre HUD-rapporten.</string> + <string name="hud_reset">Tilbakestill HUD-innstillinger</string> + <string name="hud_reset_button">Tilbakestill</string> <string name="drawer_scaling">Skaleringsmodus</string> <string name="drawer_scaling_sharpness">Skaleringsskarphet</string> <string name="drawer_effects">Skjermeffekter</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Forsinkelse</string> + <string name="drawer_low_latency">Modus for lav forsinkelse</string> + <string name="drawer_low_latency_hint">Øker CPU- og batteribruk</string> <string name="drawer_low_latency_controller">Kontroller med lav forsinkelse</string> <string name="drawer_low_latency_controller_hint">Kontrolleren rapporterer ved 1000 Hz i stedet for 250 Hz. Litt mer CPU.</string> <string name="drawer_low_latency_touch">Berøring med lav forsinkelse</string> <string name="drawer_low_latency_touch_hint">Berøringer hopper over bildeinnsamling; Steams berøringsstyring går ved 1000 Hz. Litt mer CPU.</string> + <string name="drawer_evdev_mouse">Rå musekanal</string> + <string name="drawer_direct_cursor">Peker</string> <string name="drawer_pc_keyboard">PC-tastatur</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Andre skjerm</string> @@ -642,7 +761,7 @@ <string name="drawer_session_behavior">Sesjonsoppførsel</string> <string name="drawer_suspend_hint">Gjelder nå og for fremtidige sesjoner i denne modusen.</string> <string name="drawer_next_session">Neste sesjon</string> - <string name="drawer_support">Support</string> + <string name="drawer_support">Støtte</string> <string name="drawer_logs">Sesjonslogger</string> <string name="drawer_logs_hint">Legg ved en feilrapport</string> <string name="drawer_share_logs">Del logger</string> @@ -715,6 +834,10 @@ <string name="setup_session">Sesjon</string> <string name="setup_logs">Sesjonslogger</string> <string name="setup_logs_hint">Lagret etter hver sesjon</string> + <string name="setup_game_debug_logs">Feilsøkingslogger for spill</string> + <string name="setup_game_debug_logs_hint">Ta med diagnostikk for Proton, Wine og grafikk ved neste spillstart. Kan redusere ytelsen og bruke mer lagringsplass.</string> + <string name="setup_game_debug_logs_restart">Start denne sesjonen på nytt for å lagre feilsøkingslogger for spill</string> + <string name="setup_logging_update_failed">Kunne ikke oppdatere loggingen. Sjekk bryteren og prøv igjen.</string> <string name="setup_agent_commands">Feilsøkingsverktøy</string> <string name="setup_latest_logs">Nyeste sesjonslogger</string> <string name="setup_saved_logs">Lagrede sesjonslogger</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck kan være Hjem-appen</string> <string name="setup_home_off">DroidDeck tilbys aldri som en Hjem-app</string> <string name="setup_orientation">Retning</string> + <string name="setup_launcher_orientation">Retning for launcheren</string> + <string name="setup_launcher_orientation_auto">Følg enhetens rotasjon</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Retning for sesjonen</string> + <string name="setup_session_orientation_hint">Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; egendefinert bredde og høyde forblir som angitt.</string> <string name="setup_orientation_auto">Automatisk liggende</string> <string name="setup_orientation_landscape">Liggende</string> <string name="setup_orientation_reverse">Omvendt liggende</string> <string name="setup_fullscreen">Fullskjerm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigasjonslinjer</string> <string name="setup_fullscreen_off">Viser Androids status- og navigasjonslinjer</string> + <string name="setup_dual_screen">Dobbel skjerm</string> + <string name="setup_dual_screen_hint">Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm.</string> + <string name="setup_dual_screen_auto">Automatisk</string> + <string name="setup_dual_screen_on">På</string> + <string name="setup_dual_screen_off">Av</string> + <string name="setup_dual_screen_menu">Meny på nederste skjerm</string> + <string name="setup_dual_screen_menu_hint">Flytter seksjonene og menyen i spillet til den andre skjermen og skriver der, så den øverste skjermen beholder hele visningen. L2 og R2 bytter seksjon.</string> + <string name="setup_dual_screen_controls">Kontroller på nederste skjerm i spill</string> + <string name="setup_dual_screen_controls_hint">Åpner styreflaten og tastaturet på den andre skjermen når en økt starter.</string> + <string name="dual_typing_title">Skriver for den øverste skjermen</string> + <string name="dual_typing_done">Ferdig</string> <string name="setup_default_home">Standard Hjem-app</string> <string name="setup_choose_home">Velg en Hjem-app</string> <string name="setup_choose">Velg</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Åpne Innstillinger → Utvikleralternativer → Trådløs feilsøking og slå det på</string> <string name="gate_step2">Trykk på «Par enhet med koblingskode»</string> <string name="gate_step3">Skriv koden inn i DroidDeck-varslingen</string> + <string name="pairguide_build_number">I Om telefonen trykker du på Delversjonsnummer 7 ganger</string> + <string name="pairguide_wireless">Slå på Trådløs feilsøking</string> + <string name="pairguide_pair">Åpne Trådløs feilsøking, og trykk på «Par enhet med koblingskode»</string> + <string name="pairguide_child_process">Slå på «Deaktiver begrensninger for underordnede prosesser»</string> + <string name="pairguide_row_child_process">Deaktiver begrensninger for underordnede prosesser</string> + <string name="pairguide_row_build_number">Delversjonsnummer</string> + <string name="pairguide_row_wireless">Trådløs feilsøking</string> + <string name="pairguide_row_pair">Par enhet med koblingskode</string> <string name="gate_waiting">Venter på koblingsvarselet…</string> <string name="gate_code_needed">Varsel funnet. Skriv inn koden i varslingen.</string> <string name="gate_status">Status</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Aldri spilt</string> <string name="games_runtime_busy_percent">Kjøretid opptatt · %1$d%%</string> <string name="games_runtime_busy">Kjøretid opptatt</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Skjul drivere for andre GPU-er</string> <string name="gpu_show_other">Vis drivere for andre GPU-er</string> <string name="gpu_advanced">Avansert</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prøv På eller Av hvis Steam eller Android viser striper eller flimring. Gjelder begge driverne etter at DroidDeck startes på nytt.</string> + <string name="gpu_ubwc_restart">Start DroidDeck på nytt for å bruke endringen.</string> <string name="gpu_set_with_display">Angis sammen med skjermdriveren: %1$s bærer begge.</string> <string name="gpu_set_with_runtime">Angis sammen med kjøretidsdriveren: %1$s bærer begge.</string> <string name="gpu_runtime_hint">Brukes av spill og skrivebordet.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Gå automatisk inn i PiP</string> <string name="unfolded_controls">Kontroller på den utbrettede skjermen</string> <string name="unfolded_controls_hint">Utbrettet sitter spillet over Steam Deck-styreflatene og bakgrepene. Sammenslått er spillet i fullskjerm.</string> + <string name="unfolded_controls_with_controller">Behold dem med kontroller</string> + <string name="unfolded_controls_with_controller_hint">Vis også disse berøringskontrollene mens en kontroller er tilkoblet.</string> <string name="pip_suspended">Satt på pause</string> <string name="pip_not_ready">Bilde-i-bilde er tilgjengelig når sesjonen er klar.</string> <string name="pip_permission">Tillat bilde-i-bilde for DroidDeck i Android-innstillingene.</string> <string name="pip_unavailable">Android kunne ikke åpne bilde-i-bilde.</string> + <string name="game_more">Mer</string> + <string name="game_edit_art">Rediger grafikk</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Snarvei</string> <string name="game_shortcut_add">Legg til på hjem-skjermen</string> <string name="game_shortcut_choose">Velg spill</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Vent til kjøretidsoperasjonen er ferdig</string> <string name="main_wait_proton_install">Vent til installasjonen av kompatibilitetsverktøyet er ferdig</string> + <string name="load_compat_title">Gjør kompatibilitetsverktøy klare</string> + <string name="load_compat_wait">Venter på at kompatibilitetsoppsettet skal bli ferdig</string> + <string name="load_compat_hint">Sesjonen starter når oppsettet er ferdig.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vent til installasjonen av skrivebordsappen er ferdig</string> <string name="main_wait_install_game">Vent til installasjonen er ferdig før du starter et spill</string> <string name="main_saves_close_session">Lukk Steam-sesjonen først, så spillet ikke kan lagre over importen</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Installer likevel</string> <string name="main_remove_runtime_title">Fjern Linux-kjøretid</string> <string name="main_remove_runtime_text">Dette sletter kjøretiden, Steam-klienten inni den, og hvert spill installert der.</string> + <string name="runtime_actions_title">Linux-kjøretid</string> + <string name="runtime_actions_text">Reparer installerer kjøretidens systemfiler på nytt og beholder Steam, spillene og innstillingene dine. Tillegg som skrivebordet installeres igjen neste gang du bruker dem. Fjern sletter alt.</string> + <string name="runtime_repair">Reparer kjøretid</string> <string name="main_applied">Brukt: %1$s</string> <string name="android_app_open_failed_primary">Kunne ikke åpne %1$s på hovedskjermen</string> <string name="android_app_open_failed_on">Kunne ikke åpne %1$s på %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Kunne ikke nå kjøretidskatalogen. Kontroller tilkoblingen og trykk Spill igjen.</string> <string name="session_runtime_install_failed">Linux-kjøretiden ble ikke installert. Kontroller kjøretiden i Oppsett og trykk Spill igjen.</string> <string name="session_desktop_install_failed">Skrivebordet ble ikke installert (%1$s). Kontroller tilkoblingen og trykk Skrivebord igjen.</string> + <string name="session_package_resume_failed">En avbrutt installasjon kunne ikke fullføres (%1$s). Sjekk tilkoblingen og ledig plass, og prøv igjen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-kjøretiden er skadet: %1$d bibliotekslenke peker til en manglende fil (%2$s), vanligvis etter at en installasjon ble avbrutt. Reparer beholder spillene og innstillingene dine.</item> + <item quantity="other">Linux-kjøretiden er skadet: %1$d bibliotekslenker peker til manglende filer (%2$s med flere), vanligvis etter at en installasjon ble avbrutt. Reparer beholder spillene og innstillingene dine.</item> + </plurals> <string name="session_ended_named">%1$s stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> <string name="session_ended_program">Programmet stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> <string name="session_ended_desktop">Skrivebordet stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Installer en programtillegg-ZIP for neste Steam-sesjon.</string> <string name="mode_decky_plugin_downloading">Laster ned…</string> <string name="mode_decky_plugin_install_zip">Installer fra ZIP</string> + <string name="decky_zip_warning_title">Installasjon av tredjeparts programtillegg</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har ikke gjennomgått dette programtillegget. Det kan inneholde skadevare, for eksempel programvare som stjeler Steam-kontoen din eller skader enheten din. Ved å installere dette programtillegget godtar du at du tar all risiko for enheten din.</string> + <string name="decky_zip_warning_continue">Fortsett</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vent %1$d sekund</item> + <item quantity="other">Vent %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spill</string> <string name="store_cat_audio_video">Lyd og video</string> <string name="store_cat_graphics">Grafikk</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Svart bakgrunn, hvit skrift, det blå for alt som er valgt, fokusert eller trykket.</string> <string name="theme_electric">Elektrisk marineblå</string> <string name="theme_electric_detail">Det blå lysere, på flater som lener mer mot marineblått enn grått.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Farger som går gjennom regnbuen. Følger Androids animasjonsinnstillinger.</string> + <string name="theme_rgb_speed">Hastighet</string> + <string name="theme_rgb_speed_hint">Hvor raskt fargene skifter.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Dine egne primær- og sekundærfarger, blandet på knapper og uthevinger.</string> <string name="theme_gradient_primary">Primær</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Hopp over</string> <string name="fm_select_this_folder">Velg denne mappen</string> <string name="fm_back">Tilbake</string> + <string name="fm_exit">Avslutt</string> + <string name="fm_return_to_start">Tilbake til startmappen</string> + <string name="fm_start_unavailable">Startmappen er ikke lenger tilgjengelig</string> + <string name="fm_cancel_operation_title">Avbryt operasjonen?</string> + <string name="fm_cancel_operation_confirmation">Operasjonen blir avbrutt. Er du sikker?</string> + <string name="fm_accept">Godta</string> + <string name="fm_decline">Avslå</string> <string name="fm_drive_not_readable">%1$s er montert, men ikke lesbar akkurat nå</string> + <string name="fm_drive_access_title">Gi tilgang til %1$s</string> + <string name="fm_drive_access_text">Android lar DroidDeck se denne stasjonen, men ikke lese den. Slå på Tilgang til alle filer for DroidDeck, og kom så tilbake.</string> <string name="fm_list_view">Listevisning</string> <string name="fm_grid_view">Rutenettvisning</string> <string name="fm_search">Søk</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Tastatur + styreflate</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grep + styreflater</string> + <string name="second_mode_dashboard">Dashbord</string> + <string name="bottom_dashboard_empty">Ingenting å vise her ennå.</string> + <string name="bottom_page_downloads">Nedlastinger</string> + <string name="bottom_downloads_none">Ingen nedlastinger pågår.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Laster ned shaderbuffer</string> + <string name="bottom_downloads_paused">Pauset</string> + <string name="bottom_downloads_queued">Venter på å starte</string> + <string name="bottom_page_notifications">Varslinger</string> + <string name="bottom_notifications_listener">DroidDeck nedre skjerm</string> + <string name="bottom_notifications_why">Vis meldinger og andre varslinger her mens du spiller. De vises bare på denne skjermen og lagres ikke. Android spør én gang: siden for varseltilgang åpnes på denne skjermen; slå på DroidDeck der, så kommer denne siden tilbake av seg selv.</string> + <string name="bottom_notifications_allow">Tillat varseltilgang</string> + <string name="bottom_notifications_none">Ingen varslinger.</string> + <string name="bottom_notifications_count">%1$d varslinger</string> + <string name="bottom_notifications_clear">Fjern</string> + <string name="bottom_page_screenshots">Skjermbilder</string> + <string name="stats_fps_needs_hud">FPS krever at HUD-en er på</string> + <string name="stats_speed">Fart</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tider</string> + <string name="stats_best_lap">Beste runde</string> + <string name="stats_tires">Dekk °C</string> + <string name="stats_trace">Gass og brems, siste 10 s</string> + <string name="stats_speed_chart">Fart, %1$s</string> + <string name="stats_gear">Gir</string> + <string name="stats_speed_units">Fartsenheter</string> + <string name="stats_speed_units_auto">Automatisk (%1$s)</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Gass</string> + <string name="stats_brake">Brems</string> + <string name="stats_lights">Varsellamper</string> + <string name="stats_lamp_shift">Girskift</string> + <string name="stats_lamp_handbrake">Håndbrekk</string> + <string name="stats_lamp_pit">Pitbegrenser</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olje %1$s °C</string> + <string name="stats_power">Kraftfordeler</string> + <string name="stats_fuel_t">Drivstoff, t</string> + <string name="stats_fuel_main">Hoved %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_tap_hint">Trykk på den øverste stripen eller dashbordet for å endre stilen.</string> + <string name="bottom_telemetry_send_title">Send dashborddata</string> + <string name="bottom_telemetry_send_auto">Automatisk</string> + <string name="bottom_telemetry_send_auto_hint">Slår det på for alle spill som er oppført her, også spill som blir funnet senere. Spill du slår av, forblir av.</string> + <string name="bottom_telemetry_send_note">Dette endrer spillets egen innstilling for datautgang. Det trer i kraft neste gang spillet starter; slår du det av, settes den gamle innstillingen tilbake.</string> + <string name="bottom_telemetry_send_close">Lukk %1$s for å endre dette.</string> + <string name="bottom_telemetry_send_failed">Kunne ikke endre innstillingene for %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå på %2$s i spillets innstillinger med IP 127.0.0.1 og port %3$d.</string> + <string name="bottom_shots_where">Lagret i Pictures/DroidDeck. Skjermbilder fra Steam vises også her.</string> + <string name="bottom_shots_take">Ta skjermbilde</string> + <string name="bottom_shots_saved">Skjermbildet er lagret.</string> + <string name="bottom_shots_failed">Kunne ikke ta et skjermbilde.</string> + <string name="bottom_shots_none">Ingen skjermbilder ennå.</string> + <string name="bottom_page_chat">Chat & tale</string> + <string name="bottom_chat_why">Les og svar på Steam-chat her mens spillet fortsetter på hovedskjermen. Den bruker kontoen Steam er logget inn med.</string> + <string name="bottom_chat_not_signed_in">Steam har ingen nettinnlogging å dele ennå, så logg inn her én gang.</string> + <string name="bottom_chat_stopped">Android lukket chatsiden mens DroidDeck var i bakgrunnen. Den åpnes igjen når du kommer tilbake til DroidDeck.</string> + <string name="bottom_chat_open">Åpne Steam Chat</string> + <string name="bottom_chat_close">Lukk chat</string> + <string name="bottom_chat_mic_on">Mikrofon på</string> + <string name="bottom_chat_mic_off">Mikrofon av</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen er av for dette spillet. For å snakke, slå på Mikrofon i DroidDecks Steam-innstillinger (Lyd) og start spillet på nytt.</string> + <string name="bottom_chat_volume">Volum %1$d%%</string> + <string name="bottom_page_telemetry">Statistikk i spillet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Runde</string> + <string name="bottom_telemetry_position">Plassering</string> + <string name="bottom_telemetry_this_lap">Denne runden</string> + <string name="bottom_telemetry_last_lap">Forrige runde</string> + <string name="bottom_telemetry_fuel">Drivstoff</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridisk status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Slå på datautgangen i et racingspill (ofte kalt telemetri eller UDP) for å se et direkte dashbord her. Dataene blir på denne enheten.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d mottar data (%2$d pakker på %3$d byte), men i et format denne siden ikke kan lese ennå.</string> + <string name="bottom_telemetry_port_busy">Et annet program bruker allerede port %1$s, så det spillet kan ikke vises her.</string> <string name="rtinst_removing">Fjerner Linux-kjøretid</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Sett opp Flatpak først</string> <string name="flatpakmgr_starting">Starter</string> <string name="flatpakmgr_exit_status">Flatpak avsluttet med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s er bygget for %2$s, som DroidDeck ikke kan kjøre. Flatpak-apper her trenger en ARM64- eller x86_64-versjon.</string> <string name="flatpakmgr_installing">Installerer %1$s</string> <string name="flatpakmgr_updating">Oppdaterer %1$s</string> <string name="flatpakmgr_removing">Fjerner %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Bruker innstillingen…</string> <string name="adbpair_command_failed">Kommandoen for trådløs feilsøking mislyktes</string> <string name="adbpair_channel_name">Oppsett av trådløs feilsøking</string> + <string name="adbpair_progress_channel_name">Fremdrift for oppsett av trådløs feilsøking</string> <string name="adbpair_channel_description">Ber om koblingskoden for trådløs feilsøking mens Innstillinger er åpen</string> <string name="adbpair_title_pair">Koble sammen trådløs feilsøking</string> <string name="adbpair_waiting_text">Slå på trådløs feilsøking, og trykk så på «Par enhet med koblingskode».</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Ikke en Adreno-GPU</string> <string name="gpuinfo_supported">Støttet</string> <string name="gpuinfo_experimental">Eksperimentell: driverne er testbuilder</string> + <string name="gpuinfo_a850_experimental">Eksperimentell støtte for Adreno 850: krever kompatible eksperimentelle skjerm- og spilldrivere; ikke bekreftet på denne enheten</string> <string name="gpuinfo_below_tested">Under testet maskinvare (Adreno 725 og nyere): den kan ikke kjøre</string> <string name="gpuinfo_unsupported">Ikke støttet: DroidDeck krever en Adreno (Snapdragon) GPU</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Skalert %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Vis enhetsdetaljer</string> <string name="device_info_hide">Skjul enhetsdetaljer</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Sorter</string> + <string name="setup_rail_labels">Etiketter i sidepanelet</string> + <string name="setup_rail_labels_hint">Vis navn under ikonene i sidepanelet. Slå av for et smalere sidepanel.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Større kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Vis tittel</string> + <string name="library_display_size">Vis størrelse</string> <string name="stores_sort_last_played">Nylig spilt</string> <string name="stores_sort_recently_installed">Nylig installert</string> <string name="stores_sort_title_asc">Tittel A–Å</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Nedlastingsbehandling</string> <string name="stores_parallel">Samtidige nedlastinger</string> <string name="stores_install_where">Installer til</string> + <string name="stores_install_language">Spillspråk</string> + <string name="stores_install_language_hint">GOG og Epic installerer dette språket. System følger appspråket.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installer %1$s:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s ledig</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Start i</string> <string name="edit_launch_options">Startalternativer</string> + <string name="edit_launch_options_steam_hint">Delt med Egenskaper i Steam: en endring det ene stedet vises begge steder.</string> + <string name="edit_launch_options_not_saved">Kunne ikke lagre startalternativene i Steam. Prøv igjen.</string> + <string name="edit_launch_options_desktop">Steam kan være åpent i skrivebordssesjonen. Endre startalternativene under Egenskaper der, eller lukk sesjonen først.</string> <string name="edit_artwork">Grafikk</string> <string name="edit_other_exe">Annen exe…</string> <string name="edit_remove">Fjern</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Eget prefiks</string> <string name="setup_download_mirror">Nettsted</string> <string name="setup_download_prefix">Prefiks</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPER</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Skrivebordsapper for Linux-skrivebordet, åpnet fra Skrivebord.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Automatisk holder dette 2D-spillet fast i synsfeltet. Velg Virtuell skjerm under Skjerm for å bruke hodesporing.</string> <string name="glasses_tracking_sbs_hint">Hodesporing gjelder for en virtuell skjerm eller et SteamVR-spill som kjører.</string> <string name="glasses_hardware">Enhet</string> + <string name="vr_controllers_tab">Kontrollere</string> + <string name="vr_controllers_group">SteamVR-kontrollere</string> + <string name="vr_controllers_emulate">Spillkontroller i VR</string> + <string name="vr_controllers_emulate_hint">De to VR-hendene kontrolleren din spiller som. Endringer gjelder med en gang, også mens SteamVR kjører. Joy-Con og sporede hender tar fortsatt over sin side.</string> + <string name="vr_controllers_off">Vanlig spillkontroller</string> + <string name="vr_controllers_index">Valve Index-kontrollere</string> + <string name="vr_controllers_touch">Meta Quest 3-kontrollere</string> + <string name="vr_controllers_vive">HTC Vive-kontrollere</string> + <string name="vr_controllers_sticks">Spakene starter med å</string> + <string name="vr_controllers_sticks_hint">Trykk inn begge spakene samtidig i VR for å bytte.</string> + <string name="vr_controllers_sticks_game">Flytte deg i spillet</string> + <string name="vr_controllers_sticks_hands">Flytte hendene</string> + <string name="vr_controllers_buttons">Knapper</string> + <string name="vr_controllers_buttons_stick">Avtrekkere er avtrekkere, skulderknapper griper, A/B og X/Y er hver hånds frontknapper, spakeklikk klikker tommelspakene, Guide åpner SteamVR-menyen. Retningsknapp opp og ned flytter hendene nærmere eller lenger unna.</string> + <string name="vr_controllers_buttons_vive">Spakene er styreflater; A/X eller spakeklikk trykker på dem. Avtrekkere er avtrekkere, skulderknapper griper, Start og Select er meny, Guide åpner SteamVR-menyen.</string> + <string name="vr_controllers_buttons_off">Ingen VR-hender. Spill som støtter spillkontroller, og SteamVR-menyen, får kontrolleren din som vanlig.</string> <string name="glasses_brightness">Lysstyrke</string> <string name="glasses_volume">Volum</string> <string name="glasses_sunblock">Solskjerming</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Kameraplassering</string> <string name="hand_camera_placement_hint">Sjekk at kameraet kan se deg før du spiller.</string> <string name="hand_camera_check">Sjekk</string> + <string name="tracking_pack_title">Nedlasting av håndsporing</string> + <string name="tracking_pack_hint">Håndsporing krever en engangsnedlasting på %1$s.</string> + <string name="tracking_pack_download">Last ned</string> + <string name="tracking_pack_retry">Prøv igjen</string> + <string name="tracking_pack_downloading">Laster ned håndsporing… %1$d%%</string> + <string name="tracking_pack_failed">Kunne ikke laste ned håndsporing. Sjekk tilkoblingen og prøv igjen.</string> <string name="hand_camera_check_title">Kameraplassering</string> <string name="hand_camera_how_rear">Still enheten opp 1,5 til 2 meter unna i omtrent brysthøyde, med det bakre kameraet vendt mot deg. Tre så inn i bildet med hendene ute.</string> <string name="hand_camera_how_front">Still enheten opp 1,5 til 2 meter unna i omtrent brysthøyde, med skjermen vendt mot deg. Tre så inn i bildet med hendene ute.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Ubrukte kjøretidsmiljøer, rester, gamle logger</string> <string name="storage_clean_up">Rydder…</string> <string name="storage_session_running">Stopp økten for å rydde eller slette noe. Størrelsene vises fortsatt.</string> + <string name="storage_default_group">Installasjonsplassering</string> + <string name="storage_default_title">Standard lagring</string> + <string name="storage_default_hint">Nye butikkinstallasjoner havner på valgt plassering. Eksisterende spill blir der de er. Steam-biblioteker beholder sin egen innstilling.</string> + <string name="storage_default_ask">Spør hver gang</string> + <string name="storage_default_ask_detail">Velg et mål for hver installasjon</string> + <string name="storage_default_internal">Intern lagring</string> + <string name="storage_default_external">Ekstern lagring</string> + <string name="storage_default_external_detail">%1$s · %2$s ledig</string> + <string name="storage_default_external_missing">Ikke tilkoblet</string> + <string name="storage_default_folder">Mappe · %1$s</string> + <string name="storage_default_folder_free">%1$s ledig</string> + <string name="storage_default_folder_missing">Ikke tilkoblet</string> + <string name="storage_default_choose_folder">Velg mappe…</string> + <string name="storage_default_choose_folder_detail">Bruk en hvilken som helst mappe på et SD-kort eller en USB-enhet</string> + <string name="storage_default_note">Spill legges i en Games-mappe på valgt plassering. Eksisterende spill flyttes ikke.</string> <string name="storage_where">Hvor det ender</string> <string name="storage_games">Steam-spill</string> <string name="storage_game_data">Spilldata</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Installerte spill</string> <string name="storage_data_parts">Prefiks %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Rydd shaders</string> + <string name="storage_reset_prefix">Tilbakestill prefiks</string> + <string name="storage_reset_prefix_title">Tilbakestille prefiks for %1$s?</string> + <string name="storage_reset_prefix_confirm">Sletter Wine-prefikset (%1$s) i %2$s og oppretter det på nytt ved neste start. Lagringer, innstillinger og installerte redistribuerbare pakker i det går tapt; Steam Cloud-lagringer blir værende på kontoen din.</string> <string name="storage_data_leftovers">Slettede spill</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Prefikset inneholder fortsatt filer, kanskje lokale lagringer</string> @@ -2979,4 +3335,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkroniser med Syncthing</string> + <string name="sync_enable_hint">Dette er en Syncthing-implementasjon basert på Syncthing-Fork som lar deg synkronisere filer i DroidDecks interne filsystem med andre Syncthing-instanser. Dette gjelder bare filer du lagrer i DroidDecks interne filsystem.</string> + <string name="sync_missing">Denne versjonen inneholder ikke Syncthing.</string> + <string name="sync_starting">Starter Syncthing</string> + <string name="sync_status_starting">Starter</string> + <string name="sync_status_up_to_date">Oppdatert</string> + <string name="sync_status_syncing">Synkroniserer</string> + <string name="sync_status_paused">Pauset</string> + <string name="sync_status_pausing">Pauser</string> + <string name="sync_status_resuming">Gjenopptar</string> + <string name="sync_status_attention">Trenger oppmerksomhet</string> + <string name="sync_status_failed">Syncthing stoppet</string> + <string name="sync_failed_retry">Prøv igjen</string> + <string name="sync_paused_wifi">Pauset til Wi-Fi er tilgjengelig</string> + <string name="sync_paused_game">Pauset under spillet</string> + <string name="sync_summary">%1$d mapper · %2$d av %3$d enheter tilkoblet</string> + <string name="sync_left">%1$s igjen</string> + <string name="sync_open_web_ui">Åpne nettgrensesnittet</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Gjenoppta</string> + <string name="sync_running">Kjører</string> + <string name="sync_running_hint">Slå av for å stoppe Syncthing helt.</string> + <string name="sync_this_device">Denne enheten</string> + <string name="sync_device_id">Enhets-ID</string> + <string name="sync_show_qr">Vis QR</string> + <string name="sync_advanced">Avansert</string> + <string name="sync_advanced_hint">Porter, når den skal kjøre, nullstilling</string> + <string name="sync_open">Åpne</string> + <string name="sync_waiting">Venter på deg</string> + <string name="sync_pending_device">%1$s vil koble til</string> + <string name="sync_pending_folder">%1$s vil dele «%2$s»</string> + <string name="sync_pending_folder_hint">Godta for å velge hvor den lagres i DroidDeck.</string> + <string name="sync_review">Se gjennom i nettgrensesnittet</string> + <string name="sync_folders">Mapper</string> + <string name="sync_no_folders">Ingen mapper ennå.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Oppdatert</string> + <string name="sync_folder_syncing">Synkroniserer %1$d%%</string> + <string name="sync_folder_scanning">Skanner</string> + <string name="sync_folder_paused">Pauset</string> + <string name="sync_folder_out_of_sync">Ikke synkronisert</string> + <string name="sync_folder_errors">%1$d filer kunne ikke synkroniseres</string> + <string name="sync_folder_blocked">Blokkert</string> + <string name="sync_folder_blocked_hint">Denne mappen ligger utenfor DroidDecks lagring, så DroidDeck har pauset den. Bruk Syncthing-Fork-appen for å synkronisere mapper utenfor DroidDeck.</string> + <string name="sync_remove_folder">Fjern fra Syncthing</string> + <string name="sync_remove_folder_hint">Fjerning sletter ingen filer.</string> + <string name="sync_devices">Enheter</string> + <string name="sync_no_devices">Ingen enheter ennå.</string> + <string name="sync_connected">Tilkoblet</string> + <string name="sync_offline">Frakoblet</string> + <string name="sync_last_seen">Sist sett %1$s</string> + <string name="sync_device_id_title">Denne enhetens ID</string> + <string name="sync_device_id_hint">Legg til en enhet i Syncthing på den andre enheten din, og skann denne koden eller lim inn ID-en. Godta den deretter her i nettgrensesnittet.</string> + <string name="sync_copy">Kopier</string> + <string name="sync_share">Del</string> + <string name="sync_done">Ferdig</string> + <string name="sync_off_title">Slå av Syncthing?</string> + <string name="sync_off_body">Syncthing stopper nå og forblir stoppet til den slås på igjen. Synkroniserte filer blir liggende der de er.</string> + <string name="sync_off_forget">Slett også Syncthing-konfigurasjonen</string> + <string name="sync_off_forget_hint">Fjerner denne enhetens ID, mapper og enheter. Når den slås på igjen, starter den på nytt fra bunnen av.</string> + <string name="sync_turn_off">Slå av</string> + <string name="sync_ports">Porter</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal oppdaging</string> + <string name="sync_repick">Velg nye porter</string> + <string name="sync_repick_hint">Kontrolleres på nytt ved hver oppstart.</string> + <string name="sync_repick_button">Velg på nytt</string> + <string name="sync_reset_group">Nullstill</string> + <string name="sync_api_key">API-nøkkel</string> + <string name="sync_regenerate">Generer på nytt</string> + <string name="sync_reset">Nullstill Syncthing</string> + <string name="sync_reset_hint">Ny enhets-ID, mapper og enheter fjernes. Filer i DroidDecks lagring beholdes.</string> + <string name="sync_reset_button">Nullstill</string> + <string name="sync_reset_confirm_title">Nullstille Syncthing?</string> + <string name="sync_running_group">Kjøring</string> + <string name="sync_run">Kjør</string> + <string name="sync_run_open">Mens DroidDeck er åpen</string> + <string name="sync_run_background">I bakgrunnen</string> + <string name="sync_wifi_only">Bare Wi-Fi</string> + <string name="sync_pause_games">Pause under spilling</string> + <string name="sync_logs">Logger</string> + <string name="sync_logs_hint">Syncthing-utdata for denne sesjonen</string> + <string name="sync_logs_share">Del</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurer Linux-kjøretiden først.</string> + <string name="sync_accept">Godta</string> + <string name="sync_accept_title">Lagre «%1$s» i</string> + <string name="sync_add_folder">Legg til mappe</string> + <string name="sync_add_folder_hint">Synkroniser en mappe i DroidDecks lagring</string> + <string name="sync_choose">Velg</string> + <string name="sync_add">Legg til</string> + <string name="sync_add_failed">Mappen kunne ikke legges til.</string> + <string name="sync_share_with">Del med</string> + <string name="sync_share_none">Ingen enheter ennå. Du kan dele denne mappen fra nettgrensesnittet senere.</string> + <string name="sync_use_folder">Bruk denne mappen</string> + <string name="sync_new_folder">Ny mappe</string> + <string name="sync_location_home">Hjemmemappe i containeren</string> + <string name="sync_location_sync">Sync-mappe</string> + <string name="sync_location_shared">DroidDecks delte lagring</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDeck-appdata</string> + <string name="sync_web_path_locked">Nye mapper lagres i DroidDecks Sync-mappe. For å synkronisere en annen DroidDeck-mappe, bruk Legg til mappe på Syncthing-fanen.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Last på nytt</string> + <string name="sync_not_running">Syncthing kjører ikke.</string> + <string name="session_end_steam_sigill">Steam stoppet med en ulovlig instruksjon (SIGILL). Dette kan være et kompatibilitetsproblem med CPU-instruksjoner eller et klientkrasj. Del loggene sammen med detaljer om enheten din.</string> + <string name="session_end_steam_try_x64">Du kan prøve Steam-innstillinger → Steam-klient → x86-64 (eksperimentell). Det krever en ekstra nedlasting og kan kjøre tregere.</string> + <string name="session_end_vulkan_device">Linux-grafikkdriveren fant ingen brukbar Vulkan-enhet. Sjekk at den valgte Linux-GPU-driveren støtter denne GPU-en.</string> + <string name="session_end_gpu_unsupported">Denne sesjonen kan ikke starte fordi denne GPU-en ikke har noen kompatibel Linux Vulkan-driver i det nåværende oppsettet. Adreno Turnip-drivere kan ikke gi støtte for MediaTek/Mali-GPU-er.</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_resources_browser">Åpnes i nettleseren</string> + <string name="game_resource_guides">Veiledninger</string> + <string name="game_resource_protondb_detail">Kompatibilitetsrapporter for Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">For spill med lagringer på Steam-kontoen din</string> + <string name="game_resource_search">Nettsøk</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="library_filter">Filter</string> + <string name="library_filter_installed">Bare installerte</string> + <string name="library_filter_all_owned">Alle eide spill</string> + <string name="library_no_installed_matches">Ingen installerte spill samsvarer med disse filtrene.</string> + <string name="library_browse_owned">Bla gjennom eide spill</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="stores_itch_updates_found">Oppdateringer tilgjengelig: %1$d</string> + <string name="stores_itch_update_replaced">Utvikleren har erstattet denne versjonen med %1$s. Oppdatere til den?</string> + <string name="xbox_filter_cloud">Sky</string> + <string name="stores_xbox_cloud_settings">Skyinnstillinger</string> + <string name="integration_title">Steam-integrering</string> + <string name="integration_count">%1$d av %2$d på</string> + <string name="integration_set_up">Konfigurer</string> + <string name="integration_location">Posisjon</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-navn</string> + <string name="integration_brightness">Lysstyrke</string> + <string name="integration_home">DroidDeck som startskjerm</string> + <string name="integration_shortcuts">Snarveier for Hjem-knappen</string> + <string name="integration_wifi_hint">Vis nettverk i Steam · krever posisjonstilgang, spores aldri</string> + <string name="integration_wifi_on">Nettverk vises i Steam</string> + <string name="integration_wifi_location_off">Posisjon er av</string> + <string name="integration_wifi_denied">Posisjon avslått · tillat den i Appinfo</string> + <string name="integration_brightness_hint">Steams glidebryter styrer skjermens lysstyrke</string> + <string name="integration_home_hint">Hjem åpner Steam-menyen i en sesjon</string> + <string name="integration_shortcuts_hint">Hold Hjem for Steam Guide-kombinasjoner</string> + <string name="integration_shortcuts_needs_home">Krever DroidDeck som startskjerm</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonet i Android? Appinfo → ⋮ → Tillat begrensede innstillinger</string> + <string name="integration_shortcuts_restricted">Blokkert av Android · Appinfo → ⋮ → Tillat begrensede innstillinger</string> + <string name="integration_shortcuts_service">DroidDeck Hjem-knapp</string> + <string name="integration_shortcuts_service_description">Sender trykk på Hjem-knappen til Steam Guide mens en Steam-sesjon er i fokus og DroidDeck er standard startskjerm-app. Leser ikke skjerminnhold.</string> + <string name="integration_brightness_needed">Slå på Lysstyrke i Oppsett → Steam-integrering</string> + <string name="apps_search_hint">Søk i apper</string> + <string name="apps_no_match">Ingen apper samsvarer med «%1$s».</string> + <string name="apps_add_widget">Legg til modul</string> + <string name="apps_widgets_loading">Laster inn moduler…</string> + <string name="apps_widgets_none">Ingen apper på enheten tilbyr moduler.</string> + <string name="apps_widget_wider">Bredere</string> + <string name="apps_widget_narrower">Smalere</string> + <string name="apps_widget_taller">Høyere</string> + <string name="apps_widget_shorter">Lavere</string> + <string name="apps_widget_move_earlier">Flytt tidligere</string> + <string name="apps_widget_move_later">Flytt senere</string> + <string name="apps_widget_configure">Modulinnstillinger</string> + <string name="apps_widget_remove">Fjern modul</string> + <string name="apps_add_to_folder">Legg til i mappe</string> + <string name="apps_new_folder">Ny mappe</string> + <string name="apps_remove_from_folder">Fjern fra mappe</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Avinstaller</string> + <string name="apps_folder_rename">Gi nytt navn</string> + <string name="apps_folder_ungroup">Løs opp</string> + <string name="apps_folder_default">Mappe</string> + <string name="apps_folder_name">Mappenavn</string> + <string name="apps_filter">Vis</string> + <string name="apps_filter_all">Alle apper</string> + <string name="apps_filter_games">Spill</string> + <string name="apps_filter_downloaded">Nedlastet</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Skjult</string> + <string name="apps_hide">Skjul</string> + <string name="apps_unhide">Vis i apper</string> + <string name="apps_shortcut_remove">Fjern snarvei</string> + <string name="apps_pin_title">Legg til i Apper</string> + <string name="apps_pin_add">Legg til</string> + <string name="apps_hidden_none">Ingen skjulte apper.</string> + <string name="apps_sort_name_asc">Navn A–Å</string> + <string name="apps_sort_name_desc">Navn Å–A</string> + <string name="apps_sort_installed">Nylig installert</string> + <string name="apps_sort_updated">Nylig oppdatert</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apper</item> + </plurals> + <string name="desktop_restore_title">Gjenoppretter programvaren din</string> + <string name="desktop_restore_body">Installerer appene du la til på nytt etter en DroidDeck-oppdatering.</string> + <string name="desktop_restore_done_title">Programvare gjenopprettet</string> + <string name="desktop_restore_done_body">Appene du la til er installert igjen.</string> + <string name="desktop_restore_failed_title">Noe programvare kunne ikke gjenopprettes</string> + <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log, og prøv deretter sudo apt install i Konsole.</string> + <string name="gog_full_files">Native optimaliseringer er ikke tilgjengelige. Nedlastingen inneholder komplette erstatningsfiler.</string> + <string name="gog_recover">Kontroller resultatet av oppdateringen</string> + <string name="slow_usb_title">Treg USB-tilkobling</string> + <string name="slow_usb_cable">%1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s), så spill på den lastes inn tregt. Bruk en USB 3-kabel for 5 Gbps eller mer, prøv å snu USB-C-pluggen, eller bruk en raskere stasjon.</string> + <string name="slow_usb_port">%1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s). USB-porten på denne enheten kan ikke gå raskere, så spill lastes inn tregt. Intern lagring eller et microSD-kort kan være raskere.</string> + <string name="slow_usb_never">Ikke vis igjen</string> + <string name="slow_usb_dismiss">Lukk</string> + <string name="steam_import_title">Starte Steam på nytt for å legge til spillene dine?</string> + <string name="steam_import_body">Steam kan vise disse spillene du eier som installert: %1$s. Steam må startes på nytt for å vise dem. Start på nytt nå, eller så legges de til neste gang Steam starter.</string> + <string name="steam_import_names_more">%1$s og %2$d til</string> + <string name="steam_import_now">Start på nytt nå</string> + <string name="steam_import_later">Senere</string> + <string name="gog_maintenance">Administrer GOG-installasjon</string> + <string name="gog_check">Se etter oppdateringer</string> + <string name="gog_repair">Kontroller/reparer</string> + <string name="gog_patches">Frakoblede oppdateringer</string> + <string name="gog_refresh">Last ned fullt frakoblet installasjonsprogram</string> + <string name="gog_update">Oppdater til %1$s</string> + <string name="gog_resume">Gjenoppta GOG-vedlikehold</string> + <string name="gog_open_patch">Åpne oppdateringsprogram</string> + <string name="gog_patch_in_session">Fullfør eller avbryt oppdateringsprogrammet i Linux-sesjonen.</string> + <string name="gog_patch_requirements">Velg en oppdatering for den installerte versjonen og språket ditt. Støttede kildeversjoner er kanskje ikke oppført.</string> + <string name="gog_no_patches">GOG har ingen frittstående Windows-oppdateringer for dette spillet.</string> + <string name="gog_managed_files">Endrede spillfiler kan bli erstattet.</string> + <string name="gog_patch_installer_note">Installasjonsprogrammet åpnes i Linux-sesjonen din.</string> + <string name="gog_download_label">Nedlasting</string> + <string name="gog_space_label">Ekstra plass</string> + <string name="gog_space_estimate_label">Anslått plass</string> + <string name="gog_repair_action">Reparer filer</string> + <string name="gog_refresh_action">Oppdater installasjonen</string> + <string name="gog_select_patch">Velg</string> + <string name="setup_all_files">Tilgang til alle filer</string> + <string name="setup_local_network">Lokalt nettverk</string> + <string name="libraries_title">Flere Steam-biblioteker</string> + <string name="libraries_hint">Mapper som Steam kan installere og starte spill fra, hver med sitt eget navn. Fjerning beholder spillene på disken.</string> + <string name="libraries_add">Legg til bibliotek</string> + <string name="libraries_rename_title">Biblioteknavn</string> + <string name="libraries_pick">Velg en mappe til biblioteket</string> + <string name="libraries_full">Høyst %1$d ekstra biblioteker</string> + <string name="libraries_overlap">Denne mappen er allerede et bibliotek eller ligger i et</string> + <string name="libraries_missing">%1$s · utilgjengelig</string> + <string name="libraries_applies_next">Gjelder fra neste Steam-økt</string> + <string name="bottom_desktop_start">Start skrivebordet</string> + <string name="bottom_desktop_mode_touch">Direkte berøring</string> + <string name="bottom_desktop_trackpad">Styreflate. Trykk for direkte berøring</string> + <string name="bottom_desktop_direct_touch">Direkte berøring. Trykk for styreflate</string> + <string name="bottom_desktop_starting">Starter KDE-skrivebordet…</string> + <string name="bottom_desktop_ended">Skrivebordet ble lukket.</string> + <string name="bottom_desktop_failed">Skrivebordet kunne ikke starte. Loggene ligger i mappen bottom-desktop for denne økten.</string> + <string name="bottom_desktop_off">Skrivebordet er lukket.</string> + <string name="libraries_rename">Gi nytt navn</string> + <string name="second_mode_desktop">Skrivebord</string> + <string name="bottom_desktop_mode_trackpad">Styreflate</string> + <string name="bottom_desktop_title">Skrivebord · %1$s</string> </resources> diff --git a/app/src/main/res/values-nl/gestures.xml b/app/src/main/res/values-nl/gestures.xml index a970becd5..007027c15 100644 --- a/app/src/main/res/values-nl/gestures.xml +++ b/app/src/main/res/values-nl/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gebaren</string> <string name="gesture_settings">Instellingen voor aanraakgebaren</string> - <string name="gesture_settings_hint">Pas muis- en toetsenbordgebaren aan. Kies Gebaren als aanraakmodus om ze te gebruiken.</string> <string name="gesture_tap">Tikken</string> <string name="gesture_drag">Slepen met één vinger</string> <string name="gesture_long_press">Lang indrukken</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Vasthouden met drie vingers</string> <string name="gesture_pinch">Knijpen om te zoomen</string> <string name="gesture_hold_button">Knop ingedrukt houden</string> + <string name="gesture_hold_left">Linkermuisknop ingedrukt houden</string> + <string name="gesture_hold_right">Rechtermuisknop ingedrukt houden</string> <string name="gesture_click_once">Eenmaal klikken</string> <string name="gesture_hold_delay">Wachttijd voor vasthouden</string> <string name="gesture_double_delay">Interval voor dubbeltikken</string> diff --git a/app/src/main/res/values-nl/shortcuts.xml b/app/src/main/res/values-nl/shortcuts.xml new file mode 100644 index 000000000..b76f6c6cb --- /dev/null +++ b/app/src/main/res/values-nl/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Snelkoppelingen voor fysieke knoppen</string> + <string name="shortcuts_dd_menu">DroidDeck-menu</string> + <string name="shortcuts_capture">Toewijzen: %1$s</string> + <string name="shortcuts_press">Druk op een knop en laat deze los. De toewijzing wordt automatisch opgeslagen.</string> + <string name="shortcuts_release">Laat de knop los om door te gaan.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Deze knop is al toegewezen aan: %1$s</string> + <string name="shortcuts_save">Opnieuw toewijzen</string> + <string name="shortcuts_retry">Andere knop proberen</string> + <string name="shortcuts_limitations">De Home-knop en sommige extra knoppen zijn mogelijk niet beschikbaar.</string> +</resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 93b6ab06f..587dc744b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-opties voor D3D12. nodxr schakelt raytracing uit; gebruik dit alleen voor een game die dat nodig heeft.</string> <string name="game_env_proton_log">Stel in op 1 voor een diagnostisch Proton-log. Loggen kan de prestaties verlagen en kost opslag.</string> <string name="game_env_wined3d">Stel in op 1 om voor compatibiliteitstests met D3D9–11 het op OpenGL gebaseerde WineD3D te gebruiken in plaats van DXVK.</string> + <string name="game_env_wined3d_renderer">Renderer voor DirectDraw, Direct3D 1–7 en games die met WineD3D draaien. Vulkan slaat de route via OpenGL op Zink over en is op Adreno veel sneller voor oude DirectDraw- en Direct3D 7-games.</string> + <string name="game_env_dxvk_d3d8">Stel in op 1 om Direct3D 8 via DXVK te draaien in plaats van WineD3D. Sneller in de Direct3D 8-test van AIO Graphics Test op Adreno.</string> <string name="game_env_no_ntsync">Stel in op 1 om deze game niet op ntsync (droiddeck-ntsync of een kerneldriver) te draaien; dan wordt droiddeck-esync gebruikt als er een pakket is, anders droiddeck-fsync.</string> <string name="game_env_no_esync">Stel in op 1 om droiddeck-esync uit te zetten voor deze game; dan wordt droiddeck-fsync gebruikt, of droiddeck-ntsync als fsync ook uit staat.</string> <string name="game_env_no_fsync">Stel in op 1 om deze game niet op droiddeck-fsync te draaien; dan wordt droiddeck-esync gebruikt als er een pakket is, anders droiddeck-ntsync.</string> <string name="game_env_fsync_first">Stel in op 1 om deze game op droiddeck-fsync te draaien, of op 0 om droiddeck-esync voorrang te geven als er een pakket bij de Proton-versie past.</string> <string name="game_env_xalia">Stel in op 0 om de gamepadnavigatiehulp van Proton voor deze game uit te schakelen.</string> + <string name="game_env_anticheat_offline">Standaard aan. Start een Easy Anti-Cheat-game zonder anti-cheat als de game offline spelen ondersteunt. Zet dit uit om zoals gewoonlijk via Easy Anti-Cheat te starten. Onlinemodi die Easy Anti-Cheat vereisen, blijven onbeschikbaar.</string> <string name="game_env_hud">DXVK-overlay voor D3D9–11. fps toont de framerate; niet ingesteld verbergt de overlay.</string> <string name="game_env_dxvk_config">DXVK-instellingen, gescheiden door puntkomma’s. Recente builds gebruiken dxvk.maxFrameRate om de framerate te begrenzen; gebruik voor normaal spelen liever de framelimiet van de sessie.</string> + <string name="game_env_cores">CPU-cores voor deze game, zoals 0-4 of 0,2,4, in plaats van de gamecores van de sessie. Minder cores blijven koeler.</string> <string name="game_env_vkd3d_limit">Framerate-limiet voor D3D12. 0 schakelt de limiet uit.</string> <string name="game_env_glthread">OpenGL-threading van Mesa. true kan helpen bij CPU-beperkte OpenGL-games; test per game.</string> <string name="sync_backend_title">Wine-synchronisatie</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX draait x86-Linux-programma’s op dit ARM64-apparaat. Bij Automatisch wordt FEX gebruikt als het programma voor x86 is gemaakt.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dit programma is gemaakt voor %1$s-pc’s en draait via FEX, dat nog niet is ingesteld. Open Steam één keer terwijl je bent ingelogd: DroidDeck laat het dan FEX en de benodigde Steam Linux Runtime downloaden. Daarna opent dit.</string> + <string name="session_proot_missing">De proot van DroidDeck kon niet worden gedownload. Controleer de verbinding en probeer het opnieuw. De sessie is niet gestart, omdat de reserve-proot te traag is om op te spelen.</string> + <string name="session_directaudio_missing">DirectAudio kon niet worden gedownload, dus gamegeluid gebruikt deze sessie de tragere route.</string> <string name="session_end_program">Dit programma</string> <string name="session_end_steam_download">De Steam-client kon niet worden gedownload. Je netwerk of VPN blokkeert mogelijk de servers van Steam; controleer de verbinding en probeer het opnieuw.</string> <string name="session_end_steam_setup">De Steam-client kon niet worden ingesteld. Controleer de verbinding en de vrije opslag en probeer het opnieuw.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-controller</string> <string name="mode_controller_note">Deck: knop Snelle toegang en gyro. Steam Controller: hetzelfde, met gripsensor op de achterknoppen. DualShock 4 en DualSense: gyro, en de trackpads als hun touchpad. Xbox 360: open Snelle toegang met Guide+A.</string> <string name="mode_back">Terug</string> + <string name="back_hold">Terug ingedrukt houden voor Steam-sneltoetsen</string> + <string name="back_hold_hint">Terug ingedrukt houden opent Snelle toegang of maakt Steam-combinaties met andere knoppen. Zet uit om ingedrukt houden te negeren; tikken en dubbeltikken blijven werken.</string> + <string name="back_native_qam_hint">Houd Terug 700 ms ingedrukt, of houd Terug ingedrukt en druk op een andere knop voor Steam-sneltoetsen.</string> + <string name="back_double_tap_window">Tijdvenster voor dubbeltikken</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Helderheidsbediening toestaan</string> + <string name="brightness_permission_text">Stel helderheidsbediening in DroidDeck in.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessie</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Up-to-date · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Nieuwste installeren</string> + <string name="decky_channel">Updatekanaal</string> + <string name="decky_channel_hint">Welke Decky Loader-releases worden geïnstalleerd. De eigen updater van Decky gebruikt hetzelfde kanaal.</string> + <string name="decky_channel_stable">Stabiel</string> + <string name="decky_channel_prerelease">Voorlopige release</string> + <string name="decky_channel_testing">Testversie</string> + <string name="decky_channel_failed">Kan het Decky-updatekanaal niet opslaan</string> <string name="mode_decky_on">Start met Steam. Zolang dit aan staat, kunnen andere apps op dit apparaat Steam mogelijk bedienen.</string> <string name="mode_decky_off">Uit. De poort voor foutopsporing op afstand van Steam blijft dicht.</string> <string name="mode_decky_remove_title">Decky Loader verwijderen?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Prestatie-overlay</string> <string name="mode_mangoapp_hint">Zet dit uit als games crashen of zwart worden in de Deck-modus. Geldt vanaf de volgende sessie.</string> + <string name="mode_return_after_game">Na een game terug naar DroidDeck</string> + <string name="mode_return_after_game_hint">Als een game die je vanuit DroidDeck of een andere launcher hebt gestart sluit, stopt Steam netjes (cloudopslag wordt eerst afgerond) en ga je daarheen terug. Uit: in Steam blijven.</string> + <string name="mode_shader_precache">Shaders vooraf cachen</string> + <string name="mode_shader_precache_hint">Steam downloadt kant-en-klare shaders voor je games en verwerkt ze op de achtergrond, zodat games minder haperen. Uit bespaart data, opslag en batterij; games bouwen shaders dan tijdens het spelen. Dezelfde instelling als Downloads > Shaders vooraf cachen in Steam. Geldt vanaf de volgende sessie.</string> <string name="mode_steam_repair">Steam-client repareren</string> <string name="mode_steam_repair_hint">Downloadt de Steam-client opnieuw bij de volgende start van Steam. Gebruik dit als Steam op het laadscherm blijft hangen. Games, login en instellingen blijven behouden.</string> <string name="mode_steam_repair_queued">De Steam-client wordt opnieuw gedownload bij de volgende start van Steam.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Omzeilt PulseAudio voor minder vertraging.</string> <string name="mode_mic">Microfoon</string> <string name="mode_mic_hint">Voor spraakchat.</string> + <string name="drawer_mic_hint">Zet microfoonopname aan of uit voor deze sessie.</string> + <string name="drawer_mic_failed">Kan de microfoon niet wijzigen. Probeer het opnieuw.</string> <string name="mode_network">Netwerk</string> <string name="mode_wifi_discovery">Wi-Fi-detectie</string> <string name="mode_wifi_discovery_hint">Toon Wi-Fi-namen en netwerken in de buurt in Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: realtime GPU-wachtrij</string> <string name="perf_gsrealtime_hint">Geeft het GPU-werk van de compositor voorrang. Kan de framepacing gladder maken, ten koste van wat gameprestaties.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Geheugen</string> + <string name="perf_cap_off">Uit</string> + <string name="perf_cap_auto">Driverstandaard</string> + <string name="perf_zram_client">Steam comprimeren terwijl een game draait</string> + <string name="perf_zram_client_hint">20 s nadat een game start, wordt de Steam-client in zRAM gecomprimeerd om de game meer geheugen te geven, en teruggelezen als de game sluit. Zet dit uit als de sessie kort na het starten van games sluit. Een RAM-limiet hierboven comprimeert Steam nog steeds als de sessie die overschrijdt.</string> + <string name="perf_ram_cap">RAM-limiet</string> + <string name="perf_ram_cap_hint">Geldt terwijl de Steam-client draait, in de Steam-modus of vanaf de desktop. Als de sessie meer gebruikt dan dit, worden Steam en daarna de andere ondersteunde processen van de sessie in zRAM gecomprimeerd. Een zachte limiet: er wordt niets gesloten, maar games kunnen haperen terwijl pagina’s terugkomen.</string> + <string name="perf_ram_cap_unavailable">Vereist zRAM-swap, die dit apparaat niet heeft.</string> + <string name="perf_vram_cap">VRAM-limiet</string> + <string name="perf_vram_cap_hint">Het videogeheugen dat DXVK aan Direct3D-games meldt, zodat ze minder ruimte voor texturen plannen. De eigen DXVK-instellingen van een game gaan voor. Geldt vanaf de volgende sessie.</string> <string name="perf_gpuclock">GPU op hoogste kloksnelheid houden</string> <string name="perf_gpuclock_hint">Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte.</string> <string name="perf_fixes">Sessiefixes</string> <string name="perf_sysmem">Turnip: sysmem-rendering</string> <string name="perf_sysmem_hint">Sneller voor de Steam-client; in games kiest het stuurprogramma per pass tussen tegel- en systeemgeheugenrendering. Vereist op Adreno 710/720/722.</string> <string name="perf_xalia">Sla de xalia-helper van Steam over</string> - <string name="perf_fastsync">droiddeck-ntsync (experimenteel)</string> - <string name="perf_fastsync_hint">Een userspace-vervanger voor de ntsync-driver van Linux, voor tests. Terwijl dit aan staat, gebruikt Proton dit in plaats van droiddeck-esync en droiddeck-fsync. Werkt met Proton Experimental ARM64, GE-Proton en proton-cachyos. Geldt vanaf de volgende sessie.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Een userspace-vervanger voor de ntsync-driver van Linux. Terwijl dit aan staat, gebruikt Proton dit in plaats van droiddeck-esync en droiddeck-fsync. Werkt met Proton Experimental ARM64, GE-Proton en proton-cachyos. Geldt vanaf de volgende sessie.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync eerst</string> <string name="perf_fsync_hint">Draait de eigen fsync van Proton op de standaard Proton-bestanden, met futex_waitv in userspace geleverd, zodat er geen pakket nodig is en dit blijft werken zodra Steam Proton bijwerkt. Terwijl dit aan staat, gebruiken games dit vóór droiddeck-esync, behalve de paar die Proton niet op fsync laat draaien. Geldt vanaf de volgende sessie.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot-snelpad</string> <string name="perf_fastpath_needs_seccomp">Vereist het seccomp-filter van proot.</string> <string name="perf_fastpath_hint">Snellere bestandstoegang en minder stotteren. Zet dit uit als een programma zijn bestanden niet kan vinden.</string> + <string name="perf_cursor_composite">Cursor in gamescope tekenen</string> + <string name="perf_cursor_composite_hint">Gamescope tekent de aanwijzer zelf in plaats van die aan Android over te laten. Zet dit aan voor een cursor die je met een controller bestuurt. Uit is sneller op een telefoon. Geldt vanaf de volgende sessie.</string> <string name="perf_identity">Sessie-identiteit</string> <string name="perf_hostname">Hostnaam</string> <string name="perf_hostname_hint">De naam die Steam voor dit apparaat ziet. Leeg herstelt %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">De bestanden worden uit de app verwijderd.</string> <string name="driver_delete_in_use">De bestanden worden verwijderd. Hij is in gebruik, dus de standaard neemt het over.</string> <string name="drawer_page_display">Scherm</string> + <string name="drawer_frame_limit">Framelimiet</string> + <string name="drawer_frame_limit_note">Begrenst deze game. Het scherm schakelt over naar een vernieuwingsfrequentie die precies deelbaar is door de limiet, als die er is; andere limieten kunnen ongelijkmatig ogen. Steam-games gebruiken de framelimiet van Steam in het Snelmenu.</string> <string name="drawer_page_effects">Effecten</string> <string name="drawer_page_controls">Bediening</string> <string name="drawer_page_components">Componenten</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Amber</string> <string name="drawer_hud_color_violet">Violet</string> <string name="drawer_hud_opacity">Transparantie</string> + <string name="hud_size">Grootte</string> + <string name="hud_size_hint">Tikken op de HUD verandert ook de grootte.</string> + <string name="hud_size_full">Volledig</string> + <string name="hud_size_tiles">Tegels</string> + <string name="hud_size_pill">Pil</string> + <string name="hud_size_minimal">Minimaal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Balk</string> + <string name="hud_locked">Vastzetten</string> + <string name="hud_locked_hint">Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken.</string> + <string name="hud_snap">Vastklikken aan zijkanten</string> + <string name="hud_snap_hint">Laat de HUD los en hij gaat naar de dichtstbijzijnde kant van het scherm. Met een snelle veeg gooi je hem die kant op.</string> + <string name="hud_group_look">Weergave</string> + <string name="hud_scale">Grootte op scherm</string> + <string name="hud_color_soft">Zacht</string> + <string name="hud_color_mid">Gemiddeld</string> + <string name="hud_color_vivid">Fel</string> + <string name="hud_outline">Contour</string> + <string name="hud_outline_color">Contourkleur</string> + <string name="hud_outline_gray">Grijs</string> + <string name="hud_outline_theme">Themakleur</string> + <string name="hud_group_metrics">Meetwaarden</string> + <string name="hud_metric_graph">Frametijdgrafiek</string> + <string name="hud_metric_decimal">Beeldsnelheid met decimaal</string> + <string name="hud_metric_low001" formatted="false">0.01% laagste</string> + <string name="hud_metric_engine">Grafische engine</string> + <string name="hud_metric_gpu_model">GPU-naam</string> + <string name="hud_metric_gpu">GPU-belasting</string> + <string name="hud_metric_gpu_temp">GPU-temperatuur</string> + <string name="hud_metric_cpu">CPU-belasting</string> + <string name="hud_metric_per_core">CPU per kern</string> + <string name="hud_metric_temp">Temperaturen</string> + <string name="hud_metric_ram">Geheugen</string> + <string name="hud_metric_vram">Grafisch geheugen</string> + <string name="hud_metric_swap">Swapgeheugen</string> + <string name="hud_metric_battery">Accuniveau</string> + <string name="hud_metric_power">Stroomverbruik</string> + <string name="hud_metric_network">Netwerk</string> + <string name="hud_metric_resolution">Resolutie</string> + <string name="hud_metric_proton">Proton-versie</string> + <string name="hud_metric_session">Sessieduur</string> + <string name="hud_metric_clock">Klok</string> + <string name="hud_group_temps">Temperaturen</string> + <string name="hud_temp_unit">Eenheid</string> + <string name="hud_temp_bands">Waarschuwingskleuren</string> + <string name="hud_temp_bands_hint">Temperaturen worden eerst amber en dan rood naarmate ze de limiet naderen.</string> + <string name="hud_temp_bands_off">Uit</string> + <string name="hud_temp_bands_auto">Automatisch</string> + <string name="hud_temp_bands_manual">Handmatig</string> + <string name="hud_temp_red_cpu">CPU rood vanaf</string> + <string name="hud_temp_red_gpu">GPU rood vanaf</string> + <string name="hud_temp_red_battery">Accu rood vanaf</string> + <string name="hud_group_more">Meer</string> + <string name="hud_export">HUD-diagnose</string> + <string name="hud_export_hint">Slaat een rapport van elke sensor die de HUD uitleest op in Downloads/DroidDeck.</string> + <string name="hud_export_button">Opslaan</string> + <string name="hud_export_done">Opgeslagen in %1$s</string> + <string name="hud_export_failed">Kan het HUD-rapport niet opslaan.</string> + <string name="hud_reset">HUD-instellingen resetten</string> + <string name="hud_reset_button">Resetten</string> <string name="drawer_scaling">Schaalmodus</string> <string name="drawer_scaling_sharpness">Schaalscherpte</string> <string name="drawer_effects">Schermeffecten</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Automatisch (%1$s)</string> <string name="drawer_keyboard">Toetsenbord</string> <string name="drawer_latency">Latentie</string> + <string name="drawer_low_latency">Modus voor lage latentie</string> + <string name="drawer_low_latency_hint">Verhoogt CPU- en batterijgebruik</string> <string name="drawer_low_latency_controller">Controller met lage latentie</string> <string name="drawer_low_latency_controller_hint">De controller rapporteert op 1000 Hz in plaats van 250 Hz. Iets meer CPU.</string> <string name="drawer_low_latency_touch">Aanraking met lage latentie</string> <string name="drawer_low_latency_touch_hint">Aanrakingen slaan framebundeling over; Steam-aanraakbediening op 1000 Hz. Iets meer CPU.</string> + <string name="drawer_evdev_mouse">Ruw muiskanaal</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Pc-toetsenbord</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Tweede scherm</string> @@ -715,6 +834,10 @@ <string name="setup_session">Sessie</string> <string name="setup_logs">Sessielogs</string> <string name="setup_logs_hint">Opgeslagen na elke sessie</string> + <string name="setup_game_debug_logs">Debuglogs van games</string> + <string name="setup_game_debug_logs_hint">Neem bij de volgende gamestart diagnostiek van Proton, Wine en graphics op. Kan de prestaties verlagen en meer opslag gebruiken.</string> + <string name="setup_game_debug_logs_restart">Start deze sessie opnieuw om debuglogs van games op te slaan</string> + <string name="setup_logging_update_failed">Kan logging niet bijwerken. Controleer de schakelaar en probeer het opnieuw.</string> <string name="setup_agent_commands">Hulpmiddelen voor debuggen</string> <string name="setup_latest_logs">Nieuwste sessielogs</string> <string name="setup_saved_logs">Opgeslagen sessielogs</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck kan de startschermapp zijn</string> <string name="setup_home_off">DroidDeck wordt nooit aangeboden als startschermapp</string> <string name="setup_orientation">Oriëntatie</string> + <string name="setup_launcher_orientation">Oriëntatie van launcher</string> + <string name="setup_launcher_orientation_auto">Apparaatrotatie volgen</string> + <string name="setup_orientation_portrait">Staand</string> + <string name="setup_session_orientation">Oriëntatie van sessie</string> + <string name="setup_session_orientation_hint">Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; aangepaste breedte en hoogte blijven zoals ingevoerd.</string> <string name="setup_orientation_auto">Automatisch liggend</string> <string name="setup_orientation_landscape">Liggend</string> <string name="setup_orientation_reverse">Liggend omgekeerd</string> <string name="setup_fullscreen">Volledig scherm</string> <string name="setup_fullscreen_on">Verbergt de statusbalk en navigatiebalk van Android</string> <string name="setup_fullscreen_off">Toont de statusbalk en navigatiebalk van Android</string> + <string name="setup_dual_screen">Dubbel scherm</string> + <string name="setup_dual_screen_hint">Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm.</string> + <string name="setup_dual_screen_auto">Automatisch</string> + <string name="setup_dual_screen_on">Aan</string> + <string name="setup_dual_screen_off">Uit</string> + <string name="setup_dual_screen_menu">Menu op het onderste scherm</string> + <string name="setup_dual_screen_menu_hint">Verplaatst de onderdelen en het menu in het spel naar het tweede scherm en typt daar, zodat het bovenste scherm het volledige beeld houdt. L2 en R2 wisselen van onderdeel.</string> + <string name="setup_dual_screen_controls">Bediening op het onderste scherm in games</string> + <string name="setup_dual_screen_controls_hint">Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start.</string> + <string name="dual_typing_title">Typen voor het bovenste scherm</string> + <string name="dual_typing_done">Klaar</string> <string name="setup_default_home">Standaard startschermapp</string> <string name="setup_choose_home">Kies een startschermapp</string> <string name="setup_choose">Kiezen</string> @@ -809,7 +948,7 @@ <string name="store_installing">Installeren…</string> <string name="store_install">Installeren</string> <string name="store_setup_first">Stel eerst Flatpak in</string> - <string name="store_download_size">%1$s download</string> + <string name="store_download_size">%1$s te downloaden</string> <string name="store_installed_chip">● Geïnstalleerd</string> <string name="store_details_failed">Kan de Flathub-pagina van deze app niet laden.</string> <string name="store_loading">Laden vanuit Flathub…</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Open Instellingen → Opties voor ontwikkelaars → Draadloos debuggen en zet het aan</string> <string name="gate_step2">Tik op “Apparaat koppelen met koppelingscode”</string> <string name="gate_step3">Voer de code in bij de melding van DroidDeck</string> + <string name="pairguide_build_number">Tik in Over de telefoon 7 keer op Buildnummer</string> + <string name="pairguide_wireless">Zet Draadloze foutopsporing aan</string> + <string name="pairguide_pair">Open Draadloze foutopsporing en tik op “Apparaat koppelen met koppelingscode”</string> + <string name="pairguide_child_process">Zet “Beperkingen voor onderliggende processen uitschakelen” aan</string> + <string name="pairguide_row_child_process">Beperkingen voor onderliggende processen uitschakelen</string> + <string name="pairguide_row_build_number">Buildnummer</string> + <string name="pairguide_row_wireless">Draadloze foutopsporing</string> + <string name="pairguide_row_pair">Apparaat koppelen met koppelingscode</string> <string name="gate_waiting">Wachten op de koppelingspop-up…</string> <string name="gate_code_needed">Pop-up gevonden. Voer de code ervan in bij de melding.</string> <string name="gate_status">Status</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Nooit gespeeld</string> <string name="games_runtime_busy_percent">Runtime bezig · %1$d%%</string> <string name="games_runtime_busy">Runtime bezig</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Drivers voor andere GPU’s verbergen</string> <string name="gpu_show_other">Drivers voor andere GPU’s tonen</string> <string name="gpu_advanced">Geavanceerd</string> + <string name="gpu_ubwc_title">UBWC-compatibiliteit</string> + <string name="gpu_ubwc_hint">Probeer Aan of Uit als Steam of Android strepen of flikkering toont. Geldt voor beide drivers na het herstarten van DroidDeck.</string> + <string name="gpu_ubwc_restart">Start DroidDeck opnieuw om dit toe te passen.</string> <string name="gpu_set_with_display">Wordt samen met de beeldschermdriver ingesteld: %1$s bevat beide.</string> <string name="gpu_set_with_runtime">Wordt samen met de runtimedriver ingesteld: %1$s bevat beide.</string> <string name="gpu_runtime_hint">Gebruikt door games en de desktop.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Automatisch scherm-in-scherm starten</string> <string name="unfolded_controls">Bediening op het uitgevouwen scherm</string> <string name="unfolded_controls_hint">Uitgevouwen staat de game boven de Steam Deck-trackpads en achtergrepen. Dichtgevouwen is de game schermvullend.</string> + <string name="unfolded_controls_with_controller">Behouden met een controller</string> + <string name="unfolded_controls_with_controller_hint">Toon deze aanraakbediening ook als er een controller is verbonden.</string> <string name="pip_suspended">Onderbroken</string> <string name="pip_not_ready">Scherm-in-scherm is beschikbaar zodra de sessie klaar is.</string> <string name="pip_permission">Sta scherm-in-scherm toe voor DroidDeck in de Android-instellingen.</string> <string name="pip_unavailable">Android kon scherm-in-scherm niet openen.</string> + <string name="game_more">Meer</string> + <string name="game_edit_art">Afbeeldingen bewerken</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Snelkoppeling</string> <string name="game_shortcut_add">Toevoegen aan startscherm</string> <string name="game_shortcut_choose">Game kiezen</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Wacht tot de runtime-bewerking klaar is</string> <string name="main_wait_proton_install">Wacht tot de installatie van de compatibiliteitstool klaar is</string> + <string name="load_compat_title">Compatibiliteitstools voorbereiden</string> + <string name="load_compat_wait">Wachten tot de compatibiliteitsinstallatie klaar is</string> + <string name="load_compat_hint">Je sessie start zodra de installatie klaar is.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Wacht tot de installatie van de desktop-app klaar is</string> <string name="main_wait_install_game">Wacht tot de installatie klaar is voordat je een game start</string> <string name="main_saves_close_session">Sluit eerst de Steam-sessie, zodat de game niet over de import heen kan opslaan</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Toch installeren</string> <string name="main_remove_runtime_title">Linux-runtime verwijderen</string> <string name="main_remove_runtime_text">Hiermee verwijder je de runtime, de Steam-client erin en alle games die daar zijn geïnstalleerd.</string> + <string name="runtime_actions_title">Linux-runtime</string> + <string name="runtime_actions_text">Repareren installeert de systeembestanden van de runtime opnieuw en behoudt Steam, je games en instellingen. Extra’s zoals de desktop worden opnieuw geïnstalleerd wanneer je ze weer gebruikt. Verwijderen wist alles.</string> + <string name="runtime_repair">Runtime repareren</string> <string name="main_applied">Toegepast: %1$s</string> <string name="android_app_open_failed_primary">Kan %1$s niet openen op het hoofdscherm</string> <string name="android_app_open_failed_on">Kan %1$s niet openen op %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Kan de runtimecatalogus niet bereiken. Controleer de verbinding en druk opnieuw op Spelen.</string> <string name="session_runtime_install_failed">De Linux-runtime is niet geïnstalleerd. Controleer de runtime bij Installatie en druk opnieuw op Spelen.</string> <string name="session_desktop_install_failed">De desktop is niet geïnstalleerd (%1$s). Controleer de verbinding en druk opnieuw op Desktop.</string> + <string name="session_package_resume_failed">Een onderbroken installatie kon niet worden voltooid (%1$s). Controleer de verbinding en de ruimte en probeer het opnieuw.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">De Linux-runtime is beschadigd: %1$d bibliotheeklink verwijst naar een ontbrekend bestand (%2$s), meestal na een onderbroken installatie. Repareren behoudt je games en instellingen.</item> + <item quantity="other">De Linux-runtime is beschadigd: %1$d bibliotheeklinks verwijzen naar ontbrekende bestanden (%2$s en andere), meestal na een onderbroken installatie. Repareren behoudt je games en instellingen.</item> + </plurals> <string name="session_ended_named">%1$s is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> <string name="session_ended_program">Het programma is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> <string name="session_ended_desktop">De desktop is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Installeer een plug-in-ZIP voor de volgende Steam-sessie.</string> <string name="mode_decky_plugin_downloading">Downloaden…</string> <string name="mode_decky_plugin_install_zip">Installeren uit ZIP</string> + <string name="decky_zip_warning_title">Plug-in van derden installeren</string> + <string name="decky_zip_warning_text">Het Decky Loader-team heeft deze plug-in niet gecontroleerd. Hij kan malware bevatten, zoals software die je Steam-account steelt of je apparaat schaadt. Door deze plug-in te installeren, ga je ermee akkoord dat je alle risico’s voor je apparaat op je neemt.</string> + <string name="decky_zip_warning_continue">Doorgaan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Wacht %1$d seconde</item> + <item quantity="other">Wacht %1$d seconden</item> + </plurals> <string name="store_cat_games">Games</string> <string name="store_cat_audio_video">Audio & video</string> <string name="store_cat_graphics">Grafisch</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Zwarte achtergrond, witte tekst, het blauw voor alles wat geselecteerd, gefocust of ingedrukt is.</string> <string name="theme_electric">Elektrisch marineblauw</string> <string name="theme_electric_detail">Het blauw feller, op vlakken die naar marineblauw neigen in plaats van grijs.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Kleuren die door de regenboog lopen. Volgt de animatie-instellingen van Android.</string> + <string name="theme_rgb_speed">Snelheid</string> + <string name="theme_rgb_speed_hint">Hoe snel de kleuren wisselen.</string> <string name="theme_gradient">Kleurverloop</string> <string name="theme_gradient_detail">Je eigen primaire en secundaire kleur, doorlopend op knoppen en accenten.</string> <string name="theme_gradient_primary">Primair</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Overslaan</string> <string name="fm_select_this_folder">Deze map selecteren</string> <string name="fm_back">Terug</string> + <string name="fm_exit">Afsluiten</string> + <string name="fm_return_to_start">Terug naar beginmap</string> + <string name="fm_start_unavailable">De beginmap is niet meer beschikbaar</string> + <string name="fm_cancel_operation_title">Bewerking annuleren?</string> + <string name="fm_cancel_operation_confirmation">De bewerking wordt geannuleerd. Weet je het zeker?</string> + <string name="fm_accept">Accepteren</string> + <string name="fm_decline">Weigeren</string> <string name="fm_drive_not_readable">%1$s is gekoppeld, maar nu niet leesbaar</string> + <string name="fm_drive_access_title">Toegang tot %1$s toestaan</string> + <string name="fm_drive_access_text">Android laat DroidDeck deze schijf zien, maar niet lezen. Zet Toegang tot alle bestanden aan voor DroidDeck en kom daarna terug.</string> <string name="fm_list_view">Lijstweergave</string> <string name="fm_grid_view">Rasterweergave</string> <string name="fm_search">Zoeken</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Toetsenbord + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grepen + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Hier is nog niets te zien.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Er lopen geen downloads.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shadercache downloaden</string> + <string name="bottom_downloads_paused">Gepauzeerd</string> + <string name="bottom_downloads_queued">Wacht om te starten</string> + <string name="bottom_page_notifications">Meldingen</string> + <string name="bottom_notifications_listener">DroidDeck onderste scherm</string> + <string name="bottom_notifications_why">Toon berichten en andere meldingen hier terwijl je speelt. Ze blijven alleen op dit scherm en worden niet opgeslagen. Android vraagt dit één keer: de pagina voor meldingstoegang opent op dit scherm; zet DroidDeck daar aan en deze pagina komt vanzelf terug.</string> + <string name="bottom_notifications_allow">Meldingstoegang toestaan</string> + <string name="bottom_notifications_none">Geen meldingen.</string> + <string name="bottom_notifications_count">%1$d meldingen</string> + <string name="bottom_notifications_clear">Wissen</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">Voor FPS moet de HUD aan staan</string> + <string name="stats_speed">Snelheid</string> + <string name="stats_pedals">Pedalen</string> + <string name="stats_gforce">G-kracht</string> + <string name="stats_timing">Tijden</string> + <string name="stats_best_lap">Snelste ronde</string> + <string name="stats_tires">Banden °C</string> + <string name="stats_trace">Gas en rem, laatste 10 s</string> + <string name="stats_speed_chart">Snelheid, %1$s</string> + <string name="stats_gear">Versnelling</string> + <string name="stats_speed_units">Snelheidseenheid</string> + <string name="stats_speed_units_auto">Automatisch (%1$s)</string> + <string name="stats_steam_client_arm">Steam-client ARM</string> + <string name="stats_steam_client_x86">Steam-client x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Rem</string> + <string name="stats_lights">Dashboard</string> + <string name="stats_lamp_shift">Schakelen</string> + <string name="stats_lamp_handbrake">Handrem</string> + <string name="stats_lamp_pit">Pitlimiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olie %1$s °C</string> + <string name="stats_power">Energieverdeler</string> + <string name="stats_fuel_t">Brandstof, t</string> + <string name="stats_fuel_main">Hoofdtank %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_tap_hint">Tik op de bovenste balk of het dashboard om de stijl te wijzigen.</string> + <string name="bottom_telemetry_send_title">Dashboardgegevens verzenden</string> + <string name="bottom_telemetry_send_auto">Automatisch</string> + <string name="bottom_telemetry_send_auto_hint">Zet het aan voor elke game in deze lijst, ook voor games die later worden gevonden. Games die je uitzet, blijven uit.</string> + <string name="bottom_telemetry_send_note">Dit wijzigt de eigen instelling voor gegevensuitvoer van de game. Het werkt vanaf de volgende keer dat de game start; uitzetten zet de oude instelling terug.</string> + <string name="bottom_telemetry_send_close">Sluit %1$s om dit te wijzigen.</string> + <string name="bottom_telemetry_send_failed">Kan de instellingen van %1$s niet wijzigen.</string> + <string name="bottom_telemetry_send_menu">%1$s: zet %2$s aan in de instellingen van de game met IP 127.0.0.1 en poort %3$d.</string> + <string name="bottom_shots_where">Opgeslagen in Pictures/DroidDeck. Steam-screenshots verschijnen hier ook.</string> + <string name="bottom_shots_take">Screenshot maken</string> + <string name="bottom_shots_saved">Screenshot opgeslagen.</string> + <string name="bottom_shots_failed">Kan geen screenshot maken.</string> + <string name="bottom_shots_none">Nog geen screenshots.</string> + <string name="bottom_page_chat">Chat & spraak</string> + <string name="bottom_chat_why">Lees en beantwoord Steam-chats hier terwijl de game op het hoofdscherm doorloopt. Het gebruikt het account waarmee Steam is ingelogd.</string> + <string name="bottom_chat_not_signed_in">Steam heeft nog geen webaanmelding om te delen, dus log hier één keer in.</string> + <string name="bottom_chat_stopped">Android heeft de chatpagina gesloten terwijl DroidDeck op de achtergrond was. Hij opent weer wanneer je terugkeert naar DroidDeck.</string> + <string name="bottom_chat_open">Steam Chat openen</string> + <string name="bottom_chat_close">Chat sluiten</string> + <string name="bottom_chat_mic_on">Microfoon aan</string> + <string name="bottom_chat_mic_off">Microfoon uit</string> + <string name="bottom_chat_mic_unavailable">De microfoon staat uit voor deze game. Zet Microfoon aan in de Steam-instellingen van DroidDeck (Audio) en start de game opnieuw om te praten.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">In-game statistieken</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Accu</string> + <string name="bottom_telemetry_lap">Ronde</string> + <string name="bottom_telemetry_position">Positie</string> + <string name="bottom_telemetry_this_lap">Deze ronde</string> + <string name="bottom_telemetry_last_lap">Vorige ronde</string> + <string name="bottom_telemetry_fuel">Brandstof</string> + <string name="bottom_telemetry_cargo">Lading</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridische status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Zet de gegevensuitvoer van een racegame aan (vaak telemetrie of UDP genoemd) om hier een live dashboard te zien. De gegevens blijven op dit apparaat.</string> + <string name="bottom_telemetry_unknown_format">Poort %1$d ontvangt gegevens (%2$d pakketten van %3$d bytes), maar in een formaat dat deze pagina nog niet kan lezen.</string> + <string name="bottom_telemetry_port_busy">Een ander programma gebruikt poort %1$s al, dus die game kan hier niet worden getoond.</string> <string name="rtinst_removing">Linux-runtime verwijderen</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Stel eerst Flatpak in</string> <string name="flatpakmgr_starting">Starten</string> <string name="flatpakmgr_exit_status">Flatpak is gestopt met status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s is gebouwd voor %2$s, wat DroidDeck niet kan draaien. Flatpak-apps hebben hier een ARM64- of x86_64-versie nodig.</string> <string name="flatpakmgr_installing">%1$s installeren</string> <string name="flatpakmgr_updating">%1$s updaten</string> <string name="flatpakmgr_removing">%1$s verwijderen</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Instelling toepassen…</string> <string name="adbpair_command_failed">Opdracht voor draadloze foutopsporing mislukt</string> <string name="adbpair_channel_name">Draadloze foutopsporing instellen</string> + <string name="adbpair_progress_channel_name">Voortgang van instellen van draadloze foutopsporing</string> <string name="adbpair_channel_description">Vraagt om de koppelcode voor draadloze foutopsporing terwijl Instellingen open is</string> <string name="adbpair_title_pair">Draadloze foutopsporing koppelen</string> <string name="adbpair_waiting_text">Schakel draadloze foutopsporing in en tik vervolgens op “Apparaat koppelen met koppelcode”.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Geen Adreno-GPU</string> <string name="gpuinfo_supported">Ondersteund</string> <string name="gpuinfo_experimental">Experimenteel: de drivers zijn testbuilds</string> + <string name="gpuinfo_a850_experimental">Experimentele ondersteuning voor Adreno 850: vereist compatibele experimentele scherm- en gamedrivers; niet geverifieerd op dit apparaat</string> <string name="gpuinfo_below_tested">Onder de geteste hardware (Adreno 725 en nieuwer): werkt mogelijk niet</string> <string name="gpuinfo_unsupported">Niet ondersteund: DroidDeck heeft een Adreno-GPU (Snapdragon) nodig</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Geschaald %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Apparaatgegevens tonen</string> <string name="device_info_hide">Apparaatgegevens verbergen</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Sorteren</string> + <string name="setup_rail_labels">Labels in zijbalk</string> + <string name="setup_rail_labels_hint">Toon namen onder de pictogrammen in de zijbalk. Zet uit voor een smallere zijbalk.</string> + <string name="library_display">Weergave</string> + <string name="library_display_larger">Grotere kaarten</string> + <string name="library_display_smaller">Kleinere kaarten</string> + <string name="library_display_title">Titel tonen</string> + <string name="library_display_size">Grootte tonen</string> <string name="stores_sort_last_played">Onlangs gespeeld</string> <string name="stores_sort_recently_installed">Onlangs geïnstalleerd</string> <string name="stores_sort_title_asc">Titel A–Z</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Downloadbeheer</string> <string name="stores_parallel">Downloads tegelijk</string> <string name="stores_install_where">Installeren op</string> + <string name="stores_install_language">Gametaal</string> + <string name="stores_install_language_hint">GOG en Epic installeren deze taal. Systeem volgt de taal van de app.</string> + <string name="stores_install_language_system">Systeem</string> <string name="stores_install_title">%1$s installeren:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s vrij</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Doel</string> <string name="edit_start_in">Beginnen in</string> <string name="edit_launch_options">Opstartopties</string> + <string name="edit_launch_options_steam_hint">Gedeeld met de Eigenschappen in Steam: een wijziging op de ene plek is op beide te zien.</string> + <string name="edit_launch_options_not_saved">De opstartopties konden niet in Steam worden opgeslagen. Probeer het opnieuw.</string> + <string name="edit_launch_options_desktop">Steam is misschien geopend in de desktopsessie. Wijzig de opstartopties daar in de Eigenschappen, of sluit eerst de sessie.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Andere exe…</string> <string name="edit_remove">Verwijderen</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Eigen 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">Bureaubladapps voor het Linux-bureaublad, geopend vanuit Desktop.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Automatisch houdt deze 2D-game vast in beeld. Kies Virtueel scherm bij Scherm om hoofdtracking te gebruiken.</string> <string name="glasses_tracking_sbs_hint">Hoofdtracking geldt voor een virtueel scherm of een actieve SteamVR-game.</string> <string name="glasses_hardware">Apparaat</string> + <string name="vr_controllers_tab">Controllers</string> + <string name="vr_controllers_group">SteamVR-controllers</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">De twee VR-handen waarmee je controller speelt. Wijzigingen gelden meteen, ook terwijl SteamVR draait. Joy-Cons en getrackte handen nemen hun kant nog steeds over.</string> + <string name="vr_controllers_off">Gewone gamepad</string> + <string name="vr_controllers_index">Valve Index-controllers</string> + <string name="vr_controllers_touch">Meta Quest 3-controllers</string> + <string name="vr_controllers_vive">HTC Vive-controllers</string> + <string name="vr_controllers_sticks">Sticks beginnen met</string> + <string name="vr_controllers_sticks_hint">Druk in VR beide sticks tegelijk in om te wisselen.</string> + <string name="vr_controllers_sticks_game">Jou bewegen in de game</string> + <string name="vr_controllers_sticks_hands">De handen bewegen</string> + <string name="vr_controllers_buttons">Knoppen</string> + <string name="vr_controllers_buttons_stick">Triggers zijn triggers, bumpers grijpen, A/B en X/Y zijn de frontknoppen van elke hand, stickklikken klikken de thumbsticks, Guide opent het SteamVR-menu. D-pad omhoog en omlaag brengt de handen dichterbij of verder weg.</string> + <string name="vr_controllers_buttons_vive">De sticks zijn trackpads; A/X of een stickklik drukt ze in. Triggers zijn triggers, bumpers grijpen, Start en Select zijn menu, Guide opent het SteamVR-menu.</string> + <string name="vr_controllers_buttons_off">Geen VR-handen. Games die een gamepad ondersteunen en het SteamVR-menu krijgen je controller zoals gewoonlijk.</string> <string name="glasses_brightness">Helderheid</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Zonwering</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Cameraplaatsing</string> <string name="hand_camera_placement_hint">Controleer of de camera je kan zien voordat je gaat spelen.</string> <string name="hand_camera_check">Controleren</string> + <string name="tracking_pack_title">Download voor handtracking</string> + <string name="tracking_pack_hint">Handtracking vereist een eenmalige download van %1$s.</string> + <string name="tracking_pack_download">Downloaden</string> + <string name="tracking_pack_retry">Opnieuw proberen</string> + <string name="tracking_pack_downloading">Handtracking downloaden… %1$d%%</string> + <string name="tracking_pack_failed">Handtracking kon niet worden gedownload. Controleer je verbinding en probeer het opnieuw.</string> <string name="hand_camera_check_title">Cameraplaatsing</string> <string name="hand_camera_how_rear">Zet het apparaat rechtop op 1,5 tot 2 meter afstand, op borsthoogte, met de achtercamera naar je toe. Stap dan in beeld met je handen vooruit.</string> <string name="hand_camera_how_front">Zet het apparaat rechtop op 1,5 tot 2 meter afstand, op borsthoogte, met het scherm naar je toe. Stap dan in beeld met je handen vooruit.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Ongebruikte runtimes, resten, oude logs</string> <string name="storage_clean_up">Opruimen…</string> <string name="storage_session_running">Stop de sessie om op te ruimen of iets te verwijderen. De groottes blijven zichtbaar.</string> + <string name="storage_default_group">Installatielocatie</string> + <string name="storage_default_title">Standaardopslag</string> + <string name="storage_default_hint">Nieuwe winkelinstallaties gaan naar de gekozen locatie. Bestaande games blijven waar ze zijn. Steam-bibliotheken houden hun eigen instelling.</string> + <string name="storage_default_ask">Elke keer vragen</string> + <string name="storage_default_ask_detail">Kies voor elke installatie een doel</string> + <string name="storage_default_internal">Interne opslag</string> + <string name="storage_default_external">Externe opslag</string> + <string name="storage_default_external_detail">%1$s · %2$s vrij</string> + <string name="storage_default_external_missing">Niet verbonden</string> + <string name="storage_default_folder">Map · %1$s</string> + <string name="storage_default_folder_free">%1$s vrij</string> + <string name="storage_default_folder_missing">Niet verbonden</string> + <string name="storage_default_choose_folder">Map kiezen…</string> + <string name="storage_default_choose_folder_detail">Gebruik een willekeurige map op een SD-kaart of USB-stick</string> + <string name="storage_default_note">Games komen in een map Games op de gekozen locatie. Bestaande games worden niet verplaatst.</string> <string name="storage_where">Waar het naartoe gaat</string> <string name="storage_games">Steam-games</string> <string name="storage_game_data">Gamegegevens</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Geïnstalleerde games</string> <string name="storage_data_parts">Prefix %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Shaders wissen</string> + <string name="storage_reset_prefix">Prefix resetten</string> + <string name="storage_reset_prefix_title">Prefix voor %1$s resetten?</string> + <string name="storage_reset_prefix_confirm">Verwijdert de Wine-prefix (%1$s) in %2$s en maakt die bij de volgende start opnieuw aan. Opgeslagen spellen, instellingen en geïnstalleerde redistributables daarin gaan verloren; Steam Cloud-opslagen blijven in je account.</string> <string name="storage_data_leftovers">Verwijderde games</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Het prefix bevat nog bestanden, waaronder mogelijk lokale saves</string> @@ -2977,6 +3333,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchroniseren met Syncthing</string> + <string name="sync_enable_hint">Dit is een Syncthing-implementatie op basis van Syncthing-Fork waarmee je bestanden in het interne bestandssysteem van DroidDeck synchroniseert met andere Syncthing-installaties. Dit geldt alleen voor bestanden die je in het interne bestandssysteem van DroidDeck bewaart.</string> + <string name="sync_missing">Deze build bevat geen Syncthing.</string> + <string name="sync_starting">Syncthing starten</string> + <string name="sync_status_starting">Starten</string> + <string name="sync_status_up_to_date">Bijgewerkt</string> + <string name="sync_status_syncing">Synchroniseren</string> + <string name="sync_status_paused">Gepauzeerd</string> + <string name="sync_status_pausing">Pauzeren</string> + <string name="sync_status_resuming">Hervatten</string> + <string name="sync_status_attention">Aandacht nodig</string> + <string name="sync_status_failed">Syncthing is gestopt</string> + <string name="sync_failed_retry">Opnieuw proberen</string> + <string name="sync_paused_wifi">Gepauzeerd tot er Wi-Fi is</string> + <string name="sync_paused_game">Gepauzeerd tijdens de game</string> + <string name="sync_summary">%1$d mappen · %2$d van %3$d apparaten verbonden</string> + <string name="sync_left">Nog %1$s</string> + <string name="sync_open_web_ui">Webinterface openen</string> + <string name="sync_pause">Pauzeren</string> + <string name="sync_resume">Hervatten</string> + <string name="sync_running">Actief</string> + <string name="sync_running_hint">Zet dit uit om Syncthing volledig te stoppen.</string> + <string name="sync_this_device">Dit apparaat</string> + <string name="sync_device_id">Apparaat-ID</string> + <string name="sync_show_qr">QR-code tonen</string> + <string name="sync_advanced">Geavanceerd</string> + <string name="sync_advanced_hint">Poorten, wanneer uitvoeren, resetten</string> + <string name="sync_open">Openen</string> + <string name="sync_waiting">Wacht op jou</string> + <string name="sync_pending_device">%1$s wil verbinding maken</string> + <string name="sync_pending_folder">%1$s wil “%2$s” delen</string> + <string name="sync_pending_folder_hint">Accepteer om te kiezen waar het in DroidDeck wordt opgeslagen.</string> + <string name="sync_review">Bekijken in webinterface</string> + <string name="sync_folders">Mappen</string> + <string name="sync_no_folders">Nog geen mappen.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Bijgewerkt</string> + <string name="sync_folder_syncing">Synchroniseren %1$d%%</string> + <string name="sync_folder_scanning">Scannen</string> + <string name="sync_folder_paused">Gepauzeerd</string> + <string name="sync_folder_out_of_sync">Niet gesynchroniseerd</string> + <string name="sync_folder_errors">%1$d bestanden konden niet worden gesynchroniseerd</string> + <string name="sync_folder_blocked">Geblokkeerd</string> + <string name="sync_folder_blocked_hint">Deze map staat buiten de opslag van DroidDeck, dus DroidDeck heeft hem gepauzeerd. Gebruik de Syncthing-Fork-app om mappen buiten DroidDeck te synchroniseren.</string> + <string name="sync_remove_folder">Verwijderen uit Syncthing</string> + <string name="sync_remove_folder_hint">Hierbij worden geen bestanden verwijderd.</string> + <string name="sync_devices">Apparaten</string> + <string name="sync_no_devices">Nog geen apparaten.</string> + <string name="sync_connected">Verbonden</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Laatst gezien: %1$s</string> + <string name="sync_device_id_title">ID van dit apparaat</string> + <string name="sync_device_id_hint">Voeg op je andere apparaat in Syncthing een apparaat toe en scan deze code of plak de ID. Accepteer het daarna hier in de webinterface.</string> + <string name="sync_copy">Kopiëren</string> + <string name="sync_share">Delen</string> + <string name="sync_done">Klaar</string> + <string name="sync_off_title">Syncthing uitzetten?</string> + <string name="sync_off_body">Syncthing stopt nu en blijft gestopt tot je het weer aanzet. Gesynchroniseerde bestanden blijven waar ze zijn.</string> + <string name="sync_off_forget">Ook de configuratie van Syncthing verwijderen</string> + <string name="sync_off_forget_hint">Verwijdert de ID, mappen en apparaten van dit apparaat. Als je het weer aanzet, begint het opnieuw.</string> + <string name="sync_turn_off">Uitzetten</string> + <string name="sync_ports">Poorten</string> + <string name="sync_port_sync">Synchronisatie</string> + <string name="sync_port_discovery">Lokale detectie</string> + <string name="sync_repick">Nieuwe poorten kiezen</string> + <string name="sync_repick_hint">Wordt bij elke start opnieuw gecontroleerd.</string> + <string name="sync_repick_button">Opnieuw kiezen</string> + <string name="sync_reset_group">Resetten</string> + <string name="sync_api_key">API-sleutel</string> + <string name="sync_regenerate">Opnieuw genereren</string> + <string name="sync_reset">Syncthing resetten</string> + <string name="sync_reset_hint">Nieuwe apparaat-ID, mappen en apparaten verwijderd. Bestanden in de opslag van DroidDeck blijven bewaard.</string> + <string name="sync_reset_button">Resetten</string> + <string name="sync_reset_confirm_title">Syncthing resetten?</string> + <string name="sync_running_group">Uitvoering</string> + <string name="sync_run">Uitvoeren</string> + <string name="sync_run_open">Zolang DroidDeck open is</string> + <string name="sync_run_background">Op de achtergrond</string> + <string name="sync_wifi_only">Alleen via Wi-Fi</string> + <string name="sync_pause_games">Pauzeren tijdens games</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing-uitvoer van deze sessie</string> + <string name="sync_logs_share">Delen</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Stel eerst de Linux-runtime in.</string> + <string name="sync_accept">Accepteren</string> + <string name="sync_accept_title">“%1$s” opslaan in</string> + <string name="sync_add_folder">Map toevoegen</string> + <string name="sync_add_folder_hint">Een map in de opslag van DroidDeck synchroniseren</string> + <string name="sync_choose">Kiezen</string> + <string name="sync_add">Toevoegen</string> + <string name="sync_add_failed">De map kan niet worden toegevoegd.</string> + <string name="sync_share_with">Delen met</string> + <string name="sync_share_none">Nog geen apparaten. Je kunt deze map later via de webinterface delen.</string> + <string name="sync_use_folder">Deze map gebruiken</string> + <string name="sync_new_folder">Nieuwe map</string> + <string name="sync_location_home">Thuismap van container</string> + <string name="sync_location_sync">Sync-map</string> + <string name="sync_location_shared">Gedeelde opslag van DroidDeck</string> + <string name="sync_location_card">DroidDeck op %1$s</string> + <string name="sync_location_app">App-gegevens van DroidDeck</string> + <string name="sync_web_path_locked">Nieuwe mappen worden opgeslagen in de Sync-map van DroidDeck. Gebruik Map toevoegen op het tabblad Syncthing om een andere DroidDeck-map te synchroniseren.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Opnieuw laden</string> + <string name="sync_not_running">Syncthing is niet actief.</string> + <string name="session_end_steam_sigill">Steam is gestopt met een ongeldige instructie (SIGILL). Dit kan een compatibiliteitsprobleem met CPU-instructies of een crash van de client zijn. Deel de logs met de gegevens van je apparaat.</string> + <string name="session_end_steam_try_x64">Je kunt Steam-instellingen → Steam-client → x86-64 (experimenteel) proberen. Dit vereist een extra download en kan trager draaien.</string> + <string name="session_end_vulkan_device">De Linux-grafische driver kon geen bruikbaar Vulkan-apparaat vinden. Controleer of de gekozen Linux-GPU-driver deze GPU ondersteunt.</string> + <string name="session_end_gpu_unsupported">Deze sessie kan niet starten omdat er in de huidige configuratie geen compatibele Linux-Vulkan-driver voor deze GPU is. Adreno Turnip-drivers kunnen geen ondersteuning voor MediaTek/Mali-GPU’s inschakelen.</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_resources_browser">Opent in je browser</string> + <string name="game_resource_guides">Handleidingen</string> + <string name="game_resource_protondb_detail">Compatibiliteitsrapporten voor Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Voor games met opslagbestanden in je Steam-account</string> + <string name="game_resource_search">Zoeken op het web</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="library_filter">Filteren</string> + <string name="library_filter_installed">Alleen geïnstalleerd</string> + <string name="library_filter_all_owned">Alle games in bezit</string> + <string name="library_no_installed_matches">Geen geïnstalleerde games voldoen aan deze filters.</string> + <string name="library_browse_owned">Games in bezit bekijken</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="stores_itch_updates_found">Beschikbare updates: %1$d</string> + <string name="stores_itch_update_replaced">De ontwikkelaar heeft deze build vervangen door %1$s. Bijwerken naar die build?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Cloudinstellingen</string> + <string name="integration_title">Steam-integratie</string> + <string name="integration_count">%1$d van %2$d aan</string> + <string name="integration_set_up">Instellen</string> + <string name="integration_location">Locatie</string> + <string name="integration_app_info">App-info</string> + <string name="integration_wifi">Wi-Fi-namen</string> + <string name="integration_brightness">Helderheid</string> + <string name="integration_home">DroidDeck als startscherm</string> + <string name="integration_shortcuts">Sneltoetsen voor de startknop</string> + <string name="integration_wifi_hint">Netwerken tonen in Steam · vereist locatietoegang, nooit gevolgd</string> + <string name="integration_wifi_on">Netwerken worden getoond in Steam</string> + <string name="integration_wifi_location_off">Locatie staat uit</string> + <string name="integration_wifi_denied">Locatie geweigerd · sta het toe in App-info</string> + <string name="integration_brightness_hint">De schuifregelaar van Steam stelt de schermhelderheid in</string> + <string name="integration_home_hint">Home opent het Steam-menu in een sessie</string> + <string name="integration_shortcuts_hint">Houd Home ingedrukt voor Steam Guide-combinaties</string> + <string name="integration_shortcuts_needs_home">Vereist DroidDeck als startscherm</string> + <string name="integration_shortcuts_maybe_restricted">Grijs in Android? App-info → ⋮ → Beperkte instellingen toestaan</string> + <string name="integration_shortcuts_restricted">Geblokkeerd door Android · App-info → ⋮ → Beperkte instellingen toestaan</string> + <string name="integration_shortcuts_service">DroidDeck-startknop</string> + <string name="integration_shortcuts_service_description">Geeft drukken op de startknop door aan Steam Guide terwijl een Steam-sessie actief is en DroidDeck de standaard startscherm-app is. Leest geen scherminhoud.</string> + <string name="integration_brightness_needed">Zet Helderheid aan in Installatie → Steam-integratie</string> + <string name="apps_search_hint">Apps zoeken</string> + <string name="apps_no_match">Geen apps gevonden voor ‘%1$s’.</string> + <string name="apps_add_widget">Widget toevoegen</string> + <string name="apps_widgets_loading">Widgets laden…</string> + <string name="apps_widgets_none">Geen enkele app op dit apparaat biedt widgets.</string> + <string name="apps_widget_wider">Breder</string> + <string name="apps_widget_narrower">Smaller</string> + <string name="apps_widget_taller">Hoger</string> + <string name="apps_widget_shorter">Lager</string> + <string name="apps_widget_move_earlier">Naar voren</string> + <string name="apps_widget_move_later">Naar achteren</string> + <string name="apps_widget_configure">Widgetinstellingen</string> + <string name="apps_widget_remove">Widget verwijderen</string> + <string name="apps_add_to_folder">Toevoegen aan map</string> + <string name="apps_new_folder">Nieuwe map</string> + <string name="apps_remove_from_folder">Uit map verwijderen</string> + <string name="apps_app_info">App-info</string> + <string name="apps_uninstall">Verwijderen</string> + <string name="apps_folder_rename">Naam wijzigen</string> + <string name="apps_folder_ungroup">Opheffen</string> + <string name="apps_folder_default">Map</string> + <string name="apps_folder_name">Mapnaam</string> + <string name="apps_filter">Tonen</string> + <string name="apps_filter_all">Alle apps</string> + <string name="apps_filter_games">Games</string> + <string name="apps_filter_downloaded">Gedownload</string> + <string name="apps_filter_system">Systeem</string> + <string name="apps_filter_hidden">Verborgen</string> + <string name="apps_hide">Verbergen</string> + <string name="apps_unhide">Tonen in apps</string> + <string name="apps_shortcut_remove">Snelkoppeling verwijderen</string> + <string name="apps_pin_title">Toevoegen aan Apps</string> + <string name="apps_pin_add">Toevoegen</string> + <string name="apps_hidden_none">Geen verborgen apps.</string> + <string name="apps_sort_name_asc">Naam A–Z</string> + <string name="apps_sort_name_desc">Naam Z–A</string> + <string name="apps_sort_installed">Recent geïnstalleerd</string> + <string name="apps_sort_updated">Recent bijgewerkt</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="desktop_restore_title">Je software wordt hersteld</string> + <string name="desktop_restore_body">De apps die je hebt toegevoegd worden na een DroidDeck-update opnieuw geïnstalleerd.</string> + <string name="desktop_restore_done_title">Software hersteld</string> + <string name="desktop_restore_done_body">De apps die je hebt toegevoegd zijn weer geïnstalleerd.</string> + <string name="desktop_restore_failed_title">Sommige software kon niet worden hersteld</string> + <string name="desktop_restore_failed_body">Bekijk ~/.cache/droiddeck/apt-restore.log en probeer daarna sudo apt install in Konsole.</string> + <string name="gog_full_files">Systeemeigen optimalisaties zijn niet beschikbaar. De download bevat volledige vervangende bestanden.</string> + <string name="gog_recover">Patchresultaat controleren</string> + <string name="slow_usb_title">Trage USB-verbinding</string> + <string name="slow_usb_cable">%1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s), dus games erop laden traag. Gebruik een USB 3-kabel van 5 Gbps of sneller, draai de USB-C-stekker om of gebruik een snellere schijf.</string> + <string name="slow_usb_port">%1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s). De USB-poort van dit apparaat kan niet sneller, dus games laden traag. Interne opslag of een microSD-kaart kan sneller zijn.</string> + <string name="slow_usb_never">Niet meer tonen</string> + <string name="slow_usb_dismiss">Sluiten</string> + <string name="steam_import_title">Steam opnieuw starten om je games toe te voegen?</string> + <string name="steam_import_body">Steam kan deze games die je bezit als geïnstalleerd tonen: %1$s. Steam moet opnieuw starten om ze te tonen. Start nu opnieuw, of ze worden toegevoegd de volgende keer dat Steam start.</string> + <string name="steam_import_names_more">%1$s en nog %2$d</string> + <string name="steam_import_now">Nu opnieuw starten</string> + <string name="steam_import_later">Later</string> + <string name="gog_maintenance">GOG-installatie beheren</string> + <string name="gog_check">Controleren op updates</string> + <string name="gog_repair">Controleren/repareren</string> + <string name="gog_patches">Offline patches</string> + <string name="gog_refresh">Volledig offline installatieprogramma downloaden</string> + <string name="gog_update">Bijwerken naar %1$s</string> + <string name="gog_resume">GOG-onderhoud hervatten</string> + <string name="gog_open_patch">Patch-installatieprogramma openen</string> + <string name="gog_patch_in_session">Rond het patch-installatieprogramma af in de Linux-sessie of annuleer het.</string> + <string name="gog_patch_requirements">Kies een patch voor je geïnstalleerde versie en taal. Ondersteunde bronversies staan mogelijk niet in de lijst.</string> + <string name="gog_no_patches">GOG heeft geen losse Windows-patches voor deze game.</string> + <string name="gog_managed_files">Aangepaste gamebestanden kunnen worden vervangen.</string> + <string name="gog_patch_installer_note">Het installatieprogramma opent in je Linux-sessie.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Extra ruimte</string> + <string name="gog_space_estimate_label">Geschatte ruimte</string> + <string name="gog_repair_action">Bestanden repareren</string> + <string name="gog_refresh_action">Installatie vernieuwen</string> + <string name="gog_select_patch">Kiezen</string> + <string name="setup_all_files">Toegang tot alle bestanden</string> + <string name="setup_local_network">Lokaal netwerk</string> + <string name="libraries_title">Meer Steam-bibliotheken</string> + <string name="libraries_hint">Mappen waarin Steam spellen kan installeren en starten, elk met een eigen naam. Verwijderen uit de lijst behoudt de spellen op de schijf.</string> + <string name="libraries_add">Bibliotheek toevoegen</string> + <string name="libraries_rename_title">Bibliotheeknaam</string> + <string name="libraries_pick">Kies een map voor de bibliotheek</string> + <string name="libraries_full">Maximaal %1$d extra bibliotheken</string> + <string name="libraries_overlap">Deze map is al een bibliotheek of bevindt zich daarin</string> + <string name="libraries_missing">%1$s · niet beschikbaar</string> + <string name="libraries_applies_next">Geldt vanaf de volgende Steam-sessie</string> + <string name="bottom_desktop_start">Desktop starten</string> + <string name="bottom_desktop_mode_touch">Direct aanraken</string> + <string name="bottom_desktop_trackpad">Trackpad. Tik voor direct aanraken</string> + <string name="bottom_desktop_direct_touch">Direct aanraken. Tik voor trackpad</string> + <string name="bottom_desktop_starting">KDE-desktop starten…</string> + <string name="bottom_desktop_ended">De desktop is afgesloten.</string> + <string name="bottom_desktop_failed">De desktop kon niet starten. De logboeken staan in de map bottom-desktop van deze sessie.</string> + <string name="bottom_desktop_off">De desktop is afgesloten.</string> + <string name="libraries_rename">Naam wijzigen</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-pl/gestures.xml b/app/src/main/res/values-pl/gestures.xml index 8325469e7..78fbf8cf1 100644 --- a/app/src/main/res/values-pl/gestures.xml +++ b/app/src/main/res/values-pl/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesty</string> <string name="gesture_settings">Ustawienia gestów dotykowych</string> - <string name="gesture_settings_hint">Dostosuj gesty myszy i klawiatury. Aby ich używać, wybierz Gesty jako tryb dotyku.</string> <string name="gesture_tap">Stuknięcie</string> <string name="gesture_drag">Przeciąganie jednym palcem</string> <string name="gesture_long_press">Długie naciśnięcie</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Przytrzymanie trzema palcami</string> <string name="gesture_pinch">Uszczypnij, aby przybliżyć</string> <string name="gesture_hold_button">Trzymaj przycisk wciśnięty</string> + <string name="gesture_hold_left">Trzymaj lewy przycisk wciśnięty</string> + <string name="gesture_hold_right">Trzymaj prawy przycisk wciśnięty</string> <string name="gesture_click_once">Kliknij raz</string> <string name="gesture_hold_delay">Czas przytrzymania</string> <string name="gesture_double_delay">Odstęp podwójnego stuknięcia</string> diff --git a/app/src/main/res/values-pl/shortcuts.xml b/app/src/main/res/values-pl/shortcuts.xml new file mode 100644 index 000000000..665ec3f84 --- /dev/null +++ b/app/src/main/res/values-pl/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Skróty przycisków fizycznych</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Przypisz: %1$s</string> + <string name="shortcuts_press">Naciśnij i zwolnij przycisk. Przypisanie zostanie zapisane automatycznie.</string> + <string name="shortcuts_release">Zwolnij przycisk, aby kontynuować.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Ten przycisk jest już przypisany do: %1$s</string> + <string name="shortcuts_save">Przypisz ponownie</string> + <string name="shortcuts_retry">Wypróbuj inny przycisk</string> + <string name="shortcuts_limitations">Przycisk Home i niektóre dodatkowe przyciski mogą być niedostępne.</string> +</resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 288e644ba..cc5859f12 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opcje VKD3D dla D3D12. nodxr wyłącza ray tracing; używaj tylko w grze, która tego wymaga.</string> <string name="game_env_proton_log">Ustaw 1, aby tworzyć dziennik diagnostyczny Proton. Zapis dziennika może obniżyć wydajność i zajmuje miejsce.</string> <string name="game_env_wined3d">Ustaw 1, aby do testów zgodności D3D9–11 używać WineD3D opartego na OpenGL zamiast DXVK.</string> + <string name="game_env_wined3d_renderer">Renderer dla DirectDraw, Direct3D 1-7 i gier uruchamianych przez WineD3D. Vulkan pomija ścieżkę OpenGL na Zink i jest znacznie szybszy w starych grach DirectDraw i Direct3D 7 na Adreno.</string> + <string name="game_env_dxvk_d3d8">Ustaw 1, aby uruchamiać Direct3D 8 przez DXVK zamiast WineD3D. Szybsze w teście Direct3D 8 z AIO Graphics Test na Adreno.</string> <string name="game_env_no_ntsync">Ustaw 1, aby ta gra nie korzystała z ntsync (droiddeck-ntsync ani sterownika jądra); użyje droiddeck-esync, jeśli istnieje pakiet, a w przeciwnym razie droiddeck-fsync.</string> <string name="game_env_no_esync">Ustaw 1, aby wyłączyć droiddeck-esync w tej grze; zamiast niego użyje droiddeck-fsync lub droiddeck-ntsync, gdy fsync też jest wyłączone.</string> <string name="game_env_no_fsync">Ustaw 1, aby ta gra nie korzystała z droiddeck-fsync; użyje droiddeck-esync, jeśli istnieje pakiet, a w przeciwnym razie droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ustaw 1, aby uruchamiać tę grę na droiddeck-fsync, lub 0, aby preferować droiddeck-esync, gdy pakiet pasuje do jej wersji Proton.</string> <string name="game_env_xalia">Ustaw 0, aby wyłączyć w tej grze pomocnika Proton do nawigacji kontrolerem.</string> + <string name="game_env_anticheat_offline">Domyślnie włączone. Uruchamia grę z Easy Anti-Cheat bez zabezpieczenia, gdy gra obsługuje grę offline. Wyłącz, aby uruchamiać przez Easy Anti-Cheat jak zwykle. Tryby online wymagające Easy Anti-Cheat pozostają niedostępne.</string> <string name="game_env_hud">Nakładka DXVK dla D3D9–11. fps pokazuje liczbę klatek; brak wartości ją ukrywa.</string> <string name="game_env_dxvk_config">Ustawienia DXVK rozdzielone średnikami. Nowsze wersje ograniczają klatki przez dxvk.maxFrameRate; do zwykłej gry lepiej użyć limitu klatek sesji.</string> + <string name="game_env_cores">Rdzenie CPU dla tej gry, np. 0-4 lub 0,2,4, zamiast rdzeni gier sesji. Mniej rdzeni to niższa temperatura.</string> <string name="game_env_vkd3d_limit">Limit liczby klatek D3D12. 0 wyłącza limit.</string> <string name="game_env_glthread">Wielowątkowość OpenGL w Mesa. true może pomóc grom OpenGL ograniczonym przez CPU; testuj każdą grę osobno.</string> <string name="sync_backend_title">Synchronizacja Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX uruchamia programy Linux x86 na tym urządzeniu ARM64. Auto używa go, gdy program jest zbudowany dla x86.</string> <string name="app_fex_x86">%1$s przez FEX</string> <string name="app_fex_not_ready">Ten program jest zbudowany dla komputerów %1$s i działa przez FEX, który nie jest jeszcze skonfigurowany. Otwórz raz Steam po zalogowaniu: DroidDeck pobierze wtedy FEX i potrzebne Steam Linux Runtime, a potem program się otworzy.</string> + <string name="session_proot_missing">Nie udało się pobrać proot DroidDeck. Sprawdź połączenie i spróbuj ponownie. Sesja nie została uruchomiona, bo zapasowy proot jest zbyt wolny do grania.</string> + <string name="session_directaudio_missing">Nie udało się pobrać DirectAudio, więc w tej sesji dźwięk gier używa wolniejszej ścieżki.</string> <string name="session_end_program">Ten program</string> <string name="session_end_steam_download">Nie udało się pobrać klienta Steam. Twoja sieć lub VPN może blokować serwery Steam; sprawdź połączenie i spróbuj ponownie.</string> <string name="session_end_steam_setup">Nie udało się skonfigurować klienta Steam. Sprawdź połączenie i wolne miejsce, a potem spróbuj ponownie.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Kontroler Xbox 360</string> <string name="mode_controller_note">Deck: przycisk szybkiego dostępu i żyroskop. Steam Controller: to samo oraz wykrywanie chwytu na tylnych przyciskach. DualShock 4 i DualSense: żyroskop, a gładziki działają jako ich touchpad. Xbox 360: szybki dostęp otwiera Guide+A.</string> <string name="mode_back">Wstecz</string> + <string name="back_hold">Przytrzymaj Wstecz dla skrótów Steam</string> + <string name="back_hold_hint">Przytrzymanie Wstecz otwiera Szybki dostęp lub tworzy skróty Steam z innymi przyciskami. Wyłącz, aby ignorować przytrzymanie; dotknięcie i podwójne dotknięcie nadal działają.</string> + <string name="back_native_qam_hint">Przytrzymaj Wstecz przez 700 ms lub przytrzymaj Wstecz i naciśnij inny przycisk, aby użyć skrótów Steam.</string> + <string name="back_double_tap_window">Czas podwójnego dotknięcia</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Zezwól na sterowanie jasnością</string> + <string name="brightness_permission_text">Skonfiguruj sterowanie jasnością w DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesja</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Aktualna · %1$s</string> <string name="mode_decky_loader">Program ładujący</string> <string name="mode_decky_install_latest">Zainstaluj najnowszą</string> + <string name="decky_channel">Kanał aktualizacji</string> + <string name="decky_channel_hint">Które wydania Decky Loader instalować. Wbudowany aktualizator Decky używa tego samego kanału.</string> + <string name="decky_channel_stable">Stabilny</string> + <string name="decky_channel_prerelease">Przedpremierowy</string> + <string name="decky_channel_testing">Testowy</string> + <string name="decky_channel_failed">Nie udało się zapisać kanału aktualizacji Decky</string> <string name="mode_decky_on">Uruchamia się ze Steam. Gdy jest włączony, inne aplikacje na tym urządzeniu mogą sterować Steam.</string> <string name="mode_decky_off">Wyłączony. Port zdalnego debugowania Steam pozostaje zamknięty.</string> <string name="mode_decky_remove_title">Odinstalować Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Nakładka wydajności</string> <string name="mode_mangoapp_hint">Wyłącz, jeśli gry ulegają awarii lub mają czarny ekran w trybie Deck. Działa od następnej sesji.</string> + <string name="mode_return_after_game">Wracaj do DroidDeck po grze</string> + <string name="mode_return_after_game_hint">Gdy zamkniesz grę uruchomioną z DroidDeck lub innego launchera, Steam poprawnie się zamyka (najpierw kończy zapis w chmurze) i wracasz tam. Wyłączone: zostajesz w Steam.</string> + <string name="mode_shader_precache">Wstępne buforowanie shaderów</string> + <string name="mode_shader_precache_hint">Steam pobiera gotowe shadery dla Twoich gier i przetwarza je w tle, więc gry mniej się zacinają. Wyłączenie oszczędza dane, miejsce i baterię; gry budują shadery w trakcie grania. To samo ustawienie co Pobieranie > Wstępne buforowanie shaderów w Steam. Działa od następnej sesji.</string> <string name="mode_steam_repair">Napraw klienta Steam</string> <string name="mode_steam_repair_hint">Pobiera klienta Steam ponownie przy następnym uruchomieniu Steam. Użyj, jeśli Steam utknie na ekranie wczytywania. Gry, logowanie i ustawienia zostaną zachowane.</string> <string name="mode_steam_repair_queued">Klient Steam zostanie pobrany ponownie przy następnym uruchomieniu Steam.</string> @@ -376,6 +415,8 @@ <string name="mode_directaudio_hint">Omija PulseAudio, aby zmniejszyć opóźnienie.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Do czatu głosowego.</string> + <string name="drawer_mic_hint">Włącz lub wyłącz przechwytywanie mikrofonu w tej sesji.</string> + <string name="drawer_mic_failed">Nie udało się zmienić mikrofonu. Spróbuj ponownie.</string> <string name="mode_network">Sieć</string> <string name="mode_wifi_discovery">Wykrywanie Wi-Fi</string> <string name="mode_wifi_discovery_hint">Pokazuj w Steam nazwy Wi-Fi i sieci w pobliżu.</string> @@ -539,14 +580,24 @@ <string name="perf_gsrealtime">gamescope: kolejka GPU czasu rzeczywistego</string> <string name="perf_gsrealtime_hint">Nadaje priorytet pracy GPU kompozytora. Może wygładzić tempo klatek kosztem części wydajności gier.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Pamięć</string> + <string name="perf_cap_off">Wyłączony</string> + <string name="perf_cap_auto">Domyślny sterownika</string> + <string name="perf_zram_client">Kompresuj Steam podczas gry</string> + <string name="perf_zram_client_hint">20 s po starcie gry klient Steam jest kompresowany do zRAM, aby zostawić grze więcej pamięci, i wczytywany z powrotem po zamknięciu gry. Wyłącz, jeśli sesja zamyka się wkrótce po starcie gier. Powyższy limit RAM nadal kompresuje Steam, gdy sesja go przekroczy.</string> + <string name="perf_ram_cap">Limit RAM</string> + <string name="perf_ram_cap_hint">Działa, gdy działa klient Steam, w trybie Steam lub z pulpitu. Gdy sesja używa więcej, Steam, a następnie inne obsługiwane procesy sesji są kompresowane do zRAM. Miękki limit: nic nie jest zamykane, ale gry mogą się zacinać podczas wczytywania stron z powrotem.</string> + <string name="perf_ram_cap_unavailable">Wymaga swapu zRAM, którego to urządzenie nie ma.</string> + <string name="perf_vram_cap">Limit VRAM</string> + <string name="perf_vram_cap_hint">Pamięć wideo, którą DXVK zgłasza grom Direct3D, aby planowały tekstury na mniej. Własne ustawienia DXVK gry mają pierwszeństwo. Działa od następnej sesji.</string> <string name="perf_gpuclock">Utrzymuj GPU na najwyższym taktowaniu</string> <string name="perf_gpuclock_hint">Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła.</string> <string name="perf_fixes">Poprawki sesji</string> <string name="perf_sysmem">Turnip: renderowanie sysmem</string> <string name="perf_sysmem_hint">Szybsze dla klienta Steam; w grach sterownik dla każdego przebiegu wybiera renderowanie kafelkowe lub w pamięci systemowej. Wymagane na Adreno 710/720/722.</string> <string name="perf_xalia">Pomijaj pomocnika xalia w Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (eksperymentalne)</string> - <string name="perf_fastsync_hint">Zastępnik sterownika Linux ntsync w przestrzeni użytkownika, do testów. Gdy jest włączony, Proton używa go zamiast droiddeck-esync i droiddeck-fsync. Zgodny z Proton Experimental ARM64, GE-Proton i proton-cachyos. Działa od następnej sesji.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Zastępnik sterownika Linux ntsync w przestrzeni użytkownika. Gdy jest włączony, Proton używa go zamiast droiddeck-esync i droiddeck-fsync. Zgodny z Proton Experimental ARM64, GE-Proton i proton-cachyos. Działa od następnej sesji.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">Najpierw droiddeck-fsync</string> <string name="perf_fsync_hint">Uruchamia własny fsync Proton na standardowych plikach Proton, z futex_waitv dostarczanym w przestrzeni użytkownika, więc nie wymaga pakietu i działa od razu po aktualizacji Proton przez Steam. Gdy jest włączony, gry używają go przed droiddeck-esync, z wyjątkiem nielicznych, którym Proton wyłącza fsync. Działa od następnej sesji.</string> @@ -557,6 +608,8 @@ <string name="perf_fastpath">Szybka ścieżka proot</string> <string name="perf_fastpath_needs_seccomp">Wymaga filtra seccomp proot.</string> <string name="perf_fastpath_hint">Szybsze wyszukiwanie plików i mniej przycięć. Wyłącz, jeśli program nie może znaleźć swoich plików.</string> + <string name="perf_cursor_composite">Rysuj kursor w gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope sam rysuje wskaźnik zamiast przekazywać go do Androida. Włącz dla kursora sterowanego kontrolerem. Wyłączone jest szybsze na telefonie. Działa od następnej sesji.</string> <string name="perf_identity">Tożsamość sesji</string> <string name="perf_hostname">Nazwa hosta</string> <string name="perf_hostname_hint">Nazwa tego urządzenia widoczna dla Steam. Puste pole przywraca %1$s.</string> @@ -571,6 +624,8 @@ <string name="driver_delete_plain">Jego pliki zostaną usunięte z aplikacji.</string> <string name="driver_delete_in_use">Jego pliki zostaną usunięte. Jest w użyciu, więc zastąpi go domyślny.</string> <string name="drawer_page_display">Wyświetlacz</string> + <string name="drawer_frame_limit">Limit klatek</string> + <string name="drawer_frame_limit_note">Ogranicza tę grę. Wyświetlacz przełącza się na częstotliwość odświeżania podzielną przez limit, jeśli taka jest; inne limity mogą wyglądać nierówno. Gry Steam używają limitu klatek Steam w menu szybkiego dostępu.</string> <string name="drawer_page_effects">Efekty</string> <string name="drawer_page_controls">Sterowanie</string> <string name="drawer_page_components">Komponenty</string> @@ -595,6 +650,66 @@ <string name="drawer_hud_color_amber">Bursztynowy</string> <string name="drawer_hud_color_violet">Fioletowy</string> <string name="drawer_hud_opacity">Przezroczystość</string> + <string name="hud_size">Rozmiar</string> + <string name="hud_size_hint">Dotknięcie HUD również zmienia jego rozmiar.</string> + <string name="hud_size_full">Pełny</string> + <string name="hud_size_tiles">Kafelki</string> + <string name="hud_size_pill">Pigułka</string> + <string name="hud_size_minimal">Minimalny</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Pasek</string> + <string name="hud_locked">Zablokuj w miejscu</string> + <string name="hud_locked_hint">Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa.</string> + <string name="hud_snap">Przyciągaj do boków</string> + <string name="hud_snap_hint">Puść HUD, a przesunie się do bliższego boku ekranu. Szybki ruch rzuca go w tę stronę.</string> + <string name="hud_group_look">Wygląd</string> + <string name="hud_scale">Rozmiar na ekranie</string> + <string name="hud_color_soft">Stonowany</string> + <string name="hud_color_mid">Średni</string> + <string name="hud_color_vivid">Żywy</string> + <string name="hud_outline">Obrys</string> + <string name="hud_outline_color">Kolor obrysu</string> + <string name="hud_outline_gray">Szary</string> + <string name="hud_outline_theme">Kolor motywu</string> + <string name="hud_group_metrics">Odczyty</string> + <string name="hud_metric_graph">Wykres czasu klatek</string> + <string name="hud_metric_decimal">Liczba klatek z miejscem po przecinku</string> + <string name="hud_metric_low001" formatted="false">0.01% najniższych</string> + <string name="hud_metric_engine">Silnik graficzny</string> + <string name="hud_metric_gpu_model">Nazwa GPU</string> + <string name="hud_metric_gpu">Obciążenie GPU</string> + <string name="hud_metric_gpu_temp">Temperatura GPU</string> + <string name="hud_metric_cpu">Obciążenie CPU</string> + <string name="hud_metric_per_core">CPU na rdzeń</string> + <string name="hud_metric_temp">Temperatury</string> + <string name="hud_metric_ram">Pamięć</string> + <string name="hud_metric_vram">Pamięć graficzna</string> + <string name="hud_metric_swap">Pamięć wymiany</string> + <string name="hud_metric_battery">Poziom baterii</string> + <string name="hud_metric_power">Pobór mocy</string> + <string name="hud_metric_network">Sieć</string> + <string name="hud_metric_resolution">Rozdzielczość</string> + <string name="hud_metric_proton">Wersja Protona</string> + <string name="hud_metric_session">Czas sesji</string> + <string name="hud_metric_clock">Zegar</string> + <string name="hud_group_temps">Temperatury</string> + <string name="hud_temp_unit">Jednostka</string> + <string name="hud_temp_bands">Kolory ostrzeżeń</string> + <string name="hud_temp_bands_hint">Temperatury zmieniają kolor na bursztynowy, a potem czerwony, gdy zbliżają się do limitu.</string> + <string name="hud_temp_bands_off">Wył.</string> + <string name="hud_temp_bands_auto">Automatycznie</string> + <string name="hud_temp_bands_manual">Ręcznie</string> + <string name="hud_temp_red_cpu">CPU na czerwono od</string> + <string name="hud_temp_red_gpu">GPU na czerwono od</string> + <string name="hud_temp_red_battery">Bateria na czerwono od</string> + <string name="hud_group_more">Więcej</string> + <string name="hud_export">Diagnostyka HUD</string> + <string name="hud_export_hint">Zapisuje w Downloads/DroidDeck raport ze wszystkich czujników odczytywanych przez HUD.</string> + <string name="hud_export_button">Zapisz</string> + <string name="hud_export_done">Zapisano w %1$s</string> + <string name="hud_export_failed">Nie udało się zapisać raportu HUD.</string> + <string name="hud_reset">Zresetuj ustawienia HUD</string> + <string name="hud_reset_button">Resetuj</string> <string name="drawer_scaling">Tryb skalowania</string> <string name="drawer_scaling_sharpness">Ostrość skalowania</string> <string name="drawer_effects">Efekty ekranowe</string> @@ -629,10 +744,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Klawiatura</string> <string name="drawer_latency">Opóźnienie</string> + <string name="drawer_low_latency">Tryb niskiego opóźnienia</string> + <string name="drawer_low_latency_hint">Zwiększa użycie CPU i baterii</string> <string name="drawer_low_latency_controller">Kontroler o niskim opóźnieniu</string> <string name="drawer_low_latency_controller_hint">Kontroler raportuje z częstotliwością 1000 Hz zamiast 250 Hz. Nieco więcej CPU.</string> <string name="drawer_low_latency_touch">Dotyk o niskim opóźnieniu</string> <string name="drawer_low_latency_touch_hint">Dotknięcia pomijają łączenie klatek; sterowanie dotykiem Steam działa z 1000 Hz. Nieco więcej CPU.</string> + <string name="drawer_evdev_mouse">Surowy kanał myszy</string> + <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Klawiatura PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Drugi ekran</string> @@ -721,6 +840,10 @@ <string name="setup_session">Sesja</string> <string name="setup_logs">Logi sesji</string> <string name="setup_logs_hint">Zapisywane po każdej sesji</string> + <string name="setup_game_debug_logs">Logi debugowania gier</string> + <string name="setup_game_debug_logs_hint">Dołącz diagnostykę Proton, Wine i grafiki przy następnym uruchomieniu gry. Może obniżyć wydajność i zająć więcej miejsca.</string> + <string name="setup_game_debug_logs_restart">Uruchom ponownie tę sesję, aby zapisywać logi debugowania gier</string> + <string name="setup_logging_update_failed">Nie udało się zmienić logowania. Sprawdź przełącznik i spróbuj ponownie.</string> <string name="setup_agent_commands">Narzędzia debugowania</string> <string name="setup_latest_logs">Najnowsze logi sesji</string> <string name="setup_saved_logs">Zapisane logi sesji</string> @@ -753,12 +876,28 @@ <string name="setup_home_on">DroidDeck może być aplikacją ekranu głównego</string> <string name="setup_home_off">DroidDeck nigdy nie jest proponowany jako aplikacja ekranu głównego</string> <string name="setup_orientation">Orientacja</string> + <string name="setup_launcher_orientation">Orientacja launchera</string> + <string name="setup_launcher_orientation_auto">Zgodnie z obrotem urządzenia</string> + <string name="setup_orientation_portrait">Pionowa</string> + <string name="setup_session_orientation">Orientacja sesji</string> + <string name="setup_session_orientation_hint">Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; własna szerokość i wysokość pozostają jak wpisano.</string> <string name="setup_orientation_auto">Automatyczna pozioma</string> <string name="setup_orientation_landscape">Pozioma</string> <string name="setup_orientation_reverse">Odwrócona pozioma</string> <string name="setup_fullscreen">Pełny ekran</string> <string name="setup_fullscreen_on">Ukrywa systemowe paski stanu i nawigacji</string> <string name="setup_fullscreen_off">Pokazuje systemowe paski stanu i nawigacji</string> + <string name="setup_dual_screen">Dwa ekrany</string> + <string name="setup_dual_screen_hint">Automatycznie używa drugiego ekranu w urządzeniach przenośnych, które mają go wbudowanego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone zostawia wszystko na jednym ekranie.</string> + <string name="setup_dual_screen_auto">Automatycznie</string> + <string name="setup_dual_screen_on">Włączone</string> + <string name="setup_dual_screen_off">Wyłączone</string> + <string name="setup_dual_screen_menu">Menu na dolnym ekranie</string> + <string name="setup_dual_screen_menu_hint">Przenosi sekcje i menu w grze na drugi ekran i tam odbywa się pisanie, dzięki czemu górny ekran zachowuje pełny widok. L2 i R2 przełączają sekcje.</string> + <string name="setup_dual_screen_controls">Sterowanie na dolnym ekranie w grach</string> + <string name="setup_dual_screen_controls_hint">Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji.</string> + <string name="dual_typing_title">Pisanie dla górnego ekranu</string> + <string name="dual_typing_done">Gotowe</string> <string name="setup_default_home">Domyślna aplikacja ekranu głównego</string> <string name="setup_choose_home">Wybierz aplikację ekranu głównego</string> <string name="setup_choose">Wybierz</string> @@ -912,6 +1051,14 @@ <string name="gate_step1">Otwórz Ustawienia → Opcje programisty → Debugowanie bezprzewodowe i włącz je</string> <string name="gate_step2">Dotknij „Sparuj urządzenie za pomocą kodu parowania”</string> <string name="gate_step3">Wpisz kod w powiadomieniu DroidDeck</string> + <string name="pairguide_build_number">W sekcji Informacje o telefonie dotknij 7 razy Numer kompilacji</string> + <string name="pairguide_wireless">Włącz Debugowanie bezprzewodowe</string> + <string name="pairguide_pair">Otwórz Debugowanie bezprzewodowe, a potem dotknij „Sparuj urządzenie za pomocą kodu parowania”</string> + <string name="pairguide_child_process">Włącz „Wyłącz ograniczenia procesów podrzędnych”</string> + <string name="pairguide_row_child_process">Wyłącz ograniczenia procesów podrzędnych</string> + <string name="pairguide_row_build_number">Numer kompilacji</string> + <string name="pairguide_row_wireless">Debugowanie bezprzewodowe</string> + <string name="pairguide_row_pair">Sparuj urządzenie za pomocą kodu parowania</string> <string name="gate_waiting">Czekanie na okienko parowania…</string> <string name="gate_code_needed">Znaleziono okienko. Wpisz jego kod w powiadomieniu.</string> <string name="gate_status">Stan</string> @@ -1035,8 +1182,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 +1189,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> @@ -1053,10 +1197,8 @@ <string name="games_never_played">Nigdy nie grano</string> <string name="games_runtime_busy_percent">Środowisko zajęte · %1$d%%</string> <string name="games_runtime_busy">Środowisko zajęte</string> - <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> @@ -1071,6 +1213,9 @@ <string name="gpu_hide_other">Ukryj sterowniki innych GPU</string> <string name="gpu_show_other">Pokaż sterowniki innych GPU</string> <string name="gpu_advanced">Zaawansowane</string> + <string name="gpu_ubwc_title">Zgodność UBWC</string> + <string name="gpu_ubwc_hint">Wypróbuj Włączone lub Wyłączone, jeśli Steam lub Android pokazuje pasy lub migotanie. Dotyczy obu sterowników po ponownym uruchomieniu DroidDeck.</string> + <string name="gpu_ubwc_restart">Uruchom ponownie DroidDeck, aby zastosować.</string> <string name="gpu_set_with_display">Ustawiany wraz ze sterownikiem wyświetlania: %1$s obejmuje oba.</string> <string name="gpu_set_with_runtime">Ustawiany wraz ze sterownikiem środowiska: %1$s obejmuje oba.</string> <string name="gpu_runtime_hint">Używany przez gry i pulpit.</string> @@ -1125,7 +1270,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> @@ -1179,10 +1324,15 @@ <string name="pip_auto">Automatycznie włączaj obraz w obrazie</string> <string name="unfolded_controls">Sterowanie na rozłożonym ekranie</string> <string name="unfolded_controls_hint">Po rozłożeniu gra jest nad trackpadami i tylnymi uchwytami Steam Deck. Po złożeniu gra zajmuje cały ekran.</string> + <string name="unfolded_controls_with_controller">Zachowaj je przy kontrolerze</string> + <string name="unfolded_controls_with_controller_hint">Pokazuj to sterowanie dotykowe także wtedy, gdy podłączony jest kontroler.</string> <string name="pip_suspended">Wstrzymano</string> <string name="pip_not_ready">Obraz w obrazie będzie dostępny, gdy sesja będzie gotowa.</string> <string name="pip_permission">Zezwól DroidDeck na obraz w obrazie w ustawieniach systemu Android.</string> <string name="pip_unavailable">Android nie mógł otworzyć obrazu w obrazie.</string> + <string name="game_more">Więcej</string> + <string name="game_edit_art">Edytuj grafiki</string> + <string name="stores_in_steam_label">W Steam</string> <string name="game_shortcut">Skrót</string> <string name="game_shortcut_add">Dodaj do ekranu głównego</string> <string name="game_shortcut_choose">Wybierz grę</string> @@ -1206,6 +1356,10 @@ <string name="main_wait_runtime">Poczekaj na zakończenie operacji na środowisku</string> <string name="main_wait_proton_install">Poczekaj na zakończenie instalacji narzędzia zgodności</string> + <string name="load_compat_title">Przygotowywanie narzędzi zgodności</string> + <string name="load_compat_wait">Oczekiwanie na zakończenie konfiguracji zgodności</string> + <string name="load_compat_hint">Sesja uruchomi się po zakończeniu konfiguracji.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Poczekaj na zakończenie instalacji aplikacji desktopowej</string> <string name="main_wait_install_game">Poczekaj na zakończenie instalacji, zanim uruchomisz grę</string> <string name="main_saves_close_session">Najpierw zamknij sesję Steam, aby gra nie nadpisała importowanych zapisów</string> @@ -1250,6 +1404,9 @@ <string name="main_install_anyway">Zainstaluj mimo to</string> <string name="main_remove_runtime_title">Usuń środowisko Linux</string> <string name="main_remove_runtime_text">Spowoduje to usunięcie środowiska, klienta Steam w nim i wszystkich zainstalowanych tam gier.</string> + <string name="runtime_actions_title">Środowisko Linux</string> + <string name="runtime_actions_text">Naprawa ponownie instaluje pliki systemowe środowiska i zachowuje Steam, gry i ustawienia. Dodatki, takie jak pulpit, zainstalują się ponownie przy następnym użyciu. Usunięcie kasuje wszystko.</string> + <string name="runtime_repair">Napraw środowisko</string> <string name="main_applied">Zastosowano: %1$s</string> <string name="android_app_open_failed_primary">Nie udało się otworzyć %1$s na ekranie podstawowym</string> <string name="android_app_open_failed_on">Nie udało się otworzyć %1$s na wyświetlaczu %2$s</string> @@ -1385,6 +1542,13 @@ <string name="session_runtime_catalog_unreachable">Nie udało się połączyć z katalogiem środowisk. Sprawdź połączenie i ponownie naciśnij Graj.</string> <string name="session_runtime_install_failed">Środowisko Linux nie zostało zainstalowane. Sprawdź środowisko w sekcji Konfiguracja i ponownie naciśnij Graj.</string> <string name="session_desktop_install_failed">Pulpit nie został zainstalowany (%1$s). Sprawdź połączenie i ponownie naciśnij Pulpit.</string> + <string name="session_package_resume_failed">Nie udało się dokończyć przerwanej instalacji (%1$s). Sprawdź połączenie i wolne miejsce, a potem spróbuj ponownie.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Środowisko Linux jest uszkodzone: %1$d dowiązanie biblioteki wskazuje na brakujący plik (%2$s), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="few">Środowisko Linux jest uszkodzone: %1$d dowiązania bibliotek wskazują na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="many">Środowisko Linux jest uszkodzone: %1$d dowiązań bibliotek wskazuje na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="other">Środowisko Linux jest uszkodzone: %1$d dowiązania bibliotek wskazuje na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + </plurals> <string name="session_ended_named">%1$s – nieoczekiwane zatrzymanie. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> <string name="session_ended_program">Program nieoczekiwanie się zatrzymał. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> <string name="session_ended_desktop">Pulpit nieoczekiwanie się zatrzymał. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> @@ -1401,6 +1565,15 @@ <string name="mode_decky_plugins_hint">Zainstaluj wtyczkę z pliku ZIP na następną sesję Steam.</string> <string name="mode_decky_plugin_downloading">Pobieranie…</string> <string name="mode_decky_plugin_install_zip">Zainstaluj z pliku ZIP</string> + <string name="decky_zip_warning_title">Instalacja wtyczki zewnętrznej</string> + <string name="decky_zip_warning_text">Zespół Decky Loader nie sprawdził tej wtyczki. Może zawierać złośliwe oprogramowanie, np. kradnące Twoje konto Steam lub szkodzące urządzeniu. Instalując tę wtyczkę, akceptujesz całe ryzyko dla swojego urządzenia.</string> + <string name="decky_zip_warning_continue">Dalej</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Zaczekaj %1$d sekundę</item> + <item quantity="few">Zaczekaj %1$d sekundy</item> + <item quantity="many">Zaczekaj %1$d sekund</item> + <item quantity="other">Zaczekaj %1$d sekundy</item> + </plurals> <string name="store_cat_games">Gry</string> <string name="store_cat_audio_video">Audio i wideo</string> <string name="store_cat_graphics">Grafika</string> @@ -1429,6 +1602,10 @@ <string name="theme_icon_blue_detail">Czarne tło, biały tekst i niebieski dla wszystkiego, co zaznaczone, aktywne lub naciśnięte.</string> <string name="theme_electric">Elektryczny granat</string> <string name="theme_electric_detail">Jaśniejszy niebieski na powierzchniach wpadających w granat zamiast w szarość.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Kolory przechodzące przez całą tęczę. Szanuje ustawienia animacji Androida.</string> + <string name="theme_rgb_speed">Prędkość</string> + <string name="theme_rgb_speed_hint">Jak szybko zmieniają się kolory.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Własny kolor podstawowy i dodatkowy, płynnie przechodzące na przyciskach i wyróżnieniach.</string> <string name="theme_gradient_primary">Podstawowy</string> @@ -1560,7 +1737,16 @@ <string name="fm_conflict_skip">Pomiń</string> <string name="fm_select_this_folder">Wybierz ten folder</string> <string name="fm_back">Wstecz</string> + <string name="fm_exit">Wyjdź</string> + <string name="fm_return_to_start">Wróć do folderu początkowego</string> + <string name="fm_start_unavailable">Folder początkowy nie jest już dostępny</string> + <string name="fm_cancel_operation_title">Anulować operację?</string> + <string name="fm_cancel_operation_confirmation">Operacja zostanie anulowana. Czy na pewno?</string> + <string name="fm_accept">Akceptuj</string> + <string name="fm_decline">Odrzuć</string> <string name="fm_drive_not_readable">%1$s: zamontowano, ale obecnie nie można odczytać</string> + <string name="fm_drive_access_title">Zezwól na dostęp do %1$s</string> + <string name="fm_drive_access_text">Android pozwala DroidDeck widzieć ten dysk, ale nie odczytywać go. Włącz dla DroidDeck dostęp do wszystkich plików, a potem wróć.</string> <string name="fm_list_view">Widok listy</string> <string name="fm_grid_view">Widok siatki</string> <string name="fm_search">Szukaj</string> @@ -1634,6 +1820,93 @@ <string name="second_mode_keyboard_trackpad">Klawiatura + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Uchwyty Deck + trackpady</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Na razie nie ma tu nic do pokazania.</string> + <string name="bottom_page_downloads">Pobieranie</string> + <string name="bottom_downloads_none">Nic nie jest pobierane.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Pobieranie pamięci podręcznej shaderów</string> + <string name="bottom_downloads_paused">Wstrzymano</string> + <string name="bottom_downloads_queued">Oczekuje na rozpoczęcie</string> + <string name="bottom_page_notifications">Powiadomienia</string> + <string name="bottom_notifications_listener">Dolny ekran DroidDeck</string> + <string name="bottom_notifications_why">Wyświetlaj tu wiadomości i inne powiadomienia podczas gry. Pozostają tylko na tym ekranie i nie są zapisywane. Android zapyta raz: na tym ekranie otworzy się jego strona dostępu do powiadomień; włącz tam DroidDeck, a ta strona wróci sama.</string> + <string name="bottom_notifications_allow">Zezwól na dostęp do powiadomień</string> + <string name="bottom_notifications_none">Brak powiadomień.</string> + <string name="bottom_notifications_count">Powiadomienia: %1$d</string> + <string name="bottom_notifications_clear">Wyczyść</string> + <string name="bottom_page_screenshots">Zrzuty ekranu</string> + <string name="stats_fps_needs_hud">FPS wymaga włączonego HUD</string> + <string name="stats_speed">Prędkość</string> + <string name="stats_pedals">Pedały</string> + <string name="stats_gforce">Przeciążenie G</string> + <string name="stats_timing">Czasy</string> + <string name="stats_best_lap">Najlepsze okrążenie</string> + <string name="stats_tires">Opony °C</string> + <string name="stats_trace">Gaz i hamulec, ostatnie 10 s</string> + <string name="stats_speed_chart">Prędkość, %1$s</string> + <string name="stats_gear">Bieg</string> + <string name="stats_speed_units">Jednostki prędkości</string> + <string name="stats_speed_units_auto">Automatycznie (%1$s)</string> + <string name="stats_steam_client_arm">Klient Steam ARM</string> + <string name="stats_steam_client_x86">Klient Steam x86</string> + <string name="stats_throttle">Gaz</string> + <string name="stats_brake">Hamulec</string> + <string name="stats_lights">Kontrolki</string> + <string name="stats_lamp_shift">Zmiana biegu</string> + <string name="stats_lamp_handbrake">Hamulec ręczny</string> + <string name="stats_lamp_pit">Ogranicznik pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Silnik %1$s °C</string> + <string name="stats_oil_temp">Olej %1$s °C</string> + <string name="stats_power">Rozdzielacz mocy</string> + <string name="stats_fuel_t">Paliwo, t</string> + <string name="stats_fuel_main">Główne %1$s t</string> + <string name="stats_fuel_reserve">Rezerwa %1$s t</string> + <string name="stats_tap_hint">Dotknij górnego paska lub zegarów, aby zmienić ich wygląd.</string> + <string name="bottom_telemetry_send_title">Wysyłaj dane do panelu</string> + <string name="bottom_telemetry_send_auto">Automatycznie</string> + <string name="bottom_telemetry_send_auto_hint">Włącza wysyłanie dla każdej gry z tej listy, także dla gier znalezionych później. Gry, które wyłączysz, pozostaną wyłączone.</string> + <string name="bottom_telemetry_send_note">To zmienia ustawienie wyjścia danych w samej grze. Zadziała przy następnym uruchomieniu gry; wyłączenie przywraca poprzednie ustawienie.</string> + <string name="bottom_telemetry_send_close">Zamknij %1$s, aby to zmienić.</string> + <string name="bottom_telemetry_send_failed">Nie udało się zmienić ustawień %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: włącz %2$s w ustawieniach gry, podając IP 127.0.0.1 i port %3$d.</string> + <string name="bottom_shots_where">Zapisywane w Pictures/DroidDeck. Zrzuty ekranu ze Steam też się tu pojawiają.</string> + <string name="bottom_shots_take">Zrób zrzut ekranu</string> + <string name="bottom_shots_saved">Zapisano zrzut ekranu.</string> + <string name="bottom_shots_failed">Nie udało się zrobić zrzutu ekranu.</string> + <string name="bottom_shots_none">Brak zrzutów ekranu.</string> + <string name="bottom_page_chat">Czat i głos</string> + <string name="bottom_chat_why">Czytaj czat Steam i odpowiadaj tutaj, a gra działa dalej na głównym ekranie. Używane jest konto, na które zalogowany jest Steam.</string> + <string name="bottom_chat_not_signed_in">Steam nie ma jeszcze logowania przez przeglądarkę, które można udostępnić, więc zaloguj się tu raz.</string> + <string name="bottom_chat_stopped">Android zamknął stronę czatu, gdy DroidDeck działał w tle. Otworzy się ponownie, gdy wrócisz do DroidDeck.</string> + <string name="bottom_chat_open">Otwórz Steam Chat</string> + <string name="bottom_chat_close">Zamknij czat</string> + <string name="bottom_chat_mic_on">Mikrofon wł.</string> + <string name="bottom_chat_mic_off">Mikrofon wył.</string> + <string name="bottom_chat_mic_unavailable">Mikrofon jest wyłączony dla tej gry. Aby rozmawiać, włącz Mikrofon w ustawieniach Steam w DroidDeck (Dźwięk) i uruchom grę ponownie.</string> + <string name="bottom_chat_volume">Głośność %1$d%%</string> + <string name="bottom_page_telemetry">Statystyki w grze</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Okrążenie</string> + <string name="bottom_telemetry_position">Pozycja</string> + <string name="bottom_telemetry_this_lap">Bieżące okrążenie</string> + <string name="bottom_telemetry_last_lap">Ostatnie okrążenie</string> + <string name="bottom_telemetry_fuel">Paliwo</string> + <string name="bottom_telemetry_cargo">Ładunek</string> + <string name="bottom_telemetry_pips">Punkty mocy SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status prawny</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Włącz wyjście danych w grze wyścigowej (często nazywane telemetrią lub UDP), aby zobaczyć tu zegary na żywo. Dane nie opuszczają tego urządzenia.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d odbiera dane (%2$d pakietów po %3$d bajtów), ale w formacie, którego ta strona jeszcze nie odczytuje.</string> + <string name="bottom_telemetry_port_busy">Port %1$s jest już używany przez inny program, więc tej gry nie da się tu pokazać.</string> <string name="rtinst_removing">Usuwanie środowiska Linux</string> <plurals name="rtinst_removing_entries"> @@ -1666,6 +1939,7 @@ <string name="flatpakmgr_not_ready">Najpierw skonfiguruj Flatpak</string> <string name="flatpakmgr_starting">Rozpoczynanie</string> <string name="flatpakmgr_exit_status">Flatpak zakończył działanie z kodem %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s zbudowano dla %2$s, czego DroidDeck nie potrafi uruchomić. Aplikacje Flatpak potrzebują tu wersji dla ARM64 lub x86_64.</string> <string name="flatpakmgr_installing">Instalowanie %1$s</string> <string name="flatpakmgr_updating">Aktualizowanie %1$s</string> <string name="flatpakmgr_removing">Usuwanie %1$s</string> @@ -1759,6 +2033,7 @@ <string name="adbpair_applying">Stosowanie ustawienia…</string> <string name="adbpair_command_failed">Polecenie debugowania bezprzewodowego nie powiodło się</string> <string name="adbpair_channel_name">Konfiguracja debugowania bezprzewodowego</string> + <string name="adbpair_progress_channel_name">Postęp konfiguracji debugowania bezprzewodowego</string> <string name="adbpair_channel_description">Prosi o kod parowania debugowania bezprzewodowego, gdy Ustawienia są otwarte</string> <string name="adbpair_title_pair">Sparuj debugowanie bezprzewodowe</string> <string name="adbpair_waiting_text">Włącz Debugowanie bezprzewodowe, a potem dotknij „Sparuj urządzenie za pomocą kodu parowania”.</string> @@ -1867,6 +2142,7 @@ <string name="gpuinfo_not_adreno">To nie jest GPU Adreno</string> <string name="gpuinfo_supported">Obsługiwany</string> <string name="gpuinfo_experimental">Eksperymentalny: jego sterowniki to wersje testowe</string> + <string name="gpuinfo_a850_experimental">Eksperymentalna obsługa Adreno 850: wymaga zgodnych eksperymentalnych sterowników ekranu i gier; nie zweryfikowano na tym urządzeniu</string> <string name="gpuinfo_below_tested">Poniżej testowanego sprzętu (Adreno 725 i nowsze): może nie działać</string> <string name="gpuinfo_unsupported">Nieobsługiwany: DroidDeck wymaga GPU Adreno (Snapdragon)</string> @@ -1960,10 +2236,10 @@ <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> + <string name="display_follow_screen_scaled">Skalowanie %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Pokaż szczegóły urządzenia</string> <string name="device_info_hide">Skryj szczegóły urządzenia</string> @@ -1978,7 +2254,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> @@ -1992,11 +2267,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> @@ -2014,9 +2287,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> @@ -2035,12 +2316,43 @@ <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> <string name="stores_sort">Sortuj</string> + <string name="setup_rail_labels">Etykiety paska bocznego</string> + <string name="setup_rail_labels_hint">Pokazuj nazwy pod ikonami paska bocznego. Wyłącz, aby pasek był węższy.</string> + <string name="library_display">Wyświetlanie</string> + <string name="library_display_larger">Większe karty</string> + <string name="library_display_smaller">Mniejsze karty</string> + <string name="library_display_title">Pokazuj tytuł</string> + <string name="library_display_size">Pokazuj rozmiar</string> <string name="stores_sort_last_played">Ostatnio grane</string> <string name="stores_sort_recently_installed">Ostatnio zainstalowane</string> <string name="stores_sort_title_asc">Tytuł A–Z</string> @@ -2192,6 +2504,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> @@ -2207,6 +2520,9 @@ <string name="edit_target">Element docelowy</string> <string name="edit_start_in">Uruchom w</string> <string name="edit_launch_options">Opcje uruchamiania</string> + <string name="edit_launch_options_steam_hint">Wspólne z Właściwościami w Steam: zmiana w jednym miejscu jest widoczna w obu.</string> + <string name="edit_launch_options_not_saved">Nie udało się zapisać opcji uruchamiania w Steam. Spróbuj ponownie.</string> + <string name="edit_launch_options_desktop">Steam może być otwarty w sesji pulpitu. Zmień opcje uruchamiania w jego Właściwościach albo najpierw zamknij sesję.</string> <string name="edit_artwork">Grafika</string> <string name="edit_other_exe">Inny plik exe…</string> <string name="edit_remove">Usuń</string> @@ -2338,6 +2654,7 @@ <string name="setup_download_source_custom">Własny prefiks</string> <string name="setup_download_mirror">Strona</string> <string name="setup_download_prefix">Prefiks</string> + <string name="setup_download_proxy">Serwer proxy HTTP</string> <string name="flathub_eyebrow">APLIKACJE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplikacje pulpitowe dla pulpitu Linux, otwierane z Pulpitu.</string> @@ -2482,6 +2799,22 @@ <string name="glasses_tracking_flat_hint">Tryb „Automatycznie” utrzymuje tę grę 2D nieruchomo w polu widzenia. Aby używać śledzenia głowy, wybierz „Wirtualny ekran” w sekcji „Wyświetlacz”.</string> <string name="glasses_tracking_sbs_hint">Śledzenie głowy działa z wirtualnym ekranem lub uruchomioną grą SteamVR.</string> <string name="glasses_hardware">Urządzenie</string> + <string name="vr_controllers_tab">Kontrolery</string> + <string name="vr_controllers_group">Kontrolery SteamVR</string> + <string name="vr_controllers_emulate">Pad w VR</string> + <string name="vr_controllers_emulate_hint">Dwie dłonie VR, które odgrywa Twój kontroler. Zmiany działają od razu, także gdy działa SteamVR. Joy-Cony i śledzone dłonie nadal przejmują swoją stronę.</string> + <string name="vr_controllers_off">Zwykły pad</string> + <string name="vr_controllers_index">Kontrolery Valve Index</string> + <string name="vr_controllers_touch">Kontrolery Meta Quest 3</string> + <string name="vr_controllers_vive">Różdżki HTC Vive</string> + <string name="vr_controllers_sticks">Gałki na start</string> + <string name="vr_controllers_sticks_hint">Wciśnij obie gałki jednocześnie w VR, aby przełączyć.</string> + <string name="vr_controllers_sticks_game">Poruszają Tobą w grze</string> + <string name="vr_controllers_sticks_hands">Poruszają dłońmi</string> + <string name="vr_controllers_buttons">Przyciski</string> + <string name="vr_controllers_buttons_stick">Spusty to spusty, bumpery chwytają, A/B i X/Y to przyciski czołowe każdej dłoni, wciśnięcie gałki klika thumbstick, Guide otwiera menu SteamVR. Krzyżak w górę i w dół przybliża lub oddala dłonie.</string> + <string name="vr_controllers_buttons_vive">Gałki działają jak gładziki; A/X lub wciśnięcie gałki je naciska. Spusty to spusty, bumpery chwytają, Start i Select to menu, Guide otwiera menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Bez dłoni VR. Gry obsługujące pad oraz menu SteamVR dostają kontroler jak zwykle.</string> <string name="glasses_brightness">Jasność</string> <string name="glasses_volume">Głośność</string> <string name="glasses_sunblock">Przyciemnianie</string> @@ -2539,6 +2872,12 @@ <string name="hand_camera_placement">Położenie kamery</string> <string name="hand_camera_placement_hint">Sprawdź, czy kamera Cię widzi, zanim zaczniesz grać.</string> <string name="hand_camera_check">Sprawdź</string> + <string name="tracking_pack_title">Pobieranie śledzenia dłoni</string> + <string name="tracking_pack_hint">Śledzenie dłoni wymaga jednorazowego pobrania %1$s.</string> + <string name="tracking_pack_download">Pobierz</string> + <string name="tracking_pack_retry">Ponów</string> + <string name="tracking_pack_downloading">Pobieranie śledzenia dłoni… %1$d%%</string> + <string name="tracking_pack_failed">Nie udało się pobrać śledzenia dłoni. Sprawdź połączenie i spróbuj ponownie.</string> <string name="hand_camera_check_title">Położenie kamery</string> <string name="hand_camera_how_rear">Ustaw urządzenie pionowo w odległości od 1,5 do 2 metrów, mniej więcej na wysokości klatki piersiowej, tylną kamerą skierowaną w Twoją stronę. Następnie wejdź w kadr z wyciągniętymi rękami.</string> <string name="hand_camera_how_front">Ustaw urządzenie pionowo w odległości od 1,5 do 2 metrów, mniej więcej na wysokości klatki piersiowej, ekranem skierowanym w Twoją stronę. Następnie wejdź w kadr z wyciągniętymi rękami.</string> @@ -2610,6 +2949,21 @@ <string name="storage_safe_hint">Nieużywane środowiska, pozostałości, stare logi</string> <string name="storage_clean_up">Czyszczenie…</string> <string name="storage_session_running">Zatrzymaj sesję, aby wyczyścić lub coś usunąć. Rozmiary pozostają widoczne.</string> + <string name="storage_default_group">Miejsce instalacji</string> + <string name="storage_default_title">Domyślna pamięć</string> + <string name="storage_default_hint">Nowe instalacje ze sklepów trafiają do wybranego miejsca. Istniejące gry zostają, gdzie są. Biblioteki Steam mają własne ustawienie.</string> + <string name="storage_default_ask">Pytaj za każdym razem</string> + <string name="storage_default_ask_detail">Wybieraj miejsce przy każdej instalacji</string> + <string name="storage_default_internal">Pamięć wewnętrzna</string> + <string name="storage_default_external">Pamięć zewnętrzna</string> + <string name="storage_default_external_detail">%1$s · wolne %2$s</string> + <string name="storage_default_external_missing">Niepodłączona</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">wolne %1$s</string> + <string name="storage_default_folder_missing">Niepodłączony</string> + <string name="storage_default_choose_folder">Wybierz folder…</string> + <string name="storage_default_choose_folder_detail">Użyj dowolnego folderu na karcie SD lub dysku USB</string> + <string name="storage_default_note">Gry trafiają do folderu Games w wybranym miejscu. Istniejące gry nie są przenoszone.</string> <string name="storage_where">Gdzie to trafia</string> <string name="storage_games">Gry Steam</string> <string name="storage_game_data">Dane gier</string> @@ -2745,6 +3099,9 @@ <string name="storage_data_installed">Zainstalowane gry</string> <string name="storage_data_parts">Prefiks %1$s · shadery %2$s · warsztat %3$s</string> <string name="storage_clear_shaders">Wyczyść shadery</string> + <string name="storage_reset_prefix">Zresetuj prefiks</string> + <string name="storage_reset_prefix_title">Zresetować prefiks dla %1$s?</string> + <string name="storage_reset_prefix_confirm">Usuwa jej prefiks Wine (%1$s) w %2$s i tworzy go od nowa przy następnym uruchomieniu. Zapisy, ustawienia i zainstalowane w nim pakiety redystrybucyjne zostaną utracone; zapisy w Steam Cloud pozostają na Twoim koncie.</string> <string name="storage_data_leftovers">Usunięte gry</string> <string name="storage_steam_app">Aplikacja Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefiks wciąż zawiera pliki, być może lokalne zapisy</string> @@ -3046,8 +3403,312 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchronizuj przez Syncthing</string> + <string name="sync_enable_hint">Oparta na Syncthing-Fork implementacja Syncthing, która pozwala synchronizować pliki z wewnętrznego systemu plików DroidDeck z innymi instancjami Syncthing. Dotyczy tylko plików przechowywanych w wewnętrznym systemie plików DroidDeck.</string> + <string name="sync_missing">Ta wersja nie zawiera Syncthing.</string> + <string name="sync_starting">Uruchamianie Syncthing</string> + <string name="sync_status_starting">Uruchamianie</string> + <string name="sync_status_up_to_date">Aktualne</string> + <string name="sync_status_syncing">Synchronizowanie</string> + <string name="sync_status_paused">Wstrzymane</string> + <string name="sync_status_pausing">Wstrzymywanie</string> + <string name="sync_status_resuming">Wznawianie</string> + <string name="sync_status_attention">Wymaga uwagi</string> + <string name="sync_status_failed">Syncthing zatrzymany</string> + <string name="sync_failed_retry">Spróbuj ponownie</string> + <string name="sync_paused_wifi">Wstrzymane do połączenia z Wi-Fi</string> + <string name="sync_paused_game">Wstrzymane na czas gry</string> + <string name="sync_summary">Foldery: %1$d · połączone urządzenia: %2$d z %3$d</string> + <string name="sync_left">Pozostało: %1$s</string> + <string name="sync_open_web_ui">Otwórz interfejs WWW</string> + <string name="sync_pause">Wstrzymaj</string> + <string name="sync_resume">Wznów</string> + <string name="sync_running">Działa</string> + <string name="sync_running_hint">Wyłącz, aby całkowicie zatrzymać Syncthing.</string> + <string name="sync_this_device">To urządzenie</string> + <string name="sync_device_id">ID urządzenia</string> + <string name="sync_show_qr">Pokaż kod QR</string> + <string name="sync_advanced">Zaawansowane</string> + <string name="sync_advanced_hint">Porty, kiedy uruchamiać, reset</string> + <string name="sync_open">Otwórz</string> + <string name="sync_waiting">Czeka na Ciebie</string> + <string name="sync_pending_device">%1$s chce się połączyć</string> + <string name="sync_pending_folder">%1$s chce udostępnić „%2$s”</string> + <string name="sync_pending_folder_hint">Zaakceptuj, aby wybrać miejsce zapisu w DroidDeck.</string> + <string name="sync_review">Sprawdź w interfejsie WWW</string> + <string name="sync_folders">Foldery</string> + <string name="sync_no_folders">Brak folderów.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktualny</string> + <string name="sync_folder_syncing">Synchronizowanie %1$d%%</string> + <string name="sync_folder_scanning">Skanowanie</string> + <string name="sync_folder_paused">Wstrzymany</string> + <string name="sync_folder_out_of_sync">Niezsynchronizowany</string> + <string name="sync_folder_errors">Nie udało się zsynchronizować plików: %1$d</string> + <string name="sync_folder_blocked">Zablokowany</string> + <string name="sync_folder_blocked_hint">Ten folder znajduje się poza pamięcią DroidDeck, więc DroidDeck go wstrzymał. Aby synchronizować foldery spoza DroidDeck, użyj aplikacji Syncthing-Fork.</string> + <string name="sync_remove_folder">Usuń z Syncthing</string> + <string name="sync_remove_folder_hint">Usunięcie nie kasuje żadnych plików.</string> + <string name="sync_devices">Urządzenia</string> + <string name="sync_no_devices">Brak urządzeń.</string> + <string name="sync_connected">Połączone</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Ostatnio widziane: %1$s</string> + <string name="sync_device_id_title">ID tego urządzenia</string> + <string name="sync_device_id_hint">Na drugim urządzeniu dodaj urządzenie w Syncthing i zeskanuj ten kod lub wklej ID. Następnie zaakceptuj je tutaj w interfejsie WWW.</string> + <string name="sync_copy">Kopiuj</string> + <string name="sync_share">Udostępnij</string> + <string name="sync_done">Gotowe</string> + <string name="sync_off_title">Wyłączyć Syncthing?</string> + <string name="sync_off_body">Syncthing zatrzyma się teraz i pozostanie zatrzymany, dopóki nie zostanie ponownie włączony. Zsynchronizowane pliki pozostaną na miejscu.</string> + <string name="sync_off_forget">Usuń też konfigurację Syncthing</string> + <string name="sync_off_forget_hint">Usuwa ID tego urządzenia, foldery i urządzenia. Po ponownym włączeniu Syncthing zacznie od nowa.</string> + <string name="sync_turn_off">Wyłącz</string> + <string name="sync_ports">Porty</string> + <string name="sync_port_sync">Synchronizacja</string> + <string name="sync_port_discovery">Wykrywanie lokalne</string> + <string name="sync_repick">Wybierz nowe porty</string> + <string name="sync_repick_hint">Sprawdzane ponownie przy każdym uruchomieniu.</string> + <string name="sync_repick_button">Wybierz ponownie</string> + <string name="sync_reset_group">Reset</string> + <string name="sync_api_key">Klucz API</string> + <string name="sync_regenerate">Wygeneruj ponownie</string> + <string name="sync_reset">Zresetuj Syncthing</string> + <string name="sync_reset_hint">Nowe ID urządzenia, foldery i urządzenia zostaną usunięte. Pliki w pamięci DroidDeck zostaną zachowane.</string> + <string name="sync_reset_button">Resetuj</string> + <string name="sync_reset_confirm_title">Zresetować Syncthing?</string> + <string name="sync_running_group">Działanie</string> + <string name="sync_run">Uruchamiaj</string> + <string name="sync_run_open">Gdy DroidDeck jest otwarty</string> + <string name="sync_run_background">W tle</string> + <string name="sync_wifi_only">Tylko przez Wi-Fi</string> + <string name="sync_pause_games">Wstrzymuj podczas gier</string> + <string name="sync_logs">Logi</string> + <string name="sync_logs_hint">Dane wyjściowe Syncthing z tej sesji</string> + <string name="sync_logs_share">Udostępnij</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Najpierw skonfiguruj środowisko Linux.</string> + <string name="sync_accept">Akceptuj</string> + <string name="sync_accept_title">Zapisz „%1$s” w</string> + <string name="sync_add_folder">Dodaj folder</string> + <string name="sync_add_folder_hint">Synchronizuj folder w pamięci DroidDeck</string> + <string name="sync_choose">Wybierz</string> + <string name="sync_add">Dodaj</string> + <string name="sync_add_failed">Nie udało się dodać folderu.</string> + <string name="sync_share_with">Udostępnij dla</string> + <string name="sync_share_none">Brak urządzeń. Ten folder możesz udostępnić później w interfejsie WWW.</string> + <string name="sync_use_folder">Użyj tego folderu</string> + <string name="sync_new_folder">Nowy folder</string> + <string name="sync_location_home">Katalog domowy kontenera</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Pamięć współdzielona DroidDeck</string> + <string name="sync_location_card">DroidDeck na %1$s</string> + <string name="sync_location_app">Dane aplikacji DroidDeck</string> + <string name="sync_web_path_locked">Nowe foldery są zapisywane w folderze Sync DroidDeck. Aby synchronizować inny folder DroidDeck, użyj opcji Dodaj folder na karcie Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Odśwież</string> + <string name="sync_not_running">Syncthing nie działa.</string> + <string name="session_end_steam_sigill">Steam zatrzymał się na niedozwolonej instrukcji (SIGILL). Może to być problem ze zgodnością instrukcji CPU lub awaria klienta. Udostępnij logi wraz z danymi urządzenia.</string> + <string name="session_end_steam_try_x64">Możesz spróbować Ustawienia Steam → Klient Steam → x86-64 (eksperymentalny). Wymaga dodatkowego pobrania i może działać wolniej.</string> + <string name="session_end_vulkan_device">Sterownik graficzny Linux nie znalazł używalnego urządzenia Vulkan. Sprawdź, czy wybrany sterownik GPU Linux obsługuje to GPU.</string> + <string name="session_end_gpu_unsupported">Tej sesji nie można uruchomić, bo w bieżącej konfiguracji to GPU nie ma zgodnego sterownika Vulkan dla Linux. Sterowniki Adreno Turnip nie mogą włączyć obsługi GPU MediaTek/Mali.</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_resources_browser">Otwiera się w przeglądarce</string> + <string name="game_resource_guides">Poradniki</string> + <string name="game_resource_protondb_detail">Raporty zgodności Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Dla gier z zapisami na Twoim koncie Steam</string> + <string name="game_resource_search">Wyszukiwanie w sieci</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="library_filter">Filtr</string> + <string name="library_filter_installed">Tylko zainstalowane</string> + <string name="library_filter_all_owned">Wszystkie posiadane gry</string> + <string name="library_no_installed_matches">Żadna zainstalowana gra nie pasuje do tych filtrów.</string> + <string name="library_browse_owned">Przeglądaj posiadane gry</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="stores_itch_updates_found">Dostępne aktualizacje: %1$d</string> + <string name="stores_itch_update_replaced">Deweloper zastąpił tę wersję plikiem %1$s. Zaktualizować do niej?</string> + <string name="xbox_filter_cloud">Chmura</string> + <string name="stores_xbox_cloud_settings">Ustawienia chmury</string> + <string name="integration_title">Integracja ze Steam</string> + <string name="integration_count">Włączone: %1$d z %2$d</string> + <string name="integration_set_up">Skonfiguruj</string> + <string name="integration_location">Lokalizacja</string> + <string name="integration_app_info">Informacje o aplikacji</string> + <string name="integration_wifi">Nazwy Wi-Fi</string> + <string name="integration_brightness">Jasność</string> + <string name="integration_home">DroidDeck jako ekran główny</string> + <string name="integration_shortcuts">Skróty przycisku ekranu głównego</string> + <string name="integration_wifi_hint">Pokazuj sieci w Steam · wymaga dostępu do lokalizacji, nigdy nie jest śledzona</string> + <string name="integration_wifi_on">Sieci są widoczne w Steam</string> + <string name="integration_wifi_location_off">Lokalizacja jest wyłączona</string> + <string name="integration_wifi_denied">Odmówiono dostępu do lokalizacji · zezwól w Informacjach o aplikacji</string> + <string name="integration_brightness_hint">Suwak Steam ustawia jasność ekranu</string> + <string name="integration_home_hint">Przycisk ekranu głównego otwiera menu Steam w sesji</string> + <string name="integration_shortcuts_hint">Przytrzymaj przycisk ekranu głównego, aby użyć skrótów Steam Guide</string> + <string name="integration_shortcuts_needs_home">Wymaga DroidDeck jako ekranu głównego</string> + <string name="integration_shortcuts_maybe_restricted">Wyszarzone w Androidzie? Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami</string> + <string name="integration_shortcuts_restricted">Zablokowane przez Androida · Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami</string> + <string name="integration_shortcuts_service">Przycisk ekranu głównego DroidDeck</string> + <string name="integration_shortcuts_service_description">Przekazuje naciśnięcia przycisku ekranu głównego do Steam Guide, gdy aktywna jest sesja Steam, a DroidDeck jest domyślną aplikacją ekranu głównego. Nie odczytuje zawartości ekranu.</string> + <string name="integration_brightness_needed">Włącz Jasność w Konfiguracja → Integracja ze Steam</string> + <string name="apps_search_hint">Szukaj aplikacji</string> + <string name="apps_no_match">Żadna aplikacja nie pasuje do „%1$s”.</string> + <string name="apps_add_widget">Dodaj widżet</string> + <string name="apps_widgets_loading">Wczytywanie widżetów…</string> + <string name="apps_widgets_none">Żadna aplikacja na tym urządzeniu nie oferuje widżetów.</string> + <string name="apps_widget_wider">Szerszy</string> + <string name="apps_widget_narrower">Węższy</string> + <string name="apps_widget_taller">Wyższy</string> + <string name="apps_widget_shorter">Niższy</string> + <string name="apps_widget_move_earlier">Przesuń wcześniej</string> + <string name="apps_widget_move_later">Przesuń później</string> + <string name="apps_widget_configure">Ustawienia widżetu</string> + <string name="apps_widget_remove">Usuń widżet</string> + <string name="apps_add_to_folder">Dodaj do folderu</string> + <string name="apps_new_folder">Nowy folder</string> + <string name="apps_remove_from_folder">Usuń z folderu</string> + <string name="apps_app_info">Informacje o aplikacji</string> + <string name="apps_uninstall">Odinstaluj</string> + <string name="apps_folder_rename">Zmień nazwę</string> + <string name="apps_folder_ungroup">Rozgrupuj</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nazwa folderu</string> + <string name="apps_filter">Pokaż</string> + <string name="apps_filter_all">Wszystkie aplikacje</string> + <string name="apps_filter_games">Gry</string> + <string name="apps_filter_downloaded">Pobrane</string> + <string name="apps_filter_system">Systemowe</string> + <string name="apps_filter_hidden">Ukryte</string> + <string name="apps_hide">Ukryj</string> + <string name="apps_unhide">Pokaż w aplikacjach</string> + <string name="apps_shortcut_remove">Usuń skrót</string> + <string name="apps_pin_title">Dodaj do aplikacji</string> + <string name="apps_pin_add">Dodaj</string> + <string name="apps_hidden_none">Brak ukrytych aplikacji.</string> + <string name="apps_sort_name_asc">Nazwa A–Z</string> + <string name="apps_sort_name_desc">Nazwa Z–A</string> + <string name="apps_sort_installed">Ostatnio zainstalowane</string> + <string name="apps_sort_updated">Ostatnio zaktualizowane</string> + <plurals name="apps_count"> + <item quantity="one">%d aplikacja</item> + <item quantity="few">%d aplikacje</item> + <item quantity="many">%d aplikacji</item> + <item quantity="other">%d aplikacji</item> + </plurals> + <string name="desktop_restore_title">Przywracanie oprogramowania</string> + <string name="desktop_restore_body">Ponowna instalacja dodanych aplikacji po aktualizacji DroidDeck.</string> + <string name="desktop_restore_done_title">Oprogramowanie przywrócone</string> + <string name="desktop_restore_done_body">Dodane aplikacje są ponownie zainstalowane.</string> + <string name="desktop_restore_failed_title">Nie udało się przywrócić części oprogramowania</string> + <string name="desktop_restore_failed_body">Sprawdź ~/.cache/droiddeck/apt-restore.log, a potem spróbuj sudo apt install w Konsole.</string> + <string name="gog_full_files">Natywne optymalizacje są niedostępne. Pobieranie zawiera pełne pliki zastępcze.</string> + <string name="gog_recover">Zweryfikuj wynik łatki</string> + <string name="slow_usb_title">Wolne połączenie USB</string> + <string name="slow_usb_cable">%1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s), więc gry na nim będą wczytywać się wolno. Użyj kabla USB 3 o przepustowości 5 Gb/s lub większej, odwróć wtyczkę USB-C albo użyj szybszego dysku.</string> + <string name="slow_usb_port">%1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s). Port USB tego urządzenia nie działa szybciej, więc gry będą wczytywać się wolno. Pamięć wewnętrzna lub karta microSD mogą być szybsze.</string> + <string name="slow_usb_never">Nie pokazuj ponownie</string> + <string name="slow_usb_dismiss">Zamknij</string> + <string name="steam_import_title">Uruchomić ponownie Steam, aby dodać Twoje gry?</string> + <string name="steam_import_body">Steam może pokazać te posiadane gry jako zainstalowane: %1$s. Aby je pokazać, musi się uruchomić ponownie. Uruchom ponownie teraz albo zostaną dodane przy następnym uruchomieniu Steam.</string> + <string name="steam_import_names_more">%1$s i %2$d więcej</string> + <string name="steam_import_now">Uruchom ponownie teraz</string> + <string name="steam_import_later">Później</string> + <string name="gog_maintenance">Zarządzaj instalacją GOG</string> + <string name="gog_check">Sprawdź aktualizacje</string> + <string name="gog_repair">Weryfikuj/napraw</string> + <string name="gog_patches">Łatki offline</string> + <string name="gog_refresh">Pobierz pełny instalator offline</string> + <string name="gog_update">Aktualizuj do %1$s</string> + <string name="gog_resume">Wznów konserwację GOG</string> + <string name="gog_open_patch">Otwórz instalator łatki</string> + <string name="gog_patch_in_session">Dokończ lub anuluj instalator łatki w sesji Linux.</string> + <string name="gog_patch_requirements">Wybierz łatkę dla zainstalowanej wersji i języka. Obsługiwane wersje źródłowe mogą nie być wymienione.</string> + <string name="gog_no_patches">GOG nie ma samodzielnych łatek Windows dla tej gry.</string> + <string name="gog_managed_files">Zmodyfikowane pliki gry mogą zostać zastąpione.</string> + <string name="gog_patch_installer_note">Instalator otworzy się w Twojej sesji Linux.</string> + <string name="gog_download_label">Pobieranie</string> + <string name="gog_space_label">Dodatkowe miejsce</string> + <string name="gog_space_estimate_label">Szacowane miejsce</string> + <string name="gog_repair_action">Napraw pliki</string> + <string name="gog_refresh_action">Odśwież instalację</string> + <string name="gog_select_patch">Wybierz</string> + <string name="setup_all_files">Dostęp do wszystkich plików</string> + <string name="setup_local_network">Sieć lokalna</string> + <string name="libraries_title">Więcej bibliotek Steam</string> + <string name="libraries_hint">Foldery, w których Steam może instalować i uruchamiać gry, każdy z własną nazwą. Usunięcie z listy zachowuje gry na dysku.</string> + <string name="libraries_add">Dodaj bibliotekę</string> + <string name="libraries_rename_title">Nazwa biblioteki</string> + <string name="libraries_pick">Wybierz folder biblioteki</string> + <string name="libraries_full">Maksymalnie %1$d dodatkowych bibliotek</string> + <string name="libraries_overlap">Ten folder jest już biblioteką lub znajduje się w jej wnętrzu</string> + <string name="libraries_missing">%1$s · niedostępna</string> + <string name="libraries_applies_next">Obowiązuje od następnej sesji Steam</string> + <string name="bottom_desktop_start">Uruchom pulpit</string> + <string name="bottom_desktop_mode_touch">Dotyk bezpośredni</string> + <string name="bottom_desktop_trackpad">Gładzik. Dotknij, aby przejść na dotyk bezpośredni</string> + <string name="bottom_desktop_direct_touch">Dotyk bezpośredni. Dotknij, aby przejść na gładzik</string> + <string name="bottom_desktop_starting">Uruchamianie pulpitu KDE…</string> + <string name="bottom_desktop_ended">Pulpit został zamknięty.</string> + <string name="bottom_desktop_failed">Nie udało się uruchomić pulpitu. Dzienniki są w folderze bottom-desktop tej sesji.</string> + <string name="bottom_desktop_off">Pulpit jest zamknięty.</string> + <string name="libraries_rename">Zmień nazwę</string> + <string name="second_mode_desktop">Pulpit</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Pulpit · %1$s</string> </resources> diff --git a/app/src/main/res/values-pt-rPT/gestures.xml b/app/src/main/res/values-pt-rPT/gestures.xml index 2d8f3cf8e..19b89be40 100644 --- a/app/src/main/res/values-pt-rPT/gestures.xml +++ b/app/src/main/res/values-pt-rPT/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestos</string> <string name="gesture_settings">Configurações de gestos de toque</string> - <string name="gesture_settings_hint">Personalize os gestos de rato e teclado. Selecione Gestos como modo de toque para usá-los.</string> <string name="gesture_tap">Toque</string> <string name="gesture_drag">Arrastar com um dedo</string> <string name="gesture_long_press">Toque longo</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Manter premido com três dedos</string> <string name="gesture_pinch">Pinçar para ampliar</string> <string name="gesture_hold_button">Manter o botão premido</string> + <string name="gesture_hold_left">Manter o botão esquerdo premido</string> + <string name="gesture_hold_right">Manter o botão direito premido</string> <string name="gesture_click_once">Clicar uma vez</string> <string name="gesture_hold_delay">Tempo para manter premido</string> <string name="gesture_double_delay">Intervalo de toque duplo</string> diff --git a/app/src/main/res/values-pt-rPT/shortcuts.xml b/app/src/main/res/values-pt-rPT/shortcuts.xml new file mode 100644 index 000000000..7e9f6cf24 --- /dev/null +++ b/app/src/main/res/values-pt-rPT/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Atalhos de botões físicos</string> + <string name="shortcuts_dd_menu">Menu do DroidDeck</string> + <string name="shortcuts_capture">Atribuir: %1$s</string> + <string name="shortcuts_press">Prima e solte um botão. A atribuição é guardada automaticamente.</string> + <string name="shortcuts_release">Solte o botão para continuar.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Este botão já está atribuído a: %1$s</string> + <string name="shortcuts_save">Reatribuir</string> + <string name="shortcuts_retry">Experimentar outro botão</string> + <string name="shortcuts_limitations">O botão Início e alguns botões adicionais podem não estar disponíveis.</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 91e75d38f..bf1508186 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opções do VKD3D para D3D12. nodxr desativa o ray tracing; utilize apenas num jogo que o exija.</string> <string name="game_env_proton_log">Defina como 1 para obter um registo de diagnóstico do Proton. O registo pode reduzir o desempenho e ocupar armazenamento.</string> <string name="game_env_wined3d">Defina como 1 para utilizar o WineD3D baseado em OpenGL em vez do DXVK, para testar a compatibilidade com D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 e jogos executados com WineD3D. O Vulkan evita o caminho OpenGL sobre Zink e é muito mais rápido para jogos antigos DirectDraw e Direct3D 7 em Adreno.</string> + <string name="game_env_dxvk_d3d8">Defina como 1 para executar o Direct3D 8 através do DXVK em vez do WineD3D. Mais rápido no teste Direct3D 8 do AIO Graphics Test em Adreno.</string> <string name="game_env_no_ntsync">Defina como 1 para manter este jogo fora do ntsync (droiddeck-ntsync ou um controlador do kernel); utiliza o droiddeck-esync onde existir um pacote, caso contrário o droiddeck-fsync.</string> <string name="game_env_no_esync">Defina como 1 para desativar o droiddeck-esync neste jogo; utiliza o droiddeck-fsync em vez dele, ou o droiddeck-ntsync se o fsync também estiver desativado.</string> <string name="game_env_no_fsync">Defina como 1 para manter este jogo fora do droiddeck-fsync; utiliza o droiddeck-esync onde existir um pacote, caso contrário o droiddeck-ntsync.</string> <string name="game_env_fsync_first">Defina como 1 para executar este jogo com o droiddeck-fsync, ou 0 para dar prioridade ao droiddeck-esync onde houver um pacote compatível com o respetivo Proton.</string> <string name="game_env_xalia">Defina como 0 para desativar o assistente de navegação por comando do Proton neste jogo.</string> + <string name="game_env_anticheat_offline">Ativado por predefinição. Inicia um jogo com Easy Anti-Cheat sem o anti-cheat quando o jogo suporta jogo offline. Desative para iniciar através do Easy Anti-Cheat como habitualmente. Os modos online que exigem o Easy Anti-Cheat continuam indisponíveis.</string> <string name="game_env_hud">Sobreposição do DXVK para D3D9–11. fps mostra a taxa de fotogramas; sem valor, fica oculta.</string> <string name="game_env_dxvk_config">Definições do DXVK separadas por ponto e vírgula. As versões recentes utilizam dxvk.maxFrameRate para limitar os fotogramas; para jogar normalmente, prefira o limitador de fotogramas da sessão.</string> + <string name="game_env_cores">Núcleos da CPU para este jogo, por exemplo 0-4 ou 0,2,4, em vez dos núcleos de jogo da sessão. Menos núcleos aquecem menos.</string> <string name="game_env_vkd3d_limit">Limite da taxa de fotogramas em D3D12. 0 desativa o limite.</string> <string name="game_env_glthread">Threading OpenGL do Mesa. true pode ajudar jogos OpenGL limitados pela CPU; teste jogo a jogo.</string> <string name="sync_backend_title">Sincronização do Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">O FEX executa programas Linux x86 neste dispositivo ARM64. Em Automático, é utilizado quando o programa foi compilado para x86.</string> <string name="app_fex_x86">%1$s através do FEX</string> <string name="app_fex_not_ready">Este programa foi compilado para PCs %1$s e é executado através do FEX, que ainda não está configurado. Abra o Steam uma vez com a sessão iniciada: o DroidDeck transfere o FEX e o Steam Linux Runtime necessários e, depois, este programa abre.</string> + <string name="session_proot_missing">Não foi possível transferir o proot do DroidDeck. Verifique a ligação e tente novamente. A sessão não foi iniciada, porque o proot alternativo é demasiado lento para jogar.</string> + <string name="session_directaudio_missing">Não foi possível transferir o DirectAudio, por isso o áudio dos jogos utiliza o caminho mais lento nesta sessão.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">Não foi possível transferir o cliente Steam. A sua rede ou VPN pode estar a bloquear os servidores da Steam; verifique a ligação e tente novamente.</string> <string name="session_end_steam_setup">Não foi possível configurar o cliente Steam. Verifique a ligação e o espaço livre e tente novamente.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Comando Xbox 360</string> <string name="mode_controller_note">Deck: botão de Acesso rápido e giroscópio. Steam Controller: o mesmo, com sensor de pega nos botões traseiros. DualShock 4 e DualSense: giroscópio, e os trackpads como o painel tátil do comando. Xbox 360: abra o Acesso rápido com Guide+A.</string> <string name="mode_back">Voltar</string> + <string name="back_hold">Manter Voltar premido para atalhos do Steam</string> + <string name="back_hold_hint">Manter Voltar premido abre o Acesso rápido ou cria combinações do Steam com outros botões. Desative para ignorar Voltar premido; toque e toque duplo continuam a funcionar.</string> + <string name="back_native_qam_hint">Mantenha Voltar premido durante 700 ms, ou mantenha Voltar premido e prima outro botão para atalhos do Steam.</string> + <string name="back_double_tap_window">Intervalo do toque duplo</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir controlo do brilho</string> + <string name="brightness_permission_text">Configure o controlo do brilho no DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessão</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Atualizado · %1$s</string> <string name="mode_decky_loader">Carregador</string> <string name="mode_decky_install_latest">Instalar a versão mais recente</string> + <string name="decky_channel">Canal de atualização</string> + <string name="decky_channel_hint">Que versões do Decky Loader instalar. O atualizador do próprio Decky utiliza o mesmo canal.</string> + <string name="decky_channel_stable">Estável</string> + <string name="decky_channel_prerelease">Pré-lançamento</string> + <string name="decky_channel_testing">Testes</string> + <string name="decky_channel_failed">Não foi possível guardar o canal de atualização do Decky</string> <string name="mode_decky_on">Inicia com o Steam. Enquanto estiver ligado, outras apps neste dispositivo poderão controlar o Steam.</string> <string name="mode_decky_off">Desligado. A porta de depuração remota do Steam mantém-se fechada.</string> <string name="mode_decky_remove_title">Desinstalar o Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Sobreposição de desempenho</string> <string name="mode_mangoapp_hint">Desative se os jogos falharem ou ficarem a preto no Modo Deck. Aplica-se na próxima sessão.</string> + <string name="mode_return_after_game">Voltar ao DroidDeck após um jogo</string> + <string name="mode_return_after_game_hint">Quando um jogo iniciado a partir do DroidDeck ou de outro iniciador fecha, o Steam sai corretamente (os guardados na nuvem terminam primeiro) e regressa lá. Desativado: fica no Steam.</string> + <string name="mode_shader_precache">Pré-cache de shaders</string> + <string name="mode_shader_precache_hint">O Steam transfere shaders pré-compilados para os seus jogos e processa-os em segundo plano, para que os jogos tenham menos soluços. Desativado poupa dados, armazenamento e bateria; os jogos compilam os shaders enquanto são jogados. É a mesma definição de Transferências > Pré-cache de shaders do Steam. Aplica-se na próxima sessão.</string> <string name="mode_steam_repair">Reparar cliente Steam</string> <string name="mode_steam_repair_hint">Volta a transferir o cliente Steam na próxima vez que o Steam iniciar. Utilize se o Steam ficar preso no ecrã de carregamento. Os jogos, a sessão iniciada e as definições são mantidos.</string> <string name="mode_steam_repair_queued">O cliente Steam será transferido novamente na próxima vez que o Steam iniciar.</string> @@ -375,6 +414,8 @@ <string name="mode_directaudio_hint">Ignora o PulseAudio para reduzir a latência.</string> <string name="mode_mic">Microfone</string> <string name="mode_mic_hint">Para chat de voz.</string> + <string name="drawer_mic_hint">Ativa ou desativa a captura do microfone nesta sessão.</string> + <string name="drawer_mic_failed">Não foi possível alterar o microfone. Tente novamente.</string> <string name="mode_network">Rede</string> <string name="mode_wifi_discovery">Deteção de Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostrar nomes de Wi-Fi e redes próximas no Steam.</string> @@ -537,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: fila de GPU em tempo real</string> <string name="perf_gsrealtime_hint">Dá prioridade ao trabalho de GPU do compositor. Pode suavizar o ritmo de fotogramas, com algum custo para os jogos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Desativado</string> + <string name="perf_cap_auto">Predefinição do controlador</string> + <string name="perf_zram_client">Comprimir o Steam durante um jogo</string> + <string name="perf_zram_client_hint">20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar pouco depois de os jogos iniciarem. Um limite de RAM acima continua a comprimir o Steam quando a sessão o ultrapassa.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">Aplica-se enquanto o cliente Steam está em execução, no modo Steam ou a partir do ambiente de trabalho. Quando a sessão utiliza mais do que isto, o Steam e depois os outros processos suportados da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem ter soluços enquanto as páginas são repostas.</string> + <string name="perf_ram_cap_unavailable">Requer swap em zRAM, que este dispositivo não tem.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">A memória de vídeo que o DXVK indica aos jogos Direct3D, para que reservem menos para texturas. As definições de DXVK do próprio jogo têm prioridade. Aplica-se na próxima sessão.</string> <string name="perf_gpuclock">Manter a GPU na frequência máxima</string> <string name="perf_gpuclock_hint">Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor.</string> <string name="perf_fixes">Correções da sessão</string> <string name="perf_sysmem">Turnip: renderização em sysmem</string> <string name="perf_sysmem_hint">Mais rápido para o cliente Steam; nos jogos, o controlador escolhe em cada passagem entre renderização em mosaico ou na memória do sistema. Obrigatório no Adreno 710/720/722.</string> <string name="perf_xalia">Ignorar o assistente xalia do Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">Um substituto em espaço de utilizador para o controlador ntsync do Linux, para testes. Enquanto estiver ativado, o Proton utiliza-o em vez do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Aplica-se na próxima sessão.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Um substituto em espaço de utilizador para o controlador ntsync do Linux. Enquanto estiver ativado, o Proton utiliza-o em vez do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Aplica-se na próxima sessão.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync primeiro</string> <string name="perf_fsync_hint">Executa o fsync do próprio Proton sobre os ficheiros originais do Proton, com o futex_waitv fornecido em espaço de utilizador, por isso não precisa de pacote e continua a funcionar assim que o Steam atualiza o Proton. Enquanto estiver ativado, os jogos utilizam-no antes do droiddeck-esync, exceto os poucos que o Proton mantém fora do fsync. Aplica-se na próxima sessão.</string> @@ -555,6 +606,8 @@ <string name="perf_fastpath">Caminho rápido do proot</string> <string name="perf_fastpath_needs_seccomp">Requer o filtro seccomp do proot.</string> <string name="perf_fastpath_hint">Pesquisas de ficheiros mais rápidas e menos soluços. Desative se um programa não encontrar os seus ficheiros.</string> + <string name="perf_cursor_composite">Desenhar o cursor dentro do gamescope</string> + <string name="perf_cursor_composite_hint">O gamescope desenha o ponteiro em vez de o passar ao Android. Ative para um cursor controlado pelo comando. Desativado é mais rápido num telemóvel. Aplica-se na próxima sessão.</string> <string name="perf_identity">Identidade da sessão</string> <string name="perf_hostname">Nome do anfitrião</string> <string name="perf_hostname_hint">O nome com que o Steam vê este dispositivo. Em branco, repõe %1$s.</string> @@ -569,6 +622,8 @@ <string name="driver_delete_plain">Os ficheiros são removidos da app.</string> <string name="driver_delete_in_use">Os ficheiros são removidos. Como está em utilização, o padrão passa a ser utilizado.</string> <string name="drawer_page_display">Ecrã</string> + <string name="drawer_frame_limit">Limite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este jogo. O ecrã muda para uma taxa de atualização que o limite divida de forma exata, quando existe; outros limites podem parecer irregulares. Os jogos Steam utilizam o Limite de fotogramas do Steam no Menu de acesso rápido.</string> <string name="drawer_page_effects">Efeitos</string> <string name="drawer_page_controls">Controlos</string> <string name="drawer_page_components">Componentes</string> @@ -593,6 +648,66 @@ <string name="drawer_hud_color_amber">Âmbar</string> <string name="drawer_hud_color_violet">Violeta</string> <string name="drawer_hud_opacity">Opacidade</string> + <string name="hud_size">Tamanho</string> + <string name="hud_size_hint">Tocar no HUD também altera o tamanho.</string> + <string name="hud_size_full">Completo</string> + <string name="hud_size_tiles">Mosaicos</string> + <string name="hud_size_pill">Pílula</string> + <string name="hud_size_minimal">Mínimo</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> + <string name="hud_locked">Bloquear posição</string> + <string name="hud_locked_hint">Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar.</string> + <string name="hud_snap">Encaixar nas laterais</string> + <string name="hud_snap_hint">Solte o HUD e ele vai para a lateral mais próxima do ecrã. Um gesto rápido lança-o nessa direção.</string> + <string name="hud_group_look">Aspeto</string> + <string name="hud_scale">Tamanho no ecrã</string> + <string name="hud_color_soft">Suave</string> + <string name="hud_color_mid">Média</string> + <string name="hud_color_vivid">Viva</string> + <string name="hud_outline">Contorno</string> + <string name="hud_outline_color">Cor do contorno</string> + <string name="hud_outline_gray">Cinzento</string> + <string name="hud_outline_theme">Cor do tema</string> + <string name="hud_group_metrics">Leituras</string> + <string name="hud_metric_graph">Gráfico de tempo de fotograma</string> + <string name="hud_metric_decimal">Taxa de fotogramas com decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% mais baixo</string> + <string name="hud_metric_engine">Motor gráfico</string> + <string name="hud_metric_gpu_model">Nome da GPU</string> + <string name="hud_metric_gpu">Utilização da GPU</string> + <string name="hud_metric_gpu_temp">Temperatura da GPU</string> + <string name="hud_metric_cpu">Utilização da CPU</string> + <string name="hud_metric_per_core">CPU por núcleo</string> + <string name="hud_metric_temp">Temperaturas</string> + <string name="hud_metric_ram">Memória</string> + <string name="hud_metric_vram">Memória gráfica</string> + <string name="hud_metric_swap">Memória swap</string> + <string name="hud_metric_battery">Nível da bateria</string> + <string name="hud_metric_power">Consumo de energia</string> + <string name="hud_metric_network">Rede</string> + <string name="hud_metric_resolution">Resolução</string> + <string name="hud_metric_proton">Versão do Proton</string> + <string name="hud_metric_session">Tempo de sessão</string> + <string name="hud_metric_clock">Relógio</string> + <string name="hud_group_temps">Temperaturas</string> + <string name="hud_temp_unit">Unidade</string> + <string name="hud_temp_bands">Cores de aviso</string> + <string name="hud_temp_bands_hint">As temperaturas ficam âmbar e depois vermelhas à medida que se aproximam do limite.</string> + <string name="hud_temp_bands_off">Desativado</string> + <string name="hud_temp_bands_auto">Automático</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU a vermelho a partir de</string> + <string name="hud_temp_red_gpu">GPU a vermelho a partir de</string> + <string name="hud_temp_red_battery">Bateria a vermelho a partir de</string> + <string name="hud_group_more">Mais</string> + <string name="hud_export">Diagnóstico do HUD</string> + <string name="hud_export_hint">Guarda em Downloads/DroidDeck um relatório de cada sensor que o HUD lê.</string> + <string name="hud_export_button">Guardar</string> + <string name="hud_export_done">Guardado em %1$s</string> + <string name="hud_export_failed">Não foi possível guardar o relatório do HUD.</string> + <string name="hud_reset">Repor definições do HUD</string> + <string name="hud_reset_button">Repor</string> <string name="drawer_scaling">Modo de escala</string> <string name="drawer_scaling_sharpness">Nitidez da escala</string> <string name="drawer_effects">Efeitos de ecrã</string> @@ -627,10 +742,14 @@ <string name="drawer_touch_auto">Automático (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latência</string> + <string name="drawer_low_latency">Modo de baixa latência</string> + <string name="drawer_low_latency_hint">Aumenta o consumo de CPU e de bateria</string> <string name="drawer_low_latency_controller">Comando de baixa latência</string> <string name="drawer_low_latency_controller_hint">O comando comunica a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU.</string> <string name="drawer_low_latency_touch">Toque de baixa latência</string> <string name="drawer_low_latency_touch_hint">Os toques ignoram o agrupamento de fotogramas; os controlos táteis do Steam passam a 1000 Hz. Um pouco mais de CPU.</string> + <string name="drawer_evdev_mouse">Canal de rato em bruto</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Segundo ecrã</string> @@ -718,6 +837,10 @@ <string name="setup_session">Sessão</string> <string name="setup_logs">Registos da sessão</string> <string name="setup_logs_hint">Guardados após cada sessão</string> + <string name="setup_game_debug_logs">Registos de depuração dos jogos</string> + <string name="setup_game_debug_logs_hint">Inclui diagnósticos do Proton, do Wine e de gráficos no próximo arranque de um jogo. Pode reduzir o desempenho e ocupar mais armazenamento.</string> + <string name="setup_game_debug_logs_restart">Reinicie esta sessão para guardar os registos de depuração dos jogos</string> + <string name="setup_logging_update_failed">Não foi possível atualizar os registos. Verifique o interruptor e tente novamente.</string> <string name="setup_agent_commands">Ferramentas de depuração</string> <string name="setup_latest_logs">Registos da última sessão</string> <string name="setup_saved_logs">Registos de sessões guardados</string> @@ -742,12 +865,28 @@ <string name="setup_home_on">O DroidDeck pode ser a app de página inicial</string> <string name="setup_home_off">O DroidDeck nunca é proposto como app de página inicial</string> <string name="setup_orientation">Orientação</string> + <string name="setup_launcher_orientation">Orientação do iniciador</string> + <string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientação da sessão</string> + <string name="setup_session_orientation_hint">Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; a largura e a altura personalizadas ficam como foram introduzidas.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Ecrã inteiro</string> <string name="setup_fullscreen_on">Oculta as barras de estado e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de estado e de navegação do Android</string> + <string name="setup_dual_screen">Ecrã duplo</string> + <string name="setup_dual_screen_hint">Automático usa o segundo ecrã em consolas portáteis com ecrã secundário integrado. Ativado usa qualquer segundo ecrã. Desativado mantém tudo num só ecrã.</string> + <string name="setup_dual_screen_auto">Automático</string> + <string name="setup_dual_screen_on">Ativado</string> + <string name="setup_dual_screen_off">Desativado</string> + <string name="setup_dual_screen_menu">Menu no ecrã inferior</string> + <string name="setup_dual_screen_menu_hint">Move as secções e o menu do jogo para o segundo ecrã e a escrita é feita lá, para que o ecrã superior mantenha a vista completa. L2 e R2 mudam de secção.</string> + <string name="setup_dual_screen_controls">Controlos no ecrã inferior nos jogos</string> + <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa.</string> + <string name="dual_typing_title">A escrever para o ecrã superior</string> + <string name="dual_typing_done">Concluído</string> <string name="setup_default_home">App de página inicial predefinida</string> <string name="setup_choose_home">Escolher uma app de página inicial</string> <string name="setup_choose">Escolher</string> @@ -898,6 +1037,14 @@ <string name="gate_step1">Abra Definições → Opções de programador → Depuração sem fios e ative-a</string> <string name="gate_step2">Toque em “Sincronizar dispositivo com código de sincronização”</string> <string name="gate_step3">Escreva o código na notificação do DroidDeck</string> + <string name="pairguide_build_number">Em Acerca do telemóvel, toque 7 vezes em Número de compilação</string> + <string name="pairguide_wireless">Ative a Depuração sem fios</string> + <string name="pairguide_pair">Abra a Depuração sem fios e toque em “Sincronizar dispositivo com código de sincronização”</string> + <string name="pairguide_child_process">Ative “Desativar restrições de processos secundários”</string> + <string name="pairguide_row_child_process">Desativar restrições de processos secundários</string> + <string name="pairguide_row_build_number">Número de compilação</string> + <string name="pairguide_row_wireless">Depuração sem fios</string> + <string name="pairguide_row_pair">Sincronizar dispositivo com código de sincronização</string> <string name="gate_waiting">A aguardar a janela de sincronização…</string> <string name="gate_code_needed">Janela encontrada. Introduza o código dela na notificação.</string> <string name="gate_status">Estado</string> @@ -1021,8 +1168,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 +1175,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> @@ -1039,10 +1183,8 @@ <string name="games_never_played">Nunca jogado</string> <string name="games_runtime_busy_percent">Ambiente de execução ocupado · %1$d%%</string> <string name="games_runtime_busy">Ambiente de execução ocupado</string> - <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> @@ -1057,6 +1199,9 @@ <string name="gpu_hide_other">Ocultar controladores para outras GPUs</string> <string name="gpu_show_other">Mostrar controladores para outras GPUs</string> <string name="gpu_advanced">Avançado</string> + <string name="gpu_ubwc_title">Compatibilidade UBWC</string> + <string name="gpu_ubwc_hint">Experimente Ativado ou Desativado se o Steam ou o Android mostrarem riscas ou cintilação. Aplica-se aos dois controladores após reiniciar o DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicie o DroidDeck para aplicar.</string> <string name="gpu_set_with_display">Definido em conjunto com o controlador de ecrã: %1$s inclui ambos.</string> <string name="gpu_set_with_runtime">Definido em conjunto com o controlador de execução: %1$s inclui ambos.</string> <string name="gpu_runtime_hint">Utilizado pelos jogos e pelo ambiente de trabalho.</string> @@ -1111,7 +1256,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> @@ -1165,10 +1310,15 @@ <string name="pip_auto">Entrar automaticamente em ecrã no ecrã</string> <string name="unfolded_controls">Controlos no ecrã desdobrado</string> <string name="unfolded_controls_hint">Desdobrado, o jogo fica acima dos trackpads e das pegas traseiras do Steam Deck. Dobrado, o jogo ocupa o ecrã inteiro.</string> + <string name="unfolded_controls_with_controller">Manter com um comando</string> + <string name="unfolded_controls_with_controller_hint">Mostra também estes controlos táteis enquanto houver um comando ligado.</string> <string name="pip_suspended">Suspenso</string> <string name="pip_not_ready">O ecrã no ecrã fica disponível quando a sessão estiver pronta.</string> <string name="pip_permission">Permita o ecrã no ecrã para o DroidDeck nas definições do Android.</string> <string name="pip_unavailable">O Android não conseguiu abrir o ecrã no ecrã.</string> + <string name="game_more">Mais</string> + <string name="game_edit_art">Editar imagens</string> + <string name="stores_in_steam_label">No Steam</string> <string name="game_shortcut">Atalho</string> <string name="game_shortcut_add">Adicionar ao ecrã principal</string> <string name="game_shortcut_choose">Escolher jogo</string> @@ -1192,6 +1342,10 @@ <string name="main_wait_runtime">Aguarde que a operação do runtime termine</string> <string name="main_wait_proton_install">Aguarde que a instalação da ferramenta de compatibilidade termine</string> + <string name="load_compat_title">A preparar as ferramentas de compatibilidade</string> + <string name="load_compat_wait">A aguardar que a configuração de compatibilidade termine</string> + <string name="load_compat_hint">A sua sessão começa quando a configuração terminar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Aguarde que a instalação da app de ambiente de trabalho termine</string> <string name="main_wait_install_game">Aguarde que a instalação termine antes de iniciar um jogo</string> <string name="main_saves_close_session">Feche primeiro a sessão do Steam, para que o jogo não grave por cima da importação</string> @@ -1232,6 +1386,9 @@ <string name="main_install_anyway">Instalar mesmo assim</string> <string name="main_remove_runtime_title">Remover runtime Linux</string> <string name="main_remove_runtime_text">Isto elimina o runtime, o cliente Steam que nele existe e todos os jogos lá instalados.</string> + <string name="runtime_actions_title">Ambiente de execução Linux</string> + <string name="runtime_actions_text">Reparar reinstala os ficheiros de sistema do ambiente de execução e mantém o Steam, os seus jogos e as definições. Extras como o ambiente de trabalho voltam a ser instalados quando os utilizar. Remover elimina tudo.</string> + <string name="runtime_repair">Reparar ambiente de execução</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">Não foi possível abrir %1$s no ecrã principal</string> <string name="android_app_open_failed_on">Não foi possível abrir %1$s em %2$s</string> @@ -1364,6 +1521,12 @@ <string name="session_runtime_catalog_unreachable">Não foi possível aceder ao catálogo de runtimes. Verifique a ligação e prima Jogar novamente.</string> <string name="session_runtime_install_failed">O runtime Linux não foi instalado. Verifique o runtime em Configuração e prima Jogar novamente.</string> <string name="session_desktop_install_failed">O ambiente de trabalho não foi instalado (%1$s). Verifique a ligação e prima Ambiente de trabalho novamente.</string> + <string name="session_package_resume_failed">Não foi possível concluir uma instalação interrompida (%1$s). Verifique a ligação e o espaço e tente novamente.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">O ambiente de execução Linux está danificado: %1$d ligação de biblioteca aponta para um ficheiro em falta (%2$s), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + <item quantity="many">O ambiente de execução Linux está danificado: %1$d ligações de biblioteca apontam para ficheiros em falta (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + <item quantity="other">O ambiente de execução Linux está danificado: %1$d ligações de biblioteca apontam para ficheiros em falta (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + </plurals> <string name="session_ended_named">%1$s parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> <string name="session_ended_program">O programa parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> <string name="session_ended_desktop">O ambiente de trabalho parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> @@ -1379,6 +1542,14 @@ <string name="mode_decky_plugins_hint">Instale um ZIP de plugin para a próxima sessão do Steam.</string> <string name="mode_decky_plugin_downloading">A transferir…</string> <string name="mode_decky_plugin_install_zip">Instalar a partir de ZIP</string> + <string name="decky_zip_warning_title">Instalação de plugin de terceiros</string> + <string name="decky_zip_warning_text">A equipa do Decky Loader não reviu este plugin. Pode conter malware, como software para roubar a sua conta Steam ou danificar o seu dispositivo. Ao instalar este plugin, aceita que assume todos os riscos para o seu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Aguarde %1$d segundo</item> + <item quantity="many">Aguarde %1$d segundos</item> + <item quantity="other">Aguarde %1$d segundos</item> + </plurals> <string name="store_cat_games">Jogos</string> <string name="store_cat_audio_video">Áudio e vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1407,6 +1578,10 @@ <string name="theme_icon_blue_detail">Fundo preto, texto branco e o azul para tudo o que está selecionado, focado ou premido.</string> <string name="theme_electric">Azul-marinho elétrico</string> <string name="theme_electric_detail">O azul mais vivo, em superfícies que tendem para o azul-marinho em vez do cinzento.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Cores que percorrem o arco-íris. Respeita as definições de animação do Android.</string> + <string name="theme_rgb_speed">Velocidade</string> + <string name="theme_rgb_speed_hint">Com que rapidez as cores mudam.</string> <string name="theme_gradient">Gradiente</string> <string name="theme_gradient_detail">As suas próprias cores primária e secundária, combinadas nos botões e destaques.</string> <string name="theme_gradient_primary">Primária</string> @@ -1533,7 +1708,16 @@ <string name="fm_conflict_skip">Ignorar</string> <string name="fm_select_this_folder">Selecionar esta pasta</string> <string name="fm_back">Voltar</string> + <string name="fm_exit">Sair</string> + <string name="fm_return_to_start">Voltar à pasta inicial</string> + <string name="fm_start_unavailable">A pasta inicial já não está disponível</string> + <string name="fm_cancel_operation_title">Cancelar operação?</string> + <string name="fm_cancel_operation_confirmation">A operação será cancelada. Tem a certeza?</string> + <string name="fm_accept">Aceitar</string> + <string name="fm_decline">Recusar</string> <string name="fm_drive_not_readable">%1$s está montado, mas não é possível lê-lo de momento</string> + <string name="fm_drive_access_title">Permitir acesso a %1$s</string> + <string name="fm_drive_access_text">O Android deixa o DroidDeck ver esta unidade, mas não lê-la. Ative o Acesso a todos os ficheiros para o DroidDeck e volte.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de grelha</string> <string name="fm_search">Pesquisar</string> @@ -1606,6 +1790,93 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pegas + trackpads do Deck</string> + <string name="second_mode_dashboard">Painel</string> + <string name="bottom_dashboard_empty">Ainda não há nada para mostrar aqui.</string> + <string name="bottom_page_downloads">Transferências</string> + <string name="bottom_downloads_none">Nenhuma transferência em curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">A transferir a cache de shaders</string> + <string name="bottom_downloads_paused">Em pausa</string> + <string name="bottom_downloads_queued">A aguardar início</string> + <string name="bottom_page_notifications">Notificações</string> + <string name="bottom_notifications_listener">Ecrã inferior do DroidDeck</string> + <string name="bottom_notifications_why">Mostre aqui mensagens e outras notificações enquanto joga. Ficam apenas neste ecrã e não são guardadas. O Android pergunta uma vez: a página de acesso às notificações abre neste ecrã; ative lá o DroidDeck e esta página volta automaticamente.</string> + <string name="bottom_notifications_allow">Permitir acesso às notificações</string> + <string name="bottom_notifications_none">Sem notificações.</string> + <string name="bottom_notifications_count">%1$d notificações</string> + <string name="bottom_notifications_clear">Limpar</string> + <string name="bottom_page_screenshots">Capturas de ecrã</string> + <string name="stats_fps_needs_hud">O FPS requer o HUD ativado</string> + <string name="stats_speed">Velocidade</string> + <string name="stats_pedals">Pedais</string> + <string name="stats_gforce">Força G</string> + <string name="stats_timing">Tempos</string> + <string name="stats_best_lap">Melhor volta</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Acelerador e travão, últimos 10 s</string> + <string name="stats_speed_chart">Velocidade, %1$s</string> + <string name="stats_gear">Mudança</string> + <string name="stats_speed_units">Unidade de velocidade</string> + <string name="stats_speed_units_auto">Automático (%1$s)</string> + <string name="stats_steam_client_arm">Cliente Steam ARM</string> + <string name="stats_steam_client_x86">Cliente Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Travão</string> + <string name="stats_lights">Painel</string> + <string name="stats_lamp_shift">Engrenar mudança</string> + <string name="stats_lamp_handbrake">Travão de mão</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Óleo %1$s °C</string> + <string name="stats_power">Distribuidor de energia</string> + <string name="stats_fuel_t">Combustível, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="stats_tap_hint">Toque na faixa superior ou no painel para alterar o estilo.</string> + <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos aqui listados, incluindo os encontrados mais tarde. Os jogos que desativar permanecem desativados.</string> + <string name="bottom_telemetry_send_note">Isto altera a definição de saída de dados do próprio jogo. Aplica-se da próxima vez que o jogo iniciar; desativar repõe a definição anterior.</string> + <string name="bottom_telemetry_send_close">Feche %1$s para alterar isto.</string> + <string name="bottom_telemetry_send_failed">Não foi possível alterar as definições de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ative %2$s nas definições do jogo com o IP 127.0.0.1 e a porta %3$d.</string> + <string name="bottom_shots_where">Guardadas em Pictures/DroidDeck. As capturas de ecrã do Steam também aparecem aqui.</string> + <string name="bottom_shots_take">Fazer captura de ecrã</string> + <string name="bottom_shots_saved">Captura de ecrã guardada.</string> + <string name="bottom_shots_failed">Não foi possível fazer a captura de ecrã.</string> + <string name="bottom_shots_none">Ainda não há capturas de ecrã.</string> + <string name="bottom_page_chat">Chat e voz</string> + <string name="bottom_chat_why">Leia e responda ao chat do Steam aqui enquanto o jogo continua a correr no ecrã principal. Utiliza a conta com que o Steam tem sessão iniciada.</string> + <string name="bottom_chat_not_signed_in">O Steam ainda não tem uma sessão web para partilhar, por isso inicie sessão aqui uma vez.</string> + <string name="bottom_chat_stopped">O Android fechou a página do chat enquanto o DroidDeck estava em segundo plano. Volta a abrir quando regressar ao DroidDeck.</string> + <string name="bottom_chat_open">Abrir o Steam Chat</string> + <string name="bottom_chat_close">Fechar chat</string> + <string name="bottom_chat_mic_on">Microfone ligado</string> + <string name="bottom_chat_mic_off">Microfone desligado</string> + <string name="bottom_chat_mic_unavailable">O microfone está desligado neste jogo. Para falar, ative Microfone nas definições do Steam do DroidDeck (Áudio) e volte a iniciar o jogo.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Estatísticas no jogo</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Volta</string> + <string name="bottom_telemetry_position">Posição</string> + <string name="bottom_telemetry_this_lap">Volta atual</string> + <string name="bottom_telemetry_last_lap">Última volta</string> + <string name="bottom_telemetry_fuel">Combustível</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Ative a saída de dados de um jogo de corridas (muitas vezes chamada telemetria ou UDP) para ver aqui um painel em direto. Os dados ficam neste dispositivo.</string> + <string name="bottom_telemetry_unknown_format">A porta %1$d está a receber dados (%2$d pacotes de %3$d bytes), mas num formato que esta página ainda não consegue ler.</string> + <string name="bottom_telemetry_port_busy">Outro programa já utiliza a porta %1$s, por isso esse jogo não pode aparecer aqui.</string> <string name="rtinst_removing">A remover o runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1637,6 +1908,7 @@ <string name="flatpakmgr_not_ready">Configure primeiro o Flatpak</string> <string name="flatpakmgr_starting">A iniciar</string> <string name="flatpakmgr_exit_status">O Flatpak terminou com o código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s foi compilado para %2$s, que o DroidDeck não consegue executar. Aqui as apps Flatpak precisam de uma versão para ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">A instalar %1$s</string> <string name="flatpakmgr_updating">A atualizar %1$s</string> <string name="flatpakmgr_removing">A remover %1$s</string> @@ -1730,6 +2002,7 @@ <string name="adbpair_applying">A aplicar a definição…</string> <string name="adbpair_command_failed">Falha no comando de depuração sem fios</string> <string name="adbpair_channel_name">Configuração da depuração sem fios</string> + <string name="adbpair_progress_channel_name">Progresso da configuração da Depuração sem fios</string> <string name="adbpair_channel_description">Pede o código de sincronização da depuração sem fios enquanto as Definições estão abertas</string> <string name="adbpair_title_pair">Sincronizar a depuração sem fios</string> <string name="adbpair_waiting_text">Ative a depuração sem fios e toque em «Sincronizar dispositivo com código de sincronização».</string> @@ -1838,6 +2111,7 @@ <string name="gpuinfo_not_adreno">Não é uma GPU Adreno</string> <string name="gpuinfo_supported">Suportada</string> <string name="gpuinfo_experimental">Experimental: os controladores são versões de teste</string> + <string name="gpuinfo_a850_experimental">Suporte experimental para Adreno 850: requer controladores de ecrã e de jogos experimentais compatíveis; não verificado neste dispositivo</string> <string name="gpuinfo_below_tested">Abaixo do hardware testado (Adreno 725 e mais recentes): pode não funcionar</string> <string name="gpuinfo_unsupported">Não suportada: o DroidDeck precisa de uma GPU Adreno (Snapdragon)</string> @@ -1931,10 +2205,10 @@ <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> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalhes do dispositivo</string> <string name="device_info_hide">Ocultar detalhes do dispositivo</string> @@ -1949,7 +2223,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> @@ -1963,11 +2236,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> @@ -1985,9 +2256,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> @@ -2006,12 +2285,43 @@ <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> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas da barra lateral</string> + <string name="setup_rail_labels_hint">Mostra os nomes por baixo dos ícones da barra lateral. Desative para uma barra lateral mais estreita.</string> + <string name="library_display">Apresentação</string> + <string name="library_display_larger">Cartões maiores</string> + <string name="library_display_smaller">Cartões mais pequenos</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamanho</string> <string name="stores_sort_last_played">Jogados recentemente</string> <string name="stores_sort_recently_installed">Instalados recentemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2138,6 +2448,9 @@ <string name="stores_download_manager">Gestor de transferências</string> <string name="stores_parallel">Transferências em simultâneo</string> <string name="stores_install_where">Instalar em</string> + <string name="stores_install_language">Idioma do jogo</string> + <string name="stores_install_language_hint">O GOG e a Epic instalam este idioma. Sistema segue o idioma da app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s livres</string> @@ -2157,6 +2470,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> @@ -2172,6 +2486,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar em</string> <string name="edit_launch_options">Opções de arranque</string> + <string name="edit_launch_options_steam_hint">Partilhadas com as Propriedades do Steam: uma alteração num dos locais aparece em ambos.</string> + <string name="edit_launch_options_not_saved">Não foi possível guardar as opções de arranque no Steam. Tenta novamente.</string> + <string name="edit_launch_options_desktop">O Steam pode estar aberto na sessão do ambiente de trabalho. Altera as opções de arranque nas Propriedades dele, ou fecha primeiro a sessão.</string> <string name="edit_artwork">Imagens</string> <string name="edit_other_exe">Outro exe…</string> <string name="edit_remove">Remover</string> @@ -2301,6 +2618,7 @@ <string name="setup_download_source_custom">Prefixo personalizado</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefixo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para o ambiente de trabalho Linux, abertas a partir de Ambiente de trabalho.</string> @@ -2443,6 +2761,22 @@ <string name="glasses_tracking_flat_hint">O modo Automático mantém este jogo 2D fixo na vista. Escolha Ecrã virtual na secção Ecrã para utilizar o seguimento da cabeça.</string> <string name="glasses_tracking_sbs_hint">O seguimento da cabeça aplica-se a um ecrã virtual ou a um jogo do SteamVR em execução.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Comandos</string> + <string name="vr_controllers_group">Comandos do SteamVR</string> + <string name="vr_controllers_emulate">Comando em RV</string> + <string name="vr_controllers_emulate_hint">As duas mãos de RV que o seu comando representa. As alterações aplicam-se de imediato, mesmo com o SteamVR em execução. Os Joy-Con e as mãos rastreadas continuam a assumir o respetivo lado.</string> + <string name="vr_controllers_off">Comando normal</string> + <string name="vr_controllers_index">Comandos Valve Index</string> + <string name="vr_controllers_touch">Comandos Meta Quest 3</string> + <string name="vr_controllers_vive">Comandos HTC Vive</string> + <string name="vr_controllers_sticks">Os manípulos começam por</string> + <string name="vr_controllers_sticks_hint">Prima os dois manípulos em simultâneo durante a RV para alternar.</string> + <string name="vr_controllers_sticks_game">Mover-se no jogo</string> + <string name="vr_controllers_sticks_hands">Mover as mãos</string> + <string name="vr_controllers_buttons">Botões</string> + <string name="vr_controllers_buttons_stick">Os gatilhos são gatilhos, os botões superiores agarram, A/B e X/Y são os botões frontais de cada mão, premir os manípulos clica nos thumbsticks e Guide abre o menu do SteamVR. Direcional para cima e para baixo aproxima ou afasta as mãos.</string> + <string name="vr_controllers_buttons_vive">Os manípulos são trackpads; A/X ou premir um manípulo carrega neles. Os gatilhos são gatilhos, os botões superiores agarram, Start e Select são menu e Guide abre o menu do SteamVR.</string> + <string name="vr_controllers_buttons_off">Sem mãos de RV. Os jogos que suportam comando, e o menu do SteamVR, recebem o seu comando como habitualmente.</string> <string name="glasses_brightness">Brilho</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Escurecimento</string> @@ -2500,6 +2834,12 @@ <string name="hand_camera_placement">Posição da câmara</string> <string name="hand_camera_placement_hint">Verifique se a câmara te consegue ver antes de jogar.</string> <string name="hand_camera_check">Verificar</string> + <string name="tracking_pack_title">Transferência do rastreio de mãos</string> + <string name="tracking_pack_hint">O rastreio de mãos precisa de uma transferência única de %1$s.</string> + <string name="tracking_pack_download">Transferir</string> + <string name="tracking_pack_retry">Tentar novamente</string> + <string name="tracking_pack_downloading">A transferir o rastreio de mãos… %1$d%%</string> + <string name="tracking_pack_failed">Não foi possível transferir o rastreio de mãos. Verifique a ligação e tente novamente.</string> <string name="hand_camera_check_title">Posição da câmara</string> <string name="hand_camera_how_rear">Coloque o dispositivo em pé a 1,5-2 metros de distância, à altura do peito, com a câmara traseira voltada para ti. Depois entre no campo de visão com as mãos estendidas.</string> <string name="hand_camera_how_front">Coloque o dispositivo em pé a 1,5-2 metros de distância, à altura do peito, com o ecrã voltado para ti. Depois entre no campo de visão com as mãos estendidas.</string> @@ -2582,6 +2922,21 @@ <string name="storage_safe_hint">Ambientes de execução sem uso, resíduos, registos antigos</string> <string name="storage_clean_up">Limpar…</string> <string name="storage_session_running">Termine a sessão para limpar ou remover algo. Os tamanhos continuam visíveis.</string> + <string name="storage_default_group">Local de instalação</string> + <string name="storage_default_title">Armazenamento predefinido</string> + <string name="storage_default_hint">As novas instalações das lojas vão para o local selecionado. Os jogos existentes ficam onde estão. As bibliotecas do Steam mantêm a sua própria definição.</string> + <string name="storage_default_ask">Perguntar sempre</string> + <string name="storage_default_ask_detail">Escolha um destino para cada instalação</string> + <string name="storage_default_internal">Armazenamento interno</string> + <string name="storage_default_external">Armazenamento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s livres</string> + <string name="storage_default_external_missing">Não ligado</string> + <string name="storage_default_folder">Pasta · %1$s</string> + <string name="storage_default_folder_free">%1$s livres</string> + <string name="storage_default_folder_missing">Não ligada</string> + <string name="storage_default_choose_folder">Escolher pasta…</string> + <string name="storage_default_choose_folder_detail">Utilize qualquer pasta num cartão SD ou unidade USB</string> + <string name="storage_default_note">Os jogos vão para uma pasta Games dentro do local selecionado. Os jogos existentes não são movidos.</string> <string name="storage_where">Para onde vai</string> <string name="storage_games">Jogos do Steam</string> <string name="storage_game_data">Dados dos jogos</string> @@ -2710,6 +3065,9 @@ <string name="storage_data_installed">Jogos instalados</string> <string name="storage_data_parts">Prefixo %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Apagar shaders</string> + <string name="storage_reset_prefix">Repor prefixo</string> + <string name="storage_reset_prefix_title">Repor o prefixo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Elimina o respetivo prefixo do Wine (%1$s) em %2$s e recria-o no próximo arranque. Os guardados, as definições e os redistribuíveis instalados nele perdem-se; os guardados do Steam Cloud ficam na sua conta.</string> <string name="storage_data_leftovers">Jogos desinstalados</string> <string name="storage_steam_app">Aplicação Steam %1$d</string> <string name="storage_leftover_unsure_detail">O prefixo dele ainda tem ficheiros, que podem incluir jogos guardados locais</string> @@ -3012,5 +3370,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar com o Syncthing</string> + <string name="sync_enable_hint">Baseada no Syncthing-Fork, esta é uma implementação do Syncthing que lhe permite sincronizar ficheiros do sistema de ficheiros interno do DroidDeck com outras instâncias do Syncthing. Aplica-se apenas aos ficheiros que guarda no sistema de ficheiros interno do DroidDeck.</string> + <string name="sync_missing">Esta compilação não inclui o Syncthing.</string> + <string name="sync_starting">A iniciar o Syncthing</string> + <string name="sync_status_starting">A iniciar</string> + <string name="sync_status_up_to_date">Atualizado</string> + <string name="sync_status_syncing">A sincronizar</string> + <string name="sync_status_paused">Em pausa</string> + <string name="sync_status_pausing">A pausar</string> + <string name="sync_status_resuming">A retomar</string> + <string name="sync_status_attention">Requer atenção</string> + <string name="sync_status_failed">O Syncthing parou</string> + <string name="sync_failed_retry">Tentar novamente</string> + <string name="sync_paused_wifi">Em pausa até haver Wi-Fi</string> + <string name="sync_paused_game">Em pausa durante o jogo</string> + <string name="sync_summary">%1$d pastas · %2$d de %3$d dispositivos ligados</string> + <string name="sync_left">Faltam %1$s</string> + <string name="sync_open_web_ui">Abrir interface web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Retomar</string> + <string name="sync_running">Em execução</string> + <string name="sync_running_hint">Desative para parar o Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID do dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avançado</string> + <string name="sync_advanced_hint">Portas, quando executar, repor</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">À sua espera</string> + <string name="sync_pending_device">%1$s quer ligar-se</string> + <string name="sync_pending_folder">%1$s quer partilhar “%2$s”</string> + <string name="sync_pending_folder_hint">Aceite para escolher onde é guardada no DroidDeck.</string> + <string name="sync_review">Rever na interface web</string> + <string name="sync_folders">Pastas</string> + <string name="sync_no_folders">Ainda não há pastas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Atualizada</string> + <string name="sync_folder_syncing">A sincronizar %1$d%%</string> + <string name="sync_folder_scanning">A analisar</string> + <string name="sync_folder_paused">Em pausa</string> + <string name="sync_folder_out_of_sync">Dessincronizada</string> + <string name="sync_folder_errors">Não foi possível sincronizar %1$d ficheiros</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta pasta está fora do armazenamento do DroidDeck, por isso o DroidDeck colocou-a em pausa. Para sincronizar pastas fora do DroidDeck, utilize a app Syncthing-Fork.</string> + <string name="sync_remove_folder">Remover do Syncthing</string> + <string name="sync_remove_folder_hint">Removê-la não elimina nenhum ficheiro.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Ainda não há dispositivos.</string> + <string name="sync_connected">Ligado</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Visto pela última vez: %1$s</string> + <string name="sync_device_id_title">ID deste dispositivo</string> + <string name="sync_device_id_hint">No outro dispositivo, adicione um dispositivo no Syncthing e leia este código ou cole o ID. Depois, aceite-o aqui na interface web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Partilhar</string> + <string name="sync_done">Concluído</string> + <string name="sync_off_title">Desativar o Syncthing?</string> + <string name="sync_off_body">O Syncthing para agora e continua parado até voltar a ser ativado. Os ficheiros sincronizados ficam onde estão.</string> + <string name="sync_off_forget">Eliminar também a configuração do Syncthing</string> + <string name="sync_off_forget_hint">Remove o ID deste dispositivo, as pastas e os dispositivos. Ao voltar a ativá-lo, começa do zero.</string> + <string name="sync_turn_off">Desativar</string> + <string name="sync_ports">Portas</string> + <string name="sync_port_sync">Sincronização</string> + <string name="sync_port_discovery">Descoberta local</string> + <string name="sync_repick">Escolher novas portas</string> + <string name="sync_repick_hint">Verificadas novamente em cada início.</string> + <string name="sync_repick_button">Escolher novamente</string> + <string name="sync_reset_group">Repor</string> + <string name="sync_api_key">Chave da API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Repor o Syncthing</string> + <string name="sync_reset_hint">Novo ID do dispositivo; pastas e dispositivos removidos. Os ficheiros no armazenamento do DroidDeck são mantidos.</string> + <string name="sync_reset_button">Repor</string> + <string name="sync_reset_confirm_title">Repor o Syncthing?</string> + <string name="sync_running_group">Execução</string> + <string name="sync_run">Executar</string> + <string name="sync_run_open">Enquanto o DroidDeck estiver aberto</string> + <string name="sync_run_background">Em segundo plano</string> + <string name="sync_wifi_only">Apenas Wi-Fi</string> + <string name="sync_pause_games">Pausar durante os jogos</string> + <string name="sync_logs">Registos</string> + <string name="sync_logs_hint">Saída do Syncthing nesta sessão</string> + <string name="sync_logs_share">Partilhar</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configure primeiro o ambiente de execução Linux.</string> + <string name="sync_accept">Aceitar</string> + <string name="sync_accept_title">Guardar “%1$s” em</string> + <string name="sync_add_folder">Adicionar pasta</string> + <string name="sync_add_folder_hint">Sincronizar uma pasta no armazenamento do DroidDeck</string> + <string name="sync_choose">Escolher</string> + <string name="sync_add">Adicionar</string> + <string name="sync_add_failed">Não foi possível adicionar a pasta.</string> + <string name="sync_share_with">Partilhar com</string> + <string name="sync_share_none">Ainda não há dispositivos. Pode partilhar esta pasta mais tarde a partir da interface web.</string> + <string name="sync_use_folder">Utilizar esta pasta</string> + <string name="sync_new_folder">Nova pasta</string> + <string name="sync_location_home">Pasta pessoal do contentor</string> + <string name="sync_location_sync">Pasta Sync</string> + <string name="sync_location_shared">Armazenamento partilhado do DroidDeck</string> + <string name="sync_location_card">DroidDeck em %1$s</string> + <string name="sync_location_app">Dados da app DroidDeck</string> + <string name="sync_web_path_locked">As novas pastas são guardadas na pasta Sync do DroidDeck. Para sincronizar outra pasta do DroidDeck, utilize Adicionar pasta no separador Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recarregar</string> + <string name="sync_not_running">O Syncthing não está em execução.</string> + <string name="session_end_steam_sigill">O Steam parou com uma instrução ilegal (SIGILL). Pode ser um problema de compatibilidade de instruções da CPU ou uma falha do cliente. Partilhe os registos com os detalhes do seu dispositivo.</string> + <string name="session_end_steam_try_x64">Pode experimentar Definições do Steam → Cliente Steam → x86-64 (experimental). Requer uma transferência adicional e pode ser mais lento.</string> + <string name="session_end_vulkan_device">O controlador gráfico Linux não encontrou um dispositivo Vulkan utilizável. Verifique se o controlador de GPU Linux selecionado suporta esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sessão não pode iniciar porque esta GPU não tem nenhum controlador Vulkan Linux compatível na configuração atual. Os controladores Adreno Turnip não conseguem ativar o suporte para GPUs MediaTek/Mali.</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_resources_browser">Abre no seu navegador</string> + <string name="game_resource_guides">Guias</string> + <string name="game_resource_protondb_detail">Relatórios de compatibilidade Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para jogos com guardados na sua conta Steam</string> + <string name="game_resource_search">Pesquisa na Web</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="library_filter">Filtro</string> + <string name="library_filter_installed">Apenas instalados</string> + <string name="library_filter_all_owned">Todos os jogos que possui</string> + <string name="library_no_installed_matches">Nenhum jogo instalado corresponde a estes filtros.</string> + <string name="library_browse_owned">Explorar os jogos que possui</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="stores_itch_updates_found">Atualizações disponíveis: %1$d</string> + <string name="stores_itch_update_replaced">O programador substituiu esta versão por %1$s. Atualizar para ela?</string> + <string name="xbox_filter_cloud">Nuvem</string> + <string name="stores_xbox_cloud_settings">Definições da nuvem</string> + <string name="integration_title">Integração com o Steam</string> + <string name="integration_count">%1$d de %2$d ativadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Localização</string> + <string name="integration_app_info">Informações da aplicação</string> + <string name="integration_wifi">Nomes de Wi-Fi</string> + <string name="integration_brightness">Brilho</string> + <string name="integration_home">DroidDeck como página inicial</string> + <string name="integration_shortcuts">Atalhos do botão Página inicial</string> + <string name="integration_wifi_hint">Mostra redes no Steam · requer acesso à localização, nunca monitorizada</string> + <string name="integration_wifi_on">As redes aparecem no Steam</string> + <string name="integration_wifi_location_off">A localização está desativada</string> + <string name="integration_wifi_denied">Localização recusada · permita-a em Informações da aplicação</string> + <string name="integration_brightness_hint">O controlo de deslize do Steam ajusta o brilho do ecrã</string> + <string name="integration_home_hint">Página inicial abre o menu do Steam numa sessão</string> + <string name="integration_shortcuts_hint">Mantenha Página inicial premido para combinações do botão Guide do Steam</string> + <string name="integration_shortcuts_needs_home">Requer o DroidDeck como página inicial</string> + <string name="integration_shortcuts_maybe_restricted">Desativado a cinzento no Android? Informações da aplicação → ⋮ → Permitir definições restritas</string> + <string name="integration_shortcuts_restricted">Bloqueado pelo Android · Informações da aplicação → ⋮ → Permitir definições restritas</string> + <string name="integration_shortcuts_service">Botão Página inicial do DroidDeck</string> + <string name="integration_shortcuts_service_description">Envia os toques no botão Página inicial para o Guide do Steam enquanto uma sessão do Steam está em foco e o DroidDeck é a app de página inicial predefinida. Não lê o conteúdo do ecrã.</string> + <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com o Steam</string> + <string name="apps_search_hint">Pesquisar aplicações</string> + <string name="apps_no_match">Nenhuma aplicação corresponde a “%1$s”.</string> + <string name="apps_add_widget">Adicionar widget</string> + <string name="apps_widgets_loading">A carregar widgets…</string> + <string name="apps_widgets_none">Nenhuma aplicação neste dispositivo oferece widgets.</string> + <string name="apps_widget_wider">Mais largo</string> + <string name="apps_widget_narrower">Mais estreito</string> + <string name="apps_widget_taller">Mais alto</string> + <string name="apps_widget_shorter">Mais baixo</string> + <string name="apps_widget_move_earlier">Mover para antes</string> + <string name="apps_widget_move_later">Mover para depois</string> + <string name="apps_widget_configure">Definições do widget</string> + <string name="apps_widget_remove">Remover widget</string> + <string name="apps_add_to_folder">Adicionar a pasta</string> + <string name="apps_new_folder">Nova pasta</string> + <string name="apps_remove_from_folder">Remover da pasta</string> + <string name="apps_app_info">Informações da aplicação</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Mudar o nome</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Pasta</string> + <string name="apps_folder_name">Nome da pasta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas as aplicações</string> + <string name="apps_filter_games">Jogos</string> + <string name="apps_filter_downloaded">Transferidas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar nas aplicações</string> + <string name="apps_shortcut_remove">Remover atalho</string> + <string name="apps_pin_title">Adicionar às Aplicações</string> + <string name="apps_pin_add">Adicionar</string> + <string name="apps_hidden_none">Nenhuma aplicação oculta.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Instaladas recentemente</string> + <string name="apps_sort_updated">Atualizadas recentemente</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicação</item> + <item quantity="many">%d aplicações</item> + <item quantity="other">%d aplicações</item> + </plurals> + <string name="desktop_restore_title">A restaurar o seu software</string> + <string name="desktop_restore_body">A reinstalar as apps que adicionou após uma atualização do DroidDeck.</string> + <string name="desktop_restore_done_title">Software restaurado</string> + <string name="desktop_restore_done_body">As apps que adicionou estão novamente instaladas.</string> + <string name="desktop_restore_failed_title">Não foi possível restaurar algum software</string> + <string name="desktop_restore_failed_body">Consulte ~/.cache/droiddeck/apt-restore.log e depois experimente sudo apt install no Konsole.</string> + <string name="gog_full_files">As otimizações nativas não estão disponíveis. A transferência inclui ficheiros de substituição completos.</string> + <string name="gog_recover">Verificar o resultado do patch</string> + <string name="slow_usb_title">Ligação USB lenta</string> + <string name="slow_usb_cable">%1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s), por isso os jogos vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, experimente virar a ficha USB-C ou use uma unidade mais rápida.</string> + <string name="slow_usb_port">%1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste dispositivo não é mais rápida, por isso os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido.</string> + <string name="slow_usb_never">Não voltar a mostrar</string> + <string name="slow_usb_dismiss">Ignorar</string> + <string name="steam_import_title">Reiniciar o Steam para adicionar os seus jogos?</string> + <string name="steam_import_body">O Steam pode mostrar estes jogos que tem como instalados: %1$s. Tem de reiniciar para os mostrar. Reinicie agora ou serão adicionados da próxima vez que o Steam iniciar.</string> + <string name="steam_import_names_more">%1$s e mais %2$d</string> + <string name="steam_import_now">Reiniciar agora</string> + <string name="steam_import_later">Mais tarde</string> + <string name="gog_maintenance">Gerir instalação do GOG</string> + <string name="gog_check">Procurar atualizações</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Patches offline</string> + <string name="gog_refresh">Transferir o instalador offline completo</string> + <string name="gog_update">Atualizar para %1$s</string> + <string name="gog_resume">Retomar a manutenção do GOG</string> + <string name="gog_open_patch">Abrir o instalador do patch</string> + <string name="gog_patch_in_session">Conclua ou cancele o instalador do patch na sessão Linux.</string> + <string name="gog_patch_requirements">Escolha um patch para a versão e o idioma instalados. As versões de origem suportadas podem não estar listadas.</string> + <string name="gog_no_patches">O GOG não tem patches autónomos para Windows deste jogo.</string> + <string name="gog_managed_files">Os ficheiros do jogo modificados podem ser substituídos.</string> + <string name="gog_patch_installer_note">O instalador abre na sua sessão Linux.</string> + <string name="gog_download_label">Transferência</string> + <string name="gog_space_label">Espaço adicional</string> + <string name="gog_space_estimate_label">Espaço estimado</string> + <string name="gog_repair_action">Reparar ficheiros</string> + <string name="gog_refresh_action">Renovar instalação</string> + <string name="gog_select_patch">Selecionar</string> + <string name="setup_all_files">Acesso a todos os ficheiros</string> + <string name="setup_local_network">Rede local</string> + <string name="libraries_title">Mais bibliotecas Steam</string> + <string name="libraries_hint">Pastas onde o Steam pode instalar e executar jogos, cada uma com o seu nome. Remover uma mantém os jogos no disco.</string> + <string name="libraries_add">Adicionar biblioteca</string> + <string name="libraries_rename_title">Nome da biblioteca</string> + <string name="libraries_pick">Escolha uma pasta para a biblioteca</string> + <string name="libraries_full">No máximo %1$d bibliotecas adicionais</string> + <string name="libraries_overlap">Esta pasta já é uma biblioteca ou está dentro de uma</string> + <string name="libraries_missing">%1$s · indisponível</string> + <string name="libraries_applies_next">Aplica-se a partir da próxima sessão do Steam</string> + <string name="bottom_desktop_start">Iniciar o ambiente de trabalho</string> + <string name="bottom_desktop_mode_touch">Toque direto</string> + <string name="bottom_desktop_trackpad">Trackpad. Toque para usar o toque direto</string> + <string name="bottom_desktop_direct_touch">Toque direto. Toque para usar o trackpad</string> + <string name="bottom_desktop_starting">A iniciar o ambiente de trabalho KDE…</string> + <string name="bottom_desktop_ended">O ambiente de trabalho foi fechado.</string> + <string name="bottom_desktop_failed">Não foi possível iniciar o ambiente de trabalho. Os registos estão na pasta bottom-desktop desta sessão.</string> + <string name="bottom_desktop_off">O ambiente de trabalho está fechado.</string> + <string name="libraries_rename">Mudar o nome</string> + <string name="second_mode_desktop">Ambiente de trabalho</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Ambiente de trabalho · %1$s</string> </resources> diff --git a/app/src/main/res/values-pt/gestures.xml b/app/src/main/res/values-pt/gestures.xml index c345617df..42225990f 100644 --- a/app/src/main/res/values-pt/gestures.xml +++ b/app/src/main/res/values-pt/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestos</string> <string name="gesture_settings">Configurações de gestos de toque</string> - <string name="gesture_settings_hint">Personalize os gestos de mouse e teclado. Selecione Gestos como modo de toque para usá-los.</string> <string name="gesture_tap">Toque</string> <string name="gesture_drag">Arrastar com um dedo</string> <string name="gesture_long_press">Toque longo</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Manter pressionado com três dedos</string> <string name="gesture_pinch">Pinçar para ampliar</string> <string name="gesture_hold_button">Manter o botão pressionado</string> + <string name="gesture_hold_left">Manter o botão esquerdo pressionado</string> + <string name="gesture_hold_right">Manter o botão direito pressionado</string> <string name="gesture_click_once">Clicar uma vez</string> <string name="gesture_hold_delay">Tempo para manter pressionado</string> <string name="gesture_double_delay">Intervalo de toque duplo</string> diff --git a/app/src/main/res/values-pt/shortcuts.xml b/app/src/main/res/values-pt/shortcuts.xml new file mode 100644 index 000000000..cd9abed5c --- /dev/null +++ b/app/src/main/res/values-pt/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Atalhos de botões físicos</string> + <string name="shortcuts_dd_menu">Menu do DroidDeck</string> + <string name="shortcuts_capture">Atribuir: %1$s</string> + <string name="shortcuts_press">Pressione e solte um botão. A atribuição é salva automaticamente.</string> + <string name="shortcuts_release">Solte o botão para continuar.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Este botão já está atribuído a: %1$s</string> + <string name="shortcuts_save">Reatribuir</string> + <string name="shortcuts_retry">Testar outro botão</string> + <string name="shortcuts_limitations">O botão Início e alguns botões extras podem não estar disponíveis.</string> +</resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 45bd06550..de659f2a0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opções do VKD3D para D3D12. nodxr desativa o ray tracing; use só em um jogo que precise disso.</string> <string name="game_env_proton_log">Defina como 1 para gerar um log de diagnóstico do Proton. O log pode reduzir o desempenho e ocupar armazenamento.</string> <string name="game_env_wined3d">Defina como 1 para usar o WineD3D (baseado em OpenGL) em vez do DXVK ao testar a compatibilidade com D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 e jogos executados com WineD3D. O Vulkan evita o caminho OpenGL sobre Zink e é muito mais rápido para jogos antigos de DirectDraw e Direct3D 7 em Adreno.</string> + <string name="game_env_dxvk_d3d8">Defina como 1 para rodar o Direct3D 8 pelo DXVK em vez do WineD3D. Mais rápido no teste de Direct3D 8 do AIO Graphics Test em Adreno.</string> <string name="game_env_no_ntsync">Defina como 1 para manter este jogo fora do ntsync (droiddeck-ntsync ou um driver do kernel); ele usa o droiddeck-esync onde houver um pacote, senão o droiddeck-fsync.</string> <string name="game_env_no_esync">Defina como 1 para desativar o droiddeck-esync neste jogo; ele passa a usar o droiddeck-fsync, ou o droiddeck-ntsync onde o fsync também estiver desativado.</string> <string name="game_env_no_fsync">Defina como 1 para manter este jogo fora do droiddeck-fsync; ele usa o droiddeck-esync onde houver um pacote, senão o droiddeck-ntsync.</string> <string name="game_env_fsync_first">Defina como 1 para rodar este jogo no droiddeck-fsync, ou como 0 para priorizar o droiddeck-esync onde houver um pacote compatível com o Proton dele.</string> <string name="game_env_xalia">Defina como 0 para desativar o assistente de navegação por controle do Proton neste jogo.</string> + <string name="game_env_anticheat_offline">Ativado por padrão. Inicia um jogo com Easy Anti-Cheat sem o anti-cheat quando o jogo permite jogar offline. Desative para iniciar pelo Easy Anti-Cheat normalmente. Modos online que exigem o Easy Anti-Cheat continuam indisponíveis.</string> <string name="game_env_hud">Overlay do DXVK para D3D9–11. fps mostra a taxa de quadros; sem definir, fica oculto.</string> <string name="game_env_dxvk_config">Configurações do DXVK separadas por ponto e vírgula. Versões recentes usam dxvk.maxFrameRate para limitar os quadros; para jogar normalmente, prefira o limitador de quadros da sessão.</string> + <string name="game_env_cores">Núcleos da CPU para este jogo, como 0-4 ou 0,2,4, no lugar dos núcleos de jogo da sessão. Menos núcleos esquentam menos.</string> <string name="game_env_vkd3d_limit">Limite de taxa de quadros do D3D12. 0 desativa o limite.</string> <string name="game_env_glthread">Threading do OpenGL no Mesa. true pode ajudar jogos OpenGL limitados pela CPU; teste jogo a jogo.</string> <string name="sync_backend_title">Sincronização do Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">O FEX roda programas Linux x86 neste dispositivo ARM64. No Automático, ele é usado quando o programa é feito para x86.</string> <string name="app_fex_x86">%1$s pelo FEX</string> <string name="app_fex_not_ready">Este programa é feito para PCs %1$s e roda pelo FEX, que ainda não está configurado. Abra a Steam uma vez com a sessão iniciada: o DroidDeck faz com que ela baixe o FEX e o Steam Linux Runtime necessários, e então isto abre.</string> + <string name="session_proot_missing">Não foi possível baixar o proot do DroidDeck. Verifique a conexão e tente novamente. A sessão não foi iniciada, porque o proot alternativo é lento demais para jogar.</string> + <string name="session_directaudio_missing">Não foi possível baixar o DirectAudio, então o áudio dos jogos usa o caminho mais lento nesta sessão.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">Não foi possível baixar o cliente Steam. Sua rede ou VPN pode estar bloqueando os servidores da Steam; verifique a conexão e tente novamente.</string> <string name="session_end_steam_setup">Não foi possível configurar o cliente Steam. Verifique a conexão e o espaço livre e tente novamente.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Controle de Xbox 360</string> <string name="mode_controller_note">Deck: botão de Acesso rápido e giroscópio. Steam Controller: o mesmo, com detecção de pegada nos botões traseiros. DualShock 4 e DualSense: giroscópio, e os trackpads como o touchpad deles. Xbox 360: abra o Acesso rápido com Guide+A.</string> <string name="mode_back">Voltar</string> + <string name="back_hold">Segurar Voltar para atalhos do Steam</string> + <string name="back_hold_hint">Segurar Voltar abre o Acesso rápido ou cria combinações do Steam com outros botões. Desative para ignorar Voltar segurado; toque e toque duplo continuam funcionando.</string> + <string name="back_native_qam_hint">Segure Voltar por 700 ms, ou segure Voltar e pressione outro botão para atalhos da Steam.</string> + <string name="back_double_tap_window">Intervalo do toque duplo</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir controle de brilho</string> + <string name="brightness_permission_text">Configure o controle de brilho no DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessão</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Atualizado · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar a mais recente</string> + <string name="decky_channel">Canal de atualização</string> + <string name="decky_channel_hint">Quais versões do Decky Loader instalar. O atualizador do próprio Decky usa o mesmo canal.</string> + <string name="decky_channel_stable">Estável</string> + <string name="decky_channel_prerelease">Pré-lançamento</string> + <string name="decky_channel_testing">Testes</string> + <string name="decky_channel_failed">Não foi possível salvar o canal de atualização do Decky</string> <string name="mode_decky_on">Inicia com a Steam. Enquanto estiver ativado, outros apps neste dispositivo podem conseguir controlar a Steam.</string> <string name="mode_decky_off">Desativado. A porta de depuração remota da Steam fica fechada.</string> <string name="mode_decky_remove_title">Desinstalar o Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Overlay de desempenho</string> <string name="mode_mangoapp_hint">Desative se os jogos travarem ou ficarem com a tela preta no modo Deck. Vale a partir da próxima sessão.</string> + <string name="mode_return_after_game">Voltar ao DroidDeck após um jogo</string> + <string name="mode_return_after_game_hint">Quando um jogo iniciado pelo DroidDeck ou por outro launcher fecha, a Steam sai corretamente (os salvamentos na nuvem terminam antes) e você volta para lá. Desativado: fica na Steam.</string> + <string name="mode_shader_precache">Pré-cache de shaders</string> + <string name="mode_shader_precache_hint">A Steam baixa shaders pré-compilados para seus jogos e os processa em segundo plano, então os jogos travam menos. Desativado economiza dados, armazenamento e bateria; os jogos compilam os shaders enquanto rodam. É a mesma opção de Downloads > Pré-cache de shaders da Steam. Vale a partir da próxima sessão.</string> <string name="mode_steam_repair">Reparar o cliente Steam</string> <string name="mode_steam_repair_hint">Baixa o cliente Steam de novo na próxima vez que a Steam iniciar. Use se a Steam ficar presa na tela de carregamento. Jogos, login e configurações são mantidos.</string> <string name="mode_steam_repair_queued">O cliente Steam será baixado de novo na próxima vez que a Steam iniciar.</string> @@ -375,6 +414,8 @@ <string name="mode_directaudio_hint">Ignora o PulseAudio para reduzir a latência.</string> <string name="mode_mic">Microfone</string> <string name="mode_mic_hint">Para chat de voz.</string> + <string name="drawer_mic_hint">Ativa ou desativa a captura do microfone nesta sessão.</string> + <string name="drawer_mic_failed">Não foi possível alterar o microfone. Tente novamente.</string> <string name="mode_network">Rede</string> <string name="mode_wifi_discovery">Descoberta de Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostra os nomes de Wi-Fi e as redes próximas na Steam.</string> @@ -537,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: fila de GPU em tempo real</string> <string name="perf_gsrealtime_hint">Prioriza o trabalho de GPU do compositor. Pode suavizar o ritmo dos quadros, com algum custo para os jogos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Desativado</string> + <string name="perf_cap_auto">Padrão do driver</string> + <string name="perf_zram_client">Comprimir a Steam durante o jogo</string> + <string name="perf_zram_client_hint">20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar logo após os jogos iniciarem. Um limite de RAM acima ainda comprime a Steam quando a sessão o ultrapassa.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">Vale enquanto o cliente Steam está em execução, no modo Steam ou pela área de trabalho. Quando a sessão usa mais que isso, a Steam e depois os outros processos compatíveis da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem travar enquanto as páginas voltam.</string> + <string name="perf_ram_cap_unavailable">Requer swap em zRAM, que este dispositivo não tem.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">A memória de vídeo que o DXVK informa aos jogos Direct3D, para que reservem menos para texturas. As configurações de DXVK do próprio jogo têm prioridade. Vale a partir da próxima sessão.</string> <string name="perf_gpuclock">Manter a GPU no clock máximo</string> <string name="perf_gpuclock_hint">Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor.</string> <string name="perf_fixes">Correções da sessão</string> <string name="perf_sysmem">Turnip: renderização sysmem</string> <string name="perf_sysmem_hint">Mais rápido para o cliente da Steam; nos jogos, o driver escolhe a cada passagem entre renderização em blocos ou na memória do sistema. Obrigatório nas Adreno 710/720/722.</string> <string name="perf_xalia">Pular o assistente xalia da Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">Um substituto em espaço de usuário para o driver ntsync do Linux, para testes. Enquanto estiver ativado, o Proton o usa no lugar do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Vale a partir da próxima sessão.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Um substituto em espaço de usuário para o driver ntsync do Linux. Enquanto estiver ativado, o Proton o usa no lugar do droiddeck-esync e do droiddeck-fsync. Funciona com o Proton Experimental ARM64, o GE-Proton e o proton-cachyos. Vale a partir da próxima sessão.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync primeiro</string> <string name="perf_fsync_hint">Roda o fsync do próprio Proton nos arquivos originais do Proton, com o futex_waitv fornecido em espaço de usuário, então não precisa de pacote e continua funcionando assim que a Steam atualiza o Proton. Enquanto estiver ativado, os jogos o usam antes do droiddeck-esync, exceto os poucos que o Proton mantém fora do fsync. Vale a partir da próxima sessão.</string> @@ -555,6 +606,8 @@ <string name="perf_fastpath">Caminho rápido do proot</string> <string name="perf_fastpath_needs_seccomp">Requer o filtro seccomp do proot.</string> <string name="perf_fastpath_hint">Buscas de arquivos mais rápidas e menos engasgos. Desative se um programa não encontrar os arquivos dele.</string> + <string name="perf_cursor_composite">Desenhar o cursor dentro do gamescope</string> + <string name="perf_cursor_composite_hint">O gamescope desenha o ponteiro em vez de repassá-lo ao Android. Ative para um cursor movido pelo controle. Desativado é mais rápido em um celular. Vale a partir da próxima sessão.</string> <string name="perf_identity">Identidade da sessão</string> <string name="perf_hostname">Nome do host</string> <string name="perf_hostname_hint">O nome que a Steam vê para este dispositivo. Em branco, volta a ser %1$s.</string> @@ -569,6 +622,8 @@ <string name="driver_delete_plain">Os arquivos dele são removidos do app.</string> <string name="driver_delete_in_use">Os arquivos dele são removidos. Ele está em uso, então o padrão assume.</string> <string name="drawer_page_display">Tela</string> + <string name="drawer_frame_limit">Limite de quadros</string> + <string name="drawer_frame_limit_note">Limita este jogo. A tela muda para uma taxa de atualização que o limite divida por igual, quando houver; outros limites podem parecer irregulares. Jogos da Steam usam o Limite de quadros da Steam no menu de Acesso rápido.</string> <string name="drawer_page_effects">Efeitos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -593,6 +648,66 @@ <string name="drawer_hud_color_amber">Âmbar</string> <string name="drawer_hud_color_violet">Violeta</string> <string name="drawer_hud_opacity">Opacidade</string> + <string name="hud_size">Tamanho</string> + <string name="hud_size_hint">Tocar no HUD também altera o tamanho.</string> + <string name="hud_size_full">Completo</string> + <string name="hud_size_tiles">Blocos</string> + <string name="hud_size_pill">Pílula</string> + <string name="hud_size_minimal">Mínimo</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> + <string name="hud_locked">Travar posição</string> + <string name="hud_locked_hint">Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando.</string> + <string name="hud_snap">Encaixar nas laterais</string> + <string name="hud_snap_hint">Solte o HUD e ele vai para a lateral mais próxima da tela. Um gesto rápido o lança nessa direção.</string> + <string name="hud_group_look">Aparência</string> + <string name="hud_scale">Tamanho na tela</string> + <string name="hud_color_soft">Suave</string> + <string name="hud_color_mid">Média</string> + <string name="hud_color_vivid">Viva</string> + <string name="hud_outline">Contorno</string> + <string name="hud_outline_color">Cor do contorno</string> + <string name="hud_outline_gray">Cinza</string> + <string name="hud_outline_theme">Cor do tema</string> + <string name="hud_group_metrics">Leituras</string> + <string name="hud_metric_graph">Gráfico de tempo de quadro</string> + <string name="hud_metric_decimal">Taxa de quadros com decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% mais baixo</string> + <string name="hud_metric_engine">Motor gráfico</string> + <string name="hud_metric_gpu_model">Nome da GPU</string> + <string name="hud_metric_gpu">Uso da GPU</string> + <string name="hud_metric_gpu_temp">Temperatura da GPU</string> + <string name="hud_metric_cpu">Uso da CPU</string> + <string name="hud_metric_per_core">CPU por núcleo</string> + <string name="hud_metric_temp">Temperaturas</string> + <string name="hud_metric_ram">Memória</string> + <string name="hud_metric_vram">Memória gráfica</string> + <string name="hud_metric_swap">Memória swap</string> + <string name="hud_metric_battery">Nível da bateria</string> + <string name="hud_metric_power">Consumo de energia</string> + <string name="hud_metric_network">Rede</string> + <string name="hud_metric_resolution">Resolução</string> + <string name="hud_metric_proton">Versão do Proton</string> + <string name="hud_metric_session">Tempo de sessão</string> + <string name="hud_metric_clock">Relógio</string> + <string name="hud_group_temps">Temperaturas</string> + <string name="hud_temp_unit">Unidade</string> + <string name="hud_temp_bands">Cores de alerta</string> + <string name="hud_temp_bands_hint">As temperaturas ficam âmbar e depois vermelhas ao se aproximarem do limite.</string> + <string name="hud_temp_bands_off">Desativado</string> + <string name="hud_temp_bands_auto">Automático</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU em vermelho a partir de</string> + <string name="hud_temp_red_gpu">GPU em vermelho a partir de</string> + <string name="hud_temp_red_battery">Bateria em vermelho a partir de</string> + <string name="hud_group_more">Mais</string> + <string name="hud_export">Diagnóstico do HUD</string> + <string name="hud_export_hint">Salva em Downloads/DroidDeck um relatório de cada sensor que o HUD lê.</string> + <string name="hud_export_button">Salvar</string> + <string name="hud_export_done">Salvo em %1$s</string> + <string name="hud_export_failed">Não foi possível salvar o relatório do HUD.</string> + <string name="hud_reset">Redefinir configurações do HUD</string> + <string name="hud_reset_button">Redefinir</string> <string name="drawer_scaling">Modo de escala</string> <string name="drawer_scaling_sharpness">Nitidez da escala</string> <string name="drawer_effects">Efeitos de tela</string> @@ -627,10 +742,14 @@ <string name="drawer_touch_auto">Automático (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latência</string> + <string name="drawer_low_latency">Modo de baixa latência</string> + <string name="drawer_low_latency_hint">Aumenta o uso de CPU e bateria</string> <string name="drawer_low_latency_controller">Controle de baixa latência</string> <string name="drawer_low_latency_controller_hint">O controle envia dados a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU.</string> <string name="drawer_low_latency_touch">Toque de baixa latência</string> <string name="drawer_low_latency_touch_hint">Os toques ignoram o agrupamento de quadros; os controles de toque da Steam vão a 1000 Hz. Um pouco mais de CPU.</string> + <string name="drawer_evdev_mouse">Canal de mouse bruto</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Segunda tela</string> @@ -718,6 +837,10 @@ <string name="setup_session">Sessão</string> <string name="setup_logs">Logs da sessão</string> <string name="setup_logs_hint">Salvos após cada sessão</string> + <string name="setup_game_debug_logs">Logs de depuração dos jogos</string> + <string name="setup_game_debug_logs_hint">Inclui diagnósticos do Proton, do Wine e de gráficos na próxima inicialização do jogo. Pode reduzir o desempenho e usar mais armazenamento.</string> + <string name="setup_game_debug_logs_restart">Reinicie esta sessão para salvar os logs de depuração dos jogos</string> + <string name="setup_logging_update_failed">Não foi possível atualizar os logs. Verifique a chave e tente novamente.</string> <string name="setup_agent_commands">Ferramentas de depuração</string> <string name="setup_latest_logs">Logs da última sessão</string> <string name="setup_saved_logs">Logs de sessão salvos</string> @@ -742,12 +865,28 @@ <string name="setup_home_on">O DroidDeck pode ser o app de início</string> <string name="setup_home_off">O DroidDeck nunca é oferecido como app de início</string> <string name="setup_orientation">Orientação</string> + <string name="setup_launcher_orientation">Orientação do launcher</string> + <string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string> + <string name="setup_orientation_portrait">Retrato</string> + <string name="setup_session_orientation">Orientação da sessão</string> + <string name="setup_session_orientation_hint">Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; largura e altura personalizadas ficam como foram digitadas.</string> <string name="setup_orientation_auto">Paisagem automática</string> <string name="setup_orientation_landscape">Paisagem</string> <string name="setup_orientation_reverse">Paisagem invertida</string> <string name="setup_fullscreen">Tela cheia</string> <string name="setup_fullscreen_on">Oculta as barras de status e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de status e de navegação do Android</string> + <string name="setup_dual_screen">Tela dupla</string> + <string name="setup_dual_screen_hint">Automático usa a segunda tela em portáteis que têm uma integrada. Ativado usa qualquer segunda tela. Desativado mantém tudo em uma tela.</string> + <string name="setup_dual_screen_auto">Automático</string> + <string name="setup_dual_screen_on">Ativado</string> + <string name="setup_dual_screen_off">Desativado</string> + <string name="setup_dual_screen_menu">Menu na tela inferior</string> + <string name="setup_dual_screen_menu_hint">Move as seções e o menu do jogo para a segunda tela e a digitação acontece lá, para que a tela superior mantenha a visão completa. L2 e R2 trocam de seção.</string> + <string name="setup_dual_screen_controls">Controles na tela inferior nos jogos</string> + <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado na segunda tela quando uma sessão começa.</string> + <string name="dual_typing_title">Digitando para a tela superior</string> + <string name="dual_typing_done">Concluído</string> <string name="setup_default_home">App de início padrão</string> <string name="setup_choose_home">Escolher um app de início</string> <string name="setup_choose">Escolher</string> @@ -898,6 +1037,14 @@ <string name="gate_step1">Abra Configurações → Opções do desenvolvedor → Depuração por Wi-Fi e ative</string> <string name="gate_step2">Toque em “Parear o dispositivo com um código de pareamento”</string> <string name="gate_step3">Digite o código na notificação do DroidDeck</string> + <string name="pairguide_build_number">Em Sobre o telefone, toque em Número da versão 7 vezes</string> + <string name="pairguide_wireless">Ative a Depuração por Wi-Fi</string> + <string name="pairguide_pair">Abra a Depuração por Wi-Fi e toque em “Parear o dispositivo com um código de pareamento”</string> + <string name="pairguide_child_process">Ative “Desativar restrições de processos filhos”</string> + <string name="pairguide_row_child_process">Desativar restrições de processos filhos</string> + <string name="pairguide_row_build_number">Número da versão</string> + <string name="pairguide_row_wireless">Depuração por Wi-Fi</string> + <string name="pairguide_row_pair">Parear o dispositivo com um código de pareamento</string> <string name="gate_waiting">Aguardando o pop-up de pareamento…</string> <string name="gate_code_needed">Pop-up encontrado. Digite o código dele na notificação.</string> <string name="gate_status">Status</string> @@ -1021,8 +1168,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 +1175,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> @@ -1039,10 +1183,8 @@ <string name="games_never_played">Nunca jogado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <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> @@ -1057,6 +1199,9 @@ <string name="gpu_hide_other">Ocultar drivers de outras GPUs</string> <string name="gpu_show_other">Mostrar drivers de outras GPUs</string> <string name="gpu_advanced">Avançado</string> + <string name="gpu_ubwc_title">Compatibilidade com UBWC</string> + <string name="gpu_ubwc_hint">Experimente Ativado ou Desativado se a Steam ou o Android mostrarem listras ou cintilação. Vale para os dois drivers após reiniciar o DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicie o DroidDeck para aplicar.</string> <string name="gpu_set_with_display">Definido junto com o driver de exibição: %1$s contém os dois.</string> <string name="gpu_set_with_runtime">Definido junto com o driver do runtime: %1$s contém os dois.</string> <string name="gpu_runtime_hint">Usado pelos jogos e pela área de trabalho.</string> @@ -1111,7 +1256,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> @@ -1165,10 +1310,15 @@ <string name="pip_auto">Entrar em PiP automaticamente</string> <string name="unfolded_controls">Controles com a tela desdobrada</string> <string name="unfolded_controls_hint">Desdobrado, o jogo fica acima dos trackpads e dos botões traseiros do Steam Deck. Dobrado, o jogo fica em tela cheia.</string> + <string name="unfolded_controls_with_controller">Manter com um controle</string> + <string name="unfolded_controls_with_controller_hint">Também mostra estes controles de toque enquanto um controle estiver conectado.</string> <string name="pip_suspended">Suspenso</string> <string name="pip_not_ready">O picture-in-picture fica disponível quando a sessão estiver pronta.</string> <string name="pip_permission">Permita o picture-in-picture para o DroidDeck nas configurações do Android.</string> <string name="pip_unavailable">O Android não conseguiu abrir o picture-in-picture.</string> + <string name="game_more">Mais</string> + <string name="game_edit_art">Editar artes</string> + <string name="stores_in_steam_label">Na Steam</string> <string name="game_shortcut">Atalho</string> <string name="game_shortcut_add">Adicionar à tela inicial</string> <string name="game_shortcut_choose">Escolher jogo</string> @@ -1192,6 +1342,10 @@ <string name="main_wait_runtime">Aguarde a operação do runtime terminar</string> <string name="main_wait_proton_install">Aguarde a instalação da ferramenta de compatibilidade terminar</string> + <string name="load_compat_title">Preparando as ferramentas de compatibilidade</string> + <string name="load_compat_wait">Aguardando a configuração de compatibilidade terminar</string> + <string name="load_compat_hint">Sua sessão vai começar quando a configuração terminar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Aguarde a instalação do app de área de trabalho terminar</string> <string name="main_wait_install_game">Aguarde a instalação terminar antes de iniciar um jogo</string> <string name="main_saves_close_session">Feche a sessão do Steam primeiro, para que o jogo não salve por cima da importação</string> @@ -1232,6 +1386,9 @@ <string name="main_install_anyway">Instalar mesmo assim</string> <string name="main_remove_runtime_title">Remover runtime Linux</string> <string name="main_remove_runtime_text">Isso exclui o runtime, o cliente Steam dentro dele e todos os jogos instalados nele.</string> + <string name="runtime_actions_title">Runtime do Linux</string> + <string name="runtime_actions_text">Reparar reinstala os arquivos de sistema do runtime e mantém a Steam, seus jogos e configurações. Extras como a área de trabalho são instalados de novo quando você os usar. Remover apaga tudo.</string> + <string name="runtime_repair">Reparar runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">Não foi possível abrir %1$s na tela principal</string> <string name="android_app_open_failed_on">Não foi possível abrir %1$s em %2$s</string> @@ -1364,6 +1521,12 @@ <string name="session_runtime_catalog_unreachable">Não foi possível acessar o catálogo de runtimes. Verifique a conexão e toque em Jogar novamente.</string> <string name="session_runtime_install_failed">O runtime Linux não foi instalado. Verifique o runtime em Configuração e toque em Jogar novamente.</string> <string name="session_desktop_install_failed">A área de trabalho não foi instalada (%1$s). Verifique a conexão e toque em Área de trabalho novamente.</string> + <string name="session_package_resume_failed">Não foi possível concluir uma instalação interrompida (%1$s). Verifique a conexão e o espaço e tente novamente.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">O runtime do Linux está danificado: %1$d link de biblioteca aponta para um arquivo ausente (%2$s), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + <item quantity="many">O runtime do Linux está danificado: %1$d links de biblioteca apontam para arquivos ausentes (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + <item quantity="other">O runtime do Linux está danificado: %1$d links de biblioteca apontam para arquivos ausentes (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + </plurals> <string name="session_ended_named">%1$s parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> <string name="session_ended_program">O programa parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> <string name="session_ended_desktop">A área de trabalho parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> @@ -1379,6 +1542,14 @@ <string name="mode_decky_plugins_hint">Instale um ZIP de plugin para a próxima sessão do Steam.</string> <string name="mode_decky_plugin_downloading">Baixando…</string> <string name="mode_decky_plugin_install_zip">Instalar de um ZIP</string> + <string name="decky_zip_warning_title">Instalação de plugin de terceiros</string> + <string name="decky_zip_warning_text">A equipe do Decky Loader não revisou este plugin. Ele pode conter malware, como software para roubar sua conta Steam ou danificar seu dispositivo. Ao instalar este plugin, você concorda que assume todos os riscos para o seu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Aguarde %1$d segundo</item> + <item quantity="many">Aguarde %1$d segundos</item> + <item quantity="other">Aguarde %1$d segundos</item> + </plurals> <string name="store_cat_games">Jogos</string> <string name="store_cat_audio_video">Áudio e vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1407,6 +1578,10 @@ <string name="theme_icon_blue_detail">Fundo preto, texto branco e o azul em tudo que estiver selecionado, em foco ou pressionado.</string> <string name="theme_electric">Marinho elétrico</string> <string name="theme_electric_detail">O azul mais vivo, sobre superfícies puxadas para o marinho em vez do cinza.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Cores que percorrem o arco-íris. Respeita as configurações de animação do Android.</string> + <string name="theme_rgb_speed">Velocidade</string> + <string name="theme_rgb_speed_hint">Com que rapidez as cores mudam.</string> <string name="theme_gradient">Gradiente</string> <string name="theme_gradient_detail">Suas próprias cores primária e secundária, combinadas em botões e destaques.</string> <string name="theme_gradient_primary">Primária</string> @@ -1533,7 +1708,16 @@ <string name="fm_conflict_skip">Pular</string> <string name="fm_select_this_folder">Selecionar esta pasta</string> <string name="fm_back">Voltar</string> + <string name="fm_exit">Sair</string> + <string name="fm_return_to_start">Voltar à pasta inicial</string> + <string name="fm_start_unavailable">A pasta inicial não está mais disponível</string> + <string name="fm_cancel_operation_title">Cancelar operação?</string> + <string name="fm_cancel_operation_confirmation">A operação será cancelada. Tem certeza?</string> + <string name="fm_accept">Aceitar</string> + <string name="fm_decline">Recusar</string> <string name="fm_drive_not_readable">%1$s está montado, mas não pode ser lido agora</string> + <string name="fm_drive_access_title">Permitir acesso a %1$s</string> + <string name="fm_drive_access_text">O Android deixa o DroidDeck ver esta unidade, mas não ler. Ative o Acesso a todos os arquivos para o DroidDeck e volte.</string> <string name="fm_list_view">Visualização em lista</string> <string name="fm_grid_view">Visualização em grade</string> <string name="fm_search">Pesquisar</string> @@ -1606,6 +1790,93 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Botões traseiros + trackpads do Deck</string> + <string name="second_mode_dashboard">Painel</string> + <string name="bottom_dashboard_empty">Nada para mostrar aqui ainda.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Nenhum download em andamento.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Baixando o cache de shaders</string> + <string name="bottom_downloads_paused">Pausado</string> + <string name="bottom_downloads_queued">Aguardando para começar</string> + <string name="bottom_page_notifications">Notificações</string> + <string name="bottom_notifications_listener">Tela inferior do DroidDeck</string> + <string name="bottom_notifications_why">Mostre aqui mensagens e outras notificações enquanto você joga. Elas ficam só nesta tela e não são salvas. O Android pergunta uma vez: a página de acesso a notificações dele abre nesta tela; ative o DroidDeck lá e esta página volta sozinha.</string> + <string name="bottom_notifications_allow">Permitir acesso a notificações</string> + <string name="bottom_notifications_none">Nenhuma notificação.</string> + <string name="bottom_notifications_count">%1$d notificações</string> + <string name="bottom_notifications_clear">Limpar</string> + <string name="bottom_page_screenshots">Capturas de tela</string> + <string name="stats_fps_needs_hud">O FPS precisa do HUD ativado</string> + <string name="stats_speed">Velocidade</string> + <string name="stats_pedals">Pedais</string> + <string name="stats_gforce">Força G</string> + <string name="stats_timing">Tempos</string> + <string name="stats_best_lap">Melhor volta</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Acelerador e freio, últimos 10 s</string> + <string name="stats_speed_chart">Velocidade, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_speed_units">Unidade de velocidade</string> + <string name="stats_speed_units_auto">Automático (%1$s)</string> + <string name="stats_steam_client_arm">Cliente Steam ARM</string> + <string name="stats_steam_client_x86">Cliente Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freio</string> + <string name="stats_lights">Painel</string> + <string name="stats_lamp_shift">Troca de marcha</string> + <string name="stats_lamp_handbrake">Freio de mão</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Óleo %1$s °C</string> + <string name="stats_power">Distribuidor de energia</string> + <string name="stats_fuel_t">Combustível, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="stats_tap_hint">Toque na faixa superior ou no painel para mudar o estilo.</string> + <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos listados aqui, incluindo os encontrados depois. Os jogos que você desativar continuam desativados.</string> + <string name="bottom_telemetry_send_note">Isso altera a configuração de saída de dados do próprio jogo. Vale a partir da próxima vez que o jogo iniciar; desativar restaura a configuração anterior.</string> + <string name="bottom_telemetry_send_close">Feche %1$s para alterar isso.</string> + <string name="bottom_telemetry_send_failed">Não foi possível alterar as configurações de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ative %2$s nas configurações do jogo com o IP 127.0.0.1 e a porta %3$d.</string> + <string name="bottom_shots_where">Salvas em Pictures/DroidDeck. As capturas de tela da Steam também aparecem aqui.</string> + <string name="bottom_shots_take">Fazer captura de tela</string> + <string name="bottom_shots_saved">Captura de tela salva.</string> + <string name="bottom_shots_failed">Não foi possível fazer a captura de tela.</string> + <string name="bottom_shots_none">Nenhuma captura de tela ainda.</string> + <string name="bottom_page_chat">Chat e voz</string> + <string name="bottom_chat_why">Leia e responda o chat da Steam aqui enquanto o jogo continua rodando na tela principal. Usa a conta com que a Steam está conectada.</string> + <string name="bottom_chat_not_signed_in">A Steam ainda não tem um login web para compartilhar, então entre aqui uma vez.</string> + <string name="bottom_chat_stopped">O Android fechou a página do chat enquanto o DroidDeck estava em segundo plano. Ela abre de novo quando você voltar ao DroidDeck.</string> + <string name="bottom_chat_open">Abrir o Steam Chat</string> + <string name="bottom_chat_close">Fechar chat</string> + <string name="bottom_chat_mic_on">Microfone ligado</string> + <string name="bottom_chat_mic_off">Microfone desligado</string> + <string name="bottom_chat_mic_unavailable">O microfone está desligado neste jogo. Para falar, ative Microfone nas configurações da Steam do DroidDeck (Áudio) e inicie o jogo de novo.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Estatísticas no jogo</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Volta</string> + <string name="bottom_telemetry_position">Posição</string> + <string name="bottom_telemetry_this_lap">Volta atual</string> + <string name="bottom_telemetry_last_lap">Última volta</string> + <string name="bottom_telemetry_fuel">Combustível</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Situação legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Ative a saída de dados de um jogo de corrida (muitas vezes chamada de telemetria ou UDP) para ver um painel ao vivo aqui. Os dados ficam neste dispositivo.</string> + <string name="bottom_telemetry_unknown_format">A porta %1$d está recebendo dados (%2$d pacotes de %3$d bytes), mas em um formato que esta página ainda não consegue ler.</string> + <string name="bottom_telemetry_port_busy">Outro programa já usa a porta %1$s, então esse jogo não pode aparecer aqui.</string> <string name="rtinst_removing">Removendo o runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1637,6 +1908,7 @@ <string name="flatpakmgr_not_ready">Configure o Flatpak primeiro</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">O Flatpak terminou com o código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s foi compilado para %2$s, que o DroidDeck não consegue executar. Aqui os apps Flatpak precisam de uma versão para ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Atualizando %1$s</string> <string name="flatpakmgr_removing">Removendo %1$s</string> @@ -1730,6 +2002,7 @@ <string name="adbpair_applying">Aplicando a configuração…</string> <string name="adbpair_command_failed">Falha no comando de depuração por Wi-Fi</string> <string name="adbpair_channel_name">Configuração da depuração por Wi-Fi</string> + <string name="adbpair_progress_channel_name">Progresso da configuração da Depuração por Wi-Fi</string> <string name="adbpair_channel_description">Pede o código de pareamento da depuração por Wi-Fi enquanto as Configurações estão abertas</string> <string name="adbpair_title_pair">Parear depuração por Wi-Fi</string> <string name="adbpair_waiting_text">Ative a depuração por Wi-Fi e toque em “Parear o dispositivo com um código de pareamento”.</string> @@ -1838,6 +2111,7 @@ <string name="gpuinfo_not_adreno">Não é uma GPU Adreno</string> <string name="gpuinfo_supported">Compatível</string> <string name="gpuinfo_experimental">Experimental: os drivers são versões de teste</string> + <string name="gpuinfo_a850_experimental">Suporte experimental à Adreno 850: requer drivers de tela e de jogos experimentais compatíveis; não verificado neste dispositivo</string> <string name="gpuinfo_below_tested">Abaixo do hardware testado (Adreno 725 ou mais recente): pode não funcionar</string> <string name="gpuinfo_unsupported">Incompatível: o DroidDeck precisa de uma GPU Adreno (Snapdragon)</string> @@ -1931,10 +2205,10 @@ <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> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalhes do dispositivo</string> <string name="device_info_hide">Ocultar detalhes do dispositivo</string> @@ -1949,7 +2223,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> @@ -1963,11 +2236,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> @@ -1985,9 +2256,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> @@ -2006,12 +2285,43 @@ <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> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Rótulos da barra lateral</string> + <string name="setup_rail_labels_hint">Mostra os nomes sob os ícones da barra lateral. Desative para uma barra lateral mais estreita.</string> + <string name="library_display">Exibição</string> + <string name="library_display_larger">Cards maiores</string> + <string name="library_display_smaller">Cards menores</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamanho</string> <string name="stores_sort_last_played">Jogados recentemente</string> <string name="stores_sort_recently_installed">Instalados recentemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2138,6 +2448,9 @@ <string name="stores_download_manager">Gerenciador de downloads</string> <string name="stores_parallel">Downloads simultâneos</string> <string name="stores_install_where">Instalar em</string> + <string name="stores_install_language">Idioma do jogo</string> + <string name="stores_install_language_hint">O GOG e a Epic instalam este idioma. Sistema segue o idioma do app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s livres</string> @@ -2157,6 +2470,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> @@ -2172,6 +2486,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar em</string> <string name="edit_launch_options">Opções de inicialização</string> + <string name="edit_launch_options_steam_hint">Compartilhadas com as Propriedades da Steam: uma alteração em um dos lugares aparece nos dois.</string> + <string name="edit_launch_options_not_saved">Não foi possível salvar as opções de inicialização na Steam. Tente novamente.</string> + <string name="edit_launch_options_desktop">A Steam pode estar aberta na sessão da área de trabalho. Altere as opções de inicialização nas Propriedades dela ou feche a sessão primeiro.</string> <string name="edit_artwork">Artes</string> <string name="edit_other_exe">Outro exe…</string> <string name="edit_remove">Remover</string> @@ -2301,6 +2618,7 @@ <string name="setup_download_source_custom">Prefixo personalizado</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefixo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para a área de trabalho Linux, abertos pela Área de trabalho.</string> @@ -2443,6 +2761,22 @@ <string name="glasses_tracking_flat_hint">O modo Automático mantém este jogo 2D fixo na visão. Escolha Tela virtual na seção Tela para usar o rastreamento da cabeça.</string> <string name="glasses_tracking_sbs_hint">O rastreamento da cabeça vale para uma tela virtual ou um jogo do SteamVR em execução.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controles</string> + <string name="vr_controllers_group">Controles do SteamVR</string> + <string name="vr_controllers_emulate">Controle em VR</string> + <string name="vr_controllers_emulate_hint">As duas mãos de VR que seu controle representa. As mudanças valem na hora, mesmo com o SteamVR em execução. Joy-Cons e mãos rastreadas ainda assumem o lado delas.</string> + <string name="vr_controllers_off">Controle comum</string> + <string name="vr_controllers_index">Controles do Valve Index</string> + <string name="vr_controllers_touch">Controles do Meta Quest 3</string> + <string name="vr_controllers_vive">Controles do HTC Vive</string> + <string name="vr_controllers_sticks">Os analógicos começam</string> + <string name="vr_controllers_sticks_hint">Pressione os dois analógicos juntos durante a VR para alternar.</string> + <string name="vr_controllers_sticks_game">Movendo você no jogo</string> + <string name="vr_controllers_sticks_hands">Movendo as mãos</string> + <string name="vr_controllers_buttons">Botões</string> + <string name="vr_controllers_buttons_stick">Gatilhos são gatilhos, os botões de ombro seguram, A/B e X/Y são os botões frontais de cada mão, os cliques dos analógicos clicam os thumbsticks e Guide abre o menu do SteamVR. Direcional para cima e para baixo aproxima ou afasta as mãos.</string> + <string name="vr_controllers_buttons_vive">Os analógicos são trackpads; A/X ou um clique do analógico os pressiona. Gatilhos são gatilhos, os botões de ombro seguram, Start e Select são menu e Guide abre o menu do SteamVR.</string> + <string name="vr_controllers_buttons_off">Sem mãos de VR. Jogos com suporte a controle, e o menu do SteamVR, recebem seu controle normalmente.</string> <string name="glasses_brightness">Brilho</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Escurecimento</string> @@ -2500,6 +2834,12 @@ <string name="hand_camera_placement">Posição da câmera</string> <string name="hand_camera_placement_hint">Verifique se a câmera consegue ver você antes de jogar.</string> <string name="hand_camera_check">Verificar</string> + <string name="tracking_pack_title">Download do rastreamento de mãos</string> + <string name="tracking_pack_hint">O rastreamento de mãos precisa de um download único de %1$s.</string> + <string name="tracking_pack_download">Baixar</string> + <string name="tracking_pack_retry">Tentar novamente</string> + <string name="tracking_pack_downloading">Baixando o rastreamento de mãos… %1$d%%</string> + <string name="tracking_pack_failed">Não foi possível baixar o rastreamento de mãos. Verifique sua conexão e tente novamente.</string> <string name="hand_camera_check_title">Posição da câmera</string> <string name="hand_camera_how_rear">Deixe o dispositivo em pé a 1,5-2 metros de distância, na altura do peito, com a câmera traseira voltada para você. Depois entre no campo de visão com as mãos estendidas.</string> <string name="hand_camera_how_front">Deixe o dispositivo em pé a 1,5-2 metros de distância, na altura do peito, com a tela voltada para você. Depois entre no campo de visão com as mãos estendidas.</string> @@ -2582,6 +2922,21 @@ <string name="storage_safe_hint">Runtimes sem uso, restos, logs antigos</string> <string name="storage_clean_up">Limpar…</string> <string name="storage_session_running">Encerre a sessão para limpar ou remover algo. Os tamanhos continuam visíveis.</string> + <string name="storage_default_group">Local de instalação</string> + <string name="storage_default_title">Armazenamento padrão</string> + <string name="storage_default_hint">Novas instalações das lojas vão para o local selecionado. Jogos existentes ficam onde estão. As bibliotecas da Steam mantêm a própria configuração.</string> + <string name="storage_default_ask">Perguntar sempre</string> + <string name="storage_default_ask_detail">Escolha um destino para cada instalação</string> + <string name="storage_default_internal">Armazenamento interno</string> + <string name="storage_default_external">Armazenamento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s livres</string> + <string name="storage_default_external_missing">Não conectado</string> + <string name="storage_default_folder">Pasta · %1$s</string> + <string name="storage_default_folder_free">%1$s livres</string> + <string name="storage_default_folder_missing">Não conectada</string> + <string name="storage_default_choose_folder">Escolher pasta…</string> + <string name="storage_default_choose_folder_detail">Use qualquer pasta em um cartão SD ou unidade USB</string> + <string name="storage_default_note">Os jogos vão para uma pasta Games dentro do local selecionado. Jogos existentes não são movidos.</string> <string name="storage_where">Para onde vai</string> <string name="storage_games">Jogos da Steam</string> <string name="storage_game_data">Dados dos jogos</string> @@ -2710,6 +3065,9 @@ <string name="storage_data_installed">Jogos instalados</string> <string name="storage_data_parts">Prefixo %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Apagar shaders</string> + <string name="storage_reset_prefix">Redefinir prefixo</string> + <string name="storage_reset_prefix_title">Redefinir o prefixo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Apaga o prefixo do Wine (%1$s) em %2$s e o recria na próxima inicialização. Salvamentos, configurações e redistribuíveis instalados nele são perdidos; os salvamentos do Steam Cloud continuam na sua conta.</string> <string name="storage_data_leftovers">Jogos desinstalados</string> <string name="storage_steam_app">App Steam %1$d</string> <string name="storage_leftover_unsure_detail">O prefixo dele ainda tem arquivos, que podem incluir saves locais</string> @@ -3012,5 +3370,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar com o Syncthing</string> + <string name="sync_enable_hint">Baseada no Syncthing-Fork, esta é uma implementação do Syncthing que permite sincronizar arquivos do sistema de arquivos interno do DroidDeck com outras instâncias do Syncthing. Vale apenas para arquivos que você guarda no sistema de arquivos interno do DroidDeck.</string> + <string name="sync_missing">Esta versão não inclui o Syncthing.</string> + <string name="sync_starting">Iniciando o Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Atualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">Pausado</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Retomando</string> + <string name="sync_status_attention">Requer atenção</string> + <string name="sync_status_failed">O Syncthing parou</string> + <string name="sync_failed_retry">Tentar de novo</string> + <string name="sync_paused_wifi">Pausado até conectar ao Wi-Fi</string> + <string name="sync_paused_game">Pausado durante o jogo</string> + <string name="sync_summary">%1$d pastas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltam %1$s</string> + <string name="sync_open_web_ui">Abrir interface web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Retomar</string> + <string name="sync_running">Em execução</string> + <string name="sync_running_hint">Desative para parar o Syncthing completamente.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID do dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avançado</string> + <string name="sync_advanced_hint">Portas, quando executar, redefinir</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Aguardando você</string> + <string name="sync_pending_device">%1$s quer se conectar</string> + <string name="sync_pending_folder">%1$s quer compartilhar “%2$s”</string> + <string name="sync_pending_folder_hint">Aceite para escolher onde salvar no DroidDeck.</string> + <string name="sync_review">Revisar na interface web</string> + <string name="sync_folders">Pastas</string> + <string name="sync_no_folders">Nenhuma pasta ainda.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Atualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Verificando</string> + <string name="sync_folder_paused">Pausada</string> + <string name="sync_folder_out_of_sync">Fora de sincronia</string> + <string name="sync_folder_errors">%1$d arquivos não puderam ser sincronizados</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta pasta está fora do armazenamento do DroidDeck, então o DroidDeck a pausou. Para sincronizar pastas fora do DroidDeck, use o app Syncthing-Fork.</string> + <string name="sync_remove_folder">Remover do Syncthing</string> + <string name="sync_remove_folder_hint">Remover não apaga nenhum arquivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Nenhum dispositivo ainda.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Visto por último: %1$s</string> + <string name="sync_device_id_title">ID deste dispositivo</string> + <string name="sync_device_id_hint">No outro dispositivo, adicione um dispositivo no Syncthing e escaneie este código ou cole o ID. Depois, aceite-o aqui na interface web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartilhar</string> + <string name="sync_done">Concluído</string> + <string name="sync_off_title">Desativar o Syncthing?</string> + <string name="sync_off_body">O Syncthing para agora e continua parado até ser ativado de novo. Os arquivos sincronizados ficam onde estão.</string> + <string name="sync_off_forget">Também apagar a configuração do Syncthing</string> + <string name="sync_off_forget_hint">Remove o ID deste dispositivo, as pastas e os dispositivos. Ao ativar de novo, ele começa do zero.</string> + <string name="sync_turn_off">Desativar</string> + <string name="sync_ports">Portas</string> + <string name="sync_port_sync">Sincronização</string> + <string name="sync_port_discovery">Descoberta local</string> + <string name="sync_repick">Escolher novas portas</string> + <string name="sync_repick_hint">Verificadas novamente a cada início.</string> + <string name="sync_repick_button">Escolher de novo</string> + <string name="sync_reset_group">Redefinir</string> + <string name="sync_api_key">Chave da API</string> + <string name="sync_regenerate">Gerar novamente</string> + <string name="sync_reset">Redefinir o Syncthing</string> + <string name="sync_reset_hint">Novo ID do dispositivo; pastas e dispositivos removidos. Os arquivos no armazenamento do DroidDeck são mantidos.</string> + <string name="sync_reset_button">Redefinir</string> + <string name="sync_reset_confirm_title">Redefinir o Syncthing?</string> + <string name="sync_running_group">Execução</string> + <string name="sync_run">Executar</string> + <string name="sync_run_open">Enquanto o DroidDeck estiver aberto</string> + <string name="sync_run_background">Em segundo plano</string> + <string name="sync_wifi_only">Somente Wi-Fi</string> + <string name="sync_pause_games">Pausar durante os jogos</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Saída do Syncthing nesta sessão</string> + <string name="sync_logs_share">Compartilhar</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configure primeiro o runtime do Linux.</string> + <string name="sync_accept">Aceitar</string> + <string name="sync_accept_title">Salvar “%1$s” em</string> + <string name="sync_add_folder">Adicionar pasta</string> + <string name="sync_add_folder_hint">Sincronizar uma pasta no armazenamento do DroidDeck</string> + <string name="sync_choose">Escolher</string> + <string name="sync_add">Adicionar</string> + <string name="sync_add_failed">Não foi possível adicionar a pasta.</string> + <string name="sync_share_with">Compartilhar com</string> + <string name="sync_share_none">Nenhum dispositivo ainda. Você pode compartilhar esta pasta pela interface web depois.</string> + <string name="sync_use_folder">Usar esta pasta</string> + <string name="sync_new_folder">Nova pasta</string> + <string name="sync_location_home">Pasta pessoal do contêiner</string> + <string name="sync_location_sync">Pasta Sync</string> + <string name="sync_location_shared">Armazenamento compartilhado do DroidDeck</string> + <string name="sync_location_card">DroidDeck em %1$s</string> + <string name="sync_location_app">Dados do app DroidDeck</string> + <string name="sync_web_path_locked">Novas pastas são salvas na pasta Sync do DroidDeck. Para sincronizar outra pasta do DroidDeck, use Adicionar pasta na aba Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recarregar</string> + <string name="sync_not_running">O Syncthing não está em execução.</string> + <string name="session_end_steam_sigill">A Steam parou com uma instrução ilegal (SIGILL). Pode ser um problema de compatibilidade de instruções da CPU ou uma falha do cliente. Compartilhe os logs com os detalhes do seu dispositivo.</string> + <string name="session_end_steam_try_x64">Você pode tentar Configurações da Steam → Cliente Steam → x86-64 (experimental). Requer um download adicional e pode rodar mais devagar.</string> + <string name="session_end_vulkan_device">O driver gráfico do Linux não encontrou um dispositivo Vulkan utilizável. Verifique se o driver de GPU Linux selecionado é compatível com esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sessão não pode começar porque esta GPU não tem um driver Vulkan para Linux compatível na configuração atual. Os drivers Adreno Turnip não conseguem habilitar suporte a GPUs MediaTek/Mali.</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_resources_browser">Abre no seu navegador</string> + <string name="game_resource_guides">Guias</string> + <string name="game_resource_protondb_detail">Relatórios de compatibilidade Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para jogos com salvamentos na sua conta Steam</string> + <string name="game_resource_search">Pesquisa na web</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="library_filter">Filtro</string> + <string name="library_filter_installed">Só instalados</string> + <string name="library_filter_all_owned">Todos os jogos que você tem</string> + <string name="library_no_installed_matches">Nenhum jogo instalado corresponde a estes filtros.</string> + <string name="library_browse_owned">Ver jogos que você tem</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="stores_itch_updates_found">Atualizações disponíveis: %1$d</string> + <string name="stores_itch_update_replaced">O desenvolvedor substituiu esta versão por %1$s. Atualizar para ela?</string> + <string name="xbox_filter_cloud">Nuvem</string> + <string name="stores_xbox_cloud_settings">Configurações da nuvem</string> + <string name="integration_title">Integração com a Steam</string> + <string name="integration_count">%1$d de %2$d ativados</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Localização</string> + <string name="integration_app_info">Informações do app</string> + <string name="integration_wifi">Nomes de Wi-Fi</string> + <string name="integration_brightness">Brilho</string> + <string name="integration_home">DroidDeck como tela inicial</string> + <string name="integration_shortcuts">Atalhos do botão Início</string> + <string name="integration_wifi_hint">Mostra redes na Steam · requer acesso à localização, nunca rastreada</string> + <string name="integration_wifi_on">As redes aparecem na Steam</string> + <string name="integration_wifi_location_off">A localização está desativada</string> + <string name="integration_wifi_denied">Localização negada · permita em Informações do app</string> + <string name="integration_brightness_hint">O controle deslizante da Steam ajusta o brilho da tela</string> + <string name="integration_home_hint">Início abre o menu Steam em uma sessão</string> + <string name="integration_shortcuts_hint">Segure Início para combinações do botão Guide da Steam</string> + <string name="integration_shortcuts_needs_home">Requer DroidDeck como tela inicial</string> + <string name="integration_shortcuts_maybe_restricted">Esmaecido no Android? Informações do app → ⋮ → Permitir configurações restritas</string> + <string name="integration_shortcuts_restricted">Bloqueado pelo Android · Informações do app → ⋮ → Permitir configurações restritas</string> + <string name="integration_shortcuts_service">Botão Início do DroidDeck</string> + <string name="integration_shortcuts_service_description">Repassa os toques no botão Início para o Guide da Steam enquanto uma sessão da Steam está em foco e o DroidDeck é o app de tela inicial padrão. Não lê o conteúdo da tela.</string> + <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com a Steam</string> + <string name="apps_search_hint">Pesquisar apps</string> + <string name="apps_no_match">Nenhum app corresponde a “%1$s”.</string> + <string name="apps_add_widget">Adicionar widget</string> + <string name="apps_widgets_loading">Carregando widgets…</string> + <string name="apps_widgets_none">Nenhum app neste dispositivo oferece widgets.</string> + <string name="apps_widget_wider">Mais largo</string> + <string name="apps_widget_narrower">Mais estreito</string> + <string name="apps_widget_taller">Mais alto</string> + <string name="apps_widget_shorter">Mais baixo</string> + <string name="apps_widget_move_earlier">Mover para antes</string> + <string name="apps_widget_move_later">Mover para depois</string> + <string name="apps_widget_configure">Configurações do widget</string> + <string name="apps_widget_remove">Remover widget</string> + <string name="apps_add_to_folder">Adicionar à pasta</string> + <string name="apps_new_folder">Nova pasta</string> + <string name="apps_remove_from_folder">Remover da pasta</string> + <string name="apps_app_info">Informações do app</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Renomear</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Pasta</string> + <string name="apps_folder_name">Nome da pasta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todos os apps</string> + <string name="apps_filter_games">Jogos</string> + <string name="apps_filter_downloaded">Baixados</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultos</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar nos apps</string> + <string name="apps_shortcut_remove">Remover atalho</string> + <string name="apps_pin_title">Adicionar aos Apps</string> + <string name="apps_pin_add">Adicionar</string> + <string name="apps_hidden_none">Nenhum app oculto.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Instalados recentemente</string> + <string name="apps_sort_updated">Atualizados recentemente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d apps</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="desktop_restore_title">Restaurando seus programas</string> + <string name="desktop_restore_body">Reinstalando os apps que você adicionou após uma atualização do DroidDeck.</string> + <string name="desktop_restore_done_title">Programas restaurados</string> + <string name="desktop_restore_done_body">Os apps que você adicionou estão instalados de novo.</string> + <string name="desktop_restore_failed_title">Não foi possível restaurar alguns programas</string> + <string name="desktop_restore_failed_body">Veja ~/.cache/droiddeck/apt-restore.log e depois tente sudo apt install no Konsole.</string> + <string name="gog_full_files">As otimizações nativas não estão disponíveis. O download inclui arquivos de substituição completos.</string> + <string name="gog_recover">Verificar o resultado do patch</string> + <string name="slow_usb_title">Conexão USB lenta</string> + <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s), então os jogos nele vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, tente virar o conector USB-C ou use uma unidade mais rápida.</string> + <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste aparelho não fica mais rápida, então os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido.</string> + <string name="slow_usb_never">Não mostrar novamente</string> + <string name="slow_usb_dismiss">Dispensar</string> + <string name="steam_import_title">Reiniciar a Steam para adicionar seus jogos?</string> + <string name="steam_import_body">A Steam pode mostrar estes jogos que você tem como instalados: %1$s. Ela precisa reiniciar para mostrá-los. Reinicie agora ou eles serão adicionados na próxima vez que a Steam iniciar.</string> + <string name="steam_import_names_more">%1$s e mais %2$d</string> + <string name="steam_import_now">Reiniciar agora</string> + <string name="steam_import_later">Mais tarde</string> + <string name="gog_maintenance">Gerenciar instalação do GOG</string> + <string name="gog_check">Procurar atualizações</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Patches offline</string> + <string name="gog_refresh">Baixar o instalador offline completo</string> + <string name="gog_update">Atualizar para %1$s</string> + <string name="gog_resume">Retomar a manutenção do GOG</string> + <string name="gog_open_patch">Abrir o instalador do patch</string> + <string name="gog_patch_in_session">Conclua ou cancele o instalador do patch na sessão Linux.</string> + <string name="gog_patch_requirements">Escolha um patch para a versão e o idioma instalados. Versões de origem compatíveis podem não estar listadas.</string> + <string name="gog_no_patches">O GOG não tem patches avulsos para Windows deste jogo.</string> + <string name="gog_managed_files">Arquivos do jogo modificados podem ser substituídos.</string> + <string name="gog_patch_installer_note">O instalador abre na sua sessão Linux.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Espaço extra</string> + <string name="gog_space_estimate_label">Espaço estimado</string> + <string name="gog_repair_action">Reparar arquivos</string> + <string name="gog_refresh_action">Renovar instalação</string> + <string name="gog_select_patch">Selecionar</string> + <string name="setup_all_files">Acesso a todos os arquivos</string> + <string name="setup_local_network">Rede local</string> + <string name="libraries_title">Mais bibliotecas Steam</string> + <string name="libraries_hint">Pastas onde o Steam pode instalar e executar jogos, cada uma com seu próprio nome. Remover uma mantém os jogos no disco.</string> + <string name="libraries_add">Adicionar biblioteca</string> + <string name="libraries_rename_title">Nome da biblioteca</string> + <string name="libraries_pick">Escolha uma pasta para a biblioteca</string> + <string name="libraries_full">No máximo %1$d bibliotecas adicionais</string> + <string name="libraries_overlap">Essa pasta já é uma biblioteca ou está dentro de uma</string> + <string name="libraries_missing">%1$s · indisponível</string> + <string name="libraries_applies_next">Vale a partir da próxima sessão do Steam</string> + <string name="bottom_desktop_start">Iniciar a área de trabalho</string> + <string name="bottom_desktop_mode_touch">Toque direto</string> + <string name="bottom_desktop_trackpad">Trackpad. Toque para usar o toque direto</string> + <string name="bottom_desktop_direct_touch">Toque direto. Toque para usar o trackpad</string> + <string name="bottom_desktop_starting">Iniciando a área de trabalho KDE…</string> + <string name="bottom_desktop_ended">A área de trabalho foi fechada.</string> + <string name="bottom_desktop_failed">Não foi possível iniciar a área de trabalho. Os registros estão na pasta bottom-desktop desta sessão.</string> + <string name="bottom_desktop_off">A área de trabalho está fechada.</string> + <string name="libraries_rename">Renomear</string> + <string name="second_mode_desktop">Área de trabalho</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Área de trabalho · %1$s</string> </resources> diff --git a/app/src/main/res/values-ro/gestures.xml b/app/src/main/res/values-ro/gestures.xml index 6fb7b66fd..da13d5f14 100644 --- a/app/src/main/res/values-ro/gestures.xml +++ b/app/src/main/res/values-ro/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gesturi</string> <string name="gesture_settings">Setări pentru gesturile tactile</string> - <string name="gesture_settings_hint">Personalizează gesturile de mouse și tastatură. Selectează Gesturi ca mod tactil pentru a le folosi.</string> <string name="gesture_tap">Atingere</string> <string name="gesture_drag">Tragere cu un deget</string> <string name="gesture_long_press">Apăsare lungă</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Menținere cu trei degete</string> <string name="gesture_pinch">Apropie sau depărtează degetele pentru zoom</string> <string name="gesture_hold_button">Ține butonul apăsat</string> + <string name="gesture_hold_left">Ține butonul stâng apăsat</string> + <string name="gesture_hold_right">Ține butonul drept apăsat</string> <string name="gesture_click_once">Un singur clic</string> <string name="gesture_hold_delay">Durata până la menținere</string> <string name="gesture_double_delay">Intervalul atingerii duble</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Spațiu</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-ro/shortcuts.xml b/app/src/main/res/values-ro/shortcuts.xml new file mode 100644 index 000000000..776013182 --- /dev/null +++ b/app/src/main/res/values-ro/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Scurtături pentru butoane fizice</string> + <string name="shortcuts_dd_menu">Meniul DroidDeck</string> + <string name="shortcuts_capture">Atribuie: %1$s</string> + <string name="shortcuts_press">Apasă și eliberează un buton. Atribuirea se salvează automat.</string> + <string name="shortcuts_release">Eliberează butonul pentru a continua.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Acest buton este deja atribuit pentru: %1$s</string> + <string name="shortcuts_save">Reatribuie</string> + <string name="shortcuts_retry">Încearcă alt buton</string> + <string name="shortcuts_limitations">Butonul Acasă și unele butoane suplimentare pot fi indisponibile.</string> +</resources> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4b434247a..5b2910843 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opțiuni VKD3D pentru D3D12. nodxr dezactivează ray tracing-ul; folosește doar pentru un joc care are nevoie de el.</string> <string name="game_env_proton_log">Setează la 1 pentru un jurnal de diagnosticare Proton. Înregistrarea poate reduce performanța și folosește spațiu de stocare.</string> <string name="game_env_wined3d">Setează la 1 pentru a folosi WineD3D bazat pe OpenGL în locul DXVK, pentru testarea compatibilității D3D9–11.</string> + <string name="game_env_wined3d_renderer">Randare pentru DirectDraw, Direct3D 1-7 și jocurile rulate cu WineD3D. Vulkan ocolește calea OpenGL-prin-Zink și este mult mai rapid pentru jocurile vechi DirectDraw și Direct3D 7 pe Adreno.</string> + <string name="game_env_dxvk_d3d8">Setează la 1 pentru a rula Direct3D 8 prin DXVK în loc de WineD3D. Mai rapid în testul Direct3D 8 din AIO Graphics Test pe Adreno.</string> <string name="game_env_no_ntsync">Setează la 1 pentru a păstra acest joc în afara ntsync (droiddeck-ntsync sau un driver de kernel); folosește droiddeck-esync unde există un pachet, altfel droiddeck-fsync.</string> <string name="game_env_no_esync">Setează la 1 pentru a dezactiva droiddeck-esync pentru acest joc; folosește în schimb droiddeck-fsync, sau droiddeck-ntsync unde fsync este dezactivat și el.</string> <string name="game_env_no_fsync">Setează la 1 pentru a păstra acest joc în afara droiddeck-fsync; folosește droiddeck-esync unde există un pachet, altfel droiddeck-ntsync.</string> <string name="game_env_fsync_first">Setează la 1 pentru a rula acest joc pe droiddeck-fsync, sau la 0 pentru a pune droiddeck-esync primul unde un pachet se potrivește cu Proton-ul său.</string> <string name="game_env_xalia">Setează la 0 pentru a dezactiva asistentul de navigare cu gamepad al Proton pentru acest joc.</string> + <string name="game_env_anticheat_offline">Activat implicit. Pornește un joc cu Easy Anti-Cheat fără anti-cheat atunci când jocul acceptă jocul offline. Dezactivează pentru a lansa prin Easy Anti-Cheat ca de obicei. Modurile online care necesită Easy Anti-Cheat rămân indisponibile.</string> <string name="game_env_hud">Suprapunere DXVK pentru D3D9–11. fps afișează rata de cadre; nesetat o ascunde.</string> <string name="game_env_dxvk_config">Setări DXVK separate prin punct și virgulă. Versiunile recente folosesc dxvk.maxFrameRate pentru limitarea cadrelor; preferă limitatorul de cadre al sesiunii pentru joc obișnuit.</string> + <string name="game_env_cores">Nuclee CPU pentru acest joc, de exemplu 0-4 sau 0,2,4, în locul nucleelor pentru joc ale sesiunii. Mai puține nuclee se încălzesc mai puțin.</string> <string name="game_env_vkd3d_limit">Limita ratei de cadre D3D12. 0 dezactivează limita.</string> <string name="game_env_glthread">Procesarea pe fire a Mesa OpenGL. true poate ajuta jocurile OpenGL limitate de CPU; testează pentru fiecare joc.</string> <string name="sync_backend_title">Sincronizare Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX rulează programe Linux x86 pe acest dispozitiv ARM64. Automat îl folosește atunci când programul este compilat pentru x86.</string> <string name="app_fex_x86">%1$s prin FEX</string> <string name="app_fex_not_ready">Acest program este compilat pentru PC-uri %1$s și rulează prin FEX, care nu este încă configurat. Deschide Steam o dată, fiind autentificat: DroidDeck îl pune să descarce FEX și Steam Linux Runtime de care are nevoie, apoi acesta se deschide.</string> + <string name="session_proot_missing">Proot-ul DroidDeck nu a putut fi descărcat. Verifică conexiunea și încearcă din nou. Sesiunea nu a fost pornită, deoarece proot-ul de rezervă este prea lent pentru jocuri.</string> + <string name="session_directaudio_missing">DirectAudio nu a putut fi descărcat, așa că sunetul jocurilor folosește calea mai lentă în această sesiune.</string> <string name="session_end_program">Acest program</string> <string name="session_end_steam_download">Clientul Steam nu a putut fi descărcat. Rețeaua sau VPN-ul tău poate bloca serverele Steam; verifică conexiunea și încearcă din nou.</string> <string name="session_end_steam_setup">Clientul Steam nu a putut fi configurat. Verifică conexiunea și spațiul liber, apoi încearcă din nou.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Controller Xbox 360</string> <string name="mode_controller_note">Deck: butonul Acces rapid și giroscopul. Steam Controller: la fel, cu senzori de strângere pe butoanele din spate. DualShock 4 și DualSense: giroscop, și trackpadurile ca touchpad propriu. Xbox 360: deschide Acces rapid cu Guide+A.</string> <string name="mode_back">Înapoi</string> + <string name="back_hold">Ține apăsat Înapoi pentru comenzi Steam</string> + <string name="back_hold_hint">Dacă ții apăsat Înapoi se deschide Acces rapid sau se fac combinații Steam cu alte butoane. Dezactivează pentru a ignora apăsarea lungă; atingerea și dubla atingere funcționează în continuare.</string> + <string name="back_native_qam_hint">Ține apăsat Înapoi 700 ms sau ține apăsat Înapoi și apasă alt buton pentru comenzile rapide Steam.</string> + <string name="back_double_tap_window">Interval pentru atingere dublă</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permite controlul luminozității</string> + <string name="brightness_permission_text">Configurează controlul luminozității în DroidDeck.</string> <string name="back_menu_then_qam">Meniu → QAM</string> <string name="back_qam_then_menu">QAM → Meniu</string> <string name="mode_session">Sesiune</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Actualizat · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalează cea mai recentă versiune</string> + <string name="decky_channel">Canal de actualizare</string> + <string name="decky_channel_hint">Ce versiuni Decky Loader se instalează. Actualizatorul propriu al Decky folosește același canal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Pre-lansare</string> + <string name="decky_channel_testing">Testare</string> + <string name="decky_channel_failed">Canalul de actualizare Decky nu a putut fi salvat</string> <string name="mode_decky_on">Pornește odată cu Steam. Cât timp este activ, alte aplicații de pe acest dispozitiv pot fi capabile să controleze Steam.</string> <string name="mode_decky_off">Dezactivat. Portul de depanare la distanță al Steam rămâne închis.</string> <string name="mode_decky_remove_title">Dezinstalezi Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Suprapunere de performanță</string> <string name="mode_mangoapp_hint">Dezactivează dacă jocurile se blochează sau ecranul devine negru în modul Deck. Se aplică la sesiunea următoare.</string> + <string name="mode_return_after_game">Revino la DroidDeck după un joc</string> + <string name="mode_return_after_game_hint">Când un joc pornit din DroidDeck sau din alt launcher se închide, Steam iese curat (salvările în cloud se termină întâi) și revii acolo. Dezactivat: rămâi în Steam.</string> + <string name="mode_shader_precache">Pre-cache pentru shadere</string> + <string name="mode_shader_precache_hint">Steam descarcă shadere precompilate pentru jocurile tale și le procesează în fundal, ca jocurile să aibă mai puține sacadări. Dezactivat economisește date, spațiu și baterie; jocurile își compilează shaderele în timpul jocului. Aceeași setare ca Descărcări > Pre-cache pentru shadere din Steam. Se aplică la sesiunea următoare.</string> <string name="mode_steam_repair">Repară clientul Steam</string> <string name="mode_steam_repair_hint">Descarcă din nou clientul Steam la următoarea pornire a Steam. Folosește-l dacă Steam rămâne blocat pe ecranul de încărcare. Jocurile, autentificarea și setările sunt păstrate.</string> <string name="mode_steam_repair_queued">Clientul Steam va fi descărcat din nou la următoarea pornire a Steam.</string> @@ -375,6 +414,8 @@ <string name="mode_directaudio_hint">Evită PulseAudio pentru o latență mai mică.</string> <string name="mode_mic">Microfon</string> <string name="mode_mic_hint">Pentru chat vocal.</string> + <string name="drawer_mic_hint">Activează sau dezactivează captarea microfonului pentru această sesiune.</string> + <string name="drawer_mic_failed">Microfonul nu a putut fi schimbat. Încearcă din nou.</string> <string name="mode_network">Rețea</string> <string name="mode_wifi_discovery">Descoperire Wi-Fi</string> <string name="mode_wifi_discovery_hint">Arată numele rețelelor Wi-Fi și rețelele din apropiere în Steam.</string> @@ -537,14 +578,24 @@ <string name="perf_gsrealtime">gamescope: coadă GPU în timp real</string> <string name="perf_gsrealtime_hint">Prioritizează lucrul GPU al compositorului. Poate netezi ritmul cadrelor, cu un cost pentru jocuri.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memorie</string> + <string name="perf_cap_off">Dezactivat</string> + <string name="perf_cap_auto">Implicit driver</string> + <string name="perf_zram_client">Comprimă Steam cât rulează un joc</string> + <string name="perf_zram_client_hint">La 20 s după pornirea unui joc, clientul Steam este comprimat în zRAM pentru a lăsa jocului mai multă memorie și este citit înapoi când jocul se închide. Dezactivează dacă sesiunea se închide la scurt timp după pornirea jocurilor. O limită RAM de mai sus tot comprimă Steam când sesiunea o depășește.</string> + <string name="perf_ram_cap">Limită RAM</string> + <string name="perf_ram_cap_hint">Se aplică cât rulează clientul Steam, în modul Steam sau de pe desktop. Când sesiunea folosește mai mult de atât, Steam și apoi celelalte procese acceptate ale sesiunii sunt comprimate în zRAM. O limită flexibilă: nimic nu se închide, dar jocurile pot sacada cât paginile revin.</string> + <string name="perf_ram_cap_unavailable">Necesită swap zRAM, pe care acest dispozitiv nu îl are.</string> + <string name="perf_vram_cap">Limită VRAM</string> + <string name="perf_vram_cap_hint">Memoria video pe care DXVK o raportează jocurilor Direct3D, ca acestea să aloce mai puțin pentru texturi. Setările DXVK proprii ale unui joc au prioritate. Intră în vigoare la sesiunea următoare.</string> <string name="perf_gpuclock">Fixează GPU-ul la frecvența maximă</string> <string name="perf_gpuclock_hint">Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură.</string> <string name="perf_fixes">Remedieri de sesiune</string> <string name="perf_sysmem">Turnip: randare sysmem</string> <string name="perf_sysmem_hint">Mai rapidă pentru clientul Steam; în jocuri, driverul alege la fiecare trecere între randarea pe dale și cea în memoria sistemului. Necesară pe Adreno 710/720/722.</string> <string name="perf_xalia">Omite asistentul xalia al Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">Un substitut la nivel de utilizator pentru driverul Linux ntsync, pentru testare. Cât timp este activ, Proton îl folosește în locul droiddeck-esync și droiddeck-fsync. Funcționează cu Proton Experimental ARM64, GE-Proton și proton-cachyos. Se aplică la sesiunea următoare.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Un substitut la nivel de utilizator pentru driverul Linux ntsync. Cât timp este activ, Proton îl folosește în locul droiddeck-esync și droiddeck-fsync. Funcționează cu Proton Experimental ARM64, GE-Proton și proton-cachyos. Se aplică la sesiunea următoare.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync primul</string> <string name="perf_fsync_hint">Rulează propriul fsync al Proton pe fișierele Proton standard, cu futex_waitv furnizat la nivel de utilizator, deci nu are nevoie de pachet și continuă să funcționeze imediat ce Steam actualizează Proton. Cât timp este activ, jocurile îl folosesc înaintea droiddeck-esync, cu excepția celor puține pe care Proton le ține în afara fsync. Se aplică la sesiunea următoare.</string> @@ -555,6 +606,8 @@ <string name="perf_fastpath">Cale rapidă proot</string> <string name="perf_fastpath_needs_seccomp">Necesită filtrul seccomp al proot.</string> <string name="perf_fastpath_hint">Căutări de fișiere mai rapide și mai puține sacadări. Dezactivează dacă un program nu își găsește fișierele.</string> + <string name="perf_cursor_composite">Desenează cursorul în gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope desenează singur cursorul în loc să-l predea Android. Activează pentru un cursor controlat cu controllerul. Dezactivat este mai rapid pe telefon. Se aplică la sesiunea următoare.</string> <string name="perf_identity">Identitatea sesiunii</string> <string name="perf_hostname">Nume de host</string> <string name="perf_hostname_hint">Numele pe care Steam îl vede pentru acest dispozitiv. Gol restaurează %1$s.</string> @@ -569,6 +622,8 @@ <string name="driver_delete_plain">Fișierele sale sunt eliminate din aplicație.</string> <string name="driver_delete_in_use">Fișierele sale sunt eliminate. Este în uz, așa că cel implicit îi ia locul.</string> <string name="drawer_page_display">Afișaj</string> + <string name="drawer_frame_limit">Limită de cadre</string> + <string name="drawer_frame_limit_note">Limitează acest joc. Afișajul trece la o rată de reîmprospătare pe care limita o împarte exact, dacă există; alte limite pot părea neuniforme. Jocurile Steam folosesc Limita de cadre a Steam din meniul Acces rapid.</string> <string name="drawer_page_effects">Efecte</string> <string name="drawer_page_controls">Comenzi</string> <string name="drawer_page_components">Componente</string> @@ -593,6 +648,66 @@ <string name="drawer_hud_color_amber">Chihlimbariu</string> <string name="drawer_hud_color_violet">Violet</string> <string name="drawer_hud_opacity">Opacitate</string> + <string name="hud_size">Dimensiune</string> + <string name="hud_size_hint">Atingerea HUD-ului îi schimbă și dimensiunea.</string> + <string name="hud_size_full">Complet</string> + <string name="hud_size_tiles">Plăci</string> + <string name="hud_size_pill">Pastilă</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bară</string> + <string name="hud_locked">Blochează pe loc</string> + <string name="hud_locked_hint">Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare.</string> + <string name="hud_snap">Fixare în lateral</string> + <string name="hud_snap_hint">Eliberează HUD-ul și se mută în partea mai apropiată a ecranului. Un gest rapid îl aruncă în acea direcție.</string> + <string name="hud_group_look">Aspect</string> + <string name="hud_scale">Dimensiune pe ecran</string> + <string name="hud_color_soft">Discretă</string> + <string name="hud_color_mid">Medie</string> + <string name="hud_color_vivid">Vie</string> + <string name="hud_outline">Contur</string> + <string name="hud_outline_color">Culoare contur</string> + <string name="hud_outline_gray">Gri</string> + <string name="hud_outline_theme">Culoarea temei</string> + <string name="hud_group_metrics">Valori</string> + <string name="hud_metric_graph">Grafic timp de cadru</string> + <string name="hud_metric_decimal">Rată de cadre cu zecimală</string> + <string name="hud_metric_low001" formatted="false">0.01% cele mai mici</string> + <string name="hud_metric_engine">Motor grafic</string> + <string name="hud_metric_gpu_model">Nume GPU</string> + <string name="hud_metric_gpu">Încărcare GPU</string> + <string name="hud_metric_gpu_temp">Temperatură GPU</string> + <string name="hud_metric_cpu">Încărcare CPU</string> + <string name="hud_metric_per_core">CPU pe nucleu</string> + <string name="hud_metric_temp">Temperaturi</string> + <string name="hud_metric_ram">Memorie</string> + <string name="hud_metric_vram">Memorie grafică</string> + <string name="hud_metric_swap">Memorie swap</string> + <string name="hud_metric_battery">Nivel baterie</string> + <string name="hud_metric_power">Consum de energie</string> + <string name="hud_metric_network">Rețea</string> + <string name="hud_metric_resolution">Rezoluție</string> + <string name="hud_metric_proton">Versiune Proton</string> + <string name="hud_metric_session">Durata sesiunii</string> + <string name="hud_metric_clock">Ceas</string> + <string name="hud_group_temps">Temperaturi</string> + <string name="hud_temp_unit">Unitate</string> + <string name="hud_temp_bands">Culori de avertizare</string> + <string name="hud_temp_bands_hint">Temperaturile devin chihlimbarii, apoi roșii, pe măsură ce se apropie de limită.</string> + <string name="hud_temp_bands_off">Dezactivat</string> + <string name="hud_temp_bands_auto">Automat</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU roșu de la</string> + <string name="hud_temp_red_gpu">GPU roșu de la</string> + <string name="hud_temp_red_battery">Baterie roșie de la</string> + <string name="hud_group_more">Mai mult</string> + <string name="hud_export">Diagnosticare HUD</string> + <string name="hud_export_hint">Salvează în Downloads/DroidDeck un raport despre fiecare senzor citit de HUD.</string> + <string name="hud_export_button">Salvează</string> + <string name="hud_export_done">Salvat în %1$s</string> + <string name="hud_export_failed">Raportul HUD nu a putut fi salvat.</string> + <string name="hud_reset">Resetează setările HUD</string> + <string name="hud_reset_button">Resetează</string> <string name="drawer_scaling">Mod de scalare</string> <string name="drawer_scaling_sharpness">Claritatea scalării</string> <string name="drawer_effects">Efecte de ecran</string> @@ -627,10 +742,14 @@ <string name="drawer_touch_auto">Automat (%1$s)</string> <string name="drawer_keyboard">Tastatură</string> <string name="drawer_latency">Latență</string> + <string name="drawer_low_latency">Mod latență redusă</string> + <string name="drawer_low_latency_hint">Crește consumul de CPU și baterie</string> <string name="drawer_low_latency_controller">Controller cu latență mică</string> <string name="drawer_low_latency_controller_hint">Controllerul raportează la 1000 Hz în loc de 250 Hz. Consum CPU puțin mai mare.</string> <string name="drawer_low_latency_touch">Atingere cu latență mică</string> <string name="drawer_low_latency_touch_hint">Atingerile sar peste gruparea cadrelor, deci controlul tactil Steam rulează la 1000 Hz. Consum CPU puțin mai mare.</string> + <string name="drawer_evdev_mouse">Canal brut de mouse</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Tastatură de PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Al doilea ecran</string> @@ -718,6 +837,10 @@ <string name="setup_session">Sesiune</string> <string name="setup_logs">Jurnalele sesiunii</string> <string name="setup_logs_hint">Salvate după fiecare sesiune</string> + <string name="setup_game_debug_logs">Jurnale de depanare a jocurilor</string> + <string name="setup_game_debug_logs_hint">Include diagnosticare Proton, Wine și grafică la următoarea lansare a unui joc. Poate reduce performanța și folosește mai mult spațiu.</string> + <string name="setup_game_debug_logs_restart">Repornește această sesiune pentru a salva jurnalele de depanare</string> + <string name="setup_logging_update_failed">Jurnalizarea nu a putut fi actualizată. Verifică comutatorul și încearcă din nou.</string> <string name="setup_agent_commands">Instrumente de depanare</string> <string name="setup_latest_logs">Cele mai recente jurnale de sesiune</string> <string name="setup_saved_logs">Jurnale de sesiune salvate</string> @@ -750,12 +873,28 @@ <string name="setup_home_on">DroidDeck poate fi aplicația Acasă</string> <string name="setup_home_off">DroidDeck nu este niciodată oferit ca aplicație Acasă</string> <string name="setup_orientation">Orientare</string> + <string name="setup_launcher_orientation">Orientarea launcherului</string> + <string name="setup_launcher_orientation_auto">Urmează rotirea dispozitivului</string> + <string name="setup_orientation_portrait">Portret</string> + <string name="setup_session_orientation">Orientarea sesiunii</string> + <string name="setup_session_orientation_hint">Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; lățimea și înălțimea personalizate rămân cum au fost introduse.</string> <string name="setup_orientation_auto">Peisaj automat</string> <string name="setup_orientation_landscape">Peisaj</string> <string name="setup_orientation_reverse">Peisaj inversat</string> <string name="setup_fullscreen">Ecran complet</string> <string name="setup_fullscreen_on">Ascunde barele de stare și de navigare Android</string> <string name="setup_fullscreen_off">Arată barele de stare și de navigare Android</string> + <string name="setup_dual_screen">Ecran dublu</string> + <string name="setup_dual_screen_hint">Automat folosește al doilea ecran pe consolele portabile care au unul integrat. Pornit folosește orice al doilea afișaj. Oprit păstrează totul pe un singur ecran.</string> + <string name="setup_dual_screen_auto">Automat</string> + <string name="setup_dual_screen_on">Pornit</string> + <string name="setup_dual_screen_off">Oprit</string> + <string name="setup_dual_screen_menu">Meniu pe ecranul de jos</string> + <string name="setup_dual_screen_menu_hint">Mută secțiunile și meniul din joc pe al doilea ecran și scrierea se face acolo, astfel încât ecranul de sus păstrează imaginea completă. L2 și R2 schimbă secțiunea.</string> + <string name="setup_dual_screen_controls">Comenzi pe ecranul de jos în jocuri</string> + <string name="setup_dual_screen_controls_hint">Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune.</string> + <string name="dual_typing_title">Scriere pentru ecranul de sus</string> + <string name="dual_typing_done">Gata</string> <string name="setup_default_home">Aplicația Acasă implicită</string> <string name="setup_choose_home">Alege o aplicație Acasă</string> <string name="setup_choose">Alege</string> @@ -906,6 +1045,14 @@ <string name="gate_step1">Deschide Setări → Opțiuni pentru dezvoltatori → Depanare wireless și activează-o</string> <string name="gate_step2">Apasă „Asociază dispozitivul cu un cod de asociere”</string> <string name="gate_step3">Introdu codul în notificarea DroidDeck</string> + <string name="pairguide_build_number">În Despre telefon, atinge Numărul versiunii de 7 ori</string> + <string name="pairguide_wireless">Activează Depanarea wireless</string> + <string name="pairguide_pair">Deschide Depanare wireless, apoi atinge „Asociază dispozitivul cu un cod de asociere”</string> + <string name="pairguide_child_process">Activează „Dezactivează restricțiile pentru procese secundare”</string> + <string name="pairguide_row_child_process">Dezactivează restricțiile pentru procese secundare</string> + <string name="pairguide_row_build_number">Numărul versiunii</string> + <string name="pairguide_row_wireless">Depanare wireless</string> + <string name="pairguide_row_pair">Asociază dispozitivul cu un cod de asociere</string> <string name="gate_waiting">Se așteaptă fereastra de asociere…</string> <string name="gate_code_needed">Fereastra a fost găsită. Introdu codul său în notificare.</string> <string name="gate_status">Stare</string> @@ -1029,8 +1176,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 +1183,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> @@ -1047,10 +1191,8 @@ <string name="games_never_played">Niciodată jucat</string> <string name="games_runtime_busy_percent">Mediu de execuție ocupat · %1$d%%</string> <string name="games_runtime_busy">Mediu de execuție ocupat</string> - <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> @@ -1065,6 +1207,9 @@ <string name="gpu_hide_other">Ascunde driverele pentru alte GPU-uri</string> <string name="gpu_show_other">Arată driverele pentru alte GPU-uri</string> <string name="gpu_advanced">Avansat</string> + <string name="gpu_ubwc_title">Compatibilitate UBWC</string> + <string name="gpu_ubwc_hint">Încearcă Activat sau Dezactivat dacă Steam sau Android afișează dungi ori pâlpâiri. Se aplică ambelor drivere după repornirea DroidDeck.</string> + <string name="gpu_ubwc_restart">Repornește DroidDeck pentru a aplica.</string> <string name="gpu_set_with_display">Setat împreună cu driverul de afișaj: %1$s include ambele.</string> <string name="gpu_set_with_runtime">Setat împreună cu driverul mediului de execuție: %1$s include ambele.</string> <string name="gpu_runtime_hint">Folosit de jocuri și de desktop.</string> @@ -1119,7 +1264,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> @@ -1173,10 +1318,15 @@ <string name="pip_auto">Intră automat în PiP</string> <string name="unfolded_controls">Comenzi pe ecranul desfăcut</string> <string name="unfolded_controls_hint">Desfăcut, jocul se află peste trackpadurile și mânerele din spate ale Steam Deck. Împăturit, jocul este pe tot ecranul.</string> + <string name="unfolded_controls_with_controller">Păstrează-le cu un controller</string> + <string name="unfolded_controls_with_controller_hint">Afișează aceste comenzi tactile și cât timp un controller este conectat.</string> <string name="pip_suspended">Suspendat</string> <string name="pip_not_ready">Imaginea în imagine este disponibilă odată ce sesiunea este pregătită.</string> <string name="pip_permission">Permite imaginea în imagine pentru DroidDeck în setările Android.</string> <string name="pip_unavailable">Android nu a putut deschide imaginea în imagine.</string> + <string name="game_more">Mai multe</string> + <string name="game_edit_art">Editează grafica</string> + <string name="stores_in_steam_label">În Steam</string> <string name="game_shortcut">Comandă rapidă</string> <string name="game_shortcut_add">Adaugă pe ecranul principal</string> <string name="game_shortcut_choose">Alege jocul</string> @@ -1200,6 +1350,10 @@ <string name="main_wait_runtime">Așteaptă să se termine operația asupra mediului de execuție</string> <string name="main_wait_proton_install">Așteaptă să se termine instalarea instrumentului de compatibilitate</string> + <string name="load_compat_title">Se pregătesc instrumentele de compatibilitate</string> + <string name="load_compat_wait">Se așteaptă finalizarea configurării compatibilității</string> + <string name="load_compat_hint">Sesiunea va porni după finalizarea configurării.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Așteaptă să se termine instalarea aplicației desktop</string> <string name="main_wait_install_game">Așteaptă să se termine instalarea înainte de a lansa un joc</string> <string name="main_saves_close_session">Închide mai întâi sesiunea Steam, ca jocul să nu poată salva peste import</string> @@ -1240,6 +1394,9 @@ <string name="main_install_anyway">Instalează oricum</string> <string name="main_remove_runtime_title">Elimină mediul de execuție Linux</string> <string name="main_remove_runtime_text">Aceasta șterge mediul de execuție, clientul Steam din interiorul lui și fiecare joc instalat acolo.</string> + <string name="runtime_actions_title">Mediul de execuție Linux</string> + <string name="runtime_actions_text">Repararea reinstalează fișierele de sistem ale mediului de execuție și păstrează Steam, jocurile și setările. Extrasele, precum desktopul, se instalează din nou la următoarea utilizare. Eliminarea șterge tot.</string> + <string name="runtime_repair">Repară mediul de execuție</string> <string name="main_applied">Aplicat: %1$s</string> <string name="android_app_open_failed_primary">%1$s nu a putut fi deschis pe ecranul principal</string> <string name="android_app_open_failed_on">%1$s nu a putut fi deschis pe %2$s</string> @@ -1372,6 +1529,12 @@ <string name="session_runtime_catalog_unreachable">Catalogul mediului de execuție nu a putut fi accesat. Verifică conexiunea și apasă din nou Play.</string> <string name="session_runtime_install_failed">Mediul de execuție Linux nu s-a instalat. Verifică mediul de execuție în Configurare și apasă din nou Play.</string> <string name="session_desktop_install_failed">Desktopul nu s-a instalat (%1$s). Verifică conexiunea și apasă din nou Desktop.</string> + <string name="session_package_resume_failed">O instalare întreruptă nu a putut fi finalizată (%1$s). Verifică conexiunea și spațiul, apoi încearcă din nou.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Mediul de execuție Linux este deteriorat: %1$d legătură de bibliotecă indică un fișier lipsă (%2$s), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + <item quantity="few">Mediul de execuție Linux este deteriorat: %1$d legături de bibliotecă indică fișiere lipsă (%2$s și altele), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + <item quantity="other">Mediul de execuție Linux este deteriorat: %1$d de legături de bibliotecă indică fișiere lipsă (%2$s și altele), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + </plurals> <string name="session_ended_named">%1$s s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> <string name="session_ended_program">Programul s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> <string name="session_ended_desktop">Desktopul s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> @@ -1387,6 +1550,14 @@ <string name="mode_decky_plugins_hint">Instalează o arhivă ZIP cu un plugin pentru sesiunea Steam următoare.</string> <string name="mode_decky_plugin_downloading">Se descarcă…</string> <string name="mode_decky_plugin_install_zip">Instalează din ZIP</string> + <string name="decky_zip_warning_title">Instalarea unui plugin terț</string> + <string name="decky_zip_warning_text">Echipa Decky Loader nu a verificat acest plugin. Poate conține malware, de exemplu software care îți fură contul Steam sau îți afectează dispozitivul. Instalând acest plugin, accepți că îți asumi toate riscurile pentru dispozitiv.</string> + <string name="decky_zip_warning_continue">Continuă</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Așteaptă %1$d secundă</item> + <item quantity="few">Așteaptă %1$d secunde</item> + <item quantity="other">Așteaptă %1$d de secunde</item> + </plurals> <string name="store_cat_games">Jocuri</string> <string name="store_cat_audio_video">Audio & video</string> <string name="store_cat_graphics">Grafică</string> @@ -1415,6 +1586,10 @@ <string name="theme_icon_blue_detail">Fundal negru, text alb, albastrul pentru tot ce este selectat, focalizat sau apăsat.</string> <string name="theme_electric">Bleumarin electric</string> <string name="theme_electric_detail">Albastrul mai strălucitor, pe suprafețe care tind spre bleumarin în loc de gri.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Culori care parcurg curcubeul. Respectă setările de animație din Android.</string> + <string name="theme_rgb_speed">Viteză</string> + <string name="theme_rgb_speed_hint">Cât de repede se schimbă culorile.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Culorile tale primară și secundară, combinate pe butoane și evidențieri.</string> <string name="theme_gradient_primary">Primară</string> @@ -1438,7 +1613,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Spațiu</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1541,7 +1716,16 @@ <string name="fm_conflict_skip">Omite</string> <string name="fm_select_this_folder">Selectează acest folder</string> <string name="fm_back">Înapoi</string> + <string name="fm_exit">Ieșire</string> + <string name="fm_return_to_start">Înapoi la dosarul inițial</string> + <string name="fm_start_unavailable">Dosarul inițial nu mai este disponibil</string> + <string name="fm_cancel_operation_title">Anulați operația?</string> + <string name="fm_cancel_operation_confirmation">Operația va fi anulată. Sunteți sigur?</string> + <string name="fm_accept">Acceptă</string> + <string name="fm_decline">Refuză</string> <string name="fm_drive_not_readable">%1$s este montat, dar nu poate fi citit acum</string> + <string name="fm_drive_access_title">Permite accesul la %1$s</string> + <string name="fm_drive_access_text">Android permite DroidDeck să vadă această unitate, dar nu să o citească. Activează Acces la toate fișierele pentru DroidDeck, apoi revino.</string> <string name="fm_list_view">Vizualizare listă</string> <string name="fm_grid_view">Vizualizare grilă</string> <string name="fm_search">Căutare</string> @@ -1614,6 +1798,93 @@ <string name="second_mode_keyboard_trackpad">Tastatură + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Mânere + trackpaduri Deck</string> + <string name="second_mode_dashboard">Tablou de bord</string> + <string name="bottom_dashboard_empty">Nimic de afișat aici încă.</string> + <string name="bottom_page_downloads">Descărcări</string> + <string name="bottom_downloads_none">Nicio descărcare în curs.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Se descarcă cache-ul de shadere</string> + <string name="bottom_downloads_paused">Întrerupt</string> + <string name="bottom_downloads_queued">Așteaptă să înceapă</string> + <string name="bottom_page_notifications">Notificări</string> + <string name="bottom_notifications_listener">Ecranul de jos DroidDeck</string> + <string name="bottom_notifications_why">Afișează aici mesajele și alte notificări în timp ce te joci. Rămân doar pe acest ecran și nu sunt salvate. Android întreabă o singură dată: pagina sa de acces la notificări se deschide pe acest ecran; activează DroidDeck acolo, iar această pagină revine singură.</string> + <string name="bottom_notifications_allow">Permite accesul la notificări</string> + <string name="bottom_notifications_none">Nicio notificare.</string> + <string name="bottom_notifications_count">Notificări: %1$d</string> + <string name="bottom_notifications_clear">Șterge</string> + <string name="bottom_page_screenshots">Capturi de ecran</string> + <string name="stats_fps_needs_hud">FPS necesită HUD-ul activat</string> + <string name="stats_speed">Viteză</string> + <string name="stats_pedals">Pedale</string> + <string name="stats_gforce">Forță G</string> + <string name="stats_timing">Cronometrare</string> + <string name="stats_best_lap">Cel mai bun tur</string> + <string name="stats_tires">Anvelope °C</string> + <string name="stats_trace">Accelerație și frână, ultimele 10 s</string> + <string name="stats_speed_chart">Viteză, %1$s</string> + <string name="stats_gear">Treaptă</string> + <string name="stats_speed_units">Unități de viteză</string> + <string name="stats_speed_units_auto">Automat (%1$s)</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Accelerație</string> + <string name="stats_brake">Frână</string> + <string name="stats_lights">Bord</string> + <string name="stats_lamp_shift">Schimbă treapta</string> + <string name="stats_lamp_handbrake">Frână de mână</string> + <string name="stats_lamp_pit">Limitator de boxe</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Ulei %1$s °C</string> + <string name="stats_power">Distribuitor de putere</string> + <string name="stats_fuel_t">Combustibil, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Rezervă %1$s t</string> + <string name="stats_tap_hint">Atinge banda de sus sau bordul pentru a-i schimba stilul.</string> + <string name="bottom_telemetry_send_title">Trimite date pentru tabloul de bord</string> + <string name="bottom_telemetry_send_auto">Automat</string> + <string name="bottom_telemetry_send_auto_hint">Activează trimiterea pentru fiecare joc din listă, inclusiv pentru jocurile găsite mai târziu. Jocurile pe care le dezactivezi rămân dezactivate.</string> + <string name="bottom_telemetry_send_note">Aceasta modifică setarea de ieșire a datelor din joc. Intră în vigoare la următoarea pornire a jocului; dezactivarea readuce setarea veche.</string> + <string name="bottom_telemetry_send_close">Închide %1$s pentru a schimba asta.</string> + <string name="bottom_telemetry_send_failed">Nu s-au putut modifica setările pentru %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activează %2$s în setările jocului, cu IP-ul 127.0.0.1 și portul %3$d.</string> + <string name="bottom_shots_where">Salvate în Pictures/DroidDeck. Capturile de ecran Steam apar și ele aici.</string> + <string name="bottom_shots_take">Fă o captură de ecran</string> + <string name="bottom_shots_saved">Captură de ecran salvată.</string> + <string name="bottom_shots_failed">Nu s-a putut face o captură de ecran.</string> + <string name="bottom_shots_none">Încă nu există capturi de ecran.</string> + <string name="bottom_page_chat">Chat și voce</string> + <string name="bottom_chat_why">Citește și răspunde aici la chatul Steam, în timp ce jocul continuă să ruleze pe ecranul principal. Folosește contul cu care este conectat Steam.</string> + <string name="bottom_chat_not_signed_in">Steam nu are încă o conectare web de partajat, așa că conectează-te aici o dată.</string> + <string name="bottom_chat_stopped">Android a închis pagina de chat cât timp DroidDeck era în fundal. Se redeschide când revii în DroidDeck.</string> + <string name="bottom_chat_open">Deschide Steam Chat</string> + <string name="bottom_chat_close">Închide chatul</string> + <string name="bottom_chat_mic_on">Microfon pornit</string> + <string name="bottom_chat_mic_off">Microfon oprit</string> + <string name="bottom_chat_mic_unavailable">Microfonul este oprit pentru acest joc. Pentru a vorbi, activează Microfon în setările Steam din DroidDeck (Sunet) și pornește din nou jocul.</string> + <string name="bottom_chat_volume">Volum %1$d%%</string> + <string name="bottom_page_telemetry">Statistici în joc</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterie</string> + <string name="bottom_telemetry_lap">Tur</string> + <string name="bottom_telemetry_position">Poziție</string> + <string name="bottom_telemetry_this_lap">Turul curent</string> + <string name="bottom_telemetry_last_lap">Ultimul tur</string> + <string name="bottom_telemetry_fuel">Combustibil</string> + <string name="bottom_telemetry_cargo">Încărcătură</string> + <string name="bottom_telemetry_pips">Puncte SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Statut legal</string> + <string name="bottom_telemetry_balance">Sold</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Activează ieșirea de date a unui joc de curse (numită adesea telemetrie sau UDP) pentru a vedea aici un bord în timp real. Datele rămân pe acest dispozitiv.</string> + <string name="bottom_telemetry_unknown_format">Portul %1$d primește date (%2$d pachete de %3$d octeți), dar într-un format pe care această pagină nu îl poate citi încă.</string> + <string name="bottom_telemetry_port_busy">Alt program folosește deja portul %1$s, așa că acel joc nu poate fi afișat aici.</string> <string name="rtinst_removing">Se elimină mediul de execuție Linux</string> <plurals name="rtinst_removing_entries"> @@ -1645,6 +1916,7 @@ <string name="flatpakmgr_not_ready">Configurează mai întâi Flatpak</string> <string name="flatpakmgr_starting">Se pornește</string> <string name="flatpakmgr_exit_status">Flatpak s-a închis cu starea %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s este construită pentru %2$s, pe care DroidDeck nu o poate rula. Aici aplicațiile Flatpak au nevoie de o versiune pentru ARM64 sau x86_64.</string> <string name="flatpakmgr_installing">Se instalează %1$s</string> <string name="flatpakmgr_updating">Se actualizează %1$s</string> <string name="flatpakmgr_removing">Se elimină %1$s</string> @@ -1738,6 +2010,7 @@ <string name="adbpair_applying">Se aplică setarea…</string> <string name="adbpair_command_failed">Comanda Depanării wireless a eșuat</string> <string name="adbpair_channel_name">Configurarea Depanării wireless</string> + <string name="adbpair_progress_channel_name">Progresul configurării Depanării wireless</string> <string name="adbpair_channel_description">Cere codul de asociere al Depanării wireless cât timp Setările sunt deschise</string> <string name="adbpair_title_pair">Asociază Depanarea wireless</string> <string name="adbpair_waiting_text">Activează Depanarea wireless, apoi apasă „Asociază dispozitivul cu un cod de asociere”.</string> @@ -1846,6 +2119,7 @@ <string name="gpuinfo_not_adreno">Nu este un GPU Adreno</string> <string name="gpuinfo_supported">Acceptat</string> <string name="gpuinfo_experimental">Experimental: driverele sale sunt versiuni de test</string> + <string name="gpuinfo_a850_experimental">Suport experimental pentru Adreno 850: necesită drivere experimentale compatibile de afișaj și de jocuri; neverificat pe acest dispozitiv</string> <string name="gpuinfo_below_tested">Sub hardware-ul testat (Adreno 725 și mai nou): poate să nu ruleze</string> <string name="gpuinfo_unsupported">Neacceptat: DroidDeck are nevoie de un GPU Adreno (Snapdragon)</string> @@ -1939,10 +2213,10 @@ <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> + <string name="display_follow_screen_scaled">Scalat %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Arată detaliile dispozitivului</string> <string name="device_info_hide">Ascunde detaliile dispozitivului</string> @@ -1957,7 +2231,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> @@ -1971,11 +2244,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> @@ -1993,9 +2264,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> @@ -2014,12 +2293,43 @@ <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> <string name="stores_sort">Sortează</string> + <string name="setup_rail_labels">Etichete în bara laterală</string> + <string name="setup_rail_labels_hint">Afișează numele sub pictogramele din bara laterală. Dezactivează pentru o bară laterală mai îngustă.</string> + <string name="library_display">Afișare</string> + <string name="library_display_larger">Carduri mai mari</string> + <string name="library_display_smaller">Carduri mai mici</string> + <string name="library_display_title">Afișează titlul</string> + <string name="library_display_size">Afișează dimensiunea</string> <string name="stores_sort_last_played">Jucate recent</string> <string name="stores_sort_recently_installed">Instalate recent</string> <string name="stores_sort_title_asc">Titlu A–Z</string> @@ -2146,6 +2456,9 @@ <string name="stores_download_manager">Administrator de descărcări</string> <string name="stores_parallel">Descărcări simultane</string> <string name="stores_install_where">Instalează în</string> + <string name="stores_install_language">Limba jocului</string> + <string name="stores_install_language_hint">GOG și Epic instalează această limbă. Sistem urmează limba aplicației.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Instalezi %1$s:</string> <string name="stores_target_internal">Internă</string> <string name="stores_target_free">%1$s liber</string> @@ -2168,6 +2481,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> @@ -2183,6 +2497,9 @@ <string name="edit_target">Țintă</string> <string name="edit_start_in">Pornește în</string> <string name="edit_launch_options">Opțiuni de lansare</string> + <string name="edit_launch_options_steam_hint">Comune cu Proprietățile din Steam: o modificare într-unul dintre locuri apare în ambele.</string> + <string name="edit_launch_options_not_saved">Opțiunile de lansare nu au putut fi salvate în Steam. Încearcă din nou.</string> + <string name="edit_launch_options_desktop">Steam poate fi deschis în sesiunea desktop. Schimbă opțiunile de lansare din Proprietățile lui sau închide mai întâi sesiunea.</string> <string name="edit_artwork">Grafică</string> <string name="edit_other_exe">Alt exe…</string> <string name="edit_remove">Elimină</string> @@ -2312,6 +2629,7 @@ <string name="setup_download_source_custom">Prefix propriu</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APLICAȚII LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplicații desktop pentru desktopul Linux, deschise din Desktop.</string> @@ -2454,6 +2772,22 @@ <string name="glasses_tracking_flat_hint">Modul Automat menține acest joc 2D fix în câmpul vizual. Alege Ecran virtual în Afișaj pentru a folosi urmărirea capului.</string> <string name="glasses_tracking_sbs_hint">Urmărirea capului se aplică unui ecran virtual sau unui joc SteamVR care rulează.</string> <string name="glasses_hardware">Dispozitiv</string> + <string name="vr_controllers_tab">Controllere</string> + <string name="vr_controllers_group">Controllere SteamVR</string> + <string name="vr_controllers_emulate">Gamepad în VR</string> + <string name="vr_controllers_emulate_hint">Cele două mâini VR pe care le joacă controllerul tău. Modificările se aplică imediat, chiar și cât rulează SteamVR. Joy-Con-urile și mâinile urmărite preiau în continuare partea lor.</string> + <string name="vr_controllers_off">Gamepad obișnuit</string> + <string name="vr_controllers_index">Controllere Valve Index</string> + <string name="vr_controllers_touch">Controllere Meta Quest 3</string> + <string name="vr_controllers_vive">Baghete HTC Vive</string> + <string name="vr_controllers_sticks">Stickurile încep prin</string> + <string name="vr_controllers_sticks_hint">Apasă ambele stickuri simultan în VR pentru a comuta.</string> + <string name="vr_controllers_sticks_game">A te mișca în joc</string> + <string name="vr_controllers_sticks_hands">A mișca mâinile</string> + <string name="vr_controllers_buttons">Butoane</string> + <string name="vr_controllers_buttons_stick">Trăgaciele sunt trăgaci, butoanele umăr apucă, A/B și X/Y sunt butoanele frontale ale fiecărei mâini, apăsarea stickurilor apasă thumbstickurile, Guide deschide meniul SteamVR. D-pad sus și jos apropie sau depărtează mâinile.</string> + <string name="vr_controllers_buttons_vive">Stickurile sunt trackpaduri; A/X sau apăsarea unui stick le apasă. Trăgaciele sunt trăgaci, butoanele umăr apucă, Start și Select sunt meniu, Guide deschide meniul SteamVR.</string> + <string name="vr_controllers_buttons_off">Fără mâini VR. Jocurile care acceptă gamepad, și meniul SteamVR, primesc controllerul ca de obicei.</string> <string name="glasses_brightness">Luminozitate</string> <string name="glasses_volume">Volum</string> <string name="glasses_sunblock">Întunecare</string> @@ -2502,7 +2836,7 @@ <string name="hand_camera_not_now">Nu acum</string> <string name="hand_camera_setting">Urmărirea mâinilor cu camera</string> <string name="hand_camera_setting_hint">Folosește camera telefonului pentru gesturi cu mâinile goale sau pentru a poziționa controlerele Joy-Con asociate în VR. Controlerele Joy-Con oferă comenzi de rotație și comenzi de butoane. Pune pauză în timp ce ochelarii inteligenți urmăresc mâinile sau controlerele Joy-Con. Imaginile sunt procesate numai pe acest dispozitiv.</string> - <string name="hand_camera_choice">Camera</string> + <string name="hand_camera_choice">Cameră</string> <string name="hand_camera_access">Acces la cameră</string> <string name="hand_camera_access_hint">Permite accesul la cameră pentru a putea începe urmărirea mâinilor.</string> <string name="hand_camera_access_denied">Accesul la cameră este dezactivat. Activează-l din setările Android.</string> @@ -2511,6 +2845,12 @@ <string name="hand_camera_placement">Poziționarea camerei</string> <string name="hand_camera_placement_hint">Verifică dacă te vede camera înainte de a juca.</string> <string name="hand_camera_check">Verifică</string> + <string name="tracking_pack_title">Descărcare urmărire mâini</string> + <string name="tracking_pack_hint">Urmărirea mâinilor necesită o descărcare unică de %1$s.</string> + <string name="tracking_pack_download">Descarcă</string> + <string name="tracking_pack_retry">Reîncearcă</string> + <string name="tracking_pack_downloading">Se descarcă urmărirea mâinilor… %1$d%%</string> + <string name="tracking_pack_failed">Urmărirea mâinilor nu a putut fi descărcată. Verifică conexiunea și încearcă din nou.</string> <string name="hand_camera_check_title">Poziționarea camerei</string> <string name="hand_camera_how_rear">Așază dispozitivul vertical, la 1,5–2 metri distanță, cam la înălțimea pieptului, cu camera din spate îndreptată spre tine. Apoi intră în cadru cu mâinile întinse.</string> <string name="hand_camera_how_front">Așază dispozitivul vertical, la 1,5–2 metri distanță, cam la înălțimea pieptului, cu ecranul îndreptat spre tine. Apoi intră în cadru cu mâinile întinse.</string> @@ -2582,6 +2922,21 @@ <string name="storage_safe_hint">Medii de execuție nefolosite, resturi, jurnale vechi</string> <string name="storage_clean_up">Se curăță…</string> <string name="storage_session_running">Oprește sesiunea pentru a curăța sau șterge ceva. Dimensiunile rămân vizibile.</string> + <string name="storage_default_group">Locație de instalare</string> + <string name="storage_default_title">Stocare implicită</string> + <string name="storage_default_hint">Instalările noi din magazine merg în locația selectată. Jocurile existente rămân unde sunt. Bibliotecile Steam își păstrează propria setare.</string> + <string name="storage_default_ask">Întreabă de fiecare dată</string> + <string name="storage_default_ask_detail">Alege o destinație pentru fiecare instalare</string> + <string name="storage_default_internal">Stocare internă</string> + <string name="storage_default_external">Stocare externă</string> + <string name="storage_default_external_detail">%1$s · %2$s liber</string> + <string name="storage_default_external_missing">Neconectat</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s liber</string> + <string name="storage_default_folder_missing">Neconectat</string> + <string name="storage_default_choose_folder">Alege un folder…</string> + <string name="storage_default_choose_folder_detail">Folosește orice folder de pe un card SD sau o unitate USB</string> + <string name="storage_default_note">Jocurile sunt puse într-un folder Games din locația selectată. Jocurile existente nu sunt mutate.</string> <string name="storage_where">Unde ajunge</string> <string name="storage_games">Jocuri Steam</string> <string name="storage_game_data">Datele jocurilor</string> @@ -2710,6 +3065,9 @@ <string name="storage_data_installed">Jocuri instalate</string> <string name="storage_data_parts">Prefixe %1$s · shadere %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Șterge shaderele</string> + <string name="storage_reset_prefix">Resetează prefixul</string> + <string name="storage_reset_prefix_title">Resetezi prefixul pentru %1$s?</string> + <string name="storage_reset_prefix_confirm">Șterge prefixul Wine (%1$s) din %2$s și îl recreează la următoarea lansare. Salvările, setările și pachetele redistribuibile instalate în el se pierd; salvările din Steam Cloud rămân în contul tău.</string> <string name="storage_data_leftovers">Jocuri șterse</string> <string name="storage_steam_app">Aplicația Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefixul mai conține fișiere, probabil salvări locale</string> @@ -3013,4 +3371,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizează cu Syncthing</string> + <string name="sync_enable_hint">Bazată pe Syncthing-Fork, aceasta este o implementare Syncthing care îți permite să sincronizezi fișierele din sistemul de fișiere intern al DroidDeck cu alte instanțe Syncthing. Este doar pentru fișierele pe care le păstrezi în sistemul de fișiere intern al DroidDeck.</string> + <string name="sync_missing">Această versiune nu include Syncthing.</string> + <string name="sync_starting">Se pornește Syncthing</string> + <string name="sync_status_starting">Se pornește</string> + <string name="sync_status_up_to_date">Actualizat</string> + <string name="sync_status_syncing">Se sincronizează</string> + <string name="sync_status_paused">Întrerupt</string> + <string name="sync_status_pausing">Se întrerupe</string> + <string name="sync_status_resuming">Se reia</string> + <string name="sync_status_attention">Necesită atenție</string> + <string name="sync_status_failed">Syncthing s-a oprit</string> + <string name="sync_failed_retry">Încearcă din nou</string> + <string name="sync_paused_wifi">Întrerupt până la Wi-Fi</string> + <string name="sync_paused_game">Întrerupt în timpul jocului</string> + <string name="sync_summary">Foldere: %1$d · dispozitive conectate: %2$d din %3$d</string> + <string name="sync_left">Rămas: %1$s</string> + <string name="sync_open_web_ui">Deschide interfața web</string> + <string name="sync_pause">Întrerupe</string> + <string name="sync_resume">Reia</string> + <string name="sync_running">Rulează</string> + <string name="sync_running_hint">Dezactivează pentru a opri complet Syncthing.</string> + <string name="sync_this_device">Acest dispozitiv</string> + <string name="sync_device_id">ID dispozitiv</string> + <string name="sync_show_qr">Arată codul QR</string> + <string name="sync_advanced">Avansat</string> + <string name="sync_advanced_hint">Porturi, când să ruleze, resetare</string> + <string name="sync_open">Deschide</string> + <string name="sync_waiting">Te așteaptă</string> + <string name="sync_pending_device">%1$s vrea să se conecteze</string> + <string name="sync_pending_folder">%1$s vrea să partajeze „%2$s”</string> + <string name="sync_pending_folder_hint">Acceptă pentru a alege unde este salvat în DroidDeck.</string> + <string name="sync_review">Verifică în interfața web</string> + <string name="sync_folders">Foldere</string> + <string name="sync_no_folders">Niciun folder încă.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizat</string> + <string name="sync_folder_syncing">Se sincronizează %1$d%%</string> + <string name="sync_folder_scanning">Se scanează</string> + <string name="sync_folder_paused">Întrerupt</string> + <string name="sync_folder_out_of_sync">Nesincronizat</string> + <string name="sync_folder_errors">Fișiere care nu s-au putut sincroniza: %1$d</string> + <string name="sync_folder_blocked">Blocat</string> + <string name="sync_folder_blocked_hint">Acest folder se află în afara spațiului de stocare DroidDeck, așa că DroidDeck l-a întrerupt. Pentru a sincroniza foldere din afara DroidDeck, folosește aplicația Syncthing-Fork.</string> + <string name="sync_remove_folder">Elimină din Syncthing</string> + <string name="sync_remove_folder_hint">Eliminarea nu șterge niciun fișier.</string> + <string name="sync_devices">Dispozitive</string> + <string name="sync_no_devices">Niciun dispozitiv încă.</string> + <string name="sync_connected">Conectat</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Văzut ultima dată %1$s</string> + <string name="sync_device_id_title">ID-ul acestui dispozitiv</string> + <string name="sync_device_id_hint">Pe celălalt dispozitiv, adaugă un dispozitiv în Syncthing și scanează acest cod sau lipește ID-ul. Apoi acceptă-l aici, în interfața web.</string> + <string name="sync_copy">Copiază</string> + <string name="sync_share">Partajează</string> + <string name="sync_done">Gata</string> + <string name="sync_off_title">Dezactivezi Syncthing?</string> + <string name="sync_off_body">Syncthing se oprește acum și rămâne oprit până când îl activezi din nou. Fișierele sincronizate rămân unde sunt.</string> + <string name="sync_off_forget">Șterge și configurația Syncthing</string> + <string name="sync_off_forget_hint">Elimină ID-ul acestui dispozitiv, folderele și dispozitivele. La reactivare, pornește de la zero.</string> + <string name="sync_turn_off">Dezactivează</string> + <string name="sync_ports">Porturi</string> + <string name="sync_port_sync">Sincronizare</string> + <string name="sync_port_discovery">Descoperire locală</string> + <string name="sync_repick">Alege porturi noi</string> + <string name="sync_repick_hint">Verificate din nou la fiecare pornire.</string> + <string name="sync_repick_button">Alege din nou</string> + <string name="sync_reset_group">Resetare</string> + <string name="sync_api_key">Cheie API</string> + <string name="sync_regenerate">Regenerează</string> + <string name="sync_reset">Resetează Syncthing</string> + <string name="sync_reset_hint">ID de dispozitiv nou, folderele și dispozitivele sunt eliminate. Fișierele din spațiul de stocare DroidDeck sunt păstrate.</string> + <string name="sync_reset_button">Resetează</string> + <string name="sync_reset_confirm_title">Resetezi Syncthing?</string> + <string name="sync_running_group">Rulare</string> + <string name="sync_run">Rulează</string> + <string name="sync_run_open">Cât timp DroidDeck este deschis</string> + <string name="sync_run_background">În fundal</string> + <string name="sync_wifi_only">Doar prin Wi-Fi</string> + <string name="sync_pause_games">Întrerupe în timpul jocurilor</string> + <string name="sync_logs">Jurnale</string> + <string name="sync_logs_hint">Ieșirea Syncthing pentru această sesiune</string> + <string name="sync_logs_share">Partajează</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Instalează mai întâi mediul de execuție Linux.</string> + <string name="sync_accept">Acceptă</string> + <string name="sync_accept_title">Salvează „%1$s” în</string> + <string name="sync_add_folder">Adaugă folder</string> + <string name="sync_add_folder_hint">Sincronizează un folder din spațiul de stocare DroidDeck</string> + <string name="sync_choose">Alege</string> + <string name="sync_add">Adaugă</string> + <string name="sync_add_failed">Folderul nu a putut fi adăugat.</string> + <string name="sync_share_with">Partajează cu</string> + <string name="sync_share_none">Niciun dispozitiv încă. Poți partaja acest folder mai târziu din interfața web.</string> + <string name="sync_use_folder">Folosește acest folder</string> + <string name="sync_new_folder">Folder nou</string> + <string name="sync_location_home">Directorul home al containerului</string> + <string name="sync_location_sync">Folderul Sync</string> + <string name="sync_location_shared">Stocarea partajată DroidDeck</string> + <string name="sync_location_card">DroidDeck pe %1$s</string> + <string name="sync_location_app">Datele aplicației DroidDeck</string> + <string name="sync_web_path_locked">Folderele noi sunt salvate în folderul Sync al DroidDeck. Pentru a sincroniza alt folder DroidDeck, folosește Adaugă folder din fila Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Reîncarcă</string> + <string name="sync_not_running">Syncthing nu rulează.</string> + <string name="session_end_steam_sigill">Steam s-a oprit cu o instrucțiune ilegală (SIGILL). Poate fi o problemă de compatibilitate a instrucțiunilor CPU sau o blocare a clientului. Partajează jurnalele împreună cu detaliile dispozitivului.</string> + <string name="session_end_steam_try_x64">Poți încerca Setări Steam → Client Steam → x86-64 (experimental). Necesită o descărcare suplimentară și poate rula mai lent.</string> + <string name="session_end_vulkan_device">Driverul grafic Linux nu a găsit un dispozitiv Vulkan utilizabil. Verifică dacă driverul GPU Linux selectat acceptă acest GPU.</string> + <string name="session_end_gpu_unsupported">Această sesiune nu poate porni deoarece acest GPU nu are un driver Vulkan Linux compatibil în configurația actuală. Driverele Adreno Turnip nu pot activa suportul pentru GPU-uri MediaTek/Mali.</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_resources_browser">Se deschide în browser</string> + <string name="game_resource_guides">Ghiduri</string> + <string name="game_resource_protondb_detail">Rapoarte de compatibilitate Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pentru jocurile cu salvări în contul tău Steam</string> + <string name="game_resource_search">Căutare pe web</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="library_filter">Filtru</string> + <string name="library_filter_installed">Doar instalate</string> + <string name="library_filter_all_owned">Toate jocurile deținute</string> + <string name="library_no_installed_matches">Niciun joc instalat nu corespunde acestor filtre.</string> + <string name="library_browse_owned">Răsfoiește jocurile deținute</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="stores_itch_updates_found">Actualizări disponibile: %1$d</string> + <string name="stores_itch_update_replaced">Dezvoltatorul a înlocuit această versiune cu %1$s. Actualizezi la ea?</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Setări cloud</string> + <string name="integration_title">Integrare Steam</string> + <string name="integration_count">%1$d din %2$d activate</string> + <string name="integration_set_up">Configurează</string> + <string name="integration_location">Locație</string> + <string name="integration_app_info">Informații despre aplicație</string> + <string name="integration_wifi">Nume Wi-Fi</string> + <string name="integration_brightness">Luminozitate</string> + <string name="integration_home">DroidDeck ca Acasă</string> + <string name="integration_shortcuts">Comenzi rapide pentru butonul Acasă</string> + <string name="integration_wifi_hint">Afișează rețelele în Steam · necesită acces la locație, fără urmărire</string> + <string name="integration_wifi_on">Rețelele apar în Steam</string> + <string name="integration_wifi_location_off">Locația este dezactivată</string> + <string name="integration_wifi_denied">Locație refuzată · permite-o în Informații despre aplicație</string> + <string name="integration_brightness_hint">Glisorul din Steam setează luminozitatea ecranului</string> + <string name="integration_home_hint">Acasă deschide meniul Steam într-o sesiune</string> + <string name="integration_shortcuts_hint">Ține apăsat Acasă pentru combinațiile Steam Guide</string> + <string name="integration_shortcuts_needs_home">Necesită DroidDeck ca Acasă</string> + <string name="integration_shortcuts_maybe_restricted">Inactiv în Android? Informații despre aplicație → ⋮ → Permite setările restricționate</string> + <string name="integration_shortcuts_restricted">Blocat de Android · Informații despre aplicație → ⋮ → Permite setările restricționate</string> + <string name="integration_shortcuts_service">Butonul Acasă DroidDeck</string> + <string name="integration_shortcuts_service_description">Transmite apăsările butonului Acasă către Steam Guide cât timp o sesiune Steam este activă și DroidDeck este aplicația Acasă implicită. Nu citește conținutul ecranului.</string> + <string name="integration_brightness_needed">Activează Luminozitate în Configurare → Integrare Steam</string> + <string name="apps_search_hint">Caută aplicații</string> + <string name="apps_no_match">Nicio aplicație nu se potrivește cu „%1$s”.</string> + <string name="apps_add_widget">Adaugă widget</string> + <string name="apps_widgets_loading">Se încarcă widgeturile…</string> + <string name="apps_widgets_none">Nicio aplicație de pe acest dispozitiv nu oferă widgeturi.</string> + <string name="apps_widget_wider">Mai lat</string> + <string name="apps_widget_narrower">Mai îngust</string> + <string name="apps_widget_taller">Mai înalt</string> + <string name="apps_widget_shorter">Mai scund</string> + <string name="apps_widget_move_earlier">Mută mai devreme</string> + <string name="apps_widget_move_later">Mută mai târziu</string> + <string name="apps_widget_configure">Setări widget</string> + <string name="apps_widget_remove">Elimină widgetul</string> + <string name="apps_add_to_folder">Adaugă în dosar</string> + <string name="apps_new_folder">Dosar nou</string> + <string name="apps_remove_from_folder">Elimină din dosar</string> + <string name="apps_app_info">Informații despre aplicație</string> + <string name="apps_uninstall">Dezinstalează</string> + <string name="apps_folder_rename">Redenumește</string> + <string name="apps_folder_ungroup">Degrupează</string> + <string name="apps_folder_default">Dosar</string> + <string name="apps_folder_name">Numele dosarului</string> + <string name="apps_filter">Afișează</string> + <string name="apps_filter_all">Toate aplicațiile</string> + <string name="apps_filter_games">Jocuri</string> + <string name="apps_filter_downloaded">Descărcate</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Ascunse</string> + <string name="apps_hide">Ascunde</string> + <string name="apps_unhide">Afișează în aplicații</string> + <string name="apps_shortcut_remove">Elimină comanda rapidă</string> + <string name="apps_pin_title">Adaugă în Aplicații</string> + <string name="apps_pin_add">Adaugă</string> + <string name="apps_hidden_none">Nicio aplicație ascunsă.</string> + <string name="apps_sort_name_asc">Nume A–Z</string> + <string name="apps_sort_name_desc">Nume Z–A</string> + <string name="apps_sort_installed">Instalate recent</string> + <string name="apps_sort_updated">Actualizate recent</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicație</item> + <item quantity="few">%d aplicații</item> + <item quantity="other">%d de aplicații</item> + </plurals> + <string name="desktop_restore_title">Se restaurează software-ul</string> + <string name="desktop_restore_body">Se reinstalează aplicațiile adăugate de tine după o actualizare DroidDeck.</string> + <string name="desktop_restore_done_title">Software restaurat</string> + <string name="desktop_restore_done_body">Aplicațiile adăugate de tine sunt instalate din nou.</string> + <string name="desktop_restore_failed_title">O parte din software nu a putut fi restaurată</string> + <string name="desktop_restore_failed_body">Vezi ~/.cache/droiddeck/apt-restore.log, apoi încearcă sudo apt install în Konsole.</string> + <string name="gog_full_files">Optimizările native nu sunt disponibile. Descărcarea include fișiere de înlocuire complete.</string> + <string name="gog_recover">Verifică rezultatul patch-ului</string> + <string name="slow_usb_title">Conexiune USB lentă</string> + <string name="slow_usb_cable">%1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s), așa că jocurile de pe el se vor încărca lent. Folosește un cablu USB 3 de 5 Gbps sau mai rapid, încearcă să întorci mufa USB-C sau folosește o unitate mai rapidă.</string> + <string name="slow_usb_port">%1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s). Portul USB al acestui dispozitiv nu poate merge mai repede, așa că jocurile se vor încărca lent. Memoria internă sau un card microSD pot fi mai rapide.</string> + <string name="slow_usb_never">Nu mai afișa</string> + <string name="slow_usb_dismiss">Închide</string> + <string name="steam_import_title">Repornești Steam pentru a adăuga jocurile tale?</string> + <string name="steam_import_body">Steam poate afișa ca instalate aceste jocuri pe care le deții: %1$s. Trebuie să repornească pentru a le afișa. Repornește acum sau vor fi adăugate la următoarea pornire a Steam.</string> + <string name="steam_import_names_more">%1$s și încă %2$d</string> + <string name="steam_import_now">Repornește acum</string> + <string name="steam_import_later">Mai târziu</string> + <string name="gog_maintenance">Gestionează instalarea GOG</string> + <string name="gog_check">Caută actualizări</string> + <string name="gog_repair">Verifică/Repară</string> + <string name="gog_patches">Patch-uri offline</string> + <string name="gog_refresh">Descarcă programul de instalare offline complet</string> + <string name="gog_update">Actualizează la %1$s</string> + <string name="gog_resume">Reia întreținerea GOG</string> + <string name="gog_open_patch">Deschide programul de instalare a patch-ului</string> + <string name="gog_patch_in_session">Finalizează sau anulează instalarea patch-ului în sesiunea Linux.</string> + <string name="gog_patch_requirements">Alege un patch pentru versiunea și limba instalate. Versiunile sursă acceptate pot să nu fie listate.</string> + <string name="gog_no_patches">GOG nu are patch-uri Windows independente pentru acest joc.</string> + <string name="gog_managed_files">Fișierele de joc modificate pot fi înlocuite.</string> + <string name="gog_patch_installer_note">Programul de instalare se deschide în sesiunea ta Linux.</string> + <string name="gog_download_label">Descărcare</string> + <string name="gog_space_label">Spațiu suplimentar</string> + <string name="gog_space_estimate_label">Spațiu estimat</string> + <string name="gog_repair_action">Repară fișierele</string> + <string name="gog_refresh_action">Reîmprospătează instalarea</string> + <string name="gog_select_patch">Selectează</string> + <string name="setup_all_files">Acces la toate fișierele</string> + <string name="setup_local_network">Rețea locală</string> + <string name="libraries_title">Mai multe biblioteci Steam</string> + <string name="libraries_hint">Dosare în care Steam poate instala și porni jocuri, fiecare cu propriul nume. Eliminarea păstrează jocurile pe disc.</string> + <string name="libraries_add">Adaugă bibliotecă</string> + <string name="libraries_rename_title">Numele bibliotecii</string> + <string name="libraries_pick">Alege un dosar pentru bibliotecă</string> + <string name="libraries_full">Cel mult %1$d biblioteci suplimentare</string> + <string name="libraries_overlap">Acest dosar este deja o bibliotecă sau se află într-una</string> + <string name="libraries_missing">%1$s · indisponibilă</string> + <string name="libraries_applies_next">Se aplică de la următoarea sesiune Steam</string> + <string name="bottom_desktop_start">Pornește desktopul</string> + <string name="bottom_desktop_mode_touch">Atingere directă</string> + <string name="bottom_desktop_trackpad">Trackpad. Atinge pentru atingere directă</string> + <string name="bottom_desktop_direct_touch">Atingere directă. Atinge pentru trackpad</string> + <string name="bottom_desktop_starting">Se pornește desktopul KDE…</string> + <string name="bottom_desktop_ended">Desktopul s-a închis.</string> + <string name="bottom_desktop_failed">Desktopul nu a putut porni. Jurnalele sunt în dosarul bottom-desktop al acestei sesiuni.</string> + <string name="bottom_desktop_off">Desktopul este închis.</string> + <string name="libraries_rename">Redenumește</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-ru/gestures.xml b/app/src/main/res/values-ru/gestures.xml index bb758cb1b..4c630b780 100644 --- a/app/src/main/res/values-ru/gestures.xml +++ b/app/src/main/res/values-ru/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Жесты</string> <string name="gesture_settings">Настройки сенсорных жестов</string> - <string name="gesture_settings_hint">Настройте жесты мыши и клавиатуры. Чтобы использовать их, выберите режим касаний «Жесты».</string> <string name="gesture_tap">Касание</string> <string name="gesture_drag">Перетаскивание одним пальцем</string> <string name="gesture_long_press">Долгое нажатие</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Удержание тремя пальцами</string> <string name="gesture_pinch">Масштабирование щипком</string> <string name="gesture_hold_button">Удерживать кнопку нажатой</string> + <string name="gesture_hold_left">Удерживать левую кнопку нажатой</string> + <string name="gesture_hold_right">Удерживать правую кнопку нажатой</string> <string name="gesture_click_once">Один щелчок</string> <string name="gesture_hold_delay">Задержка удержания</string> <string name="gesture_double_delay">Интервал двойного касания</string> diff --git a/app/src/main/res/values-ru/shortcuts.xml b/app/src/main/res/values-ru/shortcuts.xml new file mode 100644 index 000000000..783abb4bd --- /dev/null +++ b/app/src/main/res/values-ru/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Действия физических кнопок</string> + <string name="shortcuts_dd_menu">Меню DroidDeck</string> + <string name="shortcuts_capture">Назначить: %1$s</string> + <string name="shortcuts_press">Нажмите и отпустите кнопку. Назначение сохранится автоматически.</string> + <string name="shortcuts_release">Отпустите кнопку, чтобы продолжить.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Эта кнопка уже назначена для: %1$s</string> + <string name="shortcuts_save">Переназначить</string> + <string name="shortcuts_retry">Попробовать другую кнопку</string> + <string name="shortcuts_limitations">Кнопка «Домой» и некоторые дополнительные кнопки могут быть недоступны.</string> +</resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 592685d83..0cc91a860 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Параметры VKD3D для D3D12. nodxr отключает трассировку лучей; используйте только для игры, которой это нужно.</string> <string name="game_env_proton_log">Установите 1 для создания диагностического журнала Proton. Ведение журнала может снизить производительность и занять место.</string> <string name="game_env_wined3d">Установите 1, чтобы использовать WineD3D на базе OpenGL вместо DXVK для тестирования совместимости с D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер для DirectDraw, Direct3D 1-7 и игр, запущенных через WineD3D. Vulkan обходит путь OpenGL через Zink и намного быстрее для старых игр DirectDraw и Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Установите 1, чтобы запускать Direct3D 8 через DXVK вместо WineD3D. Быстрее в тесте Direct3D 8 из AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Установите 1, чтобы не использовать ntsync (droiddeck-ntsync или драйвер ядра) для этой игры; тогда используется droiddeck-esync, если есть пакет, иначе droiddeck-fsync.</string> <string name="game_env_no_esync">Установите 1, чтобы отключить droiddeck-esync для этой игры; вместо него используется droiddeck-fsync или droiddeck-ntsync, если fsync тоже отключен.</string> <string name="game_env_no_fsync">Установите 1, чтобы не использовать droiddeck-fsync для этой игры; тогда используется droiddeck-esync, если есть пакет, иначе droiddeck-ntsync.</string> <string name="game_env_fsync_first">Установите 1, чтобы запускать эту игру на droiddeck-fsync, или 0, чтобы ставить droiddeck-esync первым, когда для ее Proton есть пакет.</string> <string name="game_env_xalia">Установите 0, чтобы отключить помощник навигации геймпада Proton для этой игры.</string> + <string name="game_env_anticheat_offline">Включено по умолчанию. Запускает игру с Easy Anti-Cheat без античита, если игра поддерживает офлайн-режим. Отключите, чтобы запускать через Easy Anti-Cheat как обычно. Онлайн-режимы, требующие Easy Anti-Cheat, остаются недоступны.</string> <string name="game_env_hud">Оверлей DXVK для D3D9–11. fps показывает частоту кадров; если не задано — оверлей скрыт.</string> <string name="game_env_dxvk_config">Настройки DXVK, разделенные точкой с запятой. В последних версиях используется dxvk.maxFrameRate для ограничения частоты кадров; для повседневной игры рекомендуется использовать ограничитель частоты кадров сессии.</string> + <string name="game_env_cores">Ядра CPU для этой игры, например 0-4 или 0,2,4, вместо ядер игры сессии. Меньше ядер — меньше нагрев.</string> <string name="game_env_vkd3d_limit">Ограничение частоты кадров D3D12. 0 отключает ограничение.</string> <string name="game_env_glthread">Многопоточность Mesa OpenGL. Для игр OpenGL с ограничением CPU значение true может помочь; тестируйте отдельно для каждой игры.</string> <string name="sync_backend_title">Синхронизация Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX запускает x86-программы Linux на этом ARM64-устройстве. «Авто» использует его, если программа собрана для x86.</string> <string name="app_fex_x86">%1$s через FEX</string> <string name="app_fex_not_ready">Эта программа собрана для ПК на %1$s и работает через FEX, который еще не настроен. Откройте Steam один раз, войдя в аккаунт: DroidDeck скачает через него FEX и нужную Steam Linux Runtime, после чего программа откроется.</string> + <string name="session_proot_missing">Не удалось скачать proot DroidDeck. Проверьте подключение и повторите попытку. Сессия не запущена, так как резервный proot слишком медленный для игры.</string> + <string name="session_directaudio_missing">Не удалось скачать DirectAudio, поэтому в этой сессии звук игр идёт по более медленному пути.</string> <string name="session_end_program">Эта программа</string> <string name="session_end_steam_download">Не удалось скачать клиент Steam. Возможно, ваша сеть или VPN блокирует серверы Steam; проверьте подключение и повторите попытку.</string> <string name="session_end_steam_setup">Не удалось настроить клиент Steam. Проверьте подключение и свободное место, затем повторите попытку.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Контроллер Xbox 360</string> <string name="mode_controller_note">Deck: кнопка быстрого доступа и гироскоп. Steam Controller: то же самое, с датчиком хвата на задних кнопках. DualShock 4 и DualSense: гироскоп, а трекпады работают как их тачпад. Xbox 360: используйте Guide+A для быстрого доступа.</string> <string name="mode_back">Назад</string> + <string name="back_hold">Удержание «Назад» для сочетаний Steam</string> + <string name="back_hold_hint">Удержание «Назад» открывает быстрый доступ или создаёт сочетания Steam с другими кнопками. Выключите, чтобы удержание игнорировалось; нажатие и двойное нажатие работают.</string> + <string name="back_native_qam_hint">Удерживайте «Назад» 700 мс или удерживайте «Назад» и нажмите другую кнопку для сочетаний Steam.</string> + <string name="back_double_tap_window">Интервал двойного нажатия</string> + <string name="back_tap_ms">%1$d мс</string> + <string name="brightness_permission_title">Разрешить управление яркостью</string> + <string name="brightness_permission_text">Настройте управление яркостью в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сессия</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Актуально · %1$s</string> <string name="mode_decky_loader">Загрузчик</string> <string name="mode_decky_install_latest">Установить последнюю</string> + <string name="decky_channel">Канал обновлений</string> + <string name="decky_channel_hint">Какие выпуски Decky Loader устанавливать. Встроенное средство обновления Decky использует тот же канал.</string> + <string name="decky_channel_stable">Стабильный</string> + <string name="decky_channel_prerelease">Предварительный</string> + <string name="decky_channel_testing">Тестовый</string> + <string name="decky_channel_failed">Не удалось сохранить канал обновлений Decky</string> <string name="mode_decky_on">Запускается вместе со Steam. Пока включено, другие приложения на этом устройстве могут управлять Steam.</string> <string name="mode_decky_off">Выкл. Порт удаленной отладки Steam остается закрытым.</string> <string name="mode_decky_remove_title">Удалить Decky Loader?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">Отключите, если игры вылетают или показывают черный экран в режиме Deck. Вступит в силу в следующей сессии.</string> <string name="mode_return_after_game">Возвращаться в DroidDeck после игры</string> <string name="mode_return_after_game_hint">Когда игра, запущенная из DroidDeck или другого лаунчера, закрывается, Steam корректно завершает работу (сначала синхронизирует облачные сохранения), и вы возвращаетесь туда. Выкл.: остаётесь в Steam.</string> + <string name="mode_shader_precache">Предварительное кэширование шейдеров</string> + <string name="mode_shader_precache_hint">Steam скачивает готовые шейдеры для ваших игр и обрабатывает их в фоне, поэтому игры меньше подтормаживают. Если отключено, экономятся трафик, место и батарея; игры собирают шейдеры прямо во время игры. Это та же настройка, что и «Загрузки > Предварительное кэширование шейдеров» в Steam. Применится в следующей сессии.</string> <string name="mode_steam_repair">Восстановить клиент Steam</string> <string name="mode_steam_repair_hint">При следующем запуске Steam клиент будет скачан заново. Используйте, если Steam зависает на экране загрузки. Игры, вход и настройки сохраняются.</string> <string name="mode_steam_repair_queued">Клиент Steam будет скачан заново при следующем запуске Steam.</string> @@ -378,6 +415,8 @@ <string name="mode_directaudio_hint">Обходит PulseAudio для снижения задержки.</string> <string name="mode_mic">Микрофон</string> <string name="mode_mic_hint">Используется для голосового чата.</string> + <string name="drawer_mic_hint">Включить или отключить захват микрофона в этой сессии.</string> + <string name="drawer_mic_failed">Не удалось изменить микрофон. Повторите попытку.</string> <string name="mode_network">Сеть</string> <string name="mode_wifi_discovery">Обнаружение Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показывает названия сетей Wi-Fi и сети поблизости в Steam.</string> @@ -541,14 +580,24 @@ <string name="perf_gsrealtime">gamescope: очередь GPU в реальном времени</string> <string name="perf_gsrealtime_hint">Повышает приоритет работы GPU композитора. Может улучшить стабильность времени кадра, но потребляет часть производительности игры.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Память</string> + <string name="perf_cap_off">Выкл.</string> + <string name="perf_cap_auto">По умолчанию драйвера</string> + <string name="perf_zram_client">Сжимать Steam во время игры</string> + <string name="perf_zram_client_hint">Через 20 с после запуска игры клиент Steam сжимается в zRAM, чтобы оставить игре больше памяти, и считывается обратно после закрытия игры. Отключите, если сессия закрывается вскоре после запуска игр. Лимит RAM выше всё равно сжимает Steam, когда сессия его превышает.</string> + <string name="perf_ram_cap">Лимит RAM</string> + <string name="perf_ram_cap_hint">Действует, пока работает клиент Steam, в режиме Steam или с рабочего стола. Когда сессия использует больше этого значения, Steam, а затем другие поддерживаемые процессы сессии сжимаются в zRAM. Мягкий лимит: ничего не закрывается, но игры могут подтормаживать, пока страницы возвращаются.</string> + <string name="perf_ram_cap_unavailable">Нужен своп zRAM, которого на этом устройстве нет.</string> + <string name="perf_vram_cap">Лимит VRAM</string> + <string name="perf_vram_cap_hint">Объём видеопамяти, который DXVK сообщает играм Direct3D, чтобы они рассчитывали текстуры на меньший объём. Собственные настройки DXVK игры имеют приоритет. Вступит в силу в следующей сессии.</string> <string name="perf_gpuclock">Поддерживать максимальную частоту GPU</string> <string name="perf_gpuclock_hint">Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева.</string> <string name="perf_fixes">Исправления сессии</string> <string name="perf_sysmem">Turnip: рендеринг sysmem</string> <string name="perf_sysmem_hint">Клиент Steam будет быстрее; в играх драйвер для каждого прохода выбирает тайловый рендеринг или рендеринг в системной памяти. Требуется для Adreno 710/720/722.</string> <string name="perf_xalia">Пропустить помощник xalia в Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (экспериментально)</string> - <string name="perf_fastsync_hint">Замена драйвера ntsync Linux в пространстве пользователя, для тестирования. Пока включено, Proton использует ее вместо droiddeck-esync и droiddeck-fsync. Работает с Proton Experimental ARM64, GE-Proton и proton-cachyos. Вступит в силу в следующей сессии.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Замена драйвера ntsync Linux в пространстве пользователя. Пока включено, Proton использует ее вместо droiddeck-esync и droiddeck-fsync. Работает с Proton Experimental ARM64, GE-Proton и proton-cachyos. Вступит в силу в следующей сессии.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync в приоритете</string> <string name="perf_fsync_hint">Запускает собственный fsync Proton на стандартных файлах Proton, а futex_waitv предоставляется в пространстве пользователя: пакет не нужен, и все продолжает работать сразу после обновления Proton в Steam. Пока включено, игры используют его раньше droiddeck-esync, кроме тех немногих, для которых Proton отключает fsync. Вступит в силу в следующей сессии.</string> @@ -559,6 +608,8 @@ <string name="perf_fastpath">Быстрый путь proot</string> <string name="perf_fastpath_needs_seccomp">Требуется фильтр seccomp для proot.</string> <string name="perf_fastpath_hint">Быстрый поиск файлов, меньше подтормаживаний. Отключите, если программа не находит файлы.</string> + <string name="perf_cursor_composite">Рисовать курсор внутри gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам отрисовывает указатель, а не передаёт его Android. Включите для курсора, управляемого контроллером. На телефоне быстрее, если отключено. Применится в следующей сессии.</string> <string name="perf_identity">Имя сессии</string> <string name="perf_hostname">Имя хоста</string> <string name="perf_hostname_hint">Имя, под которым Steam видит это устройство. Оставьте пустым, чтобы вернуть %1$s.</string> @@ -573,6 +624,8 @@ <string name="driver_delete_plain">Файлы будут удалены из приложения.</string> <string name="driver_delete_in_use">Файлы будут удалены. Поскольку драйвер используется, будет применен драйвер по умолчанию.</string> <string name="drawer_page_display">Экран</string> + <string name="drawer_frame_limit">Ограничение кадров</string> + <string name="drawer_frame_limit_note">Ограничивает эту игру. Экран переключается на частоту обновления, которая делится на ограничение без остатка, если такая есть; при других ограничениях движение может быть неровным. Игры Steam используют ограничение кадров Steam в меню быстрого доступа.</string> <string name="drawer_page_effects">Эффекты</string> <string name="drawer_page_controls">Управление</string> <string name="drawer_page_components">Компоненты</string> @@ -597,6 +650,66 @@ <string name="drawer_hud_color_amber">Янтарный</string> <string name="drawer_hud_color_violet">Фиолетовый</string> <string name="drawer_hud_opacity">Непрозрачность</string> + <string name="hud_size">Размер</string> + <string name="hud_size_hint">Касание HUD тоже меняет его размер.</string> + <string name="hud_size_full">Полный</string> + <string name="hud_size_tiles">Плитки</string> + <string name="hud_size_pill">Капсула</string> + <string name="hud_size_minimal">Минимальный</string> + <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Полоса</string> + <string name="hud_locked">Закрепить на месте</string> + <string name="hud_locked_hint">Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать.</string> + <string name="hud_snap">Прилипание к бокам</string> + <string name="hud_snap_hint">Отпустите HUD, и он переместится к ближайшей стороне экрана. Резкий жест отбросит его в ту сторону.</string> + <string name="hud_group_look">Внешний вид</string> + <string name="hud_scale">Размер на экране</string> + <string name="hud_color_soft">Мягкий</string> + <string name="hud_color_mid">Средний</string> + <string name="hud_color_vivid">Яркий</string> + <string name="hud_outline">Контур</string> + <string name="hud_outline_color">Цвет контура</string> + <string name="hud_outline_gray">Серый</string> + <string name="hud_outline_theme">Цвет темы</string> + <string name="hud_group_metrics">Показатели</string> + <string name="hud_metric_graph">График времени кадров</string> + <string name="hud_metric_decimal">Частота кадров с десятыми</string> + <string name="hud_metric_low001" formatted="false">0.01% минимальных</string> + <string name="hud_metric_engine">Графический движок</string> + <string name="hud_metric_gpu_model">Название GPU</string> + <string name="hud_metric_gpu">Загрузка GPU</string> + <string name="hud_metric_gpu_temp">Температура GPU</string> + <string name="hud_metric_cpu">Загрузка CPU</string> + <string name="hud_metric_per_core">CPU по ядрам</string> + <string name="hud_metric_temp">Температуры</string> + <string name="hud_metric_ram">Память</string> + <string name="hud_metric_vram">Видеопамять</string> + <string name="hud_metric_swap">Подкачка</string> + <string name="hud_metric_battery">Заряд батареи</string> + <string name="hud_metric_power">Потребляемая мощность</string> + <string name="hud_metric_network">Сеть</string> + <string name="hud_metric_resolution">Разрешение</string> + <string name="hud_metric_proton">Версия Proton</string> + <string name="hud_metric_session">Время сессии</string> + <string name="hud_metric_clock">Часы</string> + <string name="hud_group_temps">Температуры</string> + <string name="hud_temp_unit">Единицы</string> + <string name="hud_temp_bands">Цвета предупреждений</string> + <string name="hud_temp_bands_hint">Температуры становятся янтарными, затем красными по мере приближения к пределу.</string> + <string name="hud_temp_bands_off">Выкл.</string> + <string name="hud_temp_bands_auto">Автоматически</string> + <string name="hud_temp_bands_manual">Вручную</string> + <string name="hud_temp_red_cpu">CPU: красный от</string> + <string name="hud_temp_red_gpu">GPU: красный от</string> + <string name="hud_temp_red_battery">Батарея: красный от</string> + <string name="hud_group_more">Еще</string> + <string name="hud_export">Диагностика HUD</string> + <string name="hud_export_hint">Сохраняет в Downloads/DroidDeck отчет по всем датчикам, которые считывает HUD.</string> + <string name="hud_export_button">Сохранить</string> + <string name="hud_export_done">Сохранено: %1$s</string> + <string name="hud_export_failed">Не удалось сохранить отчет HUD.</string> + <string name="hud_reset">Сбросить настройки HUD</string> + <string name="hud_reset_button">Сбросить</string> <string name="drawer_scaling">Режим масштабирования</string> <string name="drawer_scaling_sharpness">Резкость масштабирования</string> <string name="drawer_effects">Экранные эффекты</string> @@ -631,10 +744,14 @@ <string name="drawer_touch_auto">Авто (%1$s)</string> <string name="drawer_keyboard">Клавиатура</string> <string name="drawer_latency">Задержка</string> + <string name="drawer_low_latency">Режим низкой задержки</string> + <string name="drawer_low_latency_hint">Увеличивает нагрузку на CPU и расход батареи</string> <string name="drawer_low_latency_controller">Контроллер с низкой задержкой</string> <string name="drawer_low_latency_controller_hint">Контроллер опрашивается на 1000 Гц вместо 250 Гц. Немного больше нагрузки на CPU.</string> <string name="drawer_low_latency_touch">Сенсор с низкой задержкой</string> <string name="drawer_low_latency_touch_hint">Касания идут без объединения кадров; сенсорное управление Steam работает на 1000 Гц. Немного больше нагрузки на CPU.</string> + <string name="drawer_evdev_mouse">Сырой канал мыши</string> + <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавиатура ПК</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Второй экран</string> @@ -723,6 +840,10 @@ <string name="setup_session">Сессия</string> <string name="setup_logs">Журналы сессии</string> <string name="setup_logs_hint">Сохраняется после каждой сессии</string> + <string name="setup_game_debug_logs">Журналы отладки игр</string> + <string name="setup_game_debug_logs_hint">Добавлять диагностику Proton, Wine и графики при следующем запуске игры. Может снизить производительность и занять больше места.</string> + <string name="setup_game_debug_logs_restart">Перезапустите сессию, чтобы сохранять журналы отладки игр</string> + <string name="setup_logging_update_failed">Не удалось обновить журналирование. Проверьте переключатель и повторите попытку.</string> <string name="setup_agent_commands">Инструменты отладки</string> <string name="setup_latest_logs">Последние журналы сессии</string> <string name="setup_saved_logs">Сохраненные журналы сессии</string> @@ -755,12 +876,28 @@ <string name="setup_home_on">DroidDeck может использоваться как приложение главного экрана</string> <string name="setup_home_off">DroidDeck не будет доступен как приложение главного экрана</string> <string name="setup_orientation">Ориентация</string> + <string name="setup_launcher_orientation">Ориентация лаунчера</string> + <string name="setup_launcher_orientation_auto">Следовать повороту устройства</string> + <string name="setup_orientation_portrait">Портретная</string> + <string name="setup_session_orientation">Ориентация сессии</string> + <string name="setup_session_orientation_hint">Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; свои ширина и высота остаются как введены.</string> <string name="setup_orientation_auto">Альбомная (авто)</string> <string name="setup_orientation_landscape">Альбомная</string> <string name="setup_orientation_reverse">Перевернутая альбомная</string> <string name="setup_fullscreen">Полноэкранный режим</string> <string name="setup_fullscreen_on">Скрывает строку состояния и панель навигации Android</string> <string name="setup_fullscreen_off">Показывает строку состояния и панель навигации Android</string> + <string name="setup_dual_screen">Два экрана</string> + <string name="setup_dual_screen_hint">Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране.</string> + <string name="setup_dual_screen_auto">Автоматически</string> + <string name="setup_dual_screen_on">Вкл.</string> + <string name="setup_dual_screen_off">Выкл.</string> + <string name="setup_dual_screen_menu">Меню на нижнем экране</string> + <string name="setup_dual_screen_menu_hint">Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы.</string> + <string name="setup_dual_screen_controls">Управление на нижнем экране в играх</string> + <string name="setup_dual_screen_controls_hint">Открывает тачпад и клавиатуру на втором экране при запуске сеанса.</string> + <string name="dual_typing_title">Ввод для верхнего экрана</string> + <string name="dual_typing_done">Готово</string> <string name="setup_default_home">Главный экран по умолчанию</string> <string name="setup_choose_home">Выбрать главный экран</string> <string name="setup_choose">Выбрать</string> @@ -912,8 +1049,16 @@ <string name="gate_needs_notifications">Код сопряжения придет в уведомлении. Разрешите DroidDeck отправлять уведомления или используйте «Другие способы».</string> <string name="gate_allow_notifications">Разрешить уведомления</string> <string name="gate_step1">Откройте Настройки → Для разработчиков → Отладка по Wi-Fi и включите ее</string> - <string name="gate_step2">Нажмите «Сопряжение устройства с помощью кода»</string> + <string name="gate_step2">Нажмите «Подключить устройство с помощью кода подключения»</string> <string name="gate_step3">Введите код сопряжения в уведомлении DroidDeck</string> + <string name="pairguide_build_number">В разделе «О телефоне» нажмите «Номер сборки» 7 раз</string> + <string name="pairguide_wireless">Включите «Отладку по Wi-Fi»</string> + <string name="pairguide_pair">Откройте «Отладку по Wi-Fi» и нажмите «Подключить устройство с помощью кода подключения»</string> + <string name="pairguide_child_process">Включите «Отключить ограничения дочерних процессов»</string> + <string name="pairguide_row_child_process">Отключить ограничения дочерних процессов</string> + <string name="pairguide_row_build_number">Номер сборки</string> + <string name="pairguide_row_wireless">Отладка по Wi-Fi</string> + <string name="pairguide_row_pair">Подключить устройство с помощью кода подключения</string> <string name="gate_waiting">Ожидание окна сопряжения…</string> <string name="gate_code_needed">Окно найдено. Введите код сопряжения из него в уведомление.</string> <string name="gate_status">Статус</string> @@ -1037,8 +1182,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 +1189,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> @@ -1055,10 +1197,8 @@ <string name="games_never_played">Никогда не запускалась</string> <string name="games_runtime_busy_percent">Среда выполнения занята · %1$d%%</string> <string name="games_runtime_busy">Среда выполнения занята</string> - <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> @@ -1073,6 +1213,9 @@ <string name="gpu_hide_other">Скрыть драйверы других GPU</string> <string name="gpu_show_other">Показать драйверы других GPU</string> <string name="gpu_advanced">Дополнительно</string> + <string name="gpu_ubwc_title">Совместимость UBWC</string> + <string name="gpu_ubwc_hint">Попробуйте «Вкл.» или «Выкл.», если в Steam или Android появляются полосы или мерцание. Применяется к обоим драйверам после перезапуска DroidDeck.</string> + <string name="gpu_ubwc_restart">Перезапустите DroidDeck, чтобы применить.</string> <string name="gpu_set_with_display">Настраивается вместе с драйвером дисплея: %1$s включает оба.</string> <string name="gpu_set_with_runtime">Настраивается вместе с драйвером среды выполнения: %1$s включает оба.</string> <string name="gpu_runtime_hint">Используется играми и рабочим столом.</string> @@ -1127,7 +1270,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> @@ -1181,10 +1324,15 @@ <string name="pip_auto">Автоматически переходить в режим PiP</string> <string name="unfolded_controls">Управление на разложенном экране</string> <string name="unfolded_controls_hint">В разложенном виде игра находится над тачпадами и грипсами Steam Deck. В сложенном — игра на весь экран.</string> + <string name="unfolded_controls_with_controller">Оставлять с контроллером</string> + <string name="unfolded_controls_with_controller_hint">Показывать это сенсорное управление и при подключённом контроллере.</string> <string name="pip_suspended">Приостановлено</string> <string name="pip_not_ready">PiP станет доступен после готовности сессии.</string> <string name="pip_permission">Разрешите DroidDeck использовать PiP в настройках Android.</string> <string name="pip_unavailable">Android не может открыть PiP.</string> + <string name="game_more">Ещё</string> + <string name="game_edit_art">Изменить обложку</string> + <string name="stores_in_steam_label">В Steam</string> <string name="game_shortcut">Ярлык</string> <string name="game_shortcut_add">Добавить на главный экран</string> <string name="game_shortcut_choose">Выбрать игру</string> @@ -1208,6 +1356,10 @@ <string name="main_wait_runtime">Дождитесь завершения операции со средой выполнения</string> <string name="main_wait_proton_install">Дождитесь завершения установки инструмента совместимости</string> + <string name="load_compat_title">Подготовка инструментов совместимости</string> + <string name="load_compat_wait">Ожидание завершения настройки совместимости</string> + <string name="load_compat_hint">Сессия запустится, когда настройка завершится.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Дождитесь завершения установки приложения рабочего стола</string> <string name="main_wait_install_game">Дождитесь завершения установки, прежде чем запускать игру</string> <string name="main_saves_close_session">Сначала закройте сессию Steam, чтобы игра не записала свои сохранения поверх импортированных</string> @@ -1252,6 +1404,9 @@ <string name="main_install_anyway">Все равно установить</string> <string name="main_remove_runtime_title">Удалить среду выполнения Linux</string> <string name="main_remove_runtime_text">Будут удалены среда выполнения, клиент Steam в ней и все установленные туда игры.</string> + <string name="runtime_actions_title">Среда выполнения Linux</string> + <string name="runtime_actions_text">Восстановление переустанавливает системные файлы среды выполнения и сохраняет Steam, ваши игры и настройки. Дополнения, например рабочий стол, установятся снова при следующем использовании. Удаление стирает всё.</string> + <string name="runtime_repair">Восстановить среду выполнения</string> <string name="main_applied">Применено: %1$s</string> <string name="android_app_open_failed_primary">Не удалось открыть %1$s на главном экране</string> <string name="android_app_open_failed_on">Не удалось открыть %1$s на экране «%2$s»</string> @@ -1387,6 +1542,13 @@ <string name="session_runtime_catalog_unreachable">Не удалось получить каталог сред выполнения. Проверьте подключение и снова нажмите Play.</string> <string name="session_runtime_install_failed">Среда выполнения Linux не установилась. Проверьте ее на странице «Настройка» и снова нажмите Play.</string> <string name="session_desktop_install_failed">Рабочий стол не установился (%1$s). Проверьте подключение и снова нажмите «Рабочий стол».</string> + <string name="session_package_resume_failed">Не удалось завершить прерванную установку (%1$s). Проверьте подключение и свободное место, затем повторите попытку.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Среда выполнения Linux повреждена: %1$d ссылка на библиотеку указывает на отсутствующий файл (%2$s), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="few">Среда выполнения Linux повреждена: %1$d ссылки на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="many">Среда выполнения Linux повреждена: %1$d ссылок на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="other">Среда выполнения Linux повреждена: %1$d ссылки на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + </plurals> <string name="session_ended_named">Работа %1$s неожиданно прервалась. Приложите журналы к отчету об ошибке или попробуйте снова.</string> <string name="session_ended_program">Программа неожиданно завершила работу. Приложите журналы к отчету об ошибке или попробуйте снова.</string> <string name="session_ended_desktop">Рабочий стол неожиданно завершил работу. Приложите журналы к отчету об ошибке или попробуйте снова.</string> @@ -1403,6 +1565,15 @@ <string name="mode_decky_plugins_hint">Установите ZIP-архив плагина для следующей сессии Steam.</string> <string name="mode_decky_plugin_downloading">Загрузка…</string> <string name="mode_decky_plugin_install_zip">Установить из ZIP</string> + <string name="decky_zip_warning_title">Установка стороннего плагина</string> + <string name="decky_zip_warning_text">Команда Decky Loader не проверяла этот плагин. Он может содержать вредоносное ПО, например программы для кражи вашего аккаунта Steam или повреждения устройства. Устанавливая этот плагин, вы соглашаетесь, что берёте на себя все риски для вашего устройства.</string> + <string name="decky_zip_warning_continue">Продолжить</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Подождите %1$d секунду</item> + <item quantity="few">Подождите %1$d секунды</item> + <item quantity="many">Подождите %1$d секунд</item> + <item quantity="other">Подождите %1$d секунды</item> + </plurals> <string name="store_cat_games">Игры</string> <string name="store_cat_audio_video">Аудио и видео</string> <string name="store_cat_graphics">Графика</string> @@ -1431,6 +1602,10 @@ <string name="theme_icon_blue_detail">Черный фон, белый текст, синий — для всего выбранного, активного или нажатого.</string> <string name="theme_electric">Электрик</string> <string name="theme_electric_detail">Более яркий синий на поверхностях темно-синего, а не серого оттенка.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Цвета, плавно переходящие по всей радуге. Учитывает настройки анимации Android.</string> + <string name="theme_rgb_speed">Скорость</string> + <string name="theme_rgb_speed_hint">Как быстро меняются цвета.</string> <string name="theme_gradient">Градиент</string> <string name="theme_gradient_detail">Ваши основной и дополнительный цвета, плавно переходящие на кнопках и выделениях.</string> <string name="theme_gradient_primary">Основной</string> @@ -1562,7 +1737,16 @@ <string name="fm_conflict_skip">Пропустить</string> <string name="fm_select_this_folder">Выбрать эту папку</string> <string name="fm_back">Назад</string> + <string name="fm_exit">Выход</string> + <string name="fm_return_to_start">Вернуться в начальную папку</string> + <string name="fm_start_unavailable">Начальная папка больше недоступна</string> + <string name="fm_cancel_operation_title">Отменить операцию?</string> + <string name="fm_cancel_operation_confirmation">Операция будет отменена. Вы уверены?</string> + <string name="fm_accept">Принять</string> + <string name="fm_decline">Отклонить</string> <string name="fm_drive_not_readable">%1$s: подключено, но сейчас недоступно для чтения</string> + <string name="fm_drive_access_title">Разрешить доступ к %1$s</string> + <string name="fm_drive_access_text">Android позволяет DroidDeck видеть этот диск, но не читать его. Включите для DroidDeck доступ ко всем файлам и вернитесь.</string> <string name="fm_list_view">Список</string> <string name="fm_grid_view">Сетка</string> <string name="fm_search">Поиск</string> @@ -1636,6 +1820,93 @@ <string name="second_mode_keyboard_trackpad">Клавиатура + тачпад</string> <string name="second_mode_terminal">Терминал</string> <string name="second_mode_deck_controls">Грипсы и тачпады Deck</string> + <string name="second_mode_dashboard">Дашборд</string> + <string name="bottom_dashboard_empty">Здесь пока ничего нет.</string> + <string name="bottom_page_downloads">Загрузки</string> + <string name="bottom_downloads_none">Нет активных загрузок.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Загрузка кэша шейдеров</string> + <string name="bottom_downloads_paused">Приостановлено</string> + <string name="bottom_downloads_queued">Ожидает начала</string> + <string name="bottom_page_notifications">Уведомления</string> + <string name="bottom_notifications_listener">Нижний экран DroidDeck</string> + <string name="bottom_notifications_why">Показывает сообщения и другие уведомления здесь, пока вы играете. Они отображаются только на этом экране и не сохраняются. Android спросит один раз: на этом экране откроется страница доступа к уведомлениям; включите там DroidDeck, и эта страница вернется сама.</string> + <string name="bottom_notifications_allow">Разрешить доступ к уведомлениям</string> + <string name="bottom_notifications_none">Нет уведомлений.</string> + <string name="bottom_notifications_count">Уведомлений: %1$d</string> + <string name="bottom_notifications_clear">Очистить</string> + <string name="bottom_page_screenshots">Скриншоты</string> + <string name="stats_fps_needs_hud">Для FPS нужно включить HUD</string> + <string name="stats_speed">Скорость</string> + <string name="stats_pedals">Педали</string> + <string name="stats_gforce">Перегрузка</string> + <string name="stats_timing">Время</string> + <string name="stats_best_lap">Лучший круг</string> + <string name="stats_tires">Шины, °C</string> + <string name="stats_trace">Газ и тормоз за последние 10 s</string> + <string name="stats_speed_chart">Скорость, %1$s</string> + <string name="stats_gear">Передача</string> + <string name="stats_speed_units">Единицы скорости</string> + <string name="stats_speed_units_auto">Автоматически (%1$s)</string> + <string name="stats_steam_client_arm">Клиент Steam ARM</string> + <string name="stats_steam_client_x86">Клиент Steam x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Тормоз</string> + <string name="stats_lights">Приборная панель</string> + <string name="stats_lamp_shift">Переключение</string> + <string name="stats_lamp_handbrake">Ручник</string> + <string name="stats_lamp_pit">Ограничитель скорости</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигатель %1$s °C</string> + <string name="stats_oil_temp">Масло %1$s °C</string> + <string name="stats_power">Распределитель энергии</string> + <string name="stats_fuel_t">Топливо, t</string> + <string name="stats_fuel_main">Основное %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="stats_tap_hint">Коснитесь верхней полосы или панели, чтобы сменить ее стиль.</string> + <string name="bottom_telemetry_send_title">Передавать данные на дашборд</string> + <string name="bottom_telemetry_send_auto">Автоматически</string> + <string name="bottom_telemetry_send_auto_hint">Включает передачу для всех игр в этом списке, в том числе найденных позже. Игры, для которых вы ее выключили, остаются выключенными.</string> + <string name="bottom_telemetry_send_note">Это меняет собственную настройку вывода данных в игре. Изменение вступит в силу при следующем запуске игры; при выключении восстанавливается прежняя настройка.</string> + <string name="bottom_telemetry_send_close">Закройте %1$s, чтобы изменить это.</string> + <string name="bottom_telemetry_send_failed">Не удалось изменить настройки %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: включите %2$s в настройках игры, указав IP 127.0.0.1 и порт %3$d.</string> + <string name="bottom_shots_where">Сохраняются в Pictures/DroidDeck. Скриншоты Steam тоже отображаются здесь.</string> + <string name="bottom_shots_take">Сделать скриншот</string> + <string name="bottom_shots_saved">Скриншот сохранен.</string> + <string name="bottom_shots_failed">Не удалось сделать скриншот.</string> + <string name="bottom_shots_none">Скриншотов пока нет.</string> + <string name="bottom_page_chat">Чат и голос</string> + <string name="bottom_chat_why">Читайте чат Steam и отвечайте в нем здесь, пока игра продолжает работать на основном экране. Используется аккаунт, в который выполнен вход в Steam.</string> + <string name="bottom_chat_not_signed_in">У Steam пока нет веб-входа, которым можно поделиться, поэтому войдите здесь один раз.</string> + <string name="bottom_chat_stopped">Android закрыл страницу чата, пока DroidDeck работал в фоне. Она откроется снова, когда вы вернетесь в DroidDeck.</string> + <string name="bottom_chat_open">Открыть Steam Chat</string> + <string name="bottom_chat_close">Закрыть чат</string> + <string name="bottom_chat_mic_on">Микрофон вкл.</string> + <string name="bottom_chat_mic_off">Микрофон выкл.</string> + <string name="bottom_chat_mic_unavailable">Микрофон для этой игры выключен. Чтобы говорить, включите «Микрофон» в настройках Steam в DroidDeck (Аудио) и запустите игру снова.</string> + <string name="bottom_chat_volume">Громкость %1$d%%</string> + <string name="bottom_page_telemetry">Игровая статистика</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батарея</string> + <string name="bottom_telemetry_lap">Круг</string> + <string name="bottom_telemetry_position">Позиция</string> + <string name="bottom_telemetry_this_lap">Текущий круг</string> + <string name="bottom_telemetry_last_lap">Прошлый круг</string> + <string name="bottom_telemetry_fuel">Топливо</string> + <string name="bottom_telemetry_cargo">Груз</string> + <string name="bottom_telemetry_pips">Деления SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правовой статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Включите вывод данных в гоночной игре (часто он называется телеметрией или UDP), чтобы видеть здесь приборную панель в реальном времени. Данные остаются на этом устройстве.</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d получает данные (пакетов: %2$d, размер: %3$d байт), но в формате, который эта страница пока не умеет читать.</string> + <string name="bottom_telemetry_port_busy">Порт %1$s уже занят другой программой, поэтому эта игра не может отображаться здесь.</string> <string name="rtinst_removing">Удаление среды выполнения Linux</string> <plurals name="rtinst_removing_entries"> @@ -1668,6 +1939,7 @@ <string name="flatpakmgr_not_ready">Сначала настройте Flatpak</string> <string name="flatpakmgr_starting">Запуск</string> <string name="flatpakmgr_exit_status">Flatpak завершился с кодом %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s собрано для %2$s, а DroidDeck не может это запустить. Приложениям Flatpak здесь нужна сборка для ARM64 или x86_64.</string> <string name="flatpakmgr_installing">Установка %1$s</string> <string name="flatpakmgr_updating">Обновление %1$s</string> <string name="flatpakmgr_removing">Удаление %1$s</string> @@ -1761,6 +2033,7 @@ <string name="adbpair_applying">Применение настройки…</string> <string name="adbpair_command_failed">Ошибка команды отладки по Wi-Fi</string> <string name="adbpair_channel_name">Настройка отладки по Wi-Fi</string> + <string name="adbpair_progress_channel_name">Ход настройки отладки по Wi-Fi</string> <string name="adbpair_channel_description">Запрашивает код сопряжения для отладки по Wi-Fi, пока открыты Настройки</string> <string name="adbpair_title_pair">Сопряжение отладки по Wi-Fi</string> <string name="adbpair_waiting_text">Включите отладку по Wi-Fi и нажмите «Сопряжение устройства с помощью кода».</string> @@ -1869,6 +2142,7 @@ <string name="gpuinfo_not_adreno">GPU не Adreno</string> <string name="gpuinfo_supported">Поддерживается</string> <string name="gpuinfo_experimental">Экспериментально: его драйверы — тестовые сборки</string> + <string name="gpuinfo_a850_experimental">Экспериментальная поддержка Adreno 850: требуются совместимые экспериментальные драйверы дисплея и игр; не проверено на этом устройстве</string> <string name="gpuinfo_below_tested">Ниже проверенного оборудования (Adreno 725 и новее): может не работать</string> <string name="gpuinfo_unsupported">Не поддерживается: DroidDeck требует GPU Adreno (Snapdragon)</string> @@ -1962,10 +2236,10 @@ <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> + <string name="display_follow_screen_scaled">Масштаб %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Показать сведения об устройстве</string> <string name="device_info_hide">Скрыть сведения об устройстве</string> @@ -1980,7 +2254,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> @@ -1994,11 +2267,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> @@ -2016,9 +2287,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> @@ -2037,12 +2316,43 @@ <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> <string name="stores_sort">Сортировка</string> + <string name="setup_rail_labels">Подписи боковой панели</string> + <string name="setup_rail_labels_hint">Показывать названия под значками боковой панели. Отключите, чтобы сделать панель уже.</string> + <string name="library_display">Вид</string> + <string name="library_display_larger">Крупные карточки</string> + <string name="library_display_smaller">Мелкие карточки</string> + <string name="library_display_title">Показывать название</string> + <string name="library_display_size">Показывать размер</string> <string name="stores_sort_last_played">Недавно запущенные</string> <string name="stores_sort_recently_installed">Недавно установленные</string> <string name="stores_sort_title_asc">Название А–Я</string> @@ -2169,6 +2479,9 @@ <string name="stores_download_manager">Менеджер загрузок</string> <string name="stores_parallel">Одновременных загрузок</string> <string name="stores_install_where">Установить в</string> + <string name="stores_install_language">Язык игры</string> + <string name="stores_install_language_hint">GOG и Epic устанавливают этот язык. «Системный» следует языку приложения.</string> + <string name="stores_install_language_system">Системный</string> <string name="stores_install_title">Установка %1$s:</string> <string name="stores_target_internal">Внутреннее хранилище</string> <string name="stores_target_free">Свободно: %1$s</string> @@ -2188,6 +2501,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> @@ -2203,6 +2517,9 @@ <string name="edit_target">Объект</string> <string name="edit_start_in">Рабочая папка</string> <string name="edit_launch_options">Параметры запуска</string> + <string name="edit_launch_options_steam_hint">Общие со «Свойствами» Steam: изменение в одном месте видно в обоих.</string> + <string name="edit_launch_options_not_saved">Не удалось сохранить параметры запуска в Steam. Попробуйте ещё раз.</string> + <string name="edit_launch_options_desktop">Steam может быть открыт в сессии рабочего стола. Измените параметры запуска в его «Свойствах» или сначала закройте сессию.</string> <string name="edit_artwork">Обложки</string> <string name="edit_other_exe">Другой exe…</string> <string name="edit_remove">Убрать</string> @@ -2334,6 +2651,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="flathub_eyebrow">ПРИЛОЖЕНИЯ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Приложения для рабочего стола Linux, запускаются на рабочем столе.</string> @@ -2478,6 +2796,22 @@ <string name="glasses_tracking_flat_hint">В режиме «Автоматически» эта 2D-игра неподвижна в поле зрения. Чтобы использовать отслеживание головы, выберите «Виртуальный экран» в разделе «Экран».</string> <string name="glasses_tracking_sbs_hint">Отслеживание головы работает с виртуальным экраном или запущенной игрой SteamVR.</string> <string name="glasses_hardware">Устройство</string> + <string name="vr_controllers_tab">Контроллеры</string> + <string name="vr_controllers_group">Контроллеры SteamVR</string> + <string name="vr_controllers_emulate">Геймпад в VR</string> + <string name="vr_controllers_emulate_hint">Две VR-руки, которыми играет ваш контроллер. Изменения применяются сразу, даже пока работает SteamVR. Joy-Con и отслеживаемые руки всё равно берут на себя свою сторону.</string> + <string name="vr_controllers_off">Обычный геймпад</string> + <string name="vr_controllers_index">Контроллеры Valve Index</string> + <string name="vr_controllers_touch">Контроллеры Meta Quest 3</string> + <string name="vr_controllers_vive">Контроллеры HTC Vive</string> + <string name="vr_controllers_sticks">Стики сначала</string> + <string name="vr_controllers_sticks_hint">Нажмите оба стика одновременно в VR, чтобы переключить.</string> + <string name="vr_controllers_sticks_game">Перемещают вас в игре</string> + <string name="vr_controllers_sticks_hands">Перемещают руки</string> + <string name="vr_controllers_buttons">Кнопки</string> + <string name="vr_controllers_buttons_stick">Триггеры — это триггеры, бамперы — хват, A/B и X/Y — лицевые кнопки каждой руки, нажатия стиков нажимают стики VR-контроллеров, Guide открывает меню SteamVR. Вверх и вниз на крестовине приближают или отдаляют руки.</string> + <string name="vr_controllers_buttons_vive">Стики работают как трекпады; A/X или нажатие стика нажимает их. Триггеры — это триггеры, бамперы — хват, Start и Select — меню, Guide открывает меню SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR-рук. Игры с поддержкой геймпада и меню SteamVR получают ваш контроллер как обычно.</string> <string name="glasses_brightness">Яркость</string> <string name="glasses_volume">Громкость</string> <string name="glasses_sunblock">Затемнение</string> @@ -2535,6 +2869,12 @@ <string name="hand_camera_placement">Расположение камеры</string> <string name="hand_camera_placement_hint">Проверьте, что камера видит вас, прежде чем начать игру.</string> <string name="hand_camera_check">Проверить</string> + <string name="tracking_pack_title">Загрузка отслеживания рук</string> + <string name="tracking_pack_hint">Для отслеживания рук нужна однократная загрузка %1$s.</string> + <string name="tracking_pack_download">Скачать</string> + <string name="tracking_pack_retry">Повторить</string> + <string name="tracking_pack_downloading">Загрузка отслеживания рук… %1$d%%</string> + <string name="tracking_pack_failed">Не удалось скачать отслеживание рук. Проверьте подключение и повторите попытку.</string> <string name="hand_camera_check_title">Расположение камеры</string> <string name="hand_camera_how_rear">Поставьте устройство вертикально на расстоянии от 1,5 до 2 метров, примерно на уровне груди, направив заднюю камеру на себя. Затем встаньте в кадр, вытянув руки.</string> <string name="hand_camera_how_front">Поставьте устройство вертикально на расстоянии от 1,5 до 2 метров, примерно на уровне груди, направив экран на себя. Затем встаньте в кадр, вытянув руки.</string> @@ -2609,6 +2949,21 @@ <string name="storage_safe_hint">Неиспользуемые среды выполнения, остатки, старые журналы</string> <string name="storage_clean_up">Очистить…</string> <string name="storage_session_running">Остановите сессию, чтобы очистить или удалить что-либо. Размеры останутся видны.</string> + <string name="storage_default_group">Место установки</string> + <string name="storage_default_title">Хранилище по умолчанию</string> + <string name="storage_default_hint">Новые установки из магазинов попадают в выбранное место. Установленные игры остаются на месте. У библиотек Steam своя настройка.</string> + <string name="storage_default_ask">Спрашивать каждый раз</string> + <string name="storage_default_ask_detail">Выбирать место для каждой установки</string> + <string name="storage_default_internal">Внутреннее хранилище</string> + <string name="storage_default_external">Внешнее хранилище</string> + <string name="storage_default_external_detail">%1$s · свободно %2$s</string> + <string name="storage_default_external_missing">Не подключено</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">Свободно %1$s</string> + <string name="storage_default_folder_missing">Не подключено</string> + <string name="storage_default_choose_folder">Выбрать папку…</string> + <string name="storage_default_choose_folder_detail">Любая папка на SD-карте или USB-накопителе</string> + <string name="storage_default_note">Игры помещаются в папку Games в выбранном месте. Установленные игры не перемещаются.</string> <string name="storage_where">Куда уходит</string> <string name="storage_games">Игры Steam</string> <string name="storage_game_data">Данные игр</string> @@ -2744,6 +3099,9 @@ <string name="storage_data_installed">Установленные игры</string> <string name="storage_data_parts">Префикс %1$s · шейдеры %2$s · мастерская %3$s</string> <string name="storage_clear_shaders">Удалить шейдеры</string> + <string name="storage_reset_prefix">Сбросить префикс</string> + <string name="storage_reset_prefix_title">Сбросить префикс для %1$s?</string> + <string name="storage_reset_prefix_confirm">Удаляет префикс Wine (%1$s) в %2$s и создаёт его заново при следующем запуске. Сохранения, настройки и установленные в нём распространяемые пакеты будут потеряны; сохранения Steam Cloud остаются в вашем аккаунте.</string> <string name="storage_data_leftovers">Удалённые игры</string> <string name="storage_steam_app">Приложение Steam %1$d</string> <string name="storage_leftover_unsure_detail">В его префиксе ещё есть файлы, среди них могут быть локальные сохранения</string> @@ -3045,8 +3403,312 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронизация через Syncthing</string> + <string name="sync_enable_hint">Это реализация Syncthing на основе Syncthing-Fork, которая позволяет синхронизировать файлы из внутренней файловой системы DroidDeck с другими экземплярами Syncthing. Она работает только с файлами, которые хранятся во внутренней файловой системе DroidDeck.</string> + <string name="sync_missing">Эта сборка не включает Syncthing.</string> + <string name="sync_starting">Запуск Syncthing</string> + <string name="sync_status_starting">Запуск</string> + <string name="sync_status_up_to_date">Актуально</string> + <string name="sync_status_syncing">Синхронизация</string> + <string name="sync_status_paused">Приостановлено</string> + <string name="sync_status_pausing">Приостановка</string> + <string name="sync_status_resuming">Возобновление</string> + <string name="sync_status_attention">Требует внимания</string> + <string name="sync_status_failed">Syncthing остановлен</string> + <string name="sync_failed_retry">Повторить</string> + <string name="sync_paused_wifi">Приостановлено до подключения к Wi-Fi</string> + <string name="sync_paused_game">Приостановлено на время игры</string> + <string name="sync_summary">Папок: %1$d · подключено устройств: %2$d из %3$d</string> + <string name="sync_left">Осталось: %1$s</string> + <string name="sync_open_web_ui">Открыть веб-интерфейс</string> + <string name="sync_pause">Приостановить</string> + <string name="sync_resume">Возобновить</string> + <string name="sync_running">Работает</string> + <string name="sync_running_hint">Выключите, чтобы полностью остановить Syncthing.</string> + <string name="sync_this_device">Это устройство</string> + <string name="sync_device_id">ID устройства</string> + <string name="sync_show_qr">Показать QR-код</string> + <string name="sync_advanced">Дополнительно</string> + <string name="sync_advanced_hint">Порты, режим работы, сброс</string> + <string name="sync_open">Открыть</string> + <string name="sync_waiting">Ожидает вашего ответа</string> + <string name="sync_pending_device">%1$s хочет подключиться</string> + <string name="sync_pending_folder">%1$s хочет предоставить доступ к папке «%2$s»</string> + <string name="sync_pending_folder_hint">Примите, чтобы выбрать, куда сохранить ее в DroidDeck.</string> + <string name="sync_review">Просмотреть в веб-интерфейсе</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Папок пока нет.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Актуально</string> + <string name="sync_folder_syncing">Синхронизация: %1$d%%</string> + <string name="sync_folder_scanning">Сканирование</string> + <string name="sync_folder_paused">Приостановлено</string> + <string name="sync_folder_out_of_sync">Не синхронизировано</string> + <string name="sync_folder_errors">Не удалось синхронизировать файлов: %1$d</string> + <string name="sync_folder_blocked">Заблокировано</string> + <string name="sync_folder_blocked_hint">Эта папка находится вне хранилища DroidDeck, поэтому DroidDeck приостановил ее. Чтобы синхронизировать папки вне DroidDeck, используйте приложение Syncthing-Fork.</string> + <string name="sync_remove_folder">Удалить из Syncthing</string> + <string name="sync_remove_folder_hint">При удалении файлы не удаляются.</string> + <string name="sync_devices">Устройства</string> + <string name="sync_no_devices">Устройств пока нет.</string> + <string name="sync_connected">Подключено</string> + <string name="sync_offline">Не в сети</string> + <string name="sync_last_seen">Последний раз в сети: %1$s</string> + <string name="sync_device_id_title">ID этого устройства</string> + <string name="sync_device_id_hint">На другом устройстве добавьте устройство в Syncthing и отсканируйте этот код или вставьте ID. Затем примите его здесь, в веб-интерфейсе.</string> + <string name="sync_copy">Копировать</string> + <string name="sync_share">Поделиться</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Выключить Syncthing?</string> + <string name="sync_off_body">Syncthing остановится сейчас и не запустится, пока вы снова его не включите. Синхронизированные файлы останутся на месте.</string> + <string name="sync_off_forget">Также удалить конфигурацию Syncthing</string> + <string name="sync_off_forget_hint">Удаляет ID этого устройства, папки и устройства. При повторном включении все начнется с нуля.</string> + <string name="sync_turn_off">Выключить</string> + <string name="sync_ports">Порты</string> + <string name="sync_port_sync">Синхронизация</string> + <string name="sync_port_discovery">Локальное обнаружение</string> + <string name="sync_repick">Выбрать новые порты</string> + <string name="sync_repick_hint">Проверяются заново при каждом запуске.</string> + <string name="sync_repick_button">Выбрать заново</string> + <string name="sync_reset_group">Сброс</string> + <string name="sync_api_key">Ключ API</string> + <string name="sync_regenerate">Создать заново</string> + <string name="sync_reset">Сбросить Syncthing</string> + <string name="sync_reset_hint">Новый ID устройства, папки и устройства удаляются. Файлы в хранилище DroidDeck сохраняются.</string> + <string name="sync_reset_button">Сбросить</string> + <string name="sync_reset_confirm_title">Сбросить Syncthing?</string> + <string name="sync_running_group">Работа</string> + <string name="sync_run">Работать</string> + <string name="sync_run_open">Пока DroidDeck открыт</string> + <string name="sync_run_background">В фоновом режиме</string> + <string name="sync_wifi_only">Только по Wi-Fi</string> + <string name="sync_pause_games">Приостанавливать во время игр</string> + <string name="sync_logs">Журналы</string> + <string name="sync_logs_hint">Вывод Syncthing за эту сессию</string> + <string name="sync_logs_share">Поделиться</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Сначала установите среду выполнения Linux.</string> + <string name="sync_accept">Принять</string> + <string name="sync_accept_title">Сохранить «%1$s» в</string> + <string name="sync_add_folder">Добавить папку</string> + <string name="sync_add_folder_hint">Синхронизировать папку в хранилище DroidDeck</string> + <string name="sync_choose">Выбрать</string> + <string name="sync_add">Добавить</string> + <string name="sync_add_failed">Не удалось добавить папку.</string> + <string name="sync_share_with">Поделиться с</string> + <string name="sync_share_none">Устройств пока нет. Вы сможете предоставить доступ к этой папке позже в веб-интерфейсе.</string> + <string name="sync_use_folder">Использовать эту папку</string> + <string name="sync_new_folder">Новая папка</string> + <string name="sync_location_home">Домашняя папка контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Общее хранилище DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Данные приложения DroidDeck</string> + <string name="sync_web_path_locked">Новые папки сохраняются в папку Sync DroidDeck. Чтобы синхронизировать другую папку DroidDeck, используйте «Добавить папку» на вкладке Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Перезагрузить</string> + <string name="sync_not_running">Syncthing не запущен.</string> + <string name="session_end_steam_sigill">Steam остановился из-за недопустимой инструкции (SIGILL). Это может быть проблема совместимости инструкций CPU или сбой клиента. Отправьте журналы вместе с данными о вашем устройстве.</string> + <string name="session_end_steam_try_x64">Можно попробовать «Настройки Steam → Клиент Steam → x86-64 (экспериментально)». Потребуется дополнительная загрузка, и работа может быть медленнее.</string> + <string name="session_end_vulkan_device">Графический драйвер Linux не нашёл подходящее устройство Vulkan. Проверьте, что выбранный драйвер GPU для Linux поддерживает этот GPU.</string> + <string name="session_end_gpu_unsupported">Сессия не может запуститься: для этого GPU в текущей конфигурации нет совместимого драйвера Vulkan для Linux. Драйверы Adreno Turnip не могут включить поддержку GPU MediaTek/Mali.</string> <string name="glasses_6dof">Виртуальный экран 6DoF</string> <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_resources_browser">Откроется в браузере</string> + <string name="game_resource_guides">Руководства</string> + <string name="game_resource_protondb_detail">Отчёты о совместимости с Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Для игр с сохранениями в аккаунте Steam</string> + <string name="game_resource_search">Поиск в интернете</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="library_filter">Фильтр</string> + <string name="library_filter_installed">Только установленные</string> + <string name="library_filter_all_owned">Все ваши игры</string> + <string name="library_no_installed_matches">Нет установленных игр, подходящих под эти фильтры.</string> + <string name="library_browse_owned">Просмотреть ваши игры</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="stores_itch_updates_found">Доступные обновления: %1$d</string> + <string name="stores_itch_update_replaced">Разработчик заменил эту сборку на %1$s. Обновиться до неё?</string> + <string name="xbox_filter_cloud">Облако</string> + <string name="stores_xbox_cloud_settings">Настройки облака</string> + <string name="integration_title">Интеграция со Steam</string> + <string name="integration_count">Включено %1$d из %2$d</string> + <string name="integration_set_up">Настроить</string> + <string name="integration_location">Местоположение</string> + <string name="integration_app_info">О приложении</string> + <string name="integration_wifi">Названия сетей Wi-Fi</string> + <string name="integration_brightness">Яркость</string> + <string name="integration_home">DroidDeck как главный экран</string> + <string name="integration_shortcuts">Сочетания кнопки «Домой»</string> + <string name="integration_wifi_hint">Показывать сети в Steam · нужен доступ к местоположению, без отслеживания</string> + <string name="integration_wifi_on">Сети отображаются в Steam</string> + <string name="integration_wifi_location_off">Местоположение отключено</string> + <string name="integration_wifi_denied">Доступ к местоположению запрещён · разрешите его в «О приложении»</string> + <string name="integration_brightness_hint">Ползунок Steam задаёт яркость экрана</string> + <string name="integration_home_hint">«Домой» открывает меню Steam в сессии</string> + <string name="integration_shortcuts_hint">Удерживайте «Домой» для сочетаний Steam Guide</string> + <string name="integration_shortcuts_needs_home">Нужен DroidDeck как главный экран</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом»</string> + <string name="integration_shortcuts_restricted">Заблокировано Android · «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом»</string> + <string name="integration_shortcuts_service">Кнопка «Домой» DroidDeck</string> + <string name="integration_shortcuts_service_description">Передаёт нажатия кнопки «Домой» в Steam Guide, пока активна сессия Steam и DroidDeck является главным экраном по умолчанию. Не считывает содержимое экрана.</string> + <string name="integration_brightness_needed">Включите «Яркость» в «Настройка → Интеграция со Steam»</string> + <string name="apps_search_hint">Поиск приложений</string> + <string name="apps_no_match">Нет приложений по запросу «%1$s».</string> + <string name="apps_add_widget">Добавить виджет</string> + <string name="apps_widgets_loading">Загрузка виджетов…</string> + <string name="apps_widgets_none">На этом устройстве нет приложений с виджетами.</string> + <string name="apps_widget_wider">Шире</string> + <string name="apps_widget_narrower">Уже</string> + <string name="apps_widget_taller">Выше</string> + <string name="apps_widget_shorter">Ниже</string> + <string name="apps_widget_move_earlier">Переместить раньше</string> + <string name="apps_widget_move_later">Переместить позже</string> + <string name="apps_widget_configure">Настройки виджета</string> + <string name="apps_widget_remove">Удалить виджет</string> + <string name="apps_add_to_folder">Добавить в папку</string> + <string name="apps_new_folder">Новая папка</string> + <string name="apps_remove_from_folder">Убрать из папки</string> + <string name="apps_app_info">О приложении</string> + <string name="apps_uninstall">Удалить</string> + <string name="apps_folder_rename">Переименовать</string> + <string name="apps_folder_ungroup">Разгруппировать</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Название папки</string> + <string name="apps_filter">Показать</string> + <string name="apps_filter_all">Все приложения</string> + <string name="apps_filter_games">Игры</string> + <string name="apps_filter_downloaded">Загруженные</string> + <string name="apps_filter_system">Системные</string> + <string name="apps_filter_hidden">Скрытые</string> + <string name="apps_hide">Скрыть</string> + <string name="apps_unhide">Показывать в приложениях</string> + <string name="apps_shortcut_remove">Удалить ярлык</string> + <string name="apps_pin_title">Добавить в приложения</string> + <string name="apps_pin_add">Добавить</string> + <string name="apps_hidden_none">Скрытых приложений нет.</string> + <string name="apps_sort_name_asc">Название А–Я</string> + <string name="apps_sort_name_desc">Название Я–А</string> + <string name="apps_sort_installed">Недавно установленные</string> + <string name="apps_sort_updated">Недавно обновлённые</string> + <plurals name="apps_count"> + <item quantity="one">%d приложение</item> + <item quantity="few">%d приложения</item> + <item quantity="many">%d приложений</item> + <item quantity="other">%d приложения</item> + </plurals> + <string name="desktop_restore_title">Восстановление программ</string> + <string name="desktop_restore_body">Повторная установка добавленных вами приложений после обновления DroidDeck.</string> + <string name="desktop_restore_done_title">Программы восстановлены</string> + <string name="desktop_restore_done_body">Добавленные вами приложения снова установлены.</string> + <string name="desktop_restore_failed_title">Не удалось восстановить часть программ</string> + <string name="desktop_restore_failed_body">Посмотрите ~/.cache/droiddeck/apt-restore.log, затем попробуйте sudo apt install в Konsole.</string> + <string name="gog_full_files">Нативные оптимизации недоступны. Загрузка содержит полные файлы для замены.</string> + <string name="gog_recover">Проверить результат патча</string> + <string name="slow_usb_title">Медленное подключение USB</string> + <string name="slow_usb_cable">%1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с), поэтому игры на нём будут загружаться медленно. Используйте кабель USB 3 на 5 Гбит/с или быстрее, попробуйте перевернуть разъём USB-C или возьмите более быстрый накопитель.</string> + <string name="slow_usb_port">%1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с). USB-порт этого устройства не работает быстрее, поэтому игры будут загружаться медленно. Внутренняя память или карта microSD могут быть быстрее.</string> + <string name="slow_usb_never">Больше не показывать</string> + <string name="slow_usb_dismiss">Закрыть</string> + <string name="steam_import_title">Перезапустить Steam, чтобы добавить ваши игры?</string> + <string name="steam_import_body">Steam может показать эти ваши игры как установленные: %1$s. Для этого его нужно перезапустить. Перезапустите сейчас, или они будут добавлены при следующем запуске Steam.</string> + <string name="steam_import_names_more">%1$s и ещё %2$d</string> + <string name="steam_import_now">Перезапустить сейчас</string> + <string name="steam_import_later">Позже</string> + <string name="gog_maintenance">Управление установкой GOG</string> + <string name="gog_check">Проверить обновления</string> + <string name="gog_repair">Проверка/восстановление</string> + <string name="gog_patches">Офлайн-патчи</string> + <string name="gog_refresh">Скачать полный офлайн-установщик</string> + <string name="gog_update">Обновить до %1$s</string> + <string name="gog_resume">Продолжить обслуживание GOG</string> + <string name="gog_open_patch">Открыть установщик патча</string> + <string name="gog_patch_in_session">Завершите или отмените установщик патча в сессии Linux.</string> + <string name="gog_patch_requirements">Выберите патч для вашей установленной версии и языка. Поддерживаемые исходные версии могут быть не указаны.</string> + <string name="gog_no_patches">У GOG нет отдельных патчей для Windows для этой игры.</string> + <string name="gog_managed_files">Изменённые файлы игры могут быть заменены.</string> + <string name="gog_patch_installer_note">Установщик откроется в вашей сессии Linux.</string> + <string name="gog_download_label">Загрузка</string> + <string name="gog_space_label">Доп. место</string> + <string name="gog_space_estimate_label">Оценка места</string> + <string name="gog_repair_action">Восстановить файлы</string> + <string name="gog_refresh_action">Обновить установку</string> + <string name="gog_select_patch">Выбрать</string> + <string name="setup_all_files">Доступ ко всем файлам</string> + <string name="setup_local_network">Локальная сеть</string> + <string name="libraries_title">Другие библиотеки Steam</string> + <string name="libraries_hint">Папки, в которые Steam может устанавливать и из которых запускать игры, каждая со своим названием. Удаление из списка сохраняет игры на диске.</string> + <string name="libraries_add">Добавить библиотеку</string> + <string name="libraries_rename_title">Название библиотеки</string> + <string name="libraries_pick">Выберите папку библиотеки</string> + <string name="libraries_full">Не более %1$d дополнительных библиотек</string> + <string name="libraries_overlap">Эта папка уже является библиотекой или находится внутри неё</string> + <string name="libraries_missing">%1$s · недоступна</string> + <string name="libraries_applies_next">Применяется со следующего сеанса Steam</string> + <string name="bottom_desktop_start">Запустить рабочий стол</string> + <string name="bottom_desktop_mode_touch">Прямое касание</string> + <string name="bottom_desktop_trackpad">Тачпад. Коснитесь для прямого касания</string> + <string name="bottom_desktop_direct_touch">Прямое касание. Коснитесь для тачпада</string> + <string name="bottom_desktop_starting">Запуск рабочего стола KDE…</string> + <string name="bottom_desktop_ended">Рабочий стол закрылся.</string> + <string name="bottom_desktop_failed">Не удалось запустить рабочий стол. Журналы находятся в папке bottom-desktop этого сеанса.</string> + <string name="bottom_desktop_off">Рабочий стол закрыт.</string> + <string name="libraries_rename">Переименовать</string> + <string name="second_mode_desktop">Рабочий стол</string> + <string name="bottom_desktop_mode_trackpad">Тачпад</string> + <string name="bottom_desktop_title">Рабочий стол · %1$s</string> </resources> diff --git a/app/src/main/res/values-sv/gestures.xml b/app/src/main/res/values-sv/gestures.xml index a860712b4..064ee4168 100644 --- a/app/src/main/res/values-sv/gestures.xml +++ b/app/src/main/res/values-sv/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gester</string> <string name="gesture_settings">Inställningar för pekgester</string> - <string name="gesture_settings_hint">Anpassa mus- och tangentbordsgester. Välj Gester som pekläge för att använda dem.</string> <string name="gesture_tap">Tryck</string> <string name="gesture_drag">Dra med ett finger</string> <string name="gesture_long_press">Långt tryck</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Håll med tre fingrar</string> <string name="gesture_pinch">Nyp för att zooma</string> <string name="gesture_hold_button">Håll knappen nedtryckt</string> + <string name="gesture_hold_left">Håll vänster knapp nedtryckt</string> + <string name="gesture_hold_right">Håll höger knapp nedtryckt</string> <string name="gesture_click_once">Klicka en gång</string> <string name="gesture_hold_delay">Fördröjning före hållning</string> <string name="gesture_double_delay">Intervall för dubbeltryck</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">Backsteg</string> <string name="gesture_key_enter">Retur</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mellanslag</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-sv/shortcuts.xml b/app/src/main/res/values-sv/shortcuts.xml new file mode 100644 index 000000000..c74ad141d --- /dev/null +++ b/app/src/main/res/values-sv/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Genvägar för fysiska knappar</string> + <string name="shortcuts_dd_menu">DroidDeck-meny</string> + <string name="shortcuts_capture">Tilldela: %1$s</string> + <string name="shortcuts_press">Tryck på en knapp och släpp den. Tilldelningen sparas automatiskt.</string> + <string name="shortcuts_release">Släpp knappen för att fortsätta.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Den här knappen är redan tilldelad: %1$s</string> + <string name="shortcuts_save">Tilldela igen</string> + <string name="shortcuts_retry">Prova en annan knapp</string> + <string name="shortcuts_limitations">Hemknappen och vissa extraknappar kanske inte är tillgängliga.</string> +</resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5f75e2177..736c764b9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-alternativ för D3D12. nodxr inaktiverar strålspårning; använd bara för ett spel som behöver det.</string> <string name="game_env_proton_log">Ange 1 för en diagnostiklogg från Proton. Loggning kan sänka prestandan och tar lagringsutrymme.</string> <string name="game_env_wined3d">Ange 1 för att använda OpenGL-baserade WineD3D i stället för DXVK vid kompatibilitetstester för D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderare för DirectDraw, Direct3D 1-7 och spel som körs med WineD3D. Vulkan hoppar över OpenGL-via-Zink-vägen och är mycket snabbare för gamla DirectDraw- och Direct3D 7-spel på Adreno.</string> + <string name="game_env_dxvk_d3d8">Ange 1 för att köra Direct3D 8 via DXVK i stället för WineD3D. Snabbare i AIO Graphics Tests Direct3D 8-test på Adreno.</string> <string name="game_env_no_ntsync">Ange 1 för att hålla spelet borta från ntsync (droiddeck-ntsync eller en kärndrivrutin); det använder droiddeck-esync där ett paket finns, annars droiddeck-fsync.</string> <string name="game_env_no_esync">Ange 1 för att stänga av droiddeck-esync för det här spelet; det använder droiddeck-fsync i stället, eller droiddeck-ntsync där även fsync är av.</string> <string name="game_env_no_fsync">Ange 1 för att hålla spelet borta från droiddeck-fsync; det använder droiddeck-esync där ett paket finns, annars droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ange 1 för att köra spelet på droiddeck-fsync, eller 0 för att prioritera droiddeck-esync där ett paket passar dess Proton.</string> <string name="game_env_xalia">Ange 0 för att inaktivera Protons hjälp för handkontrollsnavigering i det här spelet.</string> + <string name="game_env_anticheat_offline">På som standard. Startar ett Easy Anti-Cheat-spel utan dess anti-cheat när spelet stöder offlinespel. Stäng av för att starta via Easy Anti-Cheat som vanligt. Onlinelägen som kräver Easy Anti-Cheat förblir otillgängliga.</string> <string name="game_env_hud">DXVK-överlägg för D3D9–11. fps visar bildfrekvensen; utan värde döljs det.</string> <string name="game_env_dxvk_config">DXVK-inställningar avgränsade med semikolon. Nyare versioner använder dxvk.maxFrameRate för bildbegränsning; använd hellre sessionens bildbegränsare vid vanligt spelande.</string> + <string name="game_env_cores">CPU-kärnor för det här spelet, t.ex. 0-4 eller 0,2,4, i stället för sessionens spelkärnor. Färre kärnor går svalare.</string> <string name="game_env_vkd3d_limit">Gräns för bildfrekvens i D3D12. 0 inaktiverar gränsen.</string> <string name="game_env_glthread">Trådning för Mesa OpenGL. true kan hjälpa CPU-begränsade OpenGL-spel; testa för varje spel.</string> <string name="sync_backend_title">Wine-synk</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kör Linux-program för x86 på den här ARM64-enheten. Auto använder det när programmet är byggt för x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Programmet är byggt för %1$s-datorer och körs via FEX, som inte har konfigurerats än. Öppna Steam en gång medan du är inloggad: DroidDeck låter Steam ladda ned FEX och den Steam Linux Runtime som behövs, sedan öppnas detta.</string> + <string name="session_proot_missing">Det gick inte att ladda ned DroidDecks proot. Kontrollera anslutningen och försök igen. Sessionen startades inte eftersom reserv-proot är för långsam att spela på.</string> + <string name="session_directaudio_missing">Det gick inte att ladda ned DirectAudio, så spelljudet använder den långsammare vägen den här sessionen.</string> <string name="session_end_program">Det här programmet</string> <string name="session_end_steam_download">Det gick inte att ladda ned Steam-klienten. Ditt nätverk eller din VPN kanske blockerar Steams servrar; kontrollera anslutningen och försök igen.</string> <string name="session_end_steam_setup">Det gick inte att konfigurera Steam-klienten. Kontrollera anslutningen och det lediga lagringsutrymmet och försök igen.</string> @@ -247,8 +253,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 +271,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> @@ -276,7 +298,14 @@ <string name="mode_controller_dualsense">DualSense</string> <string name="mode_controller_x360">Xbox 360-kontroll</string> <string name="mode_controller_note">Deck: snabbåtkomstknappen och gyro. Steam Controller: samma, med greppkänsla på bakknapparna. DualShock 4 och DualSense: gyro, och styrplattorna som deras pekplatta. Xbox 360: öppna snabbåtkomst med Guide+A.</string> - <string name="mode_back">Back</string> + <string name="mode_back">Bakåt</string> + <string name="back_hold">Håll Bakåt för Steam-genvägar</string> + <string name="back_hold_hint">Håll Bakåt för att öppna Snabbåtkomst eller göra Steam-kombinationer med andra knappar. Stäng av för att ignorera hållen Bakåt; tryck och dubbeltryck fungerar fortfarande.</string> + <string name="back_native_qam_hint">Håll Back i 700 ms, eller håll Back och tryck på en annan knapp för Steam-genvägar.</string> + <string name="back_double_tap_window">Tidsfönster för dubbeltryck</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillåt styrning av ljusstyrka</string> + <string name="brightness_permission_text">Konfigurera styrning av ljusstyrka i DroidDeck.</string> <string name="back_menu_then_qam">Meny → QAM</string> <string name="back_qam_then_menu">QAM → Meny</string> <string name="mode_session">Session</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Senaste versionen · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installera senaste</string> + <string name="decky_channel">Uppdateringskanal</string> + <string name="decky_channel_hint">Vilka Decky Loader-utgåvor som installeras. Deckys egen uppdaterare använder samma kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Förhandsversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Det gick inte att spara Deckys uppdateringskanal</string> <string name="mode_decky_on">Startar med Steam. Medan det är på kan andra appar på enheten eventuellt styra Steam.</string> <string name="mode_decky_off">Av. Steams fjärrfelsökningsport förblir stängd.</string> <string name="mode_decky_remove_title">Avinstallera Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Prestandaöverlägg</string> <string name="mode_mangoapp_hint">Stäng av om spel kraschar eller blir svarta i Deck-läge. Gäller från nästa session.</string> + <string name="mode_return_after_game">Återgå till DroidDeck efter ett spel</string> + <string name="mode_return_after_game_hint">När ett spel du startade från DroidDeck eller en annan launcher stängs avslutas Steam korrekt (molnsparningar slutförs först) och du kommer tillbaka dit. Av: stanna i Steam.</string> + <string name="mode_shader_precache">Förhandscachning av shaders</string> + <string name="mode_shader_precache_hint">Steam laddar ned förbyggda shaders för dina spel och bearbetar dem i bakgrunden, så att spel hackar mindre. Av sparar data, lagringsutrymme och batteri; spel bygger i stället shaders medan de körs. Samma inställning som Steams Nedladdningar > Shader Pre-Caching. Gäller från nästa session.</string> <string name="mode_steam_repair">Reparera Steam-klienten</string> <string name="mode_steam_repair_hint">Laddar ned Steam-klienten igen nästa gång Steam startar. Använd det om Steam fastnar på sin inläsningsskärm. Spel, inloggning och inställningar behålls.</string> <string name="mode_steam_repair_queued">Steam-klienten laddas ned igen nästa gång Steam startar.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Kringgår PulseAudio för lägre latens.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">För röstchatt.</string> + <string name="drawer_mic_hint">Slå på eller av mikrofoninspelning för den här sessionen.</string> + <string name="drawer_mic_failed">Det gick inte att ändra mikrofonen. Försök igen.</string> <string name="mode_network">Nätverk</string> <string name="mode_wifi_discovery">Wi-Fi-identifiering</string> <string name="mode_wifi_discovery_hint">Visa Wi-Fi-namn och nätverk i närheten i Steam.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: GPU-kö i realtid</string> <string name="perf_gsrealtime_hint">Prioriterar kompositorns GPU-arbete. Kan jämna ut bildtakten till viss kostnad för spelen.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Minne</string> + <string name="perf_cap_off">Av</string> + <string name="perf_cap_auto">Drivrutinens standard</string> + <string name="perf_zram_client">Komprimera Steam medan ett spel körs</string> + <string name="perf_zram_client_hint">20 s efter att ett spel startat komprimeras Steam-klienten till zRAM för att ge spelet mer minne, och läses tillbaka när spelet stängs. Stäng av om sessionen stängs strax efter att spel startar. En RAM-gräns ovan komprimerar fortfarande Steam när sessionen överskrider den.</string> + <string name="perf_ram_cap">RAM-gräns</string> + <string name="perf_ram_cap_hint">Gäller medan Steam-klienten körs, i Steam-läge eller från skrivbordet. När sessionen använder mer än detta komprimeras Steam och sedan sessionens övriga processer som stöds till zRAM. En mjuk gräns: inget stängs, men spel kan hacka medan sidor läses tillbaka.</string> + <string name="perf_ram_cap_unavailable">Kräver zRAM-swap, vilket den här enheten saknar.</string> + <string name="perf_vram_cap">VRAM-gräns</string> + <string name="perf_vram_cap_hint">Videominnet som DXVK rapporterar till Direct3D-spel, så att de budgeterar texturer för mindre. Ett spels egna DXVK-inställningar har företräde. Börjar gälla vid nästa session.</string> <string name="perf_gpuclock">Håll GPU:n på dess högsta klockfrekvens</string> <string name="perf_gpuclock_hint">Bara Adreno. Färre hack, högre batteriförbrukning och mer värme.</string> <string name="perf_fixes">Sessionsfixar</string> <string name="perf_sysmem">Turnip: sysmem-rendering</string> <string name="perf_sysmem_hint">Snabbare för Steam-klienten; i spel väljer drivrutinen kakel- eller systemminnesrendering för varje pass. Krävs på Adreno 710/720/722.</string> <string name="perf_xalia">Hoppa över Steams xalia-hjälp</string> - <string name="perf_fastsync">droiddeck-ntsync (experimentell)</string> - <string name="perf_fastsync_hint">En ersättning i användarutrymmet för Linux ntsync-drivrutinen, för testning. Medan det är på använder Proton det i stället för droiddeck-esync och droiddeck-fsync. Fungerar med Proton Experimental ARM64, GE-Proton och proton-cachyos. Gäller från nästa session.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">En ersättning i användarutrymmet för Linux ntsync-drivrutinen. Medan det är på använder Proton det i stället för droiddeck-esync och droiddeck-fsync. Fungerar med Proton Experimental ARM64, GE-Proton och proton-cachyos. Gäller från nästa session.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync först</string> <string name="perf_fsync_hint">Kör Protons egen fsync på de ursprungliga Proton-filerna, med futex_waitv tillhandahållen i användarutrymmet, så det behöver inget paket och fortsätter fungera så snart Steam uppdaterar Proton. Medan det är på använder spel det före droiddeck-esync, förutom de få som Proton håller borta från fsync. Gäller från nästa session.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot snabbväg</string> <string name="perf_fastpath_needs_seccomp">Kräver proots seccomp-filter.</string> <string name="perf_fastpath_hint">Snabbare filuppslagningar och mindre hack. Stäng av om ett program inte hittar sina filer.</string> + <string name="perf_cursor_composite">Rita markören i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope ritar själv pekaren i stället för att lämna den till Android. Slå på för en handkontrollsstyrd markör. Av är snabbare på en telefon. Gäller från nästa session.</string> <string name="perf_identity">Sessionsidentitet</string> <string name="perf_hostname">Värdnamn</string> <string name="perf_hostname_hint">Namnet Steam ser för den här enheten. Lämna tomt för att återställa till %1$s.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Dess filer tas bort från appen.</string> <string name="driver_delete_in_use">Dess filer tas bort. Den används, så standarden tar över.</string> <string name="drawer_page_display">Skärm</string> + <string name="drawer_frame_limit">Bildgräns</string> + <string name="drawer_frame_limit_note">Begränsar det här spelet. Skärmen byter till en uppdateringsfrekvens som gränsen delar jämnt när en sådan finns; andra gränser kan se ojämna ut. Steam-spel använder Steams Frame Limit i snabbåtkomstmenyn.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -585,12 +640,72 @@ <string name="drawer_hud_battery">Batteritemperatur</string> <string name="drawer_hud_graph">Prestandagraf</string> <string name="drawer_hud_color">Färg</string> - <string name="drawer_hud_color_mint">Mint</string> + <string name="drawer_hud_color_mint">Mintgrön</string> <string name="drawer_hud_color_white">Vit</string> <string name="drawer_hud_color_sky">Himmelsblå</string> - <string name="drawer_hud_color_amber">Amber</string> + <string name="drawer_hud_color_amber">Bärnsten</string> <string name="drawer_hud_color_violet">Lila</string> <string name="drawer_hud_opacity">Opacitet</string> + <string name="hud_size">Storlek</string> + <string name="hud_size_hint">Ett tryck på HUD:en ändrar också dess storlek.</string> + <string name="hud_size_full">Full</string> + <string name="hud_size_tiles">Rutor</string> + <string name="hud_size_pill">Piller</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">List</string> + <string name="hud_locked">Lås på plats</string> + <string name="hud_locked_hint">Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. När den är låst fungerar skärmkontrollerna under den fortfarande.</string> + <string name="hud_snap">Fäst mot sidorna</string> + <string name="hud_snap_hint">Släpp HUD:en så flyttas den till skärmens närmaste sida. En snabb svepning kastar den åt det hållet.</string> + <string name="hud_group_look">Utseende</string> + <string name="hud_scale">Storlek på skärmen</string> + <string name="hud_color_soft">Mjuk</string> + <string name="hud_color_mid">Mellan</string> + <string name="hud_color_vivid">Livfull</string> + <string name="hud_outline">Kontur</string> + <string name="hud_outline_color">Konturfärg</string> + <string name="hud_outline_gray">Grå</string> + <string name="hud_outline_theme">Temafärg</string> + <string name="hud_group_metrics">Mätvärden</string> + <string name="hud_metric_graph">Bildtidsgraf</string> + <string name="hud_metric_decimal">Bildfrekvens med decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% lägsta</string> + <string name="hud_metric_engine">Grafikmotor</string> + <string name="hud_metric_gpu_model">GPU-namn</string> + <string name="hud_metric_gpu">GPU-belastning</string> + <string name="hud_metric_gpu_temp">GPU-temperatur</string> + <string name="hud_metric_cpu">CPU-belastning</string> + <string name="hud_metric_per_core">CPU per kärna</string> + <string name="hud_metric_temp">Temperaturer</string> + <string name="hud_metric_ram">Minne</string> + <string name="hud_metric_vram">Grafikminne</string> + <string name="hud_metric_swap">Växlingsminne</string> + <string name="hud_metric_battery">Batterinivå</string> + <string name="hud_metric_power">Strömförbrukning</string> + <string name="hud_metric_network">Nätverk</string> + <string name="hud_metric_resolution">Upplösning</string> + <string name="hud_metric_proton">Proton-version</string> + <string name="hud_metric_session">Sessionstid</string> + <string name="hud_metric_clock">Klocka</string> + <string name="hud_group_temps">Temperaturer</string> + <string name="hud_temp_unit">Enhet</string> + <string name="hud_temp_bands">Varningsfärger</string> + <string name="hud_temp_bands_hint">Temperaturer blir bärnstensfärgade och sedan röda när de närmar sig gränsen.</string> + <string name="hud_temp_bands_off">Av</string> + <string name="hud_temp_bands_auto">Automatiskt</string> + <string name="hud_temp_bands_manual">Manuell</string> + <string name="hud_temp_red_cpu">CPU röd vid</string> + <string name="hud_temp_red_gpu">GPU röd vid</string> + <string name="hud_temp_red_battery">Batteri rött vid</string> + <string name="hud_group_more">Mer</string> + <string name="hud_export">HUD-diagnostik</string> + <string name="hud_export_hint">Sparar en rapport över alla sensorer som HUD:en läser i Downloads/DroidDeck.</string> + <string name="hud_export_button">Spara</string> + <string name="hud_export_done">Sparad i %1$s</string> + <string name="hud_export_failed">Det gick inte att spara HUD-rapporten.</string> + <string name="hud_reset">Återställ HUD-inställningar</string> + <string name="hud_reset_button">Återställ</string> <string name="drawer_scaling">Skalningsläge</string> <string name="drawer_scaling_sharpness">Skalningsskärpa</string> <string name="drawer_effects">Skärmeffekter</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tangentbord</string> <string name="drawer_latency">Latens</string> + <string name="drawer_low_latency">Läge för låg latens</string> + <string name="drawer_low_latency_hint">Ökar CPU- och batteriförbrukningen</string> <string name="drawer_low_latency_controller">Handkontroll med låg latens</string> <string name="drawer_low_latency_controller_hint">Handkontrollen rapporterar i 1000 Hz i stället för 250 Hz. Något mer CPU.</string> <string name="drawer_low_latency_touch">Pekning med låg latens</string> <string name="drawer_low_latency_touch_hint">Pekningar hoppar över bildrutebatchning; Steams pekstyrning går i 1000 Hz. Något mer CPU.</string> + <string name="drawer_evdev_mouse">Rå muskanal</string> + <string name="drawer_direct_cursor">Markör</string> <string name="drawer_pc_keyboard">PC-tangentbord</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Andra skärmen</string> @@ -715,6 +834,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Sessionsloggar</string> <string name="setup_logs_hint">Sparas efter varje session</string> + <string name="setup_game_debug_logs">Felsökningsloggar för spel</string> + <string name="setup_game_debug_logs_hint">Ta med diagnostik för Proton, Wine och grafik vid nästa spelstart. Kan sänka prestandan och använda mer lagringsutrymme.</string> + <string name="setup_game_debug_logs_restart">Starta om sessionen för att spara felsökningsloggar för spel</string> + <string name="setup_logging_update_failed">Det gick inte att uppdatera loggningen. Kontrollera reglaget och försök igen.</string> <string name="setup_agent_commands">Felsökningsverktyg</string> <string name="setup_latest_logs">Senaste sessionsloggar</string> <string name="setup_saved_logs">Sparade sessionsloggar</string> @@ -747,12 +870,28 @@ <string name="setup_home_on">DroidDeck kan vara startskärmsappen</string> <string name="setup_home_off">DroidDeck erbjuds aldrig som startskärmsapp</string> <string name="setup_orientation">Orientering</string> + <string name="setup_launcher_orientation">Launcherns orientering</string> + <string name="setup_launcher_orientation_auto">Följ enhetens rotation</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Sessionens orientering</string> + <string name="setup_session_orientation_hint">Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; anpassad bredd och höjd förblir som angivet.</string> <string name="setup_orientation_auto">Automatiskt liggande</string> <string name="setup_orientation_landscape">Liggande</string> <string name="setup_orientation_reverse">Liggande, upp och ned</string> <string name="setup_fullscreen">Helskärm</string> <string name="setup_fullscreen_on">Döljer Androids statusfält och navigeringsfält</string> <string name="setup_fullscreen_off">Visar Androids statusfält och navigeringsfält</string> + <string name="setup_dual_screen">Dubbelskärm</string> + <string name="setup_dual_screen_hint">Automatiskt använder den andra skärmen på handhållna enheter med en inbyggd andra skärm. På använder vilken andra skärm som helst. Av håller allt på en skärm.</string> + <string name="setup_dual_screen_auto">Automatiskt</string> + <string name="setup_dual_screen_on">På</string> + <string name="setup_dual_screen_off">Av</string> + <string name="setup_dual_screen_menu">Meny på nedre skärmen</string> + <string name="setup_dual_screen_menu_hint">Flyttar avsnitten och menyn i spelet till den andra skärmen och skrivandet sker där, så att den övre skärmen behåller hela vyn. L2 och R2 byter avsnitt.</string> + <string name="setup_dual_screen_controls">Kontroller på nedre skärmen i spel</string> + <string name="setup_dual_screen_controls_hint">Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar.</string> + <string name="dual_typing_title">Skriver för den övre skärmen</string> + <string name="dual_typing_done">Klar</string> <string name="setup_default_home">Standardapp för startskärmen</string> <string name="setup_choose_home">Välj en app för startskärmen</string> <string name="setup_choose">Välj</string> @@ -900,6 +1039,14 @@ <string name="gate_step1">Öppna Inställningar → Utvecklaralternativ → Trådlös felsökning och slå på det</string> <string name="gate_step2">Tryck på ”Para ihop enhet med ihopkopplingskod”</string> <string name="gate_step3">Skriv in koden i DroidDeck-aviseringen</string> + <string name="pairguide_build_number">Tryck sju gånger på Versionsnummer under Om telefonen</string> + <string name="pairguide_wireless">Slå på Trådlös felsökning</string> + <string name="pairguide_pair">Öppna Trådlös felsökning och tryck på ”Parkoppla enheten med en kopplingskod”</string> + <string name="pairguide_child_process">Slå på ”Inaktivera begränsningar för underordnade processer”</string> + <string name="pairguide_row_child_process">Inaktivera begränsningar för underordnade processer</string> + <string name="pairguide_row_build_number">Versionsnummer</string> + <string name="pairguide_row_wireless">Trådlös felsökning</string> + <string name="pairguide_row_pair">Parkoppla enheten med en kopplingskod</string> <string name="gate_waiting">Väntar på popup-fönstret för ihopkoppling…</string> <string name="gate_code_needed">Popup-fönster hittat. Ange dess kod i aviseringen.</string> <string name="gate_status">Status</string> @@ -1023,8 +1170,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 +1177,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> @@ -1041,10 +1185,8 @@ <string name="games_never_played">Aldrig spelat</string> <string name="games_runtime_busy_percent">Körmiljö upptagen · %1$d %%</string> <string name="games_runtime_busy">Körmiljö upptagen</string> - <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> @@ -1059,6 +1201,9 @@ <string name="gpu_hide_other">Dölj drivrutiner för andra GPU:er</string> <string name="gpu_show_other">Visa drivrutiner för andra GPU:er</string> <string name="gpu_advanced">Avancerat</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prova På eller Av om Steam eller Android visar ränder eller flimmer. Gäller båda drivrutinerna efter omstart av DroidDeck.</string> + <string name="gpu_ubwc_restart">Starta om DroidDeck för att tillämpa.</string> <string name="gpu_set_with_display">Ställs in tillsammans med skärmdrivrutinen: %1$s innehåller båda.</string> <string name="gpu_set_with_runtime">Ställs in tillsammans med körmiljödrivrutinen: %1$s innehåller båda.</string> <string name="gpu_runtime_hint">Används av spel och skrivbordet.</string> @@ -1113,7 +1258,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> @@ -1167,10 +1312,15 @@ <string name="pip_auto">Öppna bild-i-bild automatiskt</string> <string name="unfolded_controls">Kontroller på den uppfällda skärmen</string> <string name="unfolded_controls_hint">Uppfälld ligger spelet ovanför Steam Decks styrplattor och greppknappar. Hopfälld visas spelet i helskärm.</string> + <string name="unfolded_controls_with_controller">Behåll dem med en handkontroll</string> + <string name="unfolded_controls_with_controller_hint">Visa även de här pekkontrollerna medan en handkontroll är ansluten.</string> <string name="pip_suspended">Pausad</string> <string name="pip_not_ready">Bild-i-bild blir tillgängligt när sessionen är redo.</string> <string name="pip_permission">Tillåt bild-i-bild för DroidDeck i Android-inställningarna.</string> <string name="pip_unavailable">Android kunde inte öppna bild-i-bild.</string> + <string name="game_more">Mer</string> + <string name="game_edit_art">Redigera grafik</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Genväg</string> <string name="game_shortcut_add">Lägg till på hemskärmen</string> <string name="game_shortcut_choose">Välj spel</string> @@ -1194,6 +1344,10 @@ <string name="main_wait_runtime">Vänta tills åtgärden på körmiljön är klar</string> <string name="main_wait_proton_install">Vänta tills installationen av kompatibilitetsverktyget är klar</string> + <string name="load_compat_title">Förbereder kompatibilitetsverktyg</string> + <string name="load_compat_wait">Väntar på att kompatibilitetskonfigurationen ska bli klar</string> + <string name="load_compat_hint">Sessionen startar när konfigurationen är klar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vänta tills installationen av skrivbordsappen är klar</string> <string name="main_wait_install_game">Vänta tills installationen är klar innan du startar ett spel</string> <string name="main_saves_close_session">Stäng Steam-sessionen först, så att spelet inte skriver över importen</string> @@ -1230,6 +1384,9 @@ <string name="main_install_anyway">Installera trots det</string> <string name="main_remove_runtime_title">Ta bort Linux-körmiljön</string> <string name="main_remove_runtime_text">Det här tar bort körmiljön, Steam-klienten i den och alla spel som är installerade där.</string> + <string name="runtime_actions_title">Linux-körmiljö</string> + <string name="runtime_actions_text">Reparera installerar om körmiljöns systemfiler och behåller Steam, dina spel och inställningar. Tillägg som skrivbordet installeras igen nästa gång du använder dem. Ta bort raderar allt.</string> + <string name="runtime_repair">Reparera körmiljön</string> <string name="main_applied">Tillämpat: %1$s</string> <string name="android_app_open_failed_primary">Kunde inte öppna %1$s på den primära skärmen</string> <string name="android_app_open_failed_on">Kunde inte öppna %1$s på %2$s</string> @@ -1359,6 +1516,11 @@ <string name="session_runtime_catalog_unreachable">Kunde inte nå körmiljökatalogen. Kontrollera anslutningen och tryck på Spela igen.</string> <string name="session_runtime_install_failed">Linux-körmiljön installerades inte. Kontrollera körmiljön i Konfiguration och tryck på Spela igen.</string> <string name="session_desktop_install_failed">Skrivbordet installerades inte (%1$s). Kontrollera anslutningen och tryck på Skrivbord igen.</string> + <string name="session_package_resume_failed">En avbruten installation kunde inte slutföras (%1$s). Kontrollera anslutningen och utrymmet och försök sedan igen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-körmiljön är skadad: %1$d bibliotekslänk pekar på en saknad fil (%2$s), oftast efter en avbruten installation. Reparera behåller dina spel och inställningar.</item> + <item quantity="other">Linux-körmiljön är skadad: %1$d bibliotekslänkar pekar på saknade filer (%2$s med flera), oftast efter en avbruten installation. Reparera behåller dina spel och inställningar.</item> + </plurals> <string name="session_ended_named">%1$s stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> <string name="session_ended_program">Programmet stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> <string name="session_ended_desktop">Skrivbordet stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> @@ -1373,6 +1535,13 @@ <string name="mode_decky_plugins_hint">Installera en plugin-zip för nästa Steam-session.</string> <string name="mode_decky_plugin_downloading">Laddar ned…</string> <string name="mode_decky_plugin_install_zip">Installera från zip</string> + <string name="decky_zip_warning_title">Installation av tredjepartstillägg</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har inte granskat det här tillägget. Det kan innehålla skadlig kod, till exempel program som stjäl ditt Steam-konto eller skadar din enhet. Genom att installera tillägget godkänner du att du tar på dig alla risker för din enhet.</string> + <string name="decky_zip_warning_continue">Fortsätt</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vänta %1$d sekund</item> + <item quantity="other">Vänta %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spel</string> <string name="store_cat_audio_video">Ljud & video</string> <string name="store_cat_graphics">Grafik</string> @@ -1401,6 +1570,10 @@ <string name="theme_icon_blue_detail">Svart bakgrund, vit text, den blå färgen för allt som är markerat, i fokus eller nedtryckt.</string> <string name="theme_electric">Elektrisk marinblå</string> <string name="theme_electric_detail">Den blå färgen klarare, på ytor som lutar åt marinblått i stället för grått.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Färger som växlar genom regnbågen. Följer Androids animationsinställningar.</string> + <string name="theme_rgb_speed">Hastighet</string> + <string name="theme_rgb_speed_hint">Hur snabbt färgerna växlar.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Dina egna primära och sekundära färger, blandade på knappar och markeringar.</string> <string name="theme_gradient_primary">Primär</string> @@ -1424,7 +1597,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mellanslag</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1522,7 +1695,16 @@ <string name="fm_conflict_skip">Hoppa över</string> <string name="fm_select_this_folder">Välj den här mappen</string> <string name="fm_back">Tillbaka</string> + <string name="fm_exit">Avsluta</string> + <string name="fm_return_to_start">Tillbaka till startmappen</string> + <string name="fm_start_unavailable">Startmappen är inte längre tillgänglig</string> + <string name="fm_cancel_operation_title">Avbryt åtgärden?</string> + <string name="fm_cancel_operation_confirmation">Åtgärden avbryts. Är du säker?</string> + <string name="fm_accept">Acceptera</string> + <string name="fm_decline">Avböj</string> <string name="fm_drive_not_readable">%1$s är monterad men inte läsbar just nu</string> + <string name="fm_drive_access_title">Tillåt åtkomst till %1$s</string> + <string name="fm_drive_access_text">Android låter DroidDeck se den här enheten men inte läsa den. Slå på Åtkomst till alla filer för DroidDeck och kom sedan tillbaka.</string> <string name="fm_list_view">Listvy</string> <string name="fm_grid_view">Rutnätsvy</string> <string name="fm_search">Sök</string> @@ -1567,7 +1749,7 @@ <string name="ctrl_tint_white">Vit</string> <string name="ctrl_tint_violet">Lila</string> <string name="ctrl_tint_green">Grön</string> - <string name="ctrl_tint_amber">Amber</string> + <string name="ctrl_tint_amber">Bärnsten</string> <string name="ctrl_tint_red">Röd</string> <string name="ctrl_tint_pink">Rosa</string> <string name="ctrl_button_a">A-knappen</string> @@ -1594,6 +1776,93 @@ <string name="second_mode_keyboard_trackpad">Tangentbord + styrplatta</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grepp + styrplattor</string> + <string name="second_mode_dashboard">Översikt</string> + <string name="bottom_dashboard_empty">Inget att visa här än.</string> + <string name="bottom_page_downloads">Nedladdningar</string> + <string name="bottom_downloads_none">Inga nedladdningar pågår.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Laddar ned shadercache</string> + <string name="bottom_downloads_paused">Pausad</string> + <string name="bottom_downloads_queued">Väntar på att starta</string> + <string name="bottom_page_notifications">Aviseringar</string> + <string name="bottom_notifications_listener">DroidDecks nedre skärm</string> + <string name="bottom_notifications_why">Visa meddelanden och andra aviseringar här medan du spelar. De visas bara på den här skärmen och sparas inte. Android frågar en gång: sidan för aviseringsåtkomst öppnas på den här skärmen; slå på DroidDeck där så kommer den här sidan tillbaka av sig själv.</string> + <string name="bottom_notifications_allow">Tillåt aviseringsåtkomst</string> + <string name="bottom_notifications_none">Inga aviseringar.</string> + <string name="bottom_notifications_count">%1$d aviseringar</string> + <string name="bottom_notifications_clear">Rensa</string> + <string name="bottom_page_screenshots">Skärmbilder</string> + <string name="stats_fps_needs_hud">FPS kräver att HUD:en är på</string> + <string name="stats_speed">Hastighet</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tidtagning</string> + <string name="stats_best_lap">Bästa varv</string> + <string name="stats_tires">Däck °C</string> + <string name="stats_trace">Gas och broms, senaste 10 s</string> + <string name="stats_speed_chart">Hastighet, %1$s</string> + <string name="stats_gear">Växel</string> + <string name="stats_speed_units">Hastighetsenhet</string> + <string name="stats_speed_units_auto">Automatisk (%1$s)</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Broms</string> + <string name="stats_lights">Instrumentpanel</string> + <string name="stats_lamp_shift">Växla</string> + <string name="stats_lamp_handbrake">Handbroms</string> + <string name="stats_lamp_pit">Depåbegränsare</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olja %1$s °C</string> + <string name="stats_power">Kraftfördelare</string> + <string name="stats_fuel_t">Bränsle, t</string> + <string name="stats_fuel_main">Huvudtank %1$s t</string> + <string name="stats_fuel_reserve">Reserv %1$s t</string> + <string name="stats_tap_hint">Tryck på den övre remsan eller instrumentpanelen för att byta stil.</string> + <string name="bottom_telemetry_send_title">Skicka data till instrumentpanelen</string> + <string name="bottom_telemetry_send_auto">Automatiskt</string> + <string name="bottom_telemetry_send_auto_hint">Slår på det för alla spel i listan, även spel som hittas senare. Spel som du stänger av förblir avstängda.</string> + <string name="bottom_telemetry_send_note">Detta ändrar spelets egen inställning för datautmatning. Ändringen gäller nästa gång spelet startar; när du stänger av den återställs den gamla inställningen.</string> + <string name="bottom_telemetry_send_close">Stäng %1$s för att ändra detta.</string> + <string name="bottom_telemetry_send_failed">Det gick inte att ändra inställningarna för %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå på %2$s i spelets inställningar med IP 127.0.0.1 och port %3$d.</string> + <string name="bottom_shots_where">Sparas i Pictures/DroidDeck. Steam-skärmbilder visas också här.</string> + <string name="bottom_shots_take">Ta skärmbild</string> + <string name="bottom_shots_saved">Skärmbilden har sparats.</string> + <string name="bottom_shots_failed">Det gick inte att ta en skärmbild.</string> + <string name="bottom_shots_none">Inga skärmbilder än.</string> + <string name="bottom_page_chat">Chatt och röst</string> + <string name="bottom_chat_why">Läs och svara på Steam-chatten här medan spelet fortsätter att köras på huvudskärmen. Kontot som Steam är inloggat med används.</string> + <string name="bottom_chat_not_signed_in">Steam har ingen webbinloggning att dela än, så logga in här en gång.</string> + <string name="bottom_chat_stopped">Android stängde chattsidan medan DroidDeck var i bakgrunden. Den öppnas igen när du kommer tillbaka till DroidDeck.</string> + <string name="bottom_chat_open">Öppna Steam Chat</string> + <string name="bottom_chat_close">Stäng chatten</string> + <string name="bottom_chat_mic_on">Mikrofon på</string> + <string name="bottom_chat_mic_off">Mikrofon av</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen är avstängd för det här spelet. Slå på Mikrofon i DroidDecks Steam-inställningar (Ljud) och starta spelet igen för att prata.</string> + <string name="bottom_chat_volume">Volym %1$d%%</string> + <string name="bottom_page_telemetry">Statistik i spelet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Varv</string> + <string name="bottom_telemetry_position">Placering</string> + <string name="bottom_telemetry_this_lap">Detta varv</string> + <string name="bottom_telemetry_last_lap">Senaste varv</string> + <string name="bottom_telemetry_fuel">Bränsle</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Rättslig status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Slå på datautmatning i ett racingspel (kallas ofta telemetri eller UDP) för att se en liveinstrumentpanel här. Datan stannar på den här enheten.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d tar emot data (%2$d paket på %3$d byte), men i ett format som den här sidan inte kan läsa än.</string> + <string name="bottom_telemetry_port_busy">Ett annat program använder redan port %1$s, så det spelet kan inte visas här.</string> <string name="rtinst_removing">Tar bort Linux-körmiljön</string> <plurals name="rtinst_removing_entries"> @@ -1624,6 +1893,7 @@ <string name="flatpakmgr_not_ready">Konfigurera Flatpak först</string> <string name="flatpakmgr_starting">Startar</string> <string name="flatpakmgr_exit_status">Flatpak avslutades med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s är byggd för %2$s, som DroidDeck inte kan köra. Flatpak-appar här behöver en ARM64- eller x86_64-version.</string> <string name="flatpakmgr_installing">Installerar %1$s</string> <string name="flatpakmgr_updating">Uppdaterar %1$s</string> <string name="flatpakmgr_removing">Tar bort %1$s</string> @@ -1717,6 +1987,7 @@ <string name="adbpair_applying">Tillämpar inställningen…</string> <string name="adbpair_command_failed">Kommandot för trådlös felsökning misslyckades</string> <string name="adbpair_channel_name">Konfiguration av trådlös felsökning</string> + <string name="adbpair_progress_channel_name">Förlopp för konfiguration av trådlös felsökning</string> <string name="adbpair_channel_description">Frågar efter parkopplingskoden för trådlös felsökning medan Inställningar är öppen</string> <string name="adbpair_title_pair">Parkoppla trådlös felsökning</string> <string name="adbpair_waiting_text">Slå på trådlös felsökning och tryck sedan på ”Parkoppla enhet med parkopplingskod”.</string> @@ -1825,6 +2096,7 @@ <string name="gpuinfo_not_adreno">Inte en Adreno-GPU</string> <string name="gpuinfo_supported">Stöds</string> <string name="gpuinfo_experimental">Experimentell: dess drivrutiner är testversioner</string> + <string name="gpuinfo_a850_experimental">Experimentellt stöd för Adreno 850: kräver kompatibla experimentella skärm- och speldrivrutiner; inte verifierat på den här enheten</string> <string name="gpuinfo_below_tested">Under testad maskinvara (Adreno 725 och nyare): det kan hända att det inte fungerar</string> <string name="gpuinfo_unsupported">Stöds inte: DroidDeck behöver en Adreno-GPU (Snapdragon)</string> @@ -1918,10 +2190,10 @@ <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> + <string name="display_follow_screen_scaled">Skalad %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Visa enhetsinformation</string> <string name="device_info_hide">Dölj enhetsinformation</string> @@ -1936,7 +2208,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> @@ -1950,11 +2221,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> @@ -1972,9 +2241,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> @@ -1993,12 +2270,43 @@ <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> <string name="stores_sort">Sortera</string> + <string name="setup_rail_labels">Sidofältets etiketter</string> + <string name="setup_rail_labels_hint">Visa namn under ikonerna i sidofältet. Stäng av för ett smalare sidofält.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Större kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Visa titel</string> + <string name="library_display_size">Visa storlek</string> <string name="stores_sort_last_played">Senast spelade</string> <string name="stores_sort_recently_installed">Senast installerade</string> <string name="stores_sort_title_asc">Titel A–Ö</string> @@ -2125,6 +2433,9 @@ <string name="stores_download_manager">Nedladdningshanterare</string> <string name="stores_parallel">Samtidiga nedladdningar</string> <string name="stores_install_where">Installera till</string> + <string name="stores_install_language">Spelspråk</string> + <string name="stores_install_language_hint">GOG och Epic installerar det här språket. System följer appens språk.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installera %1$s:</string> <string name="stores_target_internal">Internminne</string> <string name="stores_target_free">%1$s ledigt</string> @@ -2147,6 +2458,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> @@ -2162,6 +2474,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Starta i</string> <string name="edit_launch_options">Startalternativ</string> + <string name="edit_launch_options_steam_hint">Delas med Egenskaper i Steam: en ändring på det ena stället syns på båda.</string> + <string name="edit_launch_options_not_saved">Det gick inte att spara startalternativen i Steam. Försök igen.</string> + <string name="edit_launch_options_desktop">Steam kan vara öppet i skrivbordssessionen. Ändra startalternativen under Egenskaper där, eller stäng sessionen först.</string> <string name="edit_artwork">Bildmaterial</string> <string name="edit_other_exe">Annan exe…</string> <string name="edit_remove">Ta bort</string> @@ -2289,6 +2604,7 @@ <string name="setup_download_source_custom">Eget prefix</string> <string name="setup_download_mirror">Webbplats</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPAR</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Skrivbordsappar för Linux-skrivbordet, öppnas från Skrivbordsläge.</string> @@ -2429,6 +2745,22 @@ <string name="glasses_tracking_flat_hint">Automatiskt håller det här 2D-spelet fast i synfältet. Välj Virtuell skärm under Skärm för att använda huvudspårning.</string> <string name="glasses_tracking_sbs_hint">Huvudspårning gäller en virtuell skärm eller ett SteamVR-spel som körs.</string> <string name="glasses_hardware">Enhet</string> + <string name="vr_controllers_tab">Handkontroller</string> + <string name="vr_controllers_group">SteamVR-handkontroller</string> + <string name="vr_controllers_emulate">Handkontroll i VR</string> + <string name="vr_controllers_emulate_hint">De två VR-händer som din handkontroll agerar som. Ändringar gäller direkt, även medan SteamVR körs. Joy-Cons och spårade händer tar fortfarande över sin sida.</string> + <string name="vr_controllers_off">Vanlig handkontroll</string> + <string name="vr_controllers_index">Valve Index-handkontroller</string> + <string name="vr_controllers_touch">Meta Quest 3-handkontroller</string> + <string name="vr_controllers_vive">HTC Vive-handkontroller</string> + <string name="vr_controllers_sticks">Spakarna börjar med att</string> + <string name="vr_controllers_sticks_hint">Tryck in båda spakarna samtidigt i VR för att växla.</string> + <string name="vr_controllers_sticks_game">Flytta dig i spelet</string> + <string name="vr_controllers_sticks_hands">Flytta händerna</string> + <string name="vr_controllers_buttons">Knappar</string> + <string name="vr_controllers_buttons_stick">Avtryckare är avtryckare, bumprar greppar, A/B och X/Y är varje hands frontknappar, spakklick klickar på tumspakarna, Guide öppnar SteamVR-menyn. Styrkorset upp och ned flyttar händerna närmare eller längre bort.</string> + <string name="vr_controllers_buttons_vive">Spakarna är styrplattor; A/X eller ett spakklick trycker på dem. Avtryckare är avtryckare, bumprar greppar, Start och Select är meny, Guide öppnar SteamVR-menyn.</string> + <string name="vr_controllers_buttons_off">Inga VR-händer. Spel som stöder handkontroll, och SteamVR-menyn, får din handkontroll som vanligt.</string> <string name="glasses_brightness">Ljusstyrka</string> <string name="glasses_volume">Volym</string> <string name="glasses_sunblock">Solskydd</string> @@ -2486,6 +2818,12 @@ <string name="hand_camera_placement">Kameraplacering</string> <string name="hand_camera_placement_hint">Kontrollera att kameran kan se dig innan du spelar.</string> <string name="hand_camera_check">Kontrollera</string> + <string name="tracking_pack_title">Nedladdning av handspårning</string> + <string name="tracking_pack_hint">Handspårning kräver en engångsnedladdning på %1$s.</string> + <string name="tracking_pack_download">Ladda ned</string> + <string name="tracking_pack_retry">Försök igen</string> + <string name="tracking_pack_downloading">Laddar ned handspårning… %1$d%%</string> + <string name="tracking_pack_failed">Det gick inte att ladda ned handspårning. Kontrollera anslutningen och försök igen.</string> <string name="hand_camera_check_title">Kameraplacering</string> <string name="hand_camera_how_rear">Ställ enheten upprätt 1,5 till 2 meter bort, på ungefär bröstnivå, med den bakre kameran vänd mot dig. Kliv sedan in i bild med händerna ute.</string> <string name="hand_camera_how_front">Ställ enheten upprätt 1,5 till 2 meter bort, på ungefär bröstnivå, med skärmen vänd mot dig. Kliv sedan in i bild med händerna ute.</string> @@ -2557,6 +2895,21 @@ <string name="storage_safe_hint">Oanvända körmiljöer, rester, gamla loggar</string> <string name="storage_clean_up">Rensar…</string> <string name="storage_session_running">Stoppa sessionen för att rensa eller ta bort något. Storlekarna syns fortfarande.</string> + <string name="storage_default_group">Installationsplats</string> + <string name="storage_default_title">Standardlagring</string> + <string name="storage_default_hint">Nya butiksinstallationer hamnar på den valda platsen. Befintliga spel stannar där de är. Steam-bibliotek har sin egen inställning.</string> + <string name="storage_default_ask">Fråga varje gång</string> + <string name="storage_default_ask_detail">Välj mål för varje installation</string> + <string name="storage_default_internal">Intern lagring</string> + <string name="storage_default_external">Extern lagring</string> + <string name="storage_default_external_detail">%1$s · %2$s ledigt</string> + <string name="storage_default_external_missing">Inte ansluten</string> + <string name="storage_default_folder">Mapp · %1$s</string> + <string name="storage_default_folder_free">%1$s ledigt</string> + <string name="storage_default_folder_missing">Inte ansluten</string> + <string name="storage_default_choose_folder">Välj mapp…</string> + <string name="storage_default_choose_folder_detail">Använd valfri mapp på ett SD-kort eller USB-minne</string> + <string name="storage_default_note">Spel hamnar i en Games-mapp på den valda platsen. Befintliga spel flyttas inte.</string> <string name="storage_where">Vart det tar vägen</string> <string name="storage_games">Steam-spel</string> <string name="storage_game_data">Speldata</string> @@ -2678,6 +3031,9 @@ <string name="storage_data_installed">Installerade spel</string> <string name="storage_data_parts">Prefix %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Rensa shaders</string> + <string name="storage_reset_prefix">Återställ prefix</string> + <string name="storage_reset_prefix_title">Återställa prefix för %1$s?</string> + <string name="storage_reset_prefix_confirm">Raderar dess Wine-prefix (%1$s) i %2$s och återskapar det vid nästa start. Sparningar, inställningar och installerade redistributables i det går förlorade; Steam Cloud-sparningar finns kvar på ditt konto.</string> <string name="storage_data_leftovers">Borttagna spel</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Prefixet innehåller fortfarande filer, kanske lokala sparfiler</string> @@ -2978,5 +3334,307 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkronisera med Syncthing</string> + <string name="sync_enable_hint">Det här är en Syncthing-implementering baserad på Syncthing-Fork som låter dig synkronisera filer i DroidDecks interna filsystem med andra Syncthing-instanser. Den gäller bara filer som du lagrar i DroidDecks interna filsystem.</string> + <string name="sync_missing">Den här versionen innehåller inte Syncthing.</string> + <string name="sync_starting">Startar Syncthing</string> + <string name="sync_status_starting">Startar</string> + <string name="sync_status_up_to_date">Aktuell</string> + <string name="sync_status_syncing">Synkroniserar</string> + <string name="sync_status_paused">Pausad</string> + <string name="sync_status_pausing">Pausar</string> + <string name="sync_status_resuming">Återupptar</string> + <string name="sync_status_attention">Behöver åtgärdas</string> + <string name="sync_status_failed">Syncthing har stoppats</string> + <string name="sync_failed_retry">Försök igen</string> + <string name="sync_paused_wifi">Pausad tills Wi-Fi finns</string> + <string name="sync_paused_game">Pausad under spelet</string> + <string name="sync_summary">%1$d mappar · %2$d av %3$d enheter anslutna</string> + <string name="sync_left">%1$s kvar</string> + <string name="sync_open_web_ui">Öppna webbgränssnittet</string> + <string name="sync_pause">Pausa</string> + <string name="sync_resume">Återuppta</string> + <string name="sync_running">Körs</string> + <string name="sync_running_hint">Stäng av för att stoppa Syncthing helt.</string> + <string name="sync_this_device">Den här enheten</string> + <string name="sync_device_id">Enhets-ID</string> + <string name="sync_show_qr">Visa QR-kod</string> + <string name="sync_advanced">Avancerat</string> + <string name="sync_advanced_hint">Portar, när den ska köras, återställning</string> + <string name="sync_open">Öppna</string> + <string name="sync_waiting">Väntar på dig</string> + <string name="sync_pending_device">%1$s vill ansluta</string> + <string name="sync_pending_folder">%1$s vill dela ”%2$s”</string> + <string name="sync_pending_folder_hint">Acceptera för att välja var den sparas i DroidDeck.</string> + <string name="sync_review">Granska i webbgränssnittet</string> + <string name="sync_folders">Mappar</string> + <string name="sync_no_folders">Inga mappar än.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuell</string> + <string name="sync_folder_syncing">Synkroniserar %1$d %%</string> + <string name="sync_folder_scanning">Skannar</string> + <string name="sync_folder_paused">Pausad</string> + <string name="sync_folder_out_of_sync">Inte synkroniserad</string> + <string name="sync_folder_errors">%1$d filer kunde inte synkroniseras</string> + <string name="sync_folder_blocked">Blockerad</string> + <string name="sync_folder_blocked_hint">Den här mappen ligger utanför DroidDecks lagring, så DroidDeck har pausat den. Använd appen Syncthing-Fork för att synkronisera mappar utanför DroidDeck.</string> + <string name="sync_remove_folder">Ta bort från Syncthing</string> + <string name="sync_remove_folder_hint">Inga filer raderas när den tas bort.</string> + <string name="sync_devices">Enheter</string> + <string name="sync_no_devices">Inga enheter än.</string> + <string name="sync_connected">Ansluten</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Senast sedd %1$s</string> + <string name="sync_device_id_title">Den här enhetens ID</string> + <string name="sync_device_id_hint">Lägg till en enhet i Syncthing på din andra enhet och skanna den här koden eller klistra in ID:t. Acceptera den sedan här i webbgränssnittet.</string> + <string name="sync_copy">Kopiera</string> + <string name="sync_share">Dela</string> + <string name="sync_done">Klar</string> + <string name="sync_off_title">Stänga av Syncthing?</string> + <string name="sync_off_body">Syncthing stoppas nu och förblir stoppat tills det slås på igen. Synkroniserade filer ligger kvar där de är.</string> + <string name="sync_off_forget">Radera även Syncthings konfiguration</string> + <string name="sync_off_forget_hint">Tar bort enhetens ID, mappar och enheter. När du slår på det igen börjar det från början.</string> + <string name="sync_turn_off">Stäng av</string> + <string name="sync_ports">Portar</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal identifiering</string> + <string name="sync_repick">Välj nya portar</string> + <string name="sync_repick_hint">Kontrolleras igen vid varje start.</string> + <string name="sync_repick_button">Välj om</string> + <string name="sync_reset_group">Återställ</string> + <string name="sync_api_key">API-nyckel</string> + <string name="sync_regenerate">Generera ny</string> + <string name="sync_reset">Återställ Syncthing</string> + <string name="sync_reset_hint">Nytt enhets-ID, mappar och enheter tas bort. Filer i DroidDecks lagring behålls.</string> + <string name="sync_reset_button">Återställ</string> + <string name="sync_reset_confirm_title">Återställa Syncthing?</string> + <string name="sync_running_group">Körning</string> + <string name="sync_run">Kör</string> + <string name="sync_run_open">Medan DroidDeck är öppet</string> + <string name="sync_run_background">I bakgrunden</string> + <string name="sync_wifi_only">Endast Wi-Fi</string> + <string name="sync_pause_games">Pausa under spel</string> + <string name="sync_logs">Loggar</string> + <string name="sync_logs_hint">Syncthing-utdata för den här sessionen</string> + <string name="sync_logs_share">Dela</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurera Linux-körmiljön först.</string> + <string name="sync_accept">Acceptera</string> + <string name="sync_accept_title">Spara ”%1$s” i</string> + <string name="sync_add_folder">Lägg till mapp</string> + <string name="sync_add_folder_hint">Synkronisera en mapp i DroidDecks lagring</string> + <string name="sync_choose">Välj</string> + <string name="sync_add">Lägg till</string> + <string name="sync_add_failed">Mappen kunde inte läggas till.</string> + <string name="sync_share_with">Dela med</string> + <string name="sync_share_none">Inga enheter än. Du kan dela den här mappen från webbgränssnittet senare.</string> + <string name="sync_use_folder">Använd den här mappen</string> + <string name="sync_new_folder">Ny mapp</string> + <string name="sync_location_home">Containerns hemmapp</string> + <string name="sync_location_sync">Sync-mappen</string> + <string name="sync_location_shared">DroidDecks delade lagring</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDecks appdata</string> + <string name="sync_web_path_locked">Nya mappar sparas i DroidDecks Sync-mapp. Använd Lägg till mapp på fliken Syncthing för att synkronisera en annan DroidDeck-mapp.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Läs in igen</string> + <string name="sync_not_running">Syncthing körs inte.</string> + <string name="session_end_steam_sigill">Steam stoppades av en otillåten instruktion (SIGILL). Det kan vara ett kompatibilitetsproblem med CPU-instruktioner eller en klientkrasch. Dela loggarna med uppgifter om din enhet.</string> + <string name="session_end_steam_try_x64">Du kan prova Steam-inställningar → Steam-klient → x86-64 (experimentellt). Det kräver en extra nedladdning och kan gå långsammare.</string> + <string name="session_end_vulkan_device">Linux-grafikdrivrutinen hittade ingen användbar Vulkan-enhet. Kontrollera att den valda Linux-GPU-drivrutinen stöder den här GPU:n.</string> + <string name="session_end_gpu_unsupported">Sessionen kan inte starta eftersom den här GPU:n saknar en kompatibel Linux Vulkan-drivrutin i den aktuella konfigurationen. Adreno Turnip-drivrutiner kan inte aktivera stöd för MediaTek/Mali-GPU:er.</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_resources_browser">Öppnas i webbläsaren</string> + <string name="game_resource_guides">Guider</string> + <string name="game_resource_protondb_detail">Kompatibilitetsrapporter för Linux/Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">För spel med sparningar på ditt Steam-konto</string> + <string name="game_resource_search">Webbsökning</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="library_filter">Filter</string> + <string name="library_filter_installed">Endast installerade</string> + <string name="library_filter_all_owned">Alla ägda spel</string> + <string name="library_no_installed_matches">Inga installerade spel matchar filtren.</string> + <string name="library_browse_owned">Bläddra bland ägda spel</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="stores_itch_updates_found">Uppdateringar tillgängliga: %1$d</string> + <string name="stores_itch_update_replaced">Utvecklaren har ersatt den här versionen med %1$s. Uppdatera till den?</string> + <string name="xbox_filter_cloud">Moln</string> + <string name="stores_xbox_cloud_settings">Molninställningar</string> + <string name="integration_title">Steam-integration</string> + <string name="integration_count">%1$d av %2$d på</string> + <string name="integration_set_up">Konfigurera</string> + <string name="integration_location">Plats</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-namn</string> + <string name="integration_brightness">Ljusstyrka</string> + <string name="integration_home">DroidDeck som startskärm</string> + <string name="integration_shortcuts">Genvägar för hemknappen</string> + <string name="integration_wifi_hint">Visa nätverk i Steam · kräver platsåtkomst, spåras aldrig</string> + <string name="integration_wifi_on">Nätverk visas i Steam</string> + <string name="integration_wifi_location_off">Plats är avstängd</string> + <string name="integration_wifi_denied">Plats nekad · tillåt den i Appinfo</string> + <string name="integration_brightness_hint">Steams reglage ställer in skärmens ljusstyrka</string> + <string name="integration_home_hint">Hem öppnar Steam-menyn i en session</string> + <string name="integration_shortcuts_hint">Håll Hem för Steam Guide-kombinationer</string> + <string name="integration_shortcuts_needs_home">Kräver DroidDeck som startskärm</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonat i Android? Appinfo → ⋮ → Tillåt begränsade inställningar</string> + <string name="integration_shortcuts_restricted">Blockerat av Android · Appinfo → ⋮ → Tillåt begränsade inställningar</string> + <string name="integration_shortcuts_service">DroidDeck hemknapp</string> + <string name="integration_shortcuts_service_description">Skickar tryck på hemknappen till Steam Guide medan en Steam-session är i fokus och DroidDeck är standardappen för startskärmen. Läser inte skärminnehåll.</string> + <string name="integration_brightness_needed">Slå på Ljusstyrka under Konfiguration → Steam-integration</string> + <string name="apps_search_hint">Sök appar</string> + <string name="apps_no_match">Inga appar matchar ”%1$s”.</string> + <string name="apps_add_widget">Lägg till widget</string> + <string name="apps_widgets_loading">Läser in widgetar…</string> + <string name="apps_widgets_none">Inga appar på enheten erbjuder widgetar.</string> + <string name="apps_widget_wider">Bredare</string> + <string name="apps_widget_narrower">Smalare</string> + <string name="apps_widget_taller">Högre</string> + <string name="apps_widget_shorter">Lägre</string> + <string name="apps_widget_move_earlier">Flytta tidigare</string> + <string name="apps_widget_move_later">Flytta senare</string> + <string name="apps_widget_configure">Widgetinställningar</string> + <string name="apps_widget_remove">Ta bort widget</string> + <string name="apps_add_to_folder">Lägg till i mapp</string> + <string name="apps_new_folder">Ny mapp</string> + <string name="apps_remove_from_folder">Ta bort från mapp</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Avinstallera</string> + <string name="apps_folder_rename">Byt namn</string> + <string name="apps_folder_ungroup">Dela upp</string> + <string name="apps_folder_default">Mapp</string> + <string name="apps_folder_name">Mappnamn</string> + <string name="apps_filter">Visa</string> + <string name="apps_filter_all">Alla appar</string> + <string name="apps_filter_games">Spel</string> + <string name="apps_filter_downloaded">Nedladdade</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Dolda</string> + <string name="apps_hide">Dölj</string> + <string name="apps_unhide">Visa i appar</string> + <string name="apps_shortcut_remove">Ta bort genväg</string> + <string name="apps_pin_title">Lägg till i Appar</string> + <string name="apps_pin_add">Lägg till</string> + <string name="apps_hidden_none">Inga dolda appar.</string> + <string name="apps_sort_name_asc">Namn A–Ö</string> + <string name="apps_sort_name_desc">Namn Ö–A</string> + <string name="apps_sort_installed">Senast installerade</string> + <string name="apps_sort_updated">Senast uppdaterade</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d appar</item> + </plurals> + <string name="desktop_restore_title">Återställer din programvara</string> + <string name="desktop_restore_body">Installerar om apparna du lade till efter en DroidDeck-uppdatering.</string> + <string name="desktop_restore_done_title">Programvaran återställd</string> + <string name="desktop_restore_done_body">Apparna du lade till är installerade igen.</string> + <string name="desktop_restore_failed_title">Viss programvara kunde inte återställas</string> + <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log och prova sedan sudo apt install i Konsole.</string> + <string name="gog_full_files">Inbyggda optimeringar är inte tillgängliga. Nedladdningen innehåller fullständiga ersättningsfiler.</string> + <string name="gog_recover">Verifiera patchresultatet</string> + <string name="slow_usb_title">Långsam USB-anslutning</string> + <string name="slow_usb_cable">%1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s), så spel på den läses in långsamt. Använd en USB 3-kabel för 5 Gbit/s eller mer, prova att vända USB-C-kontakten eller använd en snabbare enhet.</string> + <string name="slow_usb_port">%1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s). USB-porten på den här enheten kan inte gå snabbare, så spel läses in långsamt. Internt lagringsutrymme eller ett microSD-kort kan vara snabbare.</string> + <string name="slow_usb_never">Visa inte igen</string> + <string name="slow_usb_dismiss">Stäng</string> + <string name="steam_import_title">Starta om Steam för att lägga till dina spel?</string> + <string name="steam_import_body">Steam kan visa de här spelen du äger som installerade: %1$s. Steam måste startas om för att visa dem. Starta om nu, annars läggs de till nästa gång Steam startar.</string> + <string name="steam_import_names_more">%1$s och %2$d till</string> + <string name="steam_import_now">Starta om nu</string> + <string name="steam_import_later">Senare</string> + <string name="gog_maintenance">Hantera GOG-installation</string> + <string name="gog_check">Sök efter uppdateringar</string> + <string name="gog_repair">Verifiera/reparera</string> + <string name="gog_patches">Offlinepatchar</string> + <string name="gog_refresh">Ladda ned fullständigt offlineinstallationsprogram</string> + <string name="gog_update">Uppdatera till %1$s</string> + <string name="gog_resume">Återuppta GOG-underhåll</string> + <string name="gog_open_patch">Öppna patchinstallationsprogrammet</string> + <string name="gog_patch_in_session">Slutför eller avbryt patchinstallationsprogrammet i Linux-sessionen.</string> + <string name="gog_patch_requirements">Välj en patch för din installerade version och ditt språk. Källversioner som stöds kanske inte visas.</string> + <string name="gog_no_patches">GOG har inga fristående Windows-patchar för det här spelet.</string> + <string name="gog_managed_files">Ändrade spelfiler kan ersättas.</string> + <string name="gog_patch_installer_note">Installationsprogrammet öppnas i din Linux-session.</string> + <string name="gog_download_label">Nedladdning</string> + <string name="gog_space_label">Extra utrymme</string> + <string name="gog_space_estimate_label">Uppskattat utrymme</string> + <string name="gog_repair_action">Reparera filer</string> + <string name="gog_refresh_action">Uppdatera installationen</string> + <string name="gog_select_patch">Välj</string> + <string name="setup_all_files">Åtkomst till alla filer</string> + <string name="setup_local_network">Lokalt nätverk</string> + <string name="libraries_title">Fler Steam-bibliotek</string> + <string name="libraries_hint">Mappar där Steam kan installera och starta spel, var och en med eget namn. Borttagning behåller spelen på disken.</string> + <string name="libraries_add">Lägg till bibliotek</string> + <string name="libraries_rename_title">Biblioteksnamn</string> + <string name="libraries_pick">Välj en mapp för biblioteket</string> + <string name="libraries_full">Högst %1$d extra bibliotek</string> + <string name="libraries_overlap">Den här mappen är redan ett bibliotek eller ligger i ett</string> + <string name="libraries_missing">%1$s · inte tillgängligt</string> + <string name="libraries_applies_next">Gäller från nästa Steam-session</string> + <string name="bottom_desktop_start">Starta skrivbordet</string> + <string name="bottom_desktop_mode_touch">Direkt pekning</string> + <string name="bottom_desktop_trackpad">Styrplatta. Tryck för direkt pekning</string> + <string name="bottom_desktop_direct_touch">Direkt pekning. Tryck för styrplatta</string> + <string name="bottom_desktop_starting">Startar KDE-skrivbordet…</string> + <string name="bottom_desktop_ended">Skrivbordet stängdes.</string> + <string name="bottom_desktop_failed">Skrivbordet kunde inte starta. Loggarna finns i mappen bottom-desktop för den här sessionen.</string> + <string name="bottom_desktop_off">Skrivbordet är stängt.</string> + <string name="libraries_rename">Byt namn</string> + <string name="second_mode_desktop">Skrivbord</string> + <string name="bottom_desktop_mode_trackpad">Styrplatta</string> + <string name="bottom_desktop_title">Skrivbord · %1$s</string> </resources> diff --git a/app/src/main/res/values-th/gestures.xml b/app/src/main/res/values-th/gestures.xml index 0fedbbfa1..64ecde905 100644 --- a/app/src/main/res/values-th/gestures.xml +++ b/app/src/main/res/values-th/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">ท่าทาง</string> <string name="gesture_settings">การตั้งค่าท่าทางสัมผัส</string> - <string name="gesture_settings_hint">ปรับแต่งท่าทางเมาส์และแป้นพิมพ์ เลือกท่าทางเป็นโหมดสัมผัสเพื่อใช้งาน</string> <string name="gesture_tap">แตะ</string> <string name="gesture_drag">ลากด้วยหนึ่งนิ้ว</string> <string name="gesture_long_press">กดค้าง</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">กดค้างด้วยสามนิ้ว</string> <string name="gesture_pinch">จีบนิ้วเพื่อซูม</string> <string name="gesture_hold_button">กดปุ่มค้างไว้</string> + <string name="gesture_hold_left">กดปุ่มซ้ายค้างไว้</string> + <string name="gesture_hold_right">กดปุ่มขวาค้างไว้</string> <string name="gesture_click_once">คลิกหนึ่งครั้ง</string> <string name="gesture_hold_delay">ระยะเวลาก่อนกดค้าง</string> <string name="gesture_double_delay">ช่วงเวลาแตะสองครั้ง</string> diff --git a/app/src/main/res/values-th/shortcuts.xml b/app/src/main/res/values-th/shortcuts.xml new file mode 100644 index 000000000..c9c7a1077 --- /dev/null +++ b/app/src/main/res/values-th/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">ทางลัดปุ่มจริง</string> + <string name="shortcuts_dd_menu">เมนู DroidDeck</string> + <string name="shortcuts_capture">กำหนด: %1$s</string> + <string name="shortcuts_press">กดปุ่มแล้วปล่อย การกำหนดปุ่มจะบันทึกโดยอัตโนมัติ</string> + <string name="shortcuts_release">ปล่อยปุ่มเพื่อดำเนินการต่อ</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">ปุ่มนี้ถูกกำหนดไว้แล้วสำหรับ: %1$s</string> + <string name="shortcuts_save">กำหนดใหม่</string> + <string name="shortcuts_retry">ลองปุ่มอื่น</string> + <string name="shortcuts_limitations">ปุ่มโฮมและปุ่มพิเศษบางปุ่มอาจไม่พร้อมใช้งาน</string> +</resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d2c04317c..accc47b2a 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">ตัวเลือก VKD3D สำหรับ D3D12 nodxr ปิดการเรย์เทรซิง ใช้เฉพาะกับเกมที่จำเป็นต้องปิด</string> <string name="game_env_proton_log">ตั้งเป็น 1 เพื่อบันทึกล็อกวินิจฉัยของ Proton การบันทึกล็อกอาจลดประสิทธิภาพและใช้พื้นที่จัดเก็บ</string> <string name="game_env_wined3d">ตั้งเป็น 1 เพื่อใช้ WineD3D แบบ OpenGL แทน DXVK สำหรับทดสอบความเข้ากันได้ของ D3D9–11</string> + <string name="game_env_wined3d_renderer">ตัวเรนเดอร์สำหรับ DirectDraw, Direct3D 1-7 และเกมที่รันด้วย WineD3D โดย Vulkan จะข้ามเส้นทาง OpenGL-on-Zink และเร็วกว่ามากสำหรับเกม DirectDraw และ Direct3D 7 รุ่นเก่าบน Adreno</string> + <string name="game_env_dxvk_d3d8">ตั้งเป็น 1 เพื่อรัน Direct3D 8 ผ่าน DXVK แทน WineD3D เร็วกว่าในการทดสอบ Direct3D 8 ของ AIO Graphics Test บน Adreno</string> <string name="game_env_no_ntsync">ตั้งเป็น 1 เพื่อให้เกมนี้ไม่ใช้ ntsync (droiddeck-ntsync หรือไดรเวอร์เคอร์เนล) โดยจะใช้ droiddeck-esync เมื่อมีแพ็กที่เหมาะสม มิฉะนั้นใช้ droiddeck-fsync</string> <string name="game_env_no_esync">ตั้งเป็น 1 เพื่อปิด droiddeck-esync สำหรับเกมนี้ โดยจะใช้ droiddeck-fsync แทน หรือ droiddeck-ntsync เมื่อ fsync ปิดอยู่ด้วย</string> <string name="game_env_no_fsync">ตั้งเป็น 1 เพื่อให้เกมนี้ไม่ใช้ droiddeck-fsync โดยจะใช้ droiddeck-esync เมื่อมีแพ็กที่เหมาะสม มิฉะนั้นใช้ droiddeck-ntsync</string> <string name="game_env_fsync_first">ตั้งเป็น 1 เพื่อให้เกมนี้ทำงานบน droiddeck-fsync หรือ 0 เพื่อให้ droiddeck-esync มาก่อนเมื่อมีแพ็กที่เข้ากับ Proton นี้</string> <string name="game_env_xalia">ตั้งเป็น 0 เพื่อปิดตัวช่วยควบคุมด้วยคอนโทรลเลอร์ของ Proton สำหรับเกมนี้</string> + <string name="game_env_anticheat_offline">เปิดเป็นค่าเริ่มต้น เริ่มเกม Easy Anti-Cheat โดยไม่มีระบบป้องกันการโกงเมื่อเกมรองรับการเล่นออฟไลน์ ปิดเพื่อเปิดผ่าน Easy Anti-Cheat ตามปกติ โหมดออนไลน์ที่ต้องใช้ Easy Anti-Cheat จะยังใช้งานไม่ได้</string> <string name="game_env_hud">โอเวอร์เลย์ DXVK สำหรับ D3D9–11 fps จะแสดงอัตราเฟรม หากไม่ตั้งค่าจะซ่อนไว้</string> <string name="game_env_dxvk_config">ตั้งค่า DXVK คั่นด้วยเซมิโคลอน รุ่นใหม่ใช้ dxvk.maxFrameRate สำหรับจำกัดเฟรมเรต ควรใช้ตัวจำกัดเฟรมของเซสชันสำหรับการเล่นทั่วไป</string> + <string name="game_env_cores">คอร์ CPU สำหรับเกมนี้ เช่น 0-4 หรือ 0,2,4 แทนคอร์เกมของเซสชัน ใช้คอร์น้อยลงจะร้อนน้อยลง</string> <string name="game_env_vkd3d_limit">ขีดจำกัดอัตราเฟรม D3D12 0 คือไม่จำกัด</string> <string name="game_env_glthread">การทำเธรด OpenGL ของ Mesa true อาจช่วยเกม OpenGL ที่ติดขัดจาก CPU ทดสอบดูตามแต่ละเกม</string> <string name="sync_backend_title">การซิงค์ของ Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX รันโปรแกรม Linux x86 บนอุปกรณ์ ARM64 นี้ อัตโนมัติจะใช้งานเมื่อโปรแกรมถูกสร้างมาสำหรับ x86</string> <string name="app_fex_x86">%1$s ผ่าน FEX</string> <string name="app_fex_not_ready">โปรแกรมนี้สร้างมาสำหรับพีซี %1$s และรันผ่าน FEX ซึ่งยังไม่ได้ตั้งค่า เปิด Steam สักครั้งขณะลงชื่อเข้าใช้: DroidDeck จะดาวน์โหลด FEX และ Steam Linux Runtime ที่จำเป็น จากนั้นโปรแกรมนี้จะเปิดขึ้น</string> + <string name="session_proot_missing">ดาวน์โหลด proot ของ DroidDeck ไม่ได้ ตรวจสอบการเชื่อมต่อแล้วลองใหม่ เซสชันไม่ได้เริ่มเพราะ proot สำรองช้าเกินกว่าจะเล่นได้</string> + <string name="session_directaudio_missing">ดาวน์โหลด DirectAudio ไม่ได้ เสียงเกมในเซสชันนี้จึงใช้เส้นทางที่ช้ากว่า</string> <string name="session_end_program">โปรแกรมนี้</string> <string name="session_end_steam_download">ดาวน์โหลดไคลเอนต์ Steam ไม่ได้ เครือข่ายหรือ VPN ของคุณอาจบล็อกเซิร์ฟเวอร์ของ Steam ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง</string> <string name="session_end_steam_setup">ตั้งค่าไคลเอนต์ Steam ไม่ได้ ตรวจสอบการเชื่อมต่อและพื้นที่ว่าง แล้วลองอีกครั้ง</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">คอนโทรลเลอร์ Xbox 360</string> <string name="mode_controller_note">Deck: ปุ่ม Quick Access และไจโร Steam Controller: เหมือนกัน พร้อมเซนเซอร์แรงจับที่ปุ่มด้านหลัง DualShock 4 และ DualSense: ไจโร และแทร็กแพดทำหน้าที่เป็นทัชแพด Xbox 360: เปิด Quick Access ด้วย Guide+A</string> <string name="mode_back">กลับ</string> + <string name="back_hold">กดค้างย้อนกลับสำหรับทางลัด Steam</string> + <string name="back_hold_hint">กดค้างย้อนกลับเพื่อเปิดการเข้าถึงด่วนหรือใช้คอมโบ Steam กับปุ่มอื่น ปิดเพื่อไม่สนใจการกดค้าง การแตะและแตะสองครั้งยังใช้ได้</string> + <string name="back_native_qam_hint">กดปุ่ม Back ค้างไว้ 700 ms หรือกด Back ค้างแล้วกดปุ่มอื่นเพื่อใช้ทางลัดของ Steam</string> + <string name="back_double_tap_window">ช่วงเวลาแตะสองครั้ง</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">อนุญาตการควบคุมความสว่าง</string> + <string name="brightness_permission_text">ตั้งค่าการควบคุมความสว่างใน DroidDeck</string> <string name="back_menu_then_qam">เมนู → QAM</string> <string name="back_qam_then_menu">QAM → เมนู</string> <string name="mode_session">เซสชัน</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">เป็นรุ่นล่าสุดแล้ว · %1$s</string> <string name="mode_decky_loader">ตัวโหลด</string> <string name="mode_decky_install_latest">ติดตั้งรุ่นล่าสุด</string> + <string name="decky_channel">ช่องทางอัปเดต</string> + <string name="decky_channel_hint">รุ่นของ Decky Loader ที่จะติดตั้ง ตัวอัปเดตของ Decky เองก็ใช้ช่องทางเดียวกัน</string> + <string name="decky_channel_stable">เสถียร</string> + <string name="decky_channel_prerelease">ก่อนเปิดตัว</string> + <string name="decky_channel_testing">ทดสอบ</string> + <string name="decky_channel_failed">บันทึกช่องทางอัปเดตของ Decky ไม่ได้</string> <string name="mode_decky_on">เริ่มพร้อมกับ Steam เมื่อเปิดใช้งาน แอปอื่นบนอุปกรณ์นี้อาจสามารถควบคุม Steam ได้</string> <string name="mode_decky_off">ปิดอยู่ พอร์ตดีบักระยะไกลของ Steam ยังคงปิดอยู่</string> <string name="mode_decky_remove_title">ถอนการติดตั้ง Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">ไคลเอนต์</string> <string name="mode_mangoapp">โอเวอร์เลย์แสดงประสิทธิภาพ</string> <string name="mode_mangoapp_hint">ปิดหากเกมขัดข้องหรือจอดำในโหมด Deck จะมีผลในเซสชันถัดไป</string> + <string name="mode_return_after_game">กลับไปที่ DroidDeck หลังเล่นเกม</string> + <string name="mode_return_after_game_hint">เมื่อเกมที่คุณเริ่มจาก DroidDeck หรือตัวเปิดเกมอื่นปิดลง Steam จะออกอย่างเรียบร้อย (บันทึกบนคลาวด์เสร็จก่อน) แล้วคุณจะกลับไปที่นั่น ปิด: อยู่ใน Steam ต่อ</string> + <string name="mode_shader_precache">แคชเชเดอร์ล่วงหน้า</string> + <string name="mode_shader_precache_hint">Steam จะดาวน์โหลดเชเดอร์ที่สร้างไว้แล้วสำหรับเกมของคุณและประมวลผลในเบื้องหลัง เกมจึงกระตุกน้อยลง การปิดช่วยประหยัดข้อมูล พื้นที่จัดเก็บ และแบตเตอรี่ โดยเกมจะสร้างเชเดอร์ระหว่างเล่นแทน เป็นการตั้งค่าเดียวกับ Downloads > Shader Pre-Caching ของ Steam มีผลในเซสชันถัดไป</string> <string name="mode_steam_repair">ซ่อมแซมไคลเอนต์ Steam</string> <string name="mode_steam_repair_hint">ดาวน์โหลดไคลเอนต์ Steam ใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน ใช้เมื่อ Steam ค้างอยู่ที่หน้าจอโหลด เกม การลงชื่อเข้าใช้ และการตั้งค่ายังคงอยู่</string> <string name="mode_steam_repair_queued">ไคลเอนต์ Steam จะถูกดาวน์โหลดใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน</string> @@ -373,6 +412,8 @@ <string name="mode_directaudio_hint">ข้าม PulseAudio เพื่อลดความหน่วง</string> <string name="mode_mic">ไมโครโฟน</string> <string name="mode_mic_hint">สำหรับการแชทด้วยเสียง</string> + <string name="drawer_mic_hint">เปิดหรือปิดการรับเสียงจากไมโครโฟนสำหรับเซสชันนี้</string> + <string name="drawer_mic_failed">เปลี่ยนไมโครโฟนไม่ได้ โปรดลองอีกครั้ง</string> <string name="mode_network">เครือข่าย</string> <string name="mode_wifi_discovery">การค้นหา Wi-Fi</string> <string name="mode_wifi_discovery_hint">แสดงชื่อ Wi-Fi และเครือข่ายใกล้เคียงใน Steam</string> @@ -414,7 +455,7 @@ <string name="comp_import_adrenotools">นำเข้า AdrenoTools zip…</string> <string name="comp_never">ไม่เคย</string> <string name="comp_nightlies_checked">ตรวจสอบ Nightlies ครั้งล่าสุด %1$s</string> - <string name="comp_title">Components</string> + <string name="comp_title">คอมโพเนนต์</string> <string name="comp_about">เกี่ยวกับ Components</string> <string name="comp_check_drivers">ตรวจสอบไดรเวอร์ใหม่</string> <string name="comp_check_nightlies">ตรวจสอบแพ็กเกจใหม่ใน Nightlies</string> @@ -533,14 +574,24 @@ <string name="perf_gsrealtime">gamescope: คิว GPU แบบเรียลไทม์</string> <string name="perf_gsrealtime_hint">ให้ความสำคัญกับงาน GPU ของตัวประกอบภาพก่อน อาจทำให้การเรียงเฟรมราบรื่นขึ้นโดยแลกกับประสิทธิภาพของเกมบางส่วน</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">หน่วยความจำ</string> + <string name="perf_cap_off">ปิด</string> + <string name="perf_cap_auto">ค่าเริ่มต้นของไดรเวอร์</string> + <string name="perf_zram_client">บีบอัด Steam ขณะเล่นเกม</string> + <string name="perf_zram_client_hint">20 วินาทีหลังเกมเริ่ม ไคลเอนต์ Steam จะถูกบีบอัดลงใน zRAM เพื่อเหลือหน่วยความจำให้เกมมากขึ้น และอ่านกลับเมื่อปิดเกม ปิดตัวเลือกนี้หากเซสชันปิดไปไม่นานหลังเริ่มเกม ขีดจำกัด RAM ด้านบนยังคงบีบอัด Steam เมื่อเซสชันใช้เกินขีดจำกัด</string> + <string name="perf_ram_cap">ขีดจำกัด RAM</string> + <string name="perf_ram_cap_hint">มีผลขณะไคลเอนต์ Steam ทำงาน ทั้งในโหมด Steam หรือจากเดสก์ท็อป เมื่อเซสชันใช้เกินค่านี้ Steam และโปรเซสอื่นที่รองรับของเซสชันจะถูกบีบอัดลงใน zRAM ตามลำดับ เป็นขีดจำกัดแบบอ่อน: ไม่มีอะไรถูกปิด แต่เกมอาจกระตุกขณะดึงหน้าหน่วยความจำกลับมา</string> + <string name="perf_ram_cap_unavailable">ต้องใช้ zRAM swap ซึ่งอุปกรณ์นี้ไม่มี</string> + <string name="perf_vram_cap">ขีดจำกัด VRAM</string> + <string name="perf_vram_cap_hint">หน่วยความจำวิดีโอที่ DXVK รายงานต่อเกม Direct3D เพื่อให้เกมจัดสรรเท็กซ์เจอร์น้อยลง การตั้งค่า DXVK ของเกมเองยังมีผลเหนือกว่า มีผลในเซสชันถัดไป</string> <string name="perf_gpuclock">ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด</string> <string name="perf_gpuclock_hint">สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น</string> <string name="perf_fixes">การแก้ไขเซสชัน</string> <string name="perf_sysmem">Turnip: การเรนเดอร์ sysmem</string> <string name="perf_sysmem_hint">เร็วขึ้นสำหรับไคลเอนต์ Steam ในเกมไดรเวอร์จะเลือกการเรนเดอร์แบบไทล์หรือในหน่วยความจำระบบในแต่ละพาส จำเป็นสำหรับ Adreno 710/720/722</string> <string name="perf_xalia">ข้ามตัวช่วย xalia ของ Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (ทดลอง)</string> - <string name="perf_fastsync_hint">ตัวแทนในระดับยูสเซอร์สเปซของไดรเวอร์ ntsync ของ Linux สำหรับการทดสอบ เมื่อเปิดใช้ Proton จะใช้สิ่งนี้แทน droiddeck-esync และ droiddeck-fsync ใช้ได้กับ Proton Experimental ARM64, GE-Proton และ proton-cachyos จะมีผลในเซสชันถัดไป</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">ตัวแทนในระดับยูสเซอร์สเปซของไดรเวอร์ ntsync ของ Linux เมื่อเปิดใช้ Proton จะใช้สิ่งนี้แทน droiddeck-esync และ droiddeck-fsync ใช้ได้กับ Proton Experimental ARM64, GE-Proton และ proton-cachyos จะมีผลในเซสชันถัดไป</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync ก่อน</string> <string name="perf_fsync_hint">รัน fsync ของ Proton เองบนไฟล์ Proton มาตรฐาน โดยมี futex_waitv ที่จัดเตรียมในระดับยูสเซอร์สเปซ จึงไม่ต้องใช้แพ็กและยังคงทำงานได้ทันทีที่ Steam อัปเดต Proton เมื่อเปิดใช้ เกมจะใช้สิ่งนี้ก่อน droiddeck-esync ยกเว้นบางส่วนที่ Proton ปิด fsync ไว้ จะมีผลในเซสชันถัดไป</string> @@ -551,6 +602,8 @@ <string name="perf_fastpath">เส้นทางลัดของ proot</string> <string name="perf_fastpath_needs_seccomp">ต้องใช้ตัวกรอง seccomp ของ proot</string> <string name="perf_fastpath_hint">ค้นหาไฟล์เร็วขึ้นและสะดุดน้อยลง ปิดหากโปรแกรมหาไฟล์ของตัวเองไม่พบ</string> + <string name="perf_cursor_composite">วาดเคอร์เซอร์ภายใน gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope จะวาดตัวชี้เองแทนการส่งให้ Android เปิดเพื่อใช้เคอร์เซอร์ที่ควบคุมด้วยคอนโทรลเลอร์ ปิดไว้จะเร็วกว่าบนโทรศัพท์ มีผลในเซสชันถัดไป</string> <string name="perf_identity">ข้อมูลประจำตัวของเซสชัน</string> <string name="perf_hostname">ชื่อโฮสต์</string> <string name="perf_hostname_hint">ชื่อที่ Steam มองเห็นสำหรับอุปกรณ์นี้ เว้นว่างไว้เพื่อคืนค่าเป็น %1$s</string> @@ -565,9 +618,11 @@ <string name="driver_delete_plain">ไฟล์ของมันจะถูกลบออกจากแอป</string> <string name="driver_delete_in_use">ไฟล์ของมันถูกลบออก เนื่องจากกำลังใช้งานอยู่ ค่าเริ่มต้นจะเข้ามาแทนที่</string> <string name="drawer_page_display">หน้าจอ</string> + <string name="drawer_frame_limit">จำกัดเฟรม</string> + <string name="drawer_frame_limit_note">จำกัดเฟรมเรตของเกมนี้ หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารด้วยค่าที่จำกัดได้ลงตัวหากมี ค่าอื่นอาจดูไม่สม่ำเสมอ เกม Steam ใช้ Frame Limit ของ Steam ในเมนู Quick Access</string> <string name="drawer_page_effects">เอฟเฟกต์</string> <string name="drawer_page_controls">การควบคุม</string> - <string name="drawer_page_components">Components</string> + <string name="drawer_page_components">คอมโพเนนต์</string> <string name="drawer_page_controller">คอนโทรลเลอร์</string> <string name="drawer_page_settings">การตั้งค่า</string> <string name="drawer_page_desc">หน้า %1$s</string> @@ -589,6 +644,66 @@ <string name="drawer_hud_color_amber">อำพัน</string> <string name="drawer_hud_color_violet">ม่วง</string> <string name="drawer_hud_opacity">ความโปร่งใส</string> + <string name="hud_size">ขนาด</string> + <string name="hud_size_hint">การแตะ HUD จะเปลี่ยนขนาดด้วย</string> + <string name="hud_size_full">เต็ม</string> + <string name="hud_size_tiles">ไทล์</string> + <string name="hud_size_pill">แคปซูล</string> + <string name="hud_size_minimal">มินิมอล</string> + <string name="hud_size_mega">เมกะ</string> + <string name="hud_size_strip">แถบ</string> + <string name="hud_locked">ล็อกตำแหน่ง</string> + <string name="hud_locked_hint">ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้</string> + <string name="hud_snap">ยึดติดด้านข้าง</string> + <string name="hud_snap_hint">ปล่อย HUD แล้วจะย้ายไปด้านที่ใกล้กว่าของหน้าจอ ปัดเร็วๆ เพื่อเหวี่ยงไปทางนั้น</string> + <string name="hud_group_look">รูปลักษณ์</string> + <string name="hud_scale">ขนาดบนหน้าจอ</string> + <string name="hud_color_soft">อ่อน</string> + <string name="hud_color_mid">ปานกลาง</string> + <string name="hud_color_vivid">สด</string> + <string name="hud_outline">เส้นขอบ</string> + <string name="hud_outline_color">สีเส้นขอบ</string> + <string name="hud_outline_gray">เทา</string> + <string name="hud_outline_theme">สีธีม</string> + <string name="hud_group_metrics">ค่าที่แสดง</string> + <string name="hud_metric_graph">กราฟเวลาเฟรม</string> + <string name="hud_metric_decimal">อัตราเฟรมแบบทศนิยม</string> + <string name="hud_metric_low001" formatted="false">0.01% ต่ำสุด</string> + <string name="hud_metric_engine">เอนจินกราฟิก</string> + <string name="hud_metric_gpu_model">ชื่อ GPU</string> + <string name="hud_metric_gpu">โหลด GPU</string> + <string name="hud_metric_gpu_temp">อุณหภูมิ GPU</string> + <string name="hud_metric_cpu">โหลด CPU</string> + <string name="hud_metric_per_core">CPU รายคอร์</string> + <string name="hud_metric_temp">อุณหภูมิ</string> + <string name="hud_metric_ram">หน่วยความจำ</string> + <string name="hud_metric_vram">หน่วยความจำกราฟิก</string> + <string name="hud_metric_swap">พื้นที่สว็อป</string> + <string name="hud_metric_battery">ระดับแบตเตอรี่</string> + <string name="hud_metric_power">การใช้พลังงาน</string> + <string name="hud_metric_network">เครือข่าย</string> + <string name="hud_metric_resolution">ความละเอียด</string> + <string name="hud_metric_proton">เวอร์ชัน Proton</string> + <string name="hud_metric_session">เวลาเซสชัน</string> + <string name="hud_metric_clock">นาฬิกา</string> + <string name="hud_group_temps">อุณหภูมิ</string> + <string name="hud_temp_unit">หน่วย</string> + <string name="hud_temp_bands">สีเตือน</string> + <string name="hud_temp_bands_hint">อุณหภูมิจะเปลี่ยนเป็นสีอำพันแล้วเป็นสีแดงเมื่อใกล้ถึงขีดจำกัด</string> + <string name="hud_temp_bands_off">ปิด</string> + <string name="hud_temp_bands_auto">อัตโนมัติ</string> + <string name="hud_temp_bands_manual">กำหนดเอง</string> + <string name="hud_temp_red_cpu">CPU แดงที่</string> + <string name="hud_temp_red_gpu">GPU แดงที่</string> + <string name="hud_temp_red_battery">แบตเตอรี่แดงที่</string> + <string name="hud_group_more">เพิ่มเติม</string> + <string name="hud_export">การวินิจฉัย HUD</string> + <string name="hud_export_hint">บันทึกรายงานของเซนเซอร์ทุกตัวที่ HUD อ่านไปที่ Downloads/DroidDeck</string> + <string name="hud_export_button">บันทึก</string> + <string name="hud_export_done">บันทึกไปที่ %1$s แล้ว</string> + <string name="hud_export_failed">บันทึกรายงาน HUD ไม่ได้</string> + <string name="hud_reset">รีเซ็ตการตั้งค่า HUD</string> + <string name="hud_reset_button">รีเซ็ต</string> <string name="drawer_scaling">โหมดการปรับขนาด</string> <string name="drawer_scaling_sharpness">ความคมชัดของการปรับขนาด</string> <string name="drawer_effects">เอฟเฟกต์หน้าจอ</string> @@ -623,10 +738,14 @@ <string name="drawer_touch_auto">อัตโนมัติ (%1$s)</string> <string name="drawer_keyboard">แป้นพิมพ์</string> <string name="drawer_latency">ความหน่วง</string> + <string name="drawer_low_latency">โหมดหน่วงเวลาต่ำ</string> + <string name="drawer_low_latency_hint">ใช้ CPU และแบตเตอรี่มากขึ้น</string> <string name="drawer_low_latency_controller">คอนโทรลเลอร์ความหน่วงต่ำ</string> <string name="drawer_low_latency_controller_hint">คอนโทรลเลอร์รายงานที่ 1000 Hz แทน 250 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย</string> <string name="drawer_low_latency_touch">การสัมผัสความหน่วงต่ำ</string> <string name="drawer_low_latency_touch_hint">การสัมผัสข้ามการรวมเฟรม ทำให้ระบบสัมผัสของ Steam ทำงานที่ 1000 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย</string> + <string name="drawer_evdev_mouse">ช่องเมาส์ดิบ</string> + <string name="drawer_direct_cursor">เคอร์เซอร์</string> <string name="drawer_pc_keyboard">แป้นพิมพ์พีซี</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">หน้าจอที่สอง</string> @@ -712,6 +831,10 @@ <string name="setup_session">เซสชัน</string> <string name="setup_logs">ล็อกเซสชัน</string> <string name="setup_logs_hint">บันทึกไว้หลังจบแต่ละเซสชัน</string> + <string name="setup_game_debug_logs">บันทึกดีบักของเกม</string> + <string name="setup_game_debug_logs_hint">รวมข้อมูลวินิจฉัยของ Proton, Wine และกราฟิกในการเปิดเกมครั้งถัดไป อาจลดประสิทธิภาพและใช้พื้นที่จัดเก็บมากขึ้น</string> + <string name="setup_game_debug_logs_restart">รีสตาร์ทเซสชันนี้เพื่อบันทึกบันทึกดีบักของเกม</string> + <string name="setup_logging_update_failed">อัปเดตการบันทึกไม่ได้ ตรวจสอบสวิตช์แล้วลองใหม่</string> <string name="setup_agent_commands">เครื่องมือดีบัก</string> <string name="setup_latest_logs">ล็อกเซสชันล่าสุด</string> <string name="setup_saved_logs">ล็อกเซสชันที่บันทึกไว้</string> @@ -744,12 +867,28 @@ <string name="setup_home_on">DroidDeck สามารถเป็นแอปหน้าจอหลักได้</string> <string name="setup_home_off">DroidDeck จะไม่ถูกเสนอให้เป็นแอปหน้าจอหลัก</string> <string name="setup_orientation">การวางแนว</string> + <string name="setup_launcher_orientation">การวางแนวของตัวเปิดใช้</string> + <string name="setup_launcher_orientation_auto">หมุนตามอุปกรณ์</string> + <string name="setup_orientation_portrait">แนวตั้ง</string> + <string name="setup_session_orientation">การวางแนวของเซสชัน</string> + <string name="setup_session_orientation_hint">มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน ส่วนความกว้างและความสูงที่กำหนดเองจะคงตามที่ป้อนไว้</string> <string name="setup_orientation_auto">แนวนอนอัตโนมัติ</string> <string name="setup_orientation_landscape">แนวนอน</string> <string name="setup_orientation_reverse">แนวนอนกลับด้าน</string> <string name="setup_fullscreen">เต็มจอ</string> <string name="setup_fullscreen_on">ซ่อนแถบสถานะและแถบนำทางของ Android</string> <string name="setup_fullscreen_off">แสดงแถบสถานะและแถบนำทางของ Android</string> + <string name="setup_dual_screen">หน้าจอคู่</string> + <string name="setup_dual_screen_hint">อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว</string> + <string name="setup_dual_screen_auto">อัตโนมัติ</string> + <string name="setup_dual_screen_on">เปิด</string> + <string name="setup_dual_screen_off">ปิด</string> + <string name="setup_dual_screen_menu">เมนูหน้าจอล่าง</string> + <string name="setup_dual_screen_menu_hint">ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน</string> + <string name="setup_dual_screen_controls">ปุ่มควบคุมหน้าจอล่างในเกม</string> + <string name="setup_dual_screen_controls_hint">เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน</string> + <string name="dual_typing_title">กำลังพิมพ์ให้หน้าจอบน</string> + <string name="dual_typing_done">เสร็จสิ้น</string> <string name="setup_default_home">แอปหน้าจอหลักเริ่มต้น</string> <string name="setup_choose_home">เลือกแอปหน้าจอหลัก</string> <string name="setup_choose">เลือก</string> @@ -762,7 +901,7 @@ <string name="setup_tool_performance_hint">การกำหนดคอร์ CPU</string> <string name="setup_tool_roms">โฟลเดอร์ ROM</string> <string name="setup_tool_roms_hint">ตำแหน่งที่เก็บเกมของโปรแกรมจำลอง</string> - <string name="setup_card_components">Components</string> + <string name="setup_card_components">คอมโพเนนต์</string> <string name="setup_card_components_hint">FEX, DXVK, VKD3D</string> <string name="setup_card_controls">การควบคุม</string> <string name="setup_card_controls_hint">การกำหนดปุ่ม</string> @@ -894,6 +1033,14 @@ <string name="gate_step1">เปิดการตั้งค่า → ตัวเลือกสำหรับนักพัฒนา → Wireless debugging แล้วเปิดใช้งาน</string> <string name="gate_step2">แตะ “Pair device with pairing code”</string> <string name="gate_step3">พิมพ์รหัสลงในการแจ้งเตือนของ DroidDeck</string> + <string name="pairguide_build_number">ในเกี่ยวกับโทรศัพท์ แตะหมายเลขบิลด์ 7 ครั้ง</string> + <string name="pairguide_wireless">เปิดการแก้ไขข้อบกพร่องผ่าน Wi-Fi</string> + <string name="pairguide_pair">เปิดการแก้ไขข้อบกพร่องผ่าน Wi-Fi แล้วแตะ “จับคู่อุปกรณ์ด้วยรหัสการจับคู่”</string> + <string name="pairguide_child_process">เปิด “ปิดการจำกัดการประมวลผลข้อมูลย่อย”</string> + <string name="pairguide_row_child_process">ปิดการจำกัดการประมวลผลข้อมูลย่อย</string> + <string name="pairguide_row_build_number">หมายเลขบิลด์</string> + <string name="pairguide_row_wireless">การแก้ไขข้อบกพร่องผ่าน Wi-Fi</string> + <string name="pairguide_row_pair">จับคู่อุปกรณ์ด้วยรหัสการจับคู่</string> <string name="gate_waiting">กำลังรอป๊อปอัปการจับคู่…</string> <string name="gate_code_needed">พบป๊อปอัปแล้ว กรอกรหัสในการแจ้งเตือน</string> <string name="gate_status">สถานะ</string> @@ -913,7 +1060,7 @@ <string name="wadb_enter_port">จับคู่แล้ว กรอกพอร์ตจากการตั้งค่า</string> <string name="wadb_applying">พบอุปกรณ์แล้ว กำลังปรับใช้การตั้งค่า…</string> <string name="wadb_apply_failed">ไม่สามารถปรับใช้โดยอัตโนมัติได้ ตรวจสอบที่อยู่ด้านล่างแล้วลองใหม่ %1$s</string> - <string name="wadb_title_wireless">Wireless debugging</string> + <string name="wadb_title_wireless">การแก้ไขข้อบกพร่องแบบไร้สาย</string> <string name="wadb_title_done">อัปเดตขีดจำกัดโพรเซสลูกแล้ว</string> <string name="wadb_title">เปลี่ยนขีดจำกัดโพรเซสลูก</string> <string name="wadb_lede_compact0">หากไม่พบตัวเลือกนี้ ให้จับคู่ผ่าน Wireless debugging</string> @@ -1017,8 +1164,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 +1171,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> @@ -1035,10 +1179,8 @@ <string name="games_never_played">ยังไม่เคยเล่น</string> <string name="games_runtime_busy_percent">รันไทม์กำลังทำงาน · %1$d%%</string> <string name="games_runtime_busy">รันไทม์กำลังทำงาน</string> - <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> @@ -1053,6 +1195,9 @@ <string name="gpu_hide_other">ซ่อนไดรเวอร์สำหรับ GPU อื่น</string> <string name="gpu_show_other">แสดงไดรเวอร์สำหรับ GPU อื่น</string> <string name="gpu_advanced">ขั้นสูง</string> + <string name="gpu_ubwc_title">ความเข้ากันได้ของ UBWC</string> + <string name="gpu_ubwc_hint">ลองเปิดหรือปิดหาก Steam หรือ Android แสดงเป็นแถบลายหรือกะพริบ มีผลกับไดรเวอร์ทั้งสองหลังรีสตาร์ท DroidDeck</string> + <string name="gpu_ubwc_restart">รีสตาร์ท DroidDeck เพื่อใช้การเปลี่ยนแปลง</string> <string name="gpu_set_with_display">ตั้งค่าร่วมกับไดรเวอร์แสดงผล: %1$s รวมทั้งสองอย่าง</string> <string name="gpu_set_with_runtime">ตั้งค่าร่วมกับไดรเวอร์รันไทม์: %1$s รวมทั้งสองอย่าง</string> <string name="gpu_runtime_hint">ใช้โดยเกมและเดสก์ท็อป</string> @@ -1107,10 +1252,10 @@ <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> + <string name="rail_components">คอมโพเนนต์</string> <string name="rail_apps">แอป</string> <string name="rail_setup">การตั้งค่า</string> <string name="rail_updates">การอัปเดต</string> @@ -1161,10 +1306,15 @@ <string name="pip_auto">เข้าสู่ภาพซ้อนภาพโดยอัตโนมัติ</string> <string name="unfolded_controls">การควบคุมบนหน้าจอที่กางออก</string> <string name="unfolded_controls_hint">เมื่อกางออก เกมจะอยู่เหนือแทร็กแพดและปุ่มด้านหลังของ Steam Deck เมื่อพับ เกมจะแสดงเต็มจอ</string> + <string name="unfolded_controls_with_controller">คงไว้เมื่อใช้คอนโทรลเลอร์</string> + <string name="unfolded_controls_with_controller_hint">แสดงปุ่มสัมผัสเหล่านี้ด้วยขณะเชื่อมต่อคอนโทรลเลอร์</string> <string name="pip_suspended">หยุดชั่วคราว</string> <string name="pip_not_ready">ภาพซ้อนภาพจะพร้อมใช้งานเมื่อเซสชันพร้อม</string> <string name="pip_permission">อนุญาตภาพซ้อนภาพสำหรับ DroidDeck ในการตั้งค่า Android</string> <string name="pip_unavailable">Android ไม่สามารถเปิดภาพซ้อนภาพได้</string> + <string name="game_more">เพิ่มเติม</string> + <string name="game_edit_art">แก้ไขภาพปก</string> + <string name="stores_in_steam_label">ใน Steam</string> <string name="game_shortcut">ช็อตคัต</string> <string name="game_shortcut_add">เพิ่มไปยังหน้าจอหลัก</string> <string name="game_shortcut_choose">เลือกเกม</string> @@ -1188,6 +1338,10 @@ <string name="main_wait_runtime">รอให้การดำเนินการของรันไทม์เสร็จสิ้น</string> <string name="main_wait_proton_install">รอให้การติดตั้งเครื่องมือความเข้ากันได้เสร็จสิ้น</string> + <string name="load_compat_title">กำลังเตรียมเครื่องมือความเข้ากันได้</string> + <string name="load_compat_wait">กำลังรอให้การตั้งค่าความเข้ากันได้เสร็จสิ้น</string> + <string name="load_compat_hint">เซสชันของคุณจะเริ่มเมื่อการตั้งค่าเสร็จสิ้น</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">รอให้การติดตั้งแอปเดสก์ท็อปเสร็จสิ้น</string> <string name="main_wait_install_game">รอให้การติดตั้งเสร็จสิ้นก่อนเปิดเกม</string> <string name="main_saves_close_session">ปิดเซสชัน Steam ก่อน เพื่อไม่ให้เกมบันทึกทับการนำเข้า</string> @@ -1220,6 +1374,9 @@ <string name="main_install_anyway">ติดตั้งอยู่ดี</string> <string name="main_remove_runtime_title">ลบรันไทม์ Linux</string> <string name="main_remove_runtime_text">การลบนี้จะลบรันไทม์ ไคลเอนต์ Steam ภายใน และเกมทุกเกมที่ติดตั้งอยู่ในนั้น</string> + <string name="runtime_actions_title">รันไทม์ Linux</string> + <string name="runtime_actions_text">ซ่อมแซมจะติดตั้งไฟล์ระบบของรันไทม์ใหม่โดยเก็บ Steam เกม และการตั้งค่าของคุณไว้ ส่วนเสริมอย่างเดสก์ท็อปจะติดตั้งใหม่เมื่อคุณใช้งานครั้งถัดไป ลบจะลบทุกอย่าง</string> + <string name="runtime_repair">ซ่อมแซมรันไทม์</string> <string name="main_applied">นำมาใช้แล้ว: %1$s</string> <string name="android_app_open_failed_primary">ไม่สามารถเปิด %1$s บนหน้าจอหลักได้</string> <string name="android_app_open_failed_on">ไม่สามารถเปิด %1$s บน %2$s ได้</string> @@ -1346,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">ไม่สามารถเข้าถึงแคตตาล็อกรันไทม์ได้ ตรวจสอบการเชื่อมต่อแล้วกด Play อีกครั้ง</string> <string name="session_runtime_install_failed">รันไทม์ Linux ติดตั้งไม่สำเร็จ ตรวจสอบรันไทม์ในการตั้งค่าแล้วกด Play อีกครั้ง</string> <string name="session_desktop_install_failed">เดสก์ท็อปติดตั้งไม่สำเร็จ (%1$s) ตรวจสอบการเชื่อมต่อแล้วกดเดสก์ท็อปอีกครั้ง</string> + <string name="session_package_resume_failed">การติดตั้งที่ถูกขัดจังหวะไม่สามารถทำให้เสร็จได้ (%1$s) ตรวจสอบการเชื่อมต่อและพื้นที่ แล้วลองใหม่</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">รันไทม์ Linux เสียหาย: ลิงก์ไลบรารี %1$d รายการชี้ไปยังไฟล์ที่หายไป (%2$s และอื่นๆ) มักเกิดหลังการติดตั้งถูกขัดจังหวะ การซ่อมแซมจะเก็บเกมและการตั้งค่าของคุณไว้</item> + </plurals> <string name="session_ended_named">%1$s หยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> <string name="session_ended_program">โปรแกรมหยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> <string name="session_ended_desktop">เดสก์ท็อปหยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> @@ -1359,6 +1520,12 @@ <string name="mode_decky_plugins_hint">ติดตั้งไฟล์ ZIP พลักอินสำหรับเซสชัน Steam ครั้งถัดไป</string> <string name="mode_decky_plugin_downloading">กำลังดาวน์โหลด…</string> <string name="mode_decky_plugin_install_zip">ติดตั้งจาก ZIP</string> + <string name="decky_zip_warning_title">การติดตั้งพลักอินจากบุคคลที่สาม</string> + <string name="decky_zip_warning_text">ทีม Decky Loader ยังไม่ได้ตรวจสอบพลักอินนี้ อาจมีมัลแวร์ เช่น ซอฟต์แวร์ที่ขโมยบัญชี Steam ของคุณหรือทำอันตรายต่ออุปกรณ์ การติดตั้งพลักอินนี้ถือว่าคุณยอมรับความเสี่ยงทั้งหมดต่ออุปกรณ์ของคุณ</string> + <string name="decky_zip_warning_continue">ดำเนินการต่อ</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">โปรดรอ %1$d วินาที</item> + </plurals> <string name="store_cat_games">เกม</string> <string name="store_cat_audio_video">เสียงและวิดีโอ</string> <string name="store_cat_graphics">กราฟิก</string> @@ -1387,6 +1554,10 @@ <string name="theme_icon_blue_detail">พื้นดำ ตัวอักษรขาว สีฟ้าสำหรับทุกสิ่งที่ถูกเลือก โฟกัส หรือกด</string> <string name="theme_electric">กรมท่าไฟฟ้า</string> <string name="theme_electric_detail">สีฟ้าสว่างขึ้น บนพื้นผิวที่เอียงไปทางกรมท่ามากกว่าเทา</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">สีที่เปลี่ยนวนไปตามสายรุ้ง ทำงานตามการตั้งค่าแอนิเมชันของ Android</string> + <string name="theme_rgb_speed">ความเร็ว</string> + <string name="theme_rgb_speed_hint">สีเปลี่ยนเร็วแค่ไหน</string> <string name="theme_gradient">ไล่เฉดสี</string> <string name="theme_gradient_detail">สีหลักและสีรองที่คุณเลือกเอง ผสมกันบนปุ่มและส่วนที่เน้น</string> <string name="theme_gradient_primary">สีหลัก</string> @@ -1503,7 +1674,16 @@ <string name="fm_conflict_skip">ข้าม</string> <string name="fm_select_this_folder">เลือกโฟลเดอร์นี้</string> <string name="fm_back">กลับ</string> + <string name="fm_exit">ออก</string> + <string name="fm_return_to_start">กลับไปยังโฟลเดอร์เริ่มต้น</string> + <string name="fm_start_unavailable">โฟลเดอร์เริ่มต้นไม่พร้อมใช้งานแล้ว</string> + <string name="fm_cancel_operation_title">ยกเลิกการดำเนินการ?</string> + <string name="fm_cancel_operation_confirmation">การดำเนินการจะถูกยกเลิก คุณแน่ใจหรือไม่?</string> + <string name="fm_accept">ยอมรับ</string> + <string name="fm_decline">ปฏิเสธ</string> <string name="fm_drive_not_readable">%1$s ติดตั้งอยู่แต่อ่านไม่ได้ในขณะนี้</string> + <string name="fm_drive_access_title">อนุญาตให้เข้าถึง %1$s</string> + <string name="fm_drive_access_text">Android ให้ DroidDeck เห็นไดรฟ์นี้แต่อ่านไม่ได้ เปิดสิทธิ์เข้าถึงไฟล์ทั้งหมดให้ DroidDeck แล้วกลับมาที่นี่</string> <string name="fm_list_view">มุมมองรายการ</string> <string name="fm_grid_view">มุมมองตาราง</string> <string name="fm_search">ค้นหา</string> @@ -1574,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">แป้นพิมพ์ + แทร็กแพด</string> <string name="second_mode_terminal">เทอร์มินัล</string> <string name="second_mode_deck_controls">ปุ่มด้านหลังและแทร็กแพดของ Deck</string> + <string name="second_mode_dashboard">แดชบอร์ด</string> + <string name="bottom_dashboard_empty">ยังไม่มีอะไรให้แสดงที่นี่</string> + <string name="bottom_page_downloads">ดาวน์โหลด</string> + <string name="bottom_downloads_none">ไม่มีการดาวน์โหลดที่กำลังทำงาน</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">กำลังดาวน์โหลดแคชเชเดอร์</string> + <string name="bottom_downloads_paused">หยุดชั่วคราว</string> + <string name="bottom_downloads_queued">กำลังรอเริ่ม</string> + <string name="bottom_page_notifications">การแจ้งเตือน</string> + <string name="bottom_notifications_listener">หน้าจอล่างของ DroidDeck</string> + <string name="bottom_notifications_why">แสดงข้อความและการแจ้งเตือนอื่นๆ ที่นี่ขณะที่คุณเล่น การแจ้งเตือนจะแสดงบนหน้าจอนี้เท่านั้นและจะไม่ถูกบันทึก Android จะถามเพียงครั้งเดียว: หน้าการเข้าถึงการแจ้งเตือนจะเปิดขึ้นบนหน้าจอนี้ เปิด DroidDeck ที่นั่น แล้วหน้านี้จะกลับมาเอง</string> + <string name="bottom_notifications_allow">อนุญาตการเข้าถึงการแจ้งเตือน</string> + <string name="bottom_notifications_none">ไม่มีการแจ้งเตือน</string> + <string name="bottom_notifications_count">การแจ้งเตือน %1$d รายการ</string> + <string name="bottom_notifications_clear">ล้าง</string> + <string name="bottom_page_screenshots">ภาพหน้าจอ</string> + <string name="stats_fps_needs_hud">ต้องเปิด HUD เพื่อแสดง FPS</string> + <string name="stats_speed">ความเร็ว</string> + <string name="stats_pedals">แป้นเหยียบ</string> + <string name="stats_gforce">แรง G</string> + <string name="stats_timing">การจับเวลา</string> + <string name="stats_best_lap">รอบที่ดีที่สุด</string> + <string name="stats_tires">ยาง °C</string> + <string name="stats_trace">คันเร่งและเบรก 10 s ล่าสุด</string> + <string name="stats_speed_chart">ความเร็ว, %1$s</string> + <string name="stats_gear">เกียร์</string> + <string name="stats_speed_units">หน่วยความเร็ว</string> + <string name="stats_speed_units_auto">อัตโนมัติ (%1$s)</string> + <string name="stats_steam_client_arm">ไคลเอนต์ Steam ARM</string> + <string name="stats_steam_client_x86">ไคลเอนต์ Steam x86</string> + <string name="stats_throttle">คันเร่ง</string> + <string name="stats_brake">เบรก</string> + <string name="stats_lights">แผงหน้าปัด</string> + <string name="stats_lamp_shift">เปลี่ยนเกียร์</string> + <string name="stats_lamp_handbrake">เบรกมือ</string> + <string name="stats_lamp_pit">ตัวจำกัดความเร็วพิต</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">เทอร์โบ %1$s bar</string> + <string name="stats_engine_temp">เครื่องยนต์ %1$s °C</string> + <string name="stats_oil_temp">น้ำมันเครื่อง %1$s °C</string> + <string name="stats_power">ตัวกระจายพลังงาน</string> + <string name="stats_fuel_t">เชื้อเพลิง, t</string> + <string name="stats_fuel_main">หลัก %1$s t</string> + <string name="stats_fuel_reserve">สำรอง %1$s t</string> + <string name="stats_tap_hint">แตะแถบด้านบนหรือหน้าปัดเพื่อเปลี่ยนรูปแบบ</string> + <string name="bottom_telemetry_send_title">ส่งข้อมูลแดชบอร์ด</string> + <string name="bottom_telemetry_send_auto">อัตโนมัติ</string> + <string name="bottom_telemetry_send_auto_hint">เปิดใช้สำหรับทุกเกมที่แสดงที่นี่ รวมถึงเกมที่พบในภายหลัง เกมที่คุณปิดไว้จะยังคงปิดอยู่</string> + <string name="bottom_telemetry_send_note">การตั้งค่านี้จะเปลี่ยนการตั้งค่าการส่งออกข้อมูลของเกมเอง และมีผลในครั้งถัดไปที่เกมเริ่มทำงาน การปิดจะคืนค่าการตั้งค่าเดิม</string> + <string name="bottom_telemetry_send_close">ปิด %1$s เพื่อเปลี่ยนการตั้งค่านี้</string> + <string name="bottom_telemetry_send_failed">เปลี่ยนการตั้งค่าของ %1$s ไม่ได้</string> + <string name="bottom_telemetry_send_menu">%1$s: เปิด %2$s ในการตั้งค่าของเกม โดยใช้ IP 127.0.0.1 และพอร์ต %3$d</string> + <string name="bottom_shots_where">บันทึกไว้ที่ Pictures/DroidDeck ภาพหน้าจอของ Steam จะแสดงที่นี่ด้วย</string> + <string name="bottom_shots_take">ถ่ายภาพหน้าจอ</string> + <string name="bottom_shots_saved">บันทึกภาพหน้าจอแล้ว</string> + <string name="bottom_shots_failed">ถ่ายภาพหน้าจอไม่ได้</string> + <string name="bottom_shots_none">ยังไม่มีภาพหน้าจอ</string> + <string name="bottom_page_chat">แชทและเสียง</string> + <string name="bottom_chat_why">อ่านและตอบแชท Steam ที่นี่ขณะที่เกมยังทำงานบนหน้าจอหลัก โดยใช้บัญชีที่ลงชื่อเข้าใช้ Steam อยู่</string> + <string name="bottom_chat_not_signed_in">Steam ยังไม่มีการลงชื่อเข้าใช้เว็บที่แชร์ได้ โปรดลงชื่อเข้าใช้ที่นี่หนึ่งครั้ง</string> + <string name="bottom_chat_stopped">Android ปิดหน้าแชทขณะที่ DroidDeck ทำงานอยู่ในเบื้องหลัง หน้าแชทจะเปิดอีกครั้งเมื่อคุณกลับมาที่ DroidDeck</string> + <string name="bottom_chat_open">เปิด Steam Chat</string> + <string name="bottom_chat_close">ปิดแชท</string> + <string name="bottom_chat_mic_on">ไมค์เปิด</string> + <string name="bottom_chat_mic_off">ไมค์ปิด</string> + <string name="bottom_chat_mic_unavailable">ไมค์ปิดอยู่สำหรับเกมนี้ หากต้องการพูด ให้เปิดไมโครโฟนในการตั้งค่า Steam ของ DroidDeck (เสียง) แล้วเริ่มเกมอีกครั้ง</string> + <string name="bottom_chat_volume">ระดับเสียง %1$d%%</string> + <string name="bottom_page_telemetry">สถิติในเกม</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">แบตเตอรี่</string> + <string name="bottom_telemetry_lap">รอบ</string> + <string name="bottom_telemetry_position">อันดับ</string> + <string name="bottom_telemetry_this_lap">รอบนี้</string> + <string name="bottom_telemetry_last_lap">รอบที่แล้ว</string> + <string name="bottom_telemetry_fuel">เชื้อเพลิง</string> + <string name="bottom_telemetry_cargo">สินค้า</string> + <string name="bottom_telemetry_pips">พิป SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">สถานะทางกฎหมาย</string> + <string name="bottom_telemetry_balance">ยอดเงิน</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">เปิดการส่งออกข้อมูลของเกมแข่งรถ (มักเรียกว่าเทเลเมทรีหรือ UDP) เพื่อดูหน้าปัดแบบสดที่นี่ ข้อมูลจะอยู่บนอุปกรณ์นี้เท่านั้น</string> + <string name="bottom_telemetry_unknown_format">พอร์ต %1$d ได้รับข้อมูล (%2$d แพ็กเก็ต ขนาด %3$d ไบต์) แต่อยู่ในรูปแบบที่หน้านี้ยังอ่านไม่ได้</string> + <string name="bottom_telemetry_port_busy">มีโปรแกรมอื่นใช้พอร์ต %1$s อยู่แล้ว เกมนั้นจึงแสดงที่นี่ไม่ได้</string> <string name="rtinst_removing">กำลังลบรันไทม์ Linux</string> <plurals name="rtinst_removing_entries"> @@ -1603,6 +1870,7 @@ <string name="flatpakmgr_not_ready">ตั้งค่า Flatpak ก่อน</string> <string name="flatpakmgr_starting">กำลังเริ่ม</string> <string name="flatpakmgr_exit_status">Flatpak ออกด้วยสถานะ %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s สร้างมาสำหรับ %2$s ซึ่ง DroidDeck เรียกใช้ไม่ได้ แอป Flatpak ที่นี่ต้องเป็นเวอร์ชัน ARM64 หรือ x86_64</string> <string name="flatpakmgr_installing">กำลังติดตั้ง %1$s</string> <string name="flatpakmgr_updating">กำลังอัปเดต %1$s</string> <string name="flatpakmgr_removing">กำลังลบ %1$s</string> @@ -1696,6 +1964,7 @@ <string name="adbpair_applying">กำลังปรับใช้การตั้งค่า…</string> <string name="adbpair_command_failed">คำสั่ง Wireless debugging ล้มเหลว</string> <string name="adbpair_channel_name">การตั้งค่า Wireless debugging</string> + <string name="adbpair_progress_channel_name">ความคืบหน้าการตั้งค่า Wireless debugging</string> <string name="adbpair_channel_description">ขอรหัสจับคู่ Wireless debugging ขณะเปิดการตั้งค่าอยู่</string> <string name="adbpair_title_pair">จับคู่ Wireless debugging</string> <string name="adbpair_waiting_text">เปิด Wireless debugging แล้วแตะ “Pair device with pairing code”</string> @@ -1804,6 +2073,7 @@ <string name="gpuinfo_not_adreno">ไม่ใช่ GPU Adreno</string> <string name="gpuinfo_supported">รองรับ</string> <string name="gpuinfo_experimental">ทดลอง: ไดรเวอร์เป็นบิลด์ทดสอบ</string> + <string name="gpuinfo_a850_experimental">รองรับ Adreno 850 แบบทดลอง: ต้องใช้ไดรเวอร์จอแสดงผลและไดรเวอร์เกมแบบทดลองที่เข้ากันได้ ยังไม่ได้ตรวจสอบบนอุปกรณ์นี้</string> <string name="gpuinfo_below_tested">ต่ำกว่าฮาร์ดแวร์ที่ทดสอบแล้ว (Adreno 725 และรุ่นใหม่กว่า): อาจรันไม่ได้</string> <string name="gpuinfo_unsupported">ไม่รองรับ: DroidDeck ต้องใช้ GPU Adreno (Snapdragon)</string> @@ -1897,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">ปรับสเกล %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">แสดงรายละเอียดอุปกรณ์</string> <string name="device_info_hide">ซ่อนรายละเอียดอุปกรณ์</string> @@ -1915,7 +2185,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> @@ -1929,11 +2198,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> @@ -1951,9 +2218,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> @@ -1972,12 +2247,43 @@ <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> <string name="stores_sort">จัดเรียง</string> + <string name="setup_rail_labels">ป้ายแถบด้านข้าง</string> + <string name="setup_rail_labels_hint">แสดงชื่อใต้ไอคอนในแถบด้านข้าง ปิดเพื่อให้แถบด้านข้างแคบลง</string> + <string name="library_display">การแสดงผล</string> + <string name="library_display_larger">การ์ดใหญ่ขึ้น</string> + <string name="library_display_smaller">การ์ดเล็กลง</string> + <string name="library_display_title">แสดงชื่อ</string> + <string name="library_display_size">แสดงขนาด</string> <string name="stores_sort_last_played">เล่นล่าสุด</string> <string name="stores_sort_recently_installed">เพิ่งติดตั้ง</string> <string name="stores_sort_title_asc">ชื่อ A–Z</string> @@ -2055,7 +2361,7 @@ <string name="stores_card_proton_value">การเลือกของ Steam ต่อเกม</string> <string name="stores_card_audio">เสียง</string> <string name="stores_card_audio_value">DirectAudio</string> - <string name="stores_card_components">Components</string> + <string name="stores_card_components">คอมโพเนนต์</string> <string name="stores_card_components_value">FEX, DXVK, VKD3D</string> <string name="stores_card_engine">เอนจิน</string> <string name="stores_card_engine_value">%1$s · เนทีฟ</string> @@ -2104,6 +2410,9 @@ <string name="stores_download_manager">ตัวจัดการดาวน์โหลด</string> <string name="stores_parallel">การดาวน์โหลดพร้อมกัน</string> <string name="stores_install_where">ติดตั้งไปที่</string> + <string name="stores_install_language">ภาษาของเกม</string> + <string name="stores_install_language_hint">GOG และ Epic จะติดตั้งภาษานี้ ระบบจะใช้ภาษาตามแอป</string> + <string name="stores_install_language_system">ระบบ</string> <string name="stores_install_title">ติดตั้ง %1$s:</string> <string name="stores_target_internal">ภายใน</string> <string name="stores_target_free">เหลือ %1$s</string> @@ -2126,6 +2435,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> @@ -2141,6 +2451,9 @@ <string name="edit_target">เป้าหมาย</string> <string name="edit_start_in">เริ่มที่</string> <string name="edit_launch_options">ตัวเลือกการเปิด</string> + <string name="edit_launch_options_steam_hint">ใช้ร่วมกับคุณสมบัติใน Steam: เปลี่ยนที่ใดที่หนึ่งก็จะแสดงในทั้งสองที่</string> + <string name="edit_launch_options_not_saved">บันทึกตัวเลือกการเปิดลงใน Steam ไม่ได้ ลองอีกครั้ง</string> + <string name="edit_launch_options_desktop">Steam อาจเปิดอยู่ในเซสชันเดสก์ท็อป เปลี่ยนตัวเลือกการเปิดในคุณสมบัติของ Steam หรือปิดเซสชันก่อน</string> <string name="edit_artwork">ภาพปก</string> <string name="edit_other_exe">exe อื่น…</string> <string name="edit_remove">ลบ</string> @@ -2266,6 +2579,7 @@ <string name="setup_download_source_custom">Prefix ของตัวเอง</string> <string name="setup_download_mirror">เว็บไซต์</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">พร็อกซี HTTP</string> <string name="flathub_eyebrow">แอป LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">แอปเดสก์ท็อปสำหรับเดสก์ท็อป Linux เปิดจากเดสก์ท็อป</string> @@ -2404,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">โหมดอัตโนมัติจะตรึงเกม 2D นี้ไว้ในมุมมอง เลือก “หน้าจอเสมือน” ในส่วน “หน้าจอ” เพื่อใช้การติดตามศีรษะ</string> <string name="glasses_tracking_sbs_hint">การติดตามศีรษะใช้กับหน้าจอเสมือนหรือเกม SteamVR ที่กำลังทำงาน</string> <string name="glasses_hardware">อุปกรณ์</string> + <string name="vr_controllers_tab">คอนโทรลเลอร์</string> + <string name="vr_controllers_group">คอนโทรลเลอร์ SteamVR</string> + <string name="vr_controllers_emulate">เกมแพดใน VR</string> + <string name="vr_controllers_emulate_hint">มือ VR สองข้างที่คอนโทรลเลอร์ของคุณจำลอง การเปลี่ยนแปลงมีผลทันที แม้ขณะ SteamVR ทำงาน Joy-Con และมือที่ติดตามได้ยังคงควบคุมฝั่งของตัวเองแทน</string> + <string name="vr_controllers_off">เกมแพดปกติ</string> + <string name="vr_controllers_index">คอนโทรลเลอร์ Valve Index</string> + <string name="vr_controllers_touch">คอนโทรลเลอร์ Meta Quest 3</string> + <string name="vr_controllers_vive">ไม้ควบคุม HTC Vive</string> + <string name="vr_controllers_sticks">สติ๊กเริ่มต้นด้วยการ</string> + <string name="vr_controllers_sticks_hint">กดสติ๊กทั้งสองพร้อมกันระหว่างใช้ VR เพื่อสลับ</string> + <string name="vr_controllers_sticks_game">เคลื่อนที่ตัวคุณในเกม</string> + <string name="vr_controllers_sticks_hands">ขยับมือ</string> + <string name="vr_controllers_buttons">ปุ่ม</string> + <string name="vr_controllers_buttons_stick">ทริกเกอร์เป็นทริกเกอร์ บัมเปอร์เป็นการจับ A/B และ X/Y เป็นปุ่มหน้าของมือแต่ละข้าง การกดสติ๊กคือการกดธัมบ์สติ๊ก Guide เปิดเมนู SteamVR D-pad ขึ้นและลงขยับมือเข้าใกล้หรือออกห่าง</string> + <string name="vr_controllers_buttons_vive">สติ๊กเป็นแทร็กแพด กด A/X หรือกดสติ๊กเพื่อกดแทร็กแพด ทริกเกอร์เป็นทริกเกอร์ บัมเปอร์เป็นการจับ Start และ Select เป็นเมนู Guide เปิดเมนู SteamVR</string> + <string name="vr_controllers_buttons_off">ไม่มีมือ VR เกมที่รองรับเกมแพดและเมนู SteamVR จะรับคอนโทรลเลอร์ของคุณตามปกติ</string> <string name="glasses_brightness">ความสว่าง</string> <string name="glasses_volume">ระดับเสียง</string> <string name="glasses_sunblock">กันแดด</string> @@ -2461,6 +2791,12 @@ <string name="hand_camera_placement">ตำแหน่งกล้อง</string> <string name="hand_camera_placement_hint">ตรวจสอบว่ากล้องมองเห็นคุณก่อนเริ่มเล่น</string> <string name="hand_camera_check">ตรวจสอบ</string> + <string name="tracking_pack_title">ดาวน์โหลดการติดตามมือ</string> + <string name="tracking_pack_hint">การติดตามมือต้องดาวน์โหลด %1$s เพียงครั้งเดียว</string> + <string name="tracking_pack_download">ดาวน์โหลด</string> + <string name="tracking_pack_retry">ลองใหม่</string> + <string name="tracking_pack_downloading">กำลังดาวน์โหลดการติดตามมือ… %1$d%%</string> + <string name="tracking_pack_failed">ดาวน์โหลดการติดตามมือไม่ได้ ตรวจสอบการเชื่อมต่อแล้วลองใหม่</string> <string name="hand_camera_check_title">ตำแหน่งกล้อง</string> <string name="hand_camera_how_rear">ตั้งอุปกรณ์ให้ห่างออกไป 1.5 ถึง 2 เมตร ที่ระดับความสูงประมาณหน้าอก โดยให้กล้องหลังหันมาทางคุณ จากนั้นเดินเข้ามาในมุมมองพร้อมยื่นมือทั้งสองข้างออกมา</string> <string name="hand_camera_how_front">ตั้งอุปกรณ์ให้ห่างออกไป 1.5 ถึง 2 เมตร ที่ระดับความสูงประมาณหน้าอก โดยให้หน้าจอหันมาทางคุณ จากนั้นเดินเข้ามาในมุมมองพร้อมยื่นมือทั้งสองข้างออกมา</string> @@ -2532,6 +2868,21 @@ <string name="storage_safe_hint">รันไทม์ที่ไม่ได้ใช้ เศษที่เหลือ ล็อกเก่า</string> <string name="storage_clean_up">กำลังล้าง…</string> <string name="storage_session_running">หยุดเซสชันเพื่อล้างหรือลบอะไรก็ตาม ขนาดจะยังแสดงอยู่</string> + <string name="storage_default_group">ตำแหน่งติดตั้ง</string> + <string name="storage_default_title">พื้นที่จัดเก็บเริ่มต้น</string> + <string name="storage_default_hint">การติดตั้งใหม่จากสโตร์จะไปยังตำแหน่งที่เลือก เกมที่มีอยู่จะอยู่ที่เดิม ไลบรารี Steam ใช้การตั้งค่าของตัวเอง</string> + <string name="storage_default_ask">ถามทุกครั้ง</string> + <string name="storage_default_ask_detail">เลือกปลายทางสำหรับการติดตั้งแต่ละครั้ง</string> + <string name="storage_default_internal">พื้นที่จัดเก็บภายใน</string> + <string name="storage_default_external">พื้นที่จัดเก็บภายนอก</string> + <string name="storage_default_external_detail">%1$s · ว่าง %2$s</string> + <string name="storage_default_external_missing">ไม่ได้เชื่อมต่อ</string> + <string name="storage_default_folder">โฟลเดอร์ · %1$s</string> + <string name="storage_default_folder_free">ว่าง %1$s</string> + <string name="storage_default_folder_missing">ไม่ได้เชื่อมต่อ</string> + <string name="storage_default_choose_folder">เลือกโฟลเดอร์…</string> + <string name="storage_default_choose_folder_detail">ใช้โฟลเดอร์ใดก็ได้บนการ์ด SD หรือไดรฟ์ USB</string> + <string name="storage_default_note">เกมจะอยู่ในโฟลเดอร์ Games ภายในตำแหน่งที่เลือก เกมที่มีอยู่จะไม่ถูกย้าย</string> <string name="storage_where">ไปอยู่ที่ไหน</string> <string name="storage_games">เกม Steam</string> <string name="storage_game_data">ข้อมูลเกม</string> @@ -2653,6 +3004,9 @@ <string name="storage_data_installed">เกมที่ติดตั้ง</string> <string name="storage_data_parts">Prefix %1$s · เชเดอร์ %2$s · เวิร์กชอป %3$s</string> <string name="storage_clear_shaders">ล้างเชเดอร์</string> + <string name="storage_reset_prefix">รีเซ็ต prefix</string> + <string name="storage_reset_prefix_title">รีเซ็ต prefix ของ %1$s?</string> + <string name="storage_reset_prefix_confirm">ลบ Wine prefix (%1$s) ใน %2$s และสร้างใหม่เมื่อเปิดครั้งถัดไป เซฟ การตั้งค่า และ redistributable ที่ติดตั้งไว้ข้างในจะหายไป เซฟใน Steam Cloud ยังอยู่ในบัญชีของคุณ</string> <string name="storage_data_leftovers">เกมที่ลบแล้ว</string> <string name="storage_steam_app">แอป Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix ยังมีไฟล์อยู่ อาจเป็นเซฟในเครื่อง</string> @@ -2953,5 +3307,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">ซิงค์ด้วย Syncthing</string> + <string name="sync_enable_hint">นี่คือ Syncthing ที่อิงจาก Syncthing-Fork ซึ่งช่วยให้คุณซิงค์ไฟล์ในระบบไฟล์ภายในของ DroidDeck กับ Syncthing เครื่องอื่นได้ ใช้ได้เฉพาะกับไฟล์ที่คุณจัดเก็บไว้ในระบบไฟล์ภายในของ DroidDeck เท่านั้น</string> + <string name="sync_missing">บิลด์นี้ไม่มี Syncthing</string> + <string name="sync_starting">กำลังเริ่ม Syncthing</string> + <string name="sync_status_starting">กำลังเริ่ม</string> + <string name="sync_status_up_to_date">เป็นปัจจุบัน</string> + <string name="sync_status_syncing">กำลังซิงค์</string> + <string name="sync_status_paused">หยุดชั่วคราว</string> + <string name="sync_status_pausing">กำลังหยุดชั่วคราว</string> + <string name="sync_status_resuming">กำลังทำต่อ</string> + <string name="sync_status_attention">ต้องตรวจสอบ</string> + <string name="sync_status_failed">Syncthing หยุดทำงาน</string> + <string name="sync_failed_retry">ลองอีกครั้ง</string> + <string name="sync_paused_wifi">หยุดชั่วคราวจนกว่าจะเชื่อมต่อ Wi-Fi</string> + <string name="sync_paused_game">หยุดชั่วคราวระหว่างเล่นเกม</string> + <string name="sync_summary">%1$d โฟลเดอร์ · เชื่อมต่อแล้ว %2$d จาก %3$d อุปกรณ์</string> + <string name="sync_left">เหลืออีก %1$s</string> + <string name="sync_open_web_ui">เปิดเว็บ UI</string> + <string name="sync_pause">หยุดชั่วคราว</string> + <string name="sync_resume">ทำต่อ</string> + <string name="sync_running">กำลังทำงาน</string> + <string name="sync_running_hint">ปิดเพื่อหยุด Syncthing ทั้งหมด</string> + <string name="sync_this_device">อุปกรณ์นี้</string> + <string name="sync_device_id">ID อุปกรณ์</string> + <string name="sync_show_qr">แสดง QR</string> + <string name="sync_advanced">ขั้นสูง</string> + <string name="sync_advanced_hint">พอร์ต เวลาที่ทำงาน การรีเซ็ต</string> + <string name="sync_open">เปิด</string> + <string name="sync_waiting">รอคุณอยู่</string> + <string name="sync_pending_device">%1$s ต้องการเชื่อมต่อ</string> + <string name="sync_pending_folder">%1$s ต้องการแชร์ “%2$s”</string> + <string name="sync_pending_folder_hint">ยอมรับเพื่อเลือกตำแหน่งที่จะบันทึกใน DroidDeck</string> + <string name="sync_review">ตรวจสอบในเว็บ UI</string> + <string name="sync_folders">โฟลเดอร์</string> + <string name="sync_no_folders">ยังไม่มีโฟลเดอร์</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">เป็นปัจจุบัน</string> + <string name="sync_folder_syncing">กำลังซิงค์ %1$d%%</string> + <string name="sync_folder_scanning">กำลังสแกน</string> + <string name="sync_folder_paused">หยุดชั่วคราว</string> + <string name="sync_folder_out_of_sync">ไม่ตรงกัน</string> + <string name="sync_folder_errors">ซิงค์ไม่ได้ %1$d ไฟล์</string> + <string name="sync_folder_blocked">ถูกบล็อก</string> + <string name="sync_folder_blocked_hint">โฟลเดอร์นี้อยู่นอกพื้นที่จัดเก็บของ DroidDeck ดังนั้น DroidDeck จึงหยุดโฟลเดอร์นี้ชั่วคราว หากต้องการซิงค์โฟลเดอร์ที่อยู่นอก DroidDeck ให้ใช้แอป Syncthing-Fork</string> + <string name="sync_remove_folder">นำออกจาก Syncthing</string> + <string name="sync_remove_folder_hint">การนำออกจะไม่ลบไฟล์ใดๆ</string> + <string name="sync_devices">อุปกรณ์</string> + <string name="sync_no_devices">ยังไม่มีอุปกรณ์</string> + <string name="sync_connected">เชื่อมต่อแล้ว</string> + <string name="sync_offline">ออฟไลน์</string> + <string name="sync_last_seen">พบล่าสุด %1$s</string> + <string name="sync_device_id_title">ID ของอุปกรณ์นี้</string> + <string name="sync_device_id_hint">บนอุปกรณ์อีกเครื่อง ให้เพิ่มอุปกรณ์ใน Syncthing แล้วสแกนโค้ดนี้หรือวาง ID จากนั้นยอมรับอุปกรณ์นั้นที่นี่ในเว็บ UI</string> + <string name="sync_copy">คัดลอก</string> + <string name="sync_share">แชร์</string> + <string name="sync_done">เสร็จสิ้น</string> + <string name="sync_off_title">ปิด Syncthing?</string> + <string name="sync_off_body">Syncthing จะหยุดทันทีและหยุดอยู่จนกว่าจะเปิดอีกครั้ง ไฟล์ที่ซิงค์แล้วจะยังอยู่ที่เดิม</string> + <string name="sync_off_forget">ลบการกำหนดค่าของ Syncthing ด้วย</string> + <string name="sync_off_forget_hint">นำ ID ของอุปกรณ์นี้ โฟลเดอร์ และอุปกรณ์ออก เมื่อเปิดอีกครั้งจะเริ่มต้นใหม่ทั้งหมด</string> + <string name="sync_turn_off">ปิด</string> + <string name="sync_ports">พอร์ต</string> + <string name="sync_port_sync">ซิงค์</string> + <string name="sync_port_discovery">การค้นหาในเครือข่ายท้องถิ่น</string> + <string name="sync_repick">เลือกพอร์ตใหม่</string> + <string name="sync_repick_hint">ตรวจสอบอีกครั้งทุกครั้งที่เริ่ม</string> + <string name="sync_repick_button">เลือกใหม่</string> + <string name="sync_reset_group">รีเซ็ต</string> + <string name="sync_api_key">คีย์ API</string> + <string name="sync_regenerate">สร้างใหม่</string> + <string name="sync_reset">รีเซ็ต Syncthing</string> + <string name="sync_reset_hint">ได้ ID อุปกรณ์ใหม่ และนำโฟลเดอร์กับอุปกรณ์ออก ไฟล์ในพื้นที่จัดเก็บของ DroidDeck จะยังคงอยู่</string> + <string name="sync_reset_button">รีเซ็ต</string> + <string name="sync_reset_confirm_title">รีเซ็ต Syncthing?</string> + <string name="sync_running_group">การทำงาน</string> + <string name="sync_run">ทำงาน</string> + <string name="sync_run_open">ขณะที่ DroidDeck เปิดอยู่</string> + <string name="sync_run_background">ในเบื้องหลัง</string> + <string name="sync_wifi_only">Wi-Fi เท่านั้น</string> + <string name="sync_pause_games">หยุดชั่วคราวระหว่างเล่นเกม</string> + <string name="sync_logs">ล็อก</string> + <string name="sync_logs_hint">เอาต์พุตของ Syncthing สำหรับเซสชันนี้</string> + <string name="sync_logs_share">แชร์</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">ตั้งค่ารันไทม์ Linux ก่อน</string> + <string name="sync_accept">ยอมรับ</string> + <string name="sync_accept_title">บันทึก “%1$s” ไปที่</string> + <string name="sync_add_folder">เพิ่มโฟลเดอร์</string> + <string name="sync_add_folder_hint">ซิงค์โฟลเดอร์ในพื้นที่จัดเก็บของ DroidDeck</string> + <string name="sync_choose">เลือก</string> + <string name="sync_add">เพิ่ม</string> + <string name="sync_add_failed">เพิ่มโฟลเดอร์ไม่ได้</string> + <string name="sync_share_with">แชร์กับ</string> + <string name="sync_share_none">ยังไม่มีอุปกรณ์ คุณสามารถแชร์โฟลเดอร์นี้จากเว็บ UI ได้ในภายหลัง</string> + <string name="sync_use_folder">ใช้โฟลเดอร์นี้</string> + <string name="sync_new_folder">โฟลเดอร์ใหม่</string> + <string name="sync_location_home">โฮมของคอนเทนเนอร์</string> + <string name="sync_location_sync">โฟลเดอร์ Sync</string> + <string name="sync_location_shared">พื้นที่จัดเก็บที่ใช้ร่วมกันของ DroidDeck</string> + <string name="sync_location_card">DroidDeck บน %1$s</string> + <string name="sync_location_app">ข้อมูลแอป DroidDeck</string> + <string name="sync_web_path_locked">โฟลเดอร์ใหม่จะบันทึกไว้ในโฟลเดอร์ Sync ของ DroidDeck หากต้องการซิงค์โฟลเดอร์อื่นของ DroidDeck ให้ใช้ เพิ่มโฟลเดอร์ ในแท็บ Syncthing</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">โหลดซ้ำ</string> + <string name="sync_not_running">Syncthing ไม่ได้ทำงานอยู่</string> + <string name="session_end_steam_sigill">Steam หยุดทำงานเพราะคำสั่งที่ไม่ถูกต้อง (SIGILL) อาจเป็นปัญหาความเข้ากันได้ของคำสั่ง CPU หรือไคลเอนต์ขัดข้อง แชร์บันทึกพร้อมรายละเอียดอุปกรณ์ของคุณ</string> + <string name="session_end_steam_try_x64">คุณสามารถลองการตั้งค่า Steam → ไคลเอนต์ Steam → x86-64 (ทดลอง) ต้องดาวน์โหลดเพิ่มเติมและอาจทำงานช้าลง</string> + <string name="session_end_vulkan_device">ไดรเวอร์กราฟิก Linux ไม่พบอุปกรณ์ Vulkan ที่ใช้งานได้ ตรวจสอบว่าไดรเวอร์ GPU ของ Linux ที่เลือกรองรับ GPU นี้</string> + <string name="session_end_gpu_unsupported">เซสชันนี้เริ่มไม่ได้เพราะ GPU นี้ไม่มีไดรเวอร์ Linux Vulkan ที่เข้ากันได้ในการตั้งค่าปัจจุบัน ไดรเวอร์ Adreno Turnip ไม่สามารถเปิดการรองรับ GPU ของ MediaTek/Mali ได้</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">การแก้ไขข้อบกพร่องแบบไร้สาย</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_resources_browser">เปิดในเบราว์เซอร์ของคุณ</string> + <string name="game_resource_guides">คู่มือ</string> + <string name="game_resource_protondb_detail">รายงานความเข้ากันได้ของ Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">สำหรับเกมที่มีเซฟอยู่ในบัญชี Steam ของคุณ</string> + <string name="game_resource_search">ค้นหาเว็บ</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="library_filter">ตัวกรอง</string> + <string name="library_filter_installed">เฉพาะที่ติดตั้ง</string> + <string name="library_filter_all_owned">เกมทั้งหมดที่เป็นเจ้าของ</string> + <string name="library_no_installed_matches">ไม่มีเกมที่ติดตั้งไว้ตรงกับตัวกรองเหล่านี้</string> + <string name="library_browse_owned">เรียกดูเกมที่เป็นเจ้าของ</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="stores_itch_updates_found">มีอัปเดตพร้อมใช้งาน: %1$d</string> + <string name="stores_itch_update_replaced">ผู้พัฒนาได้แทนที่บิลด์นี้ด้วย %1$s ต้องการอัปเดตเป็นบิลด์นั้นไหม</string> + <string name="xbox_filter_cloud">คลาวด์</string> + <string name="stores_xbox_cloud_settings">การตั้งค่าคลาวด์</string> + <string name="integration_title">การผสานรวม Steam</string> + <string name="integration_count">เปิด %1$d จาก %2$d</string> + <string name="integration_set_up">ตั้งค่า</string> + <string name="integration_location">ตำแหน่ง</string> + <string name="integration_app_info">ข้อมูลแอป</string> + <string name="integration_wifi">ชื่อ Wi-Fi</string> + <string name="integration_brightness">ความสว่าง</string> + <string name="integration_home">DroidDeck เป็นหน้าหลัก</string> + <string name="integration_shortcuts">ทางลัดปุ่มหน้าหลัก</string> + <string name="integration_wifi_hint">แสดงเครือข่ายใน Steam · ต้องใช้สิทธิ์ตำแหน่ง ไม่มีการติดตาม</string> + <string name="integration_wifi_on">เครือข่ายแสดงใน Steam</string> + <string name="integration_wifi_location_off">ตำแหน่งปิดอยู่</string> + <string name="integration_wifi_denied">ปฏิเสธตำแหน่ง · อนุญาตในข้อมูลแอป</string> + <string name="integration_brightness_hint">แถบเลื่อนของ Steam ปรับความสว่างหน้าจอ</string> + <string name="integration_home_hint">ปุ่มหน้าหลักเปิดเมนู Steam ในเซสชัน</string> + <string name="integration_shortcuts_hint">กดปุ่มหน้าหลักค้างไว้เพื่อใช้คอร์ด Steam Guide</string> + <string name="integration_shortcuts_needs_home">ต้องตั้ง DroidDeck เป็นหน้าหลัก</string> + <string name="integration_shortcuts_maybe_restricted">เป็นสีเทาใน Android? ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด</string> + <string name="integration_shortcuts_restricted">ถูกบล็อกโดย Android · ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด</string> + <string name="integration_shortcuts_service">ปุ่มหน้าหลัก DroidDeck</string> + <string name="integration_shortcuts_service_description">ส่งการกดปุ่มหน้าหลักไปยัง Steam Guide ขณะเซสชัน Steam อยู่ในโฟกัสและ DroidDeck เป็นแอปหน้าหลักเริ่มต้น ไม่อ่านเนื้อหาบนหน้าจอ</string> + <string name="integration_brightness_needed">เปิดความสว่างในการตั้งค่า → การผสานรวม Steam</string> + <string name="apps_search_hint">ค้นหาแอป</string> + <string name="apps_no_match">ไม่มีแอปที่ตรงกับ “%1$s”</string> + <string name="apps_add_widget">เพิ่มวิดเจ็ต</string> + <string name="apps_widgets_loading">กำลังโหลดวิดเจ็ต…</string> + <string name="apps_widgets_none">ไม่มีแอปในอุปกรณ์นี้ที่มีวิดเจ็ต</string> + <string name="apps_widget_wider">กว้างขึ้น</string> + <string name="apps_widget_narrower">แคบลง</string> + <string name="apps_widget_taller">สูงขึ้น</string> + <string name="apps_widget_shorter">เตี้ยลง</string> + <string name="apps_widget_move_earlier">ย้ายไปก่อน</string> + <string name="apps_widget_move_later">ย้ายไปหลัง</string> + <string name="apps_widget_configure">การตั้งค่าวิดเจ็ต</string> + <string name="apps_widget_remove">นำวิดเจ็ตออก</string> + <string name="apps_add_to_folder">เพิ่มลงในโฟลเดอร์</string> + <string name="apps_new_folder">โฟลเดอร์ใหม่</string> + <string name="apps_remove_from_folder">นำออกจากโฟลเดอร์</string> + <string name="apps_app_info">ข้อมูลแอป</string> + <string name="apps_uninstall">ถอนการติดตั้ง</string> + <string name="apps_folder_rename">เปลี่ยนชื่อ</string> + <string name="apps_folder_ungroup">ยกเลิกกลุ่ม</string> + <string name="apps_folder_default">โฟลเดอร์</string> + <string name="apps_folder_name">ชื่อโฟลเดอร์</string> + <string name="apps_filter">แสดง</string> + <string name="apps_filter_all">แอปทั้งหมด</string> + <string name="apps_filter_games">เกม</string> + <string name="apps_filter_downloaded">ที่ดาวน์โหลด</string> + <string name="apps_filter_system">ระบบ</string> + <string name="apps_filter_hidden">ที่ซ่อนไว้</string> + <string name="apps_hide">ซ่อน</string> + <string name="apps_unhide">แสดงในแอป</string> + <string name="apps_shortcut_remove">นำทางลัดออก</string> + <string name="apps_pin_title">เพิ่มลงในแอป</string> + <string name="apps_pin_add">เพิ่ม</string> + <string name="apps_hidden_none">ไม่มีแอปที่ซ่อนไว้</string> + <string name="apps_sort_name_asc">ชื่อ A–Z</string> + <string name="apps_sort_name_desc">ชื่อ Z–A</string> + <string name="apps_sort_installed">ติดตั้งล่าสุด</string> + <string name="apps_sort_updated">อัปเดตล่าสุด</string> + <plurals name="apps_count"> + <item quantity="other">%d แอป</item> + </plurals> + <string name="desktop_restore_title">กำลังกู้คืนซอฟต์แวร์ของคุณ</string> + <string name="desktop_restore_body">กำลังติดตั้งแอปที่คุณเพิ่มไว้อีกครั้งหลังการอัปเดต DroidDeck</string> + <string name="desktop_restore_done_title">กู้คืนซอฟต์แวร์แล้ว</string> + <string name="desktop_restore_done_body">แอปที่คุณเพิ่มไว้ติดตั้งกลับมาแล้ว</string> + <string name="desktop_restore_failed_title">กู้คืนซอฟต์แวร์บางส่วนไม่ได้</string> + <string name="desktop_restore_failed_body">ดู ~/.cache/droiddeck/apt-restore.log แล้วลองใช้ sudo apt install ใน Konsole</string> + <string name="gog_full_files">การปรับแต่งแบบเนทีฟใช้งานไม่ได้ การดาวน์โหลดมีไฟล์ทดแทนแบบสมบูรณ์</string> + <string name="gog_recover">ตรวจสอบผลลัพธ์แพตช์</string> + <string name="slow_usb_title">การเชื่อมต่อ USB ช้า</string> + <string name="slow_usb_cable">%1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) เกมในไดรฟ์นี้จึงโหลดช้า ใช้สาย USB 3 ที่รองรับ 5 Gbps ขึ้นไป ลองกลับด้านหัว USB-C หรือใช้ไดรฟ์ที่เร็วกว่า</string> + <string name="slow_usb_port">%1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) พอร์ต USB ของอุปกรณ์นี้เร็วกว่านี้ไม่ได้ เกมจึงโหลดช้า ที่เก็บข้อมูลภายในหรือการ์ด microSD อาจเร็วกว่า</string> + <string name="slow_usb_never">ไม่ต้องแสดงอีก</string> + <string name="slow_usb_dismiss">ปิด</string> + <string name="steam_import_title">รีสตาร์ต Steam เพื่อเพิ่มเกมของคุณหรือไม่</string> + <string name="steam_import_body">Steam แสดงเกมที่คุณเป็นเจ้าของเหล่านี้ว่าติดตั้งแล้วได้: %1$s ต้องรีสตาร์ตเพื่อให้แสดง รีสตาร์ตเลย หรือเกมจะถูกเพิ่มเมื่อ Steam เริ่มครั้งถัดไป</string> + <string name="steam_import_names_more">%1$s และอีก %2$d เกม</string> + <string name="steam_import_now">รีสตาร์ตเลย</string> + <string name="steam_import_later">ภายหลัง</string> + <string name="gog_maintenance">จัดการการติดตั้ง GOG</string> + <string name="gog_check">ตรวจหาอัปเดต</string> + <string name="gog_repair">ตรวจสอบ/ซ่อมแซม</string> + <string name="gog_patches">แพตช์ออฟไลน์</string> + <string name="gog_refresh">ดาวน์โหลดตัวติดตั้งออฟไลน์แบบเต็ม</string> + <string name="gog_update">อัปเดตเป็น %1$s</string> + <string name="gog_resume">ดำเนินการบำรุงรักษา GOG ต่อ</string> + <string name="gog_open_patch">เปิดตัวติดตั้งแพตช์</string> + <string name="gog_patch_in_session">ทำตัวติดตั้งแพตช์ให้เสร็จหรือยกเลิกในเซสชัน Linux</string> + <string name="gog_patch_requirements">เลือกแพตช์สำหรับเวอร์ชันและภาษาที่คุณติดตั้งไว้ เวอร์ชันต้นทางที่รองรับอาจไม่ได้แสดงในรายการ</string> + <string name="gog_no_patches">GOG ไม่มีแพตช์ Windows แบบแยกสำหรับเกมนี้</string> + <string name="gog_managed_files">ไฟล์เกมที่ถูกแก้ไขอาจถูกแทนที่</string> + <string name="gog_patch_installer_note">ตัวติดตั้งจะเปิดในเซสชัน Linux ของคุณ</string> + <string name="gog_download_label">ดาวน์โหลด</string> + <string name="gog_space_label">พื้นที่เพิ่มเติม</string> + <string name="gog_space_estimate_label">พื้นที่โดยประมาณ</string> + <string name="gog_repair_action">ซ่อมแซมไฟล์</string> + <string name="gog_refresh_action">รีเฟรชการติดตั้ง</string> + <string name="gog_select_patch">เลือก</string> + <string name="setup_all_files">การเข้าถึงไฟล์ทั้งหมด</string> + <string name="setup_local_network">เครือข่ายภายใน</string> + <string name="libraries_title">คลัง Steam เพิ่มเติม</string> + <string name="libraries_hint">โฟลเดอร์ที่ Steam ใช้ติดตั้งและเรียกใช้เกม โดยแต่ละโฟลเดอร์มีชื่อของตนเอง การนำออกจากรายการจะยังคงเก็บเกมไว้บนดิสก์</string> + <string name="libraries_add">เพิ่มคลัง</string> + <string name="libraries_rename_title">ชื่อคลัง</string> + <string name="libraries_pick">เลือกโฟลเดอร์สำหรับคลัง</string> + <string name="libraries_full">เพิ่มได้สูงสุด %1$d คลัง</string> + <string name="libraries_overlap">โฟลเดอร์นี้เป็นคลังอยู่แล้วหรืออยู่ภายในคลัง</string> + <string name="libraries_missing">%1$s · ไม่พร้อมใช้งาน</string> + <string name="libraries_applies_next">มีผลตั้งแต่เซสชัน Steam ถัดไป</string> + <string name="bottom_desktop_start">เริ่มเดสก์ท็อป</string> + <string name="bottom_desktop_mode_touch">สัมผัสโดยตรง</string> + <string name="bottom_desktop_trackpad">แทร็กแพด แตะเพื่อเปลี่ยนเป็นสัมผัสโดยตรง</string> + <string name="bottom_desktop_direct_touch">สัมผัสโดยตรง แตะเพื่อเปลี่ยนเป็นแทร็กแพด</string> + <string name="bottom_desktop_starting">กำลังเริ่มเดสก์ท็อป KDE…</string> + <string name="bottom_desktop_ended">เดสก์ท็อปปิดแล้ว</string> + <string name="bottom_desktop_failed">เริ่มเดสก์ท็อปไม่ได้ บันทึกอยู่ในโฟลเดอร์ bottom-desktop ของเซสชันนี้</string> + <string name="bottom_desktop_off">เดสก์ท็อปปิดอยู่</string> + <string name="libraries_rename">เปลี่ยนชื่อ</string> + <string name="second_mode_desktop">เดสก์ท็อป</string> + <string name="bottom_desktop_mode_trackpad">แทร็กแพด</string> + <string name="bottom_desktop_title">เดสก์ท็อป · %1$s</string> </resources> diff --git a/app/src/main/res/values-tr/gestures.xml b/app/src/main/res/values-tr/gestures.xml index 92ca99e01..df0186b2e 100644 --- a/app/src/main/res/values-tr/gestures.xml +++ b/app/src/main/res/values-tr/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Hareketler</string> <string name="gesture_settings">Dokunmatik hareket ayarları</string> - <string name="gesture_settings_hint">Fare ve klavye hareketlerini özelleştirin. Kullanmak için dokunma modu olarak Hareketler\'i seçin.</string> <string name="gesture_tap">Dokunma</string> <string name="gesture_drag">Tek parmakla sürükleme</string> <string name="gesture_long_press">Uzun basma</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Üç parmakla basılı tutma</string> <string name="gesture_pinch">İki parmakla yakınlaştırma</string> <string name="gesture_hold_button">Düğmeyi basılı tut</string> + <string name="gesture_hold_left">Sol düğmeyi basılı tut</string> + <string name="gesture_hold_right">Sağ düğmeyi basılı tut</string> <string name="gesture_click_once">Bir kez tıkla</string> <string name="gesture_hold_delay">Basılı tutma gecikmesi</string> <string name="gesture_double_delay">Çift dokunma aralığı</string> diff --git a/app/src/main/res/values-tr/shortcuts.xml b/app/src/main/res/values-tr/shortcuts.xml new file mode 100644 index 000000000..b279d0a04 --- /dev/null +++ b/app/src/main/res/values-tr/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Fiziksel düğme kısayolları</string> + <string name="shortcuts_dd_menu">DroidDeck menüsü</string> + <string name="shortcuts_capture">Ata: %1$s</string> + <string name="shortcuts_press">Bir düğmeye basıp bırakın. Atama otomatik olarak kaydedilir.</string> + <string name="shortcuts_release">Devam etmek için düğmeyi bırakın.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Bu düğme zaten şuna atanmış: %1$s</string> + <string name="shortcuts_save">Yeniden ata</string> + <string name="shortcuts_retry">Başka düğme dene</string> + <string name="shortcuts_limitations">Ana ekran düğmesi ve bazı ek düğmeler kullanılamayabilir.</string> +</resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 24fc12e92..edf9063de 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 için VKD3D seçenekleri. nodxr ışın izlemeyi kapatır; yalnızca buna ihtiyaç duyan bir oyunda kullanın.</string> <string name="game_env_proton_log">Proton tanılama günlüğü için 1 olarak ayarlayın. Günlük kaydı performansı düşürebilir ve depolama alanı kullanır.</string> <string name="game_env_wined3d">D3D9–11 uyumluluk testi için DXVK yerine OpenGL tabanlı WineD3D kullanmak üzere 1 olarak ayarlayın.</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 ve WineD3D ile çalışan oyunlar için oluşturucu. Vulkan, Zink üzerinden OpenGL yolunu atlar ve Adreno\'da eski DirectDraw ve Direct3D 7 oyunlarında çok daha hızlıdır.</string> + <string name="game_env_dxvk_d3d8">Direct3D 8\'i WineD3D yerine DXVK ile çalıştırmak için 1 yapın. Adreno\'da AIO Graphics Test\'in Direct3D 8 testinde daha hızlıdır.</string> <string name="game_env_no_ntsync">Bu oyunda ntsync\'i (droiddeck-ntsync veya çekirdek sürücüsü) kapatmak için 1 olarak ayarlayın; paket varsa droiddeck-esync, yoksa droiddeck-fsync kullanılır.</string> <string name="game_env_no_esync">Bu oyunda droiddeck-esync\'i kapatmak için 1 olarak ayarlayın; yerine droiddeck-fsync, fsync de kapalıysa droiddeck-ntsync kullanılır.</string> <string name="game_env_no_fsync">Bu oyunda droiddeck-fsync\'i kapatmak için 1 olarak ayarlayın; paket varsa droiddeck-esync, yoksa droiddeck-ntsync kullanılır.</string> <string name="game_env_fsync_first">Bu oyunu droiddeck-fsync ile çalıştırmak için 1, Proton sürümüne uyan bir paket varsa droiddeck-esync\'i öne almak için 0 olarak ayarlayın.</string> <string name="game_env_xalia">Bu oyunda Proton’un kumandayla gezinme yardımcısını kapatmak için 0 olarak ayarlayın.</string> + <string name="game_env_anticheat_offline">Varsayılan olarak açık. Oyun çevrimdışı oynamayı destekliyorsa Easy Anti-Cheat oyununu hile önleyicisi olmadan başlatır. Her zamanki gibi Easy Anti-Cheat üzerinden başlatmak için kapatın. Easy Anti-Cheat gerektiren çevrimiçi modlar kullanılamaz.</string> <string name="game_env_hud">D3D9–11 için DXVK katmanı. fps kare hızını gösterir; boş bırakılırsa gizlenir.</string> <string name="game_env_dxvk_config">Noktalı virgülle ayrılmış DXVK ayarları. Yeni sürümler kare sınırlama için dxvk.maxFrameRate kullanır; normal oyun için oturumun kare sınırlayıcısını tercih edin.</string> + <string name="game_env_cores">Oturumun oyun çekirdekleri yerine bu oyun için CPU çekirdekleri, örneğin 0-4 veya 0,2,4. Daha az çekirdek daha serin çalışır.</string> <string name="game_env_vkd3d_limit">D3D12 kare hızı sınırı. 0 sınırı kaldırır.</string> <string name="game_env_glthread">Mesa OpenGL iş parçacığı kullanımı. true, CPU sınırlı OpenGL oyunlarına yardımcı olabilir; her oyunda ayrı deneyin.</string> <string name="sync_backend_title">Wine senkronizasyonu</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX, x86 Linux programlarını bu ARM64 cihazda çalıştırır. Otomatik, program x86 için derlenmişse FEX\'i kullanır.</string> <string name="app_fex_x86">FEX ile %1$s</string> <string name="app_fex_not_ready">Bu program %1$s PC\'ler için derlenmiş ve FEX ile çalışır, ancak FEX henüz kurulmadı. Oturum açmışken Steam\'i bir kez açın: DroidDeck, FEX\'i ve gereken Steam Linux Runtime\'ı indirtir, ardından bu program açılır.</string> + <string name="session_proot_missing">DroidDeck\'in proot\'u indirilemedi. Bağlantıyı kontrol edip tekrar deneyin. Yedek proot oynamak için fazla yavaş olduğundan oturum başlatılmadı.</string> + <string name="session_directaudio_missing">DirectAudio indirilemedi, bu yüzden oyun sesi bu oturumda daha yavaş yolu kullanıyor.</string> <string name="session_end_program">Bu program</string> <string name="session_end_steam_download">Steam istemcisi indirilemedi. Ağınız veya VPN\'iniz Steam sunucularını engelliyor olabilir; bağlantıyı kontrol edip yeniden deneyin.</string> <string name="session_end_steam_setup">Steam istemcisi kurulamadı. Bağlantınızı ve boş depolama alanını kontrol edip yeniden deneyin.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 kumandası</string> <string name="mode_controller_note">Deck: Hızlı Erişim düğmesi ve jiroskop. Steam Controller: aynısı, ayrıca arka düğmelerde kavrama algılama. DualShock 4 ve DualSense: jiroskop; dokunmatik yüzeyler kumandanın dokunmatik paneli olur. Xbox 360: Hızlı Erişim\'i Guide+A ile açın.</string> <string name="mode_back">Geri</string> + <string name="back_hold">Steam kısayolları için Geri\'yi basılı tut</string> + <string name="back_hold_hint">Geri\'yi basılı tutmak Hızlı Erişim\'i açar veya diğer düğmelerle Steam kombinasyonları yapar. Basılı tutmayı yok saymak için kapatın; dokunma ve çift dokunma çalışmaya devam eder.</string> + <string name="back_native_qam_hint">Steam kısayolları için Geri\'yi 700 ms basılı tutun veya Geri\'yi basılı tutup başka bir düğmeye basın.</string> + <string name="back_double_tap_window">Çift dokunma aralığı</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Parlaklık denetimine izin ver</string> + <string name="brightness_permission_text">Parlaklık denetimini DroidDeck\'te ayarlayın.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Oturum</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Güncel · %1$s</string> <string name="mode_decky_loader">Yükleyici</string> <string name="mode_decky_install_latest">En yenisini yükle</string> + <string name="decky_channel">Güncelleme kanalı</string> + <string name="decky_channel_hint">Hangi Decky Loader sürümlerinin yükleneceği. Decky\'nin kendi güncelleyicisi de aynı kanalı kullanır.</string> + <string name="decky_channel_stable">Kararlı</string> + <string name="decky_channel_prerelease">Ön sürüm</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Decky güncelleme kanalı kaydedilemedi</string> <string name="mode_decky_on">Steam ile başlar. Açıkken bu cihazdaki diğer uygulamalar Steam\'i kontrol edebilir.</string> <string name="mode_decky_off">Kapalı. Steam\'in uzaktan hata ayıklama bağlantı noktası kapalı kalır.</string> <string name="mode_decky_remove_title">Decky Loader kaldırılsın mı?</string> @@ -307,6 +342,10 @@ <string name="mode_client">İstemci</string> <string name="mode_mangoapp">Performans katmanı</string> <string name="mode_mangoapp_hint">Oyunlar Deck modunda çökerse veya ekran kararırsa kapatın. Sonraki oturumda uygulanır.</string> + <string name="mode_return_after_game">Oyundan sonra DroidDeck\'e dön</string> + <string name="mode_return_after_game_hint">DroidDeck\'ten veya başka bir başlatıcıdan açtığınız oyun kapandığında Steam düzgünce kapanır (önce bulut kayıtları tamamlanır) ve oraya geri dönersiniz. Kapalı: Steam\'de kal.</string> + <string name="mode_shader_precache">Gölgelendirici ön önbelleği</string> + <string name="mode_shader_precache_hint">Steam oyunlarınız için önceden derlenmiş gölgelendiricileri indirir ve arka planda işler, böylece oyunlar daha az takılır. Kapalıyken veri, depolama ve pil tasarrufu sağlanır; oyunlar gölgelendiricileri oynarken derler. Steam\'in İndirmeler > Gölgelendirici Ön Önbelleği ayarıyla aynıdır. Sonraki oturumda uygulanır.</string> <string name="mode_steam_repair">Steam istemcisini onar</string> <string name="mode_steam_repair_hint">Steam bir sonraki başlatıldığında Steam istemcisini yeniden indirir. Steam yükleme ekranında takılı kalırsa kullanın. Oyunlar, oturum bilgileri ve ayarlar korunur.</string> <string name="mode_steam_repair_queued">Steam istemcisi, Steam bir sonraki başlatıldığında yeniden indirilecek.</string> @@ -374,6 +413,8 @@ <string name="mode_directaudio_hint">Daha düşük gecikme için PulseAudio\'yu atlar.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Sesli sohbet için.</string> + <string name="drawer_mic_hint">Bu oturum için mikrofon kaydını açın veya kapatın.</string> + <string name="drawer_mic_failed">Mikrofon değiştirilemedi. Lütfen tekrar deneyin.</string> <string name="mode_network">Ağ</string> <string name="mode_wifi_discovery">Wi-Fi keşfi</string> <string name="mode_wifi_discovery_hint">Steam\'de Wi-Fi adlarını ve yakındaki ağları göster.</string> @@ -535,14 +576,24 @@ <string name="perf_gsrealtime">gamescope: gerçek zamanlı GPU kuyruğu</string> <string name="perf_gsrealtime_hint">Bileştiricinin GPU işine öncelik verir. Oyunlardan biraz feda ederek kare zamanlamasını yumuşatabilir.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Bellek</string> + <string name="perf_cap_off">Kapalı</string> + <string name="perf_cap_auto">Sürücü varsayılanı</string> + <string name="perf_zram_client">Oyun çalışırken Steam\'i sıkıştır</string> + <string name="perf_zram_client_hint">Oyun başladıktan 20 sn sonra oyuna daha fazla bellek kalması için Steam istemcisi zRAM\'e sıkıştırılır ve oyun kapanınca geri okunur. Oyunlar başladıktan kısa süre sonra oturum kapanıyorsa bunu kapatın. Yukarıdaki RAM sınırı, oturum onu aştığında Steam\'i yine sıkıştırır.</string> + <string name="perf_ram_cap">RAM sınırı</string> + <string name="perf_ram_cap_hint">Steam istemcisi Steam oturumunda veya masaüstünden çalışırken uygulanır. Oturum bundan fazlasını kullandığında önce Steam, ardından oturumun desteklenen diğer işlemleri zRAM\'e sıkıştırılır. Yumuşak bir sınırdır: hiçbir şey kapatılmaz, ancak sayfalar geri yüklenirken oyunlar takılabilir.</string> + <string name="perf_ram_cap_unavailable">Bu cihazda olmayan zRAM takası gerekir.</string> + <string name="perf_vram_cap">VRAM sınırı</string> + <string name="perf_vram_cap_hint">DXVK\'nin Direct3D oyunlarına bildirdiği video belleği; böylece oyunlar dokuları daha az belleğe göre ayarlar. Oyunun kendi DXVK ayarları yine önceliklidir. Sonraki oturumda geçerli olur.</string> <string name="perf_gpuclock">GPU\'yu en yüksek saat hızında tut</string> <string name="perf_gpuclock_hint">Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma.</string> <string name="perf_fixes">Oturum düzeltmeleri</string> <string name="perf_sysmem">Turnip: sysmem işleme</string> <string name="perf_sysmem_hint">Steam istemcisi için daha hızlı; oyunlarda sürücü her geçişte döşeme tabanlı veya sistem belleğinde işlemeyi seçer. Adreno 710/720/722\'de gereklidir.</string> <string name="perf_xalia">Steam\'in xalia yardımcısını atla</string> - <string name="perf_fastsync">droiddeck-ntsync (deneysel)</string> - <string name="perf_fastsync_hint">Linux ntsync sürücüsünün test amaçlı, kullanıcı alanında çalışan bir yedeği. Açıkken Proton, droiddeck-esync ve droiddeck-fsync yerine bunu kullanır. Proton Experimental ARM64, GE-Proton ve proton-cachyos ile çalışır. Sonraki oturumda uygulanır.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Linux ntsync sürücüsünün kullanıcı alanında çalışan bir yedeği. Açıkken Proton, droiddeck-esync ve droiddeck-fsync yerine bunu kullanır. Proton Experimental ARM64, GE-Proton ve proton-cachyos ile çalışır. Sonraki oturumda uygulanır.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">Önce droiddeck-fsync</string> <string name="perf_fsync_hint">Proton\'un kendi fsync\'ini standart Proton dosyalarıyla, futex_waitv kullanıcı alanında sağlanarak çalıştırır; bu yüzden paket gerektirmez ve Steam Proton\'u güncellediği anda da çalışmaya devam eder. Açıkken oyunlar, Proton\'un fsync dışında tuttuğu birkaç oyun hariç, bunu droiddeck-esync\'ten önce kullanır. Sonraki oturumda uygulanır.</string> @@ -553,6 +604,8 @@ <string name="perf_fastpath">proot hızlı yolu</string> <string name="perf_fastpath_needs_seccomp">proot\'un seccomp filtresi gerekir.</string> <string name="perf_fastpath_hint">Daha hızlı dosya aramaları ve daha az takılma. Bir program dosyalarını bulamıyorsa kapatın.</string> + <string name="perf_cursor_composite">İmleci gamescope içinde çiz</string> + <string name="perf_cursor_composite_hint">Gamescope işaretçiyi Android\'e bırakmak yerine kendisi çizer. Kumandayla yönetilen imleç için açın. Telefonda kapalıyken daha hızlıdır. Sonraki oturumda uygulanır.</string> <string name="perf_identity">Oturum kimliği</string> <string name="perf_hostname">Ana bilgisayar adı</string> <string name="perf_hostname_hint">Steam\'in bu cihaz için gördüğü ad. Boş bırakılırsa %1$s geri yüklenir.</string> @@ -567,6 +620,8 @@ <string name="driver_delete_plain">Dosyaları uygulamadan kaldırılır.</string> <string name="driver_delete_in_use">Dosyaları kaldırılır. Kullanımda olduğu için varsayılan devreye girer.</string> <string name="drawer_page_display">Ekran</string> + <string name="drawer_frame_limit">Kare sınırı</string> + <string name="drawer_frame_limit_note">Bu oyunu sınırlar. Ekran, varsa sınırın tam böldüğü bir yenileme hızına geçer; diğer sınırlar düzensiz görünebilir. Steam oyunları Hızlı erişim menüsündeki Steam\'in Kare Sınırı ayarını kullanır.</string> <string name="drawer_page_effects">Efektler</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Bileşenler</string> @@ -591,6 +646,66 @@ <string name="drawer_hud_color_amber">Kehribar</string> <string name="drawer_hud_color_violet">Mor</string> <string name="drawer_hud_opacity">Opaklık</string> + <string name="hud_size">Boyut</string> + <string name="hud_size_hint">HUD\'a dokunmak da boyutunu değiştirir.</string> + <string name="hud_size_full">Tam</string> + <string name="hud_size_tiles">Kutucuklar</string> + <string name="hud_size_pill">Hap</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Şerit</string> + <string name="hud_locked">Yerinde kilitle</string> + <string name="hud_locked_hint">Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder.</string> + <string name="hud_snap">Yanlara yapıştır</string> + <string name="hud_snap_hint">HUD\'u bıraktığınızda ekranın daha yakın tarafına gider. Hızlı bir kaydırma onu o yöne fırlatır.</string> + <string name="hud_group_look">Görünüm</string> + <string name="hud_scale">Ekrandaki boyut</string> + <string name="hud_color_soft">Yumuşak</string> + <string name="hud_color_mid">Orta</string> + <string name="hud_color_vivid">Canlı</string> + <string name="hud_outline">Dış hat</string> + <string name="hud_outline_color">Dış hat rengi</string> + <string name="hud_outline_gray">Gri</string> + <string name="hud_outline_theme">Tema rengi</string> + <string name="hud_group_metrics">Ölçümler</string> + <string name="hud_metric_graph">Kare süresi grafiği</string> + <string name="hud_metric_decimal">Ondalıklı kare hızı</string> + <string name="hud_metric_low001" formatted="false">0.01% en düşük</string> + <string name="hud_metric_engine">Grafik motoru</string> + <string name="hud_metric_gpu_model">GPU adı</string> + <string name="hud_metric_gpu">GPU yükü</string> + <string name="hud_metric_gpu_temp">GPU sıcaklığı</string> + <string name="hud_metric_cpu">CPU yükü</string> + <string name="hud_metric_per_core">Çekirdek başına CPU</string> + <string name="hud_metric_temp">Sıcaklıklar</string> + <string name="hud_metric_ram">Bellek</string> + <string name="hud_metric_vram">Grafik belleği</string> + <string name="hud_metric_swap">Takas alanı</string> + <string name="hud_metric_battery">Pil seviyesi</string> + <string name="hud_metric_power">Güç tüketimi</string> + <string name="hud_metric_network">Ağ</string> + <string name="hud_metric_resolution">Çözünürlük</string> + <string name="hud_metric_proton">Proton sürümü</string> + <string name="hud_metric_session">Oturum süresi</string> + <string name="hud_metric_clock">Saat</string> + <string name="hud_group_temps">Sıcaklıklar</string> + <string name="hud_temp_unit">Birim</string> + <string name="hud_temp_bands">Uyarı renkleri</string> + <string name="hud_temp_bands_hint">Sıcaklıklar sınıra yaklaştıkça önce kehribar, sonra kırmızı olur.</string> + <string name="hud_temp_bands_off">Kapalı</string> + <string name="hud_temp_bands_auto">Otomatik</string> + <string name="hud_temp_bands_manual">Manuel</string> + <string name="hud_temp_red_cpu">CPU kırmızı eşiği</string> + <string name="hud_temp_red_gpu">GPU kırmızı eşiği</string> + <string name="hud_temp_red_battery">Pil kırmızı eşiği</string> + <string name="hud_group_more">Daha fazla</string> + <string name="hud_export">HUD tanılaması</string> + <string name="hud_export_hint">HUD\'un okuduğu her sensörün raporunu Downloads/DroidDeck klasörüne kaydeder.</string> + <string name="hud_export_button">Kaydet</string> + <string name="hud_export_done">%1$s konumuna kaydedildi</string> + <string name="hud_export_failed">HUD raporu kaydedilemedi.</string> + <string name="hud_reset">HUD ayarlarını sıfırla</string> + <string name="hud_reset_button">Sıfırla</string> <string name="drawer_scaling">Ölçekleme modu</string> <string name="drawer_scaling_sharpness">Ölçekleme keskinliği</string> <string name="drawer_effects">Ekran efektleri</string> @@ -625,10 +740,14 @@ <string name="drawer_touch_auto">Otomatik (%1$s)</string> <string name="drawer_keyboard">Klavye</string> <string name="drawer_latency">Gecikme</string> + <string name="drawer_low_latency">Düşük gecikme modu</string> + <string name="drawer_low_latency_hint">CPU ve pil kullanımını artırır</string> <string name="drawer_low_latency_controller">Düşük gecikmeli kumanda</string> <string name="drawer_low_latency_controller_hint">Kumanda 250 Hz yerine 1000 Hz bildirir. CPU kullanımı biraz artar.</string> <string name="drawer_low_latency_touch">Düşük gecikmeli dokunma</string> <string name="drawer_low_latency_touch_hint">Dokunmalar kare gruplamasını atlar; Steam dokunmatik kontrolleri 1000 Hz çalışır. CPU kullanımı biraz artar.</string> + <string name="drawer_evdev_mouse">Ham fare kanalı</string> + <string name="drawer_direct_cursor">İmleç</string> <string name="drawer_pc_keyboard">PC klavyesi</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">İkinci ekran</string> @@ -715,6 +834,10 @@ <string name="setup_session">Oturum</string> <string name="setup_logs">Oturum günlükleri</string> <string name="setup_logs_hint">Her oturumdan sonra kaydedilir</string> + <string name="setup_game_debug_logs">Oyun hata ayıklama günlükleri</string> + <string name="setup_game_debug_logs_hint">Sonraki oyun başlatmada Proton, Wine ve grafik tanılamalarını ekler. Performansı düşürebilir ve daha fazla depolama kullanabilir.</string> + <string name="setup_game_debug_logs_restart">Oyun hata ayıklama günlüklerini kaydetmek için bu oturumu yeniden başlatın</string> + <string name="setup_logging_update_failed">Günlük kaydı güncellenemedi. Anahtarı kontrol edip tekrar deneyin.</string> <string name="setup_agent_commands">Hata ayıklama araçları</string> <string name="setup_latest_logs">Son oturum günlükleri</string> <string name="setup_saved_logs">Kayıtlı oturum günlükleri</string> @@ -739,12 +862,28 @@ <string name="setup_home_on">DroidDeck ana ekran uygulaması olabilir</string> <string name="setup_home_off">DroidDeck hiçbir zaman ana ekran uygulaması olarak sunulmaz</string> <string name="setup_orientation">Yön</string> + <string name="setup_launcher_orientation">Başlatıcı yönü</string> + <string name="setup_launcher_orientation_auto">Cihaz dönüşünü izle</string> + <string name="setup_orientation_portrait">Dikey</string> + <string name="setup_session_orientation">Oturum yönü</string> + <string name="setup_session_orientation_hint">Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; özel genişlik ve yükseklik girildiği gibi kalır.</string> <string name="setup_orientation_auto">Otomatik yatay</string> <string name="setup_orientation_landscape">Yatay</string> <string name="setup_orientation_reverse">Ters yatay</string> <string name="setup_fullscreen">Tam ekran</string> <string name="setup_fullscreen_on">Android durum ve gezinme çubuklarını gizler</string> <string name="setup_fullscreen_off">Android durum ve gezinme çubuklarını gösterir</string> + <string name="setup_dual_screen">Çift ekran</string> + <string name="setup_dual_screen_hint">Otomatik, dahili ikinci ekranı olan el konsollarında ikinci ekranı kullanır. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, her şeyi tek ekranda tutar.</string> + <string name="setup_dual_screen_auto">Otomatik</string> + <string name="setup_dual_screen_on">Açık</string> + <string name="setup_dual_screen_off">Kapalı</string> + <string name="setup_dual_screen_menu">Alt ekran menüsü</string> + <string name="setup_dual_screen_menu_hint">Bölümleri ve oyun içi menüyü ikinci ekrana taşır ve yazma orada yapılır, böylece üst ekran tam görünümü korur. L2 ve R2 bölümler arasında geçiş yapar.</string> + <string name="setup_dual_screen_controls">Oyunlarda alt ekran kontrolleri</string> + <string name="setup_dual_screen_controls_hint">Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar.</string> + <string name="dual_typing_title">Üst ekran için yazılıyor</string> + <string name="dual_typing_done">Bitti</string> <string name="setup_default_home">Varsayılan ana ekran uygulaması</string> <string name="setup_choose_home">Ana ekran uygulaması seçin</string> <string name="setup_choose">Seç</string> @@ -892,6 +1031,14 @@ <string name="gate_step1">Ayarlar → Geliştirici seçenekleri → Kablosuz hata ayıklama\'yı açın</string> <string name="gate_step2">“Eşleştirme koduyla cihaz eşle” seçeneğine dokunun</string> <string name="gate_step3">Kodu DroidDeck bildirimine yazın</string> + <string name="pairguide_build_number">Telefon hakkında bölümünde Derleme numarası\'na 7 kez dokunun</string> + <string name="pairguide_wireless">Kablosuz hata ayıklama\'yı açın</string> + <string name="pairguide_pair">Kablosuz hata ayıklama\'yı açın, ardından “Cihazı eşleme koduyla eşle”ye dokunun</string> + <string name="pairguide_child_process">“Alt işlem kısıtlamalarını devre dışı bırak” seçeneğini açın</string> + <string name="pairguide_row_child_process">Alt işlem kısıtlamalarını devre dışı bırak</string> + <string name="pairguide_row_build_number">Derleme numarası</string> + <string name="pairguide_row_wireless">Kablosuz hata ayıklama</string> + <string name="pairguide_row_pair">Cihazı eşleme koduyla eşle</string> <string name="gate_waiting">Eşleştirme açılır penceresi bekleniyor…</string> <string name="gate_code_needed">Açılır pencere bulundu. Kodunu bildirime girin.</string> <string name="gate_status">Durum</string> @@ -1015,8 +1162,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 +1169,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> @@ -1033,10 +1177,8 @@ <string name="games_never_played">Hiç oynanmadı</string> <string name="games_runtime_busy_percent">Çalışma ortamı meşgul · %1$d%%</string> <string name="games_runtime_busy">Çalışma ortamı meşgul</string> - <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> @@ -1051,6 +1193,9 @@ <string name="gpu_hide_other">Diğer GPU\'lara ait sürücüleri gizle</string> <string name="gpu_show_other">Diğer GPU\'lara ait sürücüleri göster</string> <string name="gpu_advanced">Gelişmiş</string> + <string name="gpu_ubwc_title">UBWC uyumluluğu</string> + <string name="gpu_ubwc_hint">Steam veya Android\'de şeritler ya da titreme görülürse Açık veya Kapalı\'yı deneyin. DroidDeck yeniden başlatıldıktan sonra iki sürücüye de uygulanır.</string> + <string name="gpu_ubwc_restart">Uygulamak için DroidDeck\'i yeniden başlatın.</string> <string name="gpu_set_with_display">Ekran sürücüsüyle birlikte ayarlanır: %1$s ikisini de taşır.</string> <string name="gpu_set_with_runtime">Çalışma ortamı sürücüsüyle birlikte ayarlanır: %1$s ikisini de taşır.</string> <string name="gpu_runtime_hint">Oyunlar ve masaüstü tarafından kullanılır.</string> @@ -1105,7 +1250,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> @@ -1165,6 +1310,9 @@ <string name="pip_not_ready">Pencere içinde pencere, oturum hazır olduğunda kullanılabilir.</string> <string name="pip_permission">Android ayarlarında DroidDeck için pencere içinde pencereye izin verin.</string> <string name="pip_unavailable">Android, pencere içinde pencereyi açamadı.</string> + <string name="game_more">Diğer</string> + <string name="game_edit_art">Görseli düzenle</string> + <string name="stores_in_steam_label">Steam\'de</string> <string name="game_shortcut">Kısayol</string> <string name="game_shortcut_add">Ana ekrana ekle</string> <string name="game_shortcut_choose">Oyun seç</string> @@ -1188,6 +1336,10 @@ <string name="main_wait_runtime">Çalışma ortamı işleminin bitmesini bekleyin</string> <string name="main_wait_proton_install">Uyumluluk aracı yüklemesinin bitmesini bekleyin</string> + <string name="load_compat_title">Uyumluluk araçları hazırlanıyor</string> + <string name="load_compat_wait">Uyumluluk kurulumunun bitmesi bekleniyor</string> + <string name="load_compat_hint">Kurulum bitince oturumunuz başlayacak.</string> + <string name="load_compat_progress">%1$s · %%%2$d</string> <string name="main_wait_desktop_install">Masaüstü uygulaması yüklemesinin bitmesini bekleyin</string> <string name="main_wait_install_game">Oyun başlatmadan önce yüklemenin bitmesini bekleyin</string> <string name="main_saves_close_session">Önce Steam oturumunu kapatın; böylece oyun, içe aktarılan kayıtların üzerine yazamaz</string> @@ -1224,6 +1376,9 @@ <string name="main_install_anyway">Yine de yükle</string> <string name="main_remove_runtime_title">Linux çalışma ortamını kaldır</string> <string name="main_remove_runtime_text">Bu işlem çalışma ortamını, içindeki Steam istemcisini ve oraya yüklenen tüm oyunları siler.</string> + <string name="runtime_actions_title">Linux çalışma zamanı</string> + <string name="runtime_actions_text">Onarma, çalışma zamanının sistem dosyalarını yeniden yükler; Steam, oyunlarınız ve ayarlarınız korunur. Masaüstü gibi ekler bir sonraki kullanımda yeniden yüklenir. Kaldırma her şeyi siler.</string> + <string name="runtime_repair">Çalışma zamanını onar</string> <string name="main_applied">Uygulandı: %1$s</string> <string name="android_app_open_failed_primary">%1$s birincil ekranda açılamadı</string> <string name="android_app_open_failed_on">%1$s, %2$s üzerinde açılamadı</string> @@ -1353,6 +1508,11 @@ <string name="session_runtime_catalog_unreachable">Çalışma ortamı kataloğuna ulaşılamadı. Bağlantıyı kontrol edip yeniden Oyna\'ya basın.</string> <string name="session_runtime_install_failed">Linux çalışma ortamı yüklenmedi. Kurulum bölümünde çalışma ortamını kontrol edip yeniden Oyna\'ya basın.</string> <string name="session_desktop_install_failed">Masaüstü yüklenmedi (%1$s). Bağlantıyı kontrol edip yeniden Masaüstü\'ne basın.</string> + <string name="session_package_resume_failed">Yarıda kalan bir yükleme tamamlanamadı (%1$s). Bağlantıyı ve boş alanı kontrol edip tekrar deneyin.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux çalışma zamanı hasarlı: %1$d kitaplık bağlantısı eksik bir dosyayı gösteriyor (%2$s); genellikle yarıda kalan bir yüklemeden sonra olur. Onarma oyunlarınızı ve ayarlarınızı korur.</item> + <item quantity="other">Linux çalışma zamanı hasarlı: %1$d kitaplık bağlantısı eksik dosyaları gösteriyor (%2$s ve diğerleri); genellikle yarıda kalan bir yüklemeden sonra olur. Onarma oyunlarınızı ve ayarlarınızı korur.</item> + </plurals> <string name="session_ended_named">%1$s beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> <string name="session_ended_program">Program beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> <string name="session_ended_desktop">Masaüstü beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> @@ -1367,6 +1527,13 @@ <string name="mode_decky_plugins_hint">Sonraki Steam oturumu için bir eklenti ZIP dosyası yükleyin.</string> <string name="mode_decky_plugin_downloading">İndiriliyor…</string> <string name="mode_decky_plugin_install_zip">ZIP dosyasından yükle</string> + <string name="decky_zip_warning_title">Üçüncü Taraf Eklenti Yükleme</string> + <string name="decky_zip_warning_text">Decky Loader ekibi bu eklentiyi incelemedi. Steam hesabınızı çalmaya veya cihazınıza zarar vermeye yönelik yazılımlar gibi kötü amaçlı yazılımlar içerebilir. Bu eklentiyi yükleyerek cihazınızla ilgili tüm riskleri üstlendiğinizi kabul edersiniz.</string> + <string name="decky_zip_warning_continue">Devam et</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Lütfen %1$d saniye bekleyin</item> + <item quantity="other">Lütfen %1$d saniye bekleyin</item> + </plurals> <string name="store_cat_games">Oyunlar</string> <string name="store_cat_audio_video">Ses ve Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1395,6 +1562,10 @@ <string name="theme_icon_blue_detail">Siyah zemin, beyaz yazı; seçilen, odaklanan veya basılan her şey için mavi.</string> <string name="theme_electric">Elektrik laciverti</string> <string name="theme_electric_detail">Daha parlak mavi; gri yerine laciverte çalan yüzeylerde.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Gökkuşağında dolaşan renkler. Android\'in animasyon ayarlarına uyar.</string> + <string name="theme_rgb_speed">Hız</string> + <string name="theme_rgb_speed_hint">Renklerin ne kadar hızlı değiştiği.</string> <string name="theme_gradient">Geçiş</string> <string name="theme_gradient_detail">Kendi birincil ve ikincil renklerin, düğmelerde ve vurgularda harmanlanır.</string> <string name="theme_gradient_primary">Birincil</string> @@ -1516,7 +1687,16 @@ <string name="fm_conflict_skip">Atla</string> <string name="fm_select_this_folder">Bu klasörü seç</string> <string name="fm_back">Geri</string> + <string name="fm_exit">Çıkış</string> + <string name="fm_return_to_start">Başlangıç klasörüne dön</string> + <string name="fm_start_unavailable">Başlangıç klasörü artık kullanılamıyor</string> + <string name="fm_cancel_operation_title">İşlem iptal edilsin mi?</string> + <string name="fm_cancel_operation_confirmation">İşlem iptal edilecek. Emin misiniz?</string> + <string name="fm_accept">Kabul et</string> + <string name="fm_decline">Reddet</string> <string name="fm_drive_not_readable">%1$s bağlı ancak şu anda okunamıyor</string> + <string name="fm_drive_access_title">%1$s erişimine izin ver</string> + <string name="fm_drive_access_text">Android, DroidDeck\'in bu sürücüyü görmesine izin veriyor ama okumasına izin vermiyor. DroidDeck için Tüm dosyalara erişimi açın, sonra geri dönün.</string> <string name="fm_list_view">Liste görünümü</string> <string name="fm_grid_view">Izgara görünümü</string> <string name="fm_search">Ara</string> @@ -1588,6 +1768,93 @@ <string name="second_mode_keyboard_trackpad">Klavye + dokunmatik yüzey</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck tutamakları + dokunmatik yüzeyler</string> + <string name="second_mode_dashboard">Gösterge paneli</string> + <string name="bottom_dashboard_empty">Burada henüz gösterilecek bir şey yok.</string> + <string name="bottom_page_downloads">İndirmeler</string> + <string name="bottom_downloads_none">Devam eden indirme yok.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Gölgelendirici önbelleği indiriliyor</string> + <string name="bottom_downloads_paused">Duraklatıldı</string> + <string name="bottom_downloads_queued">Başlamayı bekliyor</string> + <string name="bottom_page_notifications">Bildirimler</string> + <string name="bottom_notifications_listener">DroidDeck alt ekranı</string> + <string name="bottom_notifications_why">Oynarken mesajları ve diğer bildirimleri burada görün. Yalnızca bu ekranda kalırlar ve kaydedilmezler. Android bunu bir kez sorar: bildirim erişimi sayfası bu ekranda açılır; orada DroidDeck\'i açın, bu sayfa kendiliğinden geri gelir.</string> + <string name="bottom_notifications_allow">Bildirim erişimine izin ver</string> + <string name="bottom_notifications_none">Bildirim yok.</string> + <string name="bottom_notifications_count">%1$d bildirim</string> + <string name="bottom_notifications_clear">Temizle</string> + <string name="bottom_page_screenshots">Ekran görüntüleri</string> + <string name="stats_fps_needs_hud">FPS için HUD açık olmalı</string> + <string name="stats_speed">Hız</string> + <string name="stats_pedals">Pedallar</string> + <string name="stats_gforce">G kuvveti</string> + <string name="stats_timing">Zamanlama</string> + <string name="stats_best_lap">En iyi tur</string> + <string name="stats_tires">Lastikler °C</string> + <string name="stats_trace">Gaz ve fren, son 10 s</string> + <string name="stats_speed_chart">Hız, %1$s</string> + <string name="stats_gear">Vites</string> + <string name="stats_speed_units">Hız birimi</string> + <string name="stats_speed_units_auto">Otomatik (%1$s)</string> + <string name="stats_steam_client_arm">Steam İstemcisi ARM</string> + <string name="stats_steam_client_x86">Steam İstemcisi x86</string> + <string name="stats_throttle">Gaz</string> + <string name="stats_brake">Fren</string> + <string name="stats_lights">Gösterge ışıkları</string> + <string name="stats_lamp_shift">Vites uyarısı</string> + <string name="stats_lamp_handbrake">El freni</string> + <string name="stats_lamp_pit">Pit hız sınırlayıcı</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Yağ %1$s °C</string> + <string name="stats_power">Güç dağıtıcı</string> + <string name="stats_fuel_t">Yakıt, t</string> + <string name="stats_fuel_main">Ana %1$s t</string> + <string name="stats_fuel_reserve">Yedek %1$s t</string> + <string name="stats_tap_hint">Stilini değiştirmek için üst şeride veya göstergeye dokunun.</string> + <string name="bottom_telemetry_send_title">Gösterge verilerini gönder</string> + <string name="bottom_telemetry_send_auto">Otomatik</string> + <string name="bottom_telemetry_send_auto_hint">Sonradan bulunanlar dahil, burada listelenen her oyun için açar. Kapattığınız oyunlar kapalı kalır.</string> + <string name="bottom_telemetry_send_note">Bu, oyunun kendi veri çıkışı ayarını değiştirir. Oyun bir sonraki başlatılışında geçerli olur; kapatmak eski ayarı geri getirir.</string> + <string name="bottom_telemetry_send_close">Bunu değiştirmek için %1$s oyununu kapatın.</string> + <string name="bottom_telemetry_send_failed">%1$s ayarları değiştirilemedi.</string> + <string name="bottom_telemetry_send_menu">%1$s: oyunun ayarlarında IP 127.0.0.1 ve %3$d portuyla %2$s seçeneğini açın.</string> + <string name="bottom_shots_where">Pictures/DroidDeck klasörüne kaydedilir. Steam ekran görüntüleri de burada görünür.</string> + <string name="bottom_shots_take">Ekran görüntüsü al</string> + <string name="bottom_shots_saved">Ekran görüntüsü kaydedildi.</string> + <string name="bottom_shots_failed">Ekran görüntüsü alınamadı.</string> + <string name="bottom_shots_none">Henüz ekran görüntüsü yok.</string> + <string name="bottom_page_chat">Sohbet ve ses</string> + <string name="bottom_chat_why">Oyun ana ekranda çalışmaya devam ederken Steam sohbetini burada okuyun ve yanıtlayın. Steam\'de oturum açılmış hesabı kullanır.</string> + <string name="bottom_chat_not_signed_in">Steam\'in paylaşabileceği bir web oturumu henüz yok, bu yüzden burada bir kez oturum açın.</string> + <string name="bottom_chat_stopped">DroidDeck arka plandayken Android sohbet sayfasını kapattı. DroidDeck\'e döndüğünüzde yeniden açılır.</string> + <string name="bottom_chat_open">Steam Chat\'i aç</string> + <string name="bottom_chat_close">Sohbeti kapat</string> + <string name="bottom_chat_mic_on">Mikrofon açık</string> + <string name="bottom_chat_mic_off">Mikrofon kapalı</string> + <string name="bottom_chat_mic_unavailable">Bu oyun için mikrofon kapalı. Konuşmak için DroidDeck\'in Steam ayarlarında (Ses) Mikrofon\'u açın ve oyunu yeniden başlatın.</string> + <string name="bottom_chat_volume">Ses düzeyi %1$d%%</string> + <string name="bottom_page_telemetry">Oyun içi istatistikler</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Pil</string> + <string name="bottom_telemetry_lap">Tur</string> + <string name="bottom_telemetry_position">Sıra</string> + <string name="bottom_telemetry_this_lap">Bu tur</string> + <string name="bottom_telemetry_last_lap">Son tur</string> + <string name="bottom_telemetry_fuel">Yakıt</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Güç SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Yasal durum</string> + <string name="bottom_telemetry_balance">Bakiye</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Burada canlı bir gösterge görmek için yarış oyununun veri çıkışını (genellikle telemetri veya UDP olarak geçer) açın. Veriler bu cihazda kalır.</string> + <string name="bottom_telemetry_unknown_format">%1$d portu veri alıyor (%3$d baytlık %2$d paket), ancak bu sayfanın henüz okuyamadığı bir biçimde.</string> + <string name="bottom_telemetry_port_busy">%1$s portunu zaten başka bir program kullanıyor, bu yüzden o oyun burada gösterilemez.</string> <string name="rtinst_removing">Linux çalışma ortamı kaldırılıyor</string> <plurals name="rtinst_removing_entries"> @@ -1618,6 +1885,7 @@ <string name="flatpakmgr_not_ready">Önce Flatpak\'i kurun</string> <string name="flatpakmgr_starting">Başlatılıyor</string> <string name="flatpakmgr_exit_status">Flatpak %1$d durum koduyla çıktı</string> + <string name="flatpakmgr_wrong_arch">%1$s, DroidDeck\'in çalıştıramadığı %2$s için derlenmiş. Buradaki Flatpak uygulamalarının ARM64 veya x86_64 sürümü olmalı.</string> <string name="flatpakmgr_installing">%1$s yükleniyor</string> <string name="flatpakmgr_updating">%1$s güncelleniyor</string> <string name="flatpakmgr_removing">%1$s kaldırılıyor</string> @@ -1711,6 +1979,7 @@ <string name="adbpair_applying">Ayar uygulanıyor…</string> <string name="adbpair_command_failed">Kablosuz hata ayıklama komutu başarısız oldu</string> <string name="adbpair_channel_name">Kablosuz hata ayıklama kurulumu</string> + <string name="adbpair_progress_channel_name">Kablosuz hata ayıklama kurulum ilerlemesi</string> <string name="adbpair_channel_description">Ayarlar açıkken Kablosuz hata ayıklama eşleştirme kodunu ister</string> <string name="adbpair_title_pair">Kablosuz hata ayıklamayı eşle</string> <string name="adbpair_waiting_text">Kablosuz hata ayıklamayı açın, sonra “Eşleştirme koduyla cihaz eşle” seçeneğine dokunun.</string> @@ -1819,6 +2088,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU değil</string> <string name="gpuinfo_supported">Destekleniyor</string> <string name="gpuinfo_experimental">Deneysel: sürücüleri test derlemeleri</string> + <string name="gpuinfo_a850_experimental">Deneysel Adreno 850 desteği: uyumlu deneysel ekran ve oyun sürücüleri gerekir; bu cihazda doğrulanmadı</string> <string name="gpuinfo_below_tested">Test edilen donanımın altında (Adreno 725 ve daha yenisi): çalışmayabilir</string> <string name="gpuinfo_unsupported">Desteklenmiyor: DroidDeck bir Adreno (Snapdragon) GPU\'su gerektirir</string> @@ -1912,10 +2182,10 @@ <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> + <string name="display_follow_screen_scaled">Ölçekli %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Cihaz ayrıntılarını göster</string> <string name="device_info_hide">Cihaz ayrıntılarını gizle</string> @@ -1930,7 +2200,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> @@ -1944,11 +2213,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> @@ -1966,9 +2233,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> @@ -1987,12 +2262,43 @@ <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> <string name="stores_sort">Sırala</string> + <string name="setup_rail_labels">Kenar çubuğu etiketleri</string> + <string name="setup_rail_labels_hint">Kenar çubuğu simgelerinin altında adları gösterir. Daha ince bir kenar çubuğu için kapatın.</string> + <string name="library_display">Görünüm</string> + <string name="library_display_larger">Daha büyük kartlar</string> + <string name="library_display_smaller">Daha küçük kartlar</string> + <string name="library_display_title">Başlığı göster</string> + <string name="library_display_size">Boyutu göster</string> <string name="stores_sort_last_played">Son oynanan</string> <string name="stores_sort_recently_installed">Son yüklenen</string> <string name="stores_sort_title_asc">Başlık A–Z</string> @@ -2119,6 +2425,9 @@ <string name="stores_download_manager">İndirme yöneticisi</string> <string name="stores_parallel">Aynı anda indirme sayısı</string> <string name="stores_install_where">Şuraya yükle</string> + <string name="stores_install_language">Oyun dili</string> + <string name="stores_install_language_hint">GOG ve Epic bu dili yükler. Sistem, uygulama dilini izler.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">%1$s\'i yükle:</string> <string name="stores_target_internal">Dahili</string> <string name="stores_target_free">%1$s boş</string> @@ -2138,6 +2447,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> @@ -2153,6 +2463,9 @@ <string name="edit_target">Hedef</string> <string name="edit_start_in">Başlangıç yeri</string> <string name="edit_launch_options">Başlatma seçenekleri</string> + <string name="edit_launch_options_steam_hint">Steam Özellikleri ile ortaktır: birinde yapılan değişiklik ikisinde de görünür.</string> + <string name="edit_launch_options_not_saved">Başlatma seçenekleri Steam\'e kaydedilemedi. Tekrar deneyin.</string> + <string name="edit_launch_options_desktop">Steam masaüstü oturumunda açık olabilir. Başlatma seçeneklerini Steam Özellikleri\'nden değiştirin veya önce oturumu kapatın.</string> <string name="edit_artwork">Görsel</string> <string name="edit_other_exe">Diğer exe…</string> <string name="edit_remove">Kaldır</string> @@ -2280,6 +2593,7 @@ <string name="setup_download_source_custom">Özel önek</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Önek</string> + <string name="setup_download_proxy">HTTP proxy</string> <string name="flathub_eyebrow">LINUX UYGULAMALARI</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux masaüstü için masaüstü uygulamaları, Masaüstü\'nden açılır.</string> @@ -2420,6 +2734,22 @@ <string name="glasses_tracking_flat_hint">Otomatik, bu 2D oyunu görüşte sabit tutar. Kafa takibini kullanmak için “Ekran” bölümünde “Sanal ekran” seçeneğine geçin.</string> <string name="glasses_tracking_sbs_hint">Kafa takibi, sanal ekranda veya çalışan bir SteamVR oyununda geçerlidir.</string> <string name="glasses_hardware">Cihaz</string> + <string name="vr_controllers_tab">Kumandalar</string> + <string name="vr_controllers_group">SteamVR kumandaları</string> + <string name="vr_controllers_emulate">VR\'da oyun kumandası</string> + <string name="vr_controllers_emulate_hint">Kumandanızın oynadığı iki VR eli. Değişiklikler hemen, SteamVR çalışırken de uygulanır. Joy-Con\'lar ve izlenen eller yine kendi taraflarını devralır.</string> + <string name="vr_controllers_off">Normal oyun kumandası</string> + <string name="vr_controllers_index">Valve Index kumandaları</string> + <string name="vr_controllers_touch">Meta Quest 3 kumandaları</string> + <string name="vr_controllers_vive">HTC Vive kumandaları</string> + <string name="vr_controllers_sticks">Çubukların başlangıç görevi</string> + <string name="vr_controllers_sticks_hint">Geçiş yapmak için VR sırasında iki çubuğa birlikte basın.</string> + <string name="vr_controllers_sticks_game">Sizi oyunda hareket ettirir</string> + <string name="vr_controllers_sticks_hands">Elleri hareket ettirir</string> + <string name="vr_controllers_buttons">Düğmeler</string> + <string name="vr_controllers_buttons_stick">Tetikler tetik, omuz düğmeleri kavrama, A/B ve X/Y her elin ön düğmeleridir; çubuk tıklamaları başparmak çubuklarına tıklar, Guide SteamVR menüsünü açar. Yön tuşlarında yukarı ve aşağı elleri yaklaştırır veya uzaklaştırır.</string> + <string name="vr_controllers_buttons_vive">Çubuklar dokunmatik yüzeydir; A/X veya çubuk tıklaması onlara basar. Tetikler tetik, omuz düğmeleri kavrama, Start ve Select menüdür, Guide SteamVR menüsünü açar.</string> + <string name="vr_controllers_buttons_off">VR eli yok. Oyun kumandasını destekleyen oyunlar ve SteamVR menüsü kumandanızı her zamanki gibi alır.</string> <string name="glasses_brightness">Parlaklık</string> <string name="glasses_volume">Ses düzeyi</string> <string name="glasses_sunblock">Güneş koruması</string> @@ -2477,6 +2807,12 @@ <string name="hand_camera_placement">Kamera konumu</string> <string name="hand_camera_placement_hint">Oynamadan önce kameranın sizi görebildiğini kontrol edin.</string> <string name="hand_camera_check">Kontrol et</string> + <string name="tracking_pack_title">El izleme indirmesi</string> + <string name="tracking_pack_hint">El izleme için bir kerelik %1$s indirme gerekir.</string> + <string name="tracking_pack_download">İndir</string> + <string name="tracking_pack_retry">Yeniden dene</string> + <string name="tracking_pack_downloading">El izleme indiriliyor… %%%1$d</string> + <string name="tracking_pack_failed">El izleme indirilemedi. Bağlantınızı kontrol edip tekrar deneyin.</string> <string name="hand_camera_check_title">Kamera konumu</string> <string name="hand_camera_how_rear">Cihazı yaklaşık göğüs hizasında, 1,5 ila 2 metre uzağa, arka kamera size dönük olacak şekilde dik durdurun. Ardından ellerinizi açarak görüntüye girin.</string> <string name="hand_camera_how_front">Cihazı yaklaşık göğüs hizasında, 1,5 ila 2 metre uzağa, ekran size dönük olacak şekilde dik durdurun. Ardından ellerinizi açarak görüntüye girin.</string> @@ -2559,6 +2895,21 @@ <string name="storage_safe_hint">Kullanılmayan çalışma zamanları, artıklar, eski günlükler</string> <string name="storage_clean_up">Temizle…</string> <string name="storage_session_running">Bir şeyi temizlemek veya kaldırmak için oturumu durdurun. Boyutlar yine de gösterilir.</string> + <string name="storage_default_group">Yükleme konumu</string> + <string name="storage_default_title">Varsayılan depolama</string> + <string name="storage_default_hint">Yeni mağaza yüklemeleri seçilen konuma gider. Mevcut oyunlar yerinde kalır. Steam kütüphaneleri kendi ayarlarını korur.</string> + <string name="storage_default_ask">Her seferinde sor</string> + <string name="storage_default_ask_detail">Her yükleme için bir hedef seçin</string> + <string name="storage_default_internal">Dahili depolama</string> + <string name="storage_default_external">Harici depolama</string> + <string name="storage_default_external_detail">%1$s · %2$s boş</string> + <string name="storage_default_external_missing">Bağlı değil</string> + <string name="storage_default_folder">Klasör · %1$s</string> + <string name="storage_default_folder_free">%1$s boş</string> + <string name="storage_default_folder_missing">Bağlı değil</string> + <string name="storage_default_choose_folder">Klasör seç…</string> + <string name="storage_default_choose_folder_detail">SD kart veya USB sürücüdeki herhangi bir klasörü kullanın</string> + <string name="storage_default_note">Oyunlar, seçilen konumdaki bir Games klasörüne yüklenir. Mevcut oyunlar taşınmaz.</string> <string name="storage_where">Nereye gidiyor</string> <string name="storage_games">Steam oyunları</string> <string name="storage_game_data">Oyun verileri</string> @@ -2680,6 +3031,9 @@ <string name="storage_data_installed">Yüklü oyunlar</string> <string name="storage_data_parts">Önek %1$s · gölgelendiriciler %2$s · atölye %3$s</string> <string name="storage_clear_shaders">Gölgelendiricileri temizle</string> + <string name="storage_reset_prefix">Öneki sıfırla</string> + <string name="storage_reset_prefix_title">%1$s için önek sıfırlansın mı?</string> + <string name="storage_reset_prefix_confirm">%2$s içindeki Wine önekini (%1$s) siler ve sonraki başlatmada yeniden oluşturur. İçindeki kayıtlar, ayarlar ve yüklü yeniden dağıtılabilir paketler kaybolur; Steam Cloud kayıtları hesabınızda kalır.</string> <string name="storage_data_leftovers">Kaldırılan oyunlar</string> <string name="storage_steam_app">Steam uygulaması %1$d</string> <string name="storage_leftover_unsure_detail">Öneki hâlâ dosya içeriyor, bunlar yerel kayıtları da içerebilir</string> @@ -2978,7 +3332,309 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing ile eşitle</string> + <string name="sync_enable_hint">Syncthing-Fork tabanlı bu Syncthing uygulaması, DroidDeck\'in dahili dosya sistemindeki dosyaları diğer Syncthing örnekleriyle eşitlemenizi sağlar. Yalnızca DroidDeck\'in dahili dosya sisteminde sakladığınız dosyalar içindir.</string> + <string name="sync_missing">Bu sürüm Syncthing içermiyor.</string> + <string name="sync_starting">Syncthing başlatılıyor</string> + <string name="sync_status_starting">Başlatılıyor</string> + <string name="sync_status_up_to_date">Güncel</string> + <string name="sync_status_syncing">Eşitleniyor</string> + <string name="sync_status_paused">Duraklatıldı</string> + <string name="sync_status_pausing">Duraklatılıyor</string> + <string name="sync_status_resuming">Sürdürülüyor</string> + <string name="sync_status_attention">İlgilenmeniz gerekiyor</string> + <string name="sync_status_failed">Syncthing durdu</string> + <string name="sync_failed_retry">Tekrar dene</string> + <string name="sync_paused_wifi">Wi-Fi\'ye bağlanana kadar duraklatıldı</string> + <string name="sync_paused_game">Oyun sırasında duraklatıldı</string> + <string name="sync_summary">%1$d klasör · %3$d cihazdan %2$d tanesi bağlı</string> + <string name="sync_left">%1$s kaldı</string> + <string name="sync_open_web_ui">Web arayüzünü aç</string> + <string name="sync_pause">Duraklat</string> + <string name="sync_resume">Sürdür</string> + <string name="sync_running">Çalışıyor</string> + <string name="sync_running_hint">Syncthing\'i tamamen durdurmak için kapatın.</string> + <string name="sync_this_device">Bu cihaz</string> + <string name="sync_device_id">Cihaz Kimliği</string> + <string name="sync_show_qr">QR kodu göster</string> + <string name="sync_advanced">Gelişmiş</string> + <string name="sync_advanced_hint">Bağlantı noktaları, ne zaman çalışacağı, sıfırlama</string> + <string name="sync_open">Aç</string> + <string name="sync_waiting">Onayınızı bekliyor</string> + <string name="sync_pending_device">%1$s bağlanmak istiyor</string> + <string name="sync_pending_folder">%1$s “%2$s” klasörünü paylaşmak istiyor</string> + <string name="sync_pending_folder_hint">DroidDeck\'te nereye kaydedileceğini seçmek için kabul edin.</string> + <string name="sync_review">Web arayüzünde incele</string> + <string name="sync_folders">Klasörler</string> + <string name="sync_no_folders">Henüz klasör yok.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Güncel</string> + <string name="sync_folder_syncing">Eşitleniyor %%%1$d</string> + <string name="sync_folder_scanning">Taranıyor</string> + <string name="sync_folder_paused">Duraklatıldı</string> + <string name="sync_folder_out_of_sync">Eşitlenmemiş</string> + <string name="sync_folder_errors">%1$d dosya eşitlenemedi</string> + <string name="sync_folder_blocked">Engellendi</string> + <string name="sync_folder_blocked_hint">Bu klasör DroidDeck\'in depolama alanının dışında olduğu için DroidDeck onu duraklattı. DroidDeck dışındaki klasörleri eşitlemek için Syncthing-Fork uygulamasını kullanın.</string> + <string name="sync_remove_folder">Syncthing\'den kaldır</string> + <string name="sync_remove_folder_hint">Kaldırmak hiçbir dosyayı silmez.</string> + <string name="sync_devices">Cihazlar</string> + <string name="sync_no_devices">Henüz cihaz yok.</string> + <string name="sync_connected">Bağlı</string> + <string name="sync_offline">Çevrimdışı</string> + <string name="sync_last_seen">Son görülme: %1$s</string> + <string name="sync_device_id_title">Bu cihazın kimliği</string> + <string name="sync_device_id_hint">Diğer cihazınızda Syncthing\'e bir cihaz ekleyin ve bu kodu tarayın ya da kimliği yapıştırın. Ardından burada web arayüzünden kabul edin.</string> + <string name="sync_copy">Kopyala</string> + <string name="sync_share">Paylaş</string> + <string name="sync_done">Bitti</string> + <string name="sync_off_title">Syncthing kapatılsın mı?</string> + <string name="sync_off_body">Syncthing şimdi durur ve yeniden açılana kadar kapalı kalır. Eşitlenen dosyalar yerinde kalır.</string> + <string name="sync_off_forget">Syncthing yapılandırmasını da sil</string> + <string name="sync_off_forget_hint">Bu cihazın kimliğini, klasörleri ve cihazları kaldırır. Yeniden açıldığında sıfırdan başlar.</string> + <string name="sync_turn_off">Kapat</string> + <string name="sync_ports">Bağlantı noktaları</string> + <string name="sync_port_sync">Eşitleme</string> + <string name="sync_port_discovery">Yerel keşif</string> + <string name="sync_repick">Yeni bağlantı noktaları seç</string> + <string name="sync_repick_hint">Her başlangıçta yeniden denetlenir.</string> + <string name="sync_repick_button">Yeniden seç</string> + <string name="sync_reset_group">Sıfırla</string> + <string name="sync_api_key">API anahtarı</string> + <string name="sync_regenerate">Yeniden oluştur</string> + <string name="sync_reset">Syncthing\'i sıfırla</string> + <string name="sync_reset_hint">Yeni cihaz kimliği oluşturulur, klasörler ve cihazlar kaldırılır. DroidDeck\'in depolama alanındaki dosyalar korunur.</string> + <string name="sync_reset_button">Sıfırla</string> + <string name="sync_reset_confirm_title">Syncthing sıfırlansın mı?</string> + <string name="sync_running_group">Çalışma</string> + <string name="sync_run">Çalıştırma</string> + <string name="sync_run_open">DroidDeck açıkken</string> + <string name="sync_run_background">Arka planda</string> + <string name="sync_wifi_only">Yalnızca Wi-Fi</string> + <string name="sync_pause_games">Oyunlar sırasında duraklat</string> + <string name="sync_logs">Günlükler</string> + <string name="sync_logs_hint">Bu oturumun Syncthing çıktısı</string> + <string name="sync_logs_share">Paylaş</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Önce Linux çalışma zamanını yükleyin.</string> + <string name="sync_accept">Kabul et</string> + <string name="sync_accept_title">“%1$s” klasörünün kaydedileceği yer</string> + <string name="sync_add_folder">Klasör ekle</string> + <string name="sync_add_folder_hint">DroidDeck\'in depolama alanındaki bir klasörü eşitleyin</string> + <string name="sync_choose">Seç</string> + <string name="sync_add">Ekle</string> + <string name="sync_add_failed">Klasör eklenemedi.</string> + <string name="sync_share_with">Paylaşılacak cihazlar</string> + <string name="sync_share_none">Henüz cihaz yok. Bu klasörü daha sonra web arayüzünden paylaşabilirsiniz.</string> + <string name="sync_use_folder">Bu klasörü kullan</string> + <string name="sync_new_folder">Yeni klasör</string> + <string name="sync_location_home">Konteyner ana dizini</string> + <string name="sync_location_sync">Sync klasörü</string> + <string name="sync_location_shared">DroidDeck paylaşılan depolama alanı</string> + <string name="sync_location_card">%1$s üzerindeki DroidDeck</string> + <string name="sync_location_app">DroidDeck uygulama verileri</string> + <string name="sync_web_path_locked">Yeni klasörler DroidDeck\'in Sync klasörüne kaydedilir. Başka bir DroidDeck klasörünü eşitlemek için Syncthing sekmesindeki Klasör ekle seçeneğini kullanın.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Yeniden yükle</string> + <string name="sync_not_running">Syncthing çalışmıyor.</string> + <string name="session_end_steam_sigill">Steam geçersiz bir komutla durdu (SIGILL). Bu bir CPU komut uyumluluğu sorunu veya istemci çökmesi olabilir. Günlükleri cihaz bilgilerinizle paylaşın.</string> + <string name="session_end_steam_try_x64">Steam ayarları → Steam istemcisi → x86-64 (deneysel) seçeneğini deneyebilirsiniz. Ek bir indirme gerektirir ve daha yavaş çalışabilir.</string> + <string name="session_end_vulkan_device">Linux grafik sürücüsü kullanılabilir bir Vulkan cihazı bulamadı. Seçilen Linux GPU sürücüsünün bu GPU\'yu desteklediğini kontrol edin.</string> + <string name="session_end_gpu_unsupported">Bu GPU için geçerli kurulumda uyumlu bir Linux Vulkan sürücüsü olmadığından bu oturum başlatılamıyor. Adreno Turnip sürücüleri MediaTek/Mali GPU\'lar için destek sağlayamaz.</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_resources_browser">Tarayıcınızda açılır</string> + <string name="game_resource_guides">Rehberler</string> + <string name="game_resource_protondb_detail">Linux / Proton uyumluluk raporları</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Kayıtları Steam hesabınızda olan oyunlar için</string> + <string name="game_resource_search">Web\'de ara</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="library_filter">Filtre</string> + <string name="library_filter_installed">Yalnızca yüklü</string> + <string name="library_filter_all_owned">Sahip olunan tüm oyunlar</string> + <string name="library_no_installed_matches">Bu filtrelere uyan yüklü oyun yok.</string> + <string name="library_browse_owned">Sahip olunan oyunlara göz at</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="stores_itch_updates_found">Mevcut güncellemeler: %1$d</string> + <string name="stores_itch_update_replaced">Geliştirici bu sürümü %1$s ile değiştirdi. Ona güncellensin mi?</string> + <string name="xbox_filter_cloud">Bulut</string> + <string name="stores_xbox_cloud_settings">Bulut ayarları</string> + <string name="integration_title">Steam entegrasyonu</string> + <string name="integration_count">%2$d içinden %1$d açık</string> + <string name="integration_set_up">Ayarla</string> + <string name="integration_location">Konum</string> + <string name="integration_app_info">Uygulama bilgileri</string> + <string name="integration_wifi">Wi-Fi adları</string> + <string name="integration_brightness">Parlaklık</string> + <string name="integration_home">Ana ekran olarak DroidDeck</string> + <string name="integration_shortcuts">Ana ekran düğmesi kısayolları</string> + <string name="integration_wifi_hint">Ağları Steam\'de göster · Konum erişimi gerekir, konum asla izlenmez</string> + <string name="integration_wifi_on">Ağlar Steam\'de görünür</string> + <string name="integration_wifi_location_off">Konum kapalı</string> + <string name="integration_wifi_denied">Konum reddedildi · Uygulama bilgileri\'nden izin verin</string> + <string name="integration_brightness_hint">Steam\'in kaydırıcısı ekran parlaklığını ayarlar</string> + <string name="integration_home_hint">Ana ekran düğmesi oturumda Steam menüsünü açar</string> + <string name="integration_shortcuts_hint">Steam Guide kombinasyonları için Ana ekran düğmesini basılı tutun</string> + <string name="integration_shortcuts_needs_home">Ana ekran olarak DroidDeck gerekir</string> + <string name="integration_shortcuts_maybe_restricted">Android\'de gri mi görünüyor? Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver</string> + <string name="integration_shortcuts_restricted">Android tarafından engellendi · Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver</string> + <string name="integration_shortcuts_service">DroidDeck Ana ekran düğmesi</string> + <string name="integration_shortcuts_service_description">Bir Steam oturumu odaktayken ve DroidDeck varsayılan Ana ekran uygulamasıyken Ana ekran düğmesine basışları Steam Guide\'a iletir. Ekran içeriğini okumaz.</string> + <string name="integration_brightness_needed">Kurulum → Steam entegrasyonu bölümünde Parlaklık\'ı açın</string> + <string name="apps_search_hint">Uygulama ara</string> + <string name="apps_no_match">“%1$s” ile eşleşen uygulama yok.</string> + <string name="apps_add_widget">Widget ekle</string> + <string name="apps_widgets_loading">Widget’lar yükleniyor…</string> + <string name="apps_widgets_none">Bu cihazdaki hiçbir uygulama widget sunmuyor.</string> + <string name="apps_widget_wider">Daha geniş</string> + <string name="apps_widget_narrower">Daha dar</string> + <string name="apps_widget_taller">Daha uzun</string> + <string name="apps_widget_shorter">Daha kısa</string> + <string name="apps_widget_move_earlier">Öne taşı</string> + <string name="apps_widget_move_later">Arkaya taşı</string> + <string name="apps_widget_configure">Widget ayarları</string> + <string name="apps_widget_remove">Widget’ı kaldır</string> + <string name="apps_add_to_folder">Klasöre ekle</string> + <string name="apps_new_folder">Yeni klasör</string> + <string name="apps_remove_from_folder">Klasörden çıkar</string> + <string name="apps_app_info">Uygulama bilgileri</string> + <string name="apps_uninstall">Kaldır</string> + <string name="apps_folder_rename">Yeniden adlandır</string> + <string name="apps_folder_ungroup">Grubu çöz</string> + <string name="apps_folder_default">Klasör</string> + <string name="apps_folder_name">Klasör adı</string> + <string name="apps_filter">Göster</string> + <string name="apps_filter_all">Tüm uygulamalar</string> + <string name="apps_filter_games">Oyunlar</string> + <string name="apps_filter_downloaded">İndirilenler</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Gizli</string> + <string name="apps_hide">Gizle</string> + <string name="apps_unhide">Uygulamalarda göster</string> + <string name="apps_shortcut_remove">Kısayolu kaldır</string> + <string name="apps_pin_title">Uygulamalara ekle</string> + <string name="apps_pin_add">Ekle</string> + <string name="apps_hidden_none">Gizli uygulama yok.</string> + <string name="apps_sort_name_asc">Ad A–Z</string> + <string name="apps_sort_name_desc">Ad Z–A</string> + <string name="apps_sort_installed">Son yüklenenler</string> + <string name="apps_sort_updated">Son güncellenenler</string> + <plurals name="apps_count"> + <item quantity="one">%d uygulama</item> + <item quantity="other">%d uygulama</item> + </plurals> + <string name="desktop_restore_title">Yazılımınız geri yükleniyor</string> + <string name="desktop_restore_body">Eklediğiniz uygulamalar DroidDeck güncellemesinden sonra yeniden yükleniyor.</string> + <string name="desktop_restore_done_title">Yazılım geri yüklendi</string> + <string name="desktop_restore_done_body">Eklediğiniz uygulamalar yeniden yüklendi.</string> + <string name="desktop_restore_failed_title">Bazı yazılımlar geri yüklenemedi</string> + <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log dosyasına bakın, ardından Konsole\'da sudo apt install deneyin.</string> + <string name="gog_full_files">Yerel iyileştirmeler kullanılamıyor. İndirme, yerine geçecek tam dosyaları içerir.</string> + <string name="gog_recover">Yama sonucunu doğrula</string> + <string name="slow_usb_title">Yavaş USB bağlantısı</string> + <string name="slow_usb_cable">%1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn), bu yüzden üzerindeki oyunlar yavaş yüklenecek. 5 Gbps veya daha hızlı bir USB 3 kablo kullanın, USB-C fişini ters çevirmeyi deneyin ya da daha hızlı bir sürücü kullanın.</string> + <string name="slow_usb_port">%1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn). Bu cihazın USB bağlantı noktası daha hızlı çalışamıyor, bu yüzden oyunlar yavaş yüklenecek. Dahili depolama veya bir microSD kart daha hızlı olabilir.</string> + <string name="slow_usb_never">Bir daha gösterme</string> + <string name="slow_usb_dismiss">Kapat</string> + <string name="steam_import_title">Oyunlarınızı eklemek için Steam yeniden başlatılsın mı?</string> + <string name="steam_import_body">Steam sahip olduğunuz bu oyunları yüklü olarak gösterebilir: %1$s. Bunları göstermek için yeniden başlaması gerekir. Şimdi yeniden başlatın ya da Steam bir sonraki açılışta onları ekleyecek.</string> + <string name="steam_import_names_more">%1$s ve %2$d tane daha</string> + <string name="steam_import_now">Şimdi yeniden başlat</string> + <string name="steam_import_later">Daha sonra</string> + <string name="gog_maintenance">GOG kurulumunu yönet</string> + <string name="gog_check">Güncellemeleri denetle</string> + <string name="gog_repair">Doğrula/Onar</string> + <string name="gog_patches">Çevrimdışı yamalar</string> + <string name="gog_refresh">Tam çevrimdışı yükleyiciyi indir</string> + <string name="gog_update">%1$s sürümüne güncelle</string> + <string name="gog_resume">GOG bakımını sürdür</string> + <string name="gog_open_patch">Yama yükleyicisini aç</string> + <string name="gog_patch_in_session">Linux oturumundaki yama yükleyicisini tamamlayın veya iptal edin.</string> + <string name="gog_patch_requirements">Yüklü sürümünüze ve dilinize uygun bir yama seçin. Desteklenen kaynak sürümler listelenmemiş olabilir.</string> + <string name="gog_no_patches">GOG\'da bu oyun için bağımsız Windows yaması yok.</string> + <string name="gog_managed_files">Değiştirilmiş oyun dosyalarının yerine yenileri konabilir.</string> + <string name="gog_patch_installer_note">Yükleyici Linux oturumunuzda açılır.</string> + <string name="gog_download_label">İndirme</string> + <string name="gog_space_label">Ek alan</string> + <string name="gog_space_estimate_label">Tahmini alan</string> + <string name="gog_repair_action">Dosyaları onar</string> + <string name="gog_refresh_action">Kurulumu yenile</string> + <string name="gog_select_patch">Seç</string> + <string name="setup_all_files">Tüm dosyalara erişim</string> + <string name="setup_local_network">Yerel ağ</string> + <string name="libraries_title">Diğer Steam kitaplıkları</string> + <string name="libraries_hint">Steam’in oyun kurup çalıştırabildiği, her biri kendi adına sahip klasörler. Kaldırmak, oyunları diskte tutar.</string> + <string name="libraries_add">Kitaplık ekle</string> + <string name="libraries_rename_title">Kitaplık adı</string> + <string name="libraries_pick">Kitaplık için klasör seçin</string> + <string name="libraries_full">En fazla %1$d ek kitaplık</string> + <string name="libraries_overlap">Bu klasör zaten bir kitaplık veya bir kitaplığın içinde</string> + <string name="libraries_missing">%1$s · kullanılamıyor</string> + <string name="libraries_applies_next">Sonraki Steam oturumundan itibaren geçerli</string> + <string name="bottom_desktop_start">Masaüstünü başlat</string> + <string name="bottom_desktop_mode_touch">Doğrudan dokunma</string> + <string name="bottom_desktop_trackpad">Dokunmatik yüzey. Doğrudan dokunma için dokunun</string> + <string name="bottom_desktop_direct_touch">Doğrudan dokunma. Dokunmatik yüzey için dokunun</string> + <string name="bottom_desktop_starting">KDE masaüstü başlatılıyor…</string> + <string name="bottom_desktop_ended">Masaüstü kapandı.</string> + <string name="bottom_desktop_failed">Masaüstü başlatılamadı. Günlükleri bu oturumun bottom-desktop klasöründe.</string> + <string name="bottom_desktop_off">Masaüstü kapalı.</string> + <string name="libraries_rename">Yeniden adlandır</string> + <string name="second_mode_desktop">Masaüstü</string> + <string name="bottom_desktop_mode_trackpad">Dokunmatik yüzey</string> + <string name="bottom_desktop_title">Masaüstü · %1$s</string> </resources> diff --git a/app/src/main/res/values-uk/gestures.xml b/app/src/main/res/values-uk/gestures.xml index 7ed3663c6..6ed58ef52 100644 --- a/app/src/main/res/values-uk/gestures.xml +++ b/app/src/main/res/values-uk/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Жести</string> <string name="gesture_settings">Налаштування сенсорних жестів</string> - <string name="gesture_settings_hint">Налаштуйте жести миші та клавіатури. Щоб використовувати їх, виберіть режим дотику «Жести».</string> <string name="gesture_tap">Дотик</string> <string name="gesture_drag">Перетягування одним пальцем</string> <string name="gesture_long_press">Тривале натискання</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Утримання трьома пальцями</string> <string name="gesture_pinch">Масштабування щипком</string> <string name="gesture_hold_button">Утримувати кнопку натиснутою</string> + <string name="gesture_hold_left">Утримувати ліву кнопку натиснутою</string> + <string name="gesture_hold_right">Утримувати праву кнопку натиснутою</string> <string name="gesture_click_once">Одне клацання</string> <string name="gesture_hold_delay">Затримка утримання</string> <string name="gesture_double_delay">Інтервал подвійного дотику</string> diff --git a/app/src/main/res/values-uk/shortcuts.xml b/app/src/main/res/values-uk/shortcuts.xml new file mode 100644 index 000000000..f1085d070 --- /dev/null +++ b/app/src/main/res/values-uk/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Дії фізичних кнопок</string> + <string name="shortcuts_dd_menu">Меню DroidDeck</string> + <string name="shortcuts_capture">Призначити: %1$s</string> + <string name="shortcuts_press">Натисніть і відпустіть кнопку. Призначення збережеться автоматично.</string> + <string name="shortcuts_release">Відпустіть кнопку, щоб продовжити.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Ця кнопка вже призначена для: %1$s</string> + <string name="shortcuts_save">Перепризначити</string> + <string name="shortcuts_retry">Спробувати іншу кнопку</string> + <string name="shortcuts_limitations">Кнопка «Додому» та деякі додаткові кнопки можуть бути недоступні.</string> +</resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0fe47636a..d03a35884 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Параметри VKD3D для D3D12. nodxr вимикає трасування променів; використовуйте лише для гри, якій це потрібно.</string> <string name="game_env_proton_log">Установіть 1, щоб вести діагностичний журнал Proton. Журналювання може знизити продуктивність і займає місце.</string> <string name="game_env_wined3d">Установіть 1, щоб використовувати WineD3D на основі OpenGL замість DXVK для перевірки сумісності D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер для DirectDraw, Direct3D 1-7 та ігор, запущених через WineD3D. Vulkan оминає шлях OpenGL через Zink і набагато швидший для старих ігор DirectDraw і Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Установіть 1, щоб запускати Direct3D 8 через DXVK замість WineD3D. Швидше в тесті Direct3D 8 з AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Установіть 1, щоб ця гра не використовувала ntsync (droiddeck-ntsync або драйвер ядра); тоді вона працює на droiddeck-esync, якщо є пакет, інакше на droiddeck-fsync.</string> <string name="game_env_no_esync">Установіть 1, щоб вимкнути droiddeck-esync для цієї гри; замість нього використовується droiddeck-fsync або droiddeck-ntsync, якщо fsync теж вимкнено.</string> <string name="game_env_no_fsync">Установіть 1, щоб ця гра не використовувала droiddeck-fsync; тоді вона працює на droiddeck-esync, якщо є пакет, інакше на droiddeck-ntsync.</string> <string name="game_env_fsync_first">Установіть 1, щоб запускати цю гру на droiddeck-fsync, або 0, щоб надавати перевагу droiddeck-esync, якщо є пакет для її Proton.</string> <string name="game_env_xalia">Установіть 0, щоб вимкнути в цій грі помічник Proton для навігації геймпадом.</string> + <string name="game_env_anticheat_offline">Увімкнено за замовчуванням. Запускає гру з Easy Anti-Cheat без античита, якщо гра підтримує офлайн-режим. Вимкніть, щоб запускати через Easy Anti-Cheat як зазвичай. Онлайн-режими, що потребують Easy Anti-Cheat, залишаються недоступними.</string> <string name="game_env_hud">Оверлей DXVK для D3D9–11. fps показує частоту кадрів; якщо не задано, оверлей приховано.</string> <string name="game_env_dxvk_config">Параметри DXVK, розділені крапкою з комою. Нові збірки обмежують частоту кадрів через dxvk.maxFrameRate; для звичайної гри краще використовувати обмеження кадрів сеансу.</string> + <string name="game_env_cores">Ядра CPU для цієї гри, наприклад 0-4 або 0,2,4, замість ядер гри сеансу. Менше ядер — менше нагрівання.</string> <string name="game_env_vkd3d_limit">Обмеження частоти кадрів D3D12. 0 вимикає обмеження.</string> <string name="game_env_glthread">Багатопотоковість OpenGL у Mesa. true може допомогти іграм OpenGL, які впираються в CPU; перевіряйте для кожної гри окремо.</string> <string name="sync_backend_title">Синхронізація Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX запускає програми Linux для x86 на цьому пристрої ARM64. У режимі «Авто» він вмикається, якщо програму зібрано для x86.</string> <string name="app_fex_x86">%1$s через FEX</string> <string name="app_fex_not_ready">Цю програму зібрано для ПК з архітектурою %1$s, і вона працює через FEX, який ще не налаштовано. Один раз відкрийте Steam, увійшовши в обліковий запис: DroidDeck завантажить FEX і потрібний йому Steam Linux Runtime, після чого програма відкриється.</string> + <string name="session_proot_missing">Не вдалося завантажити proot DroidDeck. Перевірте зʼєднання та спробуйте ще раз. Сеанс не запущено, бо резервний proot занадто повільний для гри.</string> + <string name="session_directaudio_missing">Не вдалося завантажити DirectAudio, тому в цьому сеансі звук ігор іде повільнішим шляхом.</string> <string name="session_end_program">Ця програма</string> <string name="session_end_steam_download">Не вдалося завантажити клієнт Steam. Можливо, ваша мережа або VPN блокує сервери Steam; перевірте з’єднання та спробуйте ще раз.</string> <string name="session_end_steam_setup">Не вдалося налаштувати клієнт Steam. Перевірте з’єднання та вільне місце, потім спробуйте ще раз.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Контролер Xbox 360</string> <string name="mode_controller_note">Deck: кнопка швидкого доступу й гіроскоп. Steam Controller: те саме плюс датчики хвату на задніх кнопках. DualShock 4 і DualSense: гіроскоп, а трекпади працюють як їхня сенсорна панель. Xbox 360: меню швидкого доступу відкривається комбінацією Guide+A.</string> <string name="mode_back">Кнопка Back</string> + <string name="back_hold">Утримання «Назад» для комбінацій Steam</string> + <string name="back_hold_hint">Утримання «Назад» відкриває швидкий доступ або створює комбінації Steam з іншими кнопками. Вимкніть, щоб утримання ігнорувалося; натискання й подвійне натискання працюють.</string> + <string name="back_native_qam_hint">Утримуйте «Назад» 700 мс або утримуйте «Назад» і натисніть іншу кнопку для комбінацій Steam.</string> + <string name="back_double_tap_window">Інтервал подвійного натискання</string> + <string name="back_tap_ms">%1$d мс</string> + <string name="brightness_permission_title">Дозволити керування яскравістю</string> + <string name="brightness_permission_text">Налаштуйте керування яскравістю в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сеанс</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Актуальна версія · %1$s</string> <string name="mode_decky_loader">Завантажувач</string> <string name="mode_decky_install_latest">Установити останню версію</string> + <string name="decky_channel">Канал оновлень</string> + <string name="decky_channel_hint">Які випуски Decky Loader встановлювати. Власний засіб оновлення Decky використовує той самий канал.</string> + <string name="decky_channel_stable">Стабільний</string> + <string name="decky_channel_prerelease">Попередній</string> + <string name="decky_channel_testing">Тестовий</string> + <string name="decky_channel_failed">Не вдалося зберегти канал оновлень Decky</string> <string name="mode_decky_on">Запускається разом зі Steam. Поки його ввімкнено, інші додатки на цьому пристрої можуть керувати Steam.</string> <string name="mode_decky_off">Вимкнено. Порт віддаленого налагодження Steam залишається закритим.</string> <string name="mode_decky_remove_title">Видалити Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Клієнт</string> <string name="mode_mangoapp">Оверлей продуктивності</string> <string name="mode_mangoapp_hint">Вимкніть, якщо в режимі Deck ігри вилітають або показують чорний екран. Застосовується в наступному сеансі.</string> + <string name="mode_return_after_game">Повертатися в DroidDeck після гри</string> + <string name="mode_return_after_game_hint">Коли гра, запущена з DroidDeck або іншого лаунчера, закривається, Steam коректно завершує роботу (спершу завершується збереження в хмару), і ви повертаєтеся туди. Вимкнено: залишатися в Steam.</string> + <string name="mode_shader_precache">Попереднє кешування шейдерів</string> + <string name="mode_shader_precache_hint">Steam завантажує готові шейдери для ваших ігор і обробляє їх у фоні, тож ігри менше підвисають. Вимкнення заощаджує трафік, місце й заряд батареї; натомість ігри збирають шейдери під час гри. Це те саме налаштування, що й «Завантаження > Попереднє кешування шейдерів» у Steam. Застосовується в наступному сеансі.</string> <string name="mode_steam_repair">Відновити клієнт Steam</string> <string name="mode_steam_repair_hint">Повторно завантажує клієнт Steam під час наступного запуску Steam. Скористайтеся цим, якщо Steam не виходить з екрана завантаження. Ігри, вхід і налаштування зберігаються.</string> <string name="mode_steam_repair_queued">Клієнт Steam буде повторно завантажено під час наступного запуску Steam.</string> @@ -376,6 +415,8 @@ <string name="mode_directaudio_hint">Обходить PulseAudio для меншої затримки.</string> <string name="mode_mic">Мікрофон</string> <string name="mode_mic_hint">Для голосового чату.</string> + <string name="drawer_mic_hint">Увімкнути або вимкнути захоплення мікрофона в цьому сеансі.</string> + <string name="drawer_mic_failed">Не вдалося змінити мікрофон. Спробуйте ще раз.</string> <string name="mode_network">Мережа</string> <string name="mode_wifi_discovery">Пошук Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показувати в Steam назви Wi-Fi і мережі поблизу.</string> @@ -539,14 +580,24 @@ <string name="perf_gsrealtime">gamescope: черга GPU реального часу</string> <string name="perf_gsrealtime_hint">Надає пріоритет роботі композитора на GPU. Може вирівняти темп кадрів ціною частини продуктивності ігор.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Памʼять</string> + <string name="perf_cap_off">Вимк.</string> + <string name="perf_cap_auto">Типово для драйвера</string> + <string name="perf_zram_client">Стискати Steam під час гри</string> + <string name="perf_zram_client_hint">Через 20 с після запуску гри клієнт Steam стискається в zRAM, щоб залишити грі більше памʼяті, і зчитується назад, коли гра закривається. Вимкніть, якщо сеанс закривається невдовзі після запуску ігор. Ліміт RAM вище все одно стискає Steam, коли сеанс його перевищує.</string> + <string name="perf_ram_cap">Ліміт RAM</string> + <string name="perf_ram_cap_hint">Діє, поки працює клієнт Steam, у режимі Steam або з робочого столу. Коли сеанс використовує більше цього значення, Steam, а потім інші підтримувані процеси сеансу стискаються в zRAM. Мʼякий ліміт: нічого не закривається, але ігри можуть підвисати, поки сторінки повертаються.</string> + <string name="perf_ram_cap_unavailable">Потрібен своп zRAM, якого на цьому пристрої немає.</string> + <string name="perf_vram_cap">Ліміт VRAM</string> + <string name="perf_vram_cap_hint">Обсяг відеопамʼяті, який DXVK повідомляє іграм Direct3D, щоб вони розраховували текстури на менше. Власні налаштування DXVK гри мають пріоритет. Набуде чинності в наступному сеансі.</string> <string name="perf_gpuclock">Тримати GPU на максимальній частоті</string> <string name="perf_gpuclock_hint">Лише Adreno. Менше запинок, вища витрата заряду та нагрів.</string> <string name="perf_fixes">Виправлення сеансу</string> <string name="perf_sysmem">Turnip: рендеринг через sysmem</string> <string name="perf_sysmem_hint">Швидше для клієнта Steam; в іграх драйвер для кожного проходу вибирає тайловий рендеринг або рендеринг у системній пам’яті. Потрібно для Adreno 710/720/722.</string> <string name="perf_xalia">Пропускати помічник Steam xalia</string> - <string name="perf_fastsync">droiddeck-ntsync (експериментально)</string> - <string name="perf_fastsync_hint">Програмна заміна драйвера ntsync ядра Linux у просторі користувача, для тестування. Поки це увімкнено, Proton використовує її замість droiddeck-esync і droiddeck-fsync. Працює з Proton Experimental ARM64, GE-Proton і proton-cachyos. Застосовується в наступному сеансі.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Програмна заміна драйвера ntsync ядра Linux у просторі користувача. Поки це увімкнено, Proton використовує її замість droiddeck-esync і droiddeck-fsync. Працює з Proton Experimental ARM64, GE-Proton і proton-cachyos. Застосовується в наступному сеансі.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync першим</string> <string name="perf_fsync_hint">Запускає власний fsync Proton на стандартних файлах Proton, а futex_waitv надається в просторі користувача, тому не потрібен пакет і все працює відразу після оновлення Proton у Steam. Поки це увімкнено, ігри використовують його раніше за droiddeck-esync, окрім кількох, де Proton тримає fsync вимкненим. Застосовується в наступному сеансі.</string> @@ -557,6 +608,8 @@ <string name="perf_fastpath">Швидкий шлях proot</string> <string name="perf_fastpath_needs_seccomp">Потребує фільтра seccomp у proot.</string> <string name="perf_fastpath_hint">Швидший пошук файлів і менше запинок. Вимкніть, якщо програма не може знайти свої файли.</string> + <string name="perf_cursor_composite">Малювати курсор усередині gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам малює вказівник замість передавати його Android. Увімкніть для курсора, керованого контролером. На телефоні швидше вимкнено. Застосовується в наступному сеансі.</string> <string name="perf_identity">Ідентифікація сеансу</string> <string name="perf_hostname">Ім’я хоста</string> <string name="perf_hostname_hint">Ім’я, яке Steam бачить для цього пристрою. Порожнє значення відновлює %1$s.</string> @@ -571,6 +624,8 @@ <string name="driver_delete_plain">Його файли видаляються з додатка.</string> <string name="driver_delete_in_use">Його файли видаляються. Він зараз використовується, тому його замінює стандартний драйвер.</string> <string name="drawer_page_display">Екран</string> + <string name="drawer_frame_limit">Обмеження кадрів</string> + <string name="drawer_frame_limit_note">Обмежує цю гру. Екран перемикається на частоту оновлення, яка ділиться на обмеження без залишку, якщо така є; інші обмеження можуть виглядати нерівно. Ігри Steam використовують обмеження кадрів Steam у меню швидкого доступу.</string> <string name="drawer_page_effects">Ефекти</string> <string name="drawer_page_controls">Керування</string> <string name="drawer_page_components">Компоненти</string> @@ -595,6 +650,66 @@ <string name="drawer_hud_color_amber">Бурштиновий</string> <string name="drawer_hud_color_violet">Фіолетовий</string> <string name="drawer_hud_opacity">Непрозорість</string> + <string name="hud_size">Розмір</string> + <string name="hud_size_hint">Дотик до HUD також змінює його розмір.</string> + <string name="hud_size_full">Повний</string> + <string name="hud_size_tiles">Плитки</string> + <string name="hud_size_pill">Капсула</string> + <string name="hud_size_minimal">Мінімальний</string> + <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Смуга</string> + <string name="hud_locked">Закріпити на місці</string> + <string name="hud_locked_hint">Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі.</string> + <string name="hud_snap">Прилипання до боків</string> + <string name="hud_snap_hint">Відпустіть HUD, і він переміститься до ближчого боку екрана. Різкий жест відкине його в той бік.</string> + <string name="hud_group_look">Вигляд</string> + <string name="hud_scale">Розмір на екрані</string> + <string name="hud_color_soft">М\'який</string> + <string name="hud_color_mid">Середній</string> + <string name="hud_color_vivid">Яскравий</string> + <string name="hud_outline">Контур</string> + <string name="hud_outline_color">Колір контуру</string> + <string name="hud_outline_gray">Сірий</string> + <string name="hud_outline_theme">Колір теми</string> + <string name="hud_group_metrics">Показники</string> + <string name="hud_metric_graph">Графік часу кадрів</string> + <string name="hud_metric_decimal">Частота кадрів із десятими</string> + <string name="hud_metric_low001" formatted="false">0.01% мінімальних</string> + <string name="hud_metric_engine">Графічний рушій</string> + <string name="hud_metric_gpu_model">Назва GPU</string> + <string name="hud_metric_gpu">Навантаження GPU</string> + <string name="hud_metric_gpu_temp">Температура GPU</string> + <string name="hud_metric_cpu">Навантаження CPU</string> + <string name="hud_metric_per_core">CPU за ядрами</string> + <string name="hud_metric_temp">Температури</string> + <string name="hud_metric_ram">Пам\'ять</string> + <string name="hud_metric_vram">Відеопам\'ять</string> + <string name="hud_metric_swap">Підкачка</string> + <string name="hud_metric_battery">Заряд батареї</string> + <string name="hud_metric_power">Споживана потужність</string> + <string name="hud_metric_network">Мережа</string> + <string name="hud_metric_resolution">Роздільна здатність</string> + <string name="hud_metric_proton">Версія Proton</string> + <string name="hud_metric_session">Час сеансу</string> + <string name="hud_metric_clock">Годинник</string> + <string name="hud_group_temps">Температури</string> + <string name="hud_temp_unit">Одиниці</string> + <string name="hud_temp_bands">Кольори попередження</string> + <string name="hud_temp_bands_hint">Температури стають бурштиновими, а потім червоними, коли наближаються до межі.</string> + <string name="hud_temp_bands_off">Вимк.</string> + <string name="hud_temp_bands_auto">Автоматично</string> + <string name="hud_temp_bands_manual">Вручну</string> + <string name="hud_temp_red_cpu">CPU: червоний від</string> + <string name="hud_temp_red_gpu">GPU: червоний від</string> + <string name="hud_temp_red_battery">Батарея: червоний від</string> + <string name="hud_group_more">Більше</string> + <string name="hud_export">Діагностика HUD</string> + <string name="hud_export_hint">Зберігає в Downloads/DroidDeck звіт про всі датчики, які зчитує HUD.</string> + <string name="hud_export_button">Зберегти</string> + <string name="hud_export_done">Збережено: %1$s</string> + <string name="hud_export_failed">Не вдалося зберегти звіт HUD.</string> + <string name="hud_reset">Скинути налаштування HUD</string> + <string name="hud_reset_button">Скинути</string> <string name="drawer_scaling">Режим масштабування</string> <string name="drawer_scaling_sharpness">Чіткість масштабування</string> <string name="drawer_effects">Ефекти екрана</string> @@ -629,10 +744,14 @@ <string name="drawer_touch_auto">Авто (%1$s)</string> <string name="drawer_keyboard">Клавіатура</string> <string name="drawer_latency">Затримка</string> + <string name="drawer_low_latency">Режим низької затримки</string> + <string name="drawer_low_latency_hint">Збільшує навантаження на CPU та витрату батареї</string> <string name="drawer_low_latency_controller">Контролер із низькою затримкою</string> <string name="drawer_low_latency_controller_hint">Контролер звітує на 1000 Hz замість 250 Hz. Трохи більше навантаження на CPU.</string> <string name="drawer_low_latency_touch">Дотик із низькою затримкою</string> <string name="drawer_low_latency_touch_hint">Дотики обходять групування кадрів, тож сенсорне керування Steam працює на 1000 Hz. Трохи більше навантаження на CPU.</string> + <string name="drawer_evdev_mouse">Сирий канал миші</string> + <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавіатура ПК</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Другий екран</string> @@ -721,6 +840,10 @@ <string name="setup_session">Сеанс</string> <string name="setup_logs">Журнали сеансу</string> <string name="setup_logs_hint">Зберігаються після кожного сеансу</string> + <string name="setup_game_debug_logs">Журнали налагодження ігор</string> + <string name="setup_game_debug_logs_hint">Додавати діагностику Proton, Wine і графіки під час наступного запуску гри. Може знизити продуктивність і зайняти більше місця.</string> + <string name="setup_game_debug_logs_restart">Перезапустіть цей сеанс, щоб зберігати журнали налагодження ігор</string> + <string name="setup_logging_update_failed">Не вдалося оновити журналювання. Перевірте перемикач і спробуйте ще раз.</string> <string name="setup_agent_commands">Засоби діагностики</string> <string name="setup_latest_logs">Останні журнали сеансу</string> <string name="setup_saved_logs">Збережені журнали сеансу</string> @@ -753,12 +876,28 @@ <string name="setup_home_on">DroidDeck може бути додатком головного екрана</string> <string name="setup_home_off">DroidDeck ніколи не пропонується як додаток головного екрана</string> <string name="setup_orientation">Орієнтація</string> + <string name="setup_launcher_orientation">Орієнтація лаунчера</string> + <string name="setup_launcher_orientation_auto">Слідувати повороту пристрою</string> + <string name="setup_orientation_portrait">Книжкова</string> + <string name="setup_session_orientation">Орієнтація сеансу</string> + <string name="setup_session_orientation_hint">Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; власні ширина й висота залишаються як введено.</string> <string name="setup_orientation_auto">Автоматично альбомна</string> <string name="setup_orientation_landscape">Альбомна</string> <string name="setup_orientation_reverse">Перевернута альбомна</string> <string name="setup_fullscreen">Повний екран</string> <string name="setup_fullscreen_on">Приховує рядок стану та панель навігації Android</string> <string name="setup_fullscreen_off">Показує рядок стану та панель навігації Android</string> + <string name="setup_dual_screen">Два екрани</string> + <string name="setup_dual_screen_hint">Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані.</string> + <string name="setup_dual_screen_auto">Автоматично</string> + <string name="setup_dual_screen_on">Увімк.</string> + <string name="setup_dual_screen_off">Вимк.</string> + <string name="setup_dual_screen_menu">Меню на нижньому екрані</string> + <string name="setup_dual_screen_menu_hint">Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи.</string> + <string name="setup_dual_screen_controls">Керування на нижньому екрані в іграх</string> + <string name="setup_dual_screen_controls_hint">Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу.</string> + <string name="dual_typing_title">Введення для верхнього екрана</string> + <string name="dual_typing_done">Готово</string> <string name="setup_default_home">Стандартний додаток головного екрана</string> <string name="setup_choose_home">Виберіть додаток головного екрана</string> <string name="setup_choose">Вибрати</string> @@ -912,6 +1051,14 @@ <string name="gate_step1">Відкрийте «Налаштування» → «Параметри розробника» → «Бездротове налагодження» і увімкніть його</string> <string name="gate_step2">Натисніть «Поєднати пристрій за кодом»</string> <string name="gate_step3">Введіть код у сповіщення DroidDeck</string> + <string name="pairguide_build_number">У розділі «Про телефон» натисніть «Номер збірки» 7 разів</string> + <string name="pairguide_wireless">Увімкніть «Налагодження через Wi-Fi»</string> + <string name="pairguide_pair">Відкрийте «Налагодження через Wi-Fi» і натисніть «Підключити пристрій за допомогою коду»</string> + <string name="pairguide_child_process">Увімкніть «Вимкнути обмеження дочірніх процесів»</string> + <string name="pairguide_row_child_process">Вимкнути обмеження дочірніх процесів</string> + <string name="pairguide_row_build_number">Номер збірки</string> + <string name="pairguide_row_wireless">Налагодження через Wi-Fi</string> + <string name="pairguide_row_pair">Підключити пристрій за допомогою коду</string> <string name="gate_waiting">Очікування вікна поєднання…</string> <string name="gate_code_needed">Вікно знайдено. Введіть його код у сповіщенні.</string> <string name="gate_status">Статус</string> @@ -1035,8 +1182,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 +1189,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> @@ -1053,10 +1197,8 @@ <string name="games_never_played">Ще не грали</string> <string name="games_runtime_busy_percent">Середовище зайняте · %1$d%%</string> <string name="games_runtime_busy">Середовище зайняте</string> - <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> @@ -1071,6 +1213,9 @@ <string name="gpu_hide_other">Приховати драйвери для інших GPU</string> <string name="gpu_show_other">Показати драйвери для інших GPU</string> <string name="gpu_advanced">Додатково</string> + <string name="gpu_ubwc_title">Сумісність UBWC</string> + <string name="gpu_ubwc_hint">Спробуйте «Увімк.» або «Вимк.», якщо в Steam чи Android зʼявляються смуги або мерехтіння. Застосовується до обох драйверів після перезапуску DroidDeck.</string> + <string name="gpu_ubwc_restart">Перезапустіть DroidDeck, щоб застосувати.</string> <string name="gpu_set_with_display">Задається разом із драйвером дисплея: %1$s містить обидва.</string> <string name="gpu_set_with_runtime">Задається разом із драйвером середовища: %1$s містить обидва.</string> <string name="gpu_runtime_hint">Використовується іграми та робочим столом.</string> @@ -1125,7 +1270,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> @@ -1179,10 +1324,15 @@ <string name="pip_auto">Автоматично вмикати режим PiP</string> <string name="unfolded_controls">Керування на розгорнутому екрані</string> <string name="unfolded_controls_hint">У розгорнутому стані гра розташована над трекпадами й задніми кнопками Steam Deck. У складеному — гра на весь екран.</string> + <string name="unfolded_controls_with_controller">Залишати з контролером</string> + <string name="unfolded_controls_with_controller_hint">Показувати це сенсорне керування також, коли підʼєднано контролер.</string> <string name="pip_suspended">Призупинено</string> <string name="pip_not_ready">Режим «Картинка в картинці» стане доступним, щойно сеанс буде готовий.</string> <string name="pip_permission">Дозвольте DroidDeck режим «Картинка в картинці» в налаштуваннях Android.</string> <string name="pip_unavailable">Android не вдалося відкрити режим «Картинка в картинці».</string> + <string name="game_more">Більше</string> + <string name="game_edit_art">Змінити обкладинку</string> + <string name="stores_in_steam_label">У Steam</string> <string name="game_shortcut">Ярлик</string> <string name="game_shortcut_add">Додати на головний екран</string> <string name="game_shortcut_choose">Вибрати гру</string> @@ -1206,6 +1356,10 @@ <string name="main_wait_runtime">Дочекайтеся завершення операції із середовищем</string> <string name="main_wait_proton_install">Дочекайтеся завершення встановлення інструмента сумісності</string> + <string name="load_compat_title">Підготовка інструментів сумісності</string> + <string name="load_compat_wait">Очікування завершення налаштування сумісності</string> + <string name="load_compat_hint">Сеанс запуститься, коли налаштування завершиться.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Дочекайтеся завершення встановлення програми для робочого столу</string> <string name="main_wait_install_game">Дочекайтеся завершення встановлення, перш ніж запускати гру</string> <string name="main_saves_close_session">Спершу закрийте сеанс Steam, щоб гра не перезаписала імпортовані збереження</string> @@ -1250,6 +1404,9 @@ <string name="main_install_anyway">Усе одно встановити</string> <string name="main_remove_runtime_title">Видалити середовище Linux</string> <string name="main_remove_runtime_text">Буде видалено середовище, клієнт Steam у ньому та всі встановлені там ігри.</string> + <string name="runtime_actions_title">Середовище Linux</string> + <string name="runtime_actions_text">Відновлення перевстановлює системні файли середовища й зберігає Steam, ваші ігри та налаштування. Доповнення, як-от робочий стіл, установляться знову, коли ви їх наступного разу використаєте. Видалення стирає все.</string> + <string name="runtime_repair">Відновити середовище</string> <string name="main_applied">Застосовано: %1$s</string> <string name="android_app_open_failed_primary">Не вдалося відкрити %1$s на основному екрані</string> <string name="android_app_open_failed_on">Не вдалося відкрити %1$s на %2$s</string> @@ -1385,6 +1542,13 @@ <string name="session_runtime_catalog_unreachable">Не вдалося отримати каталог середовищ. Перевірте з’єднання й натисніть «Грати» ще раз.</string> <string name="session_runtime_install_failed">Середовище Linux не встановилося. Перевірте його в розділі «Налаштування» й натисніть «Грати» ще раз.</string> <string name="session_desktop_install_failed">Робочий стіл не встановився (%1$s). Перевірте з’єднання й натисніть «Робочий стіл» ще раз.</string> + <string name="session_package_resume_failed">Не вдалося завершити перерване встановлення (%1$s). Перевірте зʼєднання та вільне місце, потім спробуйте ще раз.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Середовище Linux пошкоджено: %1$d посилання на бібліотеку вказує на відсутній файл (%2$s), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="few">Середовище Linux пошкоджено: %1$d посилання на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="many">Середовище Linux пошкоджено: %1$d посилань на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="other">Середовище Linux пошкоджено: %1$d посилання на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + </plurals> <string name="session_ended_named">Роботу %1$s несподівано завершено. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> <string name="session_ended_program">Програма несподівано зупинилася. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> <string name="session_ended_desktop">Робочий стіл несподівано зупинився. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> @@ -1401,6 +1565,15 @@ <string name="mode_decky_plugins_hint">Встановіть плагін із ZIP для наступного сеансу Steam.</string> <string name="mode_decky_plugin_downloading">Завантаження…</string> <string name="mode_decky_plugin_install_zip">Встановити із ZIP</string> + <string name="decky_zip_warning_title">Встановлення стороннього плагіна</string> + <string name="decky_zip_warning_text">Команда Decky Loader не перевіряла цей плагін. Він може містити шкідливе ПЗ, наприклад програми для крадіжки вашого облікового запису Steam або пошкодження пристрою. Встановлюючи цей плагін, ви погоджуєтеся, що берете на себе всі ризики для свого пристрою.</string> + <string name="decky_zip_warning_continue">Продовжити</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Зачекайте %1$d секунду</item> + <item quantity="few">Зачекайте %1$d секунди</item> + <item quantity="many">Зачекайте %1$d секунд</item> + <item quantity="other">Зачекайте %1$d секунди</item> + </plurals> <string name="store_cat_games">Ігри</string> <string name="store_cat_audio_video">Аудіо й відео</string> <string name="store_cat_graphics">Графіка</string> @@ -1429,6 +1602,10 @@ <string name="theme_icon_blue_detail">Чорне тло, білий текст і синій для всього вибраного, у фокусі чи натиснутого.</string> <string name="theme_electric">Електричний темно-синій</string> <string name="theme_electric_detail">Яскравіший синій на поверхнях із темно-синім відтінком замість сірого.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Кольори, що плавно змінюються по всій веселці. Враховує налаштування анімації Android.</string> + <string name="theme_rgb_speed">Швидкість</string> + <string name="theme_rgb_speed_hint">Як швидко змінюються кольори.</string> <string name="theme_gradient">Градієнт</string> <string name="theme_gradient_detail">Ваші основний і додатковий кольори, що плавно переходять на кнопках і виділеннях.</string> <string name="theme_gradient_primary">Основний</string> @@ -1560,7 +1737,16 @@ <string name="fm_conflict_skip">Пропустити</string> <string name="fm_select_this_folder">Вибрати цю папку</string> <string name="fm_back">Назад</string> + <string name="fm_exit">Вийти</string> + <string name="fm_return_to_start">Повернутися до початкової папки</string> + <string name="fm_start_unavailable">Початкова папка більше недоступна</string> + <string name="fm_cancel_operation_title">Скасувати операцію?</string> + <string name="fm_cancel_operation_confirmation">Операцію буде скасовано. Ви впевнені?</string> + <string name="fm_accept">Прийняти</string> + <string name="fm_decline">Відхилити</string> <string name="fm_drive_not_readable">%1$s: підключено, але читання зараз недоступне</string> + <string name="fm_drive_access_title">Дозволити доступ до %1$s</string> + <string name="fm_drive_access_text">Android дозволяє DroidDeck бачити цей диск, але не читати його. Увімкніть для DroidDeck доступ до всіх файлів і поверніться.</string> <string name="fm_list_view">Список</string> <string name="fm_grid_view">Сітка</string> <string name="fm_search">Пошук</string> @@ -1634,6 +1820,93 @@ <string name="second_mode_keyboard_trackpad">Клавіатура + трекпад</string> <string name="second_mode_terminal">Термінал</string> <string name="second_mode_deck_controls">Задні кнопки + трекпади Deck</string> + <string name="second_mode_dashboard">Панель</string> + <string name="bottom_dashboard_empty">Тут поки нічого показати.</string> + <string name="bottom_page_downloads">Завантаження</string> + <string name="bottom_downloads_none">Немає активних завантажень.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Завантаження кешу шейдерів</string> + <string name="bottom_downloads_paused">Призупинено</string> + <string name="bottom_downloads_queued">Очікує початку</string> + <string name="bottom_page_notifications">Сповіщення</string> + <string name="bottom_notifications_listener">Нижній екран DroidDeck</string> + <string name="bottom_notifications_why">Показуйте тут повідомлення та інші сповіщення під час гри. Вони лишаються лише на цьому екрані й не зберігаються. Android запитає один раз: сторінка доступу до сповіщень відкриється на цьому екрані; увімкніть там DroidDeck, і ця сторінка повернеться сама.</string> + <string name="bottom_notifications_allow">Дозволити доступ до сповіщень</string> + <string name="bottom_notifications_none">Немає сповіщень.</string> + <string name="bottom_notifications_count">Сповіщень: %1$d</string> + <string name="bottom_notifications_clear">Очистити</string> + <string name="bottom_page_screenshots">Знімки екрана</string> + <string name="stats_fps_needs_hud">Для FPS потрібно ввімкнути HUD</string> + <string name="stats_speed">Швидкість</string> + <string name="stats_pedals">Педалі</string> + <string name="stats_gforce">Перевантаження</string> + <string name="stats_timing">Час</string> + <string name="stats_best_lap">Найкраще коло</string> + <string name="stats_tires">Шини °C</string> + <string name="stats_trace">Газ і гальмо, останні 10 s</string> + <string name="stats_speed_chart">Швидкість, %1$s</string> + <string name="stats_gear">Передача</string> + <string name="stats_speed_units">Одиниці швидкості</string> + <string name="stats_speed_units_auto">Автоматично (%1$s)</string> + <string name="stats_steam_client_arm">Клієнт Steam ARM</string> + <string name="stats_steam_client_x86">Клієнт Steam x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Гальмо</string> + <string name="stats_lights">Панель приладів</string> + <string name="stats_lamp_shift">Перемикання</string> + <string name="stats_lamp_handbrake">Ручне гальмо</string> + <string name="stats_lamp_pit">Обмежувач піт-лейну</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигун %1$s °C</string> + <string name="stats_oil_temp">Олива %1$s °C</string> + <string name="stats_power">Розподільник енергії</string> + <string name="stats_fuel_t">Пальне, t</string> + <string name="stats_fuel_main">Основне %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="stats_tap_hint">Торкніться верхньої смуги або панелі, щоб змінити її стиль.</string> + <string name="bottom_telemetry_send_title">Надсилати дані для панелі</string> + <string name="bottom_telemetry_send_auto">Автоматично</string> + <string name="bottom_telemetry_send_auto_hint">Вмикає це для кожної гри в цьому списку, зокрема для знайдених пізніше. Ігри, які ви вимкнете, лишаються вимкненими.</string> + <string name="bottom_telemetry_send_note">Це змінює власне налаштування виведення даних у грі. Зміна діє з наступного запуску гри; вимкнення повертає попереднє налаштування.</string> + <string name="bottom_telemetry_send_close">Закрийте %1$s, щоб змінити це.</string> + <string name="bottom_telemetry_send_failed">Не вдалося змінити налаштування %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: увімкніть %2$s у налаштуваннях гри з IP 127.0.0.1 і портом %3$d.</string> + <string name="bottom_shots_where">Зберігаються в Pictures/DroidDeck. Знімки екрана Steam також показуються тут.</string> + <string name="bottom_shots_take">Зробити знімок екрана</string> + <string name="bottom_shots_saved">Знімок екрана збережено.</string> + <string name="bottom_shots_failed">Не вдалося зробити знімок екрана.</string> + <string name="bottom_shots_none">Ще немає знімків екрана.</string> + <string name="bottom_page_chat">Чат і голос</string> + <string name="bottom_chat_why">Читайте чат Steam і відповідайте в ньому тут, поки гра працює на головному екрані. Використовується обліковий запис, у який виконано вхід у Steam.</string> + <string name="bottom_chat_not_signed_in">У Steam ще немає вебвходу, яким можна поділитися, тож увійдіть тут один раз.</string> + <string name="bottom_chat_stopped">Android закрив сторінку чату, поки DroidDeck був у фоні. Вона знову відкриється, коли ви повернетеся до DroidDeck.</string> + <string name="bottom_chat_open">Відкрити Steam Chat</string> + <string name="bottom_chat_close">Закрити чат</string> + <string name="bottom_chat_mic_on">Мікрофон увімкнено</string> + <string name="bottom_chat_mic_off">Мікрофон вимкнено</string> + <string name="bottom_chat_mic_unavailable">Для цієї гри мікрофон вимкнено. Щоб говорити, увімкніть «Мікрофон» у налаштуваннях Steam у DroidDeck (Звук) і запустіть гру знову.</string> + <string name="bottom_chat_volume">Гучність %1$d%%</string> + <string name="bottom_page_telemetry">Ігрова статистика</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батарея</string> + <string name="bottom_telemetry_lap">Коло</string> + <string name="bottom_telemetry_position">Позиція</string> + <string name="bottom_telemetry_this_lap">Поточне коло</string> + <string name="bottom_telemetry_last_lap">Останнє коло</string> + <string name="bottom_telemetry_fuel">Пальне</string> + <string name="bottom_telemetry_cargo">Вантаж</string> + <string name="bottom_telemetry_pips">Енергія SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правовий статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Увімкніть виведення даних у гоночній грі (часто це називається телеметрією або UDP), щоб бачити тут живу панель. Дані лишаються на цьому пристрої.</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d отримує дані (пакетів: %2$d, по %3$d байт), але у форматі, який ця сторінка ще не вміє читати.</string> + <string name="bottom_telemetry_port_busy">Порт %1$s уже використовує інша програма, тому ця гра не може відображатися тут.</string> <string name="rtinst_removing">Видалення середовища Linux</string> <plurals name="rtinst_removing_entries"> @@ -1666,6 +1939,7 @@ <string name="flatpakmgr_not_ready">Спершу налаштуйте Flatpak</string> <string name="flatpakmgr_starting">Запуск</string> <string name="flatpakmgr_exit_status">Flatpak завершився з кодом %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s зібрано для %2$s, а DroidDeck не може це запустити. Застосункам Flatpak тут потрібна збірка для ARM64 або x86_64.</string> <string name="flatpakmgr_installing">Встановлення %1$s</string> <string name="flatpakmgr_updating">Оновлення %1$s</string> <string name="flatpakmgr_removing">Видалення %1$s</string> @@ -1759,6 +2033,7 @@ <string name="adbpair_applying">Застосування налаштування…</string> <string name="adbpair_command_failed">Помилка команди бездротового налагодження</string> <string name="adbpair_channel_name">Налаштування бездротового налагодження</string> + <string name="adbpair_progress_channel_name">Хід налаштування налагодження через Wi-Fi</string> <string name="adbpair_channel_description">Запитує код прив’язки бездротового налагодження, коли відкрито «Налаштування»</string> <string name="adbpair_title_pair">Прив’язати бездротове налагодження</string> <string name="adbpair_waiting_text">Увімкніть бездротове налагодження, потім торкніться «Прив’язати пристрій за кодом прив’язки».</string> @@ -1867,6 +2142,7 @@ <string name="gpuinfo_not_adreno">Не GPU Adreno</string> <string name="gpuinfo_supported">Підтримується</string> <string name="gpuinfo_experimental">Експериментально: його драйвери - тестові збірки</string> + <string name="gpuinfo_a850_experimental">Експериментальна підтримка Adreno 850: потрібні сумісні експериментальні драйвери дисплея та ігор; не перевірено на цьому пристрої</string> <string name="gpuinfo_below_tested">Нижче за протестоване обладнання (Adreno 725 і новіші): може не запрацювати</string> <string name="gpuinfo_unsupported">Не підтримується: DroidDeck потребує GPU Adreno (Snapdragon)</string> @@ -1960,10 +2236,10 @@ <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> + <string name="display_follow_screen_scaled">Масштаб %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Показати відомості про пристрій</string> <string name="device_info_hide">Сховати відомості про пристрій</string> @@ -1978,7 +2254,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> @@ -1992,11 +2267,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> @@ -2014,9 +2287,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> @@ -2035,12 +2316,43 @@ <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> <string name="stores_sort">Сортувати</string> + <string name="setup_rail_labels">Підписи бічної панелі</string> + <string name="setup_rail_labels_hint">Показувати назви під значками бічної панелі. Вимкніть, щоб зробити панель вужчою.</string> + <string name="library_display">Вигляд</string> + <string name="library_display_larger">Великі картки</string> + <string name="library_display_smaller">Малі картки</string> + <string name="library_display_title">Показувати назву</string> + <string name="library_display_size">Показувати розмір</string> <string name="stores_sort_last_played">Нещодавно запущені</string> <string name="stores_sort_recently_installed">Нещодавно встановлені</string> <string name="stores_sort_title_asc">Назва А–Я</string> @@ -2167,6 +2479,9 @@ <string name="stores_download_manager">Менеджер завантажень</string> <string name="stores_parallel">Одночасних завантажень</string> <string name="stores_install_where">Встановити в</string> + <string name="stores_install_language">Мова гри</string> + <string name="stores_install_language_hint">GOG і Epic установлюють цю мову. «Системна» відповідає мові додатка.</string> + <string name="stores_install_language_system">Системна</string> <string name="stores_install_title">Встановити %1$s:</string> <string name="stores_target_internal">Внутрішня пам’ять</string> <string name="stores_target_free">%1$s вільно</string> @@ -2189,6 +2504,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> @@ -2204,6 +2520,9 @@ <string name="edit_target">Ціль</string> <string name="edit_start_in">Робоча папка</string> <string name="edit_launch_options">Параметри запуску</string> + <string name="edit_launch_options_steam_hint">Спільні з «Властивостями» Steam: зміна в одному місці видна в обох.</string> + <string name="edit_launch_options_not_saved">Не вдалося зберегти параметри запуску в Steam. Спробуйте ще раз.</string> + <string name="edit_launch_options_desktop">Steam може бути відкритий у сеансі робочого столу. Змініть параметри запуску в його «Властивостях» або спершу закрийте сеанс.</string> <string name="edit_artwork">Графіка</string> <string name="edit_other_exe">Інший exe…</string> <string name="edit_remove">Вилучити</string> @@ -2335,6 +2654,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="flathub_eyebrow">ПРОГРАМИ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Програми для стільниці Linux, які відкриваються з Робочого столу.</string> @@ -2479,6 +2799,22 @@ <string name="glasses_tracking_flat_hint">«Автоматично» тримає цю 2D-гру нерухомою в полі зору. Щоб використовувати відстеження голови, виберіть «Віртуальний екран» у розділі «Екран».</string> <string name="glasses_tracking_sbs_hint">Відстеження голови діє для віртуального екрана або запущеної гри SteamVR.</string> <string name="glasses_hardware">Пристрій</string> + <string name="vr_controllers_tab">Контролери</string> + <string name="vr_controllers_group">Контролери SteamVR</string> + <string name="vr_controllers_emulate">Геймпад у VR</string> + <string name="vr_controllers_emulate_hint">Дві VR-руки, якими грає ваш контролер. Зміни застосовуються одразу, навіть коли працює SteamVR. Joy-Con і відстежувані руки все одно перебирають свою сторону.</string> + <string name="vr_controllers_off">Звичайний геймпад</string> + <string name="vr_controllers_index">Контролери Valve Index</string> + <string name="vr_controllers_touch">Контролери Meta Quest 3</string> + <string name="vr_controllers_vive">Контролери HTC Vive</string> + <string name="vr_controllers_sticks">Стіки спочатку</string> + <string name="vr_controllers_sticks_hint">Натисніть обидва стіки одночасно у VR, щоб перемкнути.</string> + <string name="vr_controllers_sticks_game">Переміщують вас у грі</string> + <string name="vr_controllers_sticks_hands">Переміщують руки</string> + <string name="vr_controllers_buttons">Кнопки</string> + <string name="vr_controllers_buttons_stick">Тригери — це тригери, бампери — хват, A/B і X/Y — лицьові кнопки кожної руки, натискання стіків натискають стіки VR-контролерів, Guide відкриває меню SteamVR. Вгору й вниз на хрестовині наближають або віддаляють руки.</string> + <string name="vr_controllers_buttons_vive">Стіки працюють як трекпади; A/X або натискання стіка натискає їх. Тригери — це тригери, бампери — хват, Start і Select — меню, Guide відкриває меню SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR-рук. Ігри з підтримкою геймпада й меню SteamVR отримують ваш контролер як зазвичай.</string> <string name="glasses_brightness">Яскравість</string> <string name="glasses_volume">Гучність</string> <string name="glasses_sunblock">Затемнення</string> @@ -2536,6 +2872,12 @@ <string name="hand_camera_placement">Розташування камери</string> <string name="hand_camera_placement_hint">Перевірте, що камера бачить вас, перш ніж почати гру.</string> <string name="hand_camera_check">Перевірити</string> + <string name="tracking_pack_title">Завантаження відстеження рук</string> + <string name="tracking_pack_hint">Для відстеження рук потрібне одноразове завантаження %1$s.</string> + <string name="tracking_pack_download">Завантажити</string> + <string name="tracking_pack_retry">Повторити</string> + <string name="tracking_pack_downloading">Завантаження відстеження рук… %1$d%%</string> + <string name="tracking_pack_failed">Не вдалося завантажити відстеження рук. Перевірте зʼєднання та спробуйте ще раз.</string> <string name="hand_camera_check_title">Розташування камери</string> <string name="hand_camera_how_rear">Поставте пристрій вертикально на відстані від 1,5 до 2 метрів, приблизно на рівні грудей, спрямувавши задню камеру на себе. Потім станьте в кадр, витягнувши руки.</string> <string name="hand_camera_how_front">Поставте пристрій вертикально на відстані від 1,5 до 2 метрів, приблизно на рівні грудей, спрямувавши екран на себе. Потім станьте в кадр, витягнувши руки.</string> @@ -2607,6 +2949,21 @@ <string name="storage_safe_hint">Невикористані середовища виконання, залишки, старі журнали</string> <string name="storage_clean_up">Очищення…</string> <string name="storage_session_running">Зупиніть сеанс, щоб очистити або видалити будь-що. Розміри залишаться видними.</string> + <string name="storage_default_group">Місце встановлення</string> + <string name="storage_default_title">Сховище за замовчуванням</string> + <string name="storage_default_hint">Нові встановлення з магазинів потрапляють у вибране місце. Наявні ігри залишаються на місці. Бібліотеки Steam мають власне налаштування.</string> + <string name="storage_default_ask">Питати щоразу</string> + <string name="storage_default_ask_detail">Вибирати місце для кожного встановлення</string> + <string name="storage_default_internal">Внутрішнє сховище</string> + <string name="storage_default_external">Зовнішнє сховище</string> + <string name="storage_default_external_detail">%1$s · вільно %2$s</string> + <string name="storage_default_external_missing">Не підключено</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">Вільно %1$s</string> + <string name="storage_default_folder_missing">Не підключено</string> + <string name="storage_default_choose_folder">Вибрати папку…</string> + <string name="storage_default_choose_folder_detail">Будь-яка папка на SD-картці або USB-накопичувачі</string> + <string name="storage_default_note">Ігри потрапляють у папку Games у вибраному місці. Наявні ігри не переміщуються.</string> <string name="storage_where">Куди йде</string> <string name="storage_games">Ігри Steam</string> <string name="storage_game_data">Дані ігор</string> @@ -2742,6 +3099,9 @@ <string name="storage_data_installed">Встановлені ігри</string> <string name="storage_data_parts">Префікси %1$s · шейдери %2$s · майстерня %3$s</string> <string name="storage_clear_shaders">Очистити шейдери</string> + <string name="storage_reset_prefix">Скинути префікс</string> + <string name="storage_reset_prefix_title">Скинути префікс для %1$s?</string> + <string name="storage_reset_prefix_confirm">Видаляє префікс Wine (%1$s) у %2$s і створює його знову під час наступного запуску. Збереження, налаштування та встановлені в ньому розповсюджувані пакети буде втрачено; збереження Steam Cloud залишаються у вашому обліковому записі.</string> <string name="storage_data_leftovers">Видалені ігри</string> <string name="storage_steam_app">Застосунок Steam %1$d</string> <string name="storage_leftover_unsure_detail">Префікс ще містить файли, можливо локальні збереження</string> @@ -3046,5 +3406,309 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронізація через Syncthing</string> + <string name="sync_enable_hint">Це реалізація Syncthing на основі Syncthing-Fork, яка дає змогу синхронізувати файли у внутрішній файловій системі DroidDeck з іншими екземплярами Syncthing. Вона працює лише з файлами, які ви зберігаєте у внутрішній файловій системі DroidDeck.</string> + <string name="sync_missing">Ця збірка не містить Syncthing.</string> + <string name="sync_starting">Запуск Syncthing</string> + <string name="sync_status_starting">Запуск</string> + <string name="sync_status_up_to_date">Синхронізовано</string> + <string name="sync_status_syncing">Синхронізація</string> + <string name="sync_status_paused">Призупинено</string> + <string name="sync_status_pausing">Призупинення</string> + <string name="sync_status_resuming">Відновлення</string> + <string name="sync_status_attention">Потрібна увага</string> + <string name="sync_status_failed">Syncthing зупинено</string> + <string name="sync_failed_retry">Повторити</string> + <string name="sync_paused_wifi">Призупинено до підключення до Wi-Fi</string> + <string name="sync_paused_game">Призупинено на час гри</string> + <string name="sync_summary">Папок: %1$d · підключено пристроїв: %2$d з %3$d</string> + <string name="sync_left">Залишилося: %1$s</string> + <string name="sync_open_web_ui">Відкрити вебінтерфейс</string> + <string name="sync_pause">Призупинити</string> + <string name="sync_resume">Відновити</string> + <string name="sync_running">Працює</string> + <string name="sync_running_hint">Вимкніть, щоб повністю зупинити Syncthing.</string> + <string name="sync_this_device">Цей пристрій</string> + <string name="sync_device_id">ID пристрою</string> + <string name="sync_show_qr">Показати QR-код</string> + <string name="sync_advanced">Додатково</string> + <string name="sync_advanced_hint">Порти, коли працювати, скидання</string> + <string name="sync_open">Відкрити</string> + <string name="sync_waiting">Чекає на вас</string> + <string name="sync_pending_device">%1$s хоче підключитися</string> + <string name="sync_pending_folder">%1$s хоче надати доступ до «%2$s»</string> + <string name="sync_pending_folder_hint">Прийміть, щоб вибрати, куди зберігати її в DroidDeck.</string> + <string name="sync_review">Переглянути у вебінтерфейсі</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Папок ще немає.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Синхронізовано</string> + <string name="sync_folder_syncing">Синхронізація: %1$d%%</string> + <string name="sync_folder_scanning">Сканування</string> + <string name="sync_folder_paused">Призупинено</string> + <string name="sync_folder_out_of_sync">Не синхронізовано</string> + <string name="sync_folder_errors">Не вдалося синхронізувати файлів: %1$d</string> + <string name="sync_folder_blocked">Заблоковано</string> + <string name="sync_folder_blocked_hint">Ця папка розташована поза сховищем DroidDeck, тому DroidDeck її призупинив. Щоб синхронізувати папки поза DroidDeck, скористайтеся додатком Syncthing-Fork.</string> + <string name="sync_remove_folder">Видалити із Syncthing</string> + <string name="sync_remove_folder_hint">Видалення не стирає жодних файлів.</string> + <string name="sync_devices">Пристрої</string> + <string name="sync_no_devices">Пристроїв ще немає.</string> + <string name="sync_connected">Підключено</string> + <string name="sync_offline">Не в мережі</string> + <string name="sync_last_seen">Востаннє в мережі: %1$s</string> + <string name="sync_device_id_title">ID цього пристрою</string> + <string name="sync_device_id_hint">На іншому пристрої додайте пристрій у Syncthing і відскануйте цей код або вставте ID. Потім прийміть його тут у вебінтерфейсі.</string> + <string name="sync_copy">Копіювати</string> + <string name="sync_share">Поділитися</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Вимкнути Syncthing?</string> + <string name="sync_off_body">Syncthing зупиниться зараз і не працюватиме, доки ви його знову не ввімкнете. Синхронізовані файли залишаться на місці.</string> + <string name="sync_off_forget">Також видалити конфігурацію Syncthing</string> + <string name="sync_off_forget_hint">Видаляє ID цього пристрою, папки й пристрої. Після повторного ввімкнення все почнеться з нуля.</string> + <string name="sync_turn_off">Вимкнути</string> + <string name="sync_ports">Порти</string> + <string name="sync_port_sync">Синхронізація</string> + <string name="sync_port_discovery">Локальне виявлення</string> + <string name="sync_repick">Вибрати нові порти</string> + <string name="sync_repick_hint">Перевіряється під час кожного запуску.</string> + <string name="sync_repick_button">Вибрати знову</string> + <string name="sync_reset_group">Скидання</string> + <string name="sync_api_key">Ключ API</string> + <string name="sync_regenerate">Згенерувати знову</string> + <string name="sync_reset">Скинути Syncthing</string> + <string name="sync_reset_hint">Новий ID пристрою, папки й пристрої буде видалено. Файли у сховищі DroidDeck збережуться.</string> + <string name="sync_reset_button">Скинути</string> + <string name="sync_reset_confirm_title">Скинути Syncthing?</string> + <string name="sync_running_group">Робота</string> + <string name="sync_run">Режим роботи</string> + <string name="sync_run_open">Поки DroidDeck відкрито</string> + <string name="sync_run_background">У фоновому режимі</string> + <string name="sync_wifi_only">Лише Wi-Fi</string> + <string name="sync_pause_games">Призупиняти під час ігор</string> + <string name="sync_logs">Журнали</string> + <string name="sync_logs_hint">Вивід Syncthing за цей сеанс</string> + <string name="sync_logs_share">Поділитися</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Спершу встановіть середовище Linux.</string> + <string name="sync_accept">Прийняти</string> + <string name="sync_accept_title">Куди зберегти «%1$s»</string> + <string name="sync_add_folder">Додати папку</string> + <string name="sync_add_folder_hint">Синхронізувати папку у сховищі DroidDeck</string> + <string name="sync_choose">Вибрати</string> + <string name="sync_add">Додати</string> + <string name="sync_add_failed">Не вдалося додати папку.</string> + <string name="sync_share_with">Надати доступ</string> + <string name="sync_share_none">Пристроїв ще немає. Ви зможете надати доступ до цієї папки пізніше у вебінтерфейсі.</string> + <string name="sync_use_folder">Використати цю папку</string> + <string name="sync_new_folder">Нова папка</string> + <string name="sync_location_home">Домашня папка контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Спільне сховище DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Дані додатка DroidDeck</string> + <string name="sync_web_path_locked">Нові папки зберігаються в папці Sync у DroidDeck. Щоб синхронізувати іншу папку DroidDeck, скористайтеся кнопкою «Додати папку» на вкладці Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Перезавантажити</string> + <string name="sync_not_running">Syncthing не запущено.</string> + <string name="session_end_steam_sigill">Steam зупинився через недопустиму інструкцію (SIGILL). Це може бути проблема сумісності інструкцій CPU або збій клієнта. Надішліть журнали разом із даними про ваш пристрій.</string> + <string name="session_end_steam_try_x64">Можна спробувати «Налаштування Steam → Клієнт Steam → x86-64 (експериментально)». Потрібне додаткове завантаження, і робота може бути повільнішою.</string> + <string name="session_end_vulkan_device">Графічний драйвер Linux не знайшов придатного пристрою Vulkan. Перевірте, чи вибраний драйвер GPU для Linux підтримує цей GPU.</string> + <string name="session_end_gpu_unsupported">Сеанс не може запуститися: для цього GPU в поточній конфігурації немає сумісного драйвера Vulkan для Linux. Драйвери Adreno Turnip не можуть увімкнути підтримку GPU MediaTek/Mali.</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_resources_browser">Відкриється в браузері</string> + <string name="game_resource_guides">Посібники</string> + <string name="game_resource_protondb_detail">Звіти про сумісність з Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Для ігор зі збереженнями в обліковому записі Steam</string> + <string name="game_resource_search">Пошук в інтернеті</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="library_filter">Фільтр</string> + <string name="library_filter_installed">Лише встановлені</string> + <string name="library_filter_all_owned">Усі придбані ігри</string> + <string name="library_no_installed_matches">Немає встановлених ігор, що відповідають цим фільтрам.</string> + <string name="library_browse_owned">Переглянути придбані ігри</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="stores_itch_updates_found">Доступні оновлення: %1$d</string> + <string name="stores_itch_update_replaced">Розробник замінив цю збірку на %1$s. Оновити до неї?</string> + <string name="xbox_filter_cloud">Хмара</string> + <string name="stores_xbox_cloud_settings">Налаштування хмари</string> + <string name="integration_title">Інтеграція зі Steam</string> + <string name="integration_count">Увімкнено %1$d з %2$d</string> + <string name="integration_set_up">Налаштувати</string> + <string name="integration_location">Місцезнаходження</string> + <string name="integration_app_info">Про додаток</string> + <string name="integration_wifi">Назви мереж Wi-Fi</string> + <string name="integration_brightness">Яскравість</string> + <string name="integration_home">DroidDeck як головний екран</string> + <string name="integration_shortcuts">Комбінації кнопки «Додому»</string> + <string name="integration_wifi_hint">Показувати мережі в Steam · потрібен доступ до місцезнаходження, без стеження</string> + <string name="integration_wifi_on">Мережі відображаються в Steam</string> + <string name="integration_wifi_location_off">Місцезнаходження вимкнено</string> + <string name="integration_wifi_denied">Доступ до місцезнаходження заборонено · дозвольте його в «Про додаток»</string> + <string name="integration_brightness_hint">Повзунок Steam задає яскравість екрана</string> + <string name="integration_home_hint">«Додому» відкриває меню Steam у сеансі</string> + <string name="integration_shortcuts_hint">Утримуйте «Додому» для комбінацій Steam Guide</string> + <string name="integration_shortcuts_needs_home">Потрібен DroidDeck як головний екран</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? «Про додаток» → ⋮ → «Дозволити обмежені налаштування»</string> + <string name="integration_shortcuts_restricted">Заблоковано Android · «Про додаток» → ⋮ → «Дозволити обмежені налаштування»</string> + <string name="integration_shortcuts_service">Кнопка «Додому» DroidDeck</string> + <string name="integration_shortcuts_service_description">Передає натискання кнопки «Додому» в Steam Guide, поки активний сеанс Steam і DroidDeck є типовим головним екраном. Не зчитує вміст екрана.</string> + <string name="integration_brightness_needed">Увімкніть «Яскравість» у «Налаштування → Інтеграція зі Steam»</string> + <string name="apps_search_hint">Пошук застосунків</string> + <string name="apps_no_match">Немає застосунків за запитом «%1$s».</string> + <string name="apps_add_widget">Додати віджет</string> + <string name="apps_widgets_loading">Завантаження віджетів…</string> + <string name="apps_widgets_none">На цьому пристрої немає застосунків із віджетами.</string> + <string name="apps_widget_wider">Ширше</string> + <string name="apps_widget_narrower">Вужче</string> + <string name="apps_widget_taller">Вище</string> + <string name="apps_widget_shorter">Нижче</string> + <string name="apps_widget_move_earlier">Перемістити раніше</string> + <string name="apps_widget_move_later">Перемістити пізніше</string> + <string name="apps_widget_configure">Налаштування віджета</string> + <string name="apps_widget_remove">Вилучити віджет</string> + <string name="apps_add_to_folder">Додати до папки</string> + <string name="apps_new_folder">Нова папка</string> + <string name="apps_remove_from_folder">Вилучити з папки</string> + <string name="apps_app_info">Про застосунок</string> + <string name="apps_uninstall">Видалити</string> + <string name="apps_folder_rename">Перейменувати</string> + <string name="apps_folder_ungroup">Розгрупувати</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Назва папки</string> + <string name="apps_filter">Показати</string> + <string name="apps_filter_all">Усі застосунки</string> + <string name="apps_filter_games">Ігри</string> + <string name="apps_filter_downloaded">Завантажені</string> + <string name="apps_filter_system">Системні</string> + <string name="apps_filter_hidden">Приховані</string> + <string name="apps_hide">Приховати</string> + <string name="apps_unhide">Показувати в застосунках</string> + <string name="apps_shortcut_remove">Вилучити ярлик</string> + <string name="apps_pin_title">Додати до застосунків</string> + <string name="apps_pin_add">Додати</string> + <string name="apps_hidden_none">Прихованих застосунків немає.</string> + <string name="apps_sort_name_asc">Назва А–Я</string> + <string name="apps_sort_name_desc">Назва Я–А</string> + <string name="apps_sort_installed">Нещодавно встановлені</string> + <string name="apps_sort_updated">Нещодавно оновлені</string> + <plurals name="apps_count"> + <item quantity="one">%d застосунок</item> + <item quantity="few">%d застосунки</item> + <item quantity="many">%d застосунків</item> + <item quantity="other">%d застосунку</item> + </plurals> + <string name="desktop_restore_title">Відновлення програм</string> + <string name="desktop_restore_body">Повторне встановлення доданих вами застосунків після оновлення DroidDeck.</string> + <string name="desktop_restore_done_title">Програми відновлено</string> + <string name="desktop_restore_done_body">Додані вами застосунки знову встановлено.</string> + <string name="desktop_restore_failed_title">Не вдалося відновити частину програм</string> + <string name="desktop_restore_failed_body">Перегляньте ~/.cache/droiddeck/apt-restore.log, потім спробуйте sudo apt install у Konsole.</string> + <string name="gog_full_files">Нативні оптимізації недоступні. Завантаження містить повні файли для заміни.</string> + <string name="gog_recover">Перевірити результат патча</string> + <string name="slow_usb_title">Повільне з’єднання USB</string> + <string name="slow_usb_cable">%1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с), тому ігри на ньому завантажуватимуться повільно. Використайте кабель USB 3 на 5 Гбіт/с або швидший, спробуйте перевернути роз’єм USB-C або візьміть швидший накопичувач.</string> + <string name="slow_usb_port">%1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с). USB-порт цього пристрою не працює швидше, тому ігри завантажуватимуться повільно. Внутрішня пам’ять або карта microSD можуть бути швидшими.</string> + <string name="slow_usb_never">Більше не показувати</string> + <string name="slow_usb_dismiss">Закрити</string> + <string name="steam_import_title">Перезапустити Steam, щоб додати ваші ігри?</string> + <string name="steam_import_body">Steam може показати ці ваші ігри як встановлені: %1$s. Для цього його треба перезапустити. Перезапустіть зараз, або їх буде додано під час наступного запуску Steam.</string> + <string name="steam_import_names_more">%1$s і ще %2$d</string> + <string name="steam_import_now">Перезапустити зараз</string> + <string name="steam_import_later">Пізніше</string> + <string name="gog_maintenance">Керування встановленням GOG</string> + <string name="gog_check">Перевірити оновлення</string> + <string name="gog_repair">Перевірка/відновлення</string> + <string name="gog_patches">Офлайн-патчі</string> + <string name="gog_refresh">Завантажити повний офлайн-інсталятор</string> + <string name="gog_update">Оновити до %1$s</string> + <string name="gog_resume">Продовжити обслуговування GOG</string> + <string name="gog_open_patch">Відкрити інсталятор патча</string> + <string name="gog_patch_in_session">Завершіть або скасуйте інсталятор патча в сеансі Linux.</string> + <string name="gog_patch_requirements">Виберіть патч для встановленої версії та мови. Підтримувані вихідні версії можуть бути не вказані.</string> + <string name="gog_no_patches">У GOG немає окремих патчів для Windows для цієї гри.</string> + <string name="gog_managed_files">Змінені файли гри можуть бути замінені.</string> + <string name="gog_patch_installer_note">Інсталятор відкриється у вашому сеансі Linux.</string> + <string name="gog_download_label">Завантаження</string> + <string name="gog_space_label">Додаткове місце</string> + <string name="gog_space_estimate_label">Оцінка місця</string> + <string name="gog_repair_action">Відновити файли</string> + <string name="gog_refresh_action">Оновити встановлення</string> + <string name="gog_select_patch">Вибрати</string> + <string name="setup_all_files">Доступ до всіх файлів</string> + <string name="setup_local_network">Локальна мережа</string> + <string name="libraries_title">Інші бібліотеки Steam</string> + <string name="libraries_hint">Папки, у які Steam може встановлювати та з яких запускати ігри, кожна з власною назвою. Вилучення зі списку зберігає ігри на диску.</string> + <string name="libraries_add">Додати бібліотеку</string> + <string name="libraries_rename_title">Назва бібліотеки</string> + <string name="libraries_pick">Виберіть папку бібліотеки</string> + <string name="libraries_full">Щонайбільше %1$d додаткових бібліотек</string> + <string name="libraries_overlap">Ця папка вже є бібліотекою або міститься в ній</string> + <string name="libraries_missing">%1$s · недоступна</string> + <string name="libraries_applies_next">Діє з наступного сеансу Steam</string> + <string name="bottom_desktop_start">Запустити робочий стіл</string> + <string name="bottom_desktop_mode_touch">Прямий дотик</string> + <string name="bottom_desktop_trackpad">Трекпад. Торкніться для прямого дотику</string> + <string name="bottom_desktop_direct_touch">Прямий дотик. Торкніться для трекпада</string> + <string name="bottom_desktop_starting">Запуск робочого столу KDE…</string> + <string name="bottom_desktop_ended">Робочий стіл закрився.</string> + <string name="bottom_desktop_failed">Не вдалося запустити робочий стіл. Журнали містяться в папці bottom-desktop цього сеансу.</string> + <string name="bottom_desktop_off">Робочий стіл закрито.</string> + <string name="libraries_rename">Перейменувати</string> + <string name="second_mode_desktop">Робочий стіл</string> + <string name="bottom_desktop_mode_trackpad">Трекпад</string> + <string name="bottom_desktop_title">Робочий стіл · %1$s</string> </resources> diff --git a/app/src/main/res/values-vi/gestures.xml b/app/src/main/res/values-vi/gestures.xml index 90196d5ae..40bd8c9b7 100644 --- a/app/src/main/res/values-vi/gestures.xml +++ b/app/src/main/res/values-vi/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Cử chỉ</string> <string name="gesture_settings">Cài đặt cử chỉ cảm ứng</string> - <string name="gesture_settings_hint">Tùy chỉnh cử chỉ chuột và bàn phím. Chọn Cử chỉ làm chế độ cảm ứng để sử dụng.</string> <string name="gesture_tap">Chạm</string> <string name="gesture_drag">Kéo bằng một ngón tay</string> <string name="gesture_long_press">Nhấn giữ</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Giữ bằng ba ngón tay</string> <string name="gesture_pinch">Chụm hoặc mở hai ngón tay để thu phóng</string> <string name="gesture_hold_button">Giữ nút được nhấn</string> + <string name="gesture_hold_left">Giữ nút trái được nhấn</string> + <string name="gesture_hold_right">Giữ nút phải được nhấn</string> <string name="gesture_click_once">Nhấp một lần</string> <string name="gesture_hold_delay">Độ trễ nhấn giữ</string> <string name="gesture_double_delay">Khoảng thời gian chạm hai lần</string> diff --git a/app/src/main/res/values-vi/shortcuts.xml b/app/src/main/res/values-vi/shortcuts.xml new file mode 100644 index 000000000..fccc48168 --- /dev/null +++ b/app/src/main/res/values-vi/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Phím tắt nút vật lý</string> + <string name="shortcuts_dd_menu">Menu DroidDeck</string> + <string name="shortcuts_capture">Gán: %1$s</string> + <string name="shortcuts_press">Nhấn và thả một nút. Gán nút được lưu tự động.</string> + <string name="shortcuts_release">Thả nút để tiếp tục.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">Nút này đã được gán cho: %1$s</string> + <string name="shortcuts_save">Gán lại</string> + <string name="shortcuts_retry">Thử nút khác</string> + <string name="shortcuts_limitations">Nút Home và một số nút bổ sung có thể không khả dụng.</string> +</resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c7e88e065..2dd0647e5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Tùy chọn VKD3D cho D3D12. nodxr tắt dò tia; chỉ dùng cho game cần nó.</string> <string name="game_env_proton_log">Đặt thành 1 để có log chẩn đoán Proton. Ghi log có thể giảm hiệu năng và dùng dung lượng.</string> <string name="game_env_wined3d">Đặt thành 1 để dùng WineD3D dựa trên OpenGL thay cho DXVK khi kiểm tra tương thích D3D9–11.</string> + <string name="game_env_wined3d_renderer">Trình kết xuất cho DirectDraw, Direct3D 1-7 và các game chạy bằng WineD3D. Vulkan bỏ qua đường OpenGL-trên-Zink và nhanh hơn nhiều cho game DirectDraw và Direct3D 7 cũ trên Adreno.</string> + <string name="game_env_dxvk_d3d8">Đặt thành 1 để chạy Direct3D 8 qua DXVK thay cho WineD3D. Nhanh hơn trong bài kiểm tra Direct3D 8 của AIO Graphics Test trên Adreno.</string> <string name="game_env_no_ntsync">Đặt thành 1 để giữ game này không dùng ntsync (droiddeck-ntsync hoặc driver kernel); nó sẽ dùng droiddeck-esync nếu có pack phù hợp, nếu không thì droiddeck-fsync.</string> <string name="game_env_no_esync">Đặt thành 1 để tắt droiddeck-esync cho game này; nó sẽ dùng droiddeck-fsync thay vào đó, hoặc droiddeck-ntsync nếu fsync cũng tắt.</string> <string name="game_env_no_fsync">Đặt thành 1 để giữ game này không dùng droiddeck-fsync; nó sẽ dùng droiddeck-esync nếu có pack phù hợp, nếu không thì droiddeck-ntsync.</string> <string name="game_env_fsync_first">Đặt thành 1 để chạy game này trên droiddeck-fsync, hoặc 0 để ưu tiên droiddeck-esync nếu có pack phù hợp với Proton.</string> <string name="game_env_xalia">Đặt thành 0 để tắt trình hỗ trợ điều hướng bằng tay cầm của Proton cho game này.</string> + <string name="game_env_anticheat_offline">Bật mặc định. Khởi động game Easy Anti-Cheat mà không có anti-cheat khi game hỗ trợ chơi ngoại tuyến. Tắt để khởi chạy qua Easy Anti-Cheat như thường. Các chế độ trực tuyến yêu cầu Easy Anti-Cheat vẫn không khả dụng.</string> <string name="game_env_hud">Lớp phủ DXVK cho D3D9–11. fps hiển thị tốc độ khung hình; để trống để ẩn.</string> <string name="game_env_dxvk_config">Các thiết lập DXVK ngăn cách bằng dấu chấm phẩy. Các bản build gần đây dùng dxvk.maxFrameRate để giới hạn khung hình; nên dùng bộ giới hạn khung hình của phiên khi chơi thông thường.</string> + <string name="game_env_cores">Lõi CPU cho game này, ví dụ 0-4 hoặc 0,2,4, thay cho lõi game của phiên. Ít lõi hơn thì mát hơn.</string> <string name="game_env_vkd3d_limit">Giới hạn tốc độ khung hình D3D12. 0 tắt giới hạn.</string> <string name="game_env_glthread">Luồng OpenGL của Mesa. true có thể giúp các game OpenGL bị giới hạn bởi CPU; hãy thử trên từng game.</string> <string name="sync_backend_title">Đồng bộ Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX chạy các chương trình Linux x86 trên thiết bị ARM64 này. Tự động sẽ dùng nó khi chương trình được build cho x86.</string> <string name="app_fex_x86">%1$s qua FEX</string> <string name="app_fex_not_ready">Chương trình này được build cho PC %1$s và chạy qua FEX, hiện chưa được thiết lập. Mở Steam một lần khi đã đăng nhập: DroidDeck sẽ tải FEX và Steam Linux Runtime cần thiết, sau đó ứng dụng này sẽ mở.</string> + <string name="session_proot_missing">Không thể tải proot của DroidDeck. Hãy kiểm tra kết nối rồi thử lại. Phiên chưa được khởi động vì proot dự phòng quá chậm để chơi.</string> + <string name="session_directaudio_missing">Không thể tải DirectAudio, nên âm thanh game dùng đường chậm hơn trong phiên này.</string> <string name="session_end_program">Chương trình này</string> <string name="session_end_steam_download">Không thể tải xuống client Steam. Mạng hoặc VPN của bạn có thể đang chặn máy chủ Steam; hãy kiểm tra kết nối rồi thử lại.</string> <string name="session_end_steam_setup">Không thể thiết lập client Steam. Hãy kiểm tra kết nối và dung lượng trống rồi thử lại.</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Tay cầm Xbox 360</string> <string name="mode_controller_note">Deck: nút Quick Access và con quay hồi chuyển. Steam Controller: tương tự, cộng với cảm biến nắm ở các nút phía sau. DualShock 4 và DualSense: con quay hồi chuyển, và touchpad dùng làm bàn di chuột. Xbox 360: mở Quick Access bằng Guide+A.</string> <string name="mode_back">Quay lại</string> + <string name="back_hold">Giữ Quay lại cho phím tắt Steam</string> + <string name="back_hold_hint">Giữ Quay lại để mở Truy cập nhanh hoặc tạo tổ hợp Steam với nút khác. Tắt để bỏ qua thao tác giữ; nhấn và nhấn đúp vẫn hoạt động.</string> + <string name="back_native_qam_hint">Giữ Back 700 ms, hoặc giữ Back và nhấn nút khác để dùng phím tắt Steam.</string> + <string name="back_double_tap_window">Khoảng thời gian nhấn đúp</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Cho phép điều khiển độ sáng</string> + <string name="brightness_permission_text">Thiết lập điều khiển độ sáng trong DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Phiên</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">Đã mới nhất · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Cài bản mới nhất</string> + <string name="decky_channel">Kênh cập nhật</string> + <string name="decky_channel_hint">Các bản phát hành Decky Loader sẽ cài. Trình cập nhật riêng của Decky dùng cùng kênh này.</string> + <string name="decky_channel_stable">Ổn định</string> + <string name="decky_channel_prerelease">Tiền phát hành</string> + <string name="decky_channel_testing">Thử nghiệm</string> + <string name="decky_channel_failed">Không thể lưu kênh cập nhật Decky</string> <string name="mode_decky_on">Khởi động cùng Steam. Khi đang bật, các ứng dụng khác trên thiết bị này có thể điều khiển được Steam.</string> <string name="mode_decky_off">Tắt. Cổng gỡ lỗi từ xa của Steam luôn đóng.</string> <string name="mode_decky_remove_title">Gỡ cài đặt Decky Loader?</string> @@ -307,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Lớp phủ hiệu năng</string> <string name="mode_mangoapp_hint">Tắt nếu game bị crash hoặc màn hình đen ở Chế độ Deck. Áp dụng từ phiên sau.</string> + <string name="mode_return_after_game">Quay lại DroidDeck sau khi chơi</string> + <string name="mode_return_after_game_hint">Khi game bạn mở từ DroidDeck hoặc launcher khác đóng lại, Steam thoát gọn gàng (bản lưu đám mây hoàn tất trước) và bạn quay về đó. Tắt: ở lại Steam.</string> + <string name="mode_shader_precache">Lưu trước shader</string> + <string name="mode_shader_precache_hint">Steam tải shader dựng sẵn cho game của bạn và xử lý chúng ở nền, nên game ít giật hơn. Tắt giúp tiết kiệm dữ liệu, bộ nhớ và pin; game sẽ tự dựng shader khi chơi. Giống thiết lập Downloads > Shader Pre-Caching của Steam. Áp dụng từ phiên sau.</string> <string name="mode_steam_repair">Sửa chữa client Steam</string> <string name="mode_steam_repair_hint">Tải lại client Steam vào lần Steam khởi động kế tiếp. Dùng khi Steam bị kẹt ở màn hình tải. Game, đăng nhập và thiết lập được giữ lại.</string> <string name="mode_steam_repair_queued">Client Steam sẽ được tải lại vào lần Steam khởi động kế tiếp.</string> @@ -373,6 +412,8 @@ <string name="mode_directaudio_hint">Bỏ qua PulseAudio để giảm độ trễ.</string> <string name="mode_mic">Micro</string> <string name="mode_mic_hint">Dùng cho chat bằng giọng nói.</string> + <string name="drawer_mic_hint">Bật hoặc tắt thu micro cho phiên này.</string> + <string name="drawer_mic_failed">Không thể thay đổi micro. Vui lòng thử lại.</string> <string name="mode_network">Mạng</string> <string name="mode_wifi_discovery">Dò tìm Wi-Fi</string> <string name="mode_wifi_discovery_hint">Hiện tên Wi-Fi và các mạng gần đó trong Steam.</string> @@ -533,14 +574,24 @@ <string name="perf_gsrealtime">gamescope: hàng đợi GPU thời gian thực</string> <string name="perf_gsrealtime_hint">Ưu tiên công việc GPU của compositor. Có thể làm nhịp khung hình mượt hơn với một phần chi phí cho game.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Bộ nhớ</string> + <string name="perf_cap_off">Tắt</string> + <string name="perf_cap_auto">Mặc định của driver</string> + <string name="perf_zram_client">Nén Steam khi game đang chạy</string> + <string name="perf_zram_client_hint">20 giây sau khi game bắt đầu, client Steam được nén vào zRAM để game có thêm bộ nhớ, và được đọc lại khi game đóng. Tắt nếu phiên bị đóng ngay sau khi game bắt đầu. Giới hạn RAM ở trên vẫn nén Steam khi phiên vượt quá mức đó.</string> + <string name="perf_ram_cap">Giới hạn RAM</string> + <string name="perf_ram_cap_hint">Áp dụng khi client Steam đang chạy, ở chế độ Steam hoặc từ desktop. Khi phiên dùng nhiều hơn mức này, Steam rồi đến các tiến trình được hỗ trợ khác của phiên sẽ bị nén vào zRAM. Giới hạn mềm: không có gì bị đóng, nhưng game có thể giật khi các trang được nạp lại.</string> + <string name="perf_ram_cap_unavailable">Cần swap zRAM, thiết bị này không có.</string> + <string name="perf_vram_cap">Giới hạn VRAM</string> + <string name="perf_vram_cap_hint">Bộ nhớ video mà DXVK báo cho game Direct3D, để chúng dùng ít texture hơn. Thiết lập DXVK riêng của game vẫn được ưu tiên. Có hiệu lực từ phiên sau.</string> <string name="perf_gpuclock">Giữ GPU ở xung nhịp cao nhất</string> <string name="perf_gpuclock_hint">Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn.</string> <string name="perf_fixes">Các bản sửa phiên</string> <string name="perf_sysmem">Turnip: render sysmem</string> <string name="perf_sysmem_hint">Nhanh hơn cho ứng dụng Steam; trong game, trình điều khiển chọn kết xuất theo ô hoặc trong bộ nhớ hệ thống cho từng lượt. Bắt buộc trên Adreno 710/720/722.</string> <string name="perf_xalia">Bỏ qua trình trợ giúp xalia của Steam</string> - <string name="perf_fastsync">droiddeck-ntsync (thử nghiệm)</string> - <string name="perf_fastsync_hint">Một bản thay thế ở không gian người dùng cho driver ntsync của Linux, dùng để thử nghiệm. Khi đang bật, Proton dùng nó thay cho droiddeck-esync và droiddeck-fsync. Hoạt động với Proton Experimental ARM64, GE-Proton và proton-cachyos. Áp dụng từ phiên sau.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Một bản thay thế ở không gian người dùng cho driver ntsync của Linux. Khi đang bật, Proton dùng nó thay cho droiddeck-esync và droiddeck-fsync. Hoạt động với Proton Experimental ARM64, GE-Proton và proton-cachyos. Áp dụng từ phiên sau.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync trước</string> <string name="perf_fsync_hint">Chạy fsync riêng của Proton trên các tệp Proton gốc, với futex_waitv được cung cấp ở không gian người dùng, nên không cần pack và vẫn hoạt động ngay khi Steam cập nhật Proton. Khi đang bật, game dùng nó trước droiddeck-esync, trừ một số ít Proton giữ fsync tắt. Áp dụng từ phiên sau.</string> @@ -551,6 +602,8 @@ <string name="perf_fastpath">Fast path của proot</string> <string name="perf_fastpath_needs_seccomp">Cần bộ lọc seccomp của proot.</string> <string name="perf_fastpath_hint">Tra cứu tệp nhanh hơn và ít giật hơn. Tắt nếu một chương trình không tìm thấy tệp của nó.</string> + <string name="perf_cursor_composite">Vẽ con trỏ bên trong gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tự vẽ con trỏ thay vì giao cho Android. Bật để dùng con trỏ điều khiển bằng tay cầm. Tắt sẽ nhanh hơn trên điện thoại. Áp dụng từ phiên sau.</string> <string name="perf_identity">Danh tính phiên</string> <string name="perf_hostname">Tên máy chủ</string> <string name="perf_hostname_hint">Tên mà Steam thấy cho thiết bị này. Để trống để khôi phục %1$s.</string> @@ -565,6 +618,8 @@ <string name="driver_delete_plain">Các tệp của nó bị xóa khỏi ứng dụng.</string> <string name="driver_delete_in_use">Các tệp của nó bị xóa. Nó đang được dùng, nên mặc định sẽ thay thế.</string> <string name="drawer_page_display">Hiển thị</string> + <string name="drawer_frame_limit">Giới hạn khung hình</string> + <string name="drawer_frame_limit_note">Giới hạn game này. Màn hình chuyển sang tần số quét chia hết cho mức giới hạn nếu có; các mức khác có thể trông không đều. Game Steam dùng Frame Limit của Steam trong menu Quick Access.</string> <string name="drawer_page_effects">Hiệu ứng</string> <string name="drawer_page_controls">Điều khiển</string> <string name="drawer_page_components">Thành phần</string> @@ -589,6 +644,66 @@ <string name="drawer_hud_color_amber">Hổ phách</string> <string name="drawer_hud_color_violet">Tím</string> <string name="drawer_hud_opacity">Độ mờ</string> + <string name="hud_size">Kích thước</string> + <string name="hud_size_hint">Chạm vào HUD cũng thay đổi kích thước của nó.</string> + <string name="hud_size_full">Đầy đủ</string> + <string name="hud_size_tiles">Ô</string> + <string name="hud_size_pill">Dạng viên</string> + <string name="hud_size_minimal">Tối giản</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Thanh</string> + <string name="hud_locked">Khóa vị trí</string> + <string name="hud_locked_hint">Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động.</string> + <string name="hud_snap">Bám vào cạnh trái/phải</string> + <string name="hud_snap_hint">Thả HUD ra và nó sẽ di chuyển sang cạnh màn hình gần hơn. Vuốt nhanh để ném nó theo hướng đó.</string> + <string name="hud_group_look">Giao diện</string> + <string name="hud_scale">Kích thước trên màn hình</string> + <string name="hud_color_soft">Dịu</string> + <string name="hud_color_mid">Vừa</string> + <string name="hud_color_vivid">Rực rỡ</string> + <string name="hud_outline">Viền</string> + <string name="hud_outline_color">Màu viền</string> + <string name="hud_outline_gray">Xám</string> + <string name="hud_outline_theme">Màu giao diện</string> + <string name="hud_group_metrics">Chỉ số</string> + <string name="hud_metric_graph">Biểu đồ thời gian khung hình</string> + <string name="hud_metric_decimal">Tốc độ khung hình có số thập phân</string> + <string name="hud_metric_low001" formatted="false">0.01% thấp nhất</string> + <string name="hud_metric_engine">Engine đồ họa</string> + <string name="hud_metric_gpu_model">Tên GPU</string> + <string name="hud_metric_gpu">Tải GPU</string> + <string name="hud_metric_gpu_temp">Nhiệt độ GPU</string> + <string name="hud_metric_cpu">Tải CPU</string> + <string name="hud_metric_per_core">CPU theo từng lõi</string> + <string name="hud_metric_temp">Nhiệt độ</string> + <string name="hud_metric_ram">Bộ nhớ</string> + <string name="hud_metric_vram">Bộ nhớ đồ họa</string> + <string name="hud_metric_swap">Bộ nhớ swap</string> + <string name="hud_metric_battery">Mức pin</string> + <string name="hud_metric_power">Công suất tiêu thụ</string> + <string name="hud_metric_network">Mạng</string> + <string name="hud_metric_resolution">Độ phân giải</string> + <string name="hud_metric_proton">Phiên bản Proton</string> + <string name="hud_metric_session">Thời gian phiên</string> + <string name="hud_metric_clock">Đồng hồ</string> + <string name="hud_group_temps">Nhiệt độ</string> + <string name="hud_temp_unit">Đơn vị</string> + <string name="hud_temp_bands">Màu cảnh báo</string> + <string name="hud_temp_bands_hint">Nhiệt độ chuyển sang màu hổ phách, rồi đỏ khi gần đến giới hạn.</string> + <string name="hud_temp_bands_off">Tắt</string> + <string name="hud_temp_bands_auto">Tự động</string> + <string name="hud_temp_bands_manual">Thủ công</string> + <string name="hud_temp_red_cpu">CPU đỏ từ</string> + <string name="hud_temp_red_gpu">GPU đỏ từ</string> + <string name="hud_temp_red_battery">Pin đỏ từ</string> + <string name="hud_group_more">Thêm</string> + <string name="hud_export">Chẩn đoán HUD</string> + <string name="hud_export_hint">Lưu báo cáo về mọi cảm biến mà HUD đọc vào Downloads/DroidDeck.</string> + <string name="hud_export_button">Lưu</string> + <string name="hud_export_done">Đã lưu vào %1$s</string> + <string name="hud_export_failed">Không thể lưu báo cáo HUD.</string> + <string name="hud_reset">Đặt lại thiết lập HUD</string> + <string name="hud_reset_button">Đặt lại</string> <string name="drawer_scaling">Chế độ chia tỷ lệ</string> <string name="drawer_scaling_sharpness">Độ sắc nét khi chia tỷ lệ</string> <string name="drawer_effects">Hiệu ứng màn hình</string> @@ -623,10 +738,14 @@ <string name="drawer_touch_auto">Tự động (%1$s)</string> <string name="drawer_keyboard">Bàn phím</string> <string name="drawer_latency">Độ trễ</string> + <string name="drawer_low_latency">Chế độ độ trễ thấp</string> + <string name="drawer_low_latency_hint">Tăng mức dùng CPU và pin</string> <string name="drawer_low_latency_controller">Tay cầm độ trễ thấp</string> <string name="drawer_low_latency_controller_hint">Tay cầm báo cáo ở 1000 Hz thay vì 250 Hz. Tốn thêm một chút CPU.</string> <string name="drawer_low_latency_touch">Cảm ứng độ trễ thấp</string> <string name="drawer_low_latency_touch_hint">Cảm ứng bỏ qua việc gộp khung hình, nên điều khiển cảm ứng của Steam chạy ở 1000 Hz. Tốn thêm một chút CPU.</string> + <string name="drawer_evdev_mouse">Kênh chuột thô</string> + <string name="drawer_direct_cursor">Con trỏ</string> <string name="drawer_pc_keyboard">Bàn phím PC</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Màn hình thứ hai</string> @@ -712,6 +831,10 @@ <string name="setup_session">Phiên</string> <string name="setup_logs">Log phiên</string> <string name="setup_logs_hint">Được lưu sau mỗi phiên</string> + <string name="setup_game_debug_logs">Nhật ký gỡ lỗi game</string> + <string name="setup_game_debug_logs_hint">Thêm chẩn đoán Proton, Wine và đồ họa vào lần khởi chạy game tiếp theo. Có thể giảm hiệu năng và tốn thêm bộ nhớ.</string> + <string name="setup_game_debug_logs_restart">Khởi động lại phiên này để lưu nhật ký gỡ lỗi game</string> + <string name="setup_logging_update_failed">Không thể cập nhật ghi nhật ký. Hãy kiểm tra công tắc rồi thử lại.</string> <string name="setup_agent_commands">Công cụ gỡ lỗi</string> <string name="setup_latest_logs">Log phiên gần nhất</string> <string name="setup_saved_logs">Log phiên đã lưu</string> @@ -744,12 +867,28 @@ <string name="setup_home_on">DroidDeck có thể là ứng dụng Màn hình chính</string> <string name="setup_home_off">DroidDeck không bao giờ được đề xuất làm ứng dụng Màn hình chính</string> <string name="setup_orientation">Hướng màn hình</string> + <string name="setup_launcher_orientation">Hướng màn hình launcher</string> + <string name="setup_launcher_orientation_auto">Theo hướng xoay thiết bị</string> + <string name="setup_orientation_portrait">Dọc</string> + <string name="setup_session_orientation">Hướng màn hình phiên</string> + <string name="setup_session_orientation_hint">Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; chiều rộng và chiều cao tùy chỉnh giữ nguyên như đã nhập.</string> <string name="setup_orientation_auto">Ngang tự động</string> <string name="setup_orientation_landscape">Ngang</string> <string name="setup_orientation_reverse">Ngang ngược</string> <string name="setup_fullscreen">Toàn màn hình</string> <string name="setup_fullscreen_on">Ẩn thanh trạng thái và thanh điều hướng của Android</string> <string name="setup_fullscreen_off">Hiện thanh trạng thái và thanh điều hướng của Android</string> + <string name="setup_dual_screen">Màn hình kép</string> + <string name="setup_dual_screen_hint">Tự động dùng màn hình thứ hai trên máy cầm tay có màn hình thứ hai tích hợp. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ mọi thứ trên một màn hình.</string> + <string name="setup_dual_screen_auto">Tự động</string> + <string name="setup_dual_screen_on">Bật</string> + <string name="setup_dual_screen_off">Tắt</string> + <string name="setup_dual_screen_menu">Menu ở màn hình dưới</string> + <string name="setup_dual_screen_menu_hint">Chuyển các mục và menu trong trò chơi sang màn hình thứ hai và nhập liệu ở đó, để màn hình trên giữ toàn bộ khung nhìn. L2 và R2 chuyển mục.</string> + <string name="setup_dual_screen_controls">Điều khiển màn hình dưới khi chơi game</string> + <string name="setup_dual_screen_controls_hint">Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu.</string> + <string name="dual_typing_title">Đang nhập cho màn hình trên</string> + <string name="dual_typing_done">Xong</string> <string name="setup_default_home">Ứng dụng Màn hình chính mặc định</string> <string name="setup_choose_home">Chọn một ứng dụng Màn hình chính</string> <string name="setup_choose">Chọn</string> @@ -894,6 +1033,14 @@ <string name="gate_step1">Mở Settings → Developer options → Wireless debugging và bật nó lên</string> <string name="gate_step2">Nhấn “Pair device with pairing code”</string> <string name="gate_step3">Nhập mã vào thông báo của DroidDeck</string> + <string name="pairguide_build_number">Trong Giới thiệu về điện thoại, nhấn Số bản dựng 7 lần</string> + <string name="pairguide_wireless">Bật Gỡ lỗi không dây</string> + <string name="pairguide_pair">Mở Gỡ lỗi không dây, rồi nhấn “Ghép nối thiết bị bằng mã ghép nối”</string> + <string name="pairguide_child_process">Bật “Tắt các hạn chế đối với quy trình con”</string> + <string name="pairguide_row_child_process">Tắt các hạn chế đối với quy trình con</string> + <string name="pairguide_row_build_number">Số bản dựng</string> + <string name="pairguide_row_wireless">Gỡ lỗi không dây</string> + <string name="pairguide_row_pair">Ghép nối thiết bị bằng mã ghép nối</string> <string name="gate_waiting">Đang chờ cửa sổ bật lên ghép nối…</string> <string name="gate_code_needed">Đã tìm thấy cửa sổ bật lên. Nhập mã của nó vào thông báo.</string> <string name="gate_status">Trạng thái</string> @@ -1017,8 +1164,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 +1171,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> @@ -1035,10 +1179,8 @@ <string name="games_never_played">Chưa chơi bao giờ</string> <string name="games_runtime_busy_percent">Runtime đang bận · %1$d%%</string> <string name="games_runtime_busy">Runtime đang bận</string> - <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> @@ -1053,6 +1195,9 @@ <string name="gpu_hide_other">Ẩn driver cho GPU khác</string> <string name="gpu_show_other">Hiện driver cho GPU khác</string> <string name="gpu_advanced">Nâng cao</string> + <string name="gpu_ubwc_title">Tương thích UBWC</string> + <string name="gpu_ubwc_hint">Thử Bật hoặc Tắt nếu Steam hoặc Android hiện sọc hay nhấp nháy. Áp dụng cho cả hai driver sau khi khởi động lại DroidDeck.</string> + <string name="gpu_ubwc_restart">Khởi động lại DroidDeck để áp dụng.</string> <string name="gpu_set_with_display">Được đặt cùng với driver hiển thị: %1$s mang cả hai.</string> <string name="gpu_set_with_runtime">Được đặt cùng với driver runtime: %1$s mang cả hai.</string> <string name="gpu_runtime_hint">Dùng bởi game và desktop.</string> @@ -1107,7 +1252,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> @@ -1161,10 +1306,15 @@ <string name="pip_auto">Tự động vào hình trong hình</string> <string name="unfolded_controls">Điều khiển trên màn hình mở</string> <string name="unfolded_controls_hint">Khi mở, game nằm phía trên trackpad và grip phía sau của Steam Deck. Khi gập, game chiếm toàn màn hình.</string> + <string name="unfolded_controls_with_controller">Giữ lại khi có tay cầm</string> + <string name="unfolded_controls_with_controller_hint">Vẫn hiện các điều khiển cảm ứng này khi đã kết nối tay cầm.</string> <string name="pip_suspended">Đã tạm dừng</string> <string name="pip_not_ready">Hình trong hình chỉ khả dụng khi phiên đã sẵn sàng.</string> <string name="pip_permission">Cho phép hình trong hình cho DroidDeck trong thiết lập Android.</string> <string name="pip_unavailable">Android không thể mở hình trong hình.</string> + <string name="game_more">Thêm</string> + <string name="game_edit_art">Sửa ảnh bìa</string> + <string name="stores_in_steam_label">Trong Steam</string> <string name="game_shortcut">Shortcut</string> <string name="game_shortcut_add">Thêm vào màn hình chính</string> <string name="game_shortcut_choose">Chọn game</string> @@ -1188,6 +1338,10 @@ <string name="main_wait_runtime">Chờ hoạt động runtime hoàn tất</string> <string name="main_wait_proton_install">Chờ việc cài công cụ tương thích hoàn tất</string> + <string name="load_compat_title">Đang chuẩn bị công cụ tương thích</string> + <string name="load_compat_wait">Đang chờ thiết lập tương thích hoàn tất</string> + <string name="load_compat_hint">Phiên của bạn sẽ bắt đầu khi thiết lập hoàn tất.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Chờ việc cài ứng dụng desktop hoàn tất</string> <string name="main_wait_install_game">Chờ việc cài hoàn tất trước khi khởi chạy một game</string> <string name="main_saves_close_session">Hãy đóng phiên Steam trước, để game không ghi đè lên tệp vừa nhập</string> @@ -1220,6 +1374,9 @@ <string name="main_install_anyway">Vẫn cài</string> <string name="main_remove_runtime_title">Gỡ runtime Linux</string> <string name="main_remove_runtime_text">Việc này xóa runtime, client Steam bên trong nó, và mọi game đã cài ở đó.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Sửa chữa sẽ cài lại các tệp hệ thống của runtime và giữ lại Steam, game và thiết lập của bạn. Các phần thêm như desktop sẽ được cài lại khi bạn dùng lần tới. Gỡ bỏ sẽ xóa mọi thứ.</string> + <string name="runtime_repair">Sửa chữa runtime</string> <string name="main_applied">Đã áp dụng: %1$s</string> <string name="android_app_open_failed_primary">Không thể mở %1$s trên màn hình chính</string> <string name="android_app_open_failed_on">Không thể mở %1$s trên %2$s</string> @@ -1346,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">Không thể kết nối danh mục runtime. Kiểm tra kết nối và nhấn Play lại.</string> <string name="session_runtime_install_failed">Runtime Linux chưa cài được. Kiểm tra runtime trong Thiết lập và nhấn Play lại.</string> <string name="session_desktop_install_failed">Desktop chưa cài được (%1$s). Kiểm tra kết nối và nhấn Desktop lại.</string> + <string name="session_package_resume_failed">Không thể hoàn tất một lượt cài đặt bị gián đoạn (%1$s). Hãy kiểm tra kết nối và dung lượng trống rồi thử lại.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Runtime Linux bị hỏng: %1$d liên kết thư viện trỏ tới tệp không tồn tại (%2$s và các tệp khác), thường do một lượt cài đặt bị gián đoạn. Sửa chữa sẽ giữ lại game và thiết lập của bạn.</item> + </plurals> <string name="session_ended_named">%1$s đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> <string name="session_ended_program">Chương trình đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> <string name="session_ended_desktop">Desktop đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> @@ -1359,6 +1520,12 @@ <string name="mode_decky_plugins_hint">Cài một tệp ZIP plugin cho phiên Steam kế tiếp.</string> <string name="mode_decky_plugin_downloading">Đang tải…</string> <string name="mode_decky_plugin_install_zip">Cài từ ZIP</string> + <string name="decky_zip_warning_title">Cài đặt plugin bên thứ ba</string> + <string name="decky_zip_warning_text">Nhóm Decky Loader chưa kiểm duyệt plugin này. Nó có thể chứa phần mềm độc hại, chẳng hạn phần mềm đánh cắp tài khoản Steam hoặc gây hại cho thiết bị của bạn. Khi cài plugin này, bạn đồng ý tự chịu mọi rủi ro cho thiết bị của mình.</string> + <string name="decky_zip_warning_continue">Tiếp tục</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Vui lòng đợi %1$d giây</item> + </plurals> <string name="store_cat_games">Games</string> <string name="store_cat_audio_video">Âm thanh & Video</string> <string name="store_cat_graphics">Đồ họa</string> @@ -1387,6 +1554,10 @@ <string name="theme_icon_blue_detail">Nền đen, chữ trắng, xanh cho mọi thứ được chọn, lấy nét hoặc nhấn.</string> <string name="theme_electric">Xanh điện navy</string> <string name="theme_electric_detail">Màu xanh sáng hơn, trên các bề mặt nghiêng về navy thay vì xám.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Màu sắc chuyển dần qua cả dải cầu vồng. Tuân theo cài đặt hiệu ứng động của Android.</string> + <string name="theme_rgb_speed">Tốc độ</string> + <string name="theme_rgb_speed_hint">Màu đổi nhanh đến mức nào.</string> <string name="theme_gradient">Chuyển màu</string> <string name="theme_gradient_detail">Màu chính và màu phụ do bạn chọn, hòa trộn trên các nút và phần nổi bật.</string> <string name="theme_gradient_primary">Chính</string> @@ -1503,7 +1674,16 @@ <string name="fm_conflict_skip">Bỏ qua</string> <string name="fm_select_this_folder">Chọn thư mục này</string> <string name="fm_back">Quay lại</string> + <string name="fm_exit">Thoát</string> + <string name="fm_return_to_start">Quay lại thư mục ban đầu</string> + <string name="fm_start_unavailable">Thư mục ban đầu không còn khả dụng</string> + <string name="fm_cancel_operation_title">Hủy thao tác?</string> + <string name="fm_cancel_operation_confirmation">Thao tác sẽ bị hủy. Bạn có chắc không?</string> + <string name="fm_accept">Chấp nhận</string> + <string name="fm_decline">Từ chối</string> <string name="fm_drive_not_readable">%1$s đã được gắn nhưng hiện không đọc được</string> + <string name="fm_drive_access_title">Cho phép truy cập %1$s</string> + <string name="fm_drive_access_text">Android cho DroidDeck thấy ổ này nhưng không đọc được. Hãy bật Quyền truy cập mọi tệp cho DroidDeck rồi quay lại.</string> <string name="fm_list_view">Xem dạng danh sách</string> <string name="fm_grid_view">Xem dạng lưới</string> <string name="fm_search">Tìm kiếm</string> @@ -1574,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">Bàn phím + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Grip + trackpad Deck</string> + <string name="second_mode_dashboard">Bảng điều khiển</string> + <string name="bottom_dashboard_empty">Chưa có gì để hiển thị ở đây.</string> + <string name="bottom_page_downloads">Tải xuống</string> + <string name="bottom_downloads_none">Không có lượt tải nào đang chạy.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Đang tải bộ nhớ đệm shader</string> + <string name="bottom_downloads_paused">Đã tạm dừng</string> + <string name="bottom_downloads_queued">Đang chờ bắt đầu</string> + <string name="bottom_page_notifications">Thông báo</string> + <string name="bottom_notifications_listener">Màn hình dưới DroidDeck</string> + <string name="bottom_notifications_why">Hiển thị tin nhắn và các thông báo khác ở đây khi bạn chơi. Chúng chỉ ở trên màn hình này và không được lưu. Android chỉ hỏi một lần: trang quyền truy cập thông báo sẽ mở trên màn hình này; hãy bật DroidDeck ở đó và trang này sẽ tự quay lại.</string> + <string name="bottom_notifications_allow">Cho phép truy cập thông báo</string> + <string name="bottom_notifications_none">Không có thông báo.</string> + <string name="bottom_notifications_count">%1$d thông báo</string> + <string name="bottom_notifications_clear">Xóa</string> + <string name="bottom_page_screenshots">Ảnh chụp màn hình</string> + <string name="stats_fps_needs_hud">Cần bật HUD để xem FPS</string> + <string name="stats_speed">Tốc độ</string> + <string name="stats_pedals">Bàn đạp</string> + <string name="stats_gforce">Lực G</string> + <string name="stats_timing">Thời gian</string> + <string name="stats_best_lap">Vòng nhanh nhất</string> + <string name="stats_tires">Lốp °C</string> + <string name="stats_trace">Ga và phanh, 10 s gần nhất</string> + <string name="stats_speed_chart">Tốc độ, %1$s</string> + <string name="stats_gear">Số</string> + <string name="stats_speed_units">Đơn vị tốc độ</string> + <string name="stats_speed_units_auto">Tự động (%1$s)</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Ga</string> + <string name="stats_brake">Phanh</string> + <string name="stats_lights">Đèn báo</string> + <string name="stats_lamp_shift">Sang số</string> + <string name="stats_lamp_handbrake">Phanh tay</string> + <string name="stats_lamp_pit">Giới hạn tốc độ pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Động cơ %1$s °C</string> + <string name="stats_oil_temp">Dầu %1$s °C</string> + <string name="stats_power">Bộ phân phối năng lượng</string> + <string name="stats_fuel_t">Nhiên liệu, t</string> + <string name="stats_fuel_main">Chính %1$s t</string> + <string name="stats_fuel_reserve">Dự trữ %1$s t</string> + <string name="stats_tap_hint">Nhấn vào dải phía trên hoặc bảng đồng hồ để đổi kiểu hiển thị.</string> + <string name="bottom_telemetry_send_title">Gửi dữ liệu bảng đồng hồ</string> + <string name="bottom_telemetry_send_auto">Tự động</string> + <string name="bottom_telemetry_send_auto_hint">Bật cho mọi game trong danh sách này, kể cả game được tìm thấy sau này. Game bạn đã tắt sẽ vẫn tắt.</string> + <string name="bottom_telemetry_send_note">Thao tác này thay đổi thiết lập xuất dữ liệu của chính game. Thay đổi có hiệu lực từ lần chạy game tiếp theo; tắt đi sẽ khôi phục thiết lập cũ.</string> + <string name="bottom_telemetry_send_close">Hãy đóng %1$s để thay đổi mục này.</string> + <string name="bottom_telemetry_send_failed">Không thể thay đổi thiết lập của %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: hãy bật %2$s trong thiết lập của game với IP 127.0.0.1 và cổng %3$d.</string> + <string name="bottom_shots_where">Được lưu vào Pictures/DroidDeck. Ảnh chụp màn hình Steam cũng hiện ở đây.</string> + <string name="bottom_shots_take">Chụp màn hình</string> + <string name="bottom_shots_saved">Đã lưu ảnh chụp màn hình.</string> + <string name="bottom_shots_failed">Không thể chụp màn hình.</string> + <string name="bottom_shots_none">Chưa có ảnh chụp màn hình.</string> + <string name="bottom_page_chat">Chat & thoại</string> + <string name="bottom_chat_why">Đọc và trả lời chat Steam ở đây trong khi game vẫn chạy trên màn hình chính. Dùng tài khoản đang đăng nhập Steam.</string> + <string name="bottom_chat_not_signed_in">Steam chưa có phiên đăng nhập web để chia sẻ, vì vậy hãy đăng nhập ở đây một lần.</string> + <string name="bottom_chat_stopped">Android đã đóng trang chat khi DroidDeck chạy nền. Trang sẽ mở lại khi bạn quay lại DroidDeck.</string> + <string name="bottom_chat_open">Mở Steam Chat</string> + <string name="bottom_chat_close">Đóng chat</string> + <string name="bottom_chat_mic_on">Micro bật</string> + <string name="bottom_chat_mic_off">Micro tắt</string> + <string name="bottom_chat_mic_unavailable">Micro đang tắt cho game này. Để nói chuyện, hãy bật Micro trong thiết lập Steam của DroidDeck (Âm thanh) rồi khởi động lại game.</string> + <string name="bottom_chat_volume">Âm lượng %1$d%%</string> + <string name="bottom_page_telemetry">Thông số trong game</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Pin</string> + <string name="bottom_telemetry_lap">Vòng</string> + <string name="bottom_telemetry_position">Vị trí</string> + <string name="bottom_telemetry_this_lap">Vòng này</string> + <string name="bottom_telemetry_last_lap">Vòng trước</string> + <string name="bottom_telemetry_fuel">Nhiên liệu</string> + <string name="bottom_telemetry_cargo">Hàng hóa</string> + <string name="bottom_telemetry_pips">Năng lượng SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Tình trạng pháp lý</string> + <string name="bottom_telemetry_balance">Số dư</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Bật xuất dữ liệu của game đua xe (thường gọi là telemetry hoặc UDP) để xem bảng đồng hồ trực tiếp ở đây. Dữ liệu chỉ ở trên thiết bị này.</string> + <string name="bottom_telemetry_unknown_format">Cổng %1$d đang nhận dữ liệu (%2$d gói, mỗi gói %3$d byte), nhưng ở định dạng mà trang này chưa đọc được.</string> + <string name="bottom_telemetry_port_busy">Một chương trình khác đang dùng cổng %1$s, nên game đó không thể hiển thị ở đây.</string> <string name="rtinst_removing">Đang gỡ runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1603,6 +1870,7 @@ <string name="flatpakmgr_not_ready">Thiết lập Flatpak trước</string> <string name="flatpakmgr_starting">Đang khởi động</string> <string name="flatpakmgr_exit_status">Flatpak đã thoát với mã %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s được dựng cho %2$s, DroidDeck không chạy được. Ứng dụng Flatpak ở đây cần bản ARM64 hoặc x86_64.</string> <string name="flatpakmgr_installing">Đang cài %1$s</string> <string name="flatpakmgr_updating">Đang cập nhật %1$s</string> <string name="flatpakmgr_removing">Đang gỡ %1$s</string> @@ -1696,6 +1964,7 @@ <string name="adbpair_applying">Đang áp dụng thiết lập…</string> <string name="adbpair_command_failed">Lệnh Gỡ lỗi qua mạng không dây thất bại</string> <string name="adbpair_channel_name">Thiết lập Gỡ lỗi qua mạng không dây</string> + <string name="adbpair_progress_channel_name">Tiến trình thiết lập gỡ lỗi không dây</string> <string name="adbpair_channel_description">Hỏi mã ghép nối Gỡ lỗi qua mạng không dây khi Settings đang mở</string> <string name="adbpair_title_pair">Ghép nối Gỡ lỗi qua mạng không dây</string> <string name="adbpair_waiting_text">Bật Gỡ lỗi qua mạng không dây, rồi nhấn “Pair device with pairing code”.</string> @@ -1804,6 +2073,7 @@ <string name="gpuinfo_not_adreno">Không phải GPU Adreno</string> <string name="gpuinfo_supported">Được hỗ trợ</string> <string name="gpuinfo_experimental">Thử nghiệm: driver của nó là bản build thử nghiệm</string> + <string name="gpuinfo_a850_experimental">Hỗ trợ thử nghiệm Adreno 850: cần driver hiển thị và driver game thử nghiệm tương thích; chưa được xác minh trên thiết bị này</string> <string name="gpuinfo_below_tested">Dưới mức phần cứng đã kiểm thử (Adreno 725 và mới hơn): có thể không chạy được</string> <string name="gpuinfo_unsupported">Không được hỗ trợ: DroidDeck cần GPU Adreno (Snapdragon)</string> @@ -1897,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">Thu nhỏ %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Hiện chi tiết thiết bị</string> <string name="device_info_hide">Ẩn chi tiết thiết bị</string> @@ -1915,7 +2185,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> @@ -1929,11 +2198,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> @@ -1951,9 +2218,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> @@ -1972,12 +2247,43 @@ <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> <string name="stores_sort">Sắp xếp</string> + <string name="setup_rail_labels">Nhãn thanh bên</string> + <string name="setup_rail_labels_hint">Hiện tên dưới các biểu tượng thanh bên. Tắt để thanh bên gọn hơn.</string> + <string name="library_display">Hiển thị</string> + <string name="library_display_larger">Thẻ lớn hơn</string> + <string name="library_display_smaller">Thẻ nhỏ hơn</string> + <string name="library_display_title">Hiện tiêu đề</string> + <string name="library_display_size">Hiện kích thước</string> <string name="stores_sort_last_played">Chơi gần đây</string> <string name="stores_sort_recently_installed">Cài gần đây</string> <string name="stores_sort_title_asc">Tên A–Z</string> @@ -2104,6 +2410,9 @@ <string name="stores_download_manager">Quản lý tải xuống</string> <string name="stores_parallel">Số lượt tải cùng lúc</string> <string name="stores_install_where">Cài vào</string> + <string name="stores_install_language">Ngôn ngữ game</string> + <string name="stores_install_language_hint">GOG và Epic cài ngôn ngữ này. Hệ thống sẽ theo ngôn ngữ của ứng dụng.</string> + <string name="stores_install_language_system">Hệ thống</string> <string name="stores_install_title">Cài %1$s:</string> <string name="stores_target_internal">Nội bộ</string> <string name="stores_target_free">%1$s trống</string> @@ -2126,6 +2435,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> @@ -2141,6 +2451,9 @@ <string name="edit_target">Đích</string> <string name="edit_start_in">Khởi chạy trong</string> <string name="edit_launch_options">Tùy chọn khởi chạy</string> + <string name="edit_launch_options_steam_hint">Dùng chung với Thuộc tính của Steam: thay đổi ở một nơi sẽ hiện ở cả hai.</string> + <string name="edit_launch_options_not_saved">Không thể lưu tùy chọn khởi chạy vào Steam. Hãy thử lại.</string> + <string name="edit_launch_options_desktop">Steam có thể đang mở trong phiên desktop. Hãy đổi tùy chọn khởi chạy trong Thuộc tính của Steam, hoặc đóng phiên trước.</string> <string name="edit_artwork">Hình ảnh</string> <string name="edit_other_exe">Exe khác…</string> <string name="edit_remove">Xóa</string> @@ -2266,6 +2579,7 @@ <string name="setup_download_source_custom">Prefix riêng</string> <string name="setup_download_mirror">Trang</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">ỨNG DỤNG LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Ứng dụng desktop cho desktop Linux, mở từ Desktop.</string> @@ -2404,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">Tự động giữ game 2D này cố định trong tầm nhìn. Chọn “Màn hình ảo” trong “Hiển thị” để dùng theo dõi đầu.</string> <string name="glasses_tracking_sbs_hint">Theo dõi đầu áp dụng cho màn hình ảo hoặc game SteamVR đang chạy.</string> <string name="glasses_hardware">Thiết bị</string> + <string name="vr_controllers_tab">Tay cầm</string> + <string name="vr_controllers_group">Tay cầm SteamVR</string> + <string name="vr_controllers_emulate">Tay cầm chơi game trong VR</string> + <string name="vr_controllers_emulate_hint">Hai tay VR mà tay cầm của bạn đóng vai. Thay đổi có hiệu lực ngay, kể cả khi SteamVR đang chạy. Joy-Con và tay được theo dõi vẫn điều khiển bên của chúng.</string> + <string name="vr_controllers_off">Tay cầm thông thường</string> + <string name="vr_controllers_index">Tay cầm Valve Index</string> + <string name="vr_controllers_touch">Tay cầm Meta Quest 3</string> + <string name="vr_controllers_vive">Tay cầm HTC Vive</string> + <string name="vr_controllers_sticks">Cần analog ban đầu dùng để</string> + <string name="vr_controllers_sticks_hint">Nhấn đồng thời cả hai cần analog trong VR để chuyển đổi.</string> + <string name="vr_controllers_sticks_game">Di chuyển bạn trong game</string> + <string name="vr_controllers_sticks_hands">Di chuyển hai tay</string> + <string name="vr_controllers_buttons">Nút</string> + <string name="vr_controllers_buttons_stick">Cò là cò, nút vai là nắm, A/B và X/Y là các nút mặt của từng tay, nhấn cần analog là nhấn thumbstick, Guide mở menu SteamVR. D-pad lên và xuống đưa hai tay lại gần hoặc ra xa.</string> + <string name="vr_controllers_buttons_vive">Cần analog là trackpad; A/X hoặc nhấn cần analog sẽ nhấn chúng. Cò là cò, nút vai là nắm, Start và Select là menu, Guide mở menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Không có tay VR. Các game hỗ trợ tay cầm, và menu SteamVR, nhận tay cầm của bạn như thường.</string> <string name="glasses_brightness">Độ sáng</string> <string name="glasses_volume">Âm lượng</string> <string name="glasses_sunblock">Chống nắng</string> @@ -2461,6 +2791,12 @@ <string name="hand_camera_placement">Vị trí camera</string> <string name="hand_camera_placement_hint">Hãy kiểm tra xem camera có thấy bạn không trước khi chơi.</string> <string name="hand_camera_check">Kiểm tra</string> + <string name="tracking_pack_title">Tải theo dõi tay</string> + <string name="tracking_pack_hint">Theo dõi tay cần tải %1$s một lần.</string> + <string name="tracking_pack_download">Tải xuống</string> + <string name="tracking_pack_retry">Thử lại</string> + <string name="tracking_pack_downloading">Đang tải theo dõi tay… %1$d%%</string> + <string name="tracking_pack_failed">Không thể tải theo dõi tay. Hãy kiểm tra kết nối rồi thử lại.</string> <string name="hand_camera_check_title">Vị trí camera</string> <string name="hand_camera_how_rear">Dựng thiết bị cách xa khoảng 1,5 đến 2 mét, ở độ cao ngang ngực, với camera sau hướng về phía bạn. Sau đó bước vào khung hình và đưa cả hai tay ra.</string> <string name="hand_camera_how_front">Dựng thiết bị cách xa khoảng 1,5 đến 2 mét, ở độ cao ngang ngực, với màn hình hướng về phía bạn. Sau đó bước vào khung hình và đưa cả hai tay ra.</string> @@ -2532,6 +2868,21 @@ <string name="storage_safe_hint">Runtime không dùng, phần còn lại, log cũ</string> <string name="storage_clean_up">Đang dọn…</string> <string name="storage_session_running">Dừng phiên để dọn hoặc xóa bất cứ thứ gì. Kích thước vẫn hiển thị.</string> + <string name="storage_default_group">Vị trí cài đặt</string> + <string name="storage_default_title">Bộ nhớ mặc định</string> + <string name="storage_default_hint">Các bản cài mới từ cửa hàng sẽ vào vị trí đã chọn. Game hiện có vẫn ở nguyên chỗ. Thư viện Steam giữ thiết lập riêng.</string> + <string name="storage_default_ask">Luôn hỏi</string> + <string name="storage_default_ask_detail">Chọn nơi lưu cho mỗi lần cài</string> + <string name="storage_default_internal">Bộ nhớ trong</string> + <string name="storage_default_external">Bộ nhớ ngoài</string> + <string name="storage_default_external_detail">%1$s · còn trống %2$s</string> + <string name="storage_default_external_missing">Chưa kết nối</string> + <string name="storage_default_folder">Thư mục · %1$s</string> + <string name="storage_default_folder_free">Còn trống %1$s</string> + <string name="storage_default_folder_missing">Chưa kết nối</string> + <string name="storage_default_choose_folder">Chọn thư mục…</string> + <string name="storage_default_choose_folder_detail">Dùng bất kỳ thư mục nào trên thẻ SD hoặc ổ USB</string> + <string name="storage_default_note">Game được đặt vào thư mục Games bên trong vị trí đã chọn. Game hiện có không bị di chuyển.</string> <string name="storage_where">Đi đâu</string> <string name="storage_games">Game Steam</string> <string name="storage_game_data">Dữ liệu game</string> @@ -2653,6 +3004,9 @@ <string name="storage_data_installed">Game đã cài</string> <string name="storage_data_parts">Prefix %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Dọn shader</string> + <string name="storage_reset_prefix">Đặt lại prefix</string> + <string name="storage_reset_prefix_title">Đặt lại prefix của %1$s?</string> + <string name="storage_reset_prefix_confirm">Xóa prefix Wine (%1$s) trong %2$s và tạo lại ở lần khởi chạy sau. Bản lưu, thiết lập và các redistributable đã cài bên trong sẽ mất; bản lưu Steam Cloud vẫn ở trong tài khoản của bạn.</string> <string name="storage_data_leftovers">Game đã xóa</string> <string name="storage_steam_app">Ứng dụng Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix vẫn còn tệp, có thể là bản lưu cục bộ</string> @@ -2953,5 +3307,306 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Đồng bộ với Syncthing</string> + <string name="sync_enable_hint">Dựa trên Syncthing-Fork, đây là bản triển khai Syncthing cho phép bạn đồng bộ các tệp trong hệ thống tệp nội bộ của DroidDeck với các phiên bản Syncthing khác. Tính năng này chỉ dành cho các tệp bạn lưu trong hệ thống tệp nội bộ của DroidDeck.</string> + <string name="sync_missing">Bản dựng này không có Syncthing.</string> + <string name="sync_starting">Đang khởi động Syncthing</string> + <string name="sync_status_starting">Đang khởi động</string> + <string name="sync_status_up_to_date">Đã cập nhật</string> + <string name="sync_status_syncing">Đang đồng bộ</string> + <string name="sync_status_paused">Đã tạm dừng</string> + <string name="sync_status_pausing">Đang tạm dừng</string> + <string name="sync_status_resuming">Đang tiếp tục</string> + <string name="sync_status_attention">Cần chú ý</string> + <string name="sync_status_failed">Syncthing đã dừng</string> + <string name="sync_failed_retry">Thử lại</string> + <string name="sync_paused_wifi">Tạm dừng cho đến khi có Wi-Fi</string> + <string name="sync_paused_game">Tạm dừng trong khi chơi game</string> + <string name="sync_summary">%1$d thư mục · %2$d/%3$d thiết bị đã kết nối</string> + <string name="sync_left">Còn %1$s</string> + <string name="sync_open_web_ui">Mở giao diện web</string> + <string name="sync_pause">Tạm dừng</string> + <string name="sync_resume">Tiếp tục</string> + <string name="sync_running">Đang chạy</string> + <string name="sync_running_hint">Tắt để dừng hoàn toàn Syncthing.</string> + <string name="sync_this_device">Thiết bị này</string> + <string name="sync_device_id">ID thiết bị</string> + <string name="sync_show_qr">Hiện mã QR</string> + <string name="sync_advanced">Nâng cao</string> + <string name="sync_advanced_hint">Cổng, thời điểm chạy, đặt lại</string> + <string name="sync_open">Mở</string> + <string name="sync_waiting">Đang chờ bạn</string> + <string name="sync_pending_device">%1$s muốn kết nối</string> + <string name="sync_pending_folder">%1$s muốn chia sẻ “%2$s”</string> + <string name="sync_pending_folder_hint">Chấp nhận để chọn nơi lưu thư mục này trong DroidDeck.</string> + <string name="sync_review">Xem lại trong giao diện web</string> + <string name="sync_folders">Thư mục</string> + <string name="sync_no_folders">Chưa có thư mục nào.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Đã cập nhật</string> + <string name="sync_folder_syncing">Đang đồng bộ %1$d%%</string> + <string name="sync_folder_scanning">Đang quét</string> + <string name="sync_folder_paused">Đã tạm dừng</string> + <string name="sync_folder_out_of_sync">Chưa đồng bộ</string> + <string name="sync_folder_errors">%1$d tệp không thể đồng bộ</string> + <string name="sync_folder_blocked">Bị chặn</string> + <string name="sync_folder_blocked_hint">Thư mục này nằm ngoài bộ nhớ của DroidDeck nên DroidDeck đã tạm dừng nó. Để đồng bộ các thư mục bên ngoài DroidDeck, hãy dùng app Syncthing-Fork.</string> + <string name="sync_remove_folder">Xóa khỏi Syncthing</string> + <string name="sync_remove_folder_hint">Xóa khỏi Syncthing không xóa tệp nào.</string> + <string name="sync_devices">Thiết bị</string> + <string name="sync_no_devices">Chưa có thiết bị nào.</string> + <string name="sync_connected">Đã kết nối</string> + <string name="sync_offline">Ngoại tuyến</string> + <string name="sync_last_seen">Lần cuối thấy %1$s</string> + <string name="sync_device_id_title">ID của thiết bị này</string> + <string name="sync_device_id_hint">Trên thiết bị còn lại, thêm thiết bị trong Syncthing rồi quét mã này hoặc dán ID. Sau đó chấp nhận ở đây trong giao diện web.</string> + <string name="sync_copy">Sao chép</string> + <string name="sync_share">Chia sẻ</string> + <string name="sync_done">Xong</string> + <string name="sync_off_title">Tắt Syncthing?</string> + <string name="sync_off_body">Syncthing sẽ dừng ngay và không chạy cho đến khi được bật lại. Các tệp đã đồng bộ vẫn giữ nguyên vị trí.</string> + <string name="sync_off_forget">Xóa cả cấu hình của Syncthing</string> + <string name="sync_off_forget_hint">Xóa ID của thiết bị này, các thư mục và thiết bị. Khi bật lại sẽ bắt đầu từ đầu.</string> + <string name="sync_turn_off">Tắt</string> + <string name="sync_ports">Cổng</string> + <string name="sync_port_sync">Đồng bộ</string> + <string name="sync_port_discovery">Khám phá cục bộ</string> + <string name="sync_repick">Chọn cổng mới</string> + <string name="sync_repick_hint">Được kiểm tra lại mỗi lần khởi động.</string> + <string name="sync_repick_button">Chọn lại</string> + <string name="sync_reset_group">Đặt lại</string> + <string name="sync_api_key">Khóa API</string> + <string name="sync_regenerate">Tạo lại</string> + <string name="sync_reset">Đặt lại Syncthing</string> + <string name="sync_reset_hint">ID thiết bị mới, các thư mục và thiết bị bị xóa. Tệp trong bộ nhớ của DroidDeck được giữ lại.</string> + <string name="sync_reset_button">Đặt lại</string> + <string name="sync_reset_confirm_title">Đặt lại Syncthing?</string> + <string name="sync_running_group">Chạy</string> + <string name="sync_run">Chạy</string> + <string name="sync_run_open">Khi DroidDeck đang mở</string> + <string name="sync_run_background">Trong nền</string> + <string name="sync_wifi_only">Chỉ Wi-Fi</string> + <string name="sync_pause_games">Tạm dừng khi chơi game</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Đầu ra của Syncthing trong phiên này</string> + <string name="sync_logs_share">Chia sẻ</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Cài runtime Linux trước.</string> + <string name="sync_accept">Chấp nhận</string> + <string name="sync_accept_title">Lưu “%1$s” vào</string> + <string name="sync_add_folder">Thêm thư mục</string> + <string name="sync_add_folder_hint">Đồng bộ một thư mục trong bộ nhớ của DroidDeck</string> + <string name="sync_choose">Chọn</string> + <string name="sync_add">Thêm</string> + <string name="sync_add_failed">Không thể thêm thư mục.</string> + <string name="sync_share_with">Chia sẻ với</string> + <string name="sync_share_none">Chưa có thiết bị nào. Bạn có thể chia sẻ thư mục này từ giao diện web sau.</string> + <string name="sync_use_folder">Dùng thư mục này</string> + <string name="sync_new_folder">Thư mục mới</string> + <string name="sync_location_home">Thư mục home của container</string> + <string name="sync_location_sync">Thư mục Sync</string> + <string name="sync_location_shared">Bộ nhớ dùng chung DroidDeck</string> + <string name="sync_location_card">DroidDeck trên %1$s</string> + <string name="sync_location_app">Dữ liệu app DroidDeck</string> + <string name="sync_web_path_locked">Thư mục mới được lưu trong thư mục Sync của DroidDeck. Để đồng bộ một thư mục DroidDeck khác, hãy dùng Thêm thư mục trong thẻ Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Tải lại</string> + <string name="sync_not_running">Syncthing không chạy.</string> + <string name="session_end_steam_sigill">Steam đã dừng do lệnh không hợp lệ (SIGILL). Đây có thể là vấn đề tương thích lệnh CPU hoặc client bị lỗi. Hãy chia sẻ nhật ký cùng thông tin thiết bị của bạn.</string> + <string name="session_end_steam_try_x64">Bạn có thể thử Thiết lập Steam → Client Steam → x86-64 (thử nghiệm). Cần tải thêm và có thể chạy chậm hơn.</string> + <string name="session_end_vulkan_device">Driver đồ họa Linux không tìm thấy thiết bị Vulkan dùng được. Hãy kiểm tra driver GPU Linux đã chọn có hỗ trợ GPU này không.</string> + <string name="session_end_gpu_unsupported">Không thể bắt đầu phiên vì GPU này không có driver Vulkan Linux tương thích trong thiết lập hiện tại. Driver Adreno Turnip không thể bật hỗ trợ cho GPU MediaTek/Mali.</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_resources_browser">Mở trong trình duyệt</string> + <string name="game_resource_guides">Hướng dẫn</string> + <string name="game_resource_protondb_detail">Báo cáo tương thích Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Cho game có bản lưu trong tài khoản Steam của bạn</string> + <string name="game_resource_search">Tìm kiếm trên web</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="library_filter">Bộ lọc</string> + <string name="library_filter_installed">Chỉ đã cài</string> + <string name="library_filter_all_owned">Tất cả game đã sở hữu</string> + <string name="library_no_installed_matches">Không có game đã cài nào khớp với bộ lọc này.</string> + <string name="library_browse_owned">Duyệt game đã sở hữu</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="stores_itch_updates_found">Có bản cập nhật: %1$d</string> + <string name="stores_itch_update_replaced">Nhà phát triển đã thay bản dựng này bằng %1$s. Cập nhật lên bản đó?</string> + <string name="xbox_filter_cloud">Đám mây</string> + <string name="stores_xbox_cloud_settings">Cài đặt đám mây</string> + <string name="integration_title">Tích hợp Steam</string> + <string name="integration_count">Bật %1$d/%2$d</string> + <string name="integration_set_up">Thiết lập</string> + <string name="integration_location">Vị trí</string> + <string name="integration_app_info">Thông tin ứng dụng</string> + <string name="integration_wifi">Tên Wi-Fi</string> + <string name="integration_brightness">Độ sáng</string> + <string name="integration_home">DroidDeck làm màn hình chính</string> + <string name="integration_shortcuts">Phím tắt nút Home</string> + <string name="integration_wifi_hint">Hiện mạng trong Steam · cần quyền Vị trí, không bao giờ theo dõi</string> + <string name="integration_wifi_on">Mạng hiện trong Steam</string> + <string name="integration_wifi_location_off">Vị trí đang tắt</string> + <string name="integration_wifi_denied">Vị trí bị từ chối · hãy cho phép trong Thông tin ứng dụng</string> + <string name="integration_brightness_hint">Thanh trượt của Steam đặt độ sáng màn hình</string> + <string name="integration_home_hint">Home mở menu Steam trong phiên</string> + <string name="integration_shortcuts_hint">Giữ Home để dùng tổ hợp Steam Guide</string> + <string name="integration_shortcuts_needs_home">Cần DroidDeck làm màn hình chính</string> + <string name="integration_shortcuts_maybe_restricted">Bị làm mờ trong Android? Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế</string> + <string name="integration_shortcuts_restricted">Bị Android chặn · Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế</string> + <string name="integration_shortcuts_service">Nút Home DroidDeck</string> + <string name="integration_shortcuts_service_description">Chuyển các lần nhấn nút Home đến Steam Guide khi phiên Steam đang được chọn và DroidDeck là ứng dụng màn hình chính mặc định. Không đọc nội dung màn hình.</string> + <string name="integration_brightness_needed">Bật Độ sáng trong Thiết lập → Tích hợp Steam</string> + <string name="apps_search_hint">Tìm ứng dụng</string> + <string name="apps_no_match">Không có ứng dụng nào khớp với “%1$s”.</string> + <string name="apps_add_widget">Thêm tiện ích</string> + <string name="apps_widgets_loading">Đang tải tiện ích…</string> + <string name="apps_widgets_none">Không có ứng dụng nào trên thiết bị này cung cấp tiện ích.</string> + <string name="apps_widget_wider">Rộng hơn</string> + <string name="apps_widget_narrower">Hẹp hơn</string> + <string name="apps_widget_taller">Cao hơn</string> + <string name="apps_widget_shorter">Thấp hơn</string> + <string name="apps_widget_move_earlier">Chuyển lên trước</string> + <string name="apps_widget_move_later">Chuyển ra sau</string> + <string name="apps_widget_configure">Cài đặt tiện ích</string> + <string name="apps_widget_remove">Xóa tiện ích</string> + <string name="apps_add_to_folder">Thêm vào thư mục</string> + <string name="apps_new_folder">Thư mục mới</string> + <string name="apps_remove_from_folder">Xóa khỏi thư mục</string> + <string name="apps_app_info">Thông tin ứng dụng</string> + <string name="apps_uninstall">Gỡ cài đặt</string> + <string name="apps_folder_rename">Đổi tên</string> + <string name="apps_folder_ungroup">Bỏ nhóm</string> + <string name="apps_folder_default">Thư mục</string> + <string name="apps_folder_name">Tên thư mục</string> + <string name="apps_filter">Hiển thị</string> + <string name="apps_filter_all">Tất cả ứng dụng</string> + <string name="apps_filter_games">Trò chơi</string> + <string name="apps_filter_downloaded">Đã tải xuống</string> + <string name="apps_filter_system">Hệ thống</string> + <string name="apps_filter_hidden">Đã ẩn</string> + <string name="apps_hide">Ẩn</string> + <string name="apps_unhide">Hiện trong ứng dụng</string> + <string name="apps_shortcut_remove">Xóa lối tắt</string> + <string name="apps_pin_title">Thêm vào Ứng dụng</string> + <string name="apps_pin_add">Thêm</string> + <string name="apps_hidden_none">Không có ứng dụng nào bị ẩn.</string> + <string name="apps_sort_name_asc">Tên A–Z</string> + <string name="apps_sort_name_desc">Tên Z–A</string> + <string name="apps_sort_installed">Mới cài đặt</string> + <string name="apps_sort_updated">Mới cập nhật</string> + <plurals name="apps_count"> + <item quantity="other">%d ứng dụng</item> + </plurals> + <string name="desktop_restore_title">Đang khôi phục phần mềm của bạn</string> + <string name="desktop_restore_body">Đang cài lại các ứng dụng bạn đã thêm sau khi cập nhật DroidDeck.</string> + <string name="desktop_restore_done_title">Đã khôi phục phần mềm</string> + <string name="desktop_restore_done_body">Các ứng dụng bạn đã thêm đã được cài lại.</string> + <string name="desktop_restore_failed_title">Không thể khôi phục một số phần mềm</string> + <string name="desktop_restore_failed_body">Xem ~/.cache/droiddeck/apt-restore.log, rồi thử sudo apt install trong Konsole.</string> + <string name="gog_full_files">Không có tối ưu hóa gốc. Bản tải xuống bao gồm các tệp thay thế đầy đủ.</string> + <string name="gog_recover">Xác minh kết quả vá</string> + <string name="slow_usb_title">Kết nối USB chậm</string> + <string name="slow_usb_cable">%1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s), nên trò chơi trên đó sẽ tải chậm. Hãy dùng cáp USB 3 tốc độ 5 Gbps trở lên, thử lật đầu cắm USB-C hoặc dùng ổ nhanh hơn.</string> + <string name="slow_usb_port">%1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s). Cổng USB của thiết bị này không thể nhanh hơn, nên trò chơi sẽ tải chậm. Bộ nhớ trong hoặc thẻ microSD có thể nhanh hơn.</string> + <string name="slow_usb_never">Không hiển thị lại</string> + <string name="slow_usb_dismiss">Đóng</string> + <string name="steam_import_title">Khởi động lại Steam để thêm trò chơi của bạn?</string> + <string name="steam_import_body">Steam có thể hiển thị các trò chơi bạn sở hữu này là đã cài đặt: %1$s. Steam cần khởi động lại để hiển thị chúng. Khởi động lại ngay, hoặc chúng sẽ được thêm vào lần tới Steam khởi động.</string> + <string name="steam_import_names_more">%1$s và %2$d trò chơi khác</string> + <string name="steam_import_now">Khởi động lại ngay</string> + <string name="steam_import_later">Để sau</string> + <string name="gog_maintenance">Quản lý bản cài GOG</string> + <string name="gog_check">Kiểm tra cập nhật</string> + <string name="gog_repair">Xác minh/Sửa chữa</string> + <string name="gog_patches">Bản vá ngoại tuyến</string> + <string name="gog_refresh">Tải bộ cài ngoại tuyến đầy đủ</string> + <string name="gog_update">Cập nhật lên %1$s</string> + <string name="gog_resume">Tiếp tục bảo trì GOG</string> + <string name="gog_open_patch">Mở trình cài bản vá</string> + <string name="gog_patch_in_session">Hoàn tất hoặc hủy trình cài bản vá trong phiên Linux.</string> + <string name="gog_patch_requirements">Chọn bản vá cho phiên bản và ngôn ngữ bạn đã cài. Có thể không liệt kê các phiên bản nguồn được hỗ trợ.</string> + <string name="gog_no_patches">GOG không có bản vá Windows độc lập cho game này.</string> + <string name="gog_managed_files">Các tệp game đã sửa đổi có thể bị thay thế.</string> + <string name="gog_patch_installer_note">Trình cài đặt sẽ mở trong phiên Linux của bạn.</string> + <string name="gog_download_label">Tải xuống</string> + <string name="gog_space_label">Dung lượng thêm</string> + <string name="gog_space_estimate_label">Ước tính dung lượng</string> + <string name="gog_repair_action">Sửa tệp</string> + <string name="gog_refresh_action">Làm mới bản cài</string> + <string name="gog_select_patch">Chọn</string> + <string name="setup_all_files">Truy cập tất cả tệp</string> + <string name="setup_local_network">Mạng cục bộ</string> + <string name="libraries_title">Thêm thư viện Steam</string> + <string name="libraries_hint">Các thư mục để Steam cài đặt và chạy trò chơi, mỗi thư mục có tên riêng. Xóa khỏi danh sách vẫn giữ trò chơi trên ổ đĩa.</string> + <string name="libraries_add">Thêm thư viện</string> + <string name="libraries_rename_title">Tên thư viện</string> + <string name="libraries_pick">Chọn thư mục cho thư viện</string> + <string name="libraries_full">Tối đa %1$d thư viện bổ sung</string> + <string name="libraries_overlap">Thư mục này đã là thư viện hoặc nằm trong một thư viện</string> + <string name="libraries_missing">%1$s · không khả dụng</string> + <string name="libraries_applies_next">Áp dụng từ phiên Steam tiếp theo</string> + <string name="bottom_desktop_start">Khởi động màn hình nền</string> + <string name="bottom_desktop_mode_touch">Chạm trực tiếp</string> + <string name="bottom_desktop_trackpad">Bàn di chuột. Chạm để chuyển sang chạm trực tiếp</string> + <string name="bottom_desktop_direct_touch">Chạm trực tiếp. Chạm để chuyển sang bàn di chuột</string> + <string name="bottom_desktop_starting">Đang khởi động màn hình nền KDE…</string> + <string name="bottom_desktop_ended">Màn hình nền đã đóng.</string> + <string name="bottom_desktop_failed">Không thể khởi động màn hình nền. Nhật ký nằm trong thư mục bottom-desktop của phiên này.</string> + <string name="bottom_desktop_off">Màn hình nền đang đóng.</string> + <string name="libraries_rename">Đổi tên</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/gestures.xml b/app/src/main/res/values-zh-rCN/gestures.xml index 18f6c00ce..69954db01 100644 --- a/app/src/main/res/values-zh-rCN/gestures.xml +++ b/app/src/main/res/values-zh-rCN/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">手势</string> <string name="gesture_settings">触屏手势设置</string> - <string name="gesture_settings_hint">自定义鼠标和键盘手势。请选择“手势”触控模式以使用这些功能。</string> <string name="gesture_tap">点按</string> <string name="gesture_drag">单指拖动</string> <string name="gesture_long_press">长按</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">三指按住</string> <string name="gesture_pinch">双指缩放</string> <string name="gesture_hold_button">持续按住按钮</string> + <string name="gesture_hold_left">按住左键</string> + <string name="gesture_hold_right">按住右键</string> <string name="gesture_click_once">单击一次</string> <string name="gesture_hold_delay">按住延迟</string> <string name="gesture_double_delay">双击间隔</string> diff --git a/app/src/main/res/values-zh-rCN/shortcuts.xml b/app/src/main/res/values-zh-rCN/shortcuts.xml new file mode 100644 index 000000000..53fa9d766 --- /dev/null +++ b/app/src/main/res/values-zh-rCN/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">实体按键快捷操作</string> + <string name="shortcuts_dd_menu">DroidDeck 菜单</string> + <string name="shortcuts_capture">分配:%1$s</string> + <string name="shortcuts_press">按下并松开一个按钮,分配将自动保存。</string> + <string name="shortcuts_release">松开按键以继续。</string> + <string name="shortcuts_detected">%1$s:%2$s</string> + <string name="shortcuts_conflict">此按键已分配给:%1$s</string> + <string name="shortcuts_save">重新分配</string> + <string name="shortcuts_retry">尝试其他按键</string> + <string name="shortcuts_limitations">主屏幕按钮和部分额外按钮可能无法使用。</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 68d927ebb..4b736400a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 选项。nodxr 禁用光线追踪;仅供需要它的游戏使用。</string> <string name="game_env_proton_log">设为 1 可生成 Proton 诊断日志。记录日志会降低性能并占用存储。</string> <string name="game_env_wined3d">设为 1 可对 D3D9–11 使用基于 OpenGL 的 WineD3D 代替 DXVK 进行兼容性测试。</string> + <string name="game_env_wined3d_renderer">用于 DirectDraw、Direct3D 1–7 以及通过 WineD3D 运行的游戏的渲染器。Vulkan 会跳过 OpenGL-on-Zink 路径,在 Adreno 上运行旧版 DirectDraw 和 Direct3D 7 游戏时快得多。</string> + <string name="game_env_dxvk_d3d8">设为 1 可通过 DXVK 而非 WineD3D 运行 Direct3D 8。在 Adreno 上的 AIO Graphics Test 的 Direct3D 8 测试中更快。</string> <string name="game_env_no_ntsync">设为 1 可让此游戏禁用 ntsync(droiddeck-ntsync 或内核驱动);存在对应包时使用 droiddeck-esync,否则使用 droiddeck-fsync。</string> <string name="game_env_no_esync">设为 1 可为此游戏禁用 droiddeck-esync;改用 droiddeck-fsync,若 fsync 也已禁用则使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">设为 1 可让此游戏禁用 droiddeck-fsync;存在对应包时使用 droiddeck-esync,否则使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">设为 1 可让此游戏使用 droiddeck-fsync;设为 0 则在有匹配其 Proton 的包时优先使用 droiddeck-esync。</string> <string name="game_env_xalia">设为 0 可为此游戏禁用 Proton 的手柄导航助手。</string> + <string name="game_env_anticheat_offline">默认开启。当游戏支持离线游玩时,以不加载反作弊的方式启动 Easy Anti-Cheat 游戏。关闭后将照常通过 Easy Anti-Cheat 启动。需要 Easy Anti-Cheat 的在线模式仍不可用。</string> <string name="game_env_hud">针对 D3D9–11 的 DXVK 覆盖层。fps 显示帧率;不设置则隐藏。</string> <string name="game_env_dxvk_config">以英文分号(;)分隔的 DXVK 设置。新版本使用 dxvk.maxFrameRate 限制帧率;日常游戏建议优先使用会话帧率限制。</string> + <string name="game_env_cores">此游戏使用的 CPU 核心,例如 0-4 或 0,2,4,用于替代会话的游戏核心。核心越少,温度越低。</string> <string name="game_env_vkd3d_limit">D3D12 帧率限制。0 表示不限制。</string> <string name="game_env_glthread">Mesa OpenGL 多线程。true 可能有助于受 CPU 限制的 OpenGL 游戏;请逐个游戏测试。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 在此 ARM64 设备上运行 x86 Linux 程序。自动模式会在程序为 x86 构建时启用。</string> <string name="app_fex_x86">%1$s 经由 FEX</string> <string name="app_fex_not_ready">此程序面向 %1$s PC 构建,需经由 FEX 运行,而 FEX 尚未配置。请在登录状态下打开一次 Steam:DroidDeck 会让其下载 FEX 及所需的 Steam Linux Runtime,之后即可打开。</string> + <string name="session_proot_missing">无法下载 DroidDeck 的 proot。请检查网络连接后重试。由于备用 proot 太慢无法流畅游玩,会话未启动。</string> + <string name="session_directaudio_missing">无法下载 DirectAudio,本次会话的游戏音频将使用较慢的路径。</string> <string name="session_end_program">此程序</string> <string name="session_end_steam_download">无法下载 Steam 客户端。你的网络或 VPN 可能屏蔽了 Steam 的服务器;请检查网络连接后重试。</string> <string name="session_end_steam_setup">无法设置 Steam 客户端。请检查网络连接和可用存储空间,然后重试。</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 手柄</string> <string name="mode_controller_note">Deck:快捷访问按钮与陀螺仪。Xbox 360:用 Guide+A 打开快捷访问。</string> <string name="mode_back">返回</string> + <string name="back_hold">长按返回键使用 Steam 快捷操作</string> + <string name="back_hold_hint">长按返回键打开快速访问,或与其他按键组成 Steam 组合键。关闭后忽略长按;单击和双击仍然有效。</string> + <string name="back_native_qam_hint">按住返回键 700 毫秒,或按住返回键再按另一个按钮以使用 Steam 快捷键。</string> + <string name="back_double_tap_window">双击间隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允许亮度控制</string> + <string name="brightness_permission_text">在 DroidDeck 中设置亮度控制。</string> <string name="back_menu_then_qam">菜单 → QAM</string> <string name="back_qam_then_menu">QAM → 菜单</string> <string name="mode_session">会话</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">加载器</string> <string name="mode_decky_install_latest">安装最新版</string> + <string name="decky_channel">更新通道</string> + <string name="decky_channel_hint">要安装哪种 Decky Loader 版本。Decky 自带的更新程序也使用相同的通道。</string> + <string name="decky_channel_stable">稳定版</string> + <string name="decky_channel_prerelease">预发布版</string> + <string name="decky_channel_testing">测试版</string> + <string name="decky_channel_failed">无法保存 Decky 更新通道</string> <string name="mode_decky_on">随 Steam 启动。开启期间,本设备上的其他应用可能可以控制 Steam。</string> <string name="mode_decky_off">已关闭。Steam 的远程调试端口保持关闭。</string> <string name="mode_decky_remove_title">卸载 Decky Loader?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">若游戏在 Deck 模式下崩溃或黑屏,请关闭性能覆盖层。将在下次会话生效。</string> <string name="mode_return_after_game">游戏结束后返回 DroidDeck</string> <string name="mode_return_after_game_hint">从 DroidDeck 或其他启动器启动的游戏关闭后,Steam 会正常退出(先完成云存档同步),并返回启动位置。关闭:留在 Steam 中。</string> + <string name="mode_shader_precache">着色器预缓存</string> + <string name="mode_shader_precache_hint">Steam 会为你的游戏下载预编译的着色器并在后台处理,以减少游戏卡顿。关闭可节省流量、存储空间和电量;游戏会改为在运行时编译着色器。与 Steam 的“下载”>“着色器预缓存”为同一设置。下次会话时生效。</string> <string name="mode_steam_repair">修复 Steam 客户端</string> <string name="mode_steam_repair_hint">下次启动 Steam 时重新下载 Steam 客户端。如果 Steam 一直停在加载画面,请使用此项。游戏、登录信息和设置都会保留。</string> <string name="mode_steam_repair_queued">下次启动 Steam 时将重新下载 Steam 客户端。</string> @@ -375,6 +412,8 @@ <string name="mode_directaudio_hint">绕过 PulseAudio 以降低延迟。</string> <string name="mode_mic">麦克风</string> <string name="mode_mic_hint">用于语音聊天。</string> + <string name="drawer_mic_hint">为此会话开启或关闭麦克风采集。</string> + <string name="drawer_mic_failed">无法更改麦克风设置。请重试。</string> <string name="mode_network">网络</string> <string name="mode_wifi_discovery">Wi-Fi 网络发现</string> <string name="mode_wifi_discovery_hint">在 Steam 中显示 Wi-Fi 名称和附近网络。</string> @@ -535,14 +574,24 @@ <string name="perf_gsrealtime">gamescope:实时 GPU 队列</string> <string name="perf_gsrealtime_hint">优先处理合成器的 GPU 工作。可平滑帧节奏,但会牺牲部分游戏性能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">内存</string> + <string name="perf_cap_off">关闭</string> + <string name="perf_cap_auto">驱动默认</string> + <string name="perf_zram_client">游戏运行时压缩 Steam</string> + <string name="perf_zram_client_hint">游戏启动 20 秒后,Steam 客户端会被压缩到 zRAM 中,为游戏腾出更多内存,并在游戏关闭时读回。如果会话在游戏启动后不久就关闭,请关闭此选项。设置了上方的 RAM 上限时,会话超出上限后仍会压缩 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 客户端运行时生效,无论是 Steam 模式还是从桌面启动。会话使用量超过此值时,会先将 Steam、再将会话中其他受支持的进程压缩到 zRAM。这是软上限:不会关闭任何进程,但在页面读回时游戏可能卡顿。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交换空间,但此设备不支持。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 游戏报告的显存大小,使游戏按更少的显存分配纹理。游戏自身的 DXVK 设置仍然优先。下次会话时生效。</string> <string name="perf_gpuclock">把 GPU 锁定在最高频率</string> <string name="perf_gpuclock_hint">仅限 Adreno。卡顿更少,但更耗电、更发热。</string> <string name="perf_fixes">会话修复</string> <string name="perf_sysmem">Turnip:sysmem 渲染</string> <string name="perf_sysmem_hint">Steam 客户端更快;游戏中驱动会为每个渲染通道选择分块渲染或系统内存渲染。Adreno 710/720/722 必需。</string> <string name="perf_xalia">跳过 Steam 的 xalia 助手</string> - <string name="perf_fastsync">droiddeck-ntsync(实验性)</string> - <string name="perf_fastsync_hint">Linux ntsync 驱动的用户态替代品,供测试使用。开启时,Proton 使用它代替 droiddeck-esync 和 droiddeck-fsync。适用于 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。将在下次会话生效。</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">Linux ntsync 驱动的用户态替代品。开启时,Proton 使用它代替 droiddeck-esync 和 droiddeck-fsync。适用于 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。将在下次会话生效。</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync 优先</string> <string name="perf_fsync_hint">在原始 Proton 文件上运行 Proton 自带的 fsync,由用户态提供 futex_waitv,因此无需任何包,且 Steam 更新 Proton 后立即继续可用。开启时,除 Proton 自身禁用 fsync 的少数游戏外,各游戏优先使用它而非 droiddeck-esync。将在下次会话生效。</string> @@ -553,6 +602,8 @@ <string name="perf_fastpath">proot 快速路径</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 过滤器。</string> <string name="perf_fastpath_hint">文件查找更快、卡顿更少。若某个程序找不到它的文件,请关闭。</string> + <string name="perf_cursor_composite">在 gamescope 内绘制光标</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行绘制指针,而不是交给 Android。使用手柄控制光标时请开启。在手机上关闭会更流畅。下次会话时生效。</string> <string name="perf_identity">会话标识</string> <string name="perf_hostname">主机名</string> <string name="perf_hostname_hint">Steam 看到的本设备名称。留空恢复为 %1$s。</string> @@ -567,6 +618,8 @@ <string name="driver_delete_plain">它的文件会从应用中移除。</string> <string name="driver_delete_in_use">文件将被移除。该驱动正在使用,将由默认驱动接管。</string> <string name="drawer_page_display">显示</string> + <string name="drawer_frame_limit">帧率限制</string> + <string name="drawer_frame_limit_note">限制此游戏的帧率。如有能被上限整除的刷新率,显示屏会切换到该刷新率;其他上限可能导致画面不均匀。Steam 游戏请使用快捷访问菜单中的 Steam 帧率限制。</string> <string name="drawer_page_effects">画面效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">组件</string> @@ -591,6 +644,66 @@ <string name="drawer_hud_color_amber">琥珀</string> <string name="drawer_hud_color_violet">紫罗兰</string> <string name="drawer_hud_opacity">不透明度</string> + <string name="hud_size">大小</string> + <string name="hud_size_hint">轻点 HUD 也可以切换大小。</string> + <string name="hud_size_full">完整</string> + <string name="hud_size_tiles">磁贴</string> + <string name="hud_size_pill">胶囊</string> + <string name="hud_size_minimal">极简</string> + <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">横条</string> + <string name="hud_locked">锁定位置</string> + <string name="hud_locked_hint">拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。</string> + <string name="hud_snap">吸附到两侧</string> + <string name="hud_snap_hint">松开 HUD 后,它会移到屏幕较近的一侧。轻甩可将它甩向该方向。</string> + <string name="hud_group_look">外观</string> + <string name="hud_scale">屏幕显示大小</string> + <string name="hud_color_soft">柔和</string> + <string name="hud_color_mid">适中</string> + <string name="hud_color_vivid">鲜艳</string> + <string name="hud_outline">描边</string> + <string name="hud_outline_color">描边颜色</string> + <string name="hud_outline_gray">灰色</string> + <string name="hud_outline_theme">主题色</string> + <string name="hud_group_metrics">读数</string> + <string name="hud_metric_graph">帧时间图表</string> + <string name="hud_metric_decimal">帧率显示小数</string> + <string name="hud_metric_low001" formatted="false">0.01% 最低帧</string> + <string name="hud_metric_engine">图形引擎</string> + <string name="hud_metric_gpu_model">GPU 名称</string> + <string name="hud_metric_gpu">GPU 负载</string> + <string name="hud_metric_gpu_temp">GPU 温度</string> + <string name="hud_metric_cpu">CPU 负载</string> + <string name="hud_metric_per_core">CPU 各核心</string> + <string name="hud_metric_temp">温度</string> + <string name="hud_metric_ram">内存</string> + <string name="hud_metric_vram">显存</string> + <string name="hud_metric_swap">交换空间</string> + <string name="hud_metric_battery">电池电量</string> + <string name="hud_metric_power">功耗</string> + <string name="hud_metric_network">网络</string> + <string name="hud_metric_resolution">分辨率</string> + <string name="hud_metric_proton">Proton 版本</string> + <string name="hud_metric_session">会话时长</string> + <string name="hud_metric_clock">时钟</string> + <string name="hud_group_temps">温度</string> + <string name="hud_temp_unit">单位</string> + <string name="hud_temp_bands">警告颜色</string> + <string name="hud_temp_bands_hint">温度接近上限时会先变为琥珀色,再变为红色。</string> + <string name="hud_temp_bands_off">关</string> + <string name="hud_temp_bands_auto">自动</string> + <string name="hud_temp_bands_manual">手动</string> + <string name="hud_temp_red_cpu">CPU 变红温度</string> + <string name="hud_temp_red_gpu">GPU 变红温度</string> + <string name="hud_temp_red_battery">电池变红温度</string> + <string name="hud_group_more">更多</string> + <string name="hud_export">HUD 诊断</string> + <string name="hud_export_hint">将 HUD 读取的所有传感器报告保存到 Downloads/DroidDeck。</string> + <string name="hud_export_button">保存</string> + <string name="hud_export_done">已保存到 %1$s</string> + <string name="hud_export_failed">无法保存 HUD 报告。</string> + <string name="hud_reset">重置 HUD 设置</string> + <string name="hud_reset_button">重置</string> <string name="drawer_scaling">缩放模式</string> <string name="drawer_scaling_sharpness">缩放锐度</string> <string name="drawer_effects">屏幕效果</string> @@ -625,10 +738,14 @@ <string name="drawer_touch_auto">自动(%1$s)</string> <string name="drawer_keyboard">键盘</string> <string name="drawer_latency">延迟</string> + <string name="drawer_low_latency">低延迟模式</string> + <string name="drawer_low_latency_hint">会增加 CPU 和电池消耗</string> <string name="drawer_low_latency_controller">低延迟手柄</string> <string name="drawer_low_latency_controller_hint">手柄以 1000 Hz 而非 250 Hz 上报。CPU 占用略高。</string> <string name="drawer_low_latency_touch">低延迟触控</string> <string name="drawer_low_latency_touch_hint">触控跳过帧合并,Steam 触控以 1000 Hz 上报。CPU 占用略高。</string> + <string name="drawer_evdev_mouse">原生鼠标通道</string> + <string name="drawer_direct_cursor">光标</string> <string name="drawer_pc_keyboard">PC 键盘</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">副屏</string> @@ -714,6 +831,10 @@ <string name="setup_session">会话</string> <string name="setup_logs">会话日志</string> <string name="setup_logs_hint">每次会话后保存</string> + <string name="setup_game_debug_logs">游戏调试日志</string> + <string name="setup_game_debug_logs_hint">在下次启动游戏时包含 Proton、Wine 和图形诊断信息。可能降低性能并占用更多存储空间。</string> + <string name="setup_game_debug_logs_restart">重启此会话以保存游戏调试日志</string> + <string name="setup_logging_update_failed">无法更新日志设置。请检查开关后重试。</string> <string name="setup_agent_commands">调试工具</string> <string name="setup_latest_logs">最新会话日志</string> <string name="setup_saved_logs">已保存的会话日志</string> @@ -746,12 +867,28 @@ <string name="setup_home_on">DroidDeck 可以设为主屏幕应用</string> <string name="setup_home_off">系统不会把 DroidDeck 作为主屏幕应用提供</string> <string name="setup_orientation">屏幕方向</string> + <string name="setup_launcher_orientation">启动器方向</string> + <string name="setup_launcher_orientation_auto">跟随设备旋转</string> + <string name="setup_orientation_portrait">竖屏</string> + <string name="setup_session_orientation">会话方向</string> + <string name="setup_session_orientation_hint">适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;自定义宽度和高度保持输入值不变。</string> <string name="setup_orientation_auto">自动横屏</string> <string name="setup_orientation_landscape">横屏</string> <string name="setup_orientation_reverse">反向横屏</string> <string name="setup_fullscreen">全屏</string> <string name="setup_fullscreen_on">隐藏 Android 状态栏和导航栏</string> <string name="setup_fullscreen_off">显示 Android 状态栏和导航栏</string> + <string name="setup_dual_screen">双屏</string> + <string name="setup_dual_screen_hint">自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。</string> + <string name="setup_dual_screen_auto">自动</string> + <string name="setup_dual_screen_on">开启</string> + <string name="setup_dual_screen_off">关闭</string> + <string name="setup_dual_screen_menu">下屏菜单</string> + <string name="setup_dual_screen_menu_hint">将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。</string> + <string name="setup_dual_screen_controls">游戏中的下屏控制</string> + <string name="setup_dual_screen_controls_hint">会话开始时在第二块屏幕上打开触控板和键盘。</string> + <string name="dual_typing_title">正在为上屏输入</string> + <string name="dual_typing_done">完成</string> <string name="setup_default_home">默认主屏幕应用</string> <string name="setup_choose_home">选择主屏幕应用</string> <string name="setup_choose">选择</string> @@ -838,6 +975,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> @@ -978,6 +1116,14 @@ <string name="gate_step1">打开“设置”→“开发者选项”→“无线调试”,并将其开启</string> <string name="gate_step2">点按“使用配对码配对设备”</string> <string name="gate_step3">在 DroidDeck 通知中输入配对码</string> + <string name="pairguide_build_number">在“关于手机”中,点按“Build 号”(版本号)7 次</string> + <string name="pairguide_wireless">开启“无线调试”</string> + <string name="pairguide_pair">打开“无线调试”,然后点按“使用配对码配对设备”</string> + <string name="pairguide_child_process">开启“停用子进程限制”</string> + <string name="pairguide_row_child_process">停用子进程限制</string> + <string name="pairguide_row_build_number">Build 号(版本号)</string> + <string name="pairguide_row_wireless">无线调试</string> + <string name="pairguide_row_pair">使用配对码配对设备</string> <string name="gate_waiting">正在等待配对弹窗…</string> <string name="gate_code_needed">已找到弹窗。请在通知中输入它的配对码。</string> <string name="gate_status">状态</string> @@ -1101,8 +1247,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 +1254,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> @@ -1119,10 +1262,8 @@ <string name="games_never_played">从未游玩</string> <string name="games_runtime_busy_percent">运行时繁忙 · %1$d%%</string> <string name="games_runtime_busy">运行时繁忙</string> - <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,6 +1278,9 @@ <string name="gpu_hide_other">隐藏其他 GPU 的驱动</string> <string name="gpu_show_other">显示其他 GPU 的驱动</string> <string name="gpu_advanced">高级</string> + <string name="gpu_ubwc_title">UBWC 兼容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出现条纹或闪烁,请尝试开启或关闭。重启 DroidDeck 后对两种驱动均生效。</string> + <string name="gpu_ubwc_restart">重启 DroidDeck 以应用。</string> <string name="gpu_set_with_display">与显示驱动一起设置:%1$s 同时携带两者。</string> <string name="gpu_set_with_runtime">与运行时驱动一起设置:%1$s 同时携带两者。</string> <string name="gpu_runtime_hint">由游戏和桌面使用。</string> @@ -1191,7 +1335,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> @@ -1245,10 +1389,15 @@ <string name="pip_auto">自动进入画中画</string> <string name="unfolded_controls">展开屏幕上的控制</string> <string name="unfolded_controls_hint">展开时,游戏画面位于 Steam Deck 触控板和背键上方。折叠时,游戏全屏显示。</string> + <string name="unfolded_controls_with_controller">连接手柄时也保留</string> + <string name="unfolded_controls_with_controller_hint">连接手柄时也显示这些触控按键。</string> <string name="pip_suspended">已暂停</string> <string name="pip_not_ready">会话就绪后即可使用画中画。</string> <string name="pip_permission">请在 Android 设置中允许 DroidDeck 的画中画。</string> <string name="pip_unavailable">Android 无法打开画中画。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">编辑封面</string> + <string name="stores_in_steam_label">已在 Steam 中</string> <string name="game_shortcut">快捷方式</string> <string name="game_shortcut_add">添加到主屏幕</string> <string name="game_shortcut_choose">选择游戏</string> @@ -1272,6 +1421,10 @@ <string name="main_wait_runtime">请等待运行时操作完成</string> <string name="main_wait_proton_install">请等待兼容性工具安装完成</string> + <string name="load_compat_title">正在准备兼容性工具</string> + <string name="load_compat_wait">正在等待兼容性设置完成</string> + <string name="load_compat_hint">设置完成后会话将自动启动。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">请等待桌面应用安装完成</string> <string name="main_wait_install_game">请等待安装完成后再启动游戏</string> <string name="main_saves_close_session">请先关闭 Steam 会话,以免游戏存档覆盖导入的内容</string> @@ -1304,6 +1457,9 @@ <string name="main_install_anyway">仍要安装</string> <string name="main_remove_runtime_title">移除 Linux 运行时</string> <string name="main_remove_runtime_text">这会删除运行时、其中的 Steam 客户端,以及安装在其中的所有游戏。</string> + <string name="runtime_actions_title">Linux 运行时</string> + <string name="runtime_actions_text">“修复”会重新安装运行时的系统文件,并保留 Steam、游戏和设置。桌面等附加组件会在下次使用时重新安装。“移除”会删除所有内容。</string> + <string name="runtime_repair">修复运行时</string> <string name="main_applied">已应用:%1$s</string> <string name="android_app_open_failed_primary">无法在主屏幕上打开 %1$s</string> <string name="android_app_open_failed_on">无法在 %2$s 上打开 %1$s</string> @@ -1424,6 +1580,10 @@ <string name="session_runtime_catalog_unreachable">无法连接运行时目录。请检查网络连接,然后再次点“游玩”。</string> <string name="session_runtime_install_failed">Linux 运行时未能安装。请在“配置”中检查运行时,然后再次点“游玩”。</string> <string name="session_desktop_install_failed">桌面未能安装(%1$s)。请检查网络连接,然后再次点“桌面”。</string> + <string name="session_package_resume_failed">无法完成之前中断的安装(%1$s)。请检查网络连接和存储空间,然后重试。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 运行时已损坏:%1$d 个库链接指向缺失的文件(%2$s 等),通常是安装中断所致。修复会保留你的游戏和设置。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。请将日志随错误报告一起分享,或重试。</string> <string name="session_ended_program">程序意外停止。请将日志随错误报告一起分享,或重试。</string> <string name="session_ended_desktop">桌面意外停止。请将日志随错误报告一起分享,或重试。</string> @@ -1437,6 +1597,12 @@ <string name="mode_decky_plugins_hint">安装插件 ZIP 包,将在下次 Steam 会话中生效。</string> <string name="mode_decky_plugin_downloading">正在下载…</string> <string name="mode_decky_plugin_install_zip">从 ZIP 安装</string> + <string name="decky_zip_warning_title">安装第三方插件</string> + <string name="decky_zip_warning_text">Decky Loader 团队尚未审核此插件。它可能包含恶意软件,例如窃取你的 Steam 账户或损害设备的软件。安装此插件即表示你同意自行承担设备的一切风险。</string> + <string name="decky_zip_warning_continue">继续</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">请等待 %1$d 秒</item> + </plurals> <string name="store_cat_games">游戏</string> <string name="store_cat_audio_video">影音</string> <string name="store_cat_graphics">图形</string> @@ -1465,6 +1631,10 @@ <string name="theme_icon_blue_detail">黑色背景、白色文字,选中、聚焦或按下的元素使用蓝色。</string> <string name="theme_electric">电光藏青</string> <string name="theme_electric_detail">更明亮的蓝色,配以偏藏青而非灰色的界面。</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">在彩虹色之间循环变化的颜色。遵循 Android 的动画设置。</string> + <string name="theme_rgb_speed">速度</string> + <string name="theme_rgb_speed_hint">颜色循环的快慢。</string> <string name="theme_gradient">渐变</string> <string name="theme_gradient_detail">你自己选择的主色和辅色,在按钮和高亮处渐变呈现。</string> <string name="theme_gradient_primary">主色</string> @@ -1581,7 +1751,16 @@ <string name="fm_conflict_skip">跳过</string> <string name="fm_select_this_folder">选择此文件夹</string> <string name="fm_back">返回</string> + <string name="fm_exit">退出</string> + <string name="fm_return_to_start">返回初始文件夹</string> + <string name="fm_start_unavailable">初始文件夹已不可用</string> + <string name="fm_cancel_operation_title">取消操作?</string> + <string name="fm_cancel_operation_confirmation">操作将被取消。确定吗?</string> + <string name="fm_accept">接受</string> + <string name="fm_decline">拒绝</string> <string name="fm_drive_not_readable">%1$s 已挂载,但当前无法读取</string> + <string name="fm_drive_access_title">允许访问 %1$s</string> + <string name="fm_drive_access_text">Android 允许 DroidDeck 看到此驱动器,但不允许读取。请为 DroidDeck 开启“所有文件访问权限”,然后返回。</string> <string name="fm_list_view">列表视图</string> <string name="fm_grid_view">网格视图</string> <string name="fm_search">搜索</string> @@ -1652,6 +1831,93 @@ <string name="second_mode_keyboard_trackpad">键盘 + 触控板</string> <string name="second_mode_terminal">终端</string> <string name="second_mode_deck_controls">Deck 背键 + 触控板</string> + <string name="second_mode_dashboard">仪表盘</string> + <string name="bottom_dashboard_empty">暂无内容。</string> + <string name="bottom_page_downloads">下载</string> + <string name="bottom_downloads_none">没有正在进行的下载。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下载着色器缓存</string> + <string name="bottom_downloads_paused">已暂停</string> + <string name="bottom_downloads_queued">等待开始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 底部屏幕</string> + <string name="bottom_notifications_why">在游戏时于此处显示消息和其他通知。通知只显示在此屏幕上,不会被保存。Android 只会询问一次:其通知使用权页面会在此屏幕上打开,在那里开启 DroidDeck 后,会自动返回此页面。</string> + <string name="bottom_notifications_allow">允许通知使用权</string> + <string name="bottom_notifications_none">没有通知。</string> + <string name="bottom_notifications_count">%1$d 条通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">截图</string> + <string name="stats_fps_needs_hud">显示 FPS 需要开启 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 值</string> + <string name="stats_timing">计时</string> + <string name="stats_best_lap">最佳圈速</string> + <string name="stats_tires">轮胎 °C</string> + <string name="stats_trace">油门和刹车,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">挡位</string> + <string name="stats_speed_units">速度单位</string> + <string name="stats_speed_units_auto">自动(%1$s)</string> + <string name="stats_steam_client_arm">Steam 客户端 ARM</string> + <string name="stats_steam_client_x86">Steam 客户端 x86</string> + <string name="stats_throttle">油门</string> + <string name="stats_brake">刹车</string> + <string name="stats_lights">仪表指示灯</string> + <string name="stats_lamp_shift">换挡</string> + <string name="stats_lamp_handbrake">手刹</string> + <string name="stats_lamp_pit">维修区限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">涡轮 %1$s bar</string> + <string name="stats_engine_temp">发动机 %1$s °C</string> + <string name="stats_oil_temp">机油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">备用 %1$s t</string> + <string name="stats_tap_hint">点按顶部横条或仪表可更改其样式。</string> + <string name="bottom_telemetry_send_title">发送仪表盘数据</string> + <string name="bottom_telemetry_send_auto">自动</string> + <string name="bottom_telemetry_send_auto_hint">为此处列出的所有游戏开启,包括之后发现的游戏。你手动关闭的游戏会保持关闭。</string> + <string name="bottom_telemetry_send_note">这会更改游戏自身的数据输出设置。将在游戏下次启动时生效;关闭后会恢复原来的设置。</string> + <string name="bottom_telemetry_send_close">请关闭 %1$s 后再更改此项。</string> + <string name="bottom_telemetry_send_failed">无法更改 %1$s 的设置。</string> + <string name="bottom_telemetry_send_menu">%1$s:请在游戏设置中开启 %2$s,IP 设为 127.0.0.1,端口设为 %3$d。</string> + <string name="bottom_shots_where">保存到 Pictures/DroidDeck。Steam 截图也会显示在这里。</string> + <string name="bottom_shots_take">截图</string> + <string name="bottom_shots_saved">截图已保存。</string> + <string name="bottom_shots_failed">无法截图。</string> + <string name="bottom_shots_none">暂无截图。</string> + <string name="bottom_page_chat">聊天和语音</string> + <string name="bottom_chat_why">在主屏幕继续运行游戏的同时,在此阅读和回复 Steam 聊天。使用 Steam 当前登录的账户。</string> + <string name="bottom_chat_not_signed_in">Steam 目前还没有可共享的网页登录,请在此登录一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在后台时,Android 关闭了聊天页面。返回 DroidDeck 后会重新打开。</string> + <string name="bottom_chat_open">打开 Steam 聊天</string> + <string name="bottom_chat_close">关闭聊天</string> + <string name="bottom_chat_mic_on">麦克风已开</string> + <string name="bottom_chat_mic_off">麦克风已关</string> + <string name="bottom_chat_mic_unavailable">此游戏的麦克风已关闭。如需语音通话,请在 DroidDeck 的 Steam 设置(音频)中开启麦克风,然后重新启动游戏。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">游戏内数据</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">电池</string> + <string name="bottom_telemetry_lap">圈数</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">货物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律状态</string> + <string name="bottom_telemetry_balance">余额</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">开启赛车游戏的数据输出(通常称为遥测或 UDP),即可在此查看实时仪表。数据仅保留在此设备上。</string> + <string name="bottom_telemetry_unknown_format">端口 %1$d 正在接收数据(%2$d 个 %3$d 字节的数据包),但其格式本页面暂时无法读取。</string> + <string name="bottom_telemetry_port_busy">端口 %1$s 已被其他程序占用,因此该游戏无法在此显示。</string> <string name="rtinst_removing">正在移除 Linux 运行时</string> <plurals name="rtinst_removing_entries"> @@ -1681,6 +1947,7 @@ <string name="flatpakmgr_not_ready">请先配置 Flatpak</string> <string name="flatpakmgr_starting">启动中</string> <string name="flatpakmgr_exit_status">Flatpak 已退出,状态码 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是为 %2$s 构建的,DroidDeck 无法运行。这里的 Flatpak 应用需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安装 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1774,6 +2041,7 @@ <string name="adbpair_applying">正在应用设置…</string> <string name="adbpair_command_failed">无线调试命令执行失败</string> <string name="adbpair_channel_name">无线调试配置</string> + <string name="adbpair_progress_channel_name">无线调试设置进度</string> <string name="adbpair_channel_description">在“设置”打开时请求输入无线调试配对码</string> <string name="adbpair_title_pair">配对无线调试</string> <string name="adbpair_waiting_text">开启无线调试,然后点按“使用配对码配对设备”。</string> @@ -1976,10 +2244,10 @@ <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> + <string name="display_follow_screen_scaled">缩放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">显示设备详情</string> <string name="device_info_hide">隐藏设备详情</string> @@ -1994,7 +2262,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> @@ -2008,11 +2275,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> @@ -2030,9 +2295,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> @@ -2051,12 +2324,43 @@ <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> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">侧边栏标签</string> + <string name="setup_rail_labels_hint">在侧边栏图标下方显示名称。关闭后侧边栏更窄。</string> + <string name="library_display">显示</string> + <string name="library_display_larger">较大卡片</string> + <string name="library_display_smaller">较小卡片</string> + <string name="library_display_title">显示标题</string> + <string name="library_display_size">显示大小</string> <string name="stores_sort_last_played">最近游玩</string> <string name="stores_sort_recently_installed">最近安装</string> <string name="stores_sort_title_asc">标题 A–Z</string> @@ -2183,6 +2487,9 @@ <string name="stores_download_manager">下载管理</string> <string name="stores_parallel">同时下载数</string> <string name="stores_install_where">安装到</string> + <string name="stores_install_language">游戏语言</string> + <string name="stores_install_language_hint">GOG 和 Epic 会安装此语言。“系统”跟随应用语言。</string> + <string name="stores_install_language_system">系统</string> <string name="stores_install_title">安装 %1$s:</string> <string name="stores_target_internal">内部存储</string> <string name="stores_target_free">可用 %1$s</string> @@ -2202,6 +2509,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> @@ -2217,6 +2525,9 @@ <string name="edit_target">目标</string> <string name="edit_start_in">起始位置</string> <string name="edit_launch_options">启动选项</string> + <string name="edit_launch_options_steam_hint">与 Steam 的“属性”共用:在任一处更改,两处都会更新。</string> + <string name="edit_launch_options_not_saved">无法将启动选项保存到 Steam。请重试。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面会话中运行。请在 Steam 的“属性”中更改启动选项,或先关闭该会话。</string> <string name="edit_artwork">美术图</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2407,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">“自动”会让这款 2D 游戏固定在视野中。要使用头部追踪,请在“显示”中选择“虚拟屏幕”。</string> <string name="glasses_tracking_sbs_hint">头部追踪适用于虚拟屏幕或正在运行的 SteamVR 游戏。</string> <string name="glasses_hardware">设备</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的手柄</string> + <string name="vr_controllers_emulate_hint">你的手柄所模拟的两只 VR 手。更改会立即生效,SteamVR 运行时也是如此。Joy-Con 和手部追踪仍会接管各自对应的一侧。</string> + <string name="vr_controllers_off">普通手柄</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">摇杆初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同时按下两个摇杆即可切换。</string> + <string name="vr_controllers_sticks_game">在游戏中移动</string> + <string name="vr_controllers_sticks_hands">移动双手</string> + <string name="vr_controllers_buttons">按键</string> + <string name="vr_controllers_buttons_stick">扳机即扳机,肩键为握持,A/B 和 X/Y 为各只手的正面按键,按下摇杆即按下拇指摇杆,Guide 键打开 SteamVR 菜单。方向键上下可让双手靠近或远离。</string> + <string name="vr_controllers_buttons_vive">摇杆作为触控板使用;按 A/X 或按下摇杆即按压触控板。扳机即扳机,肩键为握持,Start 和 Select 为菜单键,Guide 键打开 SteamVR 菜单。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支持手柄的游戏以及 SteamVR 菜单会照常使用你的手柄。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2464,6 +2791,12 @@ <string name="hand_camera_placement">相机位置</string> <string name="hand_camera_placement_hint">开始游戏前,请确认相机能看到你。</string> <string name="hand_camera_check">检查</string> + <string name="tracking_pack_title">手部追踪下载</string> + <string name="tracking_pack_hint">手部追踪需要一次性下载 %1$s。</string> + <string name="tracking_pack_download">下载</string> + <string name="tracking_pack_retry">重试</string> + <string name="tracking_pack_downloading">正在下载手部追踪… %1$d%%</string> + <string name="tracking_pack_failed">无法下载手部追踪。请检查网络连接后重试。</string> <string name="hand_camera_check_title">相机位置</string> <string name="hand_camera_how_rear">将设备立在距离 1.5 到 2 米、约胸口高度的地方,让后置相机对着你。然后张开双手走进画面。</string> <string name="hand_camera_how_front">将设备立在距离 1.5 到 2 米、约胸口高度的地方,让屏幕对着你。然后张开双手走进画面。</string> @@ -2535,6 +2868,21 @@ <string name="storage_safe_hint">未使用的运行时、残留、旧日志</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止会话后才能清理或移除。容量仍会显示。</string> + <string name="storage_default_group">安装位置</string> + <string name="storage_default_title">默认存储</string> + <string name="storage_default_hint">新的商店安装将保存到所选位置。现有游戏保持原位。Steam 库使用各自的设置。</string> + <string name="storage_default_ask">每次询问</string> + <string name="storage_default_ask_detail">每次安装时选择目标位置</string> + <string name="storage_default_internal">内部存储</string> + <string name="storage_default_external">外部存储</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未连接</string> + <string name="storage_default_folder">文件夹 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未连接</string> + <string name="storage_default_choose_folder">选择文件夹…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 驱动器上的任意文件夹</string> + <string name="storage_default_note">游戏会放在所选位置中的 Games 文件夹内。现有游戏不会被移动。</string> <string name="storage_where">占用去向</string> <string name="storage_games">Steam 游戏</string> <string name="storage_game_data">游戏数据</string> @@ -2656,6 +3004,9 @@ <string name="storage_data_installed">已安装游戏</string> <string name="storage_data_parts">前缀 %1$s · 着色器 %2$s · 创意工坊 %3$s</string> <string name="storage_clear_shaders">清除着色器</string> + <string name="storage_reset_prefix">重置前缀</string> + <string name="storage_reset_prefix_title">要重置 %1$s 的前缀吗?</string> + <string name="storage_reset_prefix_confirm">删除 %2$s 中的 Wine 前缀(%1$s),并在下次启动时重新创建。其中的存档、设置和已安装的运行库将丢失;Steam Cloud 存档仍保留在你的账户中。</string> <string name="storage_data_leftovers">已卸载游戏</string> <string name="storage_steam_app">Steam 应用 %1$d</string> <string name="storage_leftover_unsure_detail">其前缀仍含文件,其中可能有本地存档</string> @@ -2954,7 +3305,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">这是基于 Syncthing-Fork 的 Syncthing 实现,可将 DroidDeck 内部文件系统中的文件与其他 Syncthing 实例同步。仅适用于你存放在 DroidDeck 内部文件系统中的文件。</string> + <string name="sync_missing">此版本不包含 Syncthing。</string> + <string name="sync_starting">正在启动 Syncthing</string> + <string name="sync_status_starting">正在启动</string> + <string name="sync_status_up_to_date">最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暂停</string> + <string name="sync_status_pausing">正在暂停</string> + <string name="sync_status_resuming">正在恢复</string> + <string name="sync_status_attention">需要处理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">重试</string> + <string name="sync_paused_wifi">已暂停,等待连接 Wi-Fi</string> + <string name="sync_paused_game">游戏期间已暂停</string> + <string name="sync_summary">%1$d 个文件夹 · 已连接 %2$d/%3$d 台设备</string> + <string name="sync_left">剩余 %1$s</string> + <string name="sync_open_web_ui">打开 Web 管理页面</string> + <string name="sync_pause">暂停</string> + <string name="sync_resume">恢复</string> + <string name="sync_running">运行中</string> + <string name="sync_running_hint">关闭后将完全停止 Syncthing。</string> + <string name="sync_this_device">本设备</string> + <string name="sync_device_id">设备 ID</string> + <string name="sync_show_qr">显示二维码</string> + <string name="sync_advanced">高级</string> + <string name="sync_advanced_hint">端口、运行时机、重置</string> + <string name="sync_open">打开</string> + <string name="sync_waiting">等待你处理</string> + <string name="sync_pending_device">%1$s 请求连接</string> + <string name="sync_pending_folder">%1$s 想要共享“%2$s”</string> + <string name="sync_pending_folder_hint">接受后可选择在 DroidDeck 中的保存位置。</string> + <string name="sync_review">在 Web 管理页面中查看</string> + <string name="sync_folders">文件夹</string> + <string name="sync_no_folders">暂无文件夹。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在扫描</string> + <string name="sync_folder_paused">已暂停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 个文件无法同步</string> + <string name="sync_folder_blocked">已阻止</string> + <string name="sync_folder_blocked_hint">此文件夹位于 DroidDeck 的存储空间之外,因此 DroidDeck 已将其暂停。要同步 DroidDeck 之外的文件夹,请使用 Syncthing-Fork 应用。</string> + <string name="sync_remove_folder">从 Syncthing 中移除</string> + <string name="sync_remove_folder_hint">移除不会删除任何文件。</string> + <string name="sync_devices">设备</string> + <string name="sync_no_devices">暂无设备。</string> + <string name="sync_connected">已连接</string> + <string name="sync_offline">离线</string> + <string name="sync_last_seen">最后在线:%1$s</string> + <string name="sync_device_id_title">本设备的 ID</string> + <string name="sync_device_id_hint">在你的另一台设备上,于 Syncthing 中添加设备,然后扫描此二维码或粘贴 ID。之后在这里的 Web 管理页面中接受该设备。</string> + <string name="sync_copy">复制</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">关闭 Syncthing?</string> + <string name="sync_off_body">Syncthing 将立即停止,并保持停止状态,直到你重新开启。已同步的文件保留在原处。</string> + <string name="sync_off_forget">同时删除 Syncthing 的配置</string> + <string name="sync_off_forget_hint">将移除本设备的 ID、文件夹和设备。重新开启后将从头开始。</string> + <string name="sync_turn_off">关闭</string> + <string name="sync_ports">端口</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本地发现</string> + <string name="sync_repick">选择新端口</string> + <string name="sync_repick_hint">每次启动时都会重新检查。</string> + <string name="sync_repick_button">重新选择</string> + <string name="sync_reset_group">重置</string> + <string name="sync_api_key">API 密钥</string> + <string name="sync_regenerate">重新生成</string> + <string name="sync_reset">重置 Syncthing</string> + <string name="sync_reset_hint">将生成新的设备 ID,并移除文件夹和设备。DroidDeck 存储空间中的文件会保留。</string> + <string name="sync_reset_button">重置</string> + <string name="sync_reset_confirm_title">重置 Syncthing?</string> + <string name="sync_running_group">运行</string> + <string name="sync_run">运行时机</string> + <string name="sync_run_open">DroidDeck 打开时</string> + <string name="sync_run_background">在后台</string> + <string name="sync_wifi_only">仅限 Wi-Fi</string> + <string name="sync_pause_games">游戏期间暂停</string> + <string name="sync_logs">日志</string> + <string name="sync_logs_hint">本次会话的 Syncthing 输出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">请先设置 Linux 运行时。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">将“%1$s”保存到</string> + <string name="sync_add_folder">添加文件夹</string> + <string name="sync_add_folder_hint">同步 DroidDeck 存储空间中的文件夹</string> + <string name="sync_choose">选择</string> + <string name="sync_add">添加</string> + <string name="sync_add_failed">无法添加该文件夹。</string> + <string name="sync_share_with">共享给</string> + <string name="sync_share_none">暂无设备。你稍后可以在 Web 管理页面中共享此文件夹。</string> + <string name="sync_use_folder">使用此文件夹</string> + <string name="sync_new_folder">新建文件夹</string> + <string name="sync_location_home">容器主目录</string> + <string name="sync_location_sync">Sync 文件夹</string> + <string name="sync_location_shared">DroidDeck 共享存储</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 应用数据</string> + <string name="sync_web_path_locked">新文件夹会保存在 DroidDeck 的 Sync 文件夹中。要同步其他 DroidDeck 文件夹,请在“Syncthing”标签页中使用“添加文件夹”。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新加载</string> + <string name="sync_not_running">Syncthing 未在运行。</string> <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="session_end_steam_sigill">Steam 因非法指令(SIGILL)停止。这可能是 CPU 指令兼容问题,也可能是客户端崩溃。请分享日志并附上设备信息。</string> + <string name="session_end_steam_try_x64">可尝试“Steam 设置 → Steam 客户端 → x86-64(实验)”。此选项需要额外下载,运行速度也可能更慢。</string> + <string name="session_end_vulkan_device">Linux 图形驱动未找到可用的 Vulkan 设备。请确认所选 Linux GPU 驱动支持这颗 GPU。</string> + <string name="session_end_gpu_unsupported">当前配置缺少兼容这颗 GPU 的 Linux Vulkan 驱动,会话无法启动。Adreno Turnip 驱动不能为联发科/Mali GPU 增加支持。</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_resources_browser">在浏览器中打开</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 兼容性报告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">适用于存档保存在 Steam 账户中的游戏</string> + <string name="game_resource_search">网页搜索</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="library_filter">筛选</string> + <string name="library_filter_installed">仅已安装</string> + <string name="library_filter_all_owned">所有已拥有的游戏</string> + <string name="library_no_installed_matches">没有符合这些筛选条件的已安装游戏。</string> + <string name="library_browse_owned">浏览已拥有的游戏</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="stores_itch_updates_found">可用更新:%1$d</string> + <string name="stores_itch_update_replaced">开发者已将此版本替换为 %1$s。要更新到该版本吗?</string> + <string name="xbox_filter_cloud">云</string> + <string name="stores_xbox_cloud_settings">云设置</string> + <string name="integration_title">Steam 集成</string> + <string name="integration_count">已开启 %1$d/%2$d 项</string> + <string name="integration_set_up">设置</string> + <string name="integration_location">位置信息</string> + <string name="integration_app_info">应用信息</string> + <string name="integration_wifi">Wi-Fi 名称</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">将 DroidDeck 设为主屏幕</string> + <string name="integration_shortcuts">主屏幕按钮快捷键</string> + <string name="integration_wifi_hint">在 Steam 中显示网络 · 需要位置信息权限,绝不跟踪</string> + <string name="integration_wifi_on">网络会显示在 Steam 中</string> + <string name="integration_wifi_location_off">位置信息已关闭</string> + <string name="integration_wifi_denied">位置信息权限被拒绝 · 请在“应用信息”中允许</string> + <string name="integration_brightness_hint">Steam 的滑块可调节屏幕亮度</string> + <string name="integration_home_hint">在会话中按主屏幕按钮会打开 Steam 菜单</string> + <string name="integration_shortcuts_hint">按住主屏幕按钮使用 Steam Guide 按钮组合键</string> + <string name="integration_shortcuts_needs_home">需要将 DroidDeck 设为主屏幕</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中显示为灰色?应用信息 → ⋮ → 允许受限设置</string> + <string name="integration_shortcuts_restricted">已被 Android 阻止 · 应用信息 → ⋮ → 允许受限设置</string> + <string name="integration_shortcuts_service">DroidDeck 主屏幕按钮</string> + <string name="integration_shortcuts_service_description">当 Steam 会话处于焦点且 DroidDeck 为默认主屏幕应用时,将主屏幕按钮的按下操作传递给 Steam Guide 按钮。不会读取屏幕内容。</string> + <string name="integration_brightness_needed">请在“配置”→“Steam 集成”中开启亮度</string> + <string name="apps_search_hint">搜索应用</string> + <string name="apps_no_match">没有与“%1$s”匹配的应用。</string> + <string name="apps_add_widget">添加微件</string> + <string name="apps_widgets_loading">正在加载微件…</string> + <string name="apps_widgets_none">此设备上没有提供微件的应用。</string> + <string name="apps_widget_wider">加宽</string> + <string name="apps_widget_narrower">缩窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">前移</string> + <string name="apps_widget_move_later">后移</string> + <string name="apps_widget_configure">微件设置</string> + <string name="apps_widget_remove">移除微件</string> + <string name="apps_add_to_folder">添加到文件夹</string> + <string name="apps_new_folder">新建文件夹</string> + <string name="apps_remove_from_folder">从文件夹中移除</string> + <string name="apps_app_info">应用信息</string> + <string name="apps_uninstall">卸载</string> + <string name="apps_folder_rename">重命名</string> + <string name="apps_folder_ungroup">取消分组</string> + <string name="apps_folder_default">文件夹</string> + <string name="apps_folder_name">文件夹名称</string> + <string name="apps_filter">显示</string> + <string name="apps_filter_all">所有应用</string> + <string name="apps_filter_games">游戏</string> + <string name="apps_filter_downloaded">已下载</string> + <string name="apps_filter_system">系统</string> + <string name="apps_filter_hidden">已隐藏</string> + <string name="apps_hide">隐藏</string> + <string name="apps_unhide">在应用中显示</string> + <string name="apps_shortcut_remove">移除快捷方式</string> + <string name="apps_pin_title">添加到应用</string> + <string name="apps_pin_add">添加</string> + <string name="apps_hidden_none">没有隐藏的应用。</string> + <string name="apps_sort_name_asc">名称 A–Z</string> + <string name="apps_sort_name_desc">名称 Z–A</string> + <string name="apps_sort_installed">最近安装</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 个应用</item> + </plurals> + <string name="desktop_restore_title">正在恢复你的软件</string> + <string name="desktop_restore_body">DroidDeck 更新后正在重新安装你添加的应用。</string> + <string name="desktop_restore_done_title">软件已恢复</string> + <string name="desktop_restore_done_body">你添加的应用已重新安装。</string> + <string name="desktop_restore_failed_title">部分软件无法恢复</string> + <string name="desktop_restore_failed_body">请查看 ~/.cache/droiddeck/apt-restore.log,然后在 Konsole 中尝试 sudo apt install。</string> + <string name="gog_full_files">原生优化不可用。下载内容包含完整的替换文件。</string> + <string name="gog_recover">验证补丁结果</string> + <string name="slow_usb_title">USB 连接速度慢</string> + <string name="slow_usb_cable">%1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s),其中的游戏加载会很慢。请使用 5 Gbps 或更快的 USB 3 数据线,尝试翻转 USB-C 插头,或使用更快的硬盘。</string> + <string name="slow_usb_port">%1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s)。此设备的 USB 接口无法更快,游戏加载会很慢。内部存储或 microSD 卡可能更快。</string> + <string name="slow_usb_never">不再显示</string> + <string name="slow_usb_dismiss">关闭</string> + <string name="steam_import_title">重启 Steam 以添加你的游戏?</string> + <string name="steam_import_body">Steam 可以将你拥有的这些游戏显示为已安装:%1$s。需要重启 Steam 才能显示。现在重启,或在下次启动 Steam 时添加。</string> + <string name="steam_import_names_more">%1$s 等另外 %2$d 款</string> + <string name="steam_import_now">立即重启</string> + <string name="steam_import_later">稍后</string> + <string name="gog_maintenance">管理 GOG 安装</string> + <string name="gog_check">检查更新</string> + <string name="gog_repair">验证/修复</string> + <string name="gog_patches">离线补丁</string> + <string name="gog_refresh">下载完整离线安装程序</string> + <string name="gog_update">更新到 %1$s</string> + <string name="gog_resume">继续 GOG 维护</string> + <string name="gog_open_patch">打开补丁安装程序</string> + <string name="gog_patch_in_session">请在 Linux 会话中完成或取消补丁安装程序。</string> + <string name="gog_patch_requirements">请选择适用于已安装版本和语言的补丁。受支持的源版本可能未列出。</string> + <string name="gog_no_patches">GOG 没有此游戏的独立 Windows 补丁。</string> + <string name="gog_managed_files">修改过的游戏文件可能会被替换。</string> + <string name="gog_patch_installer_note">安装程序会在你的 Linux 会话中打开。</string> + <string name="gog_download_label">下载</string> + <string name="gog_space_label">额外空间</string> + <string name="gog_space_estimate_label">预计空间</string> + <string name="gog_repair_action">修复文件</string> + <string name="gog_refresh_action">刷新安装</string> + <string name="gog_select_patch">选择</string> + <string name="setup_all_files">所有文件访问权限</string> + <string name="setup_local_network">本地网络</string> + <string name="libraries_title">更多 Steam 库</string> + <string name="libraries_hint">Steam 可在这些文件夹中安装和运行游戏,每个文件夹都有独立名称。从列表中移除后,磁盘上的游戏仍会保留。</string> + <string name="libraries_add">添加库</string> + <string name="libraries_rename_title">库名称</string> + <string name="libraries_pick">选择库文件夹</string> + <string name="libraries_full">最多添加 %1$d 个库</string> + <string name="libraries_overlap">此文件夹已经是一个库,或位于某个库内</string> + <string name="libraries_missing">%1$s · 不可用</string> + <string name="libraries_applies_next">从下次 Steam 会话开始生效</string> + <string name="bottom_desktop_start">启动桌面</string> + <string name="bottom_desktop_mode_touch">直接触控</string> + <string name="bottom_desktop_trackpad">触控板。点按切换为直接触控</string> + <string name="bottom_desktop_direct_touch">直接触控。点按切换为触控板</string> + <string name="bottom_desktop_starting">正在启动 KDE 桌面…</string> + <string name="bottom_desktop_ended">桌面已退出。</string> + <string name="bottom_desktop_failed">无法启动桌面。日志位于本次会话的 bottom-desktop 文件夹中。</string> + <string name="bottom_desktop_off">桌面已关闭。</string> + <string name="libraries_rename">重命名</string> + <string name="second_mode_desktop">桌面</string> + <string name="bottom_desktop_mode_trackpad">触控板</string> + <string name="bottom_desktop_title">桌面 · %1$s</string> </resources> diff --git a/app/src/main/res/values-zh-rHK/gestures.xml b/app/src/main/res/values-zh-rHK/gestures.xml index 45bbcc062..7cd3314bc 100644 --- a/app/src/main/res/values-zh-rHK/gestures.xml +++ b/app/src/main/res/values-zh-rHK/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">手勢</string> <string name="gesture_settings">觸控手勢設定</string> - <string name="gesture_settings_hint">自訂滑鼠與鍵盤手勢。請選擇「手勢」觸控模式以使用這些功能。</string> <string name="gesture_tap">點按</string> <string name="gesture_drag">單指拖曳</string> <string name="gesture_long_press">長按</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">三指按住</string> <string name="gesture_pinch">雙指縮放</string> <string name="gesture_hold_button">持續按住按鈕</string> + <string name="gesture_hold_left">按住左鍵</string> + <string name="gesture_hold_right">按住右鍵</string> <string name="gesture_click_once">按一下</string> <string name="gesture_hold_delay">按住延遲</string> <string name="gesture_double_delay">連點兩下間隔</string> diff --git a/app/src/main/res/values-zh-rHK/shortcuts.xml b/app/src/main/res/values-zh-rHK/shortcuts.xml new file mode 100644 index 000000000..4a4d7f170 --- /dev/null +++ b/app/src/main/res/values-zh-rHK/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">實體按鍵快捷操作</string> + <string name="shortcuts_dd_menu">DroidDeck 選單</string> + <string name="shortcuts_capture">指派:%1$s</string> + <string name="shortcuts_press">按下並放開一個按鈕,指派會自動儲存。</string> + <string name="shortcuts_release">放開按鍵以繼續。</string> + <string name="shortcuts_detected">%1$s:%2$s</string> + <string name="shortcuts_conflict">此按鍵已指派給:%1$s</string> + <string name="shortcuts_save">重新指派</string> + <string name="shortcuts_retry">嘗試其他按鍵</string> + <string name="shortcuts_limitations">主畫面按鈕及部分額外按鈕可能無法使用。</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 a39c7b101..5ae3e9824 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 選項。nodxr 會停用光線追蹤;只在個別遊戲需要時使用。</string> <string name="game_env_proton_log">設為 1 以產生 Proton 診斷記錄。記錄可能會降低效能並佔用儲存空間。</string> <string name="game_env_wined3d">設為 1 以改用基於 OpenGL 的 WineD3D 代替 DXVK,用於 D3D9–11 兼容性測試。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1-7 及透過 WineD3D 執行之遊戲的轉譯器。Vulkan 會略過 OpenGL-on-Zink 路徑,在 Adreno 上執行舊款 DirectDraw 和 Direct3D 7 遊戲時快得多。</string> + <string name="game_env_dxvk_d3d8">設定為 1 以透過 DXVK 而非 WineD3D 執行 Direct3D 8。在 Adreno 上的 AIO Graphics Test Direct3D 8 測試中速度較快。</string> <string name="game_env_no_ntsync">設為 1 讓此遊戲不使用 ntsync(droiddeck-ntsync 或內核驅動程式);有可用套件時會改用 droiddeck-esync,否則使用 droiddeck-fsync。</string> <string name="game_env_no_esync">設為 1 為此遊戲關閉 droiddeck-esync;會改用 droiddeck-fsync,如 fsync 亦已關閉則使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">設為 1 讓此遊戲不使用 droiddeck-fsync;有可用套件時會改用 droiddeck-esync,否則使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">設為 1 讓此遊戲使用 droiddeck-fsync;設為 0 則在有配合其 Proton 的套件時優先使用 droiddeck-esync。</string> <string name="game_env_xalia">設為 0 以為此遊戲停用 Proton 的控制器導覽輔助程式。</string> + <string name="game_env_anticheat_offline">預設為開啟。當遊戲支援離線遊玩時,以不載入反作弊的方式啟動 Easy Anti-Cheat 遊戲。關閉後會照常透過 Easy Anti-Cheat 啟動。需要 Easy Anti-Cheat 的線上模式仍然無法使用。</string> <string name="game_env_hud">D3D9–11 的 DXVK 疊加層。fps 會顯示幀率;不設定則隱藏。</string> <string name="game_env_dxvk_config">以分號分隔的 DXVK 設定。較新版本使用 dxvk.maxFrameRate 限制幀率;一般遊玩建議使用會話的幀率限制。</string> + <string name="game_env_cores">此遊戲使用的 CPU 核心,例如 0-4 或 0,2,4,用來取代會話的遊戲核心。核心越少,溫度越低。</string> <string name="game_env_vkd3d_limit">D3D12 幀率限制。0 表示不限制。</string> <string name="game_env_glthread">Mesa OpenGL 多線程。true 可能有助受 CPU 限制的 OpenGL 遊戲;請逐個遊戲測試。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 可在此 ARM64 裝置上執行 x86 Linux 程式。「自動」會在程式為 x86 而設時使用 FEX。</string> <string name="app_fex_x86">%1$s,透過 FEX</string> <string name="app_fex_not_ready">此程式是為 %1$s 電腦而設,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 及所需的 Steam Linux Runtime,之後便會開啟此程式。</string> + <string name="session_proot_missing">無法下載 DroidDeck 的 proot。請檢查連線後再試一次。會話未啟動,因為備用 proot 太慢,無法用來玩遊戲。</string> + <string name="session_directaudio_missing">無法下載 DirectAudio,因此本次會話的遊戲音訊會使用較慢的路徑。</string> <string name="session_end_program">此程式</string> <string name="session_end_steam_download">無法下載 Steam 用戶端。你的網絡或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試。</string> <string name="session_end_steam_setup">無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試。</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 控制器</string> <string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:按 Guide+A 開啟快速存取。</string> <string name="mode_back">返回</string> + <string name="back_hold">長按返回鍵使用 Steam 快捷操作</string> + <string name="back_hold_hint">長按返回鍵開啟快速存取,或與其他按鍵組成 Steam 組合鍵。關閉後忽略長按;輕觸和輕觸兩下仍然有效。</string> + <string name="back_native_qam_hint">按住返回鍵 700 毫秒,或按住返回鍵並按下其他按鈕以使用 Steam 快速鍵。</string> + <string name="back_double_tap_window">連按兩下間隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允許控制亮度</string> + <string name="brightness_permission_text">在 DroidDeck 中設定亮度控制。</string> <string name="back_menu_then_qam">選單 → QAM</string> <string name="back_qam_then_menu">QAM → 選單</string> <string name="mode_session">會話</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">載入器</string> <string name="mode_decky_install_latest">安裝最新版本</string> + <string name="decky_channel">更新頻道</string> + <string name="decky_channel_hint">要安裝哪一種 Decky Loader 版本。Decky 本身的更新程式也會使用相同的頻道。</string> + <string name="decky_channel_stable">穩定版</string> + <string name="decky_channel_prerelease">預發佈版</string> + <string name="decky_channel_testing">測試版</string> + <string name="decky_channel_failed">無法儲存 Decky 更新頻道</string> <string name="mode_decky_on">隨 Steam 啟動。啟用時,此裝置上的其他應用程式可能可以控制 Steam。</string> <string name="mode_decky_off">已關閉。Steam 的遠端偵錯連接埠保持關閉。</string> <string name="mode_decky_remove_title">解除安裝 Decky Loader?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">如果在 Deck 模式下遊戲當機或黑畫面,請關閉此項。下次會話生效。</string> <string name="mode_return_after_game">遊戲結束後返回 DroidDeck</string> <string name="mode_return_after_game_hint">從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。</string> + <string name="mode_shader_precache">著色器預先快取</string> + <string name="mode_shader_precache_hint">Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省流動數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。</string> <string name="mode_steam_repair">修復 Steam 用戶端</string> <string name="mode_steam_repair_hint">下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停留在載入畫面,請使用此功能。遊戲、登入資料和設定都會保留。</string> <string name="mode_steam_repair_queued">下次啟動 Steam 時會重新下載 Steam 用戶端。</string> @@ -375,6 +412,8 @@ <string name="mode_directaudio_hint">繞過 PulseAudio 以減低延遲。</string> <string name="mode_mic">麥克風</string> <string name="mode_mic_hint">用於語音聊天。</string> + <string name="drawer_mic_hint">為此會話開啟或關閉麥克風收音。</string> + <string name="drawer_mic_failed">無法變更麥克風設定,請再試一次。</string> <string name="mode_network">網絡</string> <string name="mode_wifi_discovery">Wi-Fi 探索</string> <string name="mode_wifi_discovery_hint">在 Steam 中顯示 Wi-Fi 名稱和附近的網絡。</string> @@ -535,14 +574,24 @@ <string name="perf_gsrealtime">gamescope:即時 GPU 佇列</string> <string name="perf_gsrealtime_hint">優先處理合成器的 GPU 工作。可令幀間隔更平穩,但會犧牲少許遊戲效能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">記憶體</string> + <string name="perf_cap_off">關閉</string> + <string name="perf_cap_auto">驅動程式預設</string> + <string name="perf_zram_client">遊戲執行時壓縮 Steam</string> + <string name="perf_zram_client_hint">遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果會話在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,會話仍會壓縮 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當會話的用量超過此值時,會先將 Steam、再將會話中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交換空間,但此裝置沒有。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 遊戲回報的顯示記憶體,讓遊戲以較少的量規劃紋理。遊戲本身的 DXVK 設定仍優先。下次會話生效。</string> <string name="perf_gpuclock">讓 GPU 保持最高頻率</string> <string name="perf_gpuclock_hint">只限 Adreno。減少卡頓,但更耗電、更發熱。</string> <string name="perf_fixes">會話修正</string> <string name="perf_sysmem">Turnip:sysmem 渲染</string> <string name="perf_sysmem_hint">Steam 用戶端會更快;遊戲中驅動程式會為每個渲染通道選擇分塊渲染或系統記憶體渲染。Adreno 710/720/722 必須開啟。</string> <string name="perf_xalia">略過 Steam 的 xalia 輔助程式</string> - <string name="perf_fastsync">droiddeck-ntsync(實驗性)</string> - <string name="perf_fastsync_hint">在用戶空間代替 Linux ntsync 驅動程式,供測試使用。開啟時,Proton 會使用它而非 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次會話生效。</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">在用戶空間代替 Linux ntsync 驅動程式。開啟時,Proton 會使用它而非 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次會話生效。</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">優先使用 droiddeck-fsync</string> <string name="perf_fsync_hint">在原裝 Proton 檔案上執行 Proton 本身的 fsync,並在用戶空間提供 futex_waitv,因此無需套件,Steam 更新 Proton 後亦能立即繼續運作。開啟時,遊戲會優先使用它而非 droiddeck-esync,Proton 刻意不用 fsync 的少數遊戲除外。下次會話生效。</string> @@ -553,6 +602,8 @@ <string name="perf_fastpath">proot 快速路徑</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 篩選器。</string> <string name="perf_fastpath_hint">檔案查找更快,卡頓更少。如果程式找不到其檔案,請關閉此項。</string> + <string name="perf_cursor_composite">在 gamescope 內繪製游標</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行繪製指標,而不交給 Android。如要用控制器操控游標,請開啟此項。在手機上關閉會較快。下次工作階段生效。</string> <string name="perf_identity">會話身分</string> <string name="perf_hostname">主機名稱</string> <string name="perf_hostname_hint">Steam 看到的此裝置名稱。留空則還原為 %1$s。</string> @@ -567,6 +618,8 @@ <string name="driver_delete_plain">其檔案會從應用程式中移除。</string> <string name="driver_delete_in_use">其檔案會被移除。由於正在使用中,會改用預設驅動程式。</string> <string name="drawer_page_display">顯示</string> + <string name="drawer_frame_limit">幀率限制</string> + <string name="drawer_frame_limit_note">限制此遊戲的幀率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的幀率限制。</string> <string name="drawer_page_effects">效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">組件</string> @@ -591,6 +644,66 @@ <string name="drawer_hud_color_amber">琥珀色</string> <string name="drawer_hud_color_violet">紫羅蘭</string> <string name="drawer_hud_opacity">不透明度</string> + <string name="hud_size">大小</string> + <string name="hud_size_hint">輕按 HUD 亦可切換大小。</string> + <string name="hud_size_full">完整</string> + <string name="hud_size_tiles">方塊</string> + <string name="hud_size_pill">膠囊</string> + <string name="hud_size_minimal">極簡</string> + <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">橫條</string> + <string name="hud_locked">鎖定位置</string> + <string name="hud_locked_hint">拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。</string> + <string name="hud_snap">貼齊兩側</string> + <string name="hud_snap_hint">放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。</string> + <string name="hud_group_look">外觀</string> + <string name="hud_scale">螢幕顯示大小</string> + <string name="hud_color_soft">柔和</string> + <string name="hud_color_mid">適中</string> + <string name="hud_color_vivid">鮮豔</string> + <string name="hud_outline">描邊</string> + <string name="hud_outline_color">描邊顏色</string> + <string name="hud_outline_gray">灰色</string> + <string name="hud_outline_theme">主題色</string> + <string name="hud_group_metrics">讀數</string> + <string name="hud_metric_graph">幀時間圖表</string> + <string name="hud_metric_decimal">幀率顯示小數</string> + <string name="hud_metric_low001" formatted="false">0.01% 最低幀</string> + <string name="hud_metric_engine">圖形引擎</string> + <string name="hud_metric_gpu_model">GPU 名稱</string> + <string name="hud_metric_gpu">GPU 負載</string> + <string name="hud_metric_gpu_temp">GPU 溫度</string> + <string name="hud_metric_cpu">CPU 負載</string> + <string name="hud_metric_per_core">CPU 各核心</string> + <string name="hud_metric_temp">溫度</string> + <string name="hud_metric_ram">記憶體</string> + <string name="hud_metric_vram">顯示記憶體</string> + <string name="hud_metric_swap">交換空間</string> + <string name="hud_metric_battery">電池電量</string> + <string name="hud_metric_power">功耗</string> + <string name="hud_metric_network">網絡</string> + <string name="hud_metric_resolution">解像度</string> + <string name="hud_metric_proton">Proton 版本</string> + <string name="hud_metric_session">會話時長</string> + <string name="hud_metric_clock">時鐘</string> + <string name="hud_group_temps">溫度</string> + <string name="hud_temp_unit">單位</string> + <string name="hud_temp_bands">警告顏色</string> + <string name="hud_temp_bands_hint">溫度接近上限時會先變成琥珀色,再變成紅色。</string> + <string name="hud_temp_bands_off">關閉</string> + <string name="hud_temp_bands_auto">自動</string> + <string name="hud_temp_bands_manual">手動</string> + <string name="hud_temp_red_cpu">CPU 變紅溫度</string> + <string name="hud_temp_red_gpu">GPU 變紅溫度</string> + <string name="hud_temp_red_battery">電池變紅溫度</string> + <string name="hud_group_more">更多</string> + <string name="hud_export">HUD 診斷</string> + <string name="hud_export_hint">將 HUD 讀取的所有感應器報告儲存到 Downloads/DroidDeck。</string> + <string name="hud_export_button">儲存</string> + <string name="hud_export_done">已儲存到 %1$s</string> + <string name="hud_export_failed">無法儲存 HUD 報告。</string> + <string name="hud_reset">重設 HUD 設定</string> + <string name="hud_reset_button">重設</string> <string name="drawer_scaling">縮放模式</string> <string name="drawer_scaling_sharpness">縮放銳利度</string> <string name="drawer_effects">畫面效果</string> @@ -611,7 +724,7 @@ <string name="drawer_deband_strength">去色帶強度</string> <string name="drawer_brightness">亮度</string> <string name="drawer_contrast">對比度</string> - <string name="drawer_gamma">Gamma</string> + <string name="drawer_gamma">伽瑪</string> <string name="drawer_saturation">飽和度</string> <string name="drawer_fxaa">FXAA(邊緣平滑)</string> <string name="drawer_toon">卡通描邊</string> @@ -625,10 +738,14 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">鍵盤</string> <string name="drawer_latency">延遲</string> + <string name="drawer_low_latency">低延遲模式</string> + <string name="drawer_low_latency_hint">會增加 CPU 和電池用量</string> <string name="drawer_low_latency_controller">低延遲控制器</string> <string name="drawer_low_latency_controller_hint">控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。</string> <string name="drawer_low_latency_touch">低延遲觸控</string> <string name="drawer_low_latency_touch_hint">觸控略過幀合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。</string> + <string name="drawer_evdev_mouse">原生滑鼠通道</string> + <string name="drawer_direct_cursor">游標</string> <string name="drawer_pc_keyboard">電腦鍵盤</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">第二螢幕</string> @@ -714,6 +831,10 @@ <string name="setup_session">會話</string> <string name="setup_logs">會話記錄</string> <string name="setup_logs_hint">每次會話後儲存</string> + <string name="setup_game_debug_logs">遊戲偵錯記錄</string> + <string name="setup_game_debug_logs_hint">在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。</string> + <string name="setup_game_debug_logs_restart">重新啟動此會話以儲存遊戲偵錯記錄</string> + <string name="setup_logging_update_failed">無法更新記錄設定。請檢查開關後再試一次。</string> <string name="setup_agent_commands">偵錯工具</string> <string name="setup_latest_logs">最新的會話記錄</string> <string name="setup_saved_logs">已儲存的會話記錄</string> @@ -746,12 +867,28 @@ <string name="setup_home_on">DroidDeck 可用作主畫面應用程式</string> <string name="setup_home_off">DroidDeck 不會作為主畫面應用程式的選項</string> <string name="setup_orientation">螢幕方向</string> + <string name="setup_launcher_orientation">啟動器方向</string> + <string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string> + <string name="setup_orientation_portrait">直向</string> + <string name="setup_session_orientation">會話方向</string> + <string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;自訂的寬度和高度則維持輸入值。</string> <string name="setup_orientation_auto">自動橫向</string> <string name="setup_orientation_landscape">橫向</string> <string name="setup_orientation_reverse">反向橫向</string> <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> + <string name="setup_dual_screen">雙屏</string> + <string name="setup_dual_screen_hint">自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。</string> + <string name="setup_dual_screen_auto">自動</string> + <string name="setup_dual_screen_on">開啟</string> + <string name="setup_dual_screen_off">關閉</string> + <string name="setup_dual_screen_menu">下屏選單</string> + <string name="setup_dual_screen_menu_hint">將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。</string> + <string name="setup_dual_screen_controls">遊戲中的下屏控制</string> + <string name="setup_dual_screen_controls_hint">工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。</string> + <string name="dual_typing_title">正在為上屏輸入</string> + <string name="dual_typing_done">完成</string> <string name="setup_default_home">預設主畫面應用程式</string> <string name="setup_choose_home">選擇主畫面應用程式</string> <string name="setup_choose">選擇</string> @@ -896,6 +1033,14 @@ <string name="gate_step1">開啟「系統設定」→「開發人員選項」→「無線偵錯」,並將其開啟</string> <string name="gate_step2">輕按「使用配對碼配對裝置」</string> <string name="gate_step3">在 DroidDeck 通知中輸入配對碼</string> + <string name="pairguide_build_number">在「關於手機」中輕按「版本號碼」7 次</string> + <string name="pairguide_wireless">開啟「無線偵錯」</string> + <string name="pairguide_pair">開啟「無線偵錯」,然後輕按「使用配對碼配對裝置」</string> + <string name="pairguide_child_process">開啟「停用對子處理過程的限制」</string> + <string name="pairguide_row_child_process">停用對子處理過程的限制</string> + <string name="pairguide_row_build_number">版本號碼</string> + <string name="pairguide_row_wireless">無線偵錯</string> + <string name="pairguide_row_pair">使用配對碼配對裝置</string> <string name="gate_waiting">正在等待配對彈出式視窗…</string> <string name="gate_code_needed">已找到彈出式視窗,請在通知中輸入其中的配對碼。</string> <string name="gate_status">狀態</string> @@ -1019,8 +1164,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 +1171,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> @@ -1037,10 +1179,8 @@ <string name="games_never_played">從未玩過</string> <string name="games_runtime_busy_percent">運行環境繁忙 · %1$d%%</string> <string name="games_runtime_busy">運行環境繁忙</string> - <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> @@ -1055,6 +1195,9 @@ <string name="gpu_hide_other">隱藏其他 GPU 的驅動程式</string> <string name="gpu_show_other">顯示其他 GPU 的驅動程式</string> <string name="gpu_advanced">進階</string> + <string name="gpu_ubwc_title">UBWC 相容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出現條紋或閃爍,請試試開啟或關閉。重新啟動 DroidDeck 後會套用到兩種驅動程式。</string> + <string name="gpu_ubwc_restart">重新啟動 DroidDeck 以套用。</string> <string name="gpu_set_with_display">與顯示驅動程式一併設定:%1$s 同時包含兩者。</string> <string name="gpu_set_with_runtime">與運行環境驅動程式一併設定:%1$s 同時包含兩者。</string> <string name="gpu_runtime_hint">供遊戲和桌面使用。</string> @@ -1109,7 +1252,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> @@ -1163,10 +1306,15 @@ <string name="pip_auto">自動進入畫中畫</string> <string name="unfolded_controls">展開螢幕時的控制</string> <string name="unfolded_controls_hint">展開時,遊戲會顯示在 Steam Deck 觸控板和背面握把上方;摺疊時,遊戲會全螢幕顯示。</string> + <string name="unfolded_controls_with_controller">連接控制器時亦保留</string> + <string name="unfolded_controls_with_controller_hint">連接控制器時亦顯示這些觸控按鍵。</string> <string name="pip_suspended">已暫停</string> <string name="pip_not_ready">會話準備就緒後即可使用畫中畫。</string> <string name="pip_permission">請在 Android 設定中允許 DroidDeck 使用畫中畫。</string> <string name="pip_unavailable">Android 無法開啟畫中畫。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">編輯圖片</string> + <string name="stores_in_steam_label">在 Steam 中</string> <string name="game_shortcut">捷徑</string> <string name="game_shortcut_add">加至主畫面</string> <string name="game_shortcut_choose">選擇遊戲</string> @@ -1190,6 +1338,10 @@ <string name="main_wait_runtime">請等待運行環境操作完成</string> <string name="main_wait_proton_install">請等待兼容性工具安裝完成</string> + <string name="load_compat_title">正在準備兼容工具</string> + <string name="load_compat_wait">正在等待兼容性設定完成</string> + <string name="load_compat_hint">設定完成後,會話就會啟動。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">請等待桌面應用程式安裝完成</string> <string name="main_wait_install_game">請等待安裝完成後再啟動遊戲</string> <string name="main_saves_close_session">請先關閉 Steam 會話,以免遊戲存檔覆蓋匯入的內容</string> @@ -1222,6 +1374,9 @@ <string name="main_install_anyway">仍要安裝</string> <string name="main_remove_runtime_title">移除 Linux 運行環境</string> <string name="main_remove_runtime_text">此操作會刪除運行環境、其中的 Steam 用戶端,以及安裝在其中的所有遊戲。</string> + <string name="runtime_actions_title">Linux 運行環境</string> + <string name="runtime_actions_text">「修復」會重新安裝運行環境的系統檔案,並保留 Steam、遊戲和設定。桌面等額外元件會在下次使用時重新安裝。「移除」會刪除所有內容。</string> + <string name="runtime_repair">修復運行環境</string> <string name="main_applied">已套用:%1$s</string> <string name="android_app_open_failed_primary">無法在主螢幕開啟 %1$s</string> <string name="android_app_open_failed_on">無法在 %2$s 開啟 %1$s</string> @@ -1348,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">無法連接運行環境目錄。請檢查網絡連線,然後再按「開啟 Steam」。</string> <string name="session_runtime_install_failed">Linux 運行環境未能安裝。請在「設定」中檢查運行環境,然後再按「開啟 Steam」。</string> <string name="session_desktop_install_failed">桌面未能安裝(%1$s)。請檢查網絡連線,然後再按「桌面」。</string> + <string name="session_package_resume_failed">無法完成先前中斷的安裝(%1$s)。請檢查網絡連線和儲存空間,然後再試一次。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 運行環境已損壞:%1$d 個程式庫連結指向不存在的檔案(%2$s 等),通常是安裝中斷所致。修復會保留你的遊戲和設定。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。請在錯誤報告中附上記錄,或再試一次。</string> <string name="session_ended_program">程式意外停止。請在錯誤報告中附上記錄,或再試一次。</string> <string name="session_ended_desktop">桌面意外停止。請在錯誤報告中附上記錄,或再試一次。</string> @@ -1361,6 +1520,12 @@ <string name="mode_decky_plugins_hint">安裝插件 ZIP,在下次 Steam 會話使用。</string> <string name="mode_decky_plugin_downloading">正在下載…</string> <string name="mode_decky_plugin_install_zip">從 ZIP 安裝</string> + <string name="decky_zip_warning_title">安裝第三方插件</string> + <string name="decky_zip_warning_text">Decky Loader 團隊尚未審查此插件。它可能含有惡意軟件,例如竊取你的 Steam 帳戶或損害裝置的軟件。安裝此插件即表示你同意自行承擔裝置的一切風險。</string> + <string name="decky_zip_warning_continue">繼續</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">請稍候 %1$d 秒</item> + </plurals> <string name="store_cat_games">遊戲</string> <string name="store_cat_audio_video">音訊及影片</string> <string name="store_cat_graphics">圖形</string> @@ -1389,6 +1554,10 @@ <string name="theme_icon_blue_detail">黑色背景、白色文字,所有已選取、焦點所在或按下的項目都使用藍色。</string> <string name="theme_electric">電光海軍藍</string> <string name="theme_electric_detail">更明亮的藍色,搭配偏海軍藍而非灰色的介面。</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">在彩虹色之間循環變化的顏色。遵循 Android 的動畫設定。</string> + <string name="theme_rgb_speed">速度</string> + <string name="theme_rgb_speed_hint">顏色循環的快慢。</string> <string name="theme_gradient">漸層</string> <string name="theme_gradient_detail">你自行選擇的主色與輔色,在按鈕與強調處以漸層呈現。</string> <string name="theme_gradient_primary">主色</string> @@ -1505,7 +1674,16 @@ <string name="fm_conflict_skip">略過</string> <string name="fm_select_this_folder">選擇此資料夾</string> <string name="fm_back">返回</string> + <string name="fm_exit">離開</string> + <string name="fm_return_to_start">返回初始資料夾</string> + <string name="fm_start_unavailable">初始資料夾已無法使用</string> + <string name="fm_cancel_operation_title">取消操作?</string> + <string name="fm_cancel_operation_confirmation">操作將會取消。確定嗎?</string> + <string name="fm_accept">接受</string> + <string name="fm_decline">拒絕</string> <string name="fm_drive_not_readable">%1$s 已掛載,但目前無法讀取</string> + <string name="fm_drive_access_title">允許存取 %1$s</string> + <string name="fm_drive_access_text">Android 允許 DroidDeck 看到此磁碟,但不允許讀取。請為 DroidDeck 開啟「所有檔案存取權」,然後返回。</string> <string name="fm_list_view">清單檢視</string> <string name="fm_grid_view">格狀檢視</string> <string name="fm_search">搜尋</string> @@ -1576,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">鍵盤 + 觸控板</string> <string name="second_mode_terminal">終端機</string> <string name="second_mode_deck_controls">Deck 握把 + 觸控板</string> + <string name="second_mode_dashboard">儀表板</string> + <string name="bottom_dashboard_empty">目前沒有可顯示的內容。</string> + <string name="bottom_page_downloads">下載</string> + <string name="bottom_downloads_none">沒有進行中的下載。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下載著色器快取</string> + <string name="bottom_downloads_paused">已暫停</string> + <string name="bottom_downloads_queued">等待開始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 下方螢幕</string> + <string name="bottom_notifications_why">在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。</string> + <string name="bottom_notifications_allow">允許通知存取權</string> + <string name="bottom_notifications_none">沒有通知。</string> + <string name="bottom_notifications_count">%1$d 則通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">螢幕截圖</string> + <string name="stats_fps_needs_hud">顯示 FPS 需要開啟 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 力</string> + <string name="stats_timing">計時</string> + <string name="stats_best_lap">最佳單圈</string> + <string name="stats_tires">輪胎 °C</string> + <string name="stats_trace">油門和剎車,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">檔位</string> + <string name="stats_speed_units">速度單位</string> + <string name="stats_speed_units_auto">自動(%1$s)</string> + <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> + <string name="stats_steam_client_x86">Steam 用戶端 x86</string> + <string name="stats_throttle">油門</string> + <string name="stats_brake">剎車</string> + <string name="stats_lights">儀表指示燈</string> + <string name="stats_lamp_shift">換檔</string> + <string name="stats_lamp_handbrake">手剎</string> + <string name="stats_lamp_pit">維修區限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">渦輪 %1$s bar</string> + <string name="stats_engine_temp">引擎 %1$s °C</string> + <string name="stats_oil_temp">機油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">備用 %1$s t</string> + <string name="stats_tap_hint">點按頂部橫條或儀表即可變更其樣式。</string> + <string name="bottom_telemetry_send_title">傳送儀表板資料</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> + <string name="bottom_telemetry_send_note">這會變更遊戲本身的資料輸出設定。將在遊戲下次啟動時生效;關閉後會還原為原本的設定。</string> + <string name="bottom_telemetry_send_close">請先關閉 %1$s 再變更此項。</string> + <string name="bottom_telemetry_send_failed">無法變更 %1$s 的設定。</string> + <string name="bottom_telemetry_send_menu">%1$s:請在遊戲設定中開啟 %2$s,IP 設為 127.0.0.1,連接埠設為 %3$d。</string> + <string name="bottom_shots_where">儲存至 Pictures/DroidDeck。Steam 螢幕截圖也會顯示在這裡。</string> + <string name="bottom_shots_take">截取螢幕畫面</string> + <string name="bottom_shots_saved">已儲存螢幕截圖。</string> + <string name="bottom_shots_failed">無法截取螢幕畫面。</string> + <string name="bottom_shots_none">尚無螢幕截圖。</string> + <string name="bottom_page_chat">聊天和語音</string> + <string name="bottom_chat_why">遊戲在主螢幕上持續執行的同時,在此閱讀和回覆 Steam 聊天。會使用 Steam 目前登入的帳戶。</string> + <string name="bottom_chat_not_signed_in">Steam 目前還沒有可共用的網頁登入狀態,請在此登入一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在背景執行時,Android 關閉了聊天頁面。回到 DroidDeck 後會重新開啟。</string> + <string name="bottom_chat_open">開啟 Steam 聊天</string> + <string name="bottom_chat_close">關閉聊天</string> + <string name="bottom_chat_mic_on">麥克風已開啟</string> + <string name="bottom_chat_mic_off">麥克風已關閉</string> + <string name="bottom_chat_mic_unavailable">此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">遊戲內數據</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">電池</string> + <string name="bottom_telemetry_lap">圈數</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">貨物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律狀態</string> + <string name="bottom_telemetry_balance">餘額</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。</string> + <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> + <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> <string name="rtinst_removing">正在移除 Linux 運行環境</string> <plurals name="rtinst_removing_entries"> @@ -1605,6 +1870,7 @@ <string name="flatpakmgr_not_ready">請先設定 Flatpak</string> <string name="flatpakmgr_starting">正在開始</string> <string name="flatpakmgr_exit_status">Flatpak 已結束,狀態為 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是為 %2$s 建置的,DroidDeck 無法執行。這裡的 Flatpak 應用程式需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安裝 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1698,6 +1964,7 @@ <string name="adbpair_applying">正在套用設定…</string> <string name="adbpair_command_failed">無線偵錯指令失敗</string> <string name="adbpair_channel_name">無線偵錯設定</string> + <string name="adbpair_progress_channel_name">無線偵錯設定進度</string> <string name="adbpair_channel_description">在「系統設定」開啟時要求輸入無線偵錯配對碼</string> <string name="adbpair_title_pair">配對無線偵錯</string> <string name="adbpair_waiting_text">開啟無線偵錯,然後輕按「使用配對碼配對裝置」。</string> @@ -1900,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">縮放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">顯示裝置詳情</string> <string name="device_info_hide">隱藏裝置詳情</string> @@ -1918,7 +2185,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> @@ -1932,11 +2198,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> @@ -1954,9 +2218,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> @@ -1975,12 +2247,43 @@ <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> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">側邊欄標籤</string> + <string name="setup_rail_labels_hint">在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。</string> + <string name="library_display">顯示</string> + <string name="library_display_larger">較大卡片</string> + <string name="library_display_smaller">較小卡片</string> + <string name="library_display_title">顯示標題</string> + <string name="library_display_size">顯示大小</string> <string name="stores_sort_last_played">最近遊玩</string> <string name="stores_sort_recently_installed">最近安裝</string> <string name="stores_sort_title_asc">標題 A–Z</string> @@ -2107,6 +2410,9 @@ <string name="stores_download_manager">下載管理員</string> <string name="stores_parallel">同時下載數目</string> <string name="stores_install_where">安裝至</string> + <string name="stores_install_language">遊戲語言</string> + <string name="stores_install_language_hint">GOG 和 Epic 會安裝此語言。「系統」會跟隨應用程式語言。</string> + <string name="stores_install_language_system">系統</string> <string name="stores_install_title">安裝 %1$s:</string> <string name="stores_target_internal">內部儲存空間</string> <string name="stores_target_free">可用 %1$s</string> @@ -2129,6 +2435,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> @@ -2144,6 +2451,9 @@ <string name="edit_target">目標</string> <string name="edit_start_in">開始位置</string> <string name="edit_launch_options">啟動選項</string> + <string name="edit_launch_options_steam_hint">與 Steam 的「內容」共用:在任一處更改,兩處都會更新。</string> + <string name="edit_launch_options_not_saved">無法將啟動選項儲存到 Steam。請再試一次。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面會話中執行。請在 Steam 的「內容」中更改啟動選項,或先關閉該會話。</string> <string name="edit_artwork">圖片</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2269,6 +2579,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 Proxy</string> <string name="flathub_eyebrow">Linux 應用程式</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux 桌面的桌面應用程式,可從「桌面」開啟。</string> @@ -2407,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">「自動」會令這款 2D 遊戲固定在視野中。如要使用頭部追蹤,請在「顯示」中選擇「虛擬螢幕」。</string> <string name="glasses_tracking_sbs_hint">頭部追蹤適用於虛擬螢幕或正在運行的 SteamVR 遊戲。</string> <string name="glasses_hardware">設備</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的控制器</string> + <string name="vr_controllers_emulate_hint">你的控制器所模擬的兩隻 VR 手。變更會即時生效,SteamVR 運行期間亦然。Joy-Con 和手部追蹤仍會接管各自對應的一側。</string> + <string name="vr_controllers_off">一般控制器</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">搖桿初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同時按下兩個搖桿即可切換。</string> + <string name="vr_controllers_sticks_game">在遊戲中移動</string> + <string name="vr_controllers_sticks_hands">移動雙手</string> + <string name="vr_controllers_buttons">按鈕</string> + <string name="vr_controllers_buttons_stick">扳機就是扳機,肩鍵為握持,A/B 和 X/Y 為各隻手的正面按鈕,按下搖桿即按下拇指搖桿,Guide 鍵開啟 SteamVR 選單。方向鍵上下可讓雙手拉近或推遠。</string> + <string name="vr_controllers_buttons_vive">搖桿作為觸控板使用;按 A/X 或按下搖桿即可按壓觸控板。扳機就是扳機,肩鍵為握持,Start 和 Select 為選單鍵,Guide 鍵開啟 SteamVR 選單。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支援控制器的遊戲以及 SteamVR 選單會照常使用你的控制器。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2464,6 +2791,12 @@ <string name="hand_camera_placement">相機位置</string> <string name="hand_camera_placement_hint">開始玩之前,請確認相機能看到你。</string> <string name="hand_camera_check">檢查</string> + <string name="tracking_pack_title">手部追蹤下載</string> + <string name="tracking_pack_hint">手部追蹤需要一次性下載 %1$s。</string> + <string name="tracking_pack_download">下載</string> + <string name="tracking_pack_retry">重試</string> + <string name="tracking_pack_downloading">正在下載手部追蹤… %1$d%%</string> + <string name="tracking_pack_failed">無法下載手部追蹤。請檢查網絡連線後再試一次。</string> <string name="hand_camera_check_title">相機位置</string> <string name="hand_camera_how_rear">將裝置立在距離 1.5 到 2 米、約胸口高度的地方,讓後置相機對著你。然後張開雙手走進畫面。</string> <string name="hand_camera_how_front">將裝置立在距離 1.5 到 2 米、約胸口高度的地方,讓螢幕對著你。然後張開雙手走進畫面。</string> @@ -2535,6 +2868,21 @@ <string name="storage_safe_hint">未使用的運行環境、殘留、舊記錄</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止會話後才能清理或移除。容量仍會顯示。</string> + <string name="storage_default_group">安裝位置</string> + <string name="storage_default_title">預設儲存空間</string> + <string name="storage_default_hint">從商店新安裝的遊戲會安裝到所選位置。現有遊戲維持原位。Steam 收藏庫保有自己的設定。</string> + <string name="storage_default_ask">每次都詢問</string> + <string name="storage_default_ask_detail">每次安裝時選擇目標位置</string> + <string name="storage_default_internal">內部儲存空間</string> + <string name="storage_default_external">外部儲存空間</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未連接</string> + <string name="storage_default_folder">資料夾 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未連接</string> + <string name="storage_default_choose_folder">選擇資料夾…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 儲存裝置上的任何資料夾</string> + <string name="storage_default_note">遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。</string> <string name="storage_where">空間去向</string> <string name="storage_games">Steam 遊戲</string> <string name="storage_game_data">遊戲資料</string> @@ -2656,6 +3004,9 @@ <string name="storage_data_installed">已安裝遊戲</string> <string name="storage_data_parts">前綴 %1$s · 著色器 %2$s · 工作坊 %3$s</string> <string name="storage_clear_shaders">清除著色器</string> + <string name="storage_reset_prefix">重設前綴</string> + <string name="storage_reset_prefix_title">要重設 %1$s 的前綴嗎?</string> + <string name="storage_reset_prefix_confirm">刪除位於 %2$s 中的 Wine 前綴(%1$s),並在下次啟動時重新建立。其中的存檔、設定和已安裝的可轉散發元件都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。</string> <string name="storage_data_leftovers">已解除安裝遊戲</string> <string name="storage_steam_app">Steam 應用程式 %1$d</string> <string name="storage_leftover_unsure_detail">其前綴仍含檔案,其中可能有本機存檔</string> @@ -2954,7 +3305,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">這是以 Syncthing-Fork 為基礎的 Syncthing 實作,可將 DroidDeck 內部檔案系統中的檔案與其他 Syncthing 實例同步。只適用於你存放在 DroidDeck 內部檔案系統中的檔案。</string> + <string name="sync_missing">此版本未包含 Syncthing。</string> + <string name="sync_starting">正在啟動 Syncthing</string> + <string name="sync_status_starting">正在啟動</string> + <string name="sync_status_up_to_date">已是最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暫停</string> + <string name="sync_status_pausing">正在暫停</string> + <string name="sync_status_resuming">正在繼續</string> + <string name="sync_status_attention">需要處理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">再試一次</string> + <string name="sync_paused_wifi">已暫停,等待連接 Wi-Fi</string> + <string name="sync_paused_game">遊戲期間已暫停</string> + <string name="sync_summary">%1$d 個資料夾 · 已連接 %2$d/%3$d 部裝置</string> + <string name="sync_left">剩餘 %1$s</string> + <string name="sync_open_web_ui">開啟網頁介面</string> + <string name="sync_pause">暫停</string> + <string name="sync_resume">繼續</string> + <string name="sync_running">運行中</string> + <string name="sync_running_hint">關閉後將完全停止 Syncthing。</string> + <string name="sync_this_device">此裝置</string> + <string name="sync_device_id">裝置 ID</string> + <string name="sync_show_qr">顯示 QR 碼</string> + <string name="sync_advanced">進階</string> + <string name="sync_advanced_hint">連接埠、運行時機、重設</string> + <string name="sync_open">開啟</string> + <string name="sync_waiting">等待你處理</string> + <string name="sync_pending_device">%1$s 想要連接</string> + <string name="sync_pending_folder">%1$s 想要共用「%2$s」</string> + <string name="sync_pending_folder_hint">接受後即可選擇在 DroidDeck 中的儲存位置。</string> + <string name="sync_review">在網頁介面中檢視</string> + <string name="sync_folders">資料夾</string> + <string name="sync_no_folders">暫時沒有資料夾。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">已是最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在掃描</string> + <string name="sync_folder_paused">已暫停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 個檔案無法同步</string> + <string name="sync_folder_blocked">已封鎖</string> + <string name="sync_folder_blocked_hint">此資料夾位於 DroidDeck 的儲存空間之外,因此 DroidDeck 已將其暫停。若要同步 DroidDeck 以外的資料夾,請使用 Syncthing-Fork 應用程式。</string> + <string name="sync_remove_folder">從 Syncthing 移除</string> + <string name="sync_remove_folder_hint">移除後不會刪除任何檔案。</string> + <string name="sync_devices">裝置</string> + <string name="sync_no_devices">暫時沒有裝置。</string> + <string name="sync_connected">已連接</string> + <string name="sync_offline">離線</string> + <string name="sync_last_seen">上次在線:%1$s</string> + <string name="sync_device_id_title">此裝置的 ID</string> + <string name="sync_device_id_hint">在你的另一部裝置上,於 Syncthing 中新增裝置,然後掃描此 QR 碼或貼上 ID。接著在這裡的網頁介面中接受該裝置。</string> + <string name="sync_copy">複製</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">關閉 Syncthing?</string> + <string name="sync_off_body">Syncthing 會立即停止,並保持停止狀態,直至再次開啟為止。已同步的檔案會保留在原處。</string> + <string name="sync_off_forget">同時刪除 Syncthing 的設定</string> + <string name="sync_off_forget_hint">將移除此裝置的 ID、資料夾和裝置。再次開啟時會從頭開始。</string> + <string name="sync_turn_off">關閉</string> + <string name="sync_ports">連接埠</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本地探索</string> + <string name="sync_repick">選擇新的連接埠</string> + <string name="sync_repick_hint">每次啟動時都會重新檢查。</string> + <string name="sync_repick_button">重新選擇</string> + <string name="sync_reset_group">重設</string> + <string name="sync_api_key">API 密鑰</string> + <string name="sync_regenerate">重新產生</string> + <string name="sync_reset">重設 Syncthing</string> + <string name="sync_reset_hint">將產生新的裝置 ID,並移除資料夾和裝置。DroidDeck 儲存空間中的檔案會保留。</string> + <string name="sync_reset_button">重設</string> + <string name="sync_reset_confirm_title">重設 Syncthing?</string> + <string name="sync_running_group">運行</string> + <string name="sync_run">運行時機</string> + <string name="sync_run_open">DroidDeck 開啟時</string> + <string name="sync_run_background">在背景運行</string> + <string name="sync_wifi_only">只限 Wi-Fi</string> + <string name="sync_pause_games">遊戲期間暫停</string> + <string name="sync_logs">記錄</string> + <string name="sync_logs_hint">此會話的 Syncthing 輸出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">請先設定 Linux 運行環境。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">將「%1$s」儲存到</string> + <string name="sync_add_folder">新增資料夾</string> + <string name="sync_add_folder_hint">同步 DroidDeck 儲存空間中的資料夾</string> + <string name="sync_choose">選擇</string> + <string name="sync_add">新增</string> + <string name="sync_add_failed">無法新增該資料夾。</string> + <string name="sync_share_with">共用對象</string> + <string name="sync_share_none">暫時沒有裝置。你稍後可以從網頁介面共用此資料夾。</string> + <string name="sync_use_folder">使用此資料夾</string> + <string name="sync_new_folder">新資料夾</string> + <string name="sync_location_home">容器主目錄</string> + <string name="sync_location_sync">Sync 資料夾</string> + <string name="sync_location_shared">DroidDeck 共用儲存空間</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 應用程式資料</string> + <string name="sync_web_path_locked">新資料夾會儲存在 DroidDeck 的 Sync 資料夾中。若要同步其他 DroidDeck 資料夾,請在「Syncthing」分頁中使用「新增資料夾」。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新載入</string> + <string name="sync_not_running">Syncthing 未在運行。</string> <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="session_end_steam_sigill">Steam 因非法指令(SIGILL)停止。這可能是 CPU 指令兼容問題,也可能是客戶端崩潰。請分享記錄並附上裝置資訊。</string> + <string name="session_end_steam_try_x64">可嘗試「Steam 設定 → Steam 客戶端 → x86-64(實驗)」。此選項需要額外下載,執行速度也可能更慢。</string> + <string name="session_end_vulkan_device">Linux 圖形驅動程式未找到可用的 Vulkan 裝置。請確認所選 Linux GPU 驅動程式支援這顆 GPU。</string> + <string name="session_end_gpu_unsupported">目前設定缺少兼容這顆 GPU 的 Linux Vulkan 驅動程式,工作階段無法啟動。Adreno Turnip 驅動程式無法為聯發科/Mali GPU 增加支援。</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_resources_browser">在瀏覽器中開啟</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 兼容性報告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">適用於存檔儲存在 Steam 帳戶中的遊戲</string> + <string name="game_resource_search">網上搜尋</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="library_filter">篩選</string> + <string name="library_filter_installed">僅限已安裝</string> + <string name="library_filter_all_owned">所有擁有的遊戲</string> + <string name="library_no_installed_matches">沒有符合這些篩選條件的已安裝遊戲。</string> + <string name="library_browse_owned">瀏覽擁有的遊戲</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="stores_itch_updates_found">可用更新:%1$d</string> + <string name="stores_itch_update_replaced">開發者已將此版本替換為 %1$s。要更新到該版本嗎?</string> + <string name="xbox_filter_cloud">雲端</string> + <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="integration_title">Steam 整合</string> + <string name="integration_count">已開啟 %1$d/%2$d 項</string> + <string name="integration_set_up">設定</string> + <string name="integration_location">位置</string> + <string name="integration_app_info">應用程式資訊</string> + <string name="integration_wifi">Wi-Fi 名稱</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">將 DroidDeck 用作主畫面</string> + <string name="integration_shortcuts">主畫面按鈕快速鍵</string> + <string name="integration_wifi_hint">在 Steam 中顯示網絡 · 需要位置存取權,絕不追蹤</string> + <string name="integration_wifi_on">網絡會顯示在 Steam 中</string> + <string name="integration_wifi_location_off">位置資訊已關閉</string> + <string name="integration_wifi_denied">位置存取遭拒 · 請在「應用程式資訊」中允許</string> + <string name="integration_brightness_hint">Steam 的滑桿會設定螢幕亮度</string> + <string name="integration_home_hint">在會話中,主畫面按鈕會開啟 Steam 選單</string> + <string name="integration_shortcuts_hint">按住主畫面按鈕以使用 Steam Guide 組合鍵</string> + <string name="integration_shortcuts_needs_home">需要將 DroidDeck 設為主畫面</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_restricted">已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_service">DroidDeck 主畫面按鈕</string> + <string name="integration_shortcuts_service_description">當 Steam 會話處於焦點且 DroidDeck 為預設主畫面應用程式時,將主畫面按鈕的按壓傳送給 Steam Guide。不會讀取螢幕內容。</string> + <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="apps_search_hint">搜尋應用程式</string> + <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> + <string name="apps_add_widget">新增小工具</string> + <string name="apps_widgets_loading">正在載入小工具…</string> + <string name="apps_widgets_none">此裝置上沒有提供小工具的應用程式。</string> + <string name="apps_widget_wider">加闊</string> + <string name="apps_widget_narrower">收窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">向前移</string> + <string name="apps_widget_move_later">向後移</string> + <string name="apps_widget_configure">小工具設定</string> + <string name="apps_widget_remove">移除小工具</string> + <string name="apps_add_to_folder">加入資料夾</string> + <string name="apps_new_folder">新資料夾</string> + <string name="apps_remove_from_folder">從資料夾移除</string> + <string name="apps_app_info">應用程式資料</string> + <string name="apps_uninstall">解除安裝</string> + <string name="apps_folder_rename">重新命名</string> + <string name="apps_folder_ungroup">取消組合</string> + <string name="apps_folder_default">資料夾</string> + <string name="apps_folder_name">資料夾名稱</string> + <string name="apps_filter">顯示</string> + <string name="apps_filter_all">所有應用程式</string> + <string name="apps_filter_games">遊戲</string> + <string name="apps_filter_downloaded">已下載</string> + <string name="apps_filter_system">系統</string> + <string name="apps_filter_hidden">已隱藏</string> + <string name="apps_hide">隱藏</string> + <string name="apps_unhide">在應用程式中顯示</string> + <string name="apps_shortcut_remove">移除捷徑</string> + <string name="apps_pin_title">加入應用程式</string> + <string name="apps_pin_add">新增</string> + <string name="apps_hidden_none">沒有隱藏的應用程式。</string> + <string name="apps_sort_name_asc">名稱 A–Z</string> + <string name="apps_sort_name_desc">名稱 Z–A</string> + <string name="apps_sort_installed">最近安裝</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個應用程式</item> + </plurals> + <string name="desktop_restore_title">正在還原你的軟件</string> + <string name="desktop_restore_body">DroidDeck 更新後正在重新安裝你加入的應用程式。</string> + <string name="desktop_restore_done_title">軟件已還原</string> + <string name="desktop_restore_done_body">你加入的應用程式已重新安裝。</string> + <string name="desktop_restore_failed_title">部分軟件無法還原</string> + <string name="desktop_restore_failed_body">請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。</string> + <string name="gog_full_files">無法使用原生優化。下載內容包含完整的替換檔案。</string> + <string name="gog_recover">驗證修補結果</string> + <string name="slow_usb_title">USB 連線速度慢</string> + <string name="slow_usb_cable">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),當中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 線,嘗試反轉 USB-C 插頭,或使用更快的硬碟。</string> + <string name="slow_usb_port">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。</string> + <string name="slow_usb_never">不再顯示</string> + <string name="slow_usb_dismiss">關閉</string> + <string name="steam_import_title">重新啟動 Steam 以加入你的遊戲?</string> + <string name="steam_import_body">Steam 可將你擁有的這些遊戲顯示為已安裝:%1$s。需要重新啟動 Steam 才會顯示。立即重新啟動,或在下次啟動 Steam 時加入。</string> + <string name="steam_import_names_more">%1$s 及另外 %2$d 款</string> + <string name="steam_import_now">立即重新啟動</string> + <string name="steam_import_later">稍後</string> + <string name="gog_maintenance">管理 GOG 安裝</string> + <string name="gog_check">檢查更新</string> + <string name="gog_repair">驗證/修復</string> + <string name="gog_patches">離線修補程式</string> + <string name="gog_refresh">下載完整離線安裝程式</string> + <string name="gog_update">更新至 %1$s</string> + <string name="gog_resume">繼續 GOG 維護</string> + <string name="gog_open_patch">開啟修補安裝程式</string> + <string name="gog_patch_in_session">請在 Linux 會話中完成或取消修補安裝程式。</string> + <string name="gog_patch_requirements">請選擇適用於已安裝版本和語言的修補程式。支援的來源版本可能未列出。</string> + <string name="gog_no_patches">GOG 沒有提供此遊戲的獨立 Windows 修補程式。</string> + <string name="gog_managed_files">修改過的遊戲檔案可能會被取代。</string> + <string name="gog_patch_installer_note">安裝程式會在你的 Linux 會話中開啟。</string> + <string name="gog_download_label">下載</string> + <string name="gog_space_label">額外空間</string> + <string name="gog_space_estimate_label">預估空間</string> + <string name="gog_repair_action">修復檔案</string> + <string name="gog_refresh_action">重新整理安裝</string> + <string name="gog_select_patch">選擇</string> + <string name="setup_all_files">所有檔案存取權限</string> + <string name="setup_local_network">區域網絡</string> + <string name="libraries_title">更多 Steam 收藏庫</string> + <string name="libraries_hint">Steam 可在這些資料夾中安裝和執行遊戲,每個資料夾都有獨立名稱。從清單移除後,磁碟上的遊戲仍會保留。</string> + <string name="libraries_add">新增收藏庫</string> + <string name="libraries_rename_title">收藏庫名稱</string> + <string name="libraries_pick">選擇收藏庫資料夾</string> + <string name="libraries_full">最多新增 %1$d 個收藏庫</string> + <string name="libraries_overlap">此資料夾已是收藏庫,或位於某個收藏庫內</string> + <string name="libraries_missing">%1$s · 無法使用</string> + <string name="libraries_applies_next">從下次 Steam 工作階段開始生效</string> + <string name="bottom_desktop_start">啟動桌面</string> + <string name="bottom_desktop_mode_touch">直接觸控</string> + <string name="bottom_desktop_trackpad">觸控板。點按切換為直接觸控</string> + <string name="bottom_desktop_direct_touch">直接觸控。點按切換為觸控板</string> + <string name="bottom_desktop_starting">正在啟動 KDE 桌面…</string> + <string name="bottom_desktop_ended">桌面已結束。</string> + <string name="bottom_desktop_failed">無法啟動桌面。記錄位於本次工作階段的 bottom-desktop 資料夾中。</string> + <string name="bottom_desktop_off">桌面已關閉。</string> + <string name="libraries_rename">重新命名</string> + <string name="second_mode_desktop">桌面</string> + <string name="bottom_desktop_mode_trackpad">觸控板</string> + <string name="bottom_desktop_title">桌面 · %1$s</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/gestures.xml b/app/src/main/res/values-zh-rTW/gestures.xml index 464f94d88..551fab20d 100644 --- a/app/src/main/res/values-zh-rTW/gestures.xml +++ b/app/src/main/res/values-zh-rTW/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">手勢</string> <string name="gesture_settings">觸控手勢設定</string> - <string name="gesture_settings_hint">自訂滑鼠與鍵盤手勢。請選擇「手勢」觸控模式以使用這些功能。</string> <string name="gesture_tap">點按</string> <string name="gesture_drag">單指拖曳</string> <string name="gesture_long_press">長按</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">三指按住</string> <string name="gesture_pinch">雙指縮放</string> <string name="gesture_hold_button">持續按住按鈕</string> + <string name="gesture_hold_left">按住左鍵</string> + <string name="gesture_hold_right">按住右鍵</string> <string name="gesture_click_once">按一下</string> <string name="gesture_hold_delay">按住延遲</string> <string name="gesture_double_delay">連點兩下間隔</string> @@ -70,7 +71,7 @@ <string name="gesture_key_backspace">退格</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">空白鍵</string> <string name="gesture_key_delete">刪除</string> <string name="gesture_key_insert">插入</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-zh-rTW/shortcuts.xml b/app/src/main/res/values-zh-rTW/shortcuts.xml new file mode 100644 index 000000000..4a4d7f170 --- /dev/null +++ b/app/src/main/res/values-zh-rTW/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">實體按鍵快捷操作</string> + <string name="shortcuts_dd_menu">DroidDeck 選單</string> + <string name="shortcuts_capture">指派:%1$s</string> + <string name="shortcuts_press">按下並放開一個按鈕,指派會自動儲存。</string> + <string name="shortcuts_release">放開按鍵以繼續。</string> + <string name="shortcuts_detected">%1$s:%2$s</string> + <string name="shortcuts_conflict">此按鍵已指派給:%1$s</string> + <string name="shortcuts_save">重新指派</string> + <string name="shortcuts_retry">嘗試其他按鍵</string> + <string name="shortcuts_limitations">主畫面按鈕及部分額外按鈕可能無法使用。</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 d29f3cef4..b2aa84d72 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 選項。nodxr 會停用光線追蹤;僅在遊戲需要時使用。</string> <string name="game_env_proton_log">設定為 1 以產生 Proton 診斷日誌。記錄日誌可能降低效能並佔用儲存空間。</string> <string name="game_env_wined3d">設定為 1,使用基於 OpenGL 的 WineD3D 代替 DXVK,用於 D3D9–11 相容性測試。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1-7 及透過 WineD3D 執行之遊戲的轉譯器。Vulkan 會略過 OpenGL-on-Zink 路徑,在 Adreno 上執行舊款 DirectDraw 和 Direct3D 7 遊戲時快得多。</string> + <string name="game_env_dxvk_d3d8">設定為 1 以透過 DXVK 而非 WineD3D 執行 Direct3D 8。在 Adreno 上的 AIO Graphics Test Direct3D 8 測試中速度較快。</string> <string name="game_env_no_ntsync">設為 1 可讓此遊戲不使用 ntsync(droiddeck-ntsync 或核心驅動程式);有對應套件時改用 droiddeck-esync,否則使用 droiddeck-fsync。</string> <string name="game_env_no_esync">設為 1 可為此遊戲關閉 droiddeck-esync;改用 droiddeck-fsync,若 fsync 也已關閉則使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">設為 1 可讓此遊戲不使用 droiddeck-fsync;有對應套件時改用 droiddeck-esync,否則使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">設為 1 讓此遊戲使用 droiddeck-fsync;設為 0 則在有適用其 Proton 的套件時優先使用 droiddeck-esync。</string> <string name="game_env_xalia">設定為 0,為此遊戲停用 Proton 的手把導覽輔助程式。</string> + <string name="game_env_anticheat_offline">預設為開啟。當遊戲支援離線遊玩時,以不載入反作弊的方式啟動 Easy Anti-Cheat 遊戲。關閉後會照常透過 Easy Anti-Cheat 啟動。需要 Easy Anti-Cheat 的線上模式仍然無法使用。</string> <string name="game_env_hud">D3D9–11 的 DXVK 重疊層。fps 顯示影格率;取消設定則隱藏重疊層。</string> <string name="game_env_dxvk_config">以分號分隔的 DXVK 設定。近期版本使用 dxvk.maxFrameRate 限制影格率;日常遊玩建議使用工作階段影格率限制器。</string> + <string name="game_env_cores">此遊戲使用的 CPU 核心,例如 0-4 或 0,2,4,用來取代工作階段的遊戲核心。核心越少,溫度越低。</string> <string name="game_env_vkd3d_limit">D3D12 影格率限制。0 表示停用限制。</string> <string name="game_env_glthread">Mesa OpenGL 多執行緒。對於 CPU 受限的 OpenGL 遊戲,true 可能有所幫助;請按遊戲分別測試。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 可在這部 ARM64 裝置上執行 x86 Linux 程式。「自動」會在程式為 x86 組建時使用 FEX。</string> <string name="app_fex_x86">透過 FEX 執行 %1$s</string> <string name="app_fex_not_ready">此程式是為 %1$s 電腦組建的,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 和所需的 Steam Linux Runtime,之後就能開啟此程式。</string> + <string name="session_proot_missing">無法下載 DroidDeck 的 proot。請檢查連線後再試一次。工作階段未啟動,因為備用 proot 太慢,無法用來玩遊戲。</string> + <string name="session_directaudio_missing">無法下載 DirectAudio,因此本次工作階段的遊戲音訊會使用較慢的路徑。</string> <string name="session_end_program">此程式</string> <string name="session_end_steam_download">無法下載 Steam 用戶端。你的網路或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試一次。</string> <string name="session_end_steam_setup">無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試一次。</string> @@ -247,8 +253,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 +271,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> @@ -277,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 控制器</string> <string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:使用 Guide+A 開啟快速存取。</string> <string name="mode_back">返回</string> + <string name="back_hold">長按返回鍵使用 Steam 快捷操作</string> + <string name="back_hold_hint">長按返回鍵開啟快速存取,或與其他按鍵組成 Steam 組合鍵。關閉後忽略長按;輕觸和輕觸兩下仍然有效。</string> + <string name="back_native_qam_hint">按住返回鍵 700 毫秒,或按住返回鍵並按下其他按鈕以使用 Steam 快速鍵。</string> + <string name="back_double_tap_window">連按兩下間隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允許控制亮度</string> + <string name="brightness_permission_text">在 DroidDeck 中設定亮度控制。</string> <string name="back_menu_then_qam">選單 → QAM</string> <string name="back_qam_then_menu">QAM → 選單</string> <string name="mode_session">工作階段</string> @@ -300,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">載入器</string> <string name="mode_decky_install_latest">安裝最新版本</string> + <string name="decky_channel">更新頻道</string> + <string name="decky_channel_hint">要安裝哪一種 Decky Loader 版本。Decky 本身的更新程式也會使用相同的頻道。</string> + <string name="decky_channel_stable">穩定版</string> + <string name="decky_channel_prerelease">預先發行版</string> + <string name="decky_channel_testing">測試版</string> + <string name="decky_channel_failed">無法儲存 Decky 更新頻道</string> <string name="mode_decky_on">隨 Steam 啟動。啟用後,此裝置上的其他應用程式可能可以控制 Steam。</string> <string name="mode_decky_off">關閉。Steam 的遠端偵錯連接埠保持關閉。</string> <string name="mode_decky_remove_title">解除安裝 Decky Loader?</string> @@ -309,6 +344,8 @@ <string name="mode_mangoapp_hint">如果 Deck 模式下遊戲崩潰或黑畫面,請關閉此項。下次工作階段生效。</string> <string name="mode_return_after_game">遊戲結束後返回 DroidDeck</string> <string name="mode_return_after_game_hint">從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。</string> + <string name="mode_shader_precache">著色器預先快取</string> + <string name="mode_shader_precache_hint">Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。</string> <string name="mode_steam_repair">修復 Steam 用戶端</string> <string name="mode_steam_repair_hint">下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停在載入畫面,請使用此功能。遊戲、登入狀態和設定都會保留。</string> <string name="mode_steam_repair_queued">下次啟動 Steam 時會重新下載 Steam 用戶端。</string> @@ -375,6 +412,8 @@ <string name="mode_directaudio_hint">繞過 PulseAudio 以降低延遲。</string> <string name="mode_mic">麥克風</string> <string name="mode_mic_hint">用於語音聊天。</string> + <string name="drawer_mic_hint">為此工作階段開啟或關閉麥克風收音。</string> + <string name="drawer_mic_failed">無法變更麥克風設定,請再試一次。</string> <string name="mode_network">網路</string> <string name="mode_wifi_discovery">Wi-Fi 探索</string> <string name="mode_wifi_discovery_hint">在 Steam 中顯示 Wi-Fi 名稱和附近的網路。</string> @@ -535,14 +574,24 @@ <string name="perf_gsrealtime">gamescope:即時 GPU 佇列</string> <string name="perf_gsrealtime_hint">提高合成器 GPU 工作的優先順序。可能改善影格時間穩定性,但會佔用一部分遊戲效能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">記憶體</string> + <string name="perf_cap_off">關閉</string> + <string name="perf_cap_auto">驅動程式預設值</string> + <string name="perf_zram_client">遊戲執行時壓縮 Steam</string> + <string name="perf_zram_client_hint">遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果工作階段在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,工作階段仍會壓縮 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當工作階段的用量超過此值時,會先將 Steam、再將工作階段中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交換空間,但這部裝置沒有。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 遊戲回報的顯示記憶體,讓遊戲以較少的量規劃紋理。遊戲本身的 DXVK 設定仍優先。下次工作階段生效。</string> <string name="perf_gpuclock">讓 GPU 保持最高頻率</string> <string name="perf_gpuclock_hint">僅適用於 Adreno。卡頓更少,但耗電和發熱更多。</string> <string name="perf_fixes">工作階段修復</string> <string name="perf_sysmem">Turnip:sysmem 渲染</string> <string name="perf_sysmem_hint">Steam 用戶端會更快;遊戲中驅動程式會為每個算繪通道選擇分塊算繪或系統記憶體算繪。Adreno 710/720/722 必需。</string> <string name="perf_xalia">跳過 Steam 的 xalia 輔助程式</string> - <string name="perf_fastsync">droiddeck-ntsync(實驗性)</string> - <string name="perf_fastsync_hint">以使用者空間替代 Linux ntsync 驅動程式,供測試使用。開啟時,Proton 會使用它來取代 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次工作階段生效。</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">以使用者空間替代 Linux ntsync 驅動程式。開啟時,Proton 會使用它來取代 droiddeck-esync 和 droiddeck-fsync。適用於 Proton Experimental ARM64、GE-Proton 和 proton-cachyos。下次工作階段生效。</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">優先使用 droiddeck-fsync</string> <string name="perf_fsync_hint">在原版 Proton 檔案上執行 Proton 自己的 fsync,並在使用者空間提供 futex_waitv,因此不需要套件,Steam 更新 Proton 後也能立即繼續運作。開啟時,遊戲會優先使用它而非 droiddeck-esync,Proton 本身停用 fsync 的少數遊戲除外。下次工作階段生效。</string> @@ -553,6 +602,8 @@ <string name="perf_fastpath">proot 快速路徑</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 篩選器。</string> <string name="perf_fastpath_hint">檔案尋找更快、卡頓更少。如果程式找不到檔案,請關閉此項。</string> + <string name="perf_cursor_composite">在 gamescope 內繪製游標</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行繪製指標,而不交給 Android。若要用手把控制游標,請開啟此項。在手機上關閉會比較快。下次工作階段生效。</string> <string name="perf_identity">工作階段身分</string> <string name="perf_hostname">主機名稱</string> <string name="perf_hostname_hint">Steam 看到的此裝置名稱。留空可還原為 %1$s。</string> @@ -567,6 +618,8 @@ <string name="driver_delete_plain">其檔案會從應用程式中移除。</string> <string name="driver_delete_in_use">其檔案會被移除。由於正在使用中,因此會改用預設驅動程式。</string> <string name="drawer_page_display">顯示</string> + <string name="drawer_frame_limit">影格率限制</string> + <string name="drawer_frame_limit_note">限制此遊戲的影格率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的影格率限制。</string> <string name="drawer_page_effects">效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">元件</string> @@ -591,6 +644,66 @@ <string name="drawer_hud_color_amber">琥珀</string> <string name="drawer_hud_color_violet">紫羅蘭</string> <string name="drawer_hud_opacity">不透明度</string> + <string name="hud_size">大小</string> + <string name="hud_size_hint">輕觸 HUD 也可以切換大小。</string> + <string name="hud_size_full">完整</string> + <string name="hud_size_tiles">圖塊</string> + <string name="hud_size_pill">膠囊</string> + <string name="hud_size_minimal">極簡</string> + <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">橫條</string> + <string name="hud_locked">鎖定位置</string> + <string name="hud_locked_hint">拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。</string> + <string name="hud_snap">貼齊兩側</string> + <string name="hud_snap_hint">放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。</string> + <string name="hud_group_look">外觀</string> + <string name="hud_scale">螢幕顯示大小</string> + <string name="hud_color_soft">柔和</string> + <string name="hud_color_mid">適中</string> + <string name="hud_color_vivid">鮮豔</string> + <string name="hud_outline">描邊</string> + <string name="hud_outline_color">描邊顏色</string> + <string name="hud_outline_gray">灰色</string> + <string name="hud_outline_theme">主題色</string> + <string name="hud_group_metrics">讀數</string> + <string name="hud_metric_graph">幀時間圖表</string> + <string name="hud_metric_decimal">幀率顯示小數</string> + <string name="hud_metric_low001" formatted="false">0.01% 最低幀</string> + <string name="hud_metric_engine">圖形引擎</string> + <string name="hud_metric_gpu_model">GPU 名稱</string> + <string name="hud_metric_gpu">GPU 負載</string> + <string name="hud_metric_gpu_temp">GPU 溫度</string> + <string name="hud_metric_cpu">CPU 負載</string> + <string name="hud_metric_per_core">CPU 各核心</string> + <string name="hud_metric_temp">溫度</string> + <string name="hud_metric_ram">記憶體</string> + <string name="hud_metric_vram">顯示記憶體</string> + <string name="hud_metric_swap">交換空間</string> + <string name="hud_metric_battery">電池電量</string> + <string name="hud_metric_power">功耗</string> + <string name="hud_metric_network">網路</string> + <string name="hud_metric_resolution">解析度</string> + <string name="hud_metric_proton">Proton 版本</string> + <string name="hud_metric_session">工作階段時間</string> + <string name="hud_metric_clock">時鐘</string> + <string name="hud_group_temps">溫度</string> + <string name="hud_temp_unit">單位</string> + <string name="hud_temp_bands">警告顏色</string> + <string name="hud_temp_bands_hint">溫度接近上限時會先變成琥珀色,再變成紅色。</string> + <string name="hud_temp_bands_off">關閉</string> + <string name="hud_temp_bands_auto">自動</string> + <string name="hud_temp_bands_manual">手動</string> + <string name="hud_temp_red_cpu">CPU 變紅溫度</string> + <string name="hud_temp_red_gpu">GPU 變紅溫度</string> + <string name="hud_temp_red_battery">電池變紅溫度</string> + <string name="hud_group_more">更多</string> + <string name="hud_export">HUD 診斷</string> + <string name="hud_export_hint">將 HUD 讀取的所有感測器報告儲存到 Downloads/DroidDeck。</string> + <string name="hud_export_button">儲存</string> + <string name="hud_export_done">已儲存到 %1$s</string> + <string name="hud_export_failed">無法儲存 HUD 報告。</string> + <string name="hud_reset">重設 HUD 設定</string> + <string name="hud_reset_button">重設</string> <string name="drawer_scaling">縮放模式</string> <string name="drawer_scaling_sharpness">縮放銳利度</string> <string name="drawer_effects">畫面效果</string> @@ -625,10 +738,14 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">鍵盤</string> <string name="drawer_latency">延遲</string> + <string name="drawer_low_latency">低延遲模式</string> + <string name="drawer_low_latency_hint">會增加 CPU 和電池用量</string> <string name="drawer_low_latency_controller">低延遲控制器</string> <string name="drawer_low_latency_controller_hint">控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。</string> <string name="drawer_low_latency_touch">低延遲觸控</string> <string name="drawer_low_latency_touch_hint">觸控略過影格合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。</string> + <string name="drawer_evdev_mouse">原生滑鼠通道</string> + <string name="drawer_direct_cursor">游標</string> <string name="drawer_pc_keyboard">電腦鍵盤</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">第二螢幕</string> @@ -714,6 +831,10 @@ <string name="setup_session">工作階段</string> <string name="setup_logs">工作階段日誌</string> <string name="setup_logs_hint">每次工作階段結束後儲存</string> + <string name="setup_game_debug_logs">遊戲偵錯日誌</string> + <string name="setup_game_debug_logs_hint">在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。</string> + <string name="setup_game_debug_logs_restart">重新啟動此工作階段以儲存遊戲偵錯日誌</string> + <string name="setup_logging_update_failed">無法更新日誌設定。請檢查開關後再試一次。</string> <string name="setup_agent_commands">偵錯工具</string> <string name="setup_latest_logs">最新工作階段日誌</string> <string name="setup_saved_logs">已儲存的工作階段日誌</string> @@ -746,12 +867,28 @@ <string name="setup_home_on">DroidDeck 可以作為主螢幕應用程式</string> <string name="setup_home_off">DroidDeck 不會作為主螢幕應用程式提供</string> <string name="setup_orientation">螢幕方向</string> + <string name="setup_launcher_orientation">啟動器方向</string> + <string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string> + <string name="setup_orientation_portrait">直向</string> + <string name="setup_session_orientation">工作階段方向</string> + <string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;自訂的寬度和高度則維持輸入值。</string> <string name="setup_orientation_auto">自動橫向</string> <string name="setup_orientation_landscape">橫向</string> <string name="setup_orientation_reverse">反向橫向</string> <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> + <string name="setup_dual_screen">雙螢幕</string> + <string name="setup_dual_screen_hint">自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。</string> + <string name="setup_dual_screen_auto">自動</string> + <string name="setup_dual_screen_on">開啟</string> + <string name="setup_dual_screen_off">關閉</string> + <string name="setup_dual_screen_menu">下螢幕選單</string> + <string name="setup_dual_screen_menu_hint">將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。</string> + <string name="setup_dual_screen_controls">遊戲中的下螢幕控制</string> + <string name="setup_dual_screen_controls_hint">工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。</string> + <string name="dual_typing_title">正在為上螢幕輸入</string> + <string name="dual_typing_done">完成</string> <string name="setup_default_home">預設主螢幕應用程式</string> <string name="setup_choose_home">選擇主螢幕應用程式</string> <string name="setup_choose">選擇</string> @@ -896,6 +1033,14 @@ <string name="gate_step1">開啟「Android 設定」→「開發人員選項」→「無線偵錯」,並將其開啟</string> <string name="gate_step2">點擊「使用配對碼配對裝置」</string> <string name="gate_step3">將配對碼輸入 DroidDeck 通知中</string> + <string name="pairguide_build_number">在「關於手機」中輕觸「版本號碼」7 次</string> + <string name="pairguide_wireless">開啟「無線偵錯」</string> + <string name="pairguide_pair">開啟「無線偵錯」,然後輕觸「使用配對碼配對裝置」</string> + <string name="pairguide_child_process">開啟「停止限制子處理程序」</string> + <string name="pairguide_row_child_process">停止限制子處理程序</string> + <string name="pairguide_row_build_number">版本號碼</string> + <string name="pairguide_row_wireless">無線偵錯</string> + <string name="pairguide_row_pair">使用配對碼配對裝置</string> <string name="gate_waiting">正在等待配對彈出視窗…</string> <string name="gate_code_needed">已找到彈出視窗。請將其中的配對碼輸入通知。</string> <string name="gate_status">狀態</string> @@ -1019,8 +1164,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 +1171,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> @@ -1037,10 +1179,8 @@ <string name="games_never_played">從未執行</string> <string name="games_runtime_busy_percent">執行環境繁忙 · %1$d%%</string> <string name="games_runtime_busy">執行環境繁忙</string> - <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> @@ -1055,6 +1195,9 @@ <string name="gpu_hide_other">隱藏其他 GPU 的驅動程式</string> <string name="gpu_show_other">顯示其他 GPU 的驅動程式</string> <string name="gpu_advanced">進階</string> + <string name="gpu_ubwc_title">UBWC 相容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出現條紋或閃爍,請試試開啟或關閉。重新啟動 DroidDeck 後會套用到兩種驅動程式。</string> + <string name="gpu_ubwc_restart">重新啟動 DroidDeck 以套用。</string> <string name="gpu_set_with_display">與顯示驅動程式一起設定:%1$s 同時包含兩者。</string> <string name="gpu_set_with_runtime">與執行環境驅動程式一起設定:%1$s 同時包含兩者。</string> <string name="gpu_runtime_hint">供遊戲和桌面使用。</string> @@ -1109,7 +1252,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> @@ -1163,10 +1306,15 @@ <string name="pip_auto">自動進入子母畫面</string> <string name="unfolded_controls">展開螢幕時的控制</string> <string name="unfolded_controls_hint">展開時,遊戲會顯示在 Steam Deck 觸控板和背面握把上方。摺疊時,遊戲以全螢幕顯示。</string> + <string name="unfolded_controls_with_controller">連接手把時也保留</string> + <string name="unfolded_controls_with_controller_hint">連接手把時也顯示這些觸控按鍵。</string> <string name="pip_suspended">已暫停</string> <string name="pip_not_ready">工作階段準備就緒後即可使用子母畫面。</string> <string name="pip_permission">請在 Android 設定中允許 DroidDeck 使用子母畫面。</string> <string name="pip_unavailable">Android 無法開啟子母畫面。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">編輯圖片</string> + <string name="stores_in_steam_label">在 Steam 中</string> <string name="game_shortcut">捷徑</string> <string name="game_shortcut_add">新增至主螢幕</string> <string name="game_shortcut_choose">選擇遊戲</string> @@ -1190,6 +1338,10 @@ <string name="main_wait_runtime">請等待執行環境作業完成</string> <string name="main_wait_proton_install">請等待相容性工具安裝完成</string> + <string name="load_compat_title">正在準備相容工具</string> + <string name="load_compat_wait">正在等待相容性設定完成</string> + <string name="load_compat_hint">設定完成後,工作階段就會啟動。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">請等待桌面應用程式安裝完成</string> <string name="main_wait_install_game">請等待安裝完成後再啟動遊戲</string> <string name="main_saves_close_session">請先關閉 Steam 工作階段,以免遊戲存檔覆蓋匯入的內容</string> @@ -1222,6 +1374,9 @@ <string name="main_install_anyway">仍要安裝</string> <string name="main_remove_runtime_title">移除 Linux 執行環境</string> <string name="main_remove_runtime_text">這會刪除執行環境、其中的 Steam 用戶端,以及安裝在其中的所有遊戲。</string> + <string name="runtime_actions_title">Linux 執行環境</string> + <string name="runtime_actions_text">「修復」會重新安裝執行環境的系統檔案,並保留 Steam、遊戲和設定。桌面等額外元件會在下次使用時重新安裝。「移除」會刪除所有內容。</string> + <string name="runtime_repair">修復執行環境</string> <string name="main_applied">已套用:%1$s</string> <string name="android_app_open_failed_primary">無法在主螢幕上開啟 %1$s</string> <string name="android_app_open_failed_on">無法在 %2$s 上開啟 %1$s</string> @@ -1348,6 +1503,10 @@ <string name="session_runtime_catalog_unreachable">無法連線到執行環境目錄。請檢查網路連線,然後再按一次「執行」。</string> <string name="session_runtime_install_failed">Linux 執行環境未能安裝。請在「設定」中檢查執行環境,然後再按一次「執行」。</string> <string name="session_desktop_install_failed">桌面未能安裝(%1$s)。請檢查網路連線,然後再按一次「桌面」。</string> + <string name="session_package_resume_failed">無法完成先前中斷的安裝(%1$s)。請檢查網路連線和儲存空間,然後再試一次。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 執行環境已損壞:%1$d 個程式庫連結指向不存在的檔案(%2$s 等),通常是安裝中斷所致。修復會保留你的遊戲和設定。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。請在錯誤報告中附上日誌,或再試一次。</string> <string name="session_ended_program">程式意外停止。請在錯誤報告中附上日誌,或再試一次。</string> <string name="session_ended_desktop">桌面意外停止。請在錯誤報告中附上日誌,或再試一次。</string> @@ -1361,6 +1520,12 @@ <string name="mode_decky_plugins_hint">安裝外掛程式 ZIP,供下次 Steam 工作階段使用。</string> <string name="mode_decky_plugin_downloading">正在下載…</string> <string name="mode_decky_plugin_install_zip">從 ZIP 安裝</string> + <string name="decky_zip_warning_title">安裝第三方外掛程式</string> + <string name="decky_zip_warning_text">Decky Loader 團隊尚未審查此外掛程式。它可能含有惡意軟體,例如竊取你的 Steam 帳戶或損害裝置的軟體。安裝此外掛程式即表示你同意自行承擔裝置的一切風險。</string> + <string name="decky_zip_warning_continue">繼續</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">請稍候 %1$d 秒</item> + </plurals> <string name="store_cat_games">遊戲</string> <string name="store_cat_audio_video">影音</string> <string name="store_cat_graphics">圖形</string> @@ -1389,6 +1554,10 @@ <string name="theme_icon_blue_detail">黑色背景、白色文字,選取、聚焦或按下的項目使用藍色。</string> <string name="theme_electric">電光藏青</string> <string name="theme_electric_detail">更亮的藍色,搭配偏藏青而非灰色的介面。</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">在彩虹色之間循環變化的顏色。遵循 Android 的動畫設定。</string> + <string name="theme_rgb_speed">速度</string> + <string name="theme_rgb_speed_hint">顏色循環的快慢。</string> <string name="theme_gradient">漸層</string> <string name="theme_gradient_detail">你自行選擇的主色與輔色,在按鈕與強調處以漸層呈現。</string> <string name="theme_gradient_primary">主色</string> @@ -1412,7 +1581,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">空白鍵</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1505,7 +1674,16 @@ <string name="fm_conflict_skip">略過</string> <string name="fm_select_this_folder">選擇此資料夾</string> <string name="fm_back">返回</string> + <string name="fm_exit">離開</string> + <string name="fm_return_to_start">返回起始資料夾</string> + <string name="fm_start_unavailable">起始資料夾已無法使用</string> + <string name="fm_cancel_operation_title">取消操作?</string> + <string name="fm_cancel_operation_confirmation">操作將會取消。確定嗎?</string> + <string name="fm_accept">接受</string> + <string name="fm_decline">拒絕</string> <string name="fm_drive_not_readable">%1$s 已掛載,但目前無法讀取</string> + <string name="fm_drive_access_title">允許存取 %1$s</string> + <string name="fm_drive_access_text">Android 允許 DroidDeck 看到這個磁碟,但不允許讀取。請為 DroidDeck 開啟「所有檔案存取權」,然後返回。</string> <string name="fm_list_view">清單檢視</string> <string name="fm_grid_view">格狀檢視</string> <string name="fm_search">搜尋</string> @@ -1576,6 +1754,93 @@ <string name="second_mode_keyboard_trackpad">鍵盤 + 觸控板</string> <string name="second_mode_terminal">終端機</string> <string name="second_mode_deck_controls">Deck 握把 + 觸控板</string> + <string name="second_mode_dashboard">儀表板</string> + <string name="bottom_dashboard_empty">目前沒有可顯示的內容。</string> + <string name="bottom_page_downloads">下載</string> + <string name="bottom_downloads_none">沒有進行中的下載。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下載著色器快取</string> + <string name="bottom_downloads_paused">已暫停</string> + <string name="bottom_downloads_queued">等待開始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 底部螢幕</string> + <string name="bottom_notifications_why">在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。</string> + <string name="bottom_notifications_allow">允許通知存取權</string> + <string name="bottom_notifications_none">沒有通知。</string> + <string name="bottom_notifications_count">%1$d 則通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">螢幕擷取畫面</string> + <string name="stats_fps_needs_hud">顯示 FPS 需要開啟 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 力</string> + <string name="stats_timing">計時</string> + <string name="stats_best_lap">最佳單圈</string> + <string name="stats_tires">輪胎 °C</string> + <string name="stats_trace">油門和煞車,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">檔位</string> + <string name="stats_speed_units">速度單位</string> + <string name="stats_speed_units_auto">自動(%1$s)</string> + <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> + <string name="stats_steam_client_x86">Steam 用戶端 x86</string> + <string name="stats_throttle">油門</string> + <string name="stats_brake">煞車</string> + <string name="stats_lights">儀表指示燈</string> + <string name="stats_lamp_shift">換檔</string> + <string name="stats_lamp_handbrake">手煞車</string> + <string name="stats_lamp_pit">維修區限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">渦輪 %1$s bar</string> + <string name="stats_engine_temp">引擎 %1$s °C</string> + <string name="stats_oil_temp">機油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">備用 %1$s t</string> + <string name="stats_tap_hint">點按頂部橫條或儀表即可變更其樣式。</string> + <string name="bottom_telemetry_send_title">傳送儀表板資料</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> + <string name="bottom_telemetry_send_note">這會變更遊戲本身的資料輸出設定。將在遊戲下次啟動時生效;關閉後會還原為原本的設定。</string> + <string name="bottom_telemetry_send_close">請先關閉 %1$s 再變更此項。</string> + <string name="bottom_telemetry_send_failed">無法變更 %1$s 的設定。</string> + <string name="bottom_telemetry_send_menu">%1$s:請在遊戲設定中開啟 %2$s,IP 設為 127.0.0.1,連接埠設為 %3$d。</string> + <string name="bottom_shots_where">儲存至 Pictures/DroidDeck。Steam 螢幕擷取畫面也會顯示在這裡。</string> + <string name="bottom_shots_take">擷取螢幕畫面</string> + <string name="bottom_shots_saved">已儲存螢幕擷取畫面。</string> + <string name="bottom_shots_failed">無法擷取螢幕畫面。</string> + <string name="bottom_shots_none">尚無螢幕擷取畫面。</string> + <string name="bottom_page_chat">聊天和語音</string> + <string name="bottom_chat_why">遊戲在主螢幕上持續執行的同時,在此閱讀和回覆 Steam 聊天。會使用 Steam 目前登入的帳戶。</string> + <string name="bottom_chat_not_signed_in">Steam 目前還沒有可共用的網頁登入狀態,請在此登入一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在背景執行時,Android 關閉了聊天頁面。回到 DroidDeck 後會重新開啟。</string> + <string name="bottom_chat_open">開啟 Steam 聊天</string> + <string name="bottom_chat_close">關閉聊天</string> + <string name="bottom_chat_mic_on">麥克風已開啟</string> + <string name="bottom_chat_mic_off">麥克風已關閉</string> + <string name="bottom_chat_mic_unavailable">此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">遊戲內數據</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">電池</string> + <string name="bottom_telemetry_lap">圈數</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">貨物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律狀態</string> + <string name="bottom_telemetry_balance">餘額</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">開啟賽車遊戲的資料輸出(通常稱為遙測或 UDP),即可在此查看即時儀表。資料只會留在這部裝置上。</string> + <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> + <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> <string name="rtinst_removing">正在移除 Linux 執行環境</string> <plurals name="rtinst_removing_entries"> @@ -1605,6 +1870,7 @@ <string name="flatpakmgr_not_ready">請先設定 Flatpak</string> <string name="flatpakmgr_starting">正在啟動</string> <string name="flatpakmgr_exit_status">Flatpak 已結束,狀態碼 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是為 %2$s 建置的,DroidDeck 無法執行。這裡的 Flatpak 應用程式需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安裝 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1698,6 +1964,7 @@ <string name="adbpair_applying">正在套用設定…</string> <string name="adbpair_command_failed">無線偵錯指令失敗</string> <string name="adbpair_channel_name">無線偵錯設定</string> + <string name="adbpair_progress_channel_name">無線偵錯設定進度</string> <string name="adbpair_channel_description">在「Android 設定」開啟時要求輸入無線偵錯配對碼</string> <string name="adbpair_title_pair">配對無線偵錯</string> <string name="adbpair_waiting_text">開啟無線偵錯,然後點擊「使用配對碼配對裝置」。</string> @@ -1900,10 +2167,10 @@ <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> + <string name="display_follow_screen_scaled">縮放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">顯示裝置詳細資料</string> <string name="device_info_hide">隱藏裝置詳細資料</string> @@ -1918,7 +2185,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> @@ -1932,11 +2198,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> @@ -1954,9 +2218,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> @@ -1975,12 +2247,43 @@ <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> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">側邊欄標籤</string> + <string name="setup_rail_labels_hint">在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。</string> + <string name="library_display">顯示</string> + <string name="library_display_larger">較大的卡片</string> + <string name="library_display_smaller">較小的卡片</string> + <string name="library_display_title">顯示標題</string> + <string name="library_display_size">顯示大小</string> <string name="stores_sort_last_played">最近遊玩</string> <string name="stores_sort_recently_installed">最近安裝</string> <string name="stores_sort_title_asc">標題 A–Z</string> @@ -2107,6 +2410,9 @@ <string name="stores_download_manager">下載管理員</string> <string name="stores_parallel">同時下載數</string> <string name="stores_install_where">安裝到</string> + <string name="stores_install_language">遊戲語言</string> + <string name="stores_install_language_hint">GOG 和 Epic 會安裝此語言。「系統」會跟隨應用程式語言。</string> + <string name="stores_install_language_system">系統</string> <string name="stores_install_title">安裝 %1$s:</string> <string name="stores_target_internal">內部</string> <string name="stores_target_free">可用 %1$s</string> @@ -2129,6 +2435,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> @@ -2144,6 +2451,9 @@ <string name="edit_target">目標</string> <string name="edit_start_in">開始位置</string> <string name="edit_launch_options">啟動選項</string> + <string name="edit_launch_options_steam_hint">與 Steam 的「內容」共用:在任一處變更,兩處都會更新。</string> + <string name="edit_launch_options_not_saved">無法將啟動選項儲存至 Steam。請再試一次。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面工作階段中執行。請在 Steam 的「內容」中變更啟動選項,或先關閉該工作階段。</string> <string name="edit_artwork">圖片</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2269,6 +2579,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 Proxy</string> <string name="flathub_eyebrow">LINUX 應用程式</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">適用於 Linux 桌面的應用程式,從「桌面」開啟。</string> @@ -2407,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">「自動」會讓這款 2D 遊戲固定在視野中。如要使用頭部追蹤,請在「顯示」中選擇「虛擬螢幕」。</string> <string name="glasses_tracking_sbs_hint">頭部追蹤適用於虛擬螢幕或執行中的 SteamVR 遊戲。</string> <string name="glasses_hardware">設備</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的手把</string> + <string name="vr_controllers_emulate_hint">你的手把所模擬的兩隻 VR 手。變更會立即生效,SteamVR 執行時也一樣。Joy-Con 和手部追蹤仍會接管各自對應的一側。</string> + <string name="vr_controllers_off">一般手把</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">搖桿初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同時按下兩個搖桿即可切換。</string> + <string name="vr_controllers_sticks_game">在遊戲中移動</string> + <string name="vr_controllers_sticks_hands">移動雙手</string> + <string name="vr_controllers_buttons">按鈕</string> + <string name="vr_controllers_buttons_stick">扳機就是扳機,肩鍵為握持,A/B 和 X/Y 為各隻手的正面按鈕,按下搖桿即按下拇指搖桿,Guide 鍵開啟 SteamVR 選單。方向鍵上下可讓雙手拉近或推遠。</string> + <string name="vr_controllers_buttons_vive">搖桿作為觸控板使用;按 A/X 或按下搖桿即可按壓觸控板。扳機就是扳機,肩鍵為握持,Start 和 Select 為選單鍵,Guide 鍵開啟 SteamVR 選單。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支援手把的遊戲以及 SteamVR 選單會照常使用你的手把。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2464,6 +2791,12 @@ <string name="hand_camera_placement">相機位置</string> <string name="hand_camera_placement_hint">開始遊玩前,請確認相機能看到你。</string> <string name="hand_camera_check">檢查</string> + <string name="tracking_pack_title">手部追蹤下載</string> + <string name="tracking_pack_hint">手部追蹤需要一次性下載 %1$s。</string> + <string name="tracking_pack_download">下載</string> + <string name="tracking_pack_retry">重試</string> + <string name="tracking_pack_downloading">正在下載手部追蹤… %1$d%%</string> + <string name="tracking_pack_failed">無法下載手部追蹤。請檢查網路連線後再試一次。</string> <string name="hand_camera_check_title">相機位置</string> <string name="hand_camera_how_rear">將裝置立在距離 1.5 到 2 公尺、約胸口高度的地方,讓後置相機對著你。然後張開雙手走進畫面。</string> <string name="hand_camera_how_front">將裝置立在距離 1.5 到 2 公尺、約胸口高度的地方,讓螢幕對著你。然後張開雙手走進畫面。</string> @@ -2535,6 +2868,21 @@ <string name="storage_safe_hint">未使用的執行環境、殘留、舊日誌</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止工作階段後才能清理或移除。容量仍會顯示。</string> + <string name="storage_default_group">安裝位置</string> + <string name="storage_default_title">預設儲存空間</string> + <string name="storage_default_hint">從商店新安裝的遊戲會安裝到所選位置。現有遊戲維持原位。Steam 收藏庫保有自己的設定。</string> + <string name="storage_default_ask">每次都詢問</string> + <string name="storage_default_ask_detail">每次安裝時選擇目標位置</string> + <string name="storage_default_internal">內部儲存空間</string> + <string name="storage_default_external">外部儲存空間</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未連接</string> + <string name="storage_default_folder">資料夾 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未連接</string> + <string name="storage_default_choose_folder">選擇資料夾…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 隨身碟上的任何資料夾</string> + <string name="storage_default_note">遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。</string> <string name="storage_where">空間去向</string> <string name="storage_games">Steam 遊戲</string> <string name="storage_game_data">遊戲資料</string> @@ -2656,6 +3004,9 @@ <string name="storage_data_installed">已安裝遊戲</string> <string name="storage_data_parts">前綴 %1$s · 著色器 %2$s · 工作坊 %3$s</string> <string name="storage_clear_shaders">清除著色器</string> + <string name="storage_reset_prefix">重設前綴</string> + <string name="storage_reset_prefix_title">要重設 %1$s 的前綴嗎?</string> + <string name="storage_reset_prefix_confirm">刪除位於 %2$s 中的 Wine 前綴(%1$s),並在下次啟動時重新建立。其中的存檔、設定和已安裝的可轉散發套件都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。</string> <string name="storage_data_leftovers">已解除安裝遊戲</string> <string name="storage_steam_app">Steam 應用程式 %1$d</string> <string name="storage_leftover_unsure_detail">其前綴仍含檔案,其中可能有本機存檔</string> @@ -2954,7 +3305,308 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">這是以 Syncthing-Fork 為基礎的 Syncthing 實作,可將 DroidDeck 內部檔案系統中的檔案與其他 Syncthing 執行個體同步。僅適用於你存放在 DroidDeck 內部檔案系統中的檔案。</string> + <string name="sync_missing">此版本未包含 Syncthing。</string> + <string name="sync_starting">正在啟動 Syncthing</string> + <string name="sync_status_starting">正在啟動</string> + <string name="sync_status_up_to_date">已是最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暫停</string> + <string name="sync_status_pausing">正在暫停</string> + <string name="sync_status_resuming">正在繼續</string> + <string name="sync_status_attention">需要處理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">再試一次</string> + <string name="sync_paused_wifi">已暫停,等待連上 Wi-Fi</string> + <string name="sync_paused_game">遊戲期間已暫停</string> + <string name="sync_summary">%1$d 個資料夾 · 已連線 %2$d/%3$d 部裝置</string> + <string name="sync_left">剩餘 %1$s</string> + <string name="sync_open_web_ui">開啟網頁介面</string> + <string name="sync_pause">暫停</string> + <string name="sync_resume">繼續</string> + <string name="sync_running">執行中</string> + <string name="sync_running_hint">關閉後將完全停止 Syncthing。</string> + <string name="sync_this_device">此裝置</string> + <string name="sync_device_id">裝置 ID</string> + <string name="sync_show_qr">顯示 QR 碼</string> + <string name="sync_advanced">進階</string> + <string name="sync_advanced_hint">連接埠、執行時機、重設</string> + <string name="sync_open">開啟</string> + <string name="sync_waiting">等待你處理</string> + <string name="sync_pending_device">%1$s 想要連線</string> + <string name="sync_pending_folder">%1$s 想要共用「%2$s」</string> + <string name="sync_pending_folder_hint">接受後即可選擇在 DroidDeck 中的儲存位置。</string> + <string name="sync_review">在網頁介面中檢視</string> + <string name="sync_folders">資料夾</string> + <string name="sync_no_folders">尚無資料夾。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">已是最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在掃描</string> + <string name="sync_folder_paused">已暫停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 個檔案無法同步</string> + <string name="sync_folder_blocked">已封鎖</string> + <string name="sync_folder_blocked_hint">此資料夾位於 DroidDeck 的儲存空間之外,因此 DroidDeck 已將其暫停。若要同步 DroidDeck 以外的資料夾,請使用 Syncthing-Fork 應用程式。</string> + <string name="sync_remove_folder">從 Syncthing 移除</string> + <string name="sync_remove_folder_hint">移除後不會刪除任何檔案。</string> + <string name="sync_devices">裝置</string> + <string name="sync_no_devices">尚無裝置。</string> + <string name="sync_connected">已連線</string> + <string name="sync_offline">離線</string> + <string name="sync_last_seen">上次上線:%1$s</string> + <string name="sync_device_id_title">此裝置的 ID</string> + <string name="sync_device_id_hint">在你的另一部裝置上,於 Syncthing 中新增裝置,然後掃描此 QR 碼或貼上 ID。接著在這裡的網頁介面中接受該裝置。</string> + <string name="sync_copy">複製</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">要關閉 Syncthing 嗎?</string> + <string name="sync_off_body">Syncthing 會立即停止,並維持停止狀態,直到再次開啟為止。已同步的檔案會保留在原處。</string> + <string name="sync_off_forget">同時刪除 Syncthing 的設定</string> + <string name="sync_off_forget_hint">將移除此裝置的 ID、資料夾和裝置。再次開啟時會從頭開始。</string> + <string name="sync_turn_off">關閉</string> + <string name="sync_ports">連接埠</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本機探索</string> + <string name="sync_repick">選擇新的連接埠</string> + <string name="sync_repick_hint">每次啟動時都會重新檢查。</string> + <string name="sync_repick_button">重新選擇</string> + <string name="sync_reset_group">重設</string> + <string name="sync_api_key">API 金鑰</string> + <string name="sync_regenerate">重新產生</string> + <string name="sync_reset">重設 Syncthing</string> + <string name="sync_reset_hint">將產生新的裝置 ID,並移除資料夾和裝置。DroidDeck 儲存空間中的檔案會保留。</string> + <string name="sync_reset_button">重設</string> + <string name="sync_reset_confirm_title">要重設 Syncthing 嗎?</string> + <string name="sync_running_group">執行</string> + <string name="sync_run">執行時機</string> + <string name="sync_run_open">DroidDeck 開啟時</string> + <string name="sync_run_background">在背景執行</string> + <string name="sync_wifi_only">僅限 Wi-Fi</string> + <string name="sync_pause_games">遊戲期間暫停</string> + <string name="sync_logs">日誌</string> + <string name="sync_logs_hint">此工作階段的 Syncthing 輸出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">請先設定 Linux 執行環境。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">將「%1$s」儲存到</string> + <string name="sync_add_folder">新增資料夾</string> + <string name="sync_add_folder_hint">同步 DroidDeck 儲存空間中的資料夾</string> + <string name="sync_choose">選擇</string> + <string name="sync_add">新增</string> + <string name="sync_add_failed">無法新增該資料夾。</string> + <string name="sync_share_with">共用對象</string> + <string name="sync_share_none">尚無裝置。你之後可以從網頁介面共用此資料夾。</string> + <string name="sync_use_folder">使用此資料夾</string> + <string name="sync_new_folder">新資料夾</string> + <string name="sync_location_home">容器家目錄</string> + <string name="sync_location_sync">Sync 資料夾</string> + <string name="sync_location_shared">DroidDeck 共用儲存空間</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 應用程式資料</string> + <string name="sync_web_path_locked">新資料夾會儲存在 DroidDeck 的 Sync 資料夾中。若要同步其他 DroidDeck 資料夾,請在「Syncthing」分頁中使用「新增資料夾」。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新載入</string> + <string name="sync_not_running">Syncthing 未在執行。</string> <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="session_end_steam_sigill">Steam 因非法指令(SIGILL)停止。這可能是 CPU 指令相容問題,也可能是用戶端當機。請分享記錄並附上裝置資訊。</string> + <string name="session_end_steam_try_x64">可嘗試「Steam 設定 → Steam 用戶端 → x86-64(實驗)」。此選項需要額外下載,執行速度也可能更慢。</string> + <string name="session_end_vulkan_device">Linux 圖形驅動程式未找到可用的 Vulkan 裝置。請確認所選 Linux GPU 驅動程式支援這顆 GPU。</string> + <string name="session_end_gpu_unsupported">目前設定缺少相容這顆 GPU 的 Linux Vulkan 驅動程式,工作階段無法啟動。Adreno Turnip 驅動程式無法為聯發科/Mali GPU 增加支援。</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_resources_browser">在瀏覽器中開啟</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 相容性報告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">適用於存檔儲存在 Steam 帳戶中的遊戲</string> + <string name="game_resource_search">網路搜尋</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="library_filter">篩選</string> + <string name="library_filter_installed">僅限已安裝</string> + <string name="library_filter_all_owned">所有擁有的遊戲</string> + <string name="library_no_installed_matches">沒有符合這些篩選條件的已安裝遊戲。</string> + <string name="library_browse_owned">瀏覽擁有的遊戲</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="stores_itch_updates_found">可用更新:%1$d</string> + <string name="stores_itch_update_replaced">開發者已將此版本替換為 %1$s。要更新到該版本嗎?</string> + <string name="xbox_filter_cloud">雲端</string> + <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="integration_title">Steam 整合</string> + <string name="integration_count">已開啟 %1$d/%2$d 項</string> + <string name="integration_set_up">設定</string> + <string name="integration_location">位置</string> + <string name="integration_app_info">應用程式資訊</string> + <string name="integration_wifi">Wi-Fi 名稱</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">將 DroidDeck 設為主畫面</string> + <string name="integration_shortcuts">主畫面按鈕快速鍵</string> + <string name="integration_wifi_hint">在 Steam 中顯示網路 · 需要位置存取權,絕不追蹤</string> + <string name="integration_wifi_on">網路會顯示在 Steam 中</string> + <string name="integration_wifi_location_off">位置資訊已關閉</string> + <string name="integration_wifi_denied">位置存取遭拒 · 請在「應用程式資訊」中允許</string> + <string name="integration_brightness_hint">Steam 的滑桿會設定螢幕亮度</string> + <string name="integration_home_hint">在工作階段中,主畫面按鈕會開啟 Steam 選單</string> + <string name="integration_shortcuts_hint">按住主畫面按鈕以使用 Steam Guide 組合鍵</string> + <string name="integration_shortcuts_needs_home">需要將 DroidDeck 設為主畫面</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_restricted">已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_service">DroidDeck 主畫面按鈕</string> + <string name="integration_shortcuts_service_description">當 Steam 工作階段處於焦點且 DroidDeck 為預設主畫面應用程式時,將主畫面按鈕的按壓傳送給 Steam Guide。不會讀取螢幕內容。</string> + <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="apps_search_hint">搜尋應用程式</string> + <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> + <string name="apps_add_widget">新增小工具</string> + <string name="apps_widgets_loading">正在載入小工具…</string> + <string name="apps_widgets_none">這部裝置上沒有提供小工具的應用程式。</string> + <string name="apps_widget_wider">加寬</string> + <string name="apps_widget_narrower">縮窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">往前移</string> + <string name="apps_widget_move_later">往後移</string> + <string name="apps_widget_configure">小工具設定</string> + <string name="apps_widget_remove">移除小工具</string> + <string name="apps_add_to_folder">新增至資料夾</string> + <string name="apps_new_folder">新資料夾</string> + <string name="apps_remove_from_folder">從資料夾移除</string> + <string name="apps_app_info">應用程式資訊</string> + <string name="apps_uninstall">解除安裝</string> + <string name="apps_folder_rename">重新命名</string> + <string name="apps_folder_ungroup">取消群組</string> + <string name="apps_folder_default">資料夾</string> + <string name="apps_folder_name">資料夾名稱</string> + <string name="apps_filter">顯示</string> + <string name="apps_filter_all">所有應用程式</string> + <string name="apps_filter_games">遊戲</string> + <string name="apps_filter_downloaded">已下載</string> + <string name="apps_filter_system">系統</string> + <string name="apps_filter_hidden">已隱藏</string> + <string name="apps_hide">隱藏</string> + <string name="apps_unhide">在應用程式中顯示</string> + <string name="apps_shortcut_remove">移除捷徑</string> + <string name="apps_pin_title">新增至應用程式</string> + <string name="apps_pin_add">新增</string> + <string name="apps_hidden_none">沒有隱藏的應用程式。</string> + <string name="apps_sort_name_asc">名稱 A–Z</string> + <string name="apps_sort_name_desc">名稱 Z–A</string> + <string name="apps_sort_installed">最近安裝</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個應用程式</item> + </plurals> + <string name="desktop_restore_title">正在還原你的軟體</string> + <string name="desktop_restore_body">DroidDeck 更新後正在重新安裝你加入的應用程式。</string> + <string name="desktop_restore_done_title">軟體已還原</string> + <string name="desktop_restore_done_body">你加入的應用程式已重新安裝。</string> + <string name="desktop_restore_failed_title">部分軟體無法還原</string> + <string name="desktop_restore_failed_body">請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。</string> + <string name="gog_full_files">無法使用原生最佳化。下載內容包含完整的替換檔案。</string> + <string name="gog_recover">驗證修補結果</string> + <string name="slow_usb_title">USB 連線速度慢</string> + <string name="slow_usb_cable">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),其中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 傳輸線,試著翻轉 USB-C 插頭,或使用更快的硬碟。</string> + <string name="slow_usb_port">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 連接埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。</string> + <string name="slow_usb_never">不再顯示</string> + <string name="slow_usb_dismiss">關閉</string> + <string name="steam_import_title">重新啟動 Steam 以加入你的遊戲?</string> + <string name="steam_import_body">Steam 可以將你擁有的這些遊戲顯示為已安裝:%1$s。需要重新啟動 Steam 才會顯示。立即重新啟動,或在下次啟動 Steam 時加入。</string> + <string name="steam_import_names_more">%1$s 及另外 %2$d 款</string> + <string name="steam_import_now">立即重新啟動</string> + <string name="steam_import_later">稍後</string> + <string name="gog_maintenance">管理 GOG 安裝</string> + <string name="gog_check">檢查更新</string> + <string name="gog_repair">驗證/修復</string> + <string name="gog_patches">離線修補程式</string> + <string name="gog_refresh">下載完整離線安裝程式</string> + <string name="gog_update">更新至 %1$s</string> + <string name="gog_resume">繼續 GOG 維護</string> + <string name="gog_open_patch">開啟修補安裝程式</string> + <string name="gog_patch_in_session">請在 Linux 工作階段中完成或取消修補安裝程式。</string> + <string name="gog_patch_requirements">請選擇適用於已安裝版本和語言的修補程式。支援的來源版本可能未列出。</string> + <string name="gog_no_patches">GOG 沒有提供這款遊戲的獨立 Windows 修補程式。</string> + <string name="gog_managed_files">修改過的遊戲檔案可能會被取代。</string> + <string name="gog_patch_installer_note">安裝程式會在你的 Linux 工作階段中開啟。</string> + <string name="gog_download_label">下載</string> + <string name="gog_space_label">額外空間</string> + <string name="gog_space_estimate_label">預估空間</string> + <string name="gog_repair_action">修復檔案</string> + <string name="gog_refresh_action">重新整理安裝</string> + <string name="gog_select_patch">選取</string> + <string name="setup_all_files">所有檔案存取權限</string> + <string name="setup_local_network">區域網路</string> + <string name="libraries_title">更多 Steam 收藏庫</string> + <string name="libraries_hint">Steam 可在這些資料夾中安裝和執行遊戲,每個資料夾都有獨立名稱。從清單移除後,磁碟上的遊戲仍會保留。</string> + <string name="libraries_add">新增收藏庫</string> + <string name="libraries_rename_title">收藏庫名稱</string> + <string name="libraries_pick">選擇收藏庫資料夾</string> + <string name="libraries_full">最多新增 %1$d 個收藏庫</string> + <string name="libraries_overlap">此資料夾已是收藏庫,或位於某個收藏庫內</string> + <string name="libraries_missing">%1$s · 無法使用</string> + <string name="libraries_applies_next">從下次 Steam 工作階段開始生效</string> + <string name="bottom_desktop_start">啟動桌面</string> + <string name="bottom_desktop_mode_touch">直接觸控</string> + <string name="bottom_desktop_trackpad">觸控板。點按切換為直接觸控</string> + <string name="bottom_desktop_direct_touch">直接觸控。點按切換為觸控板</string> + <string name="bottom_desktop_starting">正在啟動 KDE 桌面…</string> + <string name="bottom_desktop_ended">桌面已結束。</string> + <string name="bottom_desktop_failed">無法啟動桌面。記錄位於本次工作階段的 bottom-desktop 資料夾中。</string> + <string name="bottom_desktop_off">桌面已關閉。</string> + <string name="libraries_rename">重新命名</string> + <string name="second_mode_desktop">桌面</string> + <string name="bottom_desktop_mode_trackpad">觸控板</string> + <string name="bottom_desktop_title">桌面 · %1$s</string> </resources> diff --git a/app/src/main/res/values/gestures.xml b/app/src/main/res/values/gestures.xml index 7c9132422..65f3a25b7 100644 --- a/app/src/main/res/values/gestures.xml +++ b/app/src/main/res/values/gestures.xml @@ -2,7 +2,6 @@ <resources> <string name="mode_touch_gestures">Gestures</string> <string name="gesture_settings">Touch gesture settings</string> - <string name="gesture_settings_hint">Customize mouse and keyboard gestures. Select Gestures as the touch mode to use them.</string> <string name="gesture_tap">Tap</string> <string name="gesture_drag">One-finger drag</string> <string name="gesture_long_press">Long press</string> @@ -15,6 +14,8 @@ <string name="gesture_three_hold">Three-finger hold</string> <string name="gesture_pinch">Pinch to zoom</string> <string name="gesture_hold_button">Keep button held</string> + <string name="gesture_hold_left">Hold left button</string> + <string name="gesture_hold_right">Hold right button</string> <string name="gesture_click_once">Click once</string> <string name="gesture_hold_delay">Hold delay</string> <string name="gesture_double_delay">Double-tap interval</string> diff --git a/app/src/main/res/values/shortcuts.xml b/app/src/main/res/values/shortcuts.xml new file mode 100644 index 000000000..d7e7a26d5 --- /dev/null +++ b/app/src/main/res/values/shortcuts.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="shortcuts_title">Physical button shortcuts</string> + <string name="shortcuts_dd_menu">DroidDeck menu</string> + <string name="shortcuts_capture">Assign: %1$s</string> + <string name="shortcuts_press">Press and release a button. Your assignment saves automatically.</string> + <string name="shortcuts_release">Release the button to continue.</string> + <string name="shortcuts_detected">%1$s: %2$s</string> + <string name="shortcuts_conflict">This button is already assigned to: %1$s</string> + <string name="shortcuts_save">Reassign</string> + <string name="shortcuts_retry">Try another button</string> + <string name="shortcuts_limitations">Home and some extra buttons may be unavailable.</string> +</resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24abe7411..c167bbff2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string name="gog_maintenance">Manage GOG installation</string> + <string name="gog_check">Check for updates</string> + <string name="gog_repair">Verify/Repair</string> + <string name="gog_patches">Offline patches</string> + <string name="gog_refresh">Download full offline installer</string> + <string name="gog_update">Update to %1$s</string> + <string name="gog_resume">Resume GOG maintenance</string> + <string name="gog_open_patch">Open patch installer</string> + <string name="gog_patch_in_session">Finish or cancel the patch installer in the Linux session.</string> + <string name="gog_patch_requirements">Choose a patch for your installed version and language. Supported source versions may not be listed.</string> + <string name="gog_no_patches">GOG has no standalone Windows patches for this game.</string> + <string name="gog_managed_files">Modified game files may be replaced.</string> + <string name="gog_patch_installer_note">The installer opens in your Linux session.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Extra space</string> + <string name="gog_space_estimate_label">Space estimate</string> + <string name="gog_repair_action">Repair files</string> + <string name="gog_refresh_action">Refresh installation</string> + <string name="gog_select_patch">Select</string> <string name="glasses_experimental">Luma Ultra cameras — Experimental</string> <string name="glasses_joycons">Joy-Con position tracking</string> <string name="glasses_joycons_hint">Use the glasses cameras to position your paired Joy-Cons. Rotation and button inputs come from the Joy-Cons. Position is estimated when your wrists are hidden. Replaces bare-hand controllers and pauses phone-camera tracking. Point the Joy-Cons forward when connecting or recentering.</string> @@ -85,6 +104,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 +113,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 +165,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 +203,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 +277,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 +295,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 +323,13 @@ <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_hold">Hold Back for Steam shortcuts</string> + <string name="back_hold_hint">Holding Back opens Quick Access or makes Steam chords with other buttons. Turn off to ignore held Back; tap and double-tap still work.</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> @@ -320,6 +368,8 @@ <string name="mode_mangoapp_hint">Turn off if games crash or go black in Deck mode. Applies next session.</string> <string name="mode_return_after_game">Return to DroidDeck after a game</string> <string name="mode_return_after_game_hint">When a game you started from DroidDeck or another launcher closes, Steam exits cleanly (cloud saves finish first) and you go back there. Off: stay in Steam.</string> + <string name="mode_shader_precache">Shader pre-caching</string> + <string name="mode_shader_precache_hint">Steam downloads shaders prebuilt for your games and processes them in the background, so games stutter less. Off saves data, storage and battery; games build shaders as they play instead. The same setting as Steam’s Downloads > Shader Pre-Caching. Applies next session.</string> <string name="mode_steam_repair">Repair Steam client</string> <string name="mode_steam_repair_hint">Downloads the Steam client again the next time Steam starts. Use it if Steam stays on its loading screen. Games, sign-in and settings are kept.</string> <string name="mode_steam_repair_queued">The Steam client will be downloaded again the next time Steam starts.</string> @@ -387,6 +437,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> @@ -402,6 +454,16 @@ <string name="mode_storage_internal">Internal only</string> <string name="mode_storage_folder">Folder: %1$s</string> <string name="mode_second_library">Second library</string> + <string name="libraries_title">More Steam libraries</string> + <string name="libraries_hint">Folders Steam can install to and play from, each under its own name. Removing one keeps its games on disk.</string> + <string name="libraries_add">Add library</string> + <string name="libraries_rename">Rename</string> + <string name="libraries_rename_title">Library name</string> + <string name="libraries_pick">Choose a folder for the library</string> + <string name="libraries_full">At most %1$d added libraries</string> + <string name="libraries_overlap">That folder is already a library or inside one</string> + <string name="libraries_missing">%1$s · not available</string> + <string name="libraries_applies_next">Applies from the next Steam session</string> <string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string> <string name="mode_storage_diagnostics">Storage diagnostics</string> <string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string> @@ -548,14 +610,24 @@ <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> <string name="perf_sysmem">Turnip: sysmem rendering</string> <string name="perf_sysmem_hint">Faster for the Steam client; in games the driver picks tile or system-memory rendering per pass. Required on Adreno 710/720/722.</string> <string name="perf_xalia">Skip Steam\'s xalia helper</string> - <string name="perf_fastsync">droiddeck-ntsync (experimental)</string> - <string name="perf_fastsync_hint">A userspace stand-in for the Linux ntsync driver, for testing. While it is on, Proton uses it instead of droiddeck-esync and droiddeck-fsync. Works with Proton Experimental ARM64, GE-Proton and proton-cachyos. Applies next session.</string> + <string name="perf_fastsync">droiddeck-ntsync</string> + <string name="perf_fastsync_hint">A userspace stand-in for the Linux ntsync driver. While it is on, Proton uses it instead of droiddeck-esync and droiddeck-fsync. Works with Proton Experimental ARM64, GE-Proton and proton-cachyos. Applies next session.</string> <string name="perf_esync">droiddeck-esync</string> <string name="perf_fsync">droiddeck-fsync first</string> <string name="perf_fsync_hint">Runs Proton\'s own fsync on the stock Proton files, with futex_waitv supplied in userspace, so it needs no pack and keeps working the moment Steam updates Proton. While it is on, games use it ahead of droiddeck-esync, except the few Proton keeps off fsync. Applies next session.</string> @@ -566,6 +638,8 @@ <string name="perf_fastpath">proot fast path</string> <string name="perf_fastpath_needs_seccomp">Needs proot\'s seccomp filter.</string> <string name="perf_fastpath_hint">Faster file lookups and less stutter. Turn off if a program can\'t find its files.</string> + <string name="perf_cursor_composite">Draw the cursor inside gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope paints the pointer itself instead of handing it to Android. Turn on for a controller-driven cursor. Off is faster on a phone. Applies next session.</string> <string name="perf_identity">Session identity</string> <string name="perf_hostname">Host name</string> <string name="perf_hostname_hint">The name Steam sees for this device. Blank restores %1$s.</string> @@ -580,6 +654,8 @@ <string name="driver_delete_plain">Its files are removed from the app.</string> <string name="driver_delete_in_use">Its files are removed. It\'s in use, so the default takes over.</string> <string name="drawer_page_display">Display</string> + <string name="drawer_frame_limit">Frame limit</string> + <string name="drawer_frame_limit_note">Caps this game. The display switches to a refresh rate the cap divides evenly when it has one; other caps can look uneven. Steam games use Steam\'s Frame Limit in the Quick Access menu.</string> <string name="drawer_page_effects">Effects</string> <string name="drawer_page_controls">Controls</string> <string name="drawer_page_components">Components</string> @@ -604,6 +680,66 @@ <string name="drawer_hud_color_amber">Amber</string> <string name="drawer_hud_color_violet">Violet</string> <string name="drawer_hud_opacity">Opacity</string> + <string name="hud_size">Size</string> + <string name="hud_size_hint">Tapping the HUD also changes its size.</string> + <string name="hud_size_full">Full</string> + <string name="hud_size_tiles">Tiles</string> + <string name="hud_size_pill">Pill</string> + <string name="hud_size_minimal">Minimal</string> + <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Strip</string> + <string name="hud_locked">Lock in place</string> + <string name="hud_locked_hint">Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work.</string> + <string name="hud_snap">Snap to sides</string> + <string name="hud_snap_hint">Let go of the HUD and it moves to the nearer side of the screen. A flick throws it that way.</string> + <string name="hud_group_look">Look</string> + <string name="hud_scale">Size on screen</string> + <string name="hud_color_soft">Soft</string> + <string name="hud_color_mid">Medium</string> + <string name="hud_color_vivid">Vivid</string> + <string name="hud_outline">Outline</string> + <string name="hud_outline_color">Outline color</string> + <string name="hud_outline_gray">Gray</string> + <string name="hud_outline_theme">Theme color</string> + <string name="hud_group_metrics">Readings</string> + <string name="hud_metric_graph">Frame time graph</string> + <string name="hud_metric_decimal">Frame rate with a decimal</string> + <string name="hud_metric_low001" formatted="false">0.01% low</string> + <string name="hud_metric_engine">Graphics engine</string> + <string name="hud_metric_gpu_model">GPU name</string> + <string name="hud_metric_gpu">GPU load</string> + <string name="hud_metric_gpu_temp">GPU temperature</string> + <string name="hud_metric_cpu">CPU load</string> + <string name="hud_metric_per_core">CPU per core</string> + <string name="hud_metric_temp">Temperatures</string> + <string name="hud_metric_ram">Memory</string> + <string name="hud_metric_vram">Graphics memory</string> + <string name="hud_metric_swap">Swap</string> + <string name="hud_metric_battery">Battery level</string> + <string name="hud_metric_power">Power draw</string> + <string name="hud_metric_network">Network</string> + <string name="hud_metric_resolution">Resolution</string> + <string name="hud_metric_proton">Proton version</string> + <string name="hud_metric_session">Session time</string> + <string name="hud_metric_clock">Clock</string> + <string name="hud_group_temps">Temperatures</string> + <string name="hud_temp_unit">Unit</string> + <string name="hud_temp_bands">Warning colors</string> + <string name="hud_temp_bands_hint">Temperatures turn amber, then red, as they near the limit.</string> + <string name="hud_temp_bands_off">Off</string> + <string name="hud_temp_bands_auto">Automatic</string> + <string name="hud_temp_bands_manual">Manual</string> + <string name="hud_temp_red_cpu">CPU red at</string> + <string name="hud_temp_red_gpu">GPU red at</string> + <string name="hud_temp_red_battery">Battery red at</string> + <string name="hud_group_more">More</string> + <string name="hud_export">HUD diagnostics</string> + <string name="hud_export_hint">Saves a report of every sensor the HUD reads to Downloads/DroidDeck.</string> + <string name="hud_export_button">Save</string> + <string name="hud_export_done">Saved to %1$s</string> + <string name="hud_export_failed">Couldn\'t save the HUD report.</string> + <string name="hud_reset">Reset HUD settings</string> + <string name="hud_reset_button">Reset</string> <string name="drawer_scaling">Scaling mode</string> <string name="drawer_scaling_sharpness">Scaling sharpness</string> <string name="drawer_effects">Screen effects</string> @@ -662,10 +798,14 @@ <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> <string name="drawer_low_latency_touch_hint">Touches skip frame batching; Steam touch controls at 1000 Hz. Slightly more CPU.</string> + <string name="drawer_evdev_mouse">Raw mouse channel</string> + <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">PC keyboard</string> <string name="drawer_android_keyboard">Android</string> <string name="drawer_second_screen">Second screen</string> @@ -755,6 +895,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Session logs</string> <string name="setup_logs_hint">Saved after each session</string> + <string name="setup_game_debug_logs">Game debug logs</string> + <string name="setup_game_debug_logs_hint">Include Proton, Wine and graphics diagnostics on the next game launch. Can reduce performance and use more storage.</string> + <string name="setup_game_debug_logs_restart">Restart this session to save game debug logs</string> + <string name="setup_logging_update_failed">Couldn\'t update logging. Check the switch and try again.</string> <string name="setup_agent_commands">Debugging tools</string> <string name="setup_latest_logs">Latest session logs</string> <string name="setup_saved_logs">Saved session logs</string> @@ -787,12 +931,28 @@ <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> <string name="setup_fullscreen">Fullscreen</string> <string name="setup_fullscreen_on">Hides the Android status and navigation bars</string> <string name="setup_fullscreen_off">Shows the Android status and navigation bars</string> + <string name="setup_dual_screen">Dual screen</string> + <string name="setup_dual_screen_hint">Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu.</string> + <string name="setup_dual_screen_auto">Automatic</string> + <string name="setup_dual_screen_on">On</string> + <string name="setup_dual_screen_off">Off</string> + <string name="setup_dual_screen_menu">Bottom screen menu</string> + <string name="setup_dual_screen_menu_hint">Moves the sections and the in-game menu to the second screen and types there, so the top screen keeps the full view. L2 and R2 switch sections.</string> + <string name="setup_dual_screen_controls">Bottom screen controls in games</string> + <string name="setup_dual_screen_controls_hint">Opens the trackpad and keyboard on the second screen when a session starts.</string> + <string name="dual_typing_title">Typing on the top screen</string> + <string name="dual_typing_done">Done</string> <string name="setup_default_home">Default Home app</string> <string name="setup_choose_home">Choose a Home app</string> <string name="setup_choose">Choose</string> @@ -940,6 +1100,14 @@ <string name="gate_step1">Open Settings → Developer options → Wireless debugging and turn it on</string> <string name="gate_step2">Tap “Pair device with pairing code”</string> <string name="gate_step3">Type the code into the DroidDeck notification</string> + <string name="pairguide_build_number">In About phone, tap Build number 7 times</string> + <string name="pairguide_wireless">Turn on Wireless debugging</string> + <string name="pairguide_pair">Open Wireless debugging, then tap “Pair device with pairing code”</string> + <string name="pairguide_child_process">Turn on “Disable child process restrictions”</string> + <string name="pairguide_row_child_process">Disable child process restrictions</string> + <string name="pairguide_row_build_number">Build number</string> + <string name="pairguide_row_wireless">Wireless debugging</string> + <string name="pairguide_row_pair">Pair device with pairing code</string> <string name="gate_waiting">Waiting for the pairing pop-up…</string> <string name="gate_code_needed">Pop-up found. Enter its code in the notification.</string> <string name="gate_status">Status</string> @@ -1025,6 +1193,48 @@ <string name="content_android_apps">Android apps</string> <string name="content_apps_count">%1$d apps</string> <string name="content_no_android_apps">No launchable Android apps found.</string> + <string name="apps_search_hint">Search apps</string> + <string name="apps_no_match">No apps match “%1$s”.</string> + <string name="apps_add_widget">Add widget</string> + <string name="apps_widgets_loading">Loading widgets…</string> + <string name="apps_widgets_none">No apps on this device offer widgets.</string> + <string name="apps_widget_wider">Wider</string> + <string name="apps_widget_narrower">Narrower</string> + <string name="apps_widget_taller">Taller</string> + <string name="apps_widget_shorter">Shorter</string> + <string name="apps_widget_move_earlier">Move earlier</string> + <string name="apps_widget_move_later">Move later</string> + <string name="apps_widget_configure">Widget settings</string> + <string name="apps_widget_remove">Remove widget</string> + <string name="apps_add_to_folder">Add to folder</string> + <string name="apps_new_folder">New folder</string> + <string name="apps_remove_from_folder">Remove from folder</string> + <string name="apps_app_info">App info</string> + <string name="apps_uninstall">Uninstall</string> + <string name="apps_folder_rename">Rename</string> + <string name="apps_folder_ungroup">Ungroup</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Folder name</string> + <string name="apps_filter">Show</string> + <string name="apps_filter_all">All apps</string> + <string name="apps_filter_games">Games</string> + <string name="apps_filter_downloaded">Downloaded</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Hidden</string> + <string name="apps_hide">Hide</string> + <string name="apps_unhide">Show in apps</string> + <string name="apps_shortcut_remove">Remove shortcut</string> + <string name="apps_pin_title">Add to Apps</string> + <string name="apps_pin_add">Add</string> + <string name="apps_hidden_none">No hidden apps.</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="apps_sort_name_asc">Name A–Z</string> + <string name="apps_sort_name_desc">Name Z–A</string> + <string name="apps_sort_installed">Recently installed</string> + <string name="apps_sort_updated">Recently updated</string> <string name="content_desktop_installed">● Desktop installed</string> <string name="content_desktop_first_open">Installs on first open</string> <string name="content_available">Available to install</string> @@ -1063,8 +1273,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> @@ -1072,7 +1280,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> @@ -1081,10 +1288,8 @@ <string name="games_never_played">Never played</string> <string name="games_runtime_busy_percent">Runtime busy · %1$d%%</string> <string name="games_runtime_busy">Runtime busy</string> - <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> @@ -1099,6 +1304,9 @@ <string name="gpu_hide_other">Hide drivers for other GPUs</string> <string name="gpu_show_other">Show drivers for other GPUs</string> <string name="gpu_advanced">Advanced</string> + <string name="gpu_ubwc_title">UBWC compatibility</string> + <string name="gpu_ubwc_hint">Try On or Off if Steam or Android shows stripes or flickering. Applies to both drivers after restarting DroidDeck.</string> + <string name="gpu_ubwc_restart">Restart DroidDeck to apply.</string> <string name="gpu_set_with_display">Set together with the display driver: %1$s carries both.</string> <string name="gpu_set_with_runtime">Set together with the runtime driver: %1$s carries both.</string> <string name="gpu_runtime_hint">Used by games and the desktop.</string> @@ -1153,7 +1361,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> @@ -1205,14 +1413,17 @@ <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> <string name="pip_unavailable">Android could not open picture in picture.</string> + <string name="game_more">More</string> + <string name="game_edit_art">Edit art</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Shortcut</string> <string name="game_shortcut_add">Add to home screen</string> <string name="game_shortcut_choose">Choose game</string> @@ -1236,6 +1447,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> @@ -1458,6 +1673,10 @@ <string name="theme_icon_blue_detail">Black ground, white type, the blue for everything selected, focused or pressed.</string> <string name="theme_electric">Electric navy</string> <string name="theme_electric_detail">The blue brighter, on surfaces that lean navy instead of grey.</string> + <string name="theme_inner_gamer">Inner Gamer</string> + <string name="theme_inner_gamer_detail">Colors that cycle through the rainbow. Follows Android\'s animation settings.</string> + <string name="theme_rgb_speed">Speed</string> + <string name="theme_rgb_speed_hint">How fast the colors cycle.</string> <string name="theme_gradient">Gradient</string> <string name="theme_gradient_detail">Your own primary and secondary colors, blended on buttons and highlights.</string> <string name="theme_gradient_primary">Primary</string> @@ -1579,7 +1798,16 @@ <string name="fm_conflict_skip">Skip</string> <string name="fm_select_this_folder">Select this folder</string> <string name="fm_back">Back</string> + <string name="fm_exit">Exit</string> + <string name="fm_return_to_start">Return to start</string> + <string name="fm_start_unavailable">Starting folder is no longer available</string> + <string name="fm_cancel_operation_title">Cancel operation?</string> + <string name="fm_cancel_operation_confirmation">The operation will be cancelled. Are you sure?</string> + <string name="fm_accept">Accept</string> + <string name="fm_decline">Decline</string> <string name="fm_drive_not_readable">%1$s is mounted but not readable right now</string> + <string name="fm_drive_access_title">Allow access to %1$s</string> + <string name="fm_drive_access_text">Android lets DroidDeck see this drive but not read it. Turn on All files access for DroidDeck, then come back.</string> <string name="fm_list_view">List view</string> <string name="fm_grid_view">Grid view</string> <string name="fm_search">Search</string> @@ -1662,6 +1890,104 @@ <string name="second_mode_keyboard_trackpad">Keyboard + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck grips + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_start">Start the desktop</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_mode_touch">Direct touch</string> + <string name="bottom_desktop_trackpad">Trackpad. Tap for direct touch</string> + <string name="bottom_desktop_direct_touch">Direct touch. Tap for trackpad</string> + <string name="bottom_desktop_starting">Starting the KDE desktop…</string> + <string name="bottom_desktop_ended">The desktop closed.</string> + <string name="bottom_desktop_failed">The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder.</string> + <string name="bottom_desktop_off">The desktop is closed.</string> + <string name="bottom_dashboard_empty">Nothing to show here yet.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">No downloads running.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Downloading shader cache</string> + <string name="bottom_downloads_paused">Paused</string> + <string name="bottom_downloads_queued">Waiting to start</string> + <string name="bottom_page_notifications">Notifications</string> + <string name="bottom_notifications_listener">DroidDeck bottom screen</string> + <string name="bottom_notifications_why">Show messages and other notifications here while you play. They stay on this screen only and are not saved. Android asks once: its notification access page opens on this screen; turn DroidDeck on there and this page comes back by itself.</string> + <string name="bottom_notifications_allow">Allow notification access</string> + <string name="bottom_notifications_none">No notifications.</string> + <string name="bottom_notifications_count">%1$d notifications</string> + <string name="bottom_notifications_clear">Clear</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">FPS needs the HUD on</string> + <string name="stats_speed">Speed</string> + <string name="stats_pedals">Pedals</string> + <string name="stats_gforce">G-force</string> + <string name="stats_timing">Timing</string> + <string name="stats_best_lap">Best lap</string> + <string name="stats_tires">Tires °C</string> + <string name="stats_trace">Throttle and brake, last 10 s</string> + <string name="stats_speed_chart">Speed, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_speed_units">Speed units</string> + <string name="stats_speed_units_auto">Automatic (%1$s)</string> + <string name="stats_steam_client_arm">Steam Client ARM</string> + <string name="stats_steam_client_x86">Steam Client x86</string> + <string name="stats_throttle">Throttle</string> + <string name="stats_brake">Brake</string> + <string name="stats_lights">Dashboard</string> + <string name="stats_lamp_shift">Shift</string> + <string name="stats_lamp_handbrake">Handbrake</string> + <string name="stats_lamp_pit">Pit limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Engine %1$s °C</string> + <string name="stats_oil_temp">Oil %1$s °C</string> + <string name="stats_power">Power distributor</string> + <string name="stats_fuel_t">Fuel, t</string> + <string name="stats_fuel_main">Main %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_tap_hint">Tap the top strip or the dash to change its style.</string> + <string name="bottom_telemetry_send_title">Send dashboard data</string> + <string name="bottom_telemetry_send_auto">Automatic</string> + <string name="bottom_telemetry_send_auto_hint">Turns it on for every game listed here, including games found later. Games you switch off stay off.</string> + <string name="bottom_telemetry_send_note">This changes the game\'s own data output setting. It takes effect the next time the game starts; turning it off puts the old setting back.</string> + <string name="bottom_telemetry_send_close">Close %1$s to change this.</string> + <string name="bottom_telemetry_send_failed">Could not change the settings of %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: turn on %2$s in the game\'s settings with IP 127.0.0.1 and port %3$d.</string> + <string name="bottom_shots_where">Saved to Pictures/DroidDeck. Steam screenshots show here too.</string> + <string name="bottom_shots_take">Take screenshot</string> + <string name="bottom_shots_saved">Screenshot saved.</string> + <string name="bottom_shots_failed">Could not take a screenshot.</string> + <string name="bottom_shots_none">No screenshots yet.</string> + <string name="bottom_page_chat">Chat & voice</string> + <string name="bottom_chat_why">Read and answer Steam chat here while the game keeps running on the main screen. It uses the account Steam is signed in with.</string> + <string name="bottom_chat_not_signed_in">Steam has no web sign-in to share yet, so sign in here once.</string> + <string name="bottom_chat_stopped">Android closed the chat page while DroidDeck was in the background. It opens again when you come back to DroidDeck.</string> + <string name="bottom_chat_open">Open Steam Chat</string> + <string name="bottom_chat_close">Close chat</string> + <string name="bottom_chat_mic_on">Mic on</string> + <string name="bottom_chat_mic_off">Mic off</string> + <string name="bottom_chat_mic_unavailable">Mic is off for this game. To talk, turn on Microphone in DroidDeck\'s Steam settings (Audio) and start the game again.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">In-game stats</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Battery</string> + <string name="bottom_telemetry_lap">Lap</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">This lap</string> + <string name="bottom_telemetry_last_lap">Last lap</string> + <string name="bottom_telemetry_fuel">Fuel</string> + <string name="bottom_telemetry_cargo">Cargo</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Legal state</string> + <string name="bottom_telemetry_balance">Balance</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_help">Turn on a game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device.</string> + <string name="bottom_telemetry_unknown_format">Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet.</string> + <string name="bottom_telemetry_port_busy">Another program already uses port %1$s, so that game cannot show here.</string> <string name="rtinst_removing">Removing Linux runtime</string> <plurals name="rtinst_removing_entries"> @@ -1692,6 +2018,7 @@ <string name="flatpakmgr_not_ready">Set up Flatpak first</string> <string name="flatpakmgr_starting">Starting</string> <string name="flatpakmgr_exit_status">Flatpak exited with status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s is built for %2$s, which DroidDeck can\'t run. Flatpak apps here need an ARM64 or x86_64 build.</string> <string name="flatpakmgr_installing">Installing %1$s</string> <string name="flatpakmgr_updating">Updating %1$s</string> <string name="flatpakmgr_removing">Removing %1$s</string> @@ -1785,20 +2112,13 @@ <string name="adbpair_applying">Applying the setting…</string> <string name="adbpair_command_failed">Wireless debugging command failed</string> <string name="adbpair_channel_name">Wireless debugging setup</string> + <string name="adbpair_progress_channel_name">Wireless debugging setup progress</string> <string name="adbpair_channel_description">Asks for the Wireless debugging pairing code while Settings is open</string> <string name="adbpair_title_pair">Pair Wireless debugging</string> <string name="adbpair_waiting_text">Turn on Wireless debugging, then tap “Pair device with pairing code”.</string> <string name="adbpair_waiting_long">Turn on Wireless debugging, then tap “Pair device with pairing code”. Stay in Settings: the code goes in this notification.</string> <string name="adbpair_code_label">6-digit pairing code</string> <string name="adbpair_code_hint">Tap Enter code and type the 6 digits shown in Settings.</string> - <string name="setup_all_files">All files access</string> - <string name="setup_all_files_hint">Lets DroidDeck see games and programs on your storage and SD card</string> - <string name="setup_bluetooth">Bluetooth Steam Controller</string> - <string name="setup_bluetooth_hint">Lets DroidDeck find a paired Steam Controller (Nearby devices)</string> - <string name="all_files_title">Allow access to your game folders</string> - <string name="all_files_message">DroidDeck runs games and programs from your phone\'s storage and SD card. Android only lets it see those files with All files access, which you can turn on for DroidDeck on the next screen.</string> - <string name="all_files_allow">Open settings</string> - <string name="all_files_later">Not now</string> <string name="adbpair_title_code">Enter the Wi-Fi pairing code</string> <string name="adbpair_title_retry">Try the code again</string> <string name="adbpair_enter_code">Enter code</string> @@ -1987,7 +2307,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> @@ -1996,10 +2316,10 @@ <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> + <string name="display_follow_screen_scaled">Scaled %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Show device details</string> <string name="device_info_hide">Hide device details</string> @@ -2014,7 +2334,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> @@ -2028,11 +2347,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> @@ -2050,9 +2367,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> @@ -2071,12 +2396,54 @@ <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> <string name="stores_sort">Sort</string> + <string name="setup_rail_labels">Sidebar labels</string> + <string name="setup_rail_labels_hint">Show names under the sidebar icons. Turn off for a slimmer sidebar.</string> + <string name="library_display">Display</string> + <string name="library_display_larger">Larger cards</string> + <string name="library_display_smaller">Smaller cards</string> + <string name="library_display_title">Show title</string> + <string name="library_display_size">Show size</string> <string name="stores_sort_last_played">Recently played</string> <string name="stores_sort_recently_installed">Recently installed</string> <string name="stores_sort_title_asc">Title A–Z</string> @@ -2239,6 +2606,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> @@ -2254,6 +2622,9 @@ <string name="edit_target">Target</string> <string name="edit_start_in">Start in</string> <string name="edit_launch_options">Launch options</string> + <string name="edit_launch_options_steam_hint">Shared with Steam\'s Properties: a change in either one shows in both.</string> + <string name="edit_launch_options_not_saved">Could not save the launch options to Steam. Try again.</string> + <string name="edit_launch_options_desktop">Steam may be open in the desktop session. Change the launch options in its Properties, or close the session first.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Other exe…</string> <string name="edit_remove">Remove</string> @@ -2384,6 +2755,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> @@ -2673,6 +3045,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> @@ -2794,6 +3181,9 @@ <string name="storage_data_installed">Installed games</string> <string name="storage_data_parts">Prefix %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Clear shaders</string> + <string name="storage_reset_prefix">Reset prefix</string> + <string name="storage_reset_prefix_title">Reset prefix for %1$s?</string> + <string name="storage_reset_prefix_confirm">Deletes its Wine prefix (%1$s) in %2$s and recreates it on the next launch. Saves, settings and installed redistributables inside it are lost; Steam Cloud saves stay in your account.</string> <string name="storage_data_leftovers">Uninstalled games</string> <string name="storage_steam_app">Steam app %1$d</string> <string name="storage_leftover_unsure_detail">Its prefix still holds files, which can include local saves</string> @@ -3054,4 +3444,231 @@ <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_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sync with Syncthing</string> + <string name="sync_enable_hint">Based on Syncthing-Fork, this is a Syncthing implementation that lets you sync files in DroidDeck\'s internal file system with other Syncthing instances. This is only for files you are storing within DroidDeck\'s internal file system.</string> + <string name="sync_missing">This build doesn\'t include Syncthing.</string> + <string name="sync_starting">Starting Syncthing</string> + <string name="sync_status_starting">Starting</string> + <string name="sync_status_up_to_date">Up to date</string> + <string name="sync_status_syncing">Syncing</string> + <string name="sync_status_paused">Paused</string> + <string name="sync_status_pausing">Pausing</string> + <string name="sync_status_resuming">Resuming</string> + <string name="sync_status_attention">Needs attention</string> + <string name="sync_status_failed">Syncthing stopped</string> + <string name="sync_failed_retry">Try again</string> + <string name="sync_paused_wifi">Paused until Wi-Fi</string> + <string name="sync_paused_game">Paused during the game</string> + <string name="sync_summary">%1$d folders · %2$d of %3$d devices connected</string> + <string name="sync_left">%1$s left</string> + <string name="sync_open_web_ui">Open web UI</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Resume</string> + <string name="sync_running">Running</string> + <string name="sync_running_hint">Turn off to stop Syncthing completely.</string> + <string name="sync_this_device">This device</string> + <string name="sync_device_id">Device ID</string> + <string name="sync_show_qr">Show QR</string> + <string name="sync_advanced">Advanced</string> + <string name="sync_advanced_hint">Ports, when to run, reset</string> + <string name="sync_open">Open</string> + <string name="sync_waiting">Waiting for you</string> + <string name="sync_pending_device">%1$s wants to connect</string> + <string name="sync_pending_folder">%1$s wants to share “%2$s”</string> + <string name="sync_pending_folder_hint">Accept to choose where it\'s saved in DroidDeck.</string> + <string name="sync_review">Review in web UI</string> + <string name="sync_folders">Folders</string> + <string name="sync_no_folders">No folders yet.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Up to date</string> + <string name="sync_folder_syncing">Syncing %1$d%%</string> + <string name="sync_folder_scanning">Scanning</string> + <string name="sync_folder_paused">Paused</string> + <string name="sync_folder_out_of_sync">Out of sync</string> + <string name="sync_folder_errors">%1$d files couldn\'t sync</string> + <string name="sync_folder_blocked">Blocked</string> + <string name="sync_folder_blocked_hint">This folder is outside DroidDeck\'s storage, so DroidDeck paused it. To sync folders outside DroidDeck, use the Syncthing-Fork app.</string> + <string name="sync_remove_folder">Remove from Syncthing</string> + <string name="sync_remove_folder_hint">Removing it doesn\'t delete any files.</string> + <string name="sync_devices">Devices</string> + <string name="sync_no_devices">No devices yet.</string> + <string name="sync_connected">Connected</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Last seen %1$s</string> + <string name="sync_device_id_title">This device\'s ID</string> + <string name="sync_device_id_hint">On your other device, add a device in Syncthing and scan this code or paste the ID. Then accept it here in the web UI.</string> + <string name="sync_copy">Copy</string> + <string name="sync_share">Share</string> + <string name="sync_done">Done</string> + <string name="sync_off_title">Turn off Syncthing?</string> + <string name="sync_off_body">Syncthing stops now and stays stopped until it\'s turned back on. Synced files stay where they are.</string> + <string name="sync_off_forget">Also delete Syncthing\'s config</string> + <string name="sync_off_forget_hint">Removes this device\'s ID, folders and devices. Turning it on again starts fresh.</string> + <string name="sync_turn_off">Turn off</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Sync</string> + <string name="sync_port_discovery">Local discovery</string> + <string name="sync_repick">Pick new ports</string> + <string name="sync_repick_hint">Checked again on every start.</string> + <string name="sync_repick_button">Re-pick</string> + <string name="sync_reset_group">Reset</string> + <string name="sync_api_key">API key</string> + <string name="sync_regenerate">Regenerate</string> + <string name="sync_reset">Reset Syncthing</string> + <string name="sync_reset_hint">New device ID, folders and devices removed. Files in DroidDeck\'s storage are kept.</string> + <string name="sync_reset_button">Reset</string> + <string name="sync_reset_confirm_title">Reset Syncthing?</string> + <string name="sync_running_group">Running</string> + <string name="sync_run">Run</string> + <string name="sync_run_open">While DroidDeck is open</string> + <string name="sync_run_background">In the background</string> + <string name="sync_wifi_only">Wi-Fi only</string> + <string name="sync_pause_games">Pause during games</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing output for this session</string> + <string name="sync_logs_share">Share</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Set up the Linux runtime first.</string> + <string name="sync_accept">Accept</string> + <string name="sync_accept_title">Save “%1$s” to</string> + <string name="sync_add_folder">Add folder</string> + <string name="sync_add_folder_hint">Sync a folder in DroidDeck\'s storage</string> + <string name="sync_choose">Choose</string> + <string name="sync_add">Add</string> + <string name="sync_add_failed">The folder couldn\'t be added.</string> + <string name="sync_share_with">Share with</string> + <string name="sync_share_none">No devices yet. You can share this folder from the web UI later.</string> + <string name="sync_use_folder">Use this folder</string> + <string name="sync_new_folder">New folder</string> + <string name="sync_location_home">Container home</string> + <string name="sync_location_sync">Sync folder</string> + <string name="sync_location_shared">DroidDeck shared storage</string> + <string name="sync_location_card">DroidDeck on %1$s</string> + <string name="sync_location_app">DroidDeck app data</string> + <string name="sync_web_path_locked">New folders are saved in DroidDeck\'s Sync folder. To sync a different DroidDeck folder, use Add folder on the Syncthing tab.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Reload</string> + <string name="sync_not_running">Syncthing isn\'t running.</string> + <string name="session_end_steam_sigill">Steam stopped with an illegal instruction (SIGILL). This can be a CPU instruction compatibility problem or a client crash. Share the logs with your device details.</string> + <string name="session_end_steam_try_x64">You can try Steam settings → Steam client → x86-64 (experimental). It needs an additional download and may run more slowly.</string> + <string name="session_end_vulkan_device">The Linux graphics driver could not find a usable Vulkan device. Check that the selected Linux GPU driver supports this GPU.</string> + <string name="session_end_gpu_unsupported">This session cannot start because this GPU has no compatible Linux Vulkan driver in the current setup. Adreno Turnip drivers cannot enable support for MediaTek/Mali GPUs.</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="stores_itch_updates_found">Updates available: %1$d</string> + <string name="stores_itch_update_replaced">The developer replaced this build with %1$s. Update to it?</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_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> + <string name="desktop_restore_title">Restoring your software</string> + <string name="desktop_restore_body">Reinstalling the apps you added after a DroidDeck update.</string> + <string name="desktop_restore_done_title">Software restored</string> + <string name="desktop_restore_done_body">The apps you added are installed again.</string> + <string name="desktop_restore_failed_title">Some software couldn\'t be restored</string> + <string name="desktop_restore_failed_body">See ~/.cache/droiddeck/apt-restore.log, then try sudo apt install in Konsole.</string> + <string name="gog_full_files">Native optimizations are unavailable. The download includes complete replacement files.</string> + <string name="gog_recover">Verify patch result</string> + <string name="slow_usb_title">Slow USB connection</string> + <string name="slow_usb_cable">%1$s is connected over %2$s (%3$s Mbps, about %4$d MB/s), so games on it will load slowly. Use a USB 3 cable rated 5 Gbps or faster, try flipping the USB-C plug, or use a faster drive.</string> + <string name="slow_usb_port">%1$s is connected over %2$s (%3$s Mbps, about %4$d MB/s). This device\'s USB port can\'t go faster, so games on it will load slowly. Internal storage or a microSD card may be quicker.</string> + <string name="slow_usb_never">Don\'t show this again</string> + <string name="slow_usb_dismiss">Dismiss</string> + <string name="steam_import_title">Restart Steam to add your games?</string> + <string name="steam_import_body">Steam can list these games you own as installed: %1$s. It has to restart to show them. Restart now, or they will be added the next time Steam starts.</string> + <string name="steam_import_names_more">%1$s and %2$d more</string> + <string name="steam_import_now">Restart now</string> + <string name="steam_import_later">Later</string> + <string name="setup_all_files">All files access</string> + <string name="setup_local_network">Local network</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 000000000..3b094dcd5 --- /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/Cargo.lock b/app/src/main/rust/stores/Cargo.lock index 90055ee4c..2fac37c5a 100644 --- a/app/src/main/rust/stores/Cargo.lock +++ b/app/src/main/rust/stores/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. version = 4 [[package]] @@ -186,6 +188,7 @@ dependencies = [ name = "droiddeckstores" version = "0.1.0" dependencies = [ + "cc", "flate2", "futures-util", "jni", diff --git a/app/src/main/rust/stores/Cargo.toml b/app/src/main/rust/stores/Cargo.toml index d21d5132b..61d121a22 100644 --- a/app/src/main/rust/stores/Cargo.toml +++ b/app/src/main/rust/stores/Cargo.toml @@ -21,6 +21,9 @@ serde_json = { version = "1", features = ["preserve_order"] } sha1 = "0.10" sha2 = "0.10" +[build-dependencies] +cc = "1" + [profile.release] codegen-units = 1 lto = "thin" diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index c5cd07744..b87390ac8 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -77,14 +77,14 @@ after it (marker files, exe resolution, DLC markers, redist orchestration). | `nativeCancel(handle: Long)` | `(J)V` | `Java_com_droiddeck_launcher_stores_gog_GogNative_nativeCancel` | | `nativeRelease(handle: Long)` | `(J)V` | `Java_com_droiddeck_launcher_stores_gog_GogNative_nativeRelease` | -`nativeProbe()` always returns `1`; it exists so `isAvailable()` can catch `UnsatisfiedLinkError` +`nativeProbe()` returns `2`; it exists so `isAvailable()` can catch `UnsatisfiedLinkError` once at startup instead of mid-download. `nativeStart` parameters, in order: | # | Parameter | Meaning | |---|---|---| -| 1 | `kind: Int` | `0` = `KIND_GEN2_CHUNKS`, `1` = `KIND_GEN1_RANGES` (anything else → gen2) | +| 1 | `kind: Int` | `0` = `KIND_GEN2_CHUNKS`, `1` = `KIND_GEN1_RANGES`, `2` = GOG maintenance (anything else → gen2) | | 2 | `depotManifests: Array<String>` | gen2: the inflated depot-manifest JSON strings, in fetch order, already filtered by product + language; gen1: the inflated build manifest (one element) | | 3 | `cdnBases: Array<String>` | gen2: **every** CDN base of the secure-link answer — one per `urls[]` entry, each resolved the way `parseCdnUrl` resolves `urls[0]` today (query string intact), in GOG's order — or the one unauthenticated dependency store base (an array of one); gen1: `emptyArray()` (file URLs are in the manifest). Blank entries are ignored and a base whose host already appeared is dropped (the first wins). The fetch core spreads the window across the distinct hosts with a per-host cap of `max(6, ceil(maxWorkers / hosts))`, rotating a failed chunk to another CDN; one base behaves exactly like the old single `cdnBase`. The start log line lists them as `hosts=a,b,c`. | | 4 | `installDir: String` | absolute install directory | @@ -113,6 +113,15 @@ On-disk protocol (what a resumed run, by either engine, relies on): a file is as `<file>.bhtmp`, then renamed over `<file>` once its size and MD5 match the manifest; an existing `<file>` whose size+MD5 match is skipped. The engine writes nothing else. +Maintenance (`kind=2`) instead takes a single normalized plan in `depotManifests[0]`: +`files`, `oldFiles`, optional exact-build `patches`, per-product `links` and `patchLinks`, +and estimated `downloadBytes`. Credentials and these temporary links stay in memory. +It stages replacements under `.droiddeck-gog/stage`, revalidates completed chunks on +every run, and verifies each file before atomic replacement. `onBytes` counts actual +network bytes, including failed attempts. `onMaintenance(networkBytes, reusedBytes, +appliedBytes)` (`(JJJ)V`) reports the three separate cumulative counters. Existing +gen1/gen2 first-install progress semantics are unchanged. + ## `com.droiddeck.launcher.stores.epic.EpicNative` Everything Epic runs in the Rust `epic` module: the web-service calls (sign-in, refresh, exchange @@ -160,13 +169,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 +207,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/build.rs b/app/src/main/rust/stores/build.rs new file mode 100644 index 000000000..f80559c87 --- /dev/null +++ b/app/src/main/rust/stores/build.rs @@ -0,0 +1,21 @@ +fn main() { + cc::Build::new() + .include("vendor/xdelta3") + .file("vendor/xdelta3/xdelta3.c") + .file("src/gog/delta.c") + .define("SIZEOF_SIZE_T", "8") + .define("SIZEOF_UNSIGNED_INT", "4") + .define("SIZEOF_UNSIGNED_LONG", "8") + .define("SIZEOF_UNSIGNED_LONG_LONG", "8") + .define("XD3_USE_LARGEFILE64", "1") + .define("XD3_ENCODER", "0") + .define("SECONDARY_DJW", "0") + .define("SECONDARY_FGK", "0") + .define("SECONDARY_LZMA", "0") + .define("SHELL_TESTS", "0") + .define("XD3_MAIN", "0") + .warnings(false) + .compile("gogdelta"); + println!("cargo:rerun-if-changed=vendor/xdelta3"); + println!("cargo:rerun-if-changed=src/gog/delta.c"); +} 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 426e3bdcf..df20412ac 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 31b0b4ab6..53be6cceb 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 2a75fb8a6..127d772de 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 3a7e93a0e..66cab176b 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 481e9b825..8c5a10499 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 2690e0f19..98d31f3d9 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 67c1995bd..2264f6c77 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 e0c10112c..a0a4ac91a 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,8 @@ 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() { + FetchFailKind::ServerFault } else { FetchFailKind::Other } @@ -663,14 +666,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 +1148,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 +1170,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 +1333,7 @@ struct ServerHealth { samples: u32, consecutive_errors: u32, cooldown_until: Option<Instant>, + fault_until: Option<Instant>, } struct FetchScheduler { @@ -1412,7 +1411,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 +1422,12 @@ impl FetchScheduler { }; h.samples = h.samples.saturating_add(1); h.consecutive_errors = 0; - h.cooldown_until = None; + 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 +1440,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 +1818,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 +1913,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 +1924,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 4f1f7074f..8a11c3dc0 100644 --- a/app/src/main/rust/stores/src/fetch_tuning.rs +++ b/app/src/main/rust/stores/src/fetch_tuning.rs @@ -68,6 +68,8 @@ 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; +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/main/rust/stores/src/gog.rs b/app/src/main/rust/stores/src/gog.rs index 3aed66074..e3a049c4c 100644 --- a/app/src/main/rust/stores/src/gog.rs +++ b/app/src/main/rust/stores/src/gog.rs @@ -2,6 +2,7 @@ pub mod engine; pub mod jni; pub mod plan; +pub mod maintenance; use std::fs::File; use std::io::Read; diff --git a/app/src/main/rust/stores/src/gog/delta.c b/app/src/main/rust/stores/src/gog/delta.c new file mode 100644 index 000000000..fd64ea924 --- /dev/null +++ b/app/src/main/rust/stores/src/gog/delta.c @@ -0,0 +1,78 @@ +#include "xdelta3.h" + +typedef struct { size_t used; } dd_budget; +typedef struct { size_t size; } dd_allocation; + +static void *dd_alloc(void *opaque, size_t count, usize_t size) { + dd_budget *budget = opaque; + if (size && count > (62u * 1024u * 1024u) / size) return NULL; + size_t n = count * size; + if (n > 62u * 1024u * 1024u - budget->used) return NULL; + dd_allocation *allocation = malloc(sizeof(*allocation) + n); + if (!allocation) return NULL; + allocation->size = n; + budget->used += n; + return allocation + 1; +} + +static void dd_free(void *opaque, void *ptr) { + if (!ptr) return; + dd_allocation *allocation = (dd_allocation *)ptr - 1; + ((dd_budget *)opaque)->used -= allocation->size; + free(allocation); +} + +int dd_gog_delta(const char *source, const char *patch, const char *target, + int (*cancel)(void *), void *opaque) { + FILE *old = NULL, *delta = NULL, *out = NULL; + xd3_stream stream = {0}; + xd3_source src = {0}; + xd3_config config = {0}; + dd_budget budget = {0}; + unsigned char *input = NULL, *block = NULL; + int result = -1, configured = 0; + old = fopen(source, "rb"); delta = fopen(patch, "rb"); out = fopen(target, "wb"); + if (!old || !delta || !out) goto done; + input = malloc(64 * 1024); block = malloc(1024 * 1024); + if (!input || !block) goto done; + config.winsize = 64 * 1024; + config.alloc = dd_alloc; config.freef = dd_free; config.opaque = &budget; + if (xd3_config_stream(&stream, &config)) goto done; + configured = 1; + src.blksize = 1024 * 1024; src.curblk = block; src.curblkno = 0; + src.onblk = fread(block, 1, src.blksize, old); + if (xd3_set_source(&stream, &src)) goto done; + for (;;) { + size_t n = fread(input, 1, 64 * 1024, delta); + if (ferror(delta)) goto done; + if (feof(delta)) xd3_set_flags(&stream, XD3_FLUSH); + xd3_avail_input(&stream, input, n); + int code; + while ((code = xd3_decode_input(&stream)) != XD3_INPUT) { + if (cancel && cancel(opaque)) { result = 130; goto done; } + switch (code) { + case XD3_OUTPUT: + if (fwrite(stream.next_out, 1, stream.avail_out, out) != stream.avail_out) goto done; + xd3_consume_output(&stream); break; + case XD3_GETSRCBLK: + if (fseeko(old, (off_t)(src.getblkno * src.blksize), SEEK_SET)) goto done; + src.curblkno = src.getblkno; + src.onblk = fread(block, 1, src.blksize, old); + if (ferror(old)) goto done; + break; + case XD3_GOTHEADER: case XD3_WINSTART: case XD3_WINFINISH: break; + default: goto done; + } + } + if (feof(delta)) break; + } + if (xd3_close_stream(&stream) || fflush(out)) goto done; + result = 0; +done: + if (configured) xd3_free_stream(&stream); + if (old) fclose(old); + if (delta) fclose(delta); + if (out && fclose(out)) result = -1; + free(input); free(block); + return result; +} diff --git a/app/src/main/rust/stores/src/gog/engine.rs b/app/src/main/rust/stores/src/gog/engine.rs index 9f2f59428..c1c1a8b11 100644 --- a/app/src/main/rust/stores/src/gog/engine.rs +++ b/app/src/main/rust/stores/src/gog/engine.rs @@ -32,11 +32,14 @@ pub enum PlanKind { #[default] Gen2Chunks, Gen1Ranges, + Maintenance, } impl PlanKind { pub fn from_i32(v: i32) -> Self { - if v == 1 { + if v == 2 { + PlanKind::Maintenance + } else if v == 1 { PlanKind::Gen1Ranges } else { PlanKind::Gen2Chunks @@ -72,6 +75,7 @@ pub trait GogEvents: Sync { ); fn on_log(&self, line: &str); fn on_bytes(&self, _bytes_done: u64, _bytes_total: u64) {} + fn on_maintenance(&self, _network_bytes: u64, _reused_bytes: u64, _applied_bytes: u64) {} } #[derive(Clone, Debug, Default, PartialEq, Eq)] @@ -672,6 +676,7 @@ pub fn run(req: &GogRequest, cancel: &AtomicBool, events: &dyn GogEvents) -> Gog match req.kind { PlanKind::Gen2Chunks => run_gen2(req, cancel, events), PlanKind::Gen1Ranges => run_gen1(req, cancel, events), + PlanKind::Maintenance => super::maintenance::run(req, cancel, events), } } diff --git a/app/src/main/rust/stores/src/gog/fixtures/update.vcdiff b/app/src/main/rust/stores/src/gog/fixtures/update.vcdiff new file mode 100644 index 000000000..f053eb540 Binary files /dev/null and b/app/src/main/rust/stores/src/gog/fixtures/update.vcdiff differ diff --git a/app/src/main/rust/stores/src/gog/jni.rs b/app/src/main/rust/stores/src/gog/jni.rs index 9fa1fbf01..c2e1b0bd5 100644 --- a/app/src/main/rust/stores/src/gog/jni.rs +++ b/app/src/main/rust/stores/src/gog/jni.rs @@ -153,6 +153,15 @@ impl GogEvents for JniEvents { let _ = env.delete_local_ref(text); }); } + + fn on_maintenance(&self, network_bytes: u64, reused_bytes: u64, applied_bytes: u64) { + self.with_env(|env| { + let _ = env.call_method(self.listener.as_obj(), "onMaintenance", "(JJJ)V", &[ + JValue::Long(network_bytes as jlong), JValue::Long(reused_bytes as jlong), JValue::Long(applied_bytes as jlong), + ]); + Self::clear_exception(env); + }); + } } fn jstring_to_string(env: &mut JNIEnv, value: &JString) -> Option<String> { @@ -197,7 +206,7 @@ pub extern "system" fn Java_com_droiddeck_launcher_stores_gog_GogNative_nativePr _env: JNIEnv, _class: JClass, ) -> jint { - 1 + 2 } #[no_mangle] diff --git a/app/src/main/rust/stores/src/gog/maintenance.rs b/app/src/main/rust/stores/src/gog/maintenance.rs new file mode 100644 index 000000000..b2a9338c2 --- /dev/null +++ b/app/src/main/rust/stores/src/gog/maintenance.rs @@ -0,0 +1,523 @@ +use std::collections::{HashMap, HashSet}; +use std::ffi::CString; +use std::fs::{self, File, OpenOptions}; +use std::io::{Read, Seek, SeekFrom, Write}; +use std::path::{Component, Path, PathBuf}; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::Mutex; +use serde_json::Value; +use super::engine::{GogEvents, GogRequest, GogRunResult, http_status_in, is_link_expiry_status}; +use super::{md5_hex, md5_hex_file}; + +static DELTA_LOCK: Mutex<()> = Mutex::new(()); +unsafe extern "C" { + fn dd_gog_delta(source: *const libc::c_char, patch: *const libc::c_char, target: *const libc::c_char, + cancel: extern "C" fn(*mut libc::c_void) -> libc::c_int, opaque: *mut libc::c_void) -> libc::c_int; +} +extern "C" fn cancelled(opaque: *mut libc::c_void) -> libc::c_int { + unsafe { (*(opaque as *const AtomicBool)).load(Ordering::Relaxed) as libc::c_int } +} + +fn http_client(read_timeout: std::time::Duration) -> Result<reqwest::Client, String> { + reqwest::Client::builder() + .connect_timeout(std::time::Duration::from_secs(20)) + .read_timeout(read_timeout) + .build().map_err(|e| e.to_string()) +} + +pub fn inside(root: &Path, relative: &str) -> Result<PathBuf, String> { + if relative.is_empty() || relative.contains(['\\', ':', '\0']) || relative.split('/').any(|p| p.is_empty() || p == "." || p == "..") { return Err("invalid GOG path".into()); } + let mut out = root.to_path_buf(); + for component in Path::new(relative).components() { + let Component::Normal(part) = component else { return Err("GOG path leaves installation".into()) }; + out.push(part); + if fs::symlink_metadata(&out).map(|m| m.file_type().is_symlink()).unwrap_or(false) { + return Err("GOG path is a symbolic link".into()); + } + } + Ok(out) +} + +fn text<'a>(v: &'a Value, key: &str) -> &'a str { v.get(key).and_then(Value::as_str).unwrap_or("") } +fn num(v: &Value, key: &str) -> u64 { v.get(key).and_then(Value::as_u64).unwrap_or(0) } +fn array<'a>(v: &'a Value, key: &str) -> &'a [Value] { v.get(key).and_then(Value::as_array).map(Vec::as_slice).unwrap_or(&[]) } +fn valid_md5(s: &str) -> bool { s.len() == 32 && s.bytes().all(|c| c.is_ascii_hexdigit()) } + +fn matches(path: &Path, file: &Value) -> bool { + if !fs::metadata(path).map(|m| m.is_file() && m.len() == num(file, "size")).unwrap_or(false) { return false; } + let md5 = text(file, "md5"); + if valid_md5(md5) { return md5_hex_file(path).map(|h| h.eq_ignore_ascii_case(md5)).unwrap_or(false); } + let sha = text(file, "sha256"); + if sha.len() == 64 { + use sha2::{Digest, Sha256}; + let Ok(mut input) = File::open(path) else { return false; }; + let mut digest = Sha256::new(); let mut buffer = [0u8; 64 * 1024]; + loop { let Ok(n) = input.read(&mut buffer) else { return false; }; if n == 0 { break; } digest.update(&buffer[..n]); } + return super::to_hex(&digest.finalize()).eq_ignore_ascii_case(sha); + } + let chunks = array(file, "chunks"); + if chunks.is_empty() { return num(file, "size") == 0; } + let Ok(mut input) = File::open(path) else { return false; }; + chunks.iter().all(|chunk| { + let size = num(chunk, "size"); + valid_md5(text(chunk, "md5")) && hash_range(&mut input, size).as_deref() == Some(text(chunk, "md5")) + }) +} + +fn hash_range(input: &mut File, size: u64) -> Option<String> { + let mut digest = crate::md5_small::Md5::new(); + let mut remaining = size; + let mut buffer = [0u8; 64 * 1024]; + while remaining > 0 { + let want = remaining.min(buffer.len() as u64) as usize; + input.read_exact(&mut buffer[..want]).ok()?; + digest.update(&buffer[..want]); remaining -= want as u64; + } + Some(super::to_hex(&digest.finalize())) +} + +#[derive(Clone)] +struct Reuse { path: PathBuf, offset: u64, size: u64 } +type ReuseMap = HashMap<(String, u64), Vec<Reuse>>; + +fn reuse_map(root: &Path, files: &[Value]) -> Result<ReuseMap, String> { + let mut result: ReuseMap = HashMap::new(); + for file in files { + if text(file, "path").to_lowercase().starts_with(".droiddeck-") { return Err("GOG content overlaps launcher metadata".into()); } + let path = inside(root, text(file, "path"))?; + let mut offset: u64 = 0; + for chunk in array(file, "chunks") { + let size = num(chunk, "size"); + if valid_md5(text(chunk, "md5")) { + result.entry((text(chunk, "md5").to_ascii_lowercase(), size)).or_default() + .push(Reuse { path: path.clone(), offset, size }); + } + offset = offset.checked_add(size).ok_or("GOG file size overflow")?; + } + } + Ok(result) +} + +fn reusable(chunk: &Value, map: &ReuseMap) -> Option<Reuse> { + let key = (text(chunk, "md5").to_ascii_lowercase(), num(chunk, "size")); + map.get(&key)?.iter().find(|old| { + let Ok(mut file) = File::open(&old.path) else { return false; }; + file.seek(SeekFrom::Start(old.offset)).is_ok() && hash_range(&mut file, old.size).map(|h| h.eq_ignore_ascii_case(&key.0)).unwrap_or(false) + }).cloned() +} + +struct Transfer<'a> { + runtime: tokio::runtime::Runtime, + client: reqwest::Client, + cancel: &'a AtomicBool, + events: &'a dyn GogEvents, + wire: u64, + total: u64, +} + +impl Transfer<'_> { + fn fetch(&mut self, urls: &[String], range: Option<(u64, u64)>, dest: &Path, limit: u64) -> Result<(), String> { + let mut failure = "GOG download has no URLs".to_string(); + for _ in 0..3 { + for url in urls { + if self.cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + let result = self.runtime.block_on(async { + let mut request = self.client.get(url).header("User-Agent", "GOG Galaxy"); + if let Some((start, end)) = range { request = request.header("Range", format!("bytes={start}-{end}")); } + let mut response = request.send().await.map_err(|_| "GOG connection failed".to_string())?; + let status = response.status().as_u16(); + if status != if range.is_some() { 206 } else { 200 } { return Err(format!("HTTP {status}")); } + let mut output = File::create(dest).map_err(|e| e.to_string())?; + let mut size = 0u64; + while let Some(bytes) = response.chunk().await.map_err(|_| "GOG connection interrupted".to_string())? { + if self.cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + size += bytes.len() as u64; + if limit > 0 && size > limit { return Err("GOG response exceeds expected size".into()); } + self.wire += bytes.len() as u64; + self.events.on_bytes(self.wire, self.total.max(self.wire)); + output.write_all(&bytes).map_err(|e| e.to_string())?; + } + if limit > 0 && size != limit { return Err("GOG download is incomplete".into()); } + output.sync_all().map_err(|e| e.to_string()) + }); + match result { Ok(()) => return Ok(()), Err(e) => failure = e } + if http_status_in(&failure).map(is_link_expiry_status).unwrap_or(false) { return Err(failure); } + } + } + Err(failure) + } +} + +fn urls(links: &Value, product: &str, suffix: &str) -> Vec<String> { + links.get(product).and_then(Value::as_array).map(|bases| bases.iter().filter_map(Value::as_str).map(|base| { + if base.contains("{GALAXY_PATH}") { base.replace("{GALAXY_PATH}", suffix) } + else if let Some((path, query)) = base.split_once('?') { format!("{}{suffix}?{query}", path.trim_end_matches('/').to_string() + "/") } + else { format!("{}{suffix}", base.trim_end_matches('/').to_string() + "/") } + }).collect()).unwrap_or_default() +} + +fn chunk_path(chunk: &Value) -> Result<String, String> { + let hash = text(chunk, "compressedMd5"); + if !valid_md5(hash) { return Err("GOG chunk has no valid compressed hash".into()); } + Ok(super::plan::build_cdn_path(hash)) +} + +fn download_chunk(transfer: &mut Transfer, links: &Value, product: &str, chunk: &Value, scratch: &Path, output: &mut File) -> Result<(), String> { + transfer.fetch(&urls(links, product, &chunk_path(chunk)?), None, scratch, num(chunk, "compressedSize"))?; + if !md5_hex_file(scratch).map(|h| h.eq_ignore_ascii_case(text(chunk, "compressedMd5"))).unwrap_or(false) { return Err("GOG compressed chunk checksum mismatch".into()); } + let mut raw = File::open(scratch).map_err(|e| e.to_string())?; + let mut head = [0u8; 1]; raw.read_exact(&mut head).map_err(|e| e.to_string())?; + raw.seek(SeekFrom::Start(0)).map_err(|e| e.to_string())?; + let stored = num(chunk, "size") == num(chunk, "compressedSize") && text(chunk, "md5").eq_ignore_ascii_case(text(chunk, "compressedMd5")); + let input: Box<dyn Read> = if !stored && head[0] == 0x78 { Box::new(flate2::read::ZlibDecoder::new(raw)) } else { Box::new(raw) }; + let mut input = input.take(num(chunk, "size") + 1); + let mut digest = crate::md5_small::Md5::new(); + let mut size = 0u64; + let mut buffer = [0u8; 64 * 1024]; + loop { + let n = input.read(&mut buffer).map_err(|_| "GOG chunk decompression failed")?; + if n == 0 { break; } + if transfer.cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + digest.update(&buffer[..n]); size += n as u64; + output.write_all(&buffer[..n]).map_err(|e| e.to_string())?; + } + if size != num(chunk, "size") || !super::to_hex(&digest.finalize()).eq_ignore_ascii_case(text(chunk, "md5")) { return Err("GOG chunk checksum mismatch".into()); } + Ok(()) +} + +fn apply_delta(root: &Path, file: &Value, patch: &Value, plan: &Value, stage: &Path, transfer: &mut Transfer) -> Result<(), String> { + let _guard = DELTA_LOCK.lock().map_err(|_| "GOG delta lock poisoned")?; + let source = inside(root, &text(patch, "path_source").replace('\\', "/"))?; + if !md5_hex_file(&source).map(|h| h.eq_ignore_ascii_case(text(patch, "md5_source"))).unwrap_or(false) { return Err("GOG delta source changed".into()); } + let payload = stage.with_extension("delta"); + let packed = stage.with_extension("packed"); + let mut output = File::create(&payload).map_err(|e| e.to_string())?; + for chunk in array(patch, "chunks") { download_chunk(transfer, &plan["patchLinks"], text(patch, "product"), chunk, &packed, &mut output)?; } + drop(output); + if !md5_hex_file(&payload).map(|h| h.eq_ignore_ascii_case(text(patch, "md5"))).unwrap_or(false) { return Err("GOG delta checksum mismatch".into()); } + let cpath = |p: &Path| CString::new(p.as_os_str().as_encoded_bytes()).map_err(|_| "invalid path"); + let (s, p, t) = (cpath(&source)?, cpath(&payload)?, cpath(stage)?); + let code = unsafe { dd_gog_delta(s.as_ptr(), p.as_ptr(), t.as_ptr(), cancelled, transfer.cancel as *const AtomicBool as *mut libc::c_void) }; + let _ = fs::remove_file(payload); let _ = fs::remove_file(packed); + if code != 0 || !matches(stage, file) || !md5_hex_file(stage).map(|h| h.eq_ignore_ascii_case(text(patch, "md5_target"))).unwrap_or(false) { return Err("GOG delta reconstruction failed".into()); } + Ok(()) +} + +pub fn run(req: &GogRequest, cancel: &AtomicBool, events: &dyn GogEvents) -> GogRunResult { + let mut result = GogRunResult::default(); + let work = || -> Result<(u64, u32), String> { + let plan: Value = serde_json::from_str(req.depot_manifests.first().ok_or("missing GOG maintenance plan")?).map_err(|_| "invalid GOG maintenance plan")?; + let root = fs::canonicalize(&req.install_dir).map_err(|e| e.to_string())?; + let files = array(&plan, "files"); + let mut seen = HashSet::new(); + let mut components = HashMap::new(); + for file in files { + let name = text(file, "path"); inside(&root, name)?; + if name.to_lowercase().starts_with(".droiddeck-") || !seen.insert(name.to_lowercase()) { return Err("ambiguous GOG path".into()); } + let mut parent = root.clone(); + let mut relative = PathBuf::new(); + for part in name.split('/') { + relative.push(part); + let key = relative.to_string_lossy().to_lowercase(); + if let Some(previous) = components.insert(key, relative.clone()) { + if previous != relative { return Err("ambiguous GOG directory".into()); } + } + if let Ok(entries) = fs::read_dir(&parent) { + for entry in entries.flatten() { + let actual = entry.file_name().to_string_lossy().into_owned(); + if actual != part && actual.to_lowercase() == part.to_lowercase() { return Err("existing path differs only by case".into()); } + } + } + parent.push(part); + } + } + let map = reuse_map(&root, array(&plan, "oldFiles"))?; + let stages = inside(&root, ".droiddeck-gog/stage")?; + fs::create_dir_all(&stages).map_err(|e| e.to_string())?; + let mut transfer = Transfer { + runtime: tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?, + client: http_client(std::time::Duration::from_secs(60))?, + cancel, events, wire: 0, total: num(&plan, "downloadBytes"), + }; + let mut done = 0u32; let mut reused = 0u64; let mut applied = 0u64; + for file in files { + if cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + let path = inside(&root, text(file, "path"))?; + if file.get("directory").and_then(Value::as_bool).unwrap_or(false) { + fs::create_dir_all(&path).map_err(|e| e.to_string())?; done += 1; continue; + } + if matches(&path, file) { done += 1; events.on_file_done(text(file, "path"), num(file, "size"), true, done, files.len() as u32, transfer.wire, transfer.total); continue; } + let stage = stages.join(md5_hex(text(file, "path").as_bytes())); + if !matches(&stage, file) { + let mut start = 0; + let missing_bytes: u64 = array(file, "chunks").iter().map(|chunk| { + let valid = File::open(&stage).ok().map(|mut input| input.seek(SeekFrom::Start(start)).is_ok() && + hash_range(&mut input, num(chunk, "size")).map(|h| h.eq_ignore_ascii_case(text(chunk, "md5"))).unwrap_or(false)).unwrap_or(false); + start += num(chunk, "size"); + if valid || reusable(chunk, &map).is_some() { 0 } else { num(chunk, "compressedSize") } + }).sum(); + let patch = array(&plan, "patches").iter().find(|p| text(p, "path_target").replace('\\', "/") == text(file, "path") && + array(p, "chunks").iter().map(|c| num(c, "compressedSize")).sum::<u64>() < missing_bytes); + let delta_ok = if let Some(patch) = patch { + match apply_delta(&root, file, patch, &plan, &stage, &mut transfer) { + Ok(()) => true, + Err(e) => { if cancel.load(Ordering::Relaxed) || http_status_in(&e).map(is_link_expiry_status).unwrap_or(false) { return Err(e); } events.on_log(&format!("gog: delta fallback file={} reason={e}", text(file, "path"))); false } + } + } else { false }; + if !delta_ok { + let chunks = array(file, "chunks"); + if chunks.is_empty() && num(file, "size") > 0 { + let offset = num(file, "offset"); + let remote = text(file, "remotePath"); + let endpoints = if remote.starts_with("https://") { vec![remote.to_string()] } else { urls(&plan["links"], text(file, "product"), remote.trim_start_matches('/')) }; + transfer.fetch(&endpoints, Some((offset, offset + num(file, "size") - 1)), &stage, num(file, "size"))?; + } else { + let mut output = OpenOptions::new().create(true).truncate(false).read(true).write(true).open(&stage).map_err(|e| e.to_string())?; + let mut offset = 0u64; + for chunk in chunks { + if cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + output.seek(SeekFrom::Start(offset)).map_err(|e| e.to_string())?; + let valid_stage = hash_range(&mut output, num(chunk, "size")).map(|h| h.eq_ignore_ascii_case(text(chunk, "md5"))).unwrap_or(false); + output.seek(SeekFrom::Start(offset)).map_err(|e| e.to_string())?; + if valid_stage { reused += num(chunk, "size"); } + else if let Some(old) = reusable(chunk, &map) { + let mut source = File::open(old.path).map_err(|e| e.to_string())?; + source.seek(SeekFrom::Start(old.offset)).map_err(|e| e.to_string())?; + std::io::copy(&mut source.take(old.size), &mut output).map_err(|e| e.to_string())?; + reused += old.size; + } else { + download_chunk(&mut transfer, &plan["links"], text(file, "product"), chunk, &stage.with_extension("packed"), &mut output)?; + } + offset += num(chunk, "size"); + } + output.set_len(num(file, "size")).map_err(|e| e.to_string())?; + output.sync_all().map_err(|e| e.to_string())?; + } + } + } + let unhashed_range = array(file, "chunks").is_empty() && !valid_md5(text(file, "md5")) && text(file, "sha256").is_empty(); + if !matches(&stage, file) && !(unhashed_range && fs::metadata(&stage).map(|m| m.len() == num(file, "size")).unwrap_or(false)) { return Err(format!("GOG target verification failed: {}", text(file, "path"))); } + if cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + inside(&root, text(file, "path"))?; + fs::create_dir_all(path.parent().ok_or("GOG file has no parent")?).map_err(|e| e.to_string())?; + File::open(&stage).and_then(|f| f.sync_all()).map_err(|e| e.to_string())?; + fs::rename(&stage, &path).map_err(|e| e.to_string())?; + applied += num(file, "size"); done += 1; + events.on_file_done(text(file, "path"), num(file, "size"), false, done, files.len() as u32, transfer.wire, transfer.total); + events.on_maintenance(transfer.wire, reused, applied); + events.on_log(&format!("gog: maintenance wire={} reused={reused} applied={applied} files={done}", transfer.wire)); + } + for old in array(&plan, "oldFiles") { + if cancel.load(Ordering::Relaxed) { return Err("cancelled".into()); } + if !seen.contains(&text(old, "path").to_lowercase()) { + let path = inside(&root, text(old, "path"))?; + if matches(&path, old) { fs::remove_file(path).map_err(|e| e.to_string())?; } + } + } + events.on_log(&format!("gog: maintenance complete wire={} reused={reused} applied={applied}", transfer.wire)); + Ok((transfer.wire, done)) + }; + match work() { + Ok((bytes, files)) => { result.success = true; result.bytes_written = bytes; result.files_done = files; } + Err(error) => { result.cancelled = cancel.load(Ordering::Relaxed); result.link_expiry = http_status_in(&error).map(is_link_expiry_status).unwrap_or(false); result.error = error; } + } + result +} + +#[cfg(test)] +mod tests { + use super::*; + use flate2::{write::ZlibEncoder, Compression}; + use serde_json::json; + use std::net::TcpListener; + use std::sync::{Arc, atomic::AtomicU64}; + + struct Events; + impl GogEvents for Events { + fn on_file_done(&self, _: &str, _: u64, _: bool, _: u32, _: u32, _: u64, _: u64) {} + fn on_log(&self, _: &str) {} + } + struct Temp(PathBuf); + impl Temp { + fn new() -> Self { + let path = std::env::temp_dir().join(format!("gog-maintenance-{}-{}", std::process::id(), std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos())); + fs::create_dir_all(&path).unwrap(); Self(path) + } + } + impl Drop for Temp { fn drop(&mut self) { let _ = fs::remove_dir_all(&self.0); } } + + struct Server { base: String, bytes: Arc<AtomicU64>, stop: Arc<AtomicBool>, thread: Option<std::thread::JoinHandle<()>> } + impl Server { + fn new(payloads: HashMap<String, Vec<u8>>, range: bool) -> Self { + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let base = format!("http://{}", listener.local_addr().unwrap()); + listener.set_nonblocking(true).unwrap(); + let stop = Arc::new(AtomicBool::new(false)); let bytes = Arc::new(AtomicU64::new(0)); + let (stopped, count) = (stop.clone(), bytes.clone()); + let thread = std::thread::spawn(move || { + while !stopped.load(Ordering::Relaxed) { + if let Ok((mut stream, _)) = listener.accept() { + stream.set_read_timeout(Some(std::time::Duration::from_secs(2))).unwrap(); + let mut request = Vec::new(); let mut one = [0u8]; + while stream.read(&mut one).unwrap_or(0) > 0 { request.push(one[0]); if request.ends_with(b"\r\n\r\n") { break; } } + let request = String::from_utf8_lossy(&request); + let path = request.split_whitespace().nth(1).unwrap_or(""); + if let Some(body) = payloads.get(path) { + let status = if range { "206 Partial Content" } else { "200 OK" }; + let _ = write!(stream, "HTTP/1.1 {status}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n", body.len()); + if stream.write_all(body).is_ok() { count.fetch_add(body.len() as u64, Ordering::Relaxed); } + } else { let _ = stream.write_all(b"HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"); } + } else { std::thread::sleep(std::time::Duration::from_millis(2)); } + } + }); + Self { base, bytes, stop, thread: Some(thread) } + } + } + impl Drop for Server { fn drop(&mut self) { self.stop.store(true, Ordering::Relaxed); if let Some(thread) = self.thread.take() { thread.join().unwrap(); } } } + + #[test] + fn continuing_download_may_exceed_the_read_timeout_in_total() { + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let url = format!("http://{}", listener.local_addr().unwrap()); + let server = std::thread::spawn(move || { + let (mut stream, _) = listener.accept().unwrap(); + stream.set_read_timeout(Some(std::time::Duration::from_secs(3))).unwrap(); + let mut request = Vec::new(); let mut byte = [0u8]; + while stream.read(&mut byte).unwrap() > 0 { request.push(byte[0]); if request.ends_with(b"\r\n\r\n") { break; } } + stream.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 4\r\nConnection: close\r\n\r\n").unwrap(); + for byte in b"abcd" { + stream.write_all(&[*byte]).unwrap(); stream.flush().unwrap(); + std::thread::sleep(std::time::Duration::from_millis(400)); + } + }); + let runtime = tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap(); + let client = http_client(std::time::Duration::from_secs(1)).unwrap(); + let body = runtime.block_on(async { client.get(url).send().await.unwrap().bytes().await.unwrap() }); + assert_eq!(&body[..], b"abcd"); + server.join().unwrap(); + } + + fn chunk(data: &[u8]) -> (Value, String, Vec<u8>) { + let mut encoder = ZlibEncoder::new(Vec::new(), Compression::default()); encoder.write_all(data).unwrap(); + let packed = encoder.finish().unwrap(); let hash = md5_hex(&packed); + (json!({"md5": md5_hex(data), "size": data.len(), "compressedMd5": hash, "compressedSize": packed.len()}), + format!("/{}", super::super::plan::build_cdn_path(&hash)), packed) + } + fn execute(root: &Path, files: Value, old: Value, server: &Server) -> GogRunResult { + let plan = json!({"files": files, "oldFiles": old, "patches": [], "links": {"1": [server.base]}, "downloadBytes": 4096}); + run(&GogRequest { install_dir: root.to_string_lossy().into_owned(), depot_manifests: vec![plan.to_string()], ..Default::default() }, &AtomicBool::new(false), &Events) + } + + #[test] + fn reuses_moved_and_repeated_chunks_and_downloads_only_missing_bytes() { + let temp = Temp::new(); + let (a, _, _) = chunk(b"aaaa"); let (b, path, packed) = chunk(b"bbbb"); + fs::write(temp.0.join("archive"), b"aaaaaaaa").unwrap(); + let server = Server::new(HashMap::from([(path, packed.clone())]), false); + let old = json!([{"path":"archive", "size":8, "md5":md5_hex(b"aaaaaaaa"), "chunks":[a,a]}]); + let files = json!([{"path":"archive", "size":12, "md5":md5_hex(b"bbbbaaaaaaaa"), "chunks":[b,a,a], "product":"1"}]); + let result = execute(&temp.0, files, old, &server); + assert!(result.success, "{}", result.error); + assert_eq!(fs::read(temp.0.join("archive")).unwrap(), b"bbbbaaaaaaaa"); + assert_eq!(server.bytes.load(Ordering::Relaxed), packed.len() as u64); + assert_eq!(result.bytes_written, packed.len() as u64); + } + + #[test] + fn revalidates_partial_staging_and_preserves_original_until_verified() { + let temp = Temp::new(); let (a, _, _) = chunk(b"aaaa"); let (b, path, packed) = chunk(b"bbbb"); + let stages = temp.0.join(".droiddeck-gog/stage"); fs::create_dir_all(&stages).unwrap(); + fs::write(temp.0.join("archive"), b"original").unwrap(); + fs::write(stages.join(md5_hex(b"archive")), b"aaaabadd").unwrap(); + let server = Server::new(HashMap::from([(path, packed.clone())]), false); + let files = json!([{"path":"archive", "size":8, "md5":md5_hex(b"aaaabbbb"), "chunks":[a,b], "product":"1"}]); + let result = execute(&temp.0, files, json!([]), &server); + assert!(result.success, "{}", result.error); + assert_eq!(server.bytes.load(Ordering::Relaxed), packed.len() as u64); + assert_eq!(fs::read(temp.0.join("archive")).unwrap(), b"aaaabbbb"); + } + + #[test] + fn unchanged_files_need_no_network_and_obsolete_modified_files_survive() { + let temp = Temp::new(); let (a, _, _) = chunk(b"aaaa"); + fs::write(temp.0.join("current"), b"aaaa").unwrap(); + fs::write(temp.0.join("obsolete"), b"old").unwrap(); fs::write(temp.0.join("modded"), b"mod").unwrap(); + let server = Server::new(HashMap::new(), false); + let files = json!([{"path":"current", "size":4, "md5":md5_hex(b"aaaa"), "chunks":[a], "product":"1"}, {"path":"empty", "size":0, "chunks":[], "product":"1"}]); + let old = json!([{"path":"obsolete", "size":3, "md5":md5_hex(b"old")}, {"path":"modded", "size":3, "md5":md5_hex(b"old")}]); + let result = execute(&temp.0, files, old, &server); + assert!(result.success, "{}", result.error); + assert_eq!(server.bytes.load(Ordering::Relaxed), 0); + assert!(!temp.0.join("obsolete").exists()); assert!(temp.0.join("modded").exists()); + assert_eq!(fs::metadata(temp.0.join("empty")).unwrap().len(), 0); + } + + #[test] + fn gen1_same_size_corruption_is_replaced_using_hash_and_range() { + let temp = Temp::new(); fs::write(temp.0.join("game"), b"bad!").unwrap(); + let server = Server::new(HashMap::from([("/range".to_string(), b"good".to_vec())]), true); + let files = json!([{"path":"game", "size":4, "md5":md5_hex(b"good"), "chunks":[], "product":"1", "remotePath":"range", "offset":10}]); + let result = execute(&temp.0, files, json!([]), &server); + assert!(result.success, "{}", result.error); assert_eq!(fs::read(temp.0.join("game")).unwrap(), b"good"); + assert_eq!(server.bytes.load(Ordering::Relaxed), 4); + } + + #[test] + fn bad_chunks_never_replace_original_and_expired_links_are_reported() { + let temp = Temp::new(); fs::write(temp.0.join("game"), b"old!").unwrap(); + let (a, path, mut packed) = chunk(b"new!"); packed[0] ^= 1; + let server = Server::new(HashMap::from([(path, packed)]), false); + let files = json!([{"path":"game", "size":4, "md5":md5_hex(b"new!"), "chunks":[a], "product":"1"}]); + let result = execute(&temp.0, files.clone(), json!([]), &server); + assert!(!result.success); assert_eq!(fs::read(temp.0.join("game")).unwrap(), b"old!"); + let missing = Server::new(HashMap::new(), false); + let result = execute(&temp.0, files, json!([]), &missing); + assert!(result.link_expiry, "{}", result.error); + } + + #[test] + fn rejects_traversal_symlinks_and_case_collisions_before_fetching() { + let temp = Temp::new(); let outside = Temp::new(); + std::os::unix::fs::symlink(&outside.0, temp.0.join("linked")).unwrap(); + for path in ["../escape", "/absolute", "a/./b", "a//b", "linked/game"] { assert!(inside(&temp.0, path).is_err(), "{path}"); } + let server = Server::new(HashMap::new(), false); + let result = execute(&temp.0, json!([{"path":"Game"}, {"path":"game"}]), json!([]), &server); + assert!(!result.success); assert_eq!(server.bytes.load(Ordering::Relaxed), 0); + } + + #[test] + fn valid_xdelta_downloads_only_delta_and_corrupt_source_falls_back() { + let old = b"the old archive contents\n".repeat(4096); + let mut new = b"the new archive contents\n".to_vec(); new.extend_from_slice(&old); new.extend_from_slice(b"END\n"); + let delta = include_bytes!("fixtures/update.vcdiff"); + let (patch_chunk, patch_url, packed_delta) = chunk(delta); + let (target_chunk, target_url, packed_target) = chunk(&new); + for mode in 0..3 { + let corrupt = mode == 1; + let temp = Temp::new(); + fs::write(temp.0.join("game"), if corrupt { vec![b'x'; old.len()] } else { old.clone() }).unwrap(); + let (delta_chunk, delta_url, delta_body) = if mode == 2 { chunk(b"unsupported VCDIFF") } else { (patch_chunk.clone(), patch_url.clone(), packed_delta.clone()) }; + let server = Server::new(HashMap::from([(delta_url, delta_body.clone()), (target_url.clone(), packed_target.clone())]), false); + let plan = json!({"files":[{"path":"game", "product":"1", "size":new.len(), "md5":md5_hex(&new), "chunks":[target_chunk]}], + "oldFiles":[{"path":"game", "size":old.len(), "md5":md5_hex(&old), "chunks":[]}], + "patches":[{"path_source":"game", "path_target":"game", "product":"1", "md5_source":md5_hex(&old), "md5_target":md5_hex(&new), "md5":if mode == 2 { md5_hex(b"unsupported VCDIFF") } else { md5_hex(delta) }, "chunks":[delta_chunk]}], + "links":{"1":[server.base]}, "patchLinks":{"1":[server.base]}, "downloadBytes":packed_target.len()}); + let result = run(&GogRequest {install_dir:temp.0.to_string_lossy().into_owned(), depot_manifests:vec![plan.to_string()], ..Default::default()}, &AtomicBool::new(false), &Events); + assert!(result.success, "{}", result.error); + assert_eq!(fs::read(temp.0.join("game")).unwrap(), new); + assert_eq!(server.bytes.load(Ordering::Relaxed), match mode { 1 => packed_target.len(), 2 => delta_body.len() + packed_target.len(), _ => packed_delta.len() } as u64); + } + } + + #[test] + fn stored_chunks_starting_with_x_are_not_mistaken_for_zlib() { + let temp = Temp::new(); let raw = b"xyz stored data"; + let hash = md5_hex(raw); + let path = format!("/{}", super::super::plan::build_cdn_path(&hash)); + let server = Server::new(HashMap::from([(path, raw.to_vec())]), false); + let result = execute(&temp.0, json!([{"path":"game", "product":"1", "size":raw.len(), "md5":hash, + "chunks":[{"md5":hash,"compressedMd5":hash,"size":raw.len(),"compressedSize":raw.len()}]}]), json!([]), &server); + assert!(result.success, "{}", result.error); + assert_eq!(fs::read(temp.0.join("game")).unwrap(), raw); + } +} diff --git a/app/src/main/rust/stores/vendor/xdelta3/LICENSE b/app/src/main/rust/stores/vendor/xdelta3/LICENSE new file mode 100644 index 000000000..7a774156a --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/LICENSE @@ -0,0 +1,176 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/app/src/main/rust/stores/vendor/xdelta3/README.droiddeck.md b/app/src/main/rust/stores/vendor/xdelta3/README.droiddeck.md new file mode 100644 index 000000000..696f3afa7 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/README.droiddeck.md @@ -0,0 +1,7 @@ +Xdelta3 decoder from jmacd/xdelta revision 0525275fe4b553a10f38e455d30c60dc6ed9b45d (release3_0_apl), the +Apache-2.0 revision used by heroic-gogdl. Upstream sources are unmodified. +https://github.com/jmacd/xdelta/tree/0525275/xdelta3 + +DroidDeck's streaming wrapper is src/gog/delta.c. Encoding and secondary +compression are disabled, matching heroic-gogdl's decoder baseline. Unsupported +streams fall back to verified Galaxy chunks. No Python runtime is required. diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3-cfgs.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-cfgs.h new file mode 100644 index 000000000..84a222143 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-cfgs.h @@ -0,0 +1,171 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/****************************************************************** + SOFT string matcher + ******************************************************************/ + +#if XD3_BUILD_SOFT + +#define TEMPLATE soft +#define LLOOK stream->smatcher.large_look +#define LSTEP stream->smatcher.large_step +#define SLOOK stream->smatcher.small_look +#define SCHAIN stream->smatcher.small_chain +#define SLCHAIN stream->smatcher.small_lchain +#define MAXLAZY stream->smatcher.max_lazy +#define LONGENOUGH stream->smatcher.long_enough + +#define SOFTCFG 1 +#include "xdelta3.c" +#undef SOFTCFG + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif + +#define SOFTCFG 0 + +/************************************************************ + FASTEST string matcher + **********************************************************/ +#if XD3_BUILD_FASTEST +#define TEMPLATE fastest +#define LLOOK 9 +#define LSTEP 26 +#define SLOOK 4U +#define SCHAIN 1 +#define SLCHAIN 1 +#define MAXLAZY 6 +#define LONGENOUGH 6 + +#include "xdelta3.c" + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif + +/************************************************************ + FASTER string matcher + **********************************************************/ +#if XD3_BUILD_FASTER +#define TEMPLATE faster +#define LLOOK 9 +#define LSTEP 15 +#define SLOOK 4U +#define SCHAIN 1 +#define SLCHAIN 1 +#define MAXLAZY 18 +#define LONGENOUGH 18 + +#include "xdelta3.c" + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif + +/****************************************************** + FAST string matcher + ********************************************************/ +#if XD3_BUILD_FAST +#define TEMPLATE fast +#define LLOOK 9 +#define LSTEP 8 +#define SLOOK 4U +#define SCHAIN 4 +#define SLCHAIN 1 +#define MAXLAZY 18 +#define LONGENOUGH 35 + +#include "xdelta3.c" + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif + +/************************************************** + SLOW string matcher + **************************************************************/ +#if XD3_BUILD_SLOW +#define TEMPLATE slow +#define LLOOK 9 +#define LSTEP 2 +#define SLOOK 4U +#define SCHAIN 44 +#define SLCHAIN 13 +#define MAXLAZY 90 +#define LONGENOUGH 70 + +#include "xdelta3.c" + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif + +/******************************************************** + DEFAULT string matcher + ************************************************************/ +#if XD3_BUILD_DEFAULT +#define TEMPLATE default +#define LLOOK 9 +#define LSTEP 3 +#define SLOOK 4U +#define SCHAIN 8 +#define SLCHAIN 2 +#define MAXLAZY 36 +#define LONGENOUGH 70 + +#include "xdelta3.c" + +#undef TEMPLATE +#undef LLOOK +#undef SLOOK +#undef LSTEP +#undef SCHAIN +#undef SLCHAIN +#undef MAXLAZY +#undef LONGENOUGH +#endif diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3-decode.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-decode.h new file mode 100644 index 000000000..3933b0157 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-decode.h @@ -0,0 +1,1218 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _XDELTA3_DECODE_H_ +#define _XDELTA3_DECODE_H_ + +#include "xdelta3-internal.h" + +#define SRCORTGT(x) ((((x) & VCD_SRCORTGT) == VCD_SOURCE) ? \ + VCD_SOURCE : ((((x) & VCD_SRCORTGT) == \ + VCD_TARGET) ? VCD_TARGET : 0)) + +static inline int +xd3_decode_byte (xd3_stream *stream, usize_t *val) +{ + if (stream->avail_in == 0) + { + stream->msg = "further input required"; + return XD3_INPUT; + } + + (*val) = stream->next_in[0]; + + DECODE_INPUT (1); + return 0; +} + +static inline int +xd3_decode_bytes (xd3_stream *stream, uint8_t *buf, usize_t *pos, usize_t size) +{ + usize_t want; + usize_t take; + + /* Note: The case where (*pos == size) happens when a zero-length + * appheader or code table is transmitted, but there is nothing in + * the standard against that. */ + while (*pos < size) + { + if (stream->avail_in == 0) + { + stream->msg = "further input required"; + return XD3_INPUT; + } + + want = size - *pos; + take = xd3_min (want, stream->avail_in); + + memcpy (buf + *pos, stream->next_in, (size_t) take); + + DECODE_INPUT (take); + (*pos) += take; + } + + return 0; +} + +/* Initialize the decoder for a new window. The dec_tgtlen value is + * preserved across successive window decodings, and the update to + * dec_winstart is delayed until a new window actually starts. This + * is to avoid throwing an error due to overflow until the last + * possible moment. This makes it possible to encode exactly 4GB + * through a 32-bit encoder. */ +static int +xd3_decode_init_window (xd3_stream *stream) +{ + stream->dec_cpylen = 0; + stream->dec_cpyoff = 0; + stream->dec_cksumbytes = 0; + + xd3_init_cache (& stream->acache); + + return 0; +} + +/* Allocates buffer space for the target window and possibly the + * VCD_TARGET copy-window. Also sets the base of the two copy + * segments. */ +static int +xd3_decode_setup_buffers (xd3_stream *stream) +{ + /* If VCD_TARGET is set then the previous buffer may be reused. */ + if (stream->dec_win_ind & VCD_TARGET) + { + /* Note: this implementation is untested, since Xdelta3 itself + * does not implement an encoder for VCD_TARGET mode. Thus, mark + * unimplemented until needed. */ + if (1) + { + stream->msg = "VCD_TARGET not implemented"; + return XD3_UNIMPLEMENTED; + } + + /* But this implementation only supports copying from the last + * target window. If the offset is outside that range, it can't + * be done. */ + if (stream->dec_cpyoff < stream->dec_laststart) + { + stream->msg = "unsupported VCD_TARGET offset"; + return XD3_INVALID_INPUT; + } + + /* See if the two windows are the same. This indicates the + * first time VCD_TARGET is used. This causes a second buffer + * to be allocated, after that the two are swapped in the + * DEC_FINISH case. */ + if (stream->dec_lastwin == stream->next_out) + { + stream->next_out = NULL; + stream->space_out = 0; + } + + /* TODO: (See note above, this looks incorrect) */ + stream->dec_cpyaddrbase = stream->dec_lastwin + + (usize_t) (stream->dec_cpyoff - stream->dec_laststart); + } + + /* See if the current output window is large enough. */ + if (stream->space_out < stream->dec_tgtlen) + { + xd3_free (stream, stream->dec_buffer); + + stream->space_out = + xd3_round_blksize (stream->dec_tgtlen, XD3_ALLOCSIZE); + + if ((stream->dec_buffer = + (uint8_t*) xd3_alloc (stream, stream->space_out, 1)) == NULL) + { + return ENOMEM; + } + + stream->next_out = stream->dec_buffer; + } + + /* dec_tgtaddrbase refers to an invalid base address, but it is + * always used with a sufficiently large instruction offset (i.e., + * beyond the copy window). This condition is enforced by + * xd3_decode_output_halfinst. */ + stream->dec_tgtaddrbase = stream->next_out - stream->dec_cpylen; + + return 0; +} + +static int +xd3_decode_allocate (xd3_stream *stream, + usize_t size, + uint8_t **buf_ptr, + usize_t *buf_alloc) +{ + IF_DEBUG2 (DP(RINT "[xd3_decode_allocate] size %u alloc %u\n", + size, *buf_alloc)); + + if (*buf_ptr != NULL && *buf_alloc < size) + { + xd3_free (stream, *buf_ptr); + *buf_ptr = NULL; + } + + if (*buf_ptr == NULL) + { + *buf_alloc = xd3_round_blksize (size, XD3_ALLOCSIZE); + + if ((*buf_ptr = (uint8_t*) xd3_alloc (stream, *buf_alloc, 1)) == NULL) + { + return ENOMEM; + } + } + + return 0; +} + +static int +xd3_decode_section (xd3_stream *stream, + xd3_desect *section, + xd3_decode_state nstate, + int copy) +{ + XD3_ASSERT (section->pos <= section->size); + XD3_ASSERT (stream->dec_state != nstate); + + if (section->pos < section->size) + { + usize_t sect_take; + + if (stream->avail_in == 0) + { + return XD3_INPUT; + } + + if ((copy == 0) && (section->pos == 0)) + { + /* No allocation/copy needed */ + section->buf = stream->next_in; + sect_take = section->size; + IF_DEBUG1 (DP(RINT "[xd3_decode_section] zerocopy %u @ %u avail %u\n", + sect_take, section->pos, stream->avail_in)); + } + else + { + usize_t sect_need = section->size - section->pos; + + /* Allocate and copy */ + sect_take = xd3_min (sect_need, stream->avail_in); + + if (section->pos == 0) + { + int ret; + + if ((ret = xd3_decode_allocate (stream, + section->size, + & section->copied1, + & section->alloc1))) + { + return ret; + } + + section->buf = section->copied1; + } + + IF_DEBUG2 (DP(RINT "[xd3_decode_section] take %u @ %u [need %u] avail %u\n", + sect_take, section->pos, sect_need, stream->avail_in)); + XD3_ASSERT (section->pos + sect_take <= section->alloc1); + + memcpy (section->copied1 + section->pos, + stream->next_in, + sect_take); + } + + section->pos += sect_take; + + stream->dec_winbytes += sect_take; + + DECODE_INPUT (sect_take); + } + + if (section->pos < section->size) + { + IF_DEBUG1 (DP(RINT "[xd3_decode_section] further input required %u\n", section->size - section->pos)); + stream->msg = "further input required"; + return XD3_INPUT; + } + + XD3_ASSERT (section->pos == section->size); + + stream->dec_state = nstate; + section->buf_max = section->buf + section->size; + section->pos = 0; + return 0; +} + +/* Decode the size and address for half of an instruction (i.e., a + * single opcode). This updates the stream->dec_position, which are + * bytes already output prior to processing this instruction. Perform + * bounds checking for sizes and copy addresses, which uses the + * dec_position (which is why these checks are done here). */ +static int +xd3_decode_parse_halfinst (xd3_stream *stream, xd3_hinst *inst) +{ + int ret; + + /* If the size from the instruction table is zero then read a size value. */ + if ((inst->size == 0) && + (ret = xd3_read_size (stream, + & stream->inst_sect.buf, + stream->inst_sect.buf_max, + & inst->size))) + { + return XD3_INVALID_INPUT; + } + + /* For copy instructions, read address. */ + if (inst->type >= XD3_CPY) + { + IF_DEBUG2 ({ + static int cnt = 0; + XPR(NT "DECODE:%u: COPY at %"Q"u (winoffset %u) size %u winaddr %u\n", + cnt++, + stream->total_out + (stream->dec_position - + stream->dec_cpylen), + (stream->dec_position - stream->dec_cpylen), + inst->size, + inst->addr); + }); + + if ((ret = xd3_decode_address (stream, + stream->dec_position, + inst->type - XD3_CPY, + & stream->addr_sect.buf, + stream->addr_sect.buf_max, + & inst->addr))) + { + return ret; + } + + /* Cannot copy an address before it is filled-in. */ + if (inst->addr >= stream->dec_position) + { + stream->msg = "address too large"; + return XD3_INVALID_INPUT; + } + + /* Check: a VCD_TARGET or VCD_SOURCE copy cannot exceed the remaining + * buffer space in its own segment. */ + if (inst->addr < stream->dec_cpylen && + inst->addr + inst->size > stream->dec_cpylen) + { + stream->msg = "size too large"; + return XD3_INVALID_INPUT; + } + } + else + { + IF_DEBUG2 ({ + if (inst->type == XD3_ADD) + { + static int cnt; + XPR(NT "DECODE:%d: ADD at %"Q"u (winoffset %u) size %u\n", + cnt++, + (stream->total_out + stream->dec_position - stream->dec_cpylen), + stream->dec_position - stream->dec_cpylen, + inst->size); + } + else + { + static int cnt; + XD3_ASSERT (inst->type == XD3_RUN); + XPR(NT "DECODE:%d: RUN at %"Q"u (winoffset %u) size %u\n", + cnt++, + stream->total_out + stream->dec_position - stream->dec_cpylen, + stream->dec_position - stream->dec_cpylen, + inst->size); + } + }); + } + + /* Check: The instruction will not overflow the output buffer. */ + if (stream->dec_position + inst->size > stream->dec_maxpos) + { + stream->msg = "size too large"; + return XD3_INVALID_INPUT; + } + + stream->dec_position += inst->size; + return 0; +} + +/* Decode a single opcode and then decode the two half-instructions. */ +static int +xd3_decode_instruction (xd3_stream *stream) +{ + int ret; + const xd3_dinst *inst; + + if (stream->inst_sect.buf == stream->inst_sect.buf_max) + { + stream->msg = "instruction underflow"; + return XD3_INVALID_INPUT; + } + + inst = &stream->code_table[*stream->inst_sect.buf++]; + + stream->dec_current1.type = inst->type1; + stream->dec_current2.type = inst->type2; + stream->dec_current1.size = inst->size1; + stream->dec_current2.size = inst->size2; + + /* For each instruction with a real operation, decode the + * corresponding size and addresses if necessary. Assume a + * code-table may have NOOP in either position, although this is + * unlikely. */ + if (inst->type1 != XD3_NOOP && + (ret = xd3_decode_parse_halfinst (stream, & stream->dec_current1))) + { + return ret; + } + if (inst->type2 != XD3_NOOP && + (ret = xd3_decode_parse_halfinst (stream, & stream->dec_current2))) + { + return ret; + } + return 0; +} + +/* Output the result of a single half-instruction. OPT: This the + decoder hotspot. Modifies "hinst", see below. */ +static int +xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst) +{ + /* This method is reentrant for copy instructions which may return + * XD3_GETSRCBLK to the caller. Each time through a copy takes the + * minimum of inst->size and the available space on whichever block + * supplies the data */ + usize_t take = inst->size; + + if (USIZE_T_OVERFLOW (stream->avail_out, take) || + stream->avail_out + take > stream->space_out) + { + stream->msg = "overflow while decoding"; + return XD3_INVALID_INPUT; + } + + XD3_ASSERT (inst->type != XD3_NOOP); + + switch (inst->type) + { + case XD3_RUN: + { + /* Only require a single data byte. */ + if (stream->data_sect.buf == stream->data_sect.buf_max) + { + stream->msg = "data underflow"; + return XD3_INVALID_INPUT; + } + + memset (stream->next_out + stream->avail_out, + stream->data_sect.buf[0], + take); + + stream->data_sect.buf += 1; + stream->avail_out += take; + inst->type = XD3_NOOP; + break; + } + case XD3_ADD: + { + /* Require at least TAKE data bytes. */ + if (stream->data_sect.buf + take > stream->data_sect.buf_max) + { + stream->msg = "data underflow"; + return XD3_INVALID_INPUT; + } + + memcpy (stream->next_out + stream->avail_out, + stream->data_sect.buf, + take); + + stream->data_sect.buf += take; + stream->avail_out += take; + inst->type = XD3_NOOP; + break; + } + default: + { + usize_t i; + const uint8_t *src; + uint8_t *dst; + int overlap; + + /* See if it copies from the VCD_TARGET/VCD_SOURCE window or + * the target window. Out-of-bounds checks for the addresses + * and sizes are performed in xd3_decode_parse_halfinst. This + * if/else must set "overlap", "src", and "dst". */ + if (inst->addr < stream->dec_cpylen) + { + /* In both branches we are copying from outside the + * current decoder window, the first (VCD_TARGET) is + * unimplemented. */ + overlap = 0; + + /* This branch sets "src". As a side-effect, we modify + * "inst" so that if we reenter this method after a + * XD3_GETSRCBLK response the state is correct. So if the + * instruction can be fulfilled by a contiguous block of + * memory then we will set: + * + * inst->type = XD3_NOOP; + * inst->size = 0; + */ + if (stream->dec_win_ind & VCD_TARGET) + { + /* TODO: Users have requested long-distance copies of + * similar material within a target (e.g., for dup + * supression in backups). This code path is probably + * dead due to XD3_UNIMPLEMENTED in xd3_decode_setup_buffers */ + inst->size = 0; + inst->type = XD3_NOOP; + stream->msg = "VCD_TARGET not implemented"; + return XD3_UNIMPLEMENTED; + } + else + { + /* In this case we have to read a source block, which + * could return control to the caller. We need to + * know the first block number needed for this + * copy. */ + xd3_source *source = stream->src; + xoff_t block = source->cpyoff_blocks; + usize_t blkoff = source->cpyoff_blkoff; + const usize_t blksize = source->blksize; + int ret; + + xd3_blksize_add (&block, &blkoff, source, inst->addr); + XD3_ASSERT (blkoff < blksize); + + if ((ret = xd3_getblk (stream, block))) + { + /* could be a XD3_GETSRCBLK failure. */ + if (ret == XD3_TOOFARBACK) + { + stream->msg = "non-seekable source in decode"; + ret = XD3_INTERNAL; + } + return ret; + } + + src = source->curblk + blkoff; + + /* This block is either full, or a partial block that + * must contain enough bytes. */ + if ((source->onblk != blksize) && + (blkoff + take > source->onblk)) + { + IF_DEBUG1 (XPR(NT "[srcfile] short at blkno %"Q"u onblk " + "%u blksize %u blkoff %u take %u\n", + block, + source->onblk, + blksize, + blkoff, + take)); + stream->msg = "source file too short"; + return XD3_INVALID_INPUT; + } + + XD3_ASSERT (blkoff != blksize); + + /* Check if we have enough data on this block to + * finish the instruction. */ + if (blkoff + take <= blksize) + { + inst->type = XD3_NOOP; + inst->size = 0; + } + else + { + take = blksize - blkoff; + inst->size -= take; + inst->addr += take; + + /* because (blkoff + take > blksize), above */ + XD3_ASSERT (inst->size != 0); + } + } + } + else + { + /* TODO: the memcpy/overlap optimization, etc. Overlap + * here could be more specific, it's whether (inst->addr - + * srclen) + inst->size > input_pos ? And is the system + * memcpy really any good? */ + overlap = 1; + + /* For a target-window copy, we know the entire range is + * in-memory. The dec_tgtaddrbase is negatively offset by + * dec_cpylen because the addresses start beyond that + * point. */ + src = stream->dec_tgtaddrbase + inst->addr; + inst->type = XD3_NOOP; + inst->size = 0; + } + + dst = stream->next_out + stream->avail_out; + + stream->avail_out += take; + + if (overlap) + { + /* Can't just memcpy here due to possible overlap. */ + for (i = take; i != 0; i -= 1) + { + *dst++ = *src++; + } + } + else + { + memcpy (dst, src, take); + } + } + } + + return 0; +} + +static int +xd3_decode_finish_window (xd3_stream *stream) +{ + stream->dec_winbytes = 0; + stream->dec_state = DEC_FINISH; + + stream->data_sect.pos = 0; + stream->inst_sect.pos = 0; + stream->addr_sect.pos = 0; + + return XD3_OUTPUT; +} + +static int +xd3_decode_secondary_sections (xd3_stream *secondary_stream) +{ +#if SECONDARY_ANY + int ret; +#define DECODE_SECONDARY_SECTION(UPPER,LOWER) \ + ((secondary_stream->dec_del_ind & VCD_ ## UPPER ## COMP) && \ + (ret = xd3_decode_secondary (secondary_stream, \ + & secondary_stream-> LOWER ## _sect, \ + & xd3_sec_ ## LOWER (secondary_stream)))) + + if (DECODE_SECONDARY_SECTION (DATA, data) || + DECODE_SECONDARY_SECTION (INST, inst) || + DECODE_SECONDARY_SECTION (ADDR, addr)) + { + return ret; + } +#undef DECODE_SECONDARY_SECTION +#endif + return 0; +} + +static int +xd3_decode_sections (xd3_stream *stream) +{ + usize_t need, more, take; + int copy, ret; + + if ((stream->flags & XD3_JUST_HDR) != 0) + { + /* Nothing left to do. */ + return xd3_decode_finish_window (stream); + } + + /* To avoid extra copying, allocate three sections at once (but + * check for overflow). */ + need = stream->inst_sect.size; + + if (USIZE_T_OVERFLOW (need, stream->addr_sect.size)) + { + stream->msg = "decoder section size overflow"; + return XD3_INTERNAL; + } + need += stream->addr_sect.size; + + if (USIZE_T_OVERFLOW (need, stream->data_sect.size)) + { + stream->msg = "decoder section size overflow"; + return XD3_INTERNAL; + } + need += stream->data_sect.size; + + /* The window may be entirely processed. */ + XD3_ASSERT (stream->dec_winbytes <= need); + + /* Compute how much more input is needed. */ + more = (need - stream->dec_winbytes); + + /* How much to consume. */ + take = xd3_min (more, stream->avail_in); + + /* See if the input is completely available, to avoid copy. */ + copy = (take != more); + + /* If the window is skipped... */ + if ((stream->flags & XD3_SKIP_WINDOW) != 0) + { + /* Skip the available input. */ + DECODE_INPUT (take); + + stream->dec_winbytes += take; + + if (copy) + { + stream->msg = "further input required"; + return XD3_INPUT; + } + + return xd3_decode_finish_window (stream); + } + + /* Process all but the DATA section. */ + switch (stream->dec_state) + { + default: + stream->msg = "internal error"; + return XD3_INVALID_INPUT; + + case DEC_DATA: + if ((ret = xd3_decode_section (stream, & stream->data_sect, + DEC_INST, copy))) { return ret; } + case DEC_INST: + if ((ret = xd3_decode_section (stream, & stream->inst_sect, + DEC_ADDR, copy))) { return ret; } + case DEC_ADDR: + if ((ret = xd3_decode_section (stream, & stream->addr_sect, + DEC_EMIT, copy))) { return ret; } + } + + XD3_ASSERT (stream->dec_winbytes == need); + + if ((ret = xd3_decode_secondary_sections (stream))) { return ret; } + + if (stream->flags & XD3_SKIP_EMIT) + { + return xd3_decode_finish_window (stream); + } + + /* OPT: A possible optimization is to avoid allocating memory in + * decode_setup_buffers and to avoid a large memcpy when the window + * consists of a single VCD_SOURCE copy instruction. */ + if ((ret = xd3_decode_setup_buffers (stream))) { return ret; } + + return 0; +} + +static int +xd3_decode_emit (xd3_stream *stream) +{ + int ret; + + /* Produce output: originally structured to allow reentrant code + * that fills as much of the output buffer as possible, but VCDIFF + * semantics allows to copy from anywhere from the target window, so + * instead allocate a sufficiently sized buffer after the target + * window length is decoded. + * + * This code still needs to be reentrant to allow XD3_GETSRCBLK to + * return control. This is handled by setting the + * stream->dec_currentN instruction types to XD3_NOOP after they + * have been processed. */ + XD3_ASSERT (! (stream->flags & XD3_SKIP_EMIT)); + XD3_ASSERT (stream->dec_tgtlen <= stream->space_out); + + while (stream->inst_sect.buf != stream->inst_sect.buf_max || + stream->dec_current1.type != XD3_NOOP || + stream->dec_current2.type != XD3_NOOP) + { + /* Decode next instruction pair. */ + if ((stream->dec_current1.type == XD3_NOOP) && + (stream->dec_current2.type == XD3_NOOP) && + (ret = xd3_decode_instruction (stream))) { return ret; } + + /* Output dec_current1 */ + while ((stream->dec_current1.type != XD3_NOOP)) + { + if ((ret = xd3_decode_output_halfinst (stream, & stream->dec_current1))) + { + return ret; + } + } + /* Output dec_current2 */ + while (stream->dec_current2.type != XD3_NOOP) + { + if ((ret = xd3_decode_output_halfinst (stream, & stream->dec_current2))) + { + return ret; + } + } + } + + if (stream->avail_out != stream->dec_tgtlen) + { + IF_DEBUG2 (DP(RINT "AVAIL_OUT(%d) != DEC_TGTLEN(%d)\n", + stream->avail_out, stream->dec_tgtlen)); + stream->msg = "wrong window length"; + return XD3_INVALID_INPUT; + } + + if (stream->data_sect.buf != stream->data_sect.buf_max) + { + stream->msg = "extra data section"; + return XD3_INVALID_INPUT; + } + + if (stream->addr_sect.buf != stream->addr_sect.buf_max) + { + stream->msg = "extra address section"; + return XD3_INVALID_INPUT; + } + + /* OPT: Should cksum computation be combined with the above loop? */ + if ((stream->dec_win_ind & VCD_ADLER32) != 0 && + (stream->flags & XD3_ADLER32_NOVER) == 0) + { + uint32_t a32 = adler32 (1L, stream->next_out, stream->avail_out); + + if (a32 != stream->dec_adler32) + { + stream->msg = "target window checksum mismatch"; + return XD3_INVALID_INPUT; + } + } + + /* Finished with a window. */ + return xd3_decode_finish_window (stream); +} + +int +xd3_decode_input (xd3_stream *stream) +{ + int ret; + + if (stream->enc_state != 0) + { + stream->msg = "encoder/decoder transition"; + return XD3_INVALID_INPUT; + } + +#define BYTE_CASE(expr,x,nstate) \ + do { \ + if ( (expr) && \ + ((ret = xd3_decode_byte (stream, & (x))) != 0) ) { return ret; } \ + stream->dec_state = (nstate); \ + } while (0) + +#define OFFSET_CASE(expr,x,nstate) \ + do { \ + if ( (expr) && \ + ((ret = xd3_decode_offset (stream, & (x))) != 0) ) { return ret; } \ + stream->dec_state = (nstate); \ + } while (0) + +#define SIZE_CASE(expr,x,nstate) \ + do { \ + if ( (expr) && \ + ((ret = xd3_decode_size (stream, & (x))) != 0) ) { return ret; } \ + stream->dec_state = (nstate); \ + } while (0) + + switch (stream->dec_state) + { + case DEC_VCHEAD: + { + if ((ret = xd3_decode_bytes (stream, stream->dec_magic, + & stream->dec_magicbytes, 4))) + { + return ret; + } + + if (stream->dec_magic[0] != VCDIFF_MAGIC1 || + stream->dec_magic[1] != VCDIFF_MAGIC2 || + stream->dec_magic[2] != VCDIFF_MAGIC3) + { + stream->msg = "not a VCDIFF input"; + return XD3_INVALID_INPUT; + } + + if (stream->dec_magic[3] != 0) + { + stream->msg = "VCDIFF input version > 0 is not supported"; + return XD3_INVALID_INPUT; + } + + stream->dec_state = DEC_HDRIND; + } + case DEC_HDRIND: + { + if ((ret = xd3_decode_byte (stream, & stream->dec_hdr_ind))) + { + return ret; + } + + if ((stream->dec_hdr_ind & VCD_INVHDR) != 0) + { + stream->msg = "unrecognized header indicator bits set"; + return XD3_INVALID_INPUT; + } + + stream->dec_state = DEC_SECONDID; + } + + case DEC_SECONDID: + /* Secondary compressor ID: only if VCD_SECONDARY is set */ + if ((stream->dec_hdr_ind & VCD_SECONDARY) != 0) + { + BYTE_CASE (1, stream->dec_secondid, DEC_TABLEN); + + switch (stream->dec_secondid) + { + case VCD_FGK_ID: + FGK_CASE (stream); + case VCD_DJW_ID: + DJW_CASE (stream); + case VCD_LZMA_ID: + LZMA_CASE (stream); + default: + stream->msg = "unknown secondary compressor ID"; + return XD3_INVALID_INPUT; + } + } + + case DEC_TABLEN: + /* Length of code table data: only if VCD_CODETABLE is set */ + SIZE_CASE ((stream->dec_hdr_ind & VCD_CODETABLE) != 0, + stream->dec_codetblsz, DEC_NEAR); + + /* The codetblsz counts the two NEAR/SAME bytes */ + if ((stream->dec_hdr_ind & VCD_CODETABLE) != 0) { + if (stream->dec_codetblsz <= 2) { + stream->msg = "invalid code table size"; + return ENOMEM; + } + stream->dec_codetblsz -= 2; + } + case DEC_NEAR: + /* Near modes: only if VCD_CODETABLE is set */ + BYTE_CASE((stream->dec_hdr_ind & VCD_CODETABLE) != 0, + stream->acache.s_near, DEC_SAME); + case DEC_SAME: + /* Same modes: only if VCD_CODETABLE is set */ + BYTE_CASE((stream->dec_hdr_ind & VCD_CODETABLE) != 0, + stream->acache.s_same, DEC_TABDAT); + case DEC_TABDAT: + /* Compressed code table data */ + + if ((stream->dec_hdr_ind & VCD_CODETABLE) != 0) + { + stream->msg = "VCD_CODETABLE support was removed"; + return XD3_UNIMPLEMENTED; + } + else + { + /* Use the default table. */ + stream->acache.s_near = __rfc3284_code_table_desc.near_modes; + stream->acache.s_same = __rfc3284_code_table_desc.same_modes; + stream->code_table = xd3_rfc3284_code_table (); + } + + if ((ret = xd3_alloc_cache (stream))) { return ret; } + + stream->dec_state = DEC_APPLEN; + + case DEC_APPLEN: + /* Length of application data */ + SIZE_CASE((stream->dec_hdr_ind & VCD_APPHEADER) != 0, + stream->dec_appheadsz, DEC_APPDAT); + + case DEC_APPDAT: + /* Application data */ + if (stream->dec_hdr_ind & VCD_APPHEADER) + { + /* Note: we add an additional byte for padding, to allow + 0-termination. Check for overflow: */ + if (USIZE_T_OVERFLOW(stream->dec_appheadsz, 1)) + { + stream->msg = "exceptional appheader size"; + return XD3_INVALID_INPUT; + } + + if ((stream->dec_appheader == NULL) && + (stream->dec_appheader = + (uint8_t*) xd3_alloc (stream, + stream->dec_appheadsz+1, 1)) == NULL) + { + return ENOMEM; + } + + stream->dec_appheader[stream->dec_appheadsz] = 0; + + if ((ret = xd3_decode_bytes (stream, stream->dec_appheader, + & stream->dec_appheadbytes, + stream->dec_appheadsz))) + { + return ret; + } + } + + /* xoff_t -> usize_t is safe because this is the first block. */ + stream->dec_hdrsize = (usize_t) stream->total_in; + stream->dec_state = DEC_WININD; + + case DEC_WININD: + { + /* Start of a window: the window indicator */ + if ((ret = xd3_decode_byte (stream, & stream->dec_win_ind))) + { + return ret; + } + + stream->current_window = stream->dec_window_count; + + if (XOFF_T_OVERFLOW (stream->dec_winstart, stream->dec_tgtlen)) + { + stream->msg = "decoder file offset overflow"; + return XD3_INVALID_INPUT; + } + + stream->dec_winstart += stream->dec_tgtlen; + + if ((stream->dec_win_ind & VCD_INVWIN) != 0) + { + stream->msg = "unrecognized window indicator bits set"; + return XD3_INVALID_INPUT; + } + + if ((ret = xd3_decode_init_window (stream))) { return ret; } + + stream->dec_state = DEC_CPYLEN; + + IF_DEBUG2 (DP(RINT "--------- TARGET WINDOW %"Q"u -----------\n", + stream->current_window)); + } + + case DEC_CPYLEN: + /* Copy window length: only if VCD_SOURCE or VCD_TARGET is set */ + SIZE_CASE(SRCORTGT (stream->dec_win_ind), stream->dec_cpylen, + DEC_CPYOFF); + + /* Set the initial, logical decoder position (HERE address) in + * dec_position. This is set to just after the source/copy + * window, as we are just about to output the first byte of + * target window. */ + stream->dec_position = stream->dec_cpylen; + + case DEC_CPYOFF: + /* Copy window offset: only if VCD_SOURCE or VCD_TARGET is set */ + + OFFSET_CASE(SRCORTGT (stream->dec_win_ind), stream->dec_cpyoff, + DEC_ENCLEN); + + /* Copy offset and copy length may not overflow. */ + if (XOFF_T_OVERFLOW (stream->dec_cpyoff, stream->dec_cpylen)) + { + stream->msg = "decoder copy window overflows a file offset"; + return XD3_INVALID_INPUT; + } + + /* Check copy window bounds: VCD_TARGET window may not exceed + current position. */ + if ((stream->dec_win_ind & VCD_TARGET) && + (stream->dec_cpyoff + (xoff_t) stream->dec_cpylen > + stream->dec_winstart)) + { + stream->msg = "VCD_TARGET window out of bounds"; + return XD3_INVALID_INPUT; + } + + case DEC_ENCLEN: + /* Length of the delta encoding */ + SIZE_CASE(1, stream->dec_enclen, DEC_TGTLEN); + case DEC_TGTLEN: + /* Length of target window */ + SIZE_CASE(1, stream->dec_tgtlen, DEC_DELIND); + + /* Set the maximum decoder position, beyond which we should not + * decode any data. This is the maximum value for dec_position. + * This may not exceed the size of a usize_t. */ + if (USIZE_T_OVERFLOW (stream->dec_cpylen, stream->dec_tgtlen)) + { + stream->msg = "decoder target window overflows a usize_t"; + return XD3_INVALID_INPUT; + } + + /* Check for malicious files. */ + if (stream->dec_tgtlen > XD3_HARDMAXWINSIZE) + { + stream->msg = "hard window size exceeded"; + return XD3_INVALID_INPUT; + } + + stream->dec_maxpos = stream->dec_cpylen + stream->dec_tgtlen; + + case DEC_DELIND: + /* Delta indicator */ + BYTE_CASE(1, stream->dec_del_ind, DEC_DATALEN); + + if ((stream->dec_del_ind & VCD_INVDEL) != 0) + { + stream->msg = "unrecognized delta indicator bits set"; + return XD3_INVALID_INPUT; + } + + /* Delta indicator is only used with secondary compression. */ + if ((stream->dec_del_ind != 0) && (stream->sec_type == NULL)) + { + stream->msg = "invalid delta indicator bits set"; + return XD3_INVALID_INPUT; + } + + /* Section lengths */ + case DEC_DATALEN: + SIZE_CASE(1, stream->data_sect.size, DEC_INSTLEN); + case DEC_INSTLEN: + SIZE_CASE(1, stream->inst_sect.size, DEC_ADDRLEN); + case DEC_ADDRLEN: + SIZE_CASE(1, stream->addr_sect.size, DEC_CKSUM); + + case DEC_CKSUM: + /* Window checksum. */ + if ((stream->dec_win_ind & VCD_ADLER32) != 0) + { + int i; + + if ((ret = xd3_decode_bytes (stream, stream->dec_cksum, + & stream->dec_cksumbytes, 4))) + { + return ret; + } + + for (i = 0; i < 4; i += 1) + { + stream->dec_adler32 = + (stream->dec_adler32 << 8) | stream->dec_cksum[i]; + } + } + + stream->dec_state = DEC_DATA; + + /* Check dec_enclen for redundency, otherwise it is not really used. */ + { + usize_t enclen_check = + (1 + (xd3_sizeof_size (stream->dec_tgtlen) + + xd3_sizeof_size (stream->data_sect.size) + + xd3_sizeof_size (stream->inst_sect.size) + + xd3_sizeof_size (stream->addr_sect.size)) + + stream->data_sect.size + + stream->inst_sect.size + + stream->addr_sect.size + + ((stream->dec_win_ind & VCD_ADLER32) ? 4 : 0)); + + if (stream->dec_enclen != enclen_check) + { + stream->msg = "incorrect encoding length (redundent)"; + return XD3_INVALID_INPUT; + } + } + + /* Returning here gives the application a chance to inspect the + * header, skip the window, etc. */ + if (stream->current_window == 0) { return XD3_GOTHEADER; } + else { return XD3_WINSTART; } + + case DEC_DATA: + case DEC_INST: + case DEC_ADDR: + /* Next read the three sections. */ + if ((ret = xd3_decode_sections (stream))) { return ret; } + + case DEC_EMIT: + + /* To speed VCD_SOURCE block-address calculations, the source + * cpyoff_blocks and cpyoff_blkoff are pre-computed. */ + if (stream->dec_win_ind & VCD_SOURCE) + { + xd3_source *src = stream->src; + + if (src == NULL) + { + stream->msg = "source input required"; + return XD3_INVALID_INPUT; + } + + xd3_blksize_div(stream->dec_cpyoff, src, + &src->cpyoff_blocks, + &src->cpyoff_blkoff); + + IF_DEBUG2(DP(RINT + "[decode_cpyoff] %"Q"u " + "cpyblkno %"Q"u " + "cpyblkoff %u " + "blksize %u\n", + stream->dec_cpyoff, + src->cpyoff_blocks, + src->cpyoff_blkoff, + src->blksize)); + } + + /* xd3_decode_emit returns XD3_OUTPUT on every success. */ + if ((ret = xd3_decode_emit (stream)) == XD3_OUTPUT) + { + stream->total_out += (xoff_t) stream->avail_out; + } + + return ret; + + case DEC_FINISH: + { + if (stream->dec_win_ind & VCD_TARGET) + { + if (stream->dec_lastwin == NULL) + { + stream->dec_lastwin = stream->next_out; + stream->dec_lastspace = stream->space_out; + } + else + { + xd3_swap_uint8p (& stream->dec_lastwin, + & stream->next_out); + xd3_swap_usize_t (& stream->dec_lastspace, + & stream->space_out); + } + } + + stream->dec_lastlen = stream->dec_tgtlen; + stream->dec_laststart = stream->dec_winstart; + stream->dec_window_count += 1; + + /* Note: the updates to dec_winstart & current_window are + * deferred until after the next DEC_WININD byte is read. */ + stream->dec_state = DEC_WININD; + return XD3_WINFINISH; + } + + default: + stream->msg = "invalid state"; + return XD3_INVALID_INPUT; + } +} + +#endif // _XDELTA3_DECODE_H_ diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3-hash.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-hash.h new file mode 100644 index 000000000..a20017a31 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-hash.h @@ -0,0 +1,167 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ +#ifndef _XDELTA3_HASH_H_ +#define _XDELTA3_HASH_H_ + +#if XD3_DEBUG +#define SMALL_HASH_DEBUG1(s,inp) \ + uint32_t debug_state; \ + uint32_t debug_hval = xd3_checksum_hash (& (s)->small_hash, \ + xd3_scksum (&debug_state, (inp), (s)->smatcher.small_look)) +#define SMALL_HASH_DEBUG2(s,inp) \ + XD3_ASSERT (debug_hval == xd3_checksum_hash (& (s)->small_hash, \ + xd3_scksum (&debug_state, (inp), (s)->smatcher.small_look))) +#else +#define SMALL_HASH_DEBUG1(s,inp) +#define SMALL_HASH_DEBUG2(s,inp) +#endif /* XD3_DEBUG */ + +/* This is a good hash multiplier for 32-bit LCGs: see "linear + * congruential generators of different sizes and good lattice + * structure" */ +static const uint32_t hash_multiplier = 1597334677U; + +/*********************************************************************** + Permute stuff + ***********************************************************************/ + +#if HASH_PERMUTE == 0 +#define PERMUTE(x) (x) +#else +#define PERMUTE(x) (__single_hash[(uint32_t)x]) + +extern const uint16_t __single_hash[256]; +#endif + +/* Update the checksum state. */ +#if ADLER_LARGE_CKSUM +inline uint32_t +xd3_large_cksum_update (uint32_t cksum, + const uint8_t *base, + usize_t look) { + uint32_t old_c = PERMUTE(base[0]); + uint32_t new_c = PERMUTE(base[look]); + uint32_t low = ((cksum & 0xffff) - old_c + new_c) & 0xffff; + uint32_t high = ((cksum >> 16) - (old_c * look) + low) & 0xffff; + return (high << 16) | low; +} +#else +/* TODO: revisit this topic */ +#endif + +#if UNALIGNED_OK +#define UNALIGNED_READ32(dest,src) (*(dest)) = (*(uint32_t*)(src)) +#else +#define UNALIGNED_READ32(dest,src) memcpy((dest), (src), 4); +#endif + +/* TODO: small cksum is hard-coded for 4 bytes (i.e., "look" is unused) */ +static inline uint32_t +xd3_scksum (uint32_t *state, + const uint8_t *base, + const usize_t look) +{ + UNALIGNED_READ32(state, base); + return (*state) * hash_multiplier; +} +static inline uint32_t +xd3_small_cksum_update (uint32_t *state, + const uint8_t *base, + usize_t look) +{ + UNALIGNED_READ32(state, base+1); + return (*state) * hash_multiplier; +} + +/*********************************************************************** + Ctable stuff + ***********************************************************************/ + +static inline usize_t +xd3_checksum_hash (const xd3_hash_cfg *cfg, const usize_t cksum) +{ + return (cksum >> cfg->shift) ^ (cksum & cfg->mask); +} + +/*********************************************************************** + Cksum function + ***********************************************************************/ + +#if ADLER_LARGE_CKSUM +static inline uint32_t +xd3_lcksum (const uint8_t *seg, const usize_t ln) +{ + usize_t i = 0; + uint32_t low = 0; + uint32_t high = 0; + + for (; i < ln; i += 1) + { + low += PERMUTE(*seg++); + high += low; + } + + return ((high & 0xffff) << 16) | (low & 0xffff); +} +#else +static inline uint32_t +xd3_lcksum (const uint8_t *seg, const usize_t ln) +{ + usize_t i, j; + uint32_t h = 0; + for (i = 0, j = ln - 1; i < ln; ++i, --j) { + h += PERMUTE(seg[i]) * hash_multiplier_powers[j]; + } + return h; +} +#endif + +#if XD3_ENCODER +static usize_t +xd3_size_log2 (usize_t slots) +{ + int bits = 28; /* This should not be an unreasonable limit. */ + int i; + + for (i = 3; i <= bits; i += 1) + { + if (slots < (1U << i)) + { + /* TODO: this is compaction=1 in checksum_test.cc and maybe should + * not be fixed at -1. */ + bits = i - 1; + break; + } + } + + return bits; +} + +static void +xd3_size_hashtable (xd3_stream *stream, + usize_t slots, + xd3_hash_cfg *cfg) +{ + int bits = xd3_size_log2 (slots); + + /* TODO: there's a 32-bit assumption here */ + cfg->size = (1 << bits); + cfg->mask = (cfg->size - 1); + cfg->shift = 32 - bits; +} +#endif + +#endif diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3-internal.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-internal.h new file mode 100644 index 000000000..661ce4155 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-internal.h @@ -0,0 +1,370 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ +#ifndef XDELTA3_INTERNAL_H__ +#define XDELTA3_INTERNAL_H__ + +#include "xdelta3.h" + +typedef struct _main_file main_file; +typedef struct _main_extcomp main_extcomp; + +void main_buffree (void *ptr); +void* main_bufalloc (size_t size); +void main_file_init (main_file *xfile); +int main_file_close (main_file *xfile); +void main_file_cleanup (main_file *xfile); +int main_file_isopen (main_file *xfile); +int main_file_open (main_file *xfile, const char* name, int mode); +int main_file_exists (main_file *xfile); +int xd3_whole_append_window (xd3_stream *stream); +int xd3_main_cmdline (int argc, char **argv); +int main_file_read (main_file *ifile, + uint8_t *buf, + size_t size, + size_t *nread, + const char *msg); +int main_file_write (main_file *ofile, uint8_t *buf, + usize_t size, const char *msg); +int test_compare_files (const char* f0, const char* f1); +usize_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno); +xoff_t xd3_source_eof(const xd3_source *src); +uint32_t xd3_large_cksum_update (uint32_t cksum, + const uint8_t *base, + usize_t look); +int xd3_emit_byte (xd3_stream *stream, + xd3_output **outputp, + uint8_t code); + +int xd3_emit_bytes (xd3_stream *stream, + xd3_output **outputp, + const uint8_t *base, + usize_t size); +xd3_output* xd3_alloc_output (xd3_stream *stream, + xd3_output *old_output); + +int xd3_encode_init_full (xd3_stream *stream); +size_t xd3_pow2_roundup (size_t x); +int xd3_process_stream (int is_encode, + xd3_stream *stream, + int (*func) (xd3_stream *), + int close_stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max); + +#if PYTHON_MODULE || SWIG_MODULE || NOT_MAIN +int xd3_main_cmdline (int argc, char **argv); +#endif + +/* main_file->mode values */ +typedef enum +{ + XO_READ = 0, + XO_WRITE = 1 +} main_file_modes; + +#ifndef XD3_POSIX +#define XD3_POSIX 0 +#endif +#ifndef XD3_STDIO +#define XD3_STDIO 0 +#endif +#ifndef XD3_WIN32 +#define XD3_WIN32 0 +#endif +#ifndef NOT_MAIN +#define NOT_MAIN 0 +#endif + +/* If none are set, default to posix. */ +#if (XD3_POSIX + XD3_STDIO + XD3_WIN32) == 0 +#undef XD3_POSIX +#define XD3_POSIX 1 +#endif + +struct _main_file +{ +#if XD3_WIN32 + HANDLE file; +#elif XD3_STDIO + FILE *file; +#elif XD3_POSIX + int file; +#endif + + int mode; /* XO_READ and XO_WRITE */ + const char *filename; /* File name or /dev/stdin, + * /dev/stdout, /dev/stderr. */ + char *filename_copy; /* File name or /dev/stdin, + * /dev/stdout, /dev/stderr. */ + const char *realname; /* File name or /dev/stdin, + * /dev/stdout, /dev/stderr. */ + const main_extcomp *compressor; /* External compression struct. */ + int flags; /* RD_FIRST, RD_NONEXTERNAL, ... */ + xoff_t nread; /* for input position */ + xoff_t nwrite; /* for output position */ + uint8_t *snprintf_buf; /* internal snprintf() use */ + int size_known; /* Set by main_set_souze */ + xoff_t source_position; /* for avoiding seek in getblk_func */ + int seek_failed; /* after seek fails once, try FIFO */ +}; + +#ifdef _WIN32 +#define vsnprintf_func _vsnprintf +#define snprintf_func _snprintf +#else +#define vsnprintf_func vsnprintf +#define snprintf_func snprintf +#endif +#define short_sprintf(sb,fmt,...) \ + snprintf_func((sb).buf,sizeof((sb).buf),fmt,__VA_ARGS__) + +/* Type used for short snprintf calls. */ +typedef struct { + char buf[48]; +} shortbuf; + +/* Prior to SVN 303 this function was only defined in DJGPP and WIN32 + * environments and other platforms would use the builtin snprintf() + * with an arrangement of macros below. In OS X 10.6, Apply made + * snprintf() a macro, which defeated those macros (since snprintf + * would be evaluated before its argument macros were expanded, + * therefore always define xsnprintf_func. */ +#undef PRINTF_ATTRIBUTE +#ifdef __GNUC__ +/* Let's just assume no one uses gcc 2.x! */ +#define PRINTF_ATTRIBUTE(x,y) __attribute__ ((__format__ (__printf__, x, y))) +#else +#define PRINTF_ATTRIBUTE(x,y) +#endif + +/* Underlying xprintf() */ +int xsnprintf_func (char *str, int n, const char *fmt, ...) + PRINTF_ATTRIBUTE(3,4); + +/* XPR(NT "", ...) (used by main) prefixes an "xdelta3: " to the output. */ +void xprintf(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2); +#define XPR xprintf +#define NT "xdelta3: " +#define NTR "" + +#ifndef UINT32_MAX +#define UINT32_MAX 4294967295U +#endif + +#ifndef UINT64_MAX +#define UINT64_MAX 18446744073709551615ULL +#endif + +#define UINT32_OFLOW_MASK 0xfe000000U +#define UINT64_OFLOW_MASK 0xfe00000000000000ULL + +/********************************************************************* + Integer encoder/decoder functions + **********************************************************************/ + +/* Consume N bytes of input, only used by the decoder. */ +#define DECODE_INPUT(n) \ + do { \ + stream->total_in += (xoff_t) (n); \ + stream->avail_in -= (n); \ + stream->next_in += (n); \ + } while (0) + +#define DECODE_INTEGER_TYPE(PART,OFLOW) \ + while (stream->avail_in != 0) \ + { \ + usize_t next = stream->next_in[0]; \ + \ + DECODE_INPUT(1); \ + \ + if (PART & OFLOW) \ + { \ + stream->msg = "overflow in decode_integer"; \ + return XD3_INVALID_INPUT; \ + } \ + \ + PART = (PART << 7) | (next & 127); \ + \ + if ((next & 128) == 0) \ + { \ + (*val) = PART; \ + PART = 0; \ + return 0; \ + } \ + } \ + \ + stream->msg = "further input required"; \ + return XD3_INPUT + +#define READ_INTEGER_TYPE(TYPE, OFLOW) \ + TYPE val = 0; \ + const uint8_t *inp = (*inpp); \ + usize_t next; \ + \ + do \ + { \ + if (inp == maxp) \ + { \ + stream->msg = "end-of-input in read_integer"; \ + return XD3_INVALID_INPUT; \ + } \ + \ + if (val & OFLOW) \ + { \ + stream->msg = "overflow in read_intger"; \ + return XD3_INVALID_INPUT; \ + } \ + \ + next = (*inp++); \ + val = (val << 7) | (next & 127); \ + } \ + while (next & 128); \ + \ + (*valp) = val; \ + (*inpp) = inp; \ + \ + return 0 + +#define EMIT_INTEGER_TYPE() \ + /* max 64-bit value in base-7 encoding is 9.1 bytes */ \ + uint8_t buf[10]; \ + usize_t bufi = 10; \ + \ + /* This loop performs division and turns on all MSBs. */ \ + do \ + { \ + buf[--bufi] = (num & 127) | 128; \ + num >>= 7U; \ + } \ + while (num != 0); \ + \ + /* Turn off MSB of the last byte. */ \ + buf[9] &= 127; \ + \ + return xd3_emit_bytes (stream, output, buf + bufi, 10 - bufi) + +#define IF_SIZEOF32(x) if (num < (1U << (7 * (x)))) return (x); +#define IF_SIZEOF64(x) if (num < (1ULL << (7 * (x)))) return (x); + +#if USE_UINT32 +static inline uint32_t +xd3_sizeof_uint32_t (uint32_t num) +{ + IF_SIZEOF32(1); + IF_SIZEOF32(2); + IF_SIZEOF32(3); + IF_SIZEOF32(4); + return 5; +} + +static inline int +xd3_decode_uint32_t (xd3_stream *stream, uint32_t *val) +{ DECODE_INTEGER_TYPE (stream->dec_32part, UINT32_OFLOW_MASK); } + +static inline int +xd3_read_uint32_t (xd3_stream *stream, const uint8_t **inpp, + const uint8_t *maxp, uint32_t *valp) +{ READ_INTEGER_TYPE (uint32_t, UINT32_OFLOW_MASK); } + +#if XD3_ENCODER +static inline int +xd3_emit_uint32_t (xd3_stream *stream, xd3_output **output, uint32_t num) +{ EMIT_INTEGER_TYPE (); } +#endif +#endif + +#if USE_UINT64 +static inline int +xd3_decode_uint64_t (xd3_stream *stream, uint64_t *val) +{ DECODE_INTEGER_TYPE (stream->dec_64part, UINT64_OFLOW_MASK); } + +#if XD3_ENCODER +static inline int +xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) +{ EMIT_INTEGER_TYPE (); } +#endif + +/* These are tested but not used */ +#if REGRESSION_TEST +static int +xd3_read_uint64_t (xd3_stream *stream, const uint8_t **inpp, + const uint8_t *maxp, uint64_t *valp) +{ READ_INTEGER_TYPE (uint64_t, UINT64_OFLOW_MASK); } + +static uint32_t +xd3_sizeof_uint64_t (uint64_t num) +{ + IF_SIZEOF64(1); + IF_SIZEOF64(2); + IF_SIZEOF64(3); + IF_SIZEOF64(4); + IF_SIZEOF64(5); + IF_SIZEOF64(6); + IF_SIZEOF64(7); + IF_SIZEOF64(8); + IF_SIZEOF64(9); + + return 10; +} +#endif + +#endif + +#if SIZEOF_USIZE_T == 4 +#define USIZE_T_MAX UINT32_MAX +#define USIZE_T_MAXBLKSZ 0x80000000U +#define xd3_decode_size xd3_decode_uint32_t +#define xd3_emit_size xd3_emit_uint32_t +#define xd3_sizeof_size xd3_sizeof_uint32_t +#define xd3_read_size xd3_read_uint32_t +#elif SIZEOF_USIZE_T == 8 +#define USIZE_T_MAX UINT64_MAX +#define USIZE_T_MAXBLKSZ 0x8000000000000000ULL +#define xd3_decode_size xd3_decode_uint64_t +#define xd3_emit_size xd3_emit_uint64_t +#define xd3_sizeof_size xd3_sizeof_uint64_t +#define xd3_read_size xd3_read_uint64_t +#endif + +#if SIZEOF_XOFF_T == 4 +#define XOFF_T_MAX UINT32_MAX +#define xd3_emit_offset xd3_emit_uint32_t +static inline int +xd3_decode_offset (xd3_stream *stream, xoff_t *val) +{ + return xd3_decode_uint32_t (stream, (uint32_t*) val); +} +#elif SIZEOF_XOFF_T == 8 +#define XOFF_T_MAX UINT64_MAX +#define xd3_emit_offset xd3_emit_uint64_t +static inline int +xd3_decode_offset (xd3_stream *stream, xoff_t *val) +{ + return xd3_decode_uint64_t (stream, (uint64_t*) val); +} +#endif + +#define USIZE_T_OVERFLOW(a,b) ((USIZE_T_MAX - (usize_t) (a)) < (usize_t) (b)) +#define XOFF_T_OVERFLOW(a,b) ((XOFF_T_MAX - (xoff_t) (a)) < (xoff_t) (b)) + +#define MAX_LRU_SIZE 32U +#define XD3_MINSRCWINSZ (XD3_ALLOCSIZE * MAX_LRU_SIZE) +#define XD3_MAXSRCWINSZ (1ULL << 31) + +#endif // XDELTA3_INTERNAL_H__ diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3-list.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-list.h new file mode 100644 index 000000000..23c925eaa --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3-list.h @@ -0,0 +1,127 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ +#ifndef __XDELTA3_LIST__ +#define __XDELTA3_LIST__ + +#define XD3_MAKELIST(LTYPE,ETYPE,LNAME) \ + \ +static inline ETYPE* \ +LTYPE ## _entry (LTYPE* l) \ +{ \ + return (ETYPE*) ((char*) l - (ptrdiff_t) &((ETYPE*) 0)->LNAME); \ +} \ + \ +static inline void \ +LTYPE ## _init (LTYPE *l) \ +{ \ + l->next = l; \ + l->prev = l; \ +} \ + \ +static inline void \ +LTYPE ## _add (LTYPE *prev, LTYPE *next, LTYPE *ins) \ +{ \ + next->prev = ins; \ + prev->next = ins; \ + ins->next = next; \ + ins->prev = prev; \ +} \ + \ +static inline void \ +LTYPE ## _push_back (LTYPE *l, ETYPE *i) \ +{ \ + LTYPE ## _add (l->prev, l, & i->LNAME); \ +} \ + \ +static inline void \ +LTYPE ## _del (LTYPE *next, \ + LTYPE *prev) \ +{ \ + next->prev = prev; \ + prev->next = next; \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _remove (ETYPE *f) \ +{ \ + LTYPE *i = f->LNAME.next; \ + LTYPE ## _del (f->LNAME.next, f->LNAME.prev); \ + return LTYPE ## _entry (i); \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _pop_back (LTYPE *l) \ +{ \ + LTYPE *i = l->prev; \ + LTYPE ## _del (i->next, i->prev); \ + return LTYPE ## _entry (i); \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _pop_front (LTYPE *l) \ +{ \ + LTYPE *i = l->next; \ + LTYPE ## _del (i->next, i->prev); \ + return LTYPE ## _entry (i); \ +} \ + \ +static inline int \ +LTYPE ## _empty (LTYPE *l) \ +{ \ + return l == l->next; \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _front (LTYPE *f) \ +{ \ + return LTYPE ## _entry (f->next); \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _back (LTYPE *f) \ +{ \ + return LTYPE ## _entry (f->prev); \ +} \ + \ +static inline int \ +LTYPE ## _end (LTYPE *f, ETYPE *i) \ +{ \ + return f == & i->LNAME; \ +} \ + \ +static inline ETYPE* \ +LTYPE ## _next (ETYPE *f) \ +{ \ + return LTYPE ## _entry (f->LNAME.next); \ +} \ + \ +static inline usize_t \ +LTYPE ## _length (LTYPE *l) \ +{ \ + LTYPE *p; \ + int c = 0; \ + \ + for (p = l->next; p != l; p = p->next) \ + { \ + c += 1; \ + } \ + \ + return c; \ +} \ + \ +typedef int unused_ ## LTYPE + +#endif diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3.c b/app/src/main/rust/stores/vendor/xdelta3/xdelta3.c new file mode 100644 index 000000000..ce4dadae7 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3.c @@ -0,0 +1,4835 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + ------------------------------------------------------------------- + + Xdelta 3 + + The goal of this library is to to implement both the (stand-alone) + data-compression and delta-compression aspects of VCDIFF encoding, and + to support a programming interface that works like Zlib + (http://www.gzip.org/zlib.html). See RFC3284: The VCDIFF Generic + Differencing and Compression Data Format. + + VCDIFF is a unified encoding that combines data-compression and + delta-encoding ("differencing"). + + VCDIFF has a detailed byte-code instruction set with many features. + The instruction format supports an immediate size operand for small + COPYs and ADDs (e.g., under 18 bytes). There are also instruction + "modes", which are used to compress COPY addresses by using two + address caches. An instruction mode refers to slots in the NEAR + and SAME caches for recent addresses. NEAR remembers the + previous 4 (by default) COPY addresses, and SAME catches + frequent re-uses of the same address using a 3-way (by default) + 256-entry associative cache of [ADDR mod 256], the encoded byte. + A hit in the NEAR/SAME cache requires 0/1 ADDR bytes. + + VCDIFF has a default instruction table, but an alternate + instruction tables may themselves be be delta-compressed and + included in the encoding header. This allows even more freedom. + There are 9 instruction modes in the default code table, 4 near, 3 + same, VCD_SELF (absolute encoding) and VCD_HERE (relative to the + current position). + + ---------------------------------------------------------------------- + + Algorithms + + Aside from the details of encoding and decoding, there are a bunch + of algorithms needed. + + 1. STRING-MATCH. A two-level fingerprinting approach is used. A + single loop computes the two checksums -- small and large -- at + successive offsets in the TARGET file. The large checksum is more + accurate and is used to discover SOURCE matches, which are + potentially very long. The small checksum is used to discover + copies within the TARGET. Small matching, which is more expensive, + usually dominates the large STRING-MATCH costs in this code - the + more exhaustive the search, the better the results. Either of the + two string-matching mechanisms may be disabled. + + 2. INSTRUCTION SELECTION. The IOPT buffer here represents a queue + used to store overlapping copy instructions. There are two possible + optimizations that go beyond a greedy search. Both of these fall + into the category of "non-greedy matching" optimizations. + + The first optimization stems from backward SOURCE-COPY matching. + When a new SOURCE-COPY instruction covers a previous instruction in + the target completely, it is erased from the queue. Randal Burns + originally analyzed these algorithms and did a lot of related work + (\cite the 1.5-pass algorithm). + + The second optimization comes by the encoding of common very-small + COPY and ADD instructions, for which there are special DOUBLE-code + instructions, which code two instructions in a single byte. + + The cost of bad instruction-selection overhead is relatively high + for data-compression, relative to delta-compression, so this second + optimization is fairly important. With "lazy" matching (the name + used in Zlib for a similar optimization), the string-match + algorithm searches after a match for potential overlapping copy + instructions. In Xdelta and by default, VCDIFF, the minimum match + size is 4 bytes, whereas Zlib searches with a 3-byte minimum. This + feature, combined with double instructions, provides a nice + challenge. Search in this file for "black magic", a heuristic. + + 3. STREAM ALIGNMENT. Stream alignment is needed to compress large + inputs in constant space. See xd3_srcwin_move_point(). + + 4. WINDOW SELECTION. When the IOPT buffer flushes, in the first call + to xd3_iopt_finish_encoding containing any kind of copy instruction, + the parameters of the source window must be decided: the offset into + the source and the length of the window. Since the IOPT buffer is + finite, the program may be forced to fix these values before knowing + the best offset/length. + + 5. SECONDARY COMPRESSION. VCDIFF supports a secondary encoding to + be applied to the individual sections of the data format, which are + ADDRess, INSTruction, and DATA. Several secondary compressor + variations are implemented here, although none is standardized yet. + + One is an adaptive huffman algorithm -- the FGK algorithm (Faller, + Gallager, and Knuth, 1985). This compressor is extremely slow. + + The other is a simple static Huffman routine, which is the base + case of a semi-adaptive scheme published by D.J. Wheeler and first + widely used in bzip2 (by Julian Seward). This is a very + interesting algorithm, originally published in nearly cryptic form + by D.J. Wheeler. !!!NOTE!!! Because these are not standardized, + secondary compression remains off by default. + ftp://ftp.cl.cam.ac.uk/users/djw3/bred3.{c,ps} + -------------------------------------------------------------------- + + Other Features + + 1. USER CONVENIENCE + + For user convenience, it is essential to recognize Gzip-compressed + files and automatically Gzip-decompress them prior to + delta-compression (or else no delta-compression will be achieved + unless the user manually decompresses the inputs). The compressed + represention competes with Xdelta, and this must be hidden from the + command-line user interface. The Xdelta-1.x encoding was simple, not + compressed itself, so Xdelta-1.x uses Zlib internally to compress the + representation. + + This implementation supports external compression, which implements + the necessary fork() and pipe() mechanics. There is a tricky step + involved to support automatic detection of a compressed input in a + non-seekable input. First you read a bit of the input to detect + magic headers. When a compressed format is recognized, exec() the + external compression program and create a second child process to + copy the original input stream. [Footnote: There is a difficulty + related to using Gzip externally. It is not possible to decompress + and recompress a Gzip file transparently. If FILE.GZ had a + cryptographic signature, then, after: (1) Gzip-decompression, (2) + Xdelta-encoding, (3) Gzip-compression the signature could be + broken. The only way to solve this problem is to guess at Gzip's + compression level or control it by other means. I recommend that + specific implementations of any compression scheme store + information needed to exactly re-compress the input, that way + external compression is transparent - however, this won't happen + here until it has stabilized.] + + 2. APPLICATION-HEADER + + This feature was introduced in RFC3284. It allows any application + to include a header within the VCDIFF file format. This allows + general inter-application data exchange with support for + application-specific extensions to communicate metadata. + + 3. VCDIFF CHECKSUM + + An optional checksum value is included with each window, which can + be used to validate the final result. This verifies the correct source + file was used for decompression as well as the obvious advantage: + checking the implementation (and underlying) correctness. + + 4. LIGHT WEIGHT + + The code makes efforts to avoid copying data more than necessary. + The code delays many initialization tasks until the first use, it + optimizes for identical (perfectly matching) inputs. It does not + compute any checksums until the first lookup misses. Memory usage + is reduced. String-matching is templatized (by slightly gross use + of CPP) to hard-code alternative compile-time defaults. The code + has few outside dependencies. + ---------------------------------------------------------------------- + + The default rfc3284 instruction table: + (see RFC for the explanation) + + TYPE SIZE MODE TYPE SIZE MODE INDEX + -------------------------------------------------------------------- + 1. Run 0 0 Noop 0 0 0 + 2. Add 0, [1,17] 0 Noop 0 0 [1,18] + 3. Copy 0, [4,18] 0 Noop 0 0 [19,34] + 4. Copy 0, [4,18] 1 Noop 0 0 [35,50] + 5. Copy 0, [4,18] 2 Noop 0 0 [51,66] + 6. Copy 0, [4,18] 3 Noop 0 0 [67,82] + 7. Copy 0, [4,18] 4 Noop 0 0 [83,98] + 8. Copy 0, [4,18] 5 Noop 0 0 [99,114] + 9. Copy 0, [4,18] 6 Noop 0 0 [115,130] + 10. Copy 0, [4,18] 7 Noop 0 0 [131,146] + 11. Copy 0, [4,18] 8 Noop 0 0 [147,162] + 12. Add [1,4] 0 Copy [4,6] 0 [163,174] + 13. Add [1,4] 0 Copy [4,6] 1 [175,186] + 14. Add [1,4] 0 Copy [4,6] 2 [187,198] + 15. Add [1,4] 0 Copy [4,6] 3 [199,210] + 16. Add [1,4] 0 Copy [4,6] 4 [211,222] + 17. Add [1,4] 0 Copy [4,6] 5 [223,234] + 18. Add [1,4] 0 Copy 4 6 [235,238] + 19. Add [1,4] 0 Copy 4 7 [239,242] + 20. Add [1,4] 0 Copy 4 8 [243,246] + 21. Copy 4 [0,8] Add 1 0 [247,255] + -------------------------------------------------------------------- + + Reading the source: Overview + + This file includes itself in several passes to macro-expand certain + sections with variable forms. Just read ahead, there's only a + little confusion. I know this sounds ugly, but hard-coding some of + the string-matching parameters results in a 10-15% increase in + string-match performance. The only time this hurts is when you have + unbalanced #if/endifs. + + A single compilation unit tames the Makefile. In short, this is to + allow the above-described hack without an explodingMakefile. The + single compilation unit includes the core library features, + configurable string-match templates, optional main() command-line + tool, misc optional features, and a regression test. Features are + controled with CPP #defines, see Makefile.am. + + The initial __XDELTA3_C_HEADER_PASS__ starts first, the _INLINE_ and + _TEMPLATE_ sections follow. Easy stuff first, hard stuff last. + + Optional features include: + + xdelta3-main.h The command-line interface, external compression + support, POSIX-specific, info & VCDIFF-debug tools. + xdelta3-second.h The common secondary compression routines. + xdelta3-decoder.h All decoding routines. + xdelta3-djw.h The semi-adaptive huffman secondary encoder. + xdelta3-fgk.h The adaptive huffman secondary encoder. + xdelta3-test.h The unit test covers major algorithms, + encoding and decoding. There are single-bit + error decoding tests. There are 32/64-bit file size + boundary tests. There are command-line tests. + There are compression tests. There are external + compression tests. There are string-matching tests. + There should be more tests... + + Additional headers include: + + xdelta3.h The public header file. + xdelta3-cfgs.h The default settings for default, built-in + encoders. These are hard-coded at + compile-time. There is also a single + soft-coded string matcher for experimenting + with arbitrary values. + xdelta3-list.h A cyclic list template + + Misc little debug utilities: + + badcopy.c Randomly modifies an input file based on two + parameters: (1) the probability that a byte in + the file is replaced with a pseudo-random value, + and (2) the mean change size. Changes are + generated using an expoential distribution + which approximates the expected error_prob + distribution. + -------------------------------------------------------------------- + + This file itself is unusually large. I hope to defend this layout + with lots of comments. Everything in this file is related to + encoding and decoding. I like it all together - the template stuff + is just a hack. */ + +#ifndef __XDELTA3_C_HEADER_PASS__ +#define __XDELTA3_C_HEADER_PASS__ + +#include "xdelta3.h" +#include "xdelta3-internal.h" + +/*********************************************************************** + STATIC CONFIGURATION + ***********************************************************************/ + +#ifndef XD3_MAIN /* the main application */ +#define XD3_MAIN 0 +#endif + +#ifndef VCDIFF_TOOLS +#define VCDIFF_TOOLS XD3_MAIN +#endif + +#ifndef SECONDARY_FGK /* one from the algorithm preservation department: */ +#define SECONDARY_FGK 0 /* adaptive Huffman routines */ +#endif + +#ifndef SECONDARY_DJW /* semi-adaptive/static Huffman for the eventual */ +#define SECONDARY_DJW 0 /* standardization, off by default until such time. */ +#endif + +#ifndef SECONDARY_LZMA +#ifdef HAVE_LZMA_H +#define SECONDARY_LZMA 1 +#else +#define SECONDARY_LZMA 0 +#endif +#endif + +#if XD3_ENCODER +#define IF_ENCODER(x) x +#else +#define IF_ENCODER(x) +#endif + +/***********************************************************************/ + + /* header indicator bits */ +#define VCD_SECONDARY (1U << 0) /* uses secondary compressor */ +#define VCD_CODETABLE (1U << 1) /* supplies code table data */ +#define VCD_APPHEADER (1U << 2) /* supplies application data */ +#define VCD_INVHDR (~0x7U) + + /* window indicator bits */ +#define VCD_SOURCE (1U << 0) /* copy window in source file */ +#define VCD_TARGET (1U << 1) /* copy window in target file */ +#define VCD_ADLER32 (1U << 2) /* has adler32 checksum */ +#define VCD_INVWIN (~0x7U) + +#define VCD_SRCORTGT (VCD_SOURCE | VCD_TARGET) + + /* delta indicator bits */ +#define VCD_DATACOMP (1U << 0) +#define VCD_INSTCOMP (1U << 1) +#define VCD_ADDRCOMP (1U << 2) +#define VCD_INVDEL (~0x7U) + +typedef enum { + VCD_DJW_ID = 1, + VCD_LZMA_ID = 2, + VCD_FGK_ID = 16 /* Note: these are not standard IANA-allocated IDs! */ +} xd3_secondary_ids; + +typedef enum { + SEC_NOFLAGS = 0, + + /* Note: SEC_COUNT_FREQS Not implemented (to eliminate 1st Huffman pass) */ + SEC_COUNT_FREQS = (1 << 0) +} xd3_secondary_flags; + +typedef enum { + DATA_SECTION, /* These indicate which section to the secondary + * compressor. */ + INST_SECTION, /* The header section is not compressed, therefore not + * listed here. */ + ADDR_SECTION +} xd3_section_type; + +typedef unsigned int xd3_rtype; + +/***********************************************************************/ + +#include "xdelta3-list.h" + +XD3_MAKELIST(xd3_rlist, xd3_rinst, link); + +/***********************************************************************/ + +#define SECONDARY_MIN_SAVINGS 2 /* Secondary compression has to save + at least this many bytes. */ +#define SECONDARY_MIN_INPUT 10 /* Secondary compression needs at + least this many bytes. */ + +#define VCDIFF_MAGIC1 0xd6 /* 1st file byte */ +#define VCDIFF_MAGIC2 0xc3 /* 2nd file byte */ +#define VCDIFF_MAGIC3 0xc4 /* 3rd file byte */ +#define VCDIFF_VERSION 0x00 /* 4th file byte */ + +#define VCD_SELF 0 /* 1st address mode */ +#define VCD_HERE 1 /* 2nd address mode */ + +#define CODE_TABLE_STRING_SIZE (6 * 256) /* Should fit a code table string. */ +#define CODE_TABLE_VCDIFF_SIZE (6 * 256) /* Should fit a compressed code + * table string */ + +#define SECONDARY_ANY (SECONDARY_DJW || SECONDARY_FGK || SECONDARY_LZMA) + +#define ALPHABET_SIZE 256 /* Used in test code--size of the secondary + * compressor alphabet. */ + +#define HASH_PERMUTE 1 /* The input is permuted by random nums */ +#define ADLER_LARGE_CKSUM 1 /* Adler checksum vs. RK checksum */ + +#define HASH_CKOFFSET 1U /* Table entries distinguish "no-entry" from + * offset 0 using this offset. */ + +#define MIN_SMALL_LOOK 2U /* Match-optimization stuff. */ +#define MIN_LARGE_LOOK 2U +#define MIN_MATCH_OFFSET 1U +#define MAX_MATCH_SPLIT 18U /* VCDIFF code table: 18 is the default limit + * for direct-coded ADD sizes */ + +#define LEAST_MATCH_INCR 0 /* The least number of bytes an overlapping + * match must beat the preceding match by. This + * is a bias for the lazy match optimization. A + * non-zero value means that an adjacent match + * has to be better by more than the step + * between them. 0. */ + +#define MIN_MATCH 4U /* VCDIFF code table: MIN_MATCH=4 */ +#define MIN_ADD 1U /* 1 */ +#define MIN_RUN 8U /* The shortest run, if it is shorter than this + * an immediate add/copy will be just as good. + * ADD1/COPY6 = 1I+1D+1A bytes, RUN18 = + * 1I+1D+1A. */ + +#define MAX_MODES 9 /* Maximum number of nodes used for + * compression--does not limit decompression. */ + +#define ENC_SECTS 4 /* Number of separate output sections. */ + +#define HDR_TAIL(s) ((s)->enc_tails[0]) +#define DATA_TAIL(s) ((s)->enc_tails[1]) +#define INST_TAIL(s) ((s)->enc_tails[2]) +#define ADDR_TAIL(s) ((s)->enc_tails[3]) + +#define HDR_HEAD(s) ((s)->enc_heads[0]) +#define DATA_HEAD(s) ((s)->enc_heads[1]) +#define INST_HEAD(s) ((s)->enc_heads[2]) +#define ADDR_HEAD(s) ((s)->enc_heads[3]) + +#define TOTAL_MODES(x) (2+(x)->acache.s_same+(x)->acache.s_near) + +/* Template instances. */ +#if XD3_BUILD_SLOW +#define IF_BUILD_SLOW(x) x +#else +#define IF_BUILD_SLOW(x) +#endif +#if XD3_BUILD_FAST +#define IF_BUILD_FAST(x) x +#else +#define IF_BUILD_FAST(x) +#endif +#if XD3_BUILD_FASTER +#define IF_BUILD_FASTER(x) x +#else +#define IF_BUILD_FASTER(x) +#endif +#if XD3_BUILD_FASTEST +#define IF_BUILD_FASTEST(x) x +#else +#define IF_BUILD_FASTEST(x) +#endif +#if XD3_BUILD_SOFT +#define IF_BUILD_SOFT(x) x +#else +#define IF_BUILD_SOFT(x) +#endif +#if XD3_BUILD_DEFAULT +#define IF_BUILD_DEFAULT(x) x +#else +#define IF_BUILD_DEFAULT(x) +#endif + +/* Update the run-length state */ +#define NEXTRUN(c) do { if ((c) == run_c) { run_l += 1; } \ + else { run_c = (c); run_l = 1; } } while (0) + +/* This CPP-conditional stuff can be cleaned up... */ +#if REGRESSION_TEST +#define IF_REGRESSION(x) x +#else +#define IF_REGRESSION(x) +#endif + +/***********************************************************************/ + +#if XD3_ENCODER +static void* xd3_alloc0 (xd3_stream *stream, + usize_t elts, + usize_t size); + + +static int xd3_alloc_iopt (xd3_stream *stream, usize_t elts); + +static void xd3_free_output (xd3_stream *stream, + xd3_output *output); + +static int xd3_emit_double (xd3_stream *stream, xd3_rinst *first, + xd3_rinst *second, usize_t code); +static int xd3_emit_single (xd3_stream *stream, xd3_rinst *single, + usize_t code); + +static usize_t xd3_sizeof_output (xd3_output *output); +static void xd3_encode_reset (xd3_stream *stream); + +static int xd3_source_match_setup (xd3_stream *stream, xoff_t srcpos); +static int xd3_source_extend_match (xd3_stream *stream); +static int xd3_srcwin_setup (xd3_stream *stream); +static usize_t xd3_iopt_last_matched (xd3_stream *stream); +static int xd3_emit_uint32_t (xd3_stream *stream, xd3_output **output, + uint32_t num); + +static usize_t xd3_smatch (xd3_stream *stream, + usize_t base, + usize_t scksum, + usize_t *match_offset); +static int xd3_string_match_init (xd3_stream *stream); +static uint32_t xd3_scksum (uint32_t *state, const uint8_t *seg, + const usize_t ln); +static usize_t xd3_comprun (const uint8_t *seg, usize_t slook, uint8_t *run_cp); +static int xd3_srcwin_move_point (xd3_stream *stream, + usize_t *next_move_point); + +static int xd3_emit_run (xd3_stream *stream, usize_t pos, + usize_t size, uint8_t *run_c); +static usize_t xd3_checksum_hash (const xd3_hash_cfg *cfg, + const usize_t cksum); +static xoff_t xd3_source_cksum_offset(xd3_stream *stream, usize_t low); +static void xd3_scksum_insert (xd3_stream *stream, + usize_t inx, + usize_t scksum, + usize_t pos); + + +#if XD3_DEBUG +static void xd3_verify_run_state (xd3_stream *stream, + const uint8_t *inp, + usize_t x_run_l, + uint8_t *x_run_c); +static void xd3_verify_large_state (xd3_stream *stream, + const uint8_t *inp, + uint32_t x_cksum); +static void xd3_verify_small_state (xd3_stream *stream, + const uint8_t *inp, + uint32_t x_cksum); + +#endif /* XD3_DEBUG */ +#endif /* XD3_ENCODER */ + +static int xd3_decode_allocate (xd3_stream *stream, usize_t size, + uint8_t **copied1, usize_t *alloc1); + +static void* xd3_alloc (xd3_stream *stream, usize_t elts, usize_t size); +static void xd3_free (xd3_stream *stream, void *ptr); + +static int xd3_read_uint32_t (xd3_stream *stream, const uint8_t **inpp, + const uint8_t *max, uint32_t *valp); + +#if REGRESSION_TEST +static int xd3_selftest (void); +#endif + +/***********************************************************************/ + +const char* xd3_strerror (int ret) +{ + switch (ret) + { + case XD3_INPUT: return "XD3_INPUT"; + case XD3_OUTPUT: return "XD3_OUTPUT"; + case XD3_GETSRCBLK: return "XD3_GETSRCBLK"; + case XD3_GOTHEADER: return "XD3_GOTHEADER"; + case XD3_WINSTART: return "XD3_WINSTART"; + case XD3_WINFINISH: return "XD3_WINFINISH"; + case XD3_TOOFARBACK: return "XD3_TOOFARBACK"; + case XD3_INTERNAL: return "XD3_INTERNAL"; + case XD3_INVALID: return "XD3_INVALID"; + case XD3_INVALID_INPUT: return "XD3_INVALID_INPUT"; + case XD3_NOSECOND: return "XD3_NOSECOND"; + case XD3_UNIMPLEMENTED: return "XD3_UNIMPLEMENTED"; + } + return NULL; +} + +/***********************************************************************/ + +#define xd3_sec_data(s) ((s)->sec_stream_d) +#define xd3_sec_inst(s) ((s)->sec_stream_i) +#define xd3_sec_addr(s) ((s)->sec_stream_a) + +struct _xd3_sec_type +{ + int id; + const char *name; + xd3_secondary_flags flags; + + /* xd3_sec_stream is opaque to the generic code */ + xd3_sec_stream* (*alloc) (xd3_stream *stream); + void (*destroy) (xd3_stream *stream, + xd3_sec_stream *sec); + int (*init) (xd3_stream *stream, + xd3_sec_stream *sec_stream, + int is_encode); + int (*decode) (xd3_stream *stream, + xd3_sec_stream *sec_stream, + const uint8_t **input, + const uint8_t *input_end, + uint8_t **output, + const uint8_t *output_end); +#if XD3_ENCODER + int (*encode) (xd3_stream *stream, + xd3_sec_stream *sec_stream, + xd3_output *input, + xd3_output *output, + xd3_sec_cfg *cfg); +#endif +}; + +#define BIT_STATE_ENCODE_INIT { 0, 1 } +#define BIT_STATE_DECODE_INIT { 0, 0x100 } + +typedef struct _bit_state bit_state; +struct _bit_state +{ + usize_t cur_byte; + usize_t cur_mask; +}; + +#if SECONDARY_ANY == 0 +#define IF_SEC(x) +#define IF_NSEC(x) x +#else /* yuck */ +#define IF_SEC(x) x +#define IF_NSEC(x) +static int +xd3_decode_secondary (xd3_stream *stream, + xd3_desect *sect, + xd3_sec_stream **sec_streamp); +#if XD3_ENCODER +static int +xd3_encode_secondary (xd3_stream *stream, + xd3_output **head, + xd3_output **tail, + xd3_sec_stream **sec_streamp, + xd3_sec_cfg *cfg, + int *did_it); +#endif +#endif /* SECONDARY_ANY */ + +#if SECONDARY_FGK +extern const xd3_sec_type fgk_sec_type; +#define IF_FGK(x) x +#define FGK_CASE(s) \ + s->sec_type = & fgk_sec_type; \ + break; +#else +#define IF_FGK(x) +#define FGK_CASE(s) \ + s->msg = "unavailable secondary compressor: FGK Adaptive Huffman"; \ + return XD3_INTERNAL; +#endif + +#if SECONDARY_DJW +extern const xd3_sec_type djw_sec_type; +#define IF_DJW(x) x +#define DJW_CASE(s) \ + s->sec_type = & djw_sec_type; \ + break; +#else +#define IF_DJW(x) +#define DJW_CASE(s) \ + s->msg = "unavailable secondary compressor: DJW Static Huffman"; \ + return XD3_INTERNAL; +#endif + +#if SECONDARY_LZMA +extern const xd3_sec_type lzma_sec_type; +#define IF_LZMA(x) x +#define LZMA_CASE(s) \ + s->sec_type = & lzma_sec_type; \ + break; +#else +#define IF_LZMA(x) +#define LZMA_CASE(s) \ + s->msg = "unavailable secondary compressor: LZMA"; \ + return XD3_INTERNAL; +#endif + +/***********************************************************************/ + +#include "xdelta3-hash.h" + +/* Process template passes - this includes xdelta3.c several times. */ +#define __XDELTA3_C_TEMPLATE_PASS__ +#include "xdelta3-cfgs.h" +#undef __XDELTA3_C_TEMPLATE_PASS__ + +/* Process the inline pass. */ +#define __XDELTA3_C_INLINE_PASS__ +#include "xdelta3.c" +#undef __XDELTA3_C_INLINE_PASS__ + +/* Secondary compression */ +#if SECONDARY_ANY +#include "xdelta3-second.h" +#endif + +#if SECONDARY_FGK +#include "xdelta3-fgk.h" +const xd3_sec_type fgk_sec_type = +{ + VCD_FGK_ID, + "FGK Adaptive Huffman", + SEC_NOFLAGS, + (xd3_sec_stream* (*)(xd3_stream*)) fgk_alloc, + (void (*)(xd3_stream*, xd3_sec_stream*)) fgk_destroy, + (int (*)(xd3_stream*, xd3_sec_stream*, int)) fgk_init, + (int (*)(xd3_stream*, xd3_sec_stream*, const uint8_t**, const uint8_t*, + uint8_t**, const uint8_t*)) xd3_decode_fgk, + IF_ENCODER((int (*)(xd3_stream*, xd3_sec_stream*, xd3_output*, + xd3_output*, xd3_sec_cfg*)) xd3_encode_fgk) +}; +#endif + +#if SECONDARY_DJW +#include "xdelta3-djw.h" +const xd3_sec_type djw_sec_type = +{ + VCD_DJW_ID, + "Static Huffman", + SEC_COUNT_FREQS, + (xd3_sec_stream* (*)(xd3_stream*)) djw_alloc, + (void (*)(xd3_stream*, xd3_sec_stream*)) djw_destroy, + (int (*)(xd3_stream*, xd3_sec_stream*, int)) djw_init, + (int (*)(xd3_stream*, xd3_sec_stream*, const uint8_t**, const uint8_t*, + uint8_t**, const uint8_t*)) xd3_decode_huff, + IF_ENCODER((int (*)(xd3_stream*, xd3_sec_stream*, xd3_output*, + xd3_output*, xd3_sec_cfg*)) xd3_encode_huff) +}; +#endif + +#if SECONDARY_LZMA +#include "xdelta3-lzma.h" +const xd3_sec_type lzma_sec_type = +{ + VCD_LZMA_ID, + "lzma", + SEC_NOFLAGS, + (xd3_sec_stream* (*)(xd3_stream*)) xd3_lzma_alloc, + (void (*)(xd3_stream*, xd3_sec_stream*)) xd3_lzma_destroy, + (int (*)(xd3_stream*, xd3_sec_stream*, int)) xd3_lzma_init, + (int (*)(xd3_stream*, xd3_sec_stream*, const uint8_t**, const uint8_t*, + uint8_t**, const uint8_t*)) xd3_decode_lzma, + IF_ENCODER((int (*)(xd3_stream*, xd3_sec_stream*, xd3_output*, + xd3_output*, xd3_sec_cfg*)) xd3_encode_lzma) +}; +#endif + +#if XD3_MAIN || PYTHON_MODULE || SWIG_MODULE || NOT_MAIN +#include "xdelta3-main.h" +#endif + +#if REGRESSION_TEST +#include "xdelta3-test.h" +#endif + +#endif /* __XDELTA3_C_HEADER_PASS__ */ +#ifdef __XDELTA3_C_INLINE_PASS__ + +const uint16_t __single_hash[256] = +{ + /* Random numbers generated using SLIB's pseudo-random number generator. + * This hashes the input alphabet. */ + 0xbcd1, 0xbb65, 0x42c2, 0xdffe, 0x9666, 0x431b, 0x8504, 0xeb46, + 0x6379, 0xd460, 0xcf14, 0x53cf, 0xdb51, 0xdb08, 0x12c8, 0xf602, + 0xe766, 0x2394, 0x250d, 0xdcbb, 0xa678, 0x02af, 0xa5c6, 0x7ea6, + 0xb645, 0xcb4d, 0xc44b, 0xe5dc, 0x9fe6, 0x5b5c, 0x35f5, 0x701a, + 0x220f, 0x6c38, 0x1a56, 0x4ca3, 0xffc6, 0xb152, 0x8d61, 0x7a58, + 0x9025, 0x8b3d, 0xbf0f, 0x95a3, 0xe5f4, 0xc127, 0x3bed, 0x320b, + 0xb7f3, 0x6054, 0x333c, 0xd383, 0x8154, 0x5242, 0x4e0d, 0x0a94, + 0x7028, 0x8689, 0x3a22, 0x0980, 0x1847, 0xb0f1, 0x9b5c, 0x4176, + 0xb858, 0xd542, 0x1f6c, 0x2497, 0x6a5a, 0x9fa9, 0x8c5a, 0x7743, + 0xa8a9, 0x9a02, 0x4918, 0x438c, 0xc388, 0x9e2b, 0x4cad, 0x01b6, + 0xab19, 0xf777, 0x365f, 0x1eb2, 0x091e, 0x7bf8, 0x7a8e, 0x5227, + 0xeab1, 0x2074, 0x4523, 0xe781, 0x01a3, 0x163d, 0x3b2e, 0x287d, + 0x5e7f, 0xa063, 0xb134, 0x8fae, 0x5e8e, 0xb7b7, 0x4548, 0x1f5a, + 0xfa56, 0x7a24, 0x900f, 0x42dc, 0xcc69, 0x02a0, 0x0b22, 0xdb31, + 0x71fe, 0x0c7d, 0x1732, 0x1159, 0xcb09, 0xe1d2, 0x1351, 0x52e9, + 0xf536, 0x5a4f, 0xc316, 0x6bf9, 0x8994, 0xb774, 0x5f3e, 0xf6d6, + 0x3a61, 0xf82c, 0xcc22, 0x9d06, 0x299c, 0x09e5, 0x1eec, 0x514f, + 0x8d53, 0xa650, 0x5c6e, 0xc577, 0x7958, 0x71ac, 0x8916, 0x9b4f, + 0x2c09, 0x5211, 0xf6d8, 0xcaaa, 0xf7ef, 0x287f, 0x7a94, 0xab49, + 0xfa2c, 0x7222, 0xe457, 0xd71a, 0x00c3, 0x1a76, 0xe98c, 0xc037, + 0x8208, 0x5c2d, 0xdfda, 0xe5f5, 0x0b45, 0x15ce, 0x8a7e, 0xfcad, + 0xaa2d, 0x4b5c, 0xd42e, 0xb251, 0x907e, 0x9a47, 0xc9a6, 0xd93f, + 0x085e, 0x35ce, 0xa153, 0x7e7b, 0x9f0b, 0x25aa, 0x5d9f, 0xc04d, + 0x8a0e, 0x2875, 0x4a1c, 0x295f, 0x1393, 0xf760, 0x9178, 0x0f5b, + 0xfa7d, 0x83b4, 0x2082, 0x721d, 0x6462, 0x0368, 0x67e2, 0x8624, + 0x194d, 0x22f6, 0x78fb, 0x6791, 0xb238, 0xb332, 0x7276, 0xf272, + 0x47ec, 0x4504, 0xa961, 0x9fc8, 0x3fdc, 0xb413, 0x007a, 0x0806, + 0x7458, 0x95c6, 0xccaa, 0x18d6, 0xe2ae, 0x1b06, 0xf3f6, 0x5050, + 0xc8e8, 0xf4ac, 0xc04c, 0xf41c, 0x992f, 0xae44, 0x5f1b, 0x1113, + 0x1738, 0xd9a8, 0x19ea, 0x2d33, 0x9698, 0x2fe9, 0x323f, 0xcde2, + 0x6d71, 0xe37d, 0xb697, 0x2c4f, 0x4373, 0x9102, 0x075d, 0x8e25, + 0x1672, 0xec28, 0x6acb, 0x86cc, 0x186e, 0x9414, 0xd674, 0xd1a5 +}; + +/**************************************************************** + Instruction tables + *****************************************************************/ + +/* The following code implements a parametrized description of the + * code table given above for a few reasons. It is not necessary for + * implementing the standard, to support compression with variable + * tables, so an implementation is only required to know the default + * code table to begin decompression. (If the encoder uses an + * alternate table, the table is included in compressed form inside + * the VCDIFF file.) + * + * Before adding variable-table support there were two functions which + * were hard-coded to the default table above. + * xd3_compute_default_table() would create the default table by + * filling a 256-elt array of xd3_dinst values. The corresponding + * function, xd3_choose_instruction(), would choose an instruction + * based on the hard-coded parameters of the default code table. + * + * Notes: The parametrized code table description here only generates + * tables of a certain regularity similar to the default table by + * allowing to vary the distribution of single- and + * double-instructions and change the number of near and same copy + * modes. More exotic tables are only possible by extending this + * code. + * + * For performance reasons, both the parametrized and non-parametrized + * versions of xd3_choose_instruction remain. The parametrized + * version is only needed for testing multi-table decoding support. + * If ever multi-table encoding is required, this can be optimized by + * compiling static functions for each table. + */ + +/* The XD3_CHOOSE_INSTRUCTION calls xd3_choose_instruction with the + * table description when GENERIC_ENCODE_TABLES are in use. The + * IF_GENCODETBL macro enables generic-code-table specific code + * (removed 10/2014). */ +#define XD3_CHOOSE_INSTRUCTION(stream,prev,inst) \ + xd3_choose_instruction (prev, inst) + +/* This structure maintains information needed by + * xd3_choose_instruction to compute the code for a double instruction + * by first indexing an array of code_table_sizes by copy mode, then + * using (offset + (muliplier * X)) */ +struct _xd3_code_table_sizes { + uint8_t cpy_max; + uint8_t offset; + uint8_t mult; +}; + +/* This contains a complete description of a code table. */ +struct _xd3_code_table_desc +{ + /* Assumes a single RUN instruction */ + /* Assumes that MIN_MATCH is 4 */ + + uint8_t add_sizes; /* Number of immediate-size single adds (default 17) */ + uint8_t near_modes; /* Number of near copy modes (default 4) */ + uint8_t same_modes; /* Number of same copy modes (default 3) */ + uint8_t cpy_sizes; /* Number of immediate-size single copies (default 15) */ + + uint8_t addcopy_add_max; /* Maximum add size for an add-copy double instruction, + all modes (default 4) */ + uint8_t addcopy_near_cpy_max; /* Maximum cpy size for an add-copy double instruction, + up through VCD_NEAR modes (default 6) */ + uint8_t addcopy_same_cpy_max; /* Maximum cpy size for an add-copy double instruction, + VCD_SAME modes (default 4) */ + + uint8_t copyadd_add_max; /* Maximum add size for a copy-add double instruction, + all modes (default 1) */ + uint8_t copyadd_near_cpy_max; /* Maximum cpy size for a copy-add double instruction, + up through VCD_NEAR modes (default 4) */ + uint8_t copyadd_same_cpy_max; /* Maximum cpy size for a copy-add double instruction, + VCD_SAME modes (default 4) */ + + xd3_code_table_sizes addcopy_max_sizes[MAX_MODES]; + xd3_code_table_sizes copyadd_max_sizes[MAX_MODES]; +}; + +/* The rfc3284 code table is represented: */ +static const xd3_code_table_desc __rfc3284_code_table_desc = { + 17, /* add sizes */ + 4, /* near modes */ + 3, /* same modes */ + 15, /* copy sizes */ + + 4, /* add-copy max add */ + 6, /* add-copy max cpy, near */ + 4, /* add-copy max cpy, same */ + + 1, /* copy-add max add */ + 4, /* copy-add max cpy, near */ + 4, /* copy-add max cpy, same */ + + /* addcopy */ + { {6,163,3},{6,175,3},{6,187,3},{6,199,3},{6,211,3},{6,223,3},{4,235,1},{4,239,1},{4,243,1} }, + /* copyadd */ + { {4,247,1},{4,248,1},{4,249,1},{4,250,1},{4,251,1},{4,252,1},{4,253,1},{4,254,1},{4,255,1} }, +}; + +/* Computes code table entries of TBL using the specified description. */ +static void +xd3_build_code_table (const xd3_code_table_desc *desc, xd3_dinst *tbl) +{ + usize_t size1, size2, mode; + usize_t cpy_modes = 2 + desc->near_modes + desc->same_modes; + xd3_dinst *d = tbl; + + (d++)->type1 = XD3_RUN; + (d++)->type1 = XD3_ADD; + + for (size1 = 1; size1 <= desc->add_sizes; size1 += 1, d += 1) + { + d->type1 = XD3_ADD; + d->size1 = size1; + } + + for (mode = 0; mode < cpy_modes; mode += 1) + { + (d++)->type1 = XD3_CPY + mode; + + for (size1 = MIN_MATCH; size1 < MIN_MATCH + desc->cpy_sizes; size1 += 1, d += 1) + { + d->type1 = XD3_CPY + mode; + d->size1 = size1; + } + } + + for (mode = 0; mode < cpy_modes; mode += 1) + { + for (size1 = 1; size1 <= desc->addcopy_add_max; size1 += 1) + { + usize_t max = (mode < 2U + desc->near_modes) ? + desc->addcopy_near_cpy_max : + desc->addcopy_same_cpy_max; + + for (size2 = MIN_MATCH; size2 <= max; size2 += 1, d += 1) + { + d->type1 = XD3_ADD; + d->size1 = size1; + d->type2 = XD3_CPY + mode; + d->size2 = size2; + } + } + } + + for (mode = 0; mode < cpy_modes; mode += 1) + { + usize_t max = (mode < 2U + desc->near_modes) ? + desc->copyadd_near_cpy_max : + desc->copyadd_same_cpy_max; + + for (size1 = MIN_MATCH; size1 <= max; size1 += 1) + { + for (size2 = 1; size2 <= desc->copyadd_add_max; size2 += 1, d += 1) + { + d->type1 = XD3_CPY + mode; + d->size1 = size1; + d->type2 = XD3_ADD; + d->size2 = size2; + } + } + } + + XD3_ASSERT (d - tbl == 256); +} + +/* This function generates the static default code table. */ +static const xd3_dinst* +xd3_rfc3284_code_table (void) +{ + static xd3_dinst __rfc3284_code_table[256]; + + if (__rfc3284_code_table[0].type1 != XD3_RUN) + { + xd3_build_code_table (& __rfc3284_code_table_desc, __rfc3284_code_table); + } + + return __rfc3284_code_table; +} + +#if XD3_ENCODER +/* This version of xd3_choose_instruction is hard-coded for the default + table. */ +static void +xd3_choose_instruction (xd3_rinst *prev, xd3_rinst *inst) +{ + switch (inst->type) + { + case XD3_RUN: + inst->code1 = 0; + break; + + case XD3_ADD: + inst->code1 = 1; + + if (inst->size <= 17) + { + inst->code1 += inst->size; + + if ( (inst->size == 1) && + (prev != NULL) && + (prev->size == 4) && + (prev->type >= XD3_CPY) ) + { + prev->code2 = 247 + (prev->type - XD3_CPY); + } + } + + break; + + default: + { + int mode = inst->type - XD3_CPY; + + XD3_ASSERT (inst->type >= XD3_CPY && inst->type < 12); + + inst->code1 = 19 + 16 * mode; + + if (inst->size <= 18 && inst->size >= 4) + { + inst->code1 += inst->size - 3; + + if ( (prev != NULL) && + (prev->type == XD3_ADD) && + (prev->size <= 4) ) + { + if ( (inst->size <= 6) && + (mode <= 5) ) + { + prev->code2 = 163 + (mode * 12) + (3 * (prev->size - 1)) + (inst->size - 4); + + XD3_ASSERT (prev->code2 <= 234); + } + else if ( (inst->size == 4) && + (mode >= 6) ) + { + prev->code2 = 235 + ((mode - 6) * 4) + (prev->size - 1); + + XD3_ASSERT (prev->code2 <= 246); + } + } + } + + XD3_ASSERT (inst->code1 <= 162); + } + break; + } +} +#endif /* XD3_ENCODER */ + +/***********************************************************************/ + +static inline void +xd3_swap_uint8p (uint8_t** p1, uint8_t** p2) +{ + uint8_t *t = (*p1); + (*p1) = (*p2); + (*p2) = t; +} + +static inline void +xd3_swap_usize_t (usize_t* p1, usize_t* p2) +{ + usize_t t = (*p1); + (*p1) = (*p2); + (*p2) = t; +} + +/* It's not constant time, but it computes the log. */ +static int +xd3_check_pow2 (xoff_t value, usize_t *logof) +{ + xoff_t x = 1; + usize_t nolog; + if (logof == NULL) { + logof = &nolog; + } + + *logof = 0; + + for (; x != 0; x <<= 1, *logof += 1) + { + if (x == value) + { + return 0; + } + } + + return XD3_INTERNAL; +} + +size_t +xd3_pow2_roundup (size_t x) +{ + size_t i = 1; + while (x > i) { + i <<= 1U; + } + return i; +} + +static xoff_t +xd3_xoff_roundup (xoff_t x) +{ + xoff_t i = 1; + while (x > i) { + i <<= 1U; + } + return i; +} + +static usize_t +xd3_round_blksize (usize_t sz, usize_t blksz) +{ + usize_t mod = sz & (blksz-1); + + XD3_ASSERT (xd3_check_pow2 (blksz, NULL) == 0); + + if (mod == 0) + { + return sz; + } + + if (sz > USIZE_T_MAXBLKSZ) + { + return USIZE_T_MAXBLKSZ; + } + + return sz + (blksz - mod); +} + +/*********************************************************************** + Adler32 stream function: code copied from Zlib, defined in RFC1950 + ***********************************************************************/ + +#define A32_BASE 65521L /* Largest prime smaller than 2^16 */ +#define A32_NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +#define A32_DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define A32_DO2(buf,i) A32_DO1(buf,i); A32_DO1(buf,i+1); +#define A32_DO4(buf,i) A32_DO2(buf,i); A32_DO2(buf,i+2); +#define A32_DO8(buf,i) A32_DO4(buf,i); A32_DO4(buf,i+4); +#define A32_DO16(buf) A32_DO8(buf,0); A32_DO8(buf,8); + +static unsigned long adler32 (unsigned long adler, const uint8_t *buf, + usize_t len) +{ + unsigned long s1 = adler & 0xffff; + unsigned long s2 = (adler >> 16) & 0xffff; + int k; + + while (len > 0) + { + k = (len < A32_NMAX) ? len : A32_NMAX; + len -= k; + + while (k >= 16) + { + A32_DO16(buf); + buf += 16; + k -= 16; + } + + if (k != 0) + { + do + { + s1 += *buf++; + s2 += s1; + } + while (--k); + } + + s1 %= A32_BASE; + s2 %= A32_BASE; + } + + return (s2 << 16) | s1; +} + +/*********************************************************************** + Run-length function + ***********************************************************************/ + +#if XD3_ENCODER +static usize_t +xd3_comprun (const uint8_t *seg, usize_t slook, uint8_t *run_cp) +{ + usize_t i; + usize_t run_l = 0; + uint8_t run_c = 0; + + for (i = 0; i < slook; i += 1) + { + NEXTRUN(seg[i]); + } + + (*run_cp) = run_c; + + return run_l; +} +#endif + +/*********************************************************************** + Basic encoder/decoder functions + ***********************************************************************/ + +#if XD3_ENCODER +inline int +xd3_emit_byte (xd3_stream *stream, + xd3_output **outputp, + uint8_t code) +{ + xd3_output *output = (*outputp); + + if (output->next == output->avail) + { + xd3_output *aoutput; + + if ((aoutput = xd3_alloc_output (stream, output)) == NULL) + { + return ENOMEM; + } + + output = (*outputp) = aoutput; + } + + output->base[output->next++] = code; + + return 0; +} + +inline int +xd3_emit_bytes (xd3_stream *stream, + xd3_output **outputp, + const uint8_t *base, + usize_t size) +{ + xd3_output *output = (*outputp); + + do + { + usize_t take; + + if (output->next == output->avail) + { + xd3_output *aoutput; + + if ((aoutput = xd3_alloc_output (stream, output)) == NULL) + { + return ENOMEM; + } + + output = (*outputp) = aoutput; + } + + take = xd3_min (output->avail - output->next, size); + + memcpy (output->base + output->next, base, (size_t) take); + + output->next += take; + size -= take; + base += take; + } + while (size > 0); + + return 0; +} +#endif /* XD3_ENCODER */ + +/*********************************************************************** + Address cache stuff + ***********************************************************************/ + +static int +xd3_alloc_cache (xd3_stream *stream) +{ + if (stream->acache.near_array != NULL) + { + xd3_free (stream, stream->acache.near_array); + } + + if (stream->acache.same_array != NULL) + { + xd3_free (stream, stream->acache.same_array); + } + + if (((stream->acache.s_near > 0) && + (stream->acache.near_array = (usize_t*) + xd3_alloc (stream, stream->acache.s_near, + (usize_t) sizeof (usize_t))) + == NULL) || + ((stream->acache.s_same > 0) && + (stream->acache.same_array = (usize_t*) + xd3_alloc (stream, stream->acache.s_same * 256, + (usize_t) sizeof (usize_t))) + == NULL)) + { + return ENOMEM; + } + + return 0; +} + +void +xd3_init_cache (xd3_addr_cache* acache) +{ + if (acache->s_near > 0) + { + memset (acache->near_array, 0, acache->s_near * sizeof (usize_t)); + acache->next_slot = 0; + } + + if (acache->s_same > 0) + { + memset (acache->same_array, 0, acache->s_same * 256 * sizeof (usize_t)); + } +} + +static void +xd3_update_cache (xd3_addr_cache* acache, usize_t addr) +{ + if (acache->s_near > 0) + { + acache->near_array[acache->next_slot] = addr; + acache->next_slot = (acache->next_slot + 1) % acache->s_near; + } + + if (acache->s_same > 0) + { + acache->same_array[addr % (acache->s_same*256)] = addr; + } +} + +#if XD3_ENCODER +/* OPT: this gets called a lot, can it be optimized? */ +static int +xd3_encode_address (xd3_stream *stream, + usize_t addr, + usize_t here, + uint8_t* mode) +{ + usize_t d, bestd; + usize_t i, bestm, ret; + xd3_addr_cache* acache = & stream->acache; + +#define SMALLEST_INT(x) do { if (((x) & ~127U) == 0) { goto good; } } while (0) + + /* Attempt to find the address mode that yields the smallest integer value + * for "d", the encoded address value, thereby minimizing the encoded size + * of the address. */ + bestd = addr; + bestm = VCD_SELF; + + XD3_ASSERT (addr < here); + + SMALLEST_INT (bestd); + + if ((d = here-addr) < bestd) + { + bestd = d; + bestm = VCD_HERE; + + SMALLEST_INT (bestd); + } + + for (i = 0; i < acache->s_near; i += 1) + { + /* Note: If we used signed computation here, we'd could compte d + * and then check (d >= 0 && d < bestd). */ + if (addr >= acache->near_array[i]) + { + d = addr - acache->near_array[i]; + + if (d < bestd) + { + bestd = d; + bestm = i+2; /* 2 counts the VCD_SELF, VCD_HERE modes */ + + SMALLEST_INT (bestd); + } + } + } + + if (acache->s_same > 0 && + acache->same_array[d = addr%(acache->s_same*256)] == addr) + { + bestd = d%256; + /* 2 + s_near offsets past the VCD_NEAR modes */ + bestm = acache->s_near + 2 + d/256; + + if ((ret = xd3_emit_byte (stream, & ADDR_TAIL (stream), bestd))) + { + return ret; + } + } + else + { + good: + + if ((ret = xd3_emit_size (stream, & ADDR_TAIL (stream), bestd))) + { + return ret; + } + } + + xd3_update_cache (acache, addr); + + (*mode) += bestm; + + return 0; +} +#endif + +static int +xd3_decode_address (xd3_stream *stream, usize_t here, + usize_t mode, const uint8_t **inpp, + const uint8_t *max, uint32_t *valp) +{ + int ret; + usize_t same_start = 2 + stream->acache.s_near; + + if (mode < same_start) + { + if ((ret = xd3_read_size (stream, inpp, max, valp))) { return ret; } + + switch (mode) + { + case VCD_SELF: + break; + case VCD_HERE: + (*valp) = here - (*valp); + break; + default: + (*valp) += stream->acache.near_array[mode - 2]; + break; + } + } + else + { + if (*inpp == max) + { + stream->msg = "address underflow"; + return XD3_INVALID_INPUT; + } + + mode -= same_start; + + (*valp) = stream->acache.same_array[mode*256 + (**inpp)]; + + (*inpp) += 1; + } + + xd3_update_cache (& stream->acache, *valp); + + return 0; +} + +/*********************************************************************** + Alloc/free +***********************************************************************/ + +static void* +__xd3_alloc_func (void* opaque, size_t items, usize_t size) +{ + return malloc (items * (size_t) size); +} + +static void +__xd3_free_func (void* opaque, void* address) +{ + free (address); +} + +static void* +xd3_alloc (xd3_stream *stream, + usize_t elts, + usize_t size) +{ + void *a = stream->alloc (stream->opaque, elts, size); + + if (a != NULL) + { + IF_DEBUG (stream->alloc_cnt += 1); + IF_DEBUG2 (DP(RINT "[stream %p malloc] size %u ptr %p\n", + stream, elts * size, a)); + } + else + { + stream->msg = "out of memory"; + } + + return a; +} + +static void +xd3_free (xd3_stream *stream, + void *ptr) +{ + if (ptr != NULL) + { + IF_DEBUG (stream->free_cnt += 1); + XD3_ASSERT (stream->free_cnt <= stream->alloc_cnt); + IF_DEBUG2 (DP(RINT "[stream %p free] %p\n", + stream, ptr)); + stream->free (stream->opaque, ptr); + } +} + +#if XD3_ENCODER +static void* +xd3_alloc0 (xd3_stream *stream, + usize_t elts, + usize_t size) +{ + void *a = xd3_alloc (stream, elts, size); + + if (a != NULL) + { + memset (a, 0, (size_t) (elts * size)); + } + + return a; +} + +xd3_output* +xd3_alloc_output (xd3_stream *stream, + xd3_output *old_output) +{ + xd3_output *output; + uint8_t *base; + + if (stream->enc_free != NULL) + { + output = stream->enc_free; + stream->enc_free = output->next_page; + } + else + { + if ((output = (xd3_output*) xd3_alloc (stream, 1, + (usize_t) sizeof (xd3_output))) + == NULL) + { + return NULL; + } + + if ((base = (uint8_t*) xd3_alloc (stream, XD3_ALLOCSIZE, + sizeof (uint8_t))) == NULL) + { + xd3_free (stream, output); + return NULL; + } + + output->base = base; + output->avail = XD3_ALLOCSIZE; + } + + output->next = 0; + + if (old_output) + { + old_output->next_page = output; + } + + output->next_page = NULL; + + return output; +} + +static usize_t +xd3_sizeof_output (xd3_output *output) +{ + usize_t s = 0; + + for (; output; output = output->next_page) + { + s += output->next; + } + + return s; +} + +static void +xd3_freelist_output (xd3_stream *stream, + xd3_output *output) +{ + xd3_output *tmp; + + while (output) + { + tmp = output; + output = output->next_page; + + tmp->next = 0; + tmp->next_page = stream->enc_free; + stream->enc_free = tmp; + } +} + +static void +xd3_free_output (xd3_stream *stream, + xd3_output *output) +{ + xd3_output *next; + + again: + if (output == NULL) + { + return; + } + + next = output->next_page; + + xd3_free (stream, output->base); + xd3_free (stream, output); + + output = next; + goto again; +} +#endif /* XD3_ENCODER */ + +void +xd3_free_stream (xd3_stream *stream) +{ + xd3_iopt_buflist *blist = stream->iopt_alloc; + + while (blist != NULL) + { + xd3_iopt_buflist *tmp = blist; + blist = blist->next; + xd3_free (stream, tmp->buffer); + xd3_free (stream, tmp); + } + + xd3_free (stream, stream->large_table); + xd3_free (stream, stream->small_table); + xd3_free (stream, stream->small_prev); + +#if XD3_ENCODER + { + int i; + for (i = 0; i < ENC_SECTS; i += 1) + { + xd3_free_output (stream, stream->enc_heads[i]); + } + xd3_free_output (stream, stream->enc_free); + } +#endif + + xd3_free (stream, stream->acache.near_array); + xd3_free (stream, stream->acache.same_array); + + xd3_free (stream, stream->inst_sect.copied1); + xd3_free (stream, stream->addr_sect.copied1); + xd3_free (stream, stream->data_sect.copied1); + + if (stream->dec_lastwin != stream->dec_buffer) + { + xd3_free (stream, (uint8_t*) stream->dec_lastwin); + } + xd3_free (stream, stream->dec_buffer); + + xd3_free (stream, stream->buf_in); + xd3_free (stream, stream->dec_appheader); + xd3_free (stream, stream->dec_codetbl); + xd3_free (stream, stream->code_table_alloc); + +#if SECONDARY_ANY + xd3_free (stream, stream->inst_sect.copied2); + xd3_free (stream, stream->addr_sect.copied2); + xd3_free (stream, stream->data_sect.copied2); + + if (stream->sec_type != NULL) + { + stream->sec_type->destroy (stream, stream->sec_stream_d); + stream->sec_type->destroy (stream, stream->sec_stream_i); + stream->sec_type->destroy (stream, stream->sec_stream_a); + } +#endif + + xd3_free (stream, stream->whole_target.adds); + xd3_free (stream, stream->whole_target.inst); + xd3_free (stream, stream->whole_target.wininfo); + + XD3_ASSERT (stream->alloc_cnt == stream->free_cnt); + + memset (stream, 0, sizeof (xd3_stream)); +} + +#if (XD3_DEBUG > 1 || VCDIFF_TOOLS) +static const char* +xd3_rtype_to_string (xd3_rtype type, int print_mode) +{ + switch (type) + { + case XD3_NOOP: + return "NOOP "; + case XD3_RUN: + return "RUN "; + case XD3_ADD: + return "ADD "; + default: break; + } + if (! print_mode) + { + return "CPY "; + } + switch (type) + { + case XD3_CPY + 0: return "CPY_0"; + case XD3_CPY + 1: return "CPY_1"; + case XD3_CPY + 2: return "CPY_2"; + case XD3_CPY + 3: return "CPY_3"; + case XD3_CPY + 4: return "CPY_4"; + case XD3_CPY + 5: return "CPY_5"; + case XD3_CPY + 6: return "CPY_6"; + case XD3_CPY + 7: return "CPY_7"; + case XD3_CPY + 8: return "CPY_8"; + case XD3_CPY + 9: return "CPY_9"; + default: return "CPY>9"; + } +} +#endif + +/**************************************************************** + Stream configuration + ******************************************************************/ + +int +xd3_config_stream(xd3_stream *stream, + xd3_config *config) +{ + int ret; + xd3_config defcfg; + xd3_smatcher *smatcher = &stream->smatcher; + + if (config == NULL) + { + config = & defcfg; + memset (config, 0, sizeof (*config)); + } + + /* Initial setup: no error checks yet */ + memset (stream, 0, sizeof (*stream)); + + stream->winsize = config->winsize ? config->winsize : XD3_DEFAULT_WINSIZE; + stream->sprevsz = config->sprevsz ? config->sprevsz : XD3_DEFAULT_SPREVSZ; + + if (config->iopt_size == 0) + { + stream->iopt_size = XD3_ALLOCSIZE / sizeof(xd3_rinst); + stream->iopt_unlimited = 1; + } + else + { + stream->iopt_size = config->iopt_size; + } + + stream->getblk = config->getblk; + stream->alloc = config->alloc ? config->alloc : __xd3_alloc_func; + stream->free = config->freef ? config->freef : __xd3_free_func; + stream->opaque = config->opaque; + stream->flags = config->flags; + + /* Secondary setup. */ + stream->sec_data = config->sec_data; + stream->sec_inst = config->sec_inst; + stream->sec_addr = config->sec_addr; + + stream->sec_data.data_type = DATA_SECTION; + stream->sec_inst.data_type = INST_SECTION; + stream->sec_addr.data_type = ADDR_SECTION; + + /* Check static sizes. */ + if (sizeof (usize_t) != SIZEOF_USIZE_T || + sizeof (xoff_t) != SIZEOF_XOFF_T || + (ret = xd3_check_pow2(XD3_ALLOCSIZE, NULL))) + { + stream->msg = "incorrect compilation: wrong integer sizes"; + return XD3_INTERNAL; + } + + /* Check/set secondary compressor. */ + switch (stream->flags & XD3_SEC_TYPE) + { + case 0: + if (stream->flags & XD3_SEC_NOALL) + { + stream->msg = "XD3_SEC flags require a secondary compressor type"; + return XD3_INTERNAL; + } + break; + case XD3_SEC_FGK: + FGK_CASE (stream); + case XD3_SEC_DJW: + DJW_CASE (stream); + case XD3_SEC_LZMA: + LZMA_CASE (stream); + default: + stream->msg = "too many secondary compressor types set"; + return XD3_INTERNAL; + } + + stream->code_table_desc = & __rfc3284_code_table_desc; + stream->code_table_func = xd3_rfc3284_code_table; + + /* Check sprevsz */ + if (smatcher->small_chain == 1 && + smatcher->small_lchain == 1) + { + stream->sprevsz = 0; + } + else + { + if ((ret = xd3_check_pow2 (stream->sprevsz, NULL))) + { + stream->msg = "sprevsz is required to be a power of two"; + return XD3_INTERNAL; + } + + stream->sprevmask = stream->sprevsz - 1; + } + + /* Default scanner settings. */ +#if XD3_ENCODER + switch (config->smatch_cfg) + { + IF_BUILD_SOFT(case XD3_SMATCH_SOFT: + { + *smatcher = config->smatcher_soft; + smatcher->string_match = __smatcher_soft.string_match; + smatcher->name = __smatcher_soft.name; + if (smatcher->large_look < MIN_MATCH || + smatcher->large_step < 1 || + smatcher->small_look < MIN_MATCH) + { + stream->msg = "invalid soft string-match config"; + return XD3_INVALID; + } + break; + }) + + IF_BUILD_DEFAULT(case XD3_SMATCH_DEFAULT: + *smatcher = __smatcher_default; + break;) + IF_BUILD_SLOW(case XD3_SMATCH_SLOW: + *smatcher = __smatcher_slow; + break;) + IF_BUILD_FASTEST(case XD3_SMATCH_FASTEST: + *smatcher = __smatcher_fastest; + break;) + IF_BUILD_FASTER(case XD3_SMATCH_FASTER: + *smatcher = __smatcher_faster; + break;) + IF_BUILD_FAST(case XD3_SMATCH_FAST: + *smatcher = __smatcher_fast; + break;) + default: + stream->msg = "invalid string match config type"; + return XD3_INTERNAL; + } + + if (config->smatch_cfg == XD3_SMATCH_DEFAULT && + (stream->flags & XD3_COMPLEVEL_MASK) != 0) + { + int level = (stream->flags & XD3_COMPLEVEL_MASK) >> XD3_COMPLEVEL_SHIFT; + + switch (level) + { + case 1: + IF_BUILD_FASTEST(*smatcher = __smatcher_fastest; + break;) + case 2: + IF_BUILD_FASTER(*smatcher = __smatcher_faster; + break;) + case 3: case 4: case 5: + IF_BUILD_FAST(*smatcher = __smatcher_fast; + break;) + case 6: + IF_BUILD_DEFAULT(*smatcher = __smatcher_default; + break;) + default: + IF_BUILD_SLOW(*smatcher = __smatcher_slow; + break;) + IF_BUILD_DEFAULT(*smatcher = __smatcher_default; + break;) + IF_BUILD_FAST(*smatcher = __smatcher_fast; + break;) + IF_BUILD_FASTER(*smatcher = __smatcher_faster; + break;) + IF_BUILD_FASTEST(*smatcher = __smatcher_fastest; + break;) + } + } +#endif + + return 0; +} + +/*********************************************************** + Getblk interface + ***********************************************************/ + +inline +xoff_t xd3_source_eof(const xd3_source *src) +{ + xoff_t r = (src->max_blkno << src->shiftby) + (xoff_t)src->onlastblk; + return r; +} + +inline +usize_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno) +{ + usize_t r = (blkno == src->max_blkno ? + src->onlastblk : + src->blksize); + return r; +} + +/* This function interfaces with the client getblk function, checks + * its results, updates max_blkno, onlastblk, eof_known. */ +static int +xd3_getblk (xd3_stream *stream, xoff_t blkno) +{ + int ret; + xd3_source *source = stream->src; + + if (source->curblk == NULL || blkno != source->curblkno) + { + source->getblkno = blkno; + + if (stream->getblk == NULL) + { + IF_DEBUG2 (DP(RINT "[getblk] XD3_GETSRCBLK %"Q"u\n", blkno)); + stream->msg = "getblk source input"; + return XD3_GETSRCBLK; + } + + ret = stream->getblk (stream, source, blkno); + if (ret != 0) + { + IF_DEBUG2 (DP(RINT "[getblk] app error blkno %"Q"u: %s\n", + blkno, xd3_strerror (ret))); + return ret; + } + + IF_DEBUG2 (DP(RINT "[getblk] read source block %"Q"u onblk " + "%u blksize %u max_blkno %"Q"u\n", blkno, source->onblk, + source->blksize, source->max_blkno)); + } + + if (blkno > source->max_blkno) + { + source->max_blkno = blkno; + + if (source->onblk == source->blksize) + { + IF_DEBUG1 (DP(RINT "[getblk] full source blkno %"Q"u: " + "source length unknown %"Q"u\n", + blkno, + xd3_source_eof (source))); + } + else if (!source->eof_known) + { + IF_DEBUG1 (DP(RINT "[getblk] eof block has %d bytes; " + "source length known %"Q"u\n", + xd3_bytes_on_srcblk (source, blkno), + xd3_source_eof (source))); + source->eof_known = 1; + } + } + + XD3_ASSERT (source->curblk != NULL); + + if (blkno == source->max_blkno) + { + /* In case the application sets the source as 1 block w/ a + * preset buffer. */ + source->onlastblk = source->onblk; + } + return 0; +} + +/*********************************************************** + Stream open/close + ***************************************************************/ + +int +xd3_set_source (xd3_stream *stream, + xd3_source *src) +{ + usize_t shiftby; + + stream->src = src; + src->srclen = 0; + src->srcbase = 0; + + /* Enforce power-of-two blocksize so that source-block number + * calculations are cheap. */ + if (xd3_check_pow2 (src->blksize, &shiftby) != 0) + { + src->blksize = xd3_pow2_roundup(src->blksize); + xd3_check_pow2 (src->blksize, &shiftby); + IF_DEBUG1 (DP(RINT "raising src_blksz to %u\n", src->blksize)); + } + + src->shiftby = shiftby; + src->maskby = (1 << shiftby) - 1; + + if (xd3_check_pow2 (src->max_winsize, NULL) != 0) + { + src->max_winsize = xd3_xoff_roundup(src->max_winsize); + IF_DEBUG1 (DP(RINT "raising src_maxsize to %u\n", src->blksize)); + } + src->max_winsize = xd3_max (src->max_winsize, XD3_ALLOCSIZE); + return 0; +} + +int +xd3_set_source_and_size (xd3_stream *stream, + xd3_source *user_source, + xoff_t source_size) { + int ret = xd3_set_source (stream, user_source); + if (ret == 0) + { + stream->src->eof_known = 1; + + xd3_blksize_div(source_size, + stream->src, + &stream->src->max_blkno, + &stream->src->onlastblk); + + IF_DEBUG1 (DP(RINT "[set source] size known %"Q"u max_blkno %"Q"u\n", + source_size, stream->src->max_blkno)); + } + return ret; +} + +void +xd3_abort_stream (xd3_stream *stream) +{ + stream->dec_state = DEC_ABORTED; + stream->enc_state = ENC_ABORTED; +} + +int +xd3_close_stream (xd3_stream *stream) +{ + if (stream->enc_state != 0 && stream->enc_state != ENC_ABORTED) + { + if (stream->buf_leftover != NULL) + { + stream->msg = "encoding is incomplete"; + return XD3_INTERNAL; + } + + if (stream->enc_state == ENC_POSTWIN) + { +#if XD3_ENCODER + xd3_encode_reset (stream); +#endif + stream->current_window += 1; + stream->enc_state = ENC_INPUT; + } + + /* If encoding, should be ready for more input but not actually + have any. */ + if (stream->enc_state != ENC_INPUT || stream->avail_in != 0) + { + stream->msg = "encoding is incomplete"; + return XD3_INTERNAL; + } + } + else + { + switch (stream->dec_state) + { + case DEC_VCHEAD: + case DEC_WININD: + /* TODO: Address the zero-byte ambiguity. Does the encoder + * emit a window or not? If so, then catch an error here. + * If not, need another routine to say + * decode_at_least_one_if_empty. */ + case DEC_ABORTED: + break; + default: + /* If decoding, should be ready for the next window. */ + stream->msg = "eof in decode"; + return XD3_INVALID_INPUT; + } + } + + return 0; +} + +/************************************************************** + Application header + ****************************************************************/ + +int +xd3_get_appheader (xd3_stream *stream, + uint8_t **data, + usize_t *size) +{ + if (stream->dec_state < DEC_WININD) + { + stream->msg = "application header not available"; + return XD3_INTERNAL; + } + + (*data) = stream->dec_appheader; + (*size) = stream->dec_appheadsz; + return 0; +} + +/********************************************************** + Decoder stuff + *************************************************/ + +#include "xdelta3-decode.h" + +/**************************************************************** + Encoder stuff + *****************************************************************/ + +#if XD3_ENCODER +void +xd3_set_appheader (xd3_stream *stream, + const uint8_t *data, + usize_t size) +{ + stream->enc_appheader = data; + stream->enc_appheadsz = size; +} + +#if XD3_DEBUG +static int +xd3_iopt_check (xd3_stream *stream) +{ + usize_t ul = xd3_rlist_length (& stream->iopt_used); + usize_t fl = xd3_rlist_length (& stream->iopt_free); + + return (ul + fl + (stream->iout ? 1 : 0)) == stream->iopt_size; +} +#endif + +static xd3_rinst* +xd3_iopt_free (xd3_stream *stream, xd3_rinst *i) +{ + xd3_rinst *n = xd3_rlist_remove (i); + xd3_rlist_push_back (& stream->iopt_free, i); + return n; +} + +static void +xd3_iopt_free_nonadd (xd3_stream *stream, xd3_rinst *i) +{ + if (i->type != XD3_ADD) + { + xd3_rlist_push_back (& stream->iopt_free, i); + } +} + +/* When an instruction is ready to flush from the iopt buffer, this + * function is called to produce an encoding. It writes the + * instruction plus size, address, and data to the various encoding + * sections. */ +static int +xd3_iopt_finish_encoding (xd3_stream *stream, xd3_rinst *inst) +{ + int ret; + + /* Check for input overflow. */ + XD3_ASSERT (inst->pos + inst->size <= stream->avail_in); + + switch (inst->type) + { + case XD3_CPY: + { + /* the address may have an offset if there is a source window. */ + usize_t addr; + xd3_source *src = stream->src; + + if (src != NULL) + { + /* If there is a source copy, the source must have its + * source window decided before we can encode. This can + * be bad -- we have to make this decision even if no + * source matches have been found. */ + if (stream->srcwin_decided == 0) + { + if ((ret = xd3_srcwin_setup (stream))) { return ret; } + } + else + { + stream->srcwin_decided_early = (!stream->src->eof_known || + (stream->srcwin_cksum_pos < + xd3_source_eof (stream->src))); + } + + /* xtra field indicates the copy is from the source */ + if (inst->xtra) + { + XD3_ASSERT (inst->addr >= src->srcbase); + XD3_ASSERT (inst->addr + inst->size <= + src->srcbase + src->srclen); + addr = (usize_t)(inst->addr - src->srcbase); + stream->n_scpy += 1; + stream->l_scpy += (xoff_t) inst->size; + } + else + { + /* with source window: target copy address is offset + * by taroff. */ + addr = stream->taroff + (usize_t) inst->addr; + stream->n_tcpy += 1; + stream->l_tcpy += (xoff_t) inst->size; + } + } + else + { + addr = (usize_t) inst->addr; + stream->n_tcpy += 1; + stream->l_tcpy += inst->size; + } + + /* Note: used to assert inst->size >= MIN_MATCH, but not true + * for merge operations & identical match heuristics. */ + /* the "here" position is always offset by taroff */ + if ((ret = xd3_encode_address (stream, addr, inst->pos + stream->taroff, + & inst->type))) + { + return ret; + } + + IF_DEBUG2 ({ + static int cnt; + DP(RINT "[iopt copy:%d] pos %"Q"u-%"Q"u addr %"Q"u-%"Q"u size %u\n", + cnt++, + stream->total_in + inst->pos, + stream->total_in + inst->pos + inst->size, + inst->addr, inst->addr + inst->size, inst->size); + }); + break; + } + case XD3_RUN: + { + if ((ret = xd3_emit_byte (stream, & DATA_TAIL (stream), inst->xtra))) { return ret; } + + stream->n_run += 1; + stream->l_run += inst->size; + + IF_DEBUG2 ({ + static int cnt; + DP(RINT "[iopt run:%d] pos %"Q"u size %u\n", cnt++, stream->total_in + inst->pos, inst->size); + }); + break; + } + case XD3_ADD: + { + if ((ret = xd3_emit_bytes (stream, & DATA_TAIL (stream), + stream->next_in + inst->pos, inst->size))) { return ret; } + + stream->n_add += 1; + stream->l_add += inst->size; + + IF_DEBUG2 ({ + static int cnt; + DP(RINT "[iopt add:%d] pos %"Q"u size %u\n", cnt++, stream->total_in + inst->pos, inst->size); + }); + + break; + } + } + + /* This is the only place stream->unencoded_offset is incremented. */ + XD3_ASSERT (stream->unencoded_offset == inst->pos); + stream->unencoded_offset += inst->size; + + inst->code2 = 0; + + XD3_CHOOSE_INSTRUCTION (stream, stream->iout, inst); + + if (stream->iout != NULL) + { + if (stream->iout->code2 != 0) + { + if ((ret = xd3_emit_double (stream, stream->iout, inst, stream->iout->code2))) { return ret; } + + xd3_iopt_free_nonadd (stream, stream->iout); + xd3_iopt_free_nonadd (stream, inst); + stream->iout = NULL; + return 0; + } + else + { + if ((ret = xd3_emit_single (stream, stream->iout, stream->iout->code1))) { return ret; } + + xd3_iopt_free_nonadd (stream, stream->iout); + } + } + + stream->iout = inst; + + return 0; +} + +/* This possibly encodes an add instruction, iadd, which must remain + * on the stack until the following call to + * xd3_iopt_finish_encoding. */ +static int +xd3_iopt_add (xd3_stream *stream, usize_t pos, xd3_rinst *iadd) +{ + int ret; + usize_t off = stream->unencoded_offset; + + if (pos > off) + { + iadd->type = XD3_ADD; + iadd->pos = off; + iadd->size = pos - off; + + if ((ret = xd3_iopt_finish_encoding (stream, iadd))) { return ret; } + } + + return 0; +} + +/* This function calls xd3_iopt_finish_encoding to finish encoding an + * instruction, and it may also produce an add instruction for an + * unmatched region. */ +static int +xd3_iopt_add_encoding (xd3_stream *stream, xd3_rinst *inst) +{ + int ret; + xd3_rinst iadd; + + if ((ret = xd3_iopt_add (stream, inst->pos, & iadd))) { return ret; } + + if ((ret = xd3_iopt_finish_encoding (stream, inst))) { return ret; } + + return 0; +} + +/* Generates a final add instruction to encode the remaining input. */ +static int +xd3_iopt_add_finalize (xd3_stream *stream) +{ + int ret; + xd3_rinst iadd; + + if ((ret = xd3_iopt_add (stream, stream->avail_in, & iadd))) { return ret; } + + if (stream->iout) + { + if ((ret = xd3_emit_single (stream, stream->iout, stream->iout->code1))) { return ret; } + + xd3_iopt_free_nonadd (stream, stream->iout); + stream->iout = NULL; + } + + return 0; +} + +/* Compact the instruction buffer by choosing the best non-overlapping + * instructions when lazy string-matching. There are no ADDs in the + * iopt buffer because those are synthesized in xd3_iopt_add_encoding + * and during xd3_iopt_add_finalize. */ +static int +xd3_iopt_flush_instructions (xd3_stream *stream, int force) +{ + xd3_rinst *r1 = xd3_rlist_front (& stream->iopt_used); + xd3_rinst *r2; + xd3_rinst *r3; + usize_t r1end; + usize_t r2end; + usize_t r2off; + usize_t r2moff; + usize_t gap; + usize_t flushed; + int ret; + + XD3_ASSERT (xd3_iopt_check (stream)); + + /* Note: once tried to skip this step if it's possible to assert + * there are no overlapping instructions. Doesn't work because + * xd3_opt_erase leaves overlapping instructions. */ + while (! xd3_rlist_end (& stream->iopt_used, r1) && + ! xd3_rlist_end (& stream->iopt_used, r2 = xd3_rlist_next (r1))) + { + r1end = r1->pos + r1->size; + + /* If the instructions do not overlap, continue. */ + if (r1end <= r2->pos) + { + r1 = r2; + continue; + } + + r2end = r2->pos + r2->size; + + /* The min_match adjustments prevent this. */ + XD3_ASSERT (r2end > (r1end + LEAST_MATCH_INCR)); + + /* If r3 is available... */ + if (! xd3_rlist_end (& stream->iopt_used, r3 = xd3_rlist_next (r2))) + { + /* If r3 starts before r1 finishes or just about, r2 is irrelevant */ + if (r3->pos <= r1end + 1) + { + xd3_iopt_free (stream, r2); + continue; + } + } + else if (! force) + { + /* Unless force, end the loop when r3 is not available. */ + break; + } + + r2off = r2->pos - r1->pos; + r2moff = r2end - r1end; + gap = r2end - r1->pos; + + /* If the two matches overlap almost entirely, choose the better match + * and discard the other. The else branch can still create inefficient + * copies, e.g., a 4-byte copy that takes 4 bytes to encode, which + * xd3_smatch() wouldn't allow by its crude efficiency check. However, + * in this case there are adjacent copies which mean the add would cost + * one extra byte. Allow the inefficiency here. */ + if (gap < 2*MIN_MATCH || r2moff <= 2 || r2off <= 2) + { + /* Only one match should be used, choose the longer one. */ + if (r1->size < r2->size) + { + xd3_iopt_free (stream, r1); + r1 = r2; + } + else + { + /* We are guaranteed that r1 does not overlap now, so advance past r2 */ + r1 = xd3_iopt_free (stream, r2); + } + continue; + } + else + { + /* Shorten one of the instructions -- could be optimized + * based on the address cache. */ + usize_t average; + usize_t newsize; + usize_t adjust1; + + XD3_ASSERT (r1end > r2->pos && r2end > r1->pos); + + /* Try to balance the length of both instructions, but avoid + * making both longer than MAX_MATCH_SPLIT . */ + average = gap / 2; + newsize = xd3_min (MAX_MATCH_SPLIT, gap - average); + + /* Should be possible to simplify this code. */ + if (newsize > r1->size) + { + /* shorten r2 */ + adjust1 = r1end - r2->pos; + } + else if (newsize > r2->size) + { + /* shorten r1 */ + adjust1 = r1end - r2->pos; + + XD3_ASSERT (r1->size > adjust1); + + r1->size -= adjust1; + + /* don't shorten r2 */ + adjust1 = 0; + } + else + { + /* shorten r1 */ + adjust1 = r1->size - newsize; + + if (r2->pos > r1end - adjust1) + { + adjust1 -= r2->pos - (r1end - adjust1); + } + + XD3_ASSERT (r1->size > adjust1); + + r1->size -= adjust1; + + /* shorten r2 */ + XD3_ASSERT (r1->pos + r1->size >= r2->pos); + + adjust1 = r1->pos + r1->size - r2->pos; + } + + /* Fallthrough above if-else, shorten r2 */ + XD3_ASSERT (r2->size > adjust1); + + r2->size -= adjust1; + r2->pos += adjust1; + r2->addr += adjust1; + + XD3_ASSERT (r1->size >= MIN_MATCH); + XD3_ASSERT (r2->size >= MIN_MATCH); + + r1 = r2; + } + } + + XD3_ASSERT (xd3_iopt_check (stream)); + + /* If forcing, pick instructions until the list is empty, otherwise + * this empties 50% of the queue. */ + for (flushed = 0; ! xd3_rlist_empty (& stream->iopt_used); ) + { + xd3_rinst *renc = xd3_rlist_pop_front (& stream->iopt_used); + if ((ret = xd3_iopt_add_encoding (stream, renc))) + { + return ret; + } + + if (! force) + { + if (++flushed > stream->iopt_size / 2) + { + break; + } + + /* If there are only two instructions remaining, break, + * because they were not optimized. This means there were + * more than 50% eliminated by the loop above. */ + r1 = xd3_rlist_front (& stream->iopt_used); + if (xd3_rlist_end(& stream->iopt_used, r1) || + xd3_rlist_end(& stream->iopt_used, r2 = xd3_rlist_next (r1)) || + xd3_rlist_end(& stream->iopt_used, r3 = xd3_rlist_next (r2))) + { + break; + } + } + } + + XD3_ASSERT (xd3_iopt_check (stream)); + + XD3_ASSERT (!force || xd3_rlist_length (& stream->iopt_used) == 0); + + return 0; +} + +static int +xd3_iopt_get_slot (xd3_stream *stream, xd3_rinst** iptr) +{ + xd3_rinst *i; + int ret; + + if (xd3_rlist_empty (& stream->iopt_free)) + { + if (stream->iopt_unlimited) + { + usize_t elts = XD3_ALLOCSIZE / sizeof(xd3_rinst); + + if ((ret = xd3_alloc_iopt (stream, elts))) + { + return ret; + } + + stream->iopt_size += elts; + } + else + { + if ((ret = xd3_iopt_flush_instructions (stream, 0))) { return ret; } + + XD3_ASSERT (! xd3_rlist_empty (& stream->iopt_free)); + } + } + + i = xd3_rlist_pop_back (& stream->iopt_free); + + xd3_rlist_push_back (& stream->iopt_used, i); + + (*iptr) = i; + + ++stream->i_slots_used; + + return 0; +} + +/* A copy is about to be emitted that extends backwards to POS, + * therefore it may completely cover some existing instructions in the + * buffer. If an instruction is completely covered by this new match, + * erase it. If the new instruction is covered by the previous one, + * return 1 to skip it. */ +static void +xd3_iopt_erase (xd3_stream *stream, usize_t pos, usize_t size) +{ + while (! xd3_rlist_empty (& stream->iopt_used)) + { + xd3_rinst *r = xd3_rlist_back (& stream->iopt_used); + + /* Verify that greedy is working. The previous instruction + * should end before the new one begins. */ + XD3_ASSERT ((stream->flags & XD3_BEGREEDY) == 0 || (r->pos + r->size <= pos)); + /* Verify that min_match is working. The previous instruction + * should end before the new one ends. */ + XD3_ASSERT ((stream->flags & XD3_BEGREEDY) != 0 || (r->pos + r->size < pos + size)); + + /* See if the last instruction starts before the new + * instruction. If so, there is nothing to erase. */ + if (r->pos < pos) + { + return; + } + + /* Otherwise, the new instruction covers the old one, delete it + and repeat. */ + xd3_rlist_remove (r); + xd3_rlist_push_back (& stream->iopt_free, r); + --stream->i_slots_used; + } +} + +/* This function tells the last matched input position. */ +static usize_t +xd3_iopt_last_matched (xd3_stream *stream) +{ + xd3_rinst *r; + + if (xd3_rlist_empty (& stream->iopt_used)) + { + return 0; + } + + r = xd3_rlist_back (& stream->iopt_used); + + return r->pos + r->size; +} + +/********************************************************* + Emit routines + ***********************************************************/ + +static int +xd3_emit_single (xd3_stream *stream, xd3_rinst *single, usize_t code) +{ + int has_size = stream->code_table[code].size1 == 0; + int ret; + + IF_DEBUG2 (DP(RINT "[emit1] %u %s (%u) code %u\n", + single->pos, + xd3_rtype_to_string ((xd3_rtype) single->type, 0), + single->size, + code)); + + if ((ret = xd3_emit_byte (stream, & INST_TAIL (stream), code))) + { + return ret; + } + + if (has_size) + { + if ((ret = xd3_emit_size (stream, & INST_TAIL (stream), single->size))) + { + return ret; + } + } + + return 0; +} + +static int +xd3_emit_double (xd3_stream *stream, xd3_rinst *first, + xd3_rinst *second, usize_t code) +{ + int ret; + + /* All double instructions use fixed sizes, so all we need to do is + * output the instruction code, no sizes. */ + XD3_ASSERT (stream->code_table[code].size1 != 0 && + stream->code_table[code].size2 != 0); + + if ((ret = xd3_emit_byte (stream, & INST_TAIL (stream), code))) + { + return ret; + } + + IF_DEBUG2 (DP(RINT "[emit2]: %u %s (%u) %s (%u) code %u\n", + first->pos, + xd3_rtype_to_string ((xd3_rtype) first->type, 0), + first->size, + xd3_rtype_to_string ((xd3_rtype) second->type, 0), + second->size, + code)); + + return 0; +} + +/* This enters a potential run instruction into the iopt buffer. The + * position argument is relative to the target window. */ +static int +xd3_emit_run (xd3_stream *stream, usize_t pos, usize_t size, uint8_t *run_c) +{ + xd3_rinst* ri; + int ret; + + if ((ret = xd3_iopt_get_slot (stream, & ri))) { return ret; } + + ri->type = XD3_RUN; + ri->xtra = *run_c; + ri->pos = pos; + ri->size = size; + + return 0; +} + +/* This enters a potential copy instruction into the iopt buffer. The + * position argument is relative to the target window.. */ +int +xd3_found_match (xd3_stream *stream, usize_t pos, + usize_t size, xoff_t addr, int is_source) +{ + xd3_rinst* ri; + int ret; + + if ((ret = xd3_iopt_get_slot (stream, & ri))) { return ret; } + + ri->type = XD3_CPY; + ri->xtra = is_source; + ri->pos = pos; + ri->size = size; + ri->addr = addr; + + return 0; +} + +static int +xd3_emit_hdr (xd3_stream *stream) +{ + int ret; + int use_secondary = stream->sec_type != NULL; + int use_adler32 = stream->flags & (XD3_ADLER32 | XD3_ADLER32_RECODE); + int vcd_source = xd3_encoder_used_source (stream); + usize_t win_ind = 0; + usize_t del_ind = 0; + usize_t enc_len; + usize_t tgt_len; + usize_t data_len; + usize_t inst_len; + usize_t addr_len; + + if (stream->current_window == 0) + { + usize_t hdr_ind = 0; + int use_appheader = stream->enc_appheader != NULL; + + if (use_secondary) { hdr_ind |= VCD_SECONDARY; } + if (use_appheader) { hdr_ind |= VCD_APPHEADER; } + + if ((ret = xd3_emit_byte (stream, & HDR_TAIL (stream), + VCDIFF_MAGIC1)) != 0 || + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), + VCDIFF_MAGIC2)) != 0 || + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), + VCDIFF_MAGIC3)) != 0 || + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), + VCDIFF_VERSION)) != 0 || + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), hdr_ind)) != 0) + { + return ret; + } + + /* Secondary compressor ID */ +#if SECONDARY_ANY + if (use_secondary && + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), + stream->sec_type->id))) + { + return ret; + } +#endif + + /* Application header */ + if (use_appheader) + { + if ((ret = xd3_emit_size (stream, & HDR_TAIL (stream), + stream->enc_appheadsz)) || + (ret = xd3_emit_bytes (stream, & HDR_TAIL (stream), + stream->enc_appheader, + stream->enc_appheadsz))) + { + return ret; + } + } + } + + /* try to compress this window */ +#if SECONDARY_ANY + if (use_secondary) + { + int data_sec = 0; + int inst_sec = 0; + int addr_sec = 0; + +# define ENCODE_SECONDARY_SECTION(UPPER,LOWER) \ + ((stream->flags & XD3_SEC_NO ## UPPER) == 0 && \ + (ret = xd3_encode_secondary (stream, \ + & UPPER ## _HEAD (stream), \ + & UPPER ## _TAIL (stream), \ + & xd3_sec_ ## LOWER (stream), \ + & stream->sec_ ## LOWER, \ + & LOWER ## _sec))) + + if (ENCODE_SECONDARY_SECTION (DATA, data) || + ENCODE_SECONDARY_SECTION (INST, inst) || + ENCODE_SECONDARY_SECTION (ADDR, addr)) + { + return ret; + } + + del_ind |= (data_sec ? VCD_DATACOMP : 0); + del_ind |= (inst_sec ? VCD_INSTCOMP : 0); + del_ind |= (addr_sec ? VCD_ADDRCOMP : 0); + } +#endif + + /* if (vcd_target) { win_ind |= VCD_TARGET; } */ + if (vcd_source) { win_ind |= VCD_SOURCE; } + if (use_adler32) { win_ind |= VCD_ADLER32; } + + /* window indicator */ + if ((ret = xd3_emit_byte (stream, & HDR_TAIL (stream), win_ind))) + { + return ret; + } + + /* source window */ + if (vcd_source) + { + /* or (vcd_target) { ... } */ + if ((ret = xd3_emit_size (stream, & HDR_TAIL (stream), + stream->src->srclen)) || + (ret = xd3_emit_offset (stream, & HDR_TAIL (stream), + stream->src->srcbase))) { return ret; } + } + + tgt_len = stream->avail_in; + data_len = xd3_sizeof_output (DATA_HEAD (stream)); + inst_len = xd3_sizeof_output (INST_HEAD (stream)); + addr_len = xd3_sizeof_output (ADDR_HEAD (stream)); + + /* The enc_len field is a redundency for future extensions.*/ + enc_len = (1 + (xd3_sizeof_size (tgt_len) + + xd3_sizeof_size (data_len) + + xd3_sizeof_size (inst_len) + + xd3_sizeof_size (addr_len)) + + data_len + + inst_len + + addr_len + + (use_adler32 ? 4 : 0)); + + if ((ret = xd3_emit_size (stream, & HDR_TAIL (stream), enc_len)) || + (ret = xd3_emit_size (stream, & HDR_TAIL (stream), tgt_len)) || + (ret = xd3_emit_byte (stream, & HDR_TAIL (stream), del_ind)) || + (ret = xd3_emit_size (stream, & HDR_TAIL (stream), data_len)) || + (ret = xd3_emit_size (stream, & HDR_TAIL (stream), inst_len)) || + (ret = xd3_emit_size (stream, & HDR_TAIL (stream), addr_len))) + { + return ret; + } + + if (use_adler32) + { + uint8_t send[4]; + uint32_t a32; + + if (stream->flags & XD3_ADLER32) + { + a32 = adler32 (1L, stream->next_in, stream->avail_in); + } + else + { + a32 = stream->recode_adler32; + } + + /* Four bytes. */ + send[0] = (uint8_t) (a32 >> 24); + send[1] = (uint8_t) (a32 >> 16); + send[2] = (uint8_t) (a32 >> 8); + send[3] = (uint8_t) (a32 & 0x000000FFU); + + if ((ret = xd3_emit_bytes (stream, & HDR_TAIL (stream), send, 4))) + { + return ret; + } + } + + return 0; +} + +/**************************************************************** + Encode routines + ****************************************************************/ + +static int +xd3_encode_buffer_leftover (xd3_stream *stream) +{ + usize_t take; + usize_t room; + + /* Allocate the buffer. */ + if (stream->buf_in == NULL && + (stream->buf_in = (uint8_t*) xd3_alloc (stream, stream->winsize, 1)) == NULL) + { + return ENOMEM; + } + + IF_DEBUG2 (DP(RINT "[leftover] flush?=%s\n", (stream->flags & XD3_FLUSH) ? "yes" : "no")); + + /* Take leftover input first. */ + if (stream->buf_leftover != NULL) + { + XD3_ASSERT (stream->buf_avail == 0); + XD3_ASSERT (stream->buf_leftavail < stream->winsize); + + IF_DEBUG2 (DP(RINT "[leftover] previous %u avail %u\n", stream->buf_leftavail, stream->avail_in)); + + memcpy (stream->buf_in, stream->buf_leftover, stream->buf_leftavail); + + stream->buf_leftover = NULL; + stream->buf_avail = stream->buf_leftavail; + } + + /* Copy into the buffer. */ + room = stream->winsize - stream->buf_avail; + take = xd3_min (room, stream->avail_in); + + memcpy (stream->buf_in + stream->buf_avail, stream->next_in, take); + + stream->buf_avail += take; + + if (take < stream->avail_in) + { + /* Buffer is full */ + stream->buf_leftover = stream->next_in + take; + stream->buf_leftavail = stream->avail_in - take; + } + else if ((stream->buf_avail < stream->winsize) && !(stream->flags & XD3_FLUSH)) + { + /* Buffer has space */ + IF_DEBUG2 (DP(RINT "[leftover] emptied %u\n", take)); + return XD3_INPUT; + } + + /* Use the buffer: */ + IF_DEBUG2 (DP(RINT "[leftover] take %u remaining %u\n", take, stream->buf_leftavail)); + stream->next_in = stream->buf_in; + stream->avail_in = stream->buf_avail; + stream->buf_avail = 0; + + return 0; +} + +/* Allocates one block of xd3_rlist elements */ +static int +xd3_alloc_iopt (xd3_stream *stream, usize_t elts) +{ + usize_t i; + xd3_iopt_buflist* last = + (xd3_iopt_buflist*) xd3_alloc (stream, sizeof (xd3_iopt_buflist), 1); + + if (last == NULL || + (last->buffer = (xd3_rinst*) xd3_alloc (stream, sizeof (xd3_rinst), elts)) == NULL) + { + return ENOMEM; + } + + last->next = stream->iopt_alloc; + stream->iopt_alloc = last; + + for (i = 0; i < elts; i += 1) + { + xd3_rlist_push_back (& stream->iopt_free, & last->buffer[i]); + } + + return 0; +} + +/* This function allocates all memory initially used by the encoder. */ +static int +xd3_encode_init (xd3_stream *stream, int full_init) +{ + int i; + + if (full_init) + { + int large_comp = (stream->src != NULL); + int small_comp = ! (stream->flags & XD3_NOCOMPRESS); + + /* Memory allocations for checksum tables are delayed until + * xd3_string_match_init in the first call to string_match--that way + * identical or short inputs require no table allocation. */ + if (large_comp) + { + usize_t hash_values = stream->src->max_winsize / + stream->smatcher.large_step; + + xd3_size_hashtable (stream, + hash_values, + & stream->large_hash); + } + + if (small_comp) + { + /* TODO: This is under devel: used to have min (sprevsz) here, which sort + * of makes sense, but observed fast performance w/ larger tables, which + * also sort of makes sense. @@@ */ + usize_t hash_values = stream->winsize; + + xd3_size_hashtable (stream, + hash_values, + & stream->small_hash); + } + } + + /* data buffers */ + for (i = 0; i < ENC_SECTS; i += 1) + { + if ((stream->enc_heads[i] = + stream->enc_tails[i] = + xd3_alloc_output (stream, NULL)) == NULL) + { + return ENOMEM; + } + } + + /* iopt buffer */ + xd3_rlist_init (& stream->iopt_used); + xd3_rlist_init (& stream->iopt_free); + + if (xd3_alloc_iopt (stream, stream->iopt_size) != 0) { goto fail; } + + XD3_ASSERT (xd3_rlist_length (& stream->iopt_free) == stream->iopt_size); + XD3_ASSERT (xd3_rlist_length (& stream->iopt_used) == 0); + + /* address cache, code table */ + stream->acache.s_near = stream->code_table_desc->near_modes; + stream->acache.s_same = stream->code_table_desc->same_modes; + stream->code_table = stream->code_table_func (); + + return xd3_alloc_cache (stream); + + fail: + + return ENOMEM; +} + +int +xd3_encode_init_full (xd3_stream *stream) +{ + return xd3_encode_init (stream, 1); +} + +int +xd3_encode_init_partial (xd3_stream *stream) +{ + return xd3_encode_init (stream, 0); +} + +/* Called after the ENC_POSTOUT state, this puts the output buffers + * back into separate lists and re-initializes some variables. (The + * output lists were spliced together during the ENC_FLUSH state.) */ +static void +xd3_encode_reset (xd3_stream *stream) +{ + int i; + xd3_output *olist; + + stream->avail_in = 0; + stream->small_reset = 1; + stream->i_slots_used = 0; + + if (stream->src != NULL) + { + stream->src->srcbase = 0; + stream->src->srclen = 0; + stream->srcwin_decided = 0; + stream->srcwin_decided_early = 0; + stream->match_minaddr = 0; + stream->match_maxaddr = 0; + stream->taroff = 0; + } + + /* Reset output chains. */ + olist = stream->enc_heads[0]; + + for (i = 0; i < ENC_SECTS; i += 1) + { + XD3_ASSERT (olist != NULL); + + stream->enc_heads[i] = olist; + stream->enc_tails[i] = olist; + olist = olist->next_page; + + stream->enc_heads[i]->next = 0; + stream->enc_heads[i]->next_page = NULL; + + stream->enc_tails[i]->next_page = NULL; + stream->enc_tails[i] = stream->enc_heads[i]; + } + + xd3_freelist_output (stream, olist); +} + +/* The main encoding routine. */ +int +xd3_encode_input (xd3_stream *stream) +{ + int ret, i; + + if (stream->dec_state != 0) + { + stream->msg = "encoder/decoder transition"; + return XD3_INTERNAL; + } + + switch (stream->enc_state) + { + case ENC_INIT: + /* Only reached on first time through: memory setup. */ + if ((ret = xd3_encode_init_full (stream))) { return ret; } + + stream->enc_state = ENC_INPUT; + + case ENC_INPUT: + + /* If there is no input yet, just return. This checks for + * next_in == NULL, not avail_in == 0 since zero bytes is a + * valid input. There is an assertion in xd3_avail_input() that + * next_in != NULL for this reason. By returning right away we + * avoid creating an input buffer before the caller has supplied + * its first data. It is possible for xd3_avail_input to be + * called both before and after the first call to + * xd3_encode_input(). */ + if (stream->next_in == NULL) + { + return XD3_INPUT; + } + + enc_flush: + /* See if we should buffer the input: either if there is already + * a leftover buffer, or if the input is short of winsize + * without flush. The label at this point is reached by a goto + * below, when there is leftover input after postout. */ + if ((stream->buf_leftover != NULL) || + (stream->buf_avail != 0) || + (stream->avail_in < stream->winsize && ! (stream->flags & XD3_FLUSH))) + { + if ((ret = xd3_encode_buffer_leftover (stream))) { return ret; } + } + + /* Initalize the address cache before each window. */ + xd3_init_cache (& stream->acache); + + stream->input_position = 0; + stream->min_match = MIN_MATCH; + stream->unencoded_offset = 0; + + stream->enc_state = ENC_SEARCH; + + IF_DEBUG2 (DP(RINT "[WINSTART:%"Q"u] input bytes %u offset %"Q"u\n", + stream->current_window, stream->avail_in, + stream->total_in)); + return XD3_WINSTART; + + case ENC_SEARCH: + IF_DEBUG2 (DP(RINT "[SEARCH] match_state %d avail_in %u %s\n", + stream->match_state, stream->avail_in, + stream->src ? "source" : "no source")); + + /* Reentrant matching. */ + if (stream->src != NULL) + { + switch (stream->match_state) + { + case MATCH_TARGET: + /* Try matching forward at the start of the target. + * This is entered the first time through, to check for + * a perfect match, and whenever there is a source match + * that extends to the end of the previous window. The + * match_srcpos field is initially zero and later set + * during xd3_source_extend_match. */ + + if (stream->avail_in > 0) + { + /* This call can't fail because the source window is + * unrestricted. */ + ret = xd3_source_match_setup (stream, stream->match_srcpos); + XD3_ASSERT (ret == 0); + stream->match_state = MATCH_FORWARD; + } + else + { + stream->match_state = MATCH_SEARCHING; + stream->match_fwd = 0; + } + XD3_ASSERT (stream->match_fwd == 0); + + case MATCH_FORWARD: + case MATCH_BACKWARD: + if (stream->avail_in != 0) + { + if ((ret = xd3_source_extend_match (stream)) != 0) + { + return ret; + } + + /* The search has to make forward progress here + * or else it can get stuck in a match-backward + * (getsrcblk) then match-forward (getsrcblk), + * find insufficient match length, then repeat + + * exactly the same search. + */ + stream->input_position += stream->match_fwd; + } + + case MATCH_SEARCHING: + /* Continue string matching. (It's possible that the + * initial match continued through the entire input, in + * which case we're still in MATCH_FORWARD and should + * remain so for the next input window.) */ + break; + } + } + + /* String matching... */ + if (stream->avail_in != 0 && + (ret = stream->smatcher.string_match (stream))) + { + return ret; + } + + stream->enc_state = ENC_INSTR; + + case ENC_INSTR: + /* Note: Jump here to encode VCDIFF deltas w/o using this + * string-matching code. Merging code enters here. */ + + /* Flush the instrution buffer, then possibly add one more + * instruction, then emit the header. */ + if ((ret = xd3_iopt_flush_instructions (stream, 1)) || + (ret = xd3_iopt_add_finalize (stream))) + { + return ret; + } + + stream->enc_state = ENC_FLUSH; + + case ENC_FLUSH: + /* Note: main_recode_func() bypasses string-matching by setting + * ENC_FLUSH. */ + if ((ret = xd3_emit_hdr (stream))) + { + return ret; + } + + /* Begin output. */ + stream->enc_current = HDR_HEAD (stream); + + /* Chain all the outputs together. After doing this, it looks + * as if there is only one section. The other enc_heads are set + * to NULL to avoid freeing them more than once. */ + for (i = 1; i < ENC_SECTS; i += 1) + { + stream->enc_tails[i-1]->next_page = stream->enc_heads[i]; + stream->enc_heads[i] = NULL; + } + + enc_output: + + stream->enc_state = ENC_POSTOUT; + stream->next_out = stream->enc_current->base; + stream->avail_out = stream->enc_current->next; + stream->total_out += (xoff_t) stream->avail_out; + + /* If there is any output in this buffer, return it, otherwise + * fall through to handle the next buffer or finish the window + * after all buffers have been output. */ + if (stream->avail_out > 0) + { + /* This is the only place xd3_encode returns XD3_OUTPUT */ + return XD3_OUTPUT; + } + + case ENC_POSTOUT: + + if (stream->avail_out != 0) + { + stream->msg = "missed call to consume output"; + return XD3_INTERNAL; + } + + /* Continue outputting one buffer at a time, until the next is NULL. */ + if ((stream->enc_current = stream->enc_current->next_page) != NULL) + { + goto enc_output; + } + + stream->total_in += (xoff_t) stream->avail_in; + stream->enc_state = ENC_POSTWIN; + + IF_DEBUG2 (DP(RINT "[WINFINISH:%"Q"u] in=%"Q"u\n", + stream->current_window, + stream->total_in)); + return XD3_WINFINISH; + + case ENC_POSTWIN: + + xd3_encode_reset (stream); + + stream->current_window += 1; + stream->enc_state = ENC_INPUT; + + /* If there is leftover input to flush, repeat. */ + if (stream->buf_leftover != NULL) + { + goto enc_flush; + } + + /* Ready for more input. */ + return XD3_INPUT; + + default: + stream->msg = "invalid state"; + return XD3_INTERNAL; + } +} +#endif /* XD3_ENCODER */ + +/***************************************************************** + Client convenience functions + ******************************************************************/ + +int +xd3_process_stream (int is_encode, + xd3_stream *stream, + int (*func) (xd3_stream *), + int close_stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max) +{ + usize_t ipos = 0; + usize_t n = xd3_min (stream->winsize, input_size); + + (*output_size) = 0; + + stream->flags |= XD3_FLUSH; + + xd3_avail_input (stream, input + ipos, n); + ipos += n; + + for (;;) + { + int ret; + switch ((ret = func (stream))) + { + case XD3_OUTPUT: { /* memcpy below */ break; } + case XD3_INPUT: { + n = xd3_min(stream->winsize, input_size - ipos); + if (n == 0) + { + goto done; + } + xd3_avail_input (stream, input + ipos, n); + ipos += n; + continue; + } + case XD3_GOTHEADER: { /* ignore */ continue; } + case XD3_WINSTART: { /* ignore */ continue; } + case XD3_WINFINISH: { /* ignore */ continue; } + case XD3_GETSRCBLK: + { + /* When the getblk function is NULL, it is necessary to + * provide the complete source as a single block using + * xd3_set_source_and_size, otherwise this error. The + * library should never ask for another source block. */ + stream->msg = "library requested source block"; + return XD3_INTERNAL; + } + case 0: + { + /* xd3_encode_input/xd3_decode_input never return 0 */ + stream->msg = "invalid return: 0"; + return XD3_INTERNAL; + } + default: + return ret; + } + + if (*output_size + stream->avail_out > output_size_max) + { + stream->msg = "insufficient output space"; + return ENOSPC; + } + + memcpy (output + *output_size, stream->next_out, stream->avail_out); + + *output_size += stream->avail_out; + + xd3_consume_output (stream); + } + done: + return (close_stream == 0) ? 0 : xd3_close_stream (stream); +} + +static int +xd3_process_memory (int is_encode, + int (*func) (xd3_stream *), + const uint8_t *input, + usize_t input_size, + const uint8_t *source, + usize_t source_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max, + int flags) { + xd3_stream stream; + xd3_config config; + xd3_source src; + int ret; + + memset (& stream, 0, sizeof (stream)); + memset (& config, 0, sizeof (config)); + + if (input == NULL || output == NULL) { + stream.msg = "invalid input/output buffer"; + ret = XD3_INTERNAL; + goto exit; + } + + config.flags = flags; + + if (is_encode) + { + config.winsize = xd3_min(input_size, (usize_t) XD3_DEFAULT_WINSIZE); + config.sprevsz = xd3_pow2_roundup (config.winsize); + } + + if ((ret = xd3_config_stream (&stream, &config)) != 0) + { + goto exit; + } + + if (source != NULL) + { + memset (& src, 0, sizeof (src)); + + src.blksize = source_size; + src.onblk = source_size; + src.curblk = source; + src.curblkno = 0; + src.max_winsize = source_size; + + if ((ret = xd3_set_source_and_size (&stream, &src, source_size)) != 0) + { + goto exit; + } + } + + if ((ret = xd3_process_stream (is_encode, + & stream, + func, 1, + input, input_size, + output, + output_size, + output_size_max)) != 0) + { + goto exit; + } + + exit: + if (ret != 0) + { + IF_DEBUG2 (DP(RINT "process_memory: %d: %s\n", ret, stream.msg)); + } + xd3_free_stream(&stream); + return ret; +} + +int +xd3_decode_stream (xd3_stream *stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max) +{ + return xd3_process_stream (0, stream, & xd3_decode_input, 1, + input, input_size, + output, output_size, output_size_max); +} + +int +xd3_decode_memory (const uint8_t *input, + usize_t input_size, + const uint8_t *source, + usize_t source_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max, + int flags) { + return xd3_process_memory (0, & xd3_decode_input, + input, input_size, + source, source_size, + output, output_size, output_size_max, + flags); +} + + +#if XD3_ENCODER +int +xd3_encode_stream (xd3_stream *stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max) +{ + return xd3_process_stream (1, stream, & xd3_encode_input, 1, + input, input_size, + output, output_size, output_size_max); +} + +int +xd3_encode_memory (const uint8_t *input, + usize_t input_size, + const uint8_t *source, + usize_t source_size, + uint8_t *output, + usize_t *output_size, + usize_t output_size_max, + int flags) { + return xd3_process_memory (1, & xd3_encode_input, + input, input_size, + source, source_size, + output, output_size, output_size_max, + flags); +} +#endif + + +/************************************************************* + String matching helpers + *************************************************************/ + +#if XD3_ENCODER +/* Do the initial xd3_string_match() checksum table setup. + * Allocations are delayed until first use to avoid allocation + * sometimes (e.g., perfect matches, zero-length inputs). */ +static int +xd3_string_match_init (xd3_stream *stream) +{ + const int DO_SMALL = ! (stream->flags & XD3_NOCOMPRESS); + const int DO_LARGE = (stream->src != NULL); + + if (DO_LARGE && stream->large_table == NULL) + { + if ((stream->large_table = + (usize_t*) xd3_alloc0 (stream, stream->large_hash.size, sizeof (usize_t))) == NULL) + { + return ENOMEM; + } + } + + if (DO_SMALL) + { + /* Subsequent calls can return immediately after checking reset. */ + if (stream->small_table != NULL) + { + /* The target hash table is reinitialized once per window. */ + /* TODO: This would not have to be reinitialized if absolute + * offsets were being stored. */ + if (stream->small_reset) + { + stream->small_reset = 0; + memset (stream->small_table, 0, + sizeof (usize_t) * stream->small_hash.size); + } + + return 0; + } + + if ((stream->small_table = + (usize_t*) xd3_alloc0 (stream, + stream->small_hash.size, + sizeof (usize_t))) == NULL) + { + return ENOMEM; + } + + /* If there is a previous table needed. */ + if (stream->smatcher.small_lchain > 1 || + stream->smatcher.small_chain > 1) + { + if ((stream->small_prev = + (xd3_slist*) xd3_alloc (stream, + stream->sprevsz, + sizeof (xd3_slist))) == NULL) + { + return ENOMEM; + } + } + } + + return 0; +} + +#if XD3_USE_LARGEFILE64 +/* This function handles the 32/64bit ambiguity -- file positions are 64bit + * but the hash table for source-offsets is 32bit. */ +static xoff_t +xd3_source_cksum_offset(xd3_stream *stream, usize_t low) +{ + xoff_t scp = stream->srcwin_cksum_pos; + xoff_t s0 = scp >> 32; + + usize_t sr = (usize_t) scp; + + if (s0 == 0) { + return low; + } + + /* This should not be >= because srcwin_cksum_pos is the next + * position to index. */ + if (low > sr) { + return (--s0 << 32) | low; + } + + return (s0 << 32) | low; +} +#else +static xoff_t +xd3_source_cksum_offset(xd3_stream *stream, usize_t low) +{ + return (xoff_t) low; +} +#endif + +/* This function sets up the stream->src fields srcbase, srclen. The + * call is delayed until these values are needed to encode a copy + * address. At this point the decision has to be made. */ +static int +xd3_srcwin_setup (xd3_stream *stream) +{ + xd3_source *src = stream->src; + xoff_t length, x; + + /* Check the undecided state. */ + XD3_ASSERT (src->srclen == 0 && src->srcbase == 0); + + /* Avoid repeating this call. */ + stream->srcwin_decided = 1; + + /* If the stream is flushing, then the iopt buffer was able to + * contain the complete encoding. If no copies were issued no + * source window is actually needed. This prevents the VCDIFF + * header from including source base/len. xd3_emit_hdr checks for + * srclen == 0. */ + if (stream->enc_state == ENC_INSTR && stream->match_maxaddr == 0) + { + goto done; + } + + /* Check for overflow, srclen is usize_t - this can't happen unless + * XD3_DEFAULT_SRCBACK and related parameters are extreme - should + * use smaller windows. */ + length = stream->match_maxaddr - stream->match_minaddr; + + x = (xoff_t) USIZE_T_MAX; + if (length > x) + { + stream->msg = "source window length overflow (not 64bit)"; + return XD3_INTERNAL; + } + + /* If ENC_INSTR, then we know the exact source window to use because + * no more copies can be issued. */ + if (stream->enc_state == ENC_INSTR) + { + src->srcbase = stream->match_minaddr; + src->srclen = (usize_t) length; + XD3_ASSERT (src->srclen); + goto done; + } + + /* Otherwise, we have to make a guess. More copies may still be + * issued, but we have to decide the source window base and length + * now. */ + /* TODO: This may not working well in practice, more testing needed. */ + src->srcbase = stream->match_minaddr; + src->srclen = xd3_max ((usize_t) length, + stream->avail_in + (stream->avail_in >> 2)); + + if (src->eof_known) + { + /* Note: if the source size is known, we must reduce srclen or + * code that expects to pass a single block w/ getblk == NULL + * will not function, as the code will return GETSRCBLK asking + * for the second block. */ + src->srclen = xd3_min (src->srclen, xd3_source_eof(src) - src->srcbase); + } + + IF_DEBUG1 (DP(RINT "[srcwin_setup_constrained] base %"Q"u len %u\n", + src->srcbase, src->srclen)); + + XD3_ASSERT (src->srclen); + done: + /* Set the taroff. This convenience variable is used even when + stream->src == NULL. */ + stream->taroff = src->srclen; + return 0; +} + +/* Sets the bounding region for a newly discovered source match, prior + * to calling xd3_source_extend_match(). This sets the match_maxfwd, + * match_maxback variables. Note: srcpos is an absolute position + * (xoff_t) but the match_maxfwd, match_maxback variables are usize_t. + * Returns 0 if the setup succeeds, or 1 if the source position lies + * outside an already-decided srcbase/srclen window. */ +static int +xd3_source_match_setup (xd3_stream *stream, xoff_t srcpos) +{ + xd3_source *const src = stream->src; + usize_t greedy_or_not; + + stream->match_maxback = 0; + stream->match_maxfwd = 0; + stream->match_back = 0; + stream->match_fwd = 0; + + /* This avoids a non-blocking endless loop caused by scanning + * backwards across a block boundary, only to find not enough + * matching bytes to beat the current min_match due to a better lazy + * target match: the re-entry to xd3_string_match() repeats the same + * long match because the input position hasn't changed. TODO: if + * ever duplicates are added to the source hash table, this logic + * won't suffice to avoid loops. See testing/regtest.cc's + * TestNonBlockingProgress test! */ + if (srcpos != 0 && srcpos == stream->match_last_srcpos) + { + IF_DEBUG2(DP(RINT "[match_setup] looping failure\n")); + goto bad; + } + + /* Implement src->max_winsize, which prevents the encoder from seeking + * back further than the LRU cache maintaining FIFO discipline, (to + * avoid seeking). */ + if (srcpos < stream->srcwin_cksum_pos && + stream->srcwin_cksum_pos - srcpos > src->max_winsize) + { + IF_DEBUG2(DP(RINT "[match_setup] rejected due to src->max_winsize " + "distance eof=%"Q"u srcpos=%"Q"u max_winsz=%"Q"u\n", + xd3_source_eof (src), + srcpos, src->max_winsize)); + goto bad; + } + + /* There are cases where the above test does not reject a match that + * will experience XD3_TOOFARBACK at the first xd3_getblk call + * because the input may have advanced up to one block beyond the + * actual EOF. */ + IF_DEBUG2(DP(RINT "[match_setup] %"Q"u srcpos %"Q"u, " + "src->max_winsize %"Q"u\n", + stream->total_in + stream->input_position, + srcpos, src->max_winsize)); + + /* Going backwards, the 1.5-pass algorithm allows some + * already-matched input may be covered by a longer source match. + * The greedy algorithm does not allow this. */ + if (stream->flags & XD3_BEGREEDY) + { + /* The greedy algorithm allows backward matching to the last + matched position. */ + greedy_or_not = xd3_iopt_last_matched (stream); + } + else + { + /* The 1.5-pass algorithm allows backward matching to go back as + * far as the unencoded offset, which is updated as instructions + * pass out of the iopt buffer. If this (default) is chosen, it + * means xd3_iopt_erase may be called to eliminate instructions + * when a covering source match is found. */ + greedy_or_not = stream->unencoded_offset; + } + + /* Backward target match limit. */ + XD3_ASSERT (stream->input_position >= greedy_or_not); + stream->match_maxback = stream->input_position - greedy_or_not; + + /* Forward target match limit. */ + XD3_ASSERT (stream->avail_in > stream->input_position); + stream->match_maxfwd = stream->avail_in - stream->input_position; + + /* Now we take the source position into account. It depends whether + * the srclen/srcbase have been decided yet. */ + if (stream->srcwin_decided == 0) + { + /* Unrestricted case: the match can cover the entire source, + * 0--src->size. We compare the usize_t + * match_maxfwd/match_maxback against the xoff_t + * src->size/srcpos values and take the min. */ + if (srcpos < (xoff_t) stream->match_maxback) + { + stream->match_maxback = (usize_t) srcpos; + } + + if (src->eof_known) + { + xoff_t srcavail = xd3_source_eof (src) - srcpos; + + if (srcavail < (xoff_t) stream->match_maxfwd) + { + stream->match_maxfwd = (usize_t) srcavail; + } + } + + IF_DEBUG2(DP(RINT + "[match_setup] srcpos %"Q"u (tgtpos %"Q"u) " + "unrestricted maxback %u maxfwd %u\n", + srcpos, + stream->total_in + stream->input_position, + stream->match_maxback, + stream->match_maxfwd)); + goto good; + } + + /* Decided some source window. */ + XD3_ASSERT (src->srclen > 0); + + /* Restricted case: fail if the srcpos lies outside the source window */ + if ((srcpos < src->srcbase) || + (srcpos > (src->srcbase + (xoff_t) src->srclen))) + { + IF_DEBUG1(DP(RINT "[match_setup] restricted source window failure\n")); + goto bad; + } + else + { + usize_t srcavail; + + srcavail = (usize_t) (srcpos - src->srcbase); + if (srcavail < stream->match_maxback) + { + stream->match_maxback = srcavail; + } + + srcavail = (usize_t) (src->srcbase + (xoff_t) src->srclen - srcpos); + if (srcavail < stream->match_maxfwd) + { + stream->match_maxfwd = srcavail; + } + + IF_DEBUG2(DP(RINT + "[match_setup] srcpos %"Q"u (tgtpos %"Q"u) " + "restricted maxback %u maxfwd %u\n", + srcpos, + stream->total_in + stream->input_position, + stream->match_maxback, + stream->match_maxfwd)); + goto good; + } + + good: + stream->match_state = MATCH_BACKWARD; + stream->match_srcpos = srcpos; + stream->match_last_srcpos = srcpos; + return 0; + + bad: + stream->match_state = MATCH_SEARCHING; + stream->match_last_srcpos = srcpos; + return 1; +} + +static inline int +xd3_forward_match(const uint8_t *s1c, const uint8_t *s2c, int n) +{ + int i = 0; +#if UNALIGNED_OK + int nint = n / sizeof(int); + + if (nint >> 3) + { + int j = 0; + const int *s1 = (const int*)s1c; + const int *s2 = (const int*)s2c; + int nint_8 = nint - 8; + + while (i <= nint_8 && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++] && + s1[i++] == s2[j++]) { } + + i = (i - 1) * sizeof(int); + } +#endif + + while (i < n && s1c[i] == s2c[i]) + { + i++; + } + return i; +} + +/* This function expands the source match backward and forward. It is + * reentrant, since xd3_getblk may return XD3_GETSRCBLK, so most + * variables are kept in xd3_stream. There are two callers of this + * function, the string_matching routine when a checksum match is + * discovered, and xd3_encode_input whenever a continuing (or initial) + * match is suspected. The two callers do different things with the + * input_position, thus this function leaves that variable untouched. + * If a match is taken the resulting stream->match_fwd is left + * non-zero. */ +static int +xd3_source_extend_match (xd3_stream *stream) +{ + int ret; + xd3_source *const src = stream->src; + xoff_t matchoff; /* matchoff is the current right/left-boundary of + the source match being tested. */ + usize_t streamoff; /* streamoff is the current right/left-boundary + of the input match being tested. */ + xoff_t tryblk; /* tryblk, tryoff are the block, offset position + of matchoff */ + usize_t tryoff; + usize_t tryrem; /* tryrem is the number of matchable bytes */ + usize_t matched; + + XD3_ASSERT (src != NULL); + + /* Does it make sense to compute backward match AFTER forward match? */ + if (stream->match_state == MATCH_BACKWARD) + { + /* Note: this code is practically duplicated below, substituting + * match_fwd/match_back and direction. */ + matchoff = stream->match_srcpos - stream->match_back; + streamoff = stream->input_position - stream->match_back; + xd3_blksize_div (matchoff, src, &tryblk, &tryoff); + + /* this loops backward over source blocks */ + while (stream->match_back < stream->match_maxback) + { + /* see if we're backing across a source block boundary */ + if (tryoff == 0) + { + tryoff = src->blksize; + tryblk -= 1; + } + + if ((ret = xd3_getblk (stream, tryblk))) + { + if (ret == XD3_TOOFARBACK) + { + IF_DEBUG2(DP(RINT "[maxback] %"Q"u TOOFARBACK: %u INP %"Q"u CKSUM %"Q"u\n", + tryblk, stream->match_back, + stream->total_in + stream->input_position, + stream->srcwin_cksum_pos)); + + /* the starting position is too far back. */ + if (stream->match_back == 0) + { + XD3_ASSERT(stream->match_fwd == 0); + goto donefwd; + } + + /* search went too far back, continue forward. */ + goto doneback; + } + + /* could be a XD3_GETSRCBLK failure. */ + return ret; + } + + tryrem = xd3_min (tryoff, stream->match_maxback - stream->match_back); + + IF_DEBUG2(DP(RINT "[maxback] maxback %u trysrc %"Q"u/%u tgt %u tryrem %u\n", + stream->match_maxback, tryblk, tryoff, streamoff, tryrem)); + + /* TODO: This code can be optimized similar to xd3_match_forward() */ + for (; tryrem != 0; tryrem -= 1, stream->match_back += 1) + { + if (src->curblk[tryoff-1] != stream->next_in[streamoff-1]) + { + goto doneback; + } + + tryoff -= 1; + streamoff -= 1; + } + } + + doneback: + stream->match_state = MATCH_FORWARD; + } + + XD3_ASSERT (stream->match_state == MATCH_FORWARD); + + matchoff = stream->match_srcpos + stream->match_fwd; + streamoff = stream->input_position + stream->match_fwd; + xd3_blksize_div (matchoff, src, & tryblk, & tryoff); + + /* Note: practically the same code as backwards case above: same comments */ + while (stream->match_fwd < stream->match_maxfwd) + { + if (tryoff == src->blksize) + { + tryoff = 0; + tryblk += 1; + } + + if ((ret = xd3_getblk (stream, tryblk))) + { + if (ret == XD3_TOOFARBACK) + { + IF_DEBUG2(DP(RINT "[maxfwd] %"Q"u TOOFARBACK: %u INP %"Q"u CKSUM %"Q"u\n", + tryblk, stream->match_fwd, + stream->total_in + stream->input_position, + stream->srcwin_cksum_pos)); + goto donefwd; + } + + /* could be a XD3_GETSRCBLK failure. */ + return ret; + } + + tryrem = xd3_min(stream->match_maxfwd - stream->match_fwd, + src->onblk - tryoff); + + if (tryrem == 0) + { + /* Generally, this means we have a power-of-two size source + * and we just found the end-of-file, in this case it's an + * empty block. */ + XD3_ASSERT (src->onblk < src->blksize); + break; + } + + matched = xd3_forward_match(src->curblk + tryoff, + stream->next_in + streamoff, + tryrem); + tryoff += matched; + streamoff += matched; + stream->match_fwd += matched; + + if (tryrem != matched) + { + break; + } + } + + donefwd: + stream->match_state = MATCH_SEARCHING; + + IF_DEBUG2(DP(RINT "[extend match] input %"Q"u srcpos %"Q"u len %u\n", + stream->input_position + stream->total_in, + stream->match_srcpos, + stream->match_fwd)); + + /* If the match ends short of the last instruction end, we probably + * don't want it. There is the possibility that a copy ends short + * of the last copy but also goes further back, in which case we + * might want it. This code does not implement such: if so we would + * need more complicated xd3_iopt_erase logic. */ + if (stream->match_fwd < stream->min_match) + { + stream->match_fwd = 0; + } + else + { + usize_t total = stream->match_fwd + stream->match_back; + + /* Correct the variables to remove match_back from the equation. */ + usize_t target_position = stream->input_position - stream->match_back; + usize_t match_length = stream->match_back + stream->match_fwd; + xoff_t match_position = stream->match_srcpos - stream->match_back; + xoff_t match_end = stream->match_srcpos + stream->match_fwd; + + /* At this point we may have to erase any iopt-buffer + * instructions that are fully covered by a backward-extending + * copy. */ + if (stream->match_back > 0) + { + xd3_iopt_erase (stream, target_position, total); + } + + stream->match_back = 0; + + /* Update ranges. The first source match occurs with both + values set to 0. */ + if (stream->match_maxaddr == 0 || + match_position < stream->match_minaddr) + { + stream->match_minaddr = match_position; + } + + if (match_end > stream->match_maxaddr) + { + /* Note: per-window */ + stream->match_maxaddr = match_end; + } + + if (match_end > stream->maxsrcaddr) + { + /* Note: across windows */ + stream->maxsrcaddr = match_end; + } + + IF_DEBUG2 ({ + static int x = 0; + DP(RINT "[source match:%d] length %u <inp %"Q"u %"Q"u> <src %"Q"u %"Q"u> (%s) [ %u bytes ]\n", + x++, + match_length, + stream->total_in + target_position, + stream->total_in + target_position + match_length, + match_position, + match_position + match_length, + (stream->total_in + target_position == match_position) ? "same" : "diff", + match_length); + }); + + if ((ret = xd3_found_match (stream, + /* decoder position */ target_position, + /* length */ match_length, + /* address */ match_position, + /* is_source */ 1))) + { + return ret; + } + + /* If the match ends with the available input: */ + if (target_position + match_length == stream->avail_in) + { + /* Setup continuing match for the next window. */ + stream->match_state = MATCH_TARGET; + stream->match_srcpos = match_end; + } + } + + return 0; +} + +/* Update the small hash. Values in the small_table are offset by + * HASH_CKOFFSET (1) to distinguish empty buckets from real offsets. */ +static void +xd3_scksum_insert (xd3_stream *stream, + usize_t inx, + usize_t scksum, + usize_t pos) +{ + /* If we are maintaining previous duplicates. */ + if (stream->small_prev) + { + usize_t last_pos = stream->small_table[inx]; + xd3_slist *pos_list = & stream->small_prev[pos & stream->sprevmask]; + + /* Note last_pos is offset by HASH_CKOFFSET. */ + pos_list->last_pos = last_pos; + } + + /* Enter the new position into the hash bucket. */ + stream->small_table[inx] = pos + HASH_CKOFFSET; +} + +#if XD3_DEBUG +static int +xd3_check_smatch (const uint8_t *ref0, const uint8_t *inp0, + const uint8_t *inp_max, usize_t cmp_len) +{ + usize_t i; + + for (i = 0; i < cmp_len; i += 1) + { + XD3_ASSERT (ref0[i] == inp0[i]); + } + + if (inp0 + cmp_len < inp_max) + { + XD3_ASSERT (inp0[i] != ref0[i]); + } + + return 1; +} +#endif /* XD3_DEBUG */ + +/* When the hash table indicates a possible small string match, it + * calls this routine to find the best match. The first matching + * position is taken from the small_table, HASH_CKOFFSET is subtracted + * to get the actual position. After checking that match, if previous + * linked lists are in use (because stream->smatcher.small_chain > 1), + * previous matches are tested searching for the longest match. If + * (stream->min_match > MIN_MATCH) then a lazy match is in effect. + */ +static usize_t +xd3_smatch (xd3_stream *stream, + usize_t base, + usize_t scksum, + usize_t *match_offset) +{ + usize_t cmp_len; + usize_t match_length = 0; + usize_t chain = (stream->min_match == MIN_MATCH ? + stream->smatcher.small_chain : + stream->smatcher.small_lchain); + const uint8_t *inp_max = stream->next_in + stream->avail_in; + const uint8_t *inp; + const uint8_t *ref; + + SMALL_HASH_DEBUG1 (stream, stream->next_in + stream->input_position); + + XD3_ASSERT (stream->min_match + stream->input_position <= stream->avail_in); + + base -= HASH_CKOFFSET; + + again: + + IF_DEBUG2 (DP(RINT "smatch at base=%u inp=%u cksum=%u\n", base, + stream->input_position, scksum)); + + /* For small matches, we can always go to the end-of-input because + * the matching position must be less than the input position. */ + XD3_ASSERT (base < stream->input_position); + + ref = stream->next_in + base; + inp = stream->next_in + stream->input_position; + + SMALL_HASH_DEBUG2 (stream, ref); + + /* Expand potential match forward. */ + while (inp < inp_max && *inp == *ref) + { + ++inp; + ++ref; + } + + cmp_len = (usize_t)(inp - (stream->next_in + stream->input_position)); + + /* Verify correctness */ + XD3_ASSERT (xd3_check_smatch (stream->next_in + base, + stream->next_in + stream->input_position, + inp_max, cmp_len)); + + /* Update longest match */ + if (cmp_len > match_length) + { + ( match_length) = cmp_len; + (*match_offset) = base; + + /* Stop if we match the entire input or have a long_enough match. */ + if (inp == inp_max || cmp_len >= stream->smatcher.long_enough) + { + goto done; + } + } + + /* If we have not reached the chain limit, see if there is another + previous position. */ + while (--chain != 0) + { + /* Calculate the previous offset. */ + usize_t prev_pos = stream->small_prev[base & stream->sprevmask].last_pos; + usize_t diff_pos; + + if (prev_pos == 0) + { + break; + } + + prev_pos -= HASH_CKOFFSET; + + if (prev_pos > base) + { + break; + } + + base = prev_pos; + + XD3_ASSERT (stream->input_position > base); + diff_pos = stream->input_position - base; + + /* Stop searching if we go beyond sprevsz, since those entries + * are for unrelated checksum entries. */ + if (diff_pos & ~stream->sprevmask) + { + break; + } + + goto again; + } + + done: + /* Crude efficiency test: if the match is very short and very far back, it's + * unlikely to help, but the exact calculation requires knowing the state of + * the address cache and adjacent instructions, which we can't do here. + * Rather than encode a probably inefficient copy here and check it later + * (which complicates the code a lot), do this: + */ + if (match_length == 4 && stream->input_position - (*match_offset) >= 1<<14) + { + /* It probably takes >2 bytes to encode an address >= 2^14 from here */ + return 0; + } + if (match_length == 5 && stream->input_position - (*match_offset) >= 1<<21) + { + /* It probably takes >3 bytes to encode an address >= 2^21 from here */ + return 0; + } + + /* It's unlikely that a window is large enough for the (match_length == 6 && + * address >= 2^28) check */ + return match_length; +} + +#if XD3_DEBUG +static void +xd3_verify_small_state (xd3_stream *stream, + const uint8_t *inp, + uint32_t x_cksum) +{ + uint32_t state; + uint32_t cksum = xd3_scksum (&state, inp, stream->smatcher.small_look); + + XD3_ASSERT (cksum == x_cksum); +} + +static void +xd3_verify_large_state (xd3_stream *stream, + const uint8_t *inp, + uint32_t x_cksum) +{ + uint32_t cksum = xd3_lcksum (inp, stream->smatcher.large_look); + XD3_ASSERT (cksum == x_cksum); +} +static void +xd3_verify_run_state (xd3_stream *stream, + const uint8_t *inp, + usize_t x_run_l, + uint8_t *x_run_c) +{ + usize_t slook = stream->smatcher.small_look; + uint8_t run_c; + usize_t run_l = xd3_comprun (inp, slook, &run_c); + + XD3_ASSERT (run_l == 0 || run_c == *x_run_c); + XD3_ASSERT (x_run_l > slook || run_l == x_run_l); +} +#endif /* XD3_DEBUG */ + +/* This function computes more source checksums to advance the window. + * Called at every entrance to the string-match loop and each time + * stream->input_position reaches the value returned as + * *next_move_point. NB: this is one of the most expensive functions + * in this code and also the most critical for good compression. + */ +static int +xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point) +{ + /* the source file is indexed until this point */ + xoff_t target_cksum_pos; + /* the absolute target file input position */ + xoff_t absolute_input_pos; + + if (stream->src->eof_known) + { + xoff_t source_size = xd3_source_eof (stream->src); + XD3_ASSERT(stream->srcwin_cksum_pos <= source_size); + + if (stream->srcwin_cksum_pos == source_size) + { + *next_move_point = USIZE_T_MAX; + return 0; + } + } + + absolute_input_pos = stream->total_in + stream->input_position; + + /* Immediately read the entire window. + * + * Note: this reverses a long held policy, at this point in the + * code, of advancing relatively slowly as the input is read, which + * results in better compression for very-similar inputs, but worse + * compression where data is deleted near the beginning of the file. + * + * The new policy is simpler, somewhat slower and can benefit, or + * slightly worsen, compression performance. */ + if (absolute_input_pos < stream->src->max_winsize / 2) + { + target_cksum_pos = stream->src->max_winsize; + } + else + { + /* TODO: The addition of 2 blocks here is arbitrary. Do a + * better job of stream alignment based on observed source copy + * addresses, and when both input sizes are known, the + * difference in size. */ + target_cksum_pos = absolute_input_pos + + stream->src->max_winsize / 2 + + stream->src->blksize * 2; + target_cksum_pos &= ~stream->src->maskby; + } + + /* A long match may have extended past srcwin_cksum_pos. Don't + * start checksumming already-matched source data. */ + if (stream->maxsrcaddr > stream->srcwin_cksum_pos) + { + stream->srcwin_cksum_pos = stream->maxsrcaddr; + } + + if (target_cksum_pos < stream->srcwin_cksum_pos) + { + target_cksum_pos = stream->srcwin_cksum_pos; + } + + while (stream->srcwin_cksum_pos < target_cksum_pos && + (!stream->src->eof_known || + stream->srcwin_cksum_pos < xd3_source_eof (stream->src))) + { + xoff_t blkno; + xoff_t blkbaseoffset; + usize_t blkrem; + ssize_t oldpos; /* Using ssize_t because of a */ + ssize_t blkpos; /* do { blkpos-- } + while (blkpos >= oldpos); */ + int ret; + xd3_blksize_div (stream->srcwin_cksum_pos, + stream->src, &blkno, &blkrem); + oldpos = blkrem; + + if ((ret = xd3_getblk (stream, blkno))) + { + /* TOOFARBACK should never occur here, since we read forward. */ + if (ret == XD3_TOOFARBACK) + { + ret = XD3_INTERNAL; + } + + IF_DEBUG1 (DP(RINT + "[srcwin_move_point] async getblk return for %"Q"u: %s\n", + blkno, xd3_strerror (ret))); + return ret; + } + + IF_DEBUG1 (DP(RINT + "[srcwin_move_point] block %"Q"u T=%"Q"u S=%"Q"u L=%"Q"u EOF=%"Q"u %s\n", + blkno, + stream->total_in + stream->input_position, + stream->srcwin_cksum_pos, + target_cksum_pos, + xd3_source_eof (stream->src), + stream->src->eof_known ? "known" : "unknown")); + + blkpos = xd3_bytes_on_srcblk (stream->src, blkno); + + if (blkpos < (ssize_t) stream->smatcher.large_look) + { + stream->srcwin_cksum_pos = (blkno + 1) * stream->src->blksize; + IF_DEBUG2 (DP(RINT "[srcwin_move_point] continue (end-of-block): %"Q"u\n", blkpos)); + continue; + } + + /* This inserts checksums for the entire block, in reverse, + * starting from the end of the block. This logic does not test + * stream->srcwin_cksum_pos because it always advances it to the + * start of the next block. + * + * oldpos is the srcwin_cksum_pos within this block. blkpos is + * the number of bytes available. Each iteration inspects + * large_look bytes then steps back large_step bytes. The + * if-stmt above ensures at least one large_look of data. */ + blkpos -= stream->smatcher.large_look; + blkbaseoffset = stream->src->blksize * blkno; + + do + { + uint32_t cksum = xd3_lcksum (stream->src->curblk + blkpos, + stream->smatcher.large_look); + usize_t hval = xd3_checksum_hash (& stream->large_hash, cksum); + + stream->large_table[hval] = + (usize_t) (blkbaseoffset + + (xoff_t)(blkpos + HASH_CKOFFSET)); + + IF_DEBUG (stream->large_ckcnt += 1); + + blkpos -= stream->smatcher.large_step; + } + while (blkpos >= oldpos); + + stream->srcwin_cksum_pos = (blkno + 1) * stream->src->blksize; + } + + if (stream->src->eof_known) + { + xoff_t source_size = xd3_source_eof (stream->src); + if (stream->srcwin_cksum_pos >= source_size) + { + /* This invariant is needed for xd3_source_cksum_offset() */ + stream->srcwin_cksum_pos = source_size; + *next_move_point = USIZE_T_MAX; + IF_DEBUG1 (DP(RINT + "[srcwin_move_point] finished with source input\n")); + return 0; + } + } + + /* How long until this function should be called again. */ + XD3_ASSERT(stream->srcwin_cksum_pos >= target_cksum_pos); + + *next_move_point = stream->input_position + + stream->src->blksize - + ((stream->srcwin_cksum_pos - target_cksum_pos) & stream->src->maskby); + + IF_DEBUG2 (DP(RINT + "[srcwin_move_point] finished T=%"Q"u " + "S=%"Q"u L=%"Q"u EOF=%"Q"u %s again in %u\n", + stream->total_in + stream->input_position, + stream->srcwin_cksum_pos, + target_cksum_pos, + xd3_source_eof (stream->src), + stream->src->eof_known ? "known" : "unknown", + *next_move_point - stream->input_position)); + + return 0; +} + +#endif /* XD3_ENCODER */ + +/******************************************************************** + TEMPLATE pass + *********************************************************************/ + +#endif /* __XDELTA3_C_INLINE_PASS__ */ +#ifdef __XDELTA3_C_TEMPLATE_PASS__ + +#if XD3_ENCODER + +/******************************************************************** + Templates + *******************************************************************/ + +/* Template macros */ +#define XD3_TEMPLATE(x) XD3_TEMPLATE2(x,TEMPLATE) +#define XD3_TEMPLATE2(x,n) XD3_TEMPLATE3(x,n) +#define XD3_TEMPLATE3(x,n) x ## n +#define XD3_STRINGIFY(x) XD3_STRINGIFY2(x) +#define XD3_STRINGIFY2(x) #x + +static int XD3_TEMPLATE(xd3_string_match_) (xd3_stream *stream); + +static const xd3_smatcher XD3_TEMPLATE(__smatcher_) = +{ + XD3_STRINGIFY(TEMPLATE), + XD3_TEMPLATE(xd3_string_match_), +#if SOFTCFG == 1 + 0, 0, 0, 0, 0, 0, 0 +#else + LLOOK, LSTEP, SLOOK, SCHAIN, SLCHAIN, MAXLAZY, LONGENOUGH +#endif +}; + +static int +XD3_TEMPLATE(xd3_string_match_) (xd3_stream *stream) +{ + const int DO_SMALL = ! (stream->flags & XD3_NOCOMPRESS); + const int DO_LARGE = (stream->src != NULL); + const int DO_RUN = (1); + + const uint8_t *inp; + uint32_t scksum = 0; + uint32_t scksum_state = 0; + uint32_t lcksum = 0; + usize_t sinx; + usize_t linx; + uint8_t run_c; + usize_t run_l; + int ret; + usize_t match_length; + usize_t match_offset = 0; + usize_t next_move_point; + + IF_DEBUG2(DP(RINT "[string_match] initial entry %u\n", stream->input_position)); + + /* If there will be no compression due to settings or short input, + * skip it entirely. */ + if (! (DO_SMALL || DO_LARGE || DO_RUN) || + stream->input_position + SLOOK > stream->avail_in) { goto loopnomore; } + + if ((ret = xd3_string_match_init (stream))) { return ret; } + + /* The restartloop label is reached when the incremental loop state + * needs to be reset. */ + restartloop: + + IF_DEBUG2(DP(RINT "[string_match] restartloop %u\n", stream->input_position)); + + /* If there is not enough input remaining for any kind of match, + skip it. */ + if (stream->input_position + SLOOK > stream->avail_in) { goto loopnomore; } + + /* Now reset the incremental loop state: */ + + /* The min_match variable is updated to avoid matching the same lazy + * match over and over again. For example, if you find a (small) + * match of length 9 at one position, you will likely find a match + * of length 8 at the next position. */ + if (xd3_iopt_last_matched (stream) > stream->input_position) + { + stream->min_match = xd3_max (MIN_MATCH, + 1 + xd3_iopt_last_matched(stream) - + stream->input_position); + } + else + { + stream->min_match = MIN_MATCH; + } + + /* The current input byte. */ + inp = stream->next_in + stream->input_position; + + /* Small match state. */ + if (DO_SMALL) + { + scksum = xd3_scksum (&scksum_state, inp, SLOOK); + } + + /* Run state. */ + if (DO_RUN) + { + run_l = xd3_comprun (inp, SLOOK, & run_c); + } + + /* Large match state. We continue the loop even after not enough + * bytes for LLOOK remain, so always check stream->input_position in + * DO_LARGE code. */ + if (DO_LARGE && (stream->input_position + LLOOK <= stream->avail_in)) + { + /* Source window: next_move_point is the point that + * stream->input_position must reach before computing more + * source checksum. Note: this is called unconditionally + * the first time after reentry, subsequent calls will be + * avoided if next_move_point is > input_position */ + if ((ret = xd3_srcwin_move_point (stream, & next_move_point))) + { + return ret; + } + + lcksum = xd3_lcksum (inp, LLOOK); + } + + /* TRYLAZYLEN: True if a certain length match should be followed by + * lazy search. This checks that LEN is shorter than MAXLAZY and + * that there is enough leftover data to consider lazy matching. + * "Enough" is set to 2 since the next match will start at the next + * offset, it must match two extra characters. */ +#define TRYLAZYLEN(LEN,POS,MAX) ((MAXLAZY) > 0 && (LEN) < (MAXLAZY) \ + && (POS) + (LEN) <= (MAX) - 2) + + /* HANDLELAZY: This statement is called each time an instruciton is + * emitted (three cases). If the instruction is large enough, the + * loop is restarted, otherwise lazy matching may ensue. */ +#define HANDLELAZY(mlen) \ + if (TRYLAZYLEN ((mlen), (stream->input_position), (stream->avail_in))) \ + { stream->min_match = (mlen) + LEAST_MATCH_INCR; goto updateone; } \ + else \ + { stream->input_position += (mlen); goto restartloop; } + + /* Now loop over one input byte at a time until a match is found... */ + for (;; inp += 1, stream->input_position += 1) + { + /* Now we try three kinds of string match in order of expense: + * run, large match, small match. */ + + /* Expand the start of a RUN. The test for (run_l == SLOOK) + * avoids repeating this check when we pass through a run area + * performing lazy matching. The run is only expanded once when + * the min_match is first reached. If lazy matching is + * performed, the run_l variable will remain inconsistent until + * the first non-running input character is reached, at which + * time the run_l may then again grow to SLOOK. */ + if (DO_RUN && run_l == SLOOK) + { + usize_t max_len = stream->avail_in - stream->input_position; + + IF_DEBUG (xd3_verify_run_state (stream, inp, run_l, &run_c)); + + while (run_l < max_len && inp[run_l] == run_c) { run_l += 1; } + + /* Output a RUN instruction. */ + if (run_l >= stream->min_match && run_l >= MIN_RUN) + { + if ((ret = xd3_emit_run (stream, stream->input_position, + run_l, &run_c))) { return ret; } + + HANDLELAZY (run_l); + } + } + + /* If there is enough input remaining. */ + if (DO_LARGE && (stream->input_position + LLOOK <= stream->avail_in)) + { + if ((stream->input_position >= next_move_point) && + (ret = xd3_srcwin_move_point (stream, & next_move_point))) + { + return ret; + } + + linx = xd3_checksum_hash (& stream->large_hash, lcksum); + + IF_DEBUG (xd3_verify_large_state (stream, inp, lcksum)); + + if (stream->large_table[linx] != 0) + { + /* the match_setup will fail if the source window has + * been decided and the match lies outside it. + * OPT: Consider forcing a window at this point to + * permit a new source window. */ + xoff_t adj_offset = + xd3_source_cksum_offset(stream, + stream->large_table[linx] - + HASH_CKOFFSET); + if (xd3_source_match_setup (stream, adj_offset) == 0) + { + if ((ret = xd3_source_extend_match (stream))) + { + return ret; + } + + /* Update stream position. match_fwd is zero if no + * match. */ + if (stream->match_fwd > 0) + { + HANDLELAZY (stream->match_fwd); + } + } + } + } + + /* Small matches. */ + if (DO_SMALL) + { + sinx = xd3_checksum_hash (& stream->small_hash, scksum); + + /* Verify incremental state in debugging mode. */ + IF_DEBUG (xd3_verify_small_state (stream, inp, scksum)); + + /* Search for the longest match */ + if (stream->small_table[sinx] != 0) + { + match_length = xd3_smatch (stream, + stream->small_table[sinx], + scksum, + & match_offset); + } + else + { + match_length = 0; + } + + /* Insert a hash for this string. */ + xd3_scksum_insert (stream, sinx, scksum, stream->input_position); + + /* Maybe output a COPY instruction */ + if (match_length >= stream->min_match) + { + IF_DEBUG2 ({ + static int x = 0; + DP(RINT "[target match:%d] <inp %u %u> <cpy %u %u> " + "(-%d) [ %u bytes ]\n", + x++, + stream->input_position, + stream->input_position + match_length, + match_offset, + match_offset + match_length, + stream->input_position - match_offset, + match_length); + }); + + if ((ret = xd3_found_match (stream, + /* decoder position */ + stream->input_position, + /* length */ match_length, + /* address */ (xoff_t) match_offset, + /* is_source */ 0))) + { + return ret; + } + + /* Copy instruction. */ + HANDLELAZY (match_length); + } + } + + /* The logic above prevents excess work during lazy matching by + * increasing min_match to avoid smaller matches. Each time we + * advance stream->input_position by one, the minimum match + * shortens as well. */ + if (stream->min_match > MIN_MATCH) + { + stream->min_match -= 1; + } + + updateone: + + /* See if there are no more incremental cksums to compute. */ + if (stream->input_position + SLOOK == stream->avail_in) + { + goto loopnomore; + } + + /* Compute next RUN, CKSUM */ + if (DO_RUN) + { + NEXTRUN (inp[SLOOK]); + } + + if (DO_SMALL) + { + scksum = xd3_small_cksum_update (&scksum_state, inp, SLOOK); + } + + if (DO_LARGE && (stream->input_position + LLOOK < stream->avail_in)) + { + lcksum = xd3_large_cksum_update (lcksum, inp, LLOOK); + } + } + + loopnomore: + return 0; +} + +#endif /* XD3_ENCODER */ +#endif /* __XDELTA3_C_TEMPLATE_PASS__ */ diff --git a/app/src/main/rust/stores/vendor/xdelta3/xdelta3.h b/app/src/main/rust/stores/vendor/xdelta3/xdelta3.h new file mode 100644 index 000000000..9fbda6fa2 --- /dev/null +++ b/app/src/main/rust/stores/vendor/xdelta3/xdelta3.h @@ -0,0 +1,1396 @@ +/* xdelta3 - delta compression tools and library + Copyright 2016 Joshua MacDonald + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* To know more about Xdelta, start by reading xdelta3.c. If you are + * ready to use the API, continue reading here. There are two + * interfaces -- xd3_encode_input and xd3_decode_input -- plus a dozen + * or so related calls. This interface is styled after Zlib. */ + +#ifndef _XDELTA3_H_ +#define _XDELTA3_H_ + +#define _POSIX_SOURCE +#define _ISOC99_SOURCE +#define _C99_SOURCE + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <errno.h> +#include <stdarg.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +/****************************************************************/ + +/* Default configured value of stream->winsize. If the program + * supplies xd3_encode_input() with data smaller than winsize the + * stream will automatically buffer the input, otherwise the input + * buffer is used directly. + */ +#ifndef XD3_DEFAULT_WINSIZE +#define XD3_DEFAULT_WINSIZE (1U << 23) +#endif + +/* Default total size of the source window used in xdelta3-main.h */ +#ifndef XD3_DEFAULT_SRCWINSZ +#define XD3_DEFAULT_SRCWINSZ (1U << 26) +#endif + +/* When Xdelta requests a memory allocation for certain buffers, it + * rounds up to units of at least this size. The code assumes (and + * asserts) that this is a power-of-two. */ +#ifndef XD3_ALLOCSIZE +#define XD3_ALLOCSIZE (1U<<14) +#endif + +/* The XD3_HARDMAXWINSIZE parameter is a safety mechanism to protect + * decoders against malicious files. The decoder will never decode a + * window larger than this. If the file specifies VCD_TARGET the + * decoder may require two buffers of this size. + * + * 8-16MB is reasonable, probably don't need to go larger. */ +#ifndef XD3_HARDMAXWINSIZE +#define XD3_HARDMAXWINSIZE (1U<<24) +#endif +/* The IOPT_SIZE value sets the size of a buffer used to batch + * overlapping copy instructions before they are optimized by picking + * the best non-overlapping ranges. The larger this buffer, the + * longer a forced xd3_srcwin_setup() decision is held off. Setting + * this value to 0 causes an unlimited buffer to be used. */ +#ifndef XD3_DEFAULT_IOPT_SIZE +#define XD3_DEFAULT_IOPT_SIZE (1U<<15) +#endif + +/* The maximum distance backward to search for small matches */ +#ifndef XD3_DEFAULT_SPREVSZ +#define XD3_DEFAULT_SPREVSZ (1U<<18) +#endif + +/* The default compression level + */ +#ifndef XD3_DEFAULT_LEVEL +#define XD3_DEFAULT_LEVEL 3 +#endif + +#ifndef XD3_DEFAULT_SECONDARY_LEVEL +#define XD3_DEFAULT_SECONDARY_LEVEL 6 +#endif + +#ifndef XD3_USE_LARGEFILE64 +#define XD3_USE_LARGEFILE64 1 +#endif + +/* Sizes and addresses within VCDIFF windows are represented as usize_t + * + * For source-file offsets and total file sizes, total input and + * output counts, the xoff_t type is used. The decoder and encoder + * generally check for overflow of the xoff_t size (this is tested at + * the 32bit boundary [xdelta3-test.h]). + */ +#ifndef _WIN32 +#include <stdint.h> +#else /* WIN32 case */ +#define WIN32_LEAN_AND_MEAN + +#ifndef WINVER +#if XD3_USE_LARGEFILE64 +/* 64 bit file offsets: uses GetFileSizeEx and SetFilePointerEx. + * requires Win2000 or newer version of WinNT */ +#define WINVER 0x0500 +#define _WIN32_WINNT 0x0500 +#else /* xoff_t is 32bit */ +/* 32 bit (DWORD) file offsets: uses GetFileSize and + * SetFilePointer. compatible with win9x-me and WinNT4 */ +#define WINVER 0x0400 +#define _WIN32_WINNT 0x0400 +#endif /* if XD3_USE_LARGEFILE64 */ +#endif /* ifndef WINVER */ + +#include <windows.h> + +/* _MSV_VER is defined by Microsoft tools, not by mingw32 */ +#ifdef _MSC_VER +/*#define inline*/ +typedef signed int ssize_t; +#if _MSC_VER < 1600 +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +typedef ULONGLONG uint64_t; +#else /* _MSC_VER >= 1600 */ +/* For MSVC10 and above */ +#include <stdint.h> +#endif /* _MSC_VER < 1600 */ +#else /* _MSC_VER not defined */ +/* mingw32, lcc and watcom provide a proper header */ +#include <stdint.h> +#endif /* _MSC_VER defined */ +#endif /* _WIN32 defined */ + +typedef uint32_t usize_t; + +#if XD3_USE_LARGEFILE64 +/* xoff_t is a 64-bit type */ +#define __USE_FILE_OFFSET64 1 /* GLIBC: for 64bit fileops, ... ? */ + +#ifndef _LARGEFILE_SOURCE +#define _LARGEFILE_SOURCE +#endif + +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 64 +#endif + +#if defined(_WIN32) +typedef uint64_t xoff_t; +/* Note: The following generates benign warnings in a mingw + * cross-compiler */ +#define Q "I64" +#elif SIZEOF_UNSIGNED_LONG == 8 +typedef unsigned long xoff_t; +#define Q "l" +#elif SIZEOF_SIZE_T == 8 +typedef size_t xoff_t; +#define Q "z" +#elif SIZEOF_UNSIGNED_LONG_LONG == 8 +typedef unsigned long long xoff_t; +#define Q "ll" +#endif /* #define Q */ + +#define SIZEOF_XOFF_T 8 + +#else /* XD3_USE_LARGEFILE64 == 0 */ + +#if SIZEOF_UNSIGNED_INT == 4 +typedef unsigned int xoff_t; +#elif SIZEOF_UNSIGNED_LONG == 4 +typedef unsigned long xoff_t; +#else +typedef uint32_t xoff_t; +#endif /* xoff_t is 32 bits */ + +#define SIZEOF_XOFF_T 4 +#define Q +#endif /* 64 vs 32 bit xoff_t */ + +/* Note: This gets modified in the 64bithash branch. */ +#define SIZEOF_USIZE_T 4 + +#if SIZEOF_SIZE_T == 4 +#define Z "z" +#elif SIZEOF_SIZE_T == 8 +#ifdef _WIN32 +#define Z "I64" +#else /* !_WIN32 */ +#define Z "z" +#endif /* Windows or not */ +#else +#error Bad configure script +#endif /* size_t printf flags */ + +#define USE_UINT32 (SIZEOF_USIZE_T == 4 || \ + SIZEOF_XOFF_T == 4 || REGRESSION_TEST) +#define USE_UINT64 (SIZEOF_USIZE_T == 8 || \ + SIZEOF_XOFF_T == 8 || REGRESSION_TEST) + +#ifndef UNALIGNED_OK +#ifdef HAVE_ALIGNED_ACCESS_REQUIRED +#define UNALIGNED_OK 0 +#else +/* This generally includes all Windows builds. */ +#define UNALIGNED_OK 1 +#endif +#endif + +/**********************************************************************/ + +/* Whether to build the encoder, otherwise only build the decoder. */ +#ifndef XD3_ENCODER +#define XD3_ENCODER 1 +#endif + +/* The code returned when main() fails, also defined in system + includes. */ +#ifndef EXIT_FAILURE +#define EXIT_FAILURE 1 +#endif + +/* REGRESSION TEST enables the "xdelta3 test" command, which runs a + series of self-tests. */ +#ifndef REGRESSION_TEST +#define REGRESSION_TEST 0 +#endif + +/* XD3_DEBUG=1 enables assertions and various statistics. Levels > 1 + * enable some additional output only useful during development and + * debugging. */ +#ifndef XD3_DEBUG +#define XD3_DEBUG 0 +#endif + +#ifndef PYTHON_MODULE +#define PYTHON_MODULE 0 +#endif + +#ifndef SWIG_MODULE +#define SWIG_MODULE 0 +#endif + +/* There are three string matching functions supplied: one fast, one + * slow (default), and one soft-configurable. To disable any of + * these, use the following definitions. */ +#ifndef XD3_BUILD_SLOW +#define XD3_BUILD_SLOW 1 +#endif +#ifndef XD3_BUILD_FAST +#define XD3_BUILD_FAST 1 +#endif +#ifndef XD3_BUILD_FASTER +#define XD3_BUILD_FASTER 1 +#endif +#ifndef XD3_BUILD_FASTEST +#define XD3_BUILD_FASTEST 1 +#endif +#ifndef XD3_BUILD_SOFT +#define XD3_BUILD_SOFT 1 +#endif +#ifndef XD3_BUILD_DEFAULT +#define XD3_BUILD_DEFAULT 1 +#endif + +#if XD3_DEBUG +#include <stdio.h> +#endif + +/* XPRINT. Debug output and VCDIFF_TOOLS functions report to stderr. + * I have used an irregular style to abbreviate [fprintf(stderr, "] as + * [DP(RINT "]. */ +#define DP fprintf +#define RINT stderr, + +typedef struct _xd3_stream xd3_stream; +typedef struct _xd3_source xd3_source; +typedef struct _xd3_hash_cfg xd3_hash_cfg; +typedef struct _xd3_smatcher xd3_smatcher; +typedef struct _xd3_rinst xd3_rinst; +typedef struct _xd3_dinst xd3_dinst; +typedef struct _xd3_hinst xd3_hinst; +typedef struct _xd3_winst xd3_winst; +typedef struct _xd3_rpage xd3_rpage; +typedef struct _xd3_addr_cache xd3_addr_cache; +typedef struct _xd3_output xd3_output; +typedef struct _xd3_desect xd3_desect; +typedef struct _xd3_iopt_buflist xd3_iopt_buflist; +typedef struct _xd3_rlist xd3_rlist; +typedef struct _xd3_sec_type xd3_sec_type; +typedef struct _xd3_sec_cfg xd3_sec_cfg; +typedef struct _xd3_sec_stream xd3_sec_stream; +typedef struct _xd3_config xd3_config; +typedef struct _xd3_code_table_desc xd3_code_table_desc; +typedef struct _xd3_code_table_sizes xd3_code_table_sizes; +typedef struct _xd3_slist xd3_slist; +typedef struct _xd3_whole_state xd3_whole_state; +typedef struct _xd3_wininfo xd3_wininfo; + +/* The stream configuration has three callbacks functions, all of + * which may be supplied with NULL values. If config->getblk is + * provided as NULL, the stream returns XD3_GETSRCBLK. */ + +typedef void* (xd3_alloc_func) (void *opaque, + size_t items, + usize_t size); +typedef void (xd3_free_func) (void *opaque, + void *address); + +typedef int (xd3_getblk_func) (xd3_stream *stream, + xd3_source *source, + xoff_t blkno); + +/* These are internal functions to delay construction of encoding + * tables and support alternate code tables. See the comments & code + * enabled by GENERIC_ENCODE_TABLES. */ + +typedef const xd3_dinst* (xd3_code_table_func) (void); +typedef int (xd3_comp_table_func) (xd3_stream *stream, + const uint8_t **data, + usize_t *size); + + + +#if XD3_DEBUG +#define XD3_ASSERT(x) \ + do { if (! (x)) { DP(RINT "%s:%d: XD3 assertion failed: %s\n", __FILE__, __LINE__, #x); \ + abort (); } } while (0) +#else +#define XD3_ASSERT(x) (void)0 +#endif /* XD3_DEBUG */ + +#define xd3_max(x,y) ((x) < (y) ? (y) : (x)) +#define xd3_min(x,y) ((x) < (y) ? (x) : (y)) + +/**************************************************************** + PUBLIC ENUMS + ******************************************************************/ + +/* These are the five ordinary status codes returned by the + * xd3_encode_input() and xd3_decode_input() state machines. */ +typedef enum { + + /* An application must be prepared to handle these five return + * values from either xd3_encode_input or xd3_decode_input, except + * in the case of no-source compression, in which case XD3_GETSRCBLK + * is never returned. More detailed comments for these are given in + * xd3_encode_input and xd3_decode_input comments, below. */ + XD3_INPUT = -17703, /* need input */ + XD3_OUTPUT = -17704, /* have output */ + XD3_GETSRCBLK = -17705, /* need a block of source input (with no + * xd3_getblk function), a chance to do + * non-blocking read. */ + XD3_GOTHEADER = -17706, /* (decode-only) after the initial VCDIFF & + first window header */ + XD3_WINSTART = -17707, /* notification: returned before a window is + * processed, giving a chance to + * XD3_SKIP_WINDOW or not XD3_SKIP_EMIT that + * window. */ + XD3_WINFINISH = -17708, /* notification: returned after + encode/decode & output for a window */ + XD3_TOOFARBACK = -17709, /* (encoder only) may be returned by + getblk() if the block is too old */ + XD3_INTERNAL = -17710, /* internal error */ + XD3_INVALID = -17711, /* invalid config */ + XD3_INVALID_INPUT = -17712, /* invalid input/decoder error */ + XD3_NOSECOND = -17713, /* when secondary compression finds no + improvement. */ + XD3_UNIMPLEMENTED = -17714 /* currently VCD_TARGET, VCD_CODETABLE */ +} xd3_rvalues; + +/* special values in config->flags */ +typedef enum +{ + XD3_JUST_HDR = (1 << 1), /* used by VCDIFF tools, see + xdelta3-main.h. */ + XD3_SKIP_WINDOW = (1 << 2), /* used by VCDIFF tools, see + xdelta3-main.h. */ + XD3_SKIP_EMIT = (1 << 3), /* used by VCDIFF tools, see + xdelta3-main.h. */ + XD3_FLUSH = (1 << 4), /* flush the stream buffer to + prepare for + xd3_stream_close(). */ + + XD3_SEC_DJW = (1 << 5), /* use DJW static huffman */ + XD3_SEC_FGK = (1 << 6), /* use FGK adaptive huffman */ + XD3_SEC_LZMA = (1 << 24), /* use LZMA secondary */ + + XD3_SEC_TYPE = (XD3_SEC_DJW | XD3_SEC_FGK | XD3_SEC_LZMA), + + XD3_SEC_NODATA = (1 << 7), /* disable secondary compression of + the data section. */ + XD3_SEC_NOINST = (1 << 8), /* disable secondary compression of + the inst section. */ + XD3_SEC_NOADDR = (1 << 9), /* disable secondary compression of + the addr section. */ + + XD3_SEC_NOALL = (XD3_SEC_NODATA | XD3_SEC_NOINST | XD3_SEC_NOADDR), + + XD3_ADLER32 = (1 << 10), /* enable checksum computation in + the encoder. */ + XD3_ADLER32_NOVER = (1 << 11), /* disable checksum verification in + the decoder. */ + + XD3_NOCOMPRESS = (1 << 13), /* disable ordinary data + * compression feature, only search + * the source, not the target. */ + XD3_BEGREEDY = (1 << 14), /* disable the "1.5-pass + * algorithm", instead use greedy + * matching. Greedy is off by + * default. */ + XD3_ADLER32_RECODE = (1 << 15), /* used by "recode". */ + + /* 4 bits to set the compression level the same as the command-line + * setting -1 through -9 (-0 corresponds to the XD3_NOCOMPRESS flag, + * and is independent of compression level). This is for + * convenience, especially with xd3_encode_memory(). */ + + XD3_COMPLEVEL_SHIFT = 20, /* 20 - 23 */ + XD3_COMPLEVEL_MASK = (0xF << XD3_COMPLEVEL_SHIFT), + XD3_COMPLEVEL_1 = (1 << XD3_COMPLEVEL_SHIFT), + XD3_COMPLEVEL_2 = (2 << XD3_COMPLEVEL_SHIFT), + XD3_COMPLEVEL_3 = (3 << XD3_COMPLEVEL_SHIFT), + XD3_COMPLEVEL_6 = (6 << XD3_COMPLEVEL_SHIFT), + XD3_COMPLEVEL_9 = (9 << XD3_COMPLEVEL_SHIFT) + +} xd3_flags; + +/* The values of this enumeration are set in xd3_config using the + * smatch_cfg variable. It can be set to default, slow, fast, etc., + * and soft. */ +typedef enum +{ + XD3_SMATCH_DEFAULT = 0, /* Flags may contain XD3_COMPLEVEL bits, + else default. */ + XD3_SMATCH_SLOW = 1, + XD3_SMATCH_FAST = 2, + XD3_SMATCH_FASTER = 3, + XD3_SMATCH_FASTEST = 4, + XD3_SMATCH_SOFT = 5 +} xd3_smatch_cfg; + +/********************************************************************* + PRIVATE ENUMS +**********************************************************************/ + +/* stream->match_state is part of the xd3_encode_input state machine + * for source matching: + * + * 1. the XD3_GETSRCBLK block-read mechanism means reentrant matching + * 2. this state spans encoder windows: a match and end-of-window + * will continue in the next 3. the initial target byte and source + * byte are a presumed match, to avoid some computation in case the + * inputs are identical. + */ +typedef enum { + + MATCH_TARGET = 0, /* in this state, attempt to match the start of + * the target with the previously set source + * address (initially 0). */ + MATCH_BACKWARD = 1, /* currently expanding a match backward in the + source/target. */ + MATCH_FORWARD = 2, /* currently expanding a match forward in the + source/target. */ + MATCH_SEARCHING = 3 /* currently searching for a match. */ + +} xd3_match_state; + +/* The xd3_encode_input state machine steps through these states in + * the following order. The matcher is reentrant and returns + * XD3_INPUT whenever it requires more data. After receiving + * XD3_INPUT, if the application reads EOF it should call + * xd3_stream_close(). + */ +typedef enum { + + ENC_INIT = 0, /* xd3_encode_input has never been called. */ + ENC_INPUT = 1, /* waiting for xd3_avail_input () to be called. */ + ENC_SEARCH = 2, /* currently searching for matches. */ + ENC_INSTR = 3, /* currently formatting output. */ + ENC_FLUSH = 4, /* currently emitting output. */ + ENC_POSTOUT = 5, /* after an output section. */ + ENC_POSTWIN = 6, /* after all output sections. */ + ENC_ABORTED = 7 /* abort. */ +} xd3_encode_state; + +/* The xd3_decode_input state machine steps through these states in + * the following order. The matcher is reentrant and returns + * XD3_INPUT whenever it requires more data. After receiving + * XD3_INPUT, if the application reads EOF it should call + * xd3_stream_close(). + * + * 0-8: the VCDIFF header + * 9-18: the VCDIFF window header + * 19-21: the three primary sections: data, inst, addr + * 22: producing output: returns XD3_OUTPUT, possibly XD3_GETSRCBLK, + * 23: return XD3_WINFINISH, set state=9 to decode more input + */ +typedef enum { + + DEC_VCHEAD = 0, /* VCDIFF header */ + DEC_HDRIND = 1, /* header indicator */ + + DEC_SECONDID = 2, /* secondary compressor ID */ + + DEC_TABLEN = 3, /* code table length */ + DEC_NEAR = 4, /* code table near */ + DEC_SAME = 5, /* code table same */ + DEC_TABDAT = 6, /* code table data */ + + DEC_APPLEN = 7, /* application data length */ + DEC_APPDAT = 8, /* application data */ + + DEC_WININD = 9, /* window indicator */ + + DEC_CPYLEN = 10, /* copy window length */ + DEC_CPYOFF = 11, /* copy window offset */ + + DEC_ENCLEN = 12, /* length of delta encoding */ + DEC_TGTLEN = 13, /* length of target window */ + DEC_DELIND = 14, /* delta indicator */ + + DEC_DATALEN = 15, /* length of ADD+RUN data */ + DEC_INSTLEN = 16, /* length of instruction data */ + DEC_ADDRLEN = 17, /* length of address data */ + + DEC_CKSUM = 18, /* window checksum */ + + DEC_DATA = 19, /* data section */ + DEC_INST = 20, /* instruction section */ + DEC_ADDR = 21, /* address section */ + + DEC_EMIT = 22, /* producing data */ + + DEC_FINISH = 23, /* window finished */ + + DEC_ABORTED = 24 /* xd3_abort_stream */ +} xd3_decode_state; + +/************************************************************ + internal types + ************************************************************/ + +/* instruction lists used in the IOPT buffer */ +struct _xd3_rlist +{ + xd3_rlist *next; + xd3_rlist *prev; +}; + +/* the raw encoding of an instruction used in the IOPT buffer */ +struct _xd3_rinst +{ + uint8_t type; + uint8_t xtra; + uint8_t code1; + uint8_t code2; + usize_t pos; + usize_t size; + xoff_t addr; + xd3_rlist link; +}; + +/* the code-table form of an single- or double-instruction */ +struct _xd3_dinst +{ + uint8_t type1; + uint8_t size1; + uint8_t type2; + uint8_t size2; +}; + +/* the decoded form of a single (half) instruction. */ +struct _xd3_hinst +{ + uint8_t type; + uint32_t size; /* TODO: why decode breaks if this is usize_t? */ + uint32_t addr; /* TODO: why decode breaks if this is usize_t? */ +}; + +/* the form of a whole-file instruction */ +struct _xd3_winst +{ + uint8_t type; /* RUN, ADD, COPY */ + uint8_t mode; /* 0, VCD_SOURCE, VCD_TARGET */ + usize_t size; + xoff_t addr; + xoff_t position; /* absolute position of this inst */ +}; + +/* used by the encoder to buffer output in sections. list of blocks. */ +struct _xd3_output +{ + uint8_t *base; + usize_t next; + usize_t avail; + xd3_output *next_page; +}; + +/* used by the decoder to buffer input in sections. */ +struct _xd3_desect +{ + const uint8_t *buf; + const uint8_t *buf_max; + uint32_t size; /* TODO: why decode breaks if this is usize_t? */ + usize_t pos; + + /* used in xdelta3-decode.h */ + uint8_t *copied1; + usize_t alloc1; + + /* used in xdelta3-second.h */ + uint8_t *copied2; + usize_t alloc2; +}; + +/* the VCDIFF address cache, see the RFC */ +struct _xd3_addr_cache +{ + usize_t s_near; + usize_t s_same; + usize_t next_slot; /* the circular index for near */ + usize_t *near_array; /* array of size s_near */ + usize_t *same_array; /* array of size s_same*256 */ +}; + +/* the IOPT buffer list is just a list of buffers, which may be allocated + * during encode when using an unlimited buffer. */ +struct _xd3_iopt_buflist +{ + xd3_rinst *buffer; + xd3_iopt_buflist *next; +}; + +/* This is the record of a pre-compiled configuration, a subset of + xd3_config. */ +struct _xd3_smatcher +{ + const char *name; + int (*string_match) (xd3_stream *stream); + usize_t large_look; + usize_t large_step; + usize_t small_look; + usize_t small_chain; + usize_t small_lchain; + usize_t max_lazy; + usize_t long_enough; +}; + +/* hash table size & power-of-two hash function. */ +struct _xd3_hash_cfg +{ + usize_t size; + usize_t shift; + usize_t mask; +}; + +/* the sprev list */ +struct _xd3_slist +{ + usize_t last_pos; +}; + +/* window info (for whole state) */ +struct _xd3_wininfo { + xoff_t offset; + usize_t length; + uint32_t adler32; +}; + +/* whole state for, e.g., merge */ +struct _xd3_whole_state { + usize_t addslen; + uint8_t *adds; + usize_t adds_alloc; + + usize_t instlen; + xd3_winst *inst; + usize_t inst_alloc; + + usize_t wininfolen; + xd3_wininfo *wininfo; + usize_t wininfo_alloc; + + xoff_t length; +}; + +/******************************************************************** + public types + *******************************************************************/ + +/* Settings for the secondary compressor. */ +struct _xd3_sec_cfg +{ + int data_type; /* Which section. (set automatically) */ + usize_t ngroups; /* Number of DJW Huffman groups. */ + usize_t sector_size; /* Sector size. */ + int inefficient; /* If true, ignore efficiency check [avoid XD3_NOSECOND]. */ +}; + +/* This is the user-visible stream configuration. */ +struct _xd3_config +{ + usize_t winsize; /* The encoder window size. */ + usize_t sprevsz; /* How far back small string + matching goes */ + usize_t iopt_size; /* entries in the + instruction-optimizing + buffer */ + + xd3_getblk_func *getblk; /* The three callbacks. */ + xd3_alloc_func *alloc; + xd3_free_func *freef; + void *opaque; /* Not used. */ + int flags; /* stream->flags are initialized + * from xd3_config & never + * modified by the library. Use + * xd3_set_flags to modify flags + * settings mid-stream. */ + + xd3_sec_cfg sec_data; /* Secondary compressor config: data */ + xd3_sec_cfg sec_inst; /* Secondary compressor config: inst */ + xd3_sec_cfg sec_addr; /* Secondary compressor config: addr */ + + xd3_smatch_cfg smatch_cfg; /* See enum: use fields below for + soft config */ + xd3_smatcher smatcher_soft; +}; + +/* The primary source file object. You create one of these objects and + * initialize the first four fields. This library maintains the next + * 5 fields. The configured getblk implementation is responsible for + * setting the final 3 fields when called (and/or when XD3_GETSRCBLK + * is returned). + */ +struct _xd3_source +{ + /* you set */ + usize_t blksize; /* block size */ + const char *name; /* its name, for debug/print + purposes */ + void *ioh; /* opaque handle */ + xoff_t max_winsize; /* maximum visible buffer */ + + /* getblk sets */ + xoff_t curblkno; /* current block number: client + sets after getblk request */ + usize_t onblk; /* number of bytes on current + block: client sets, must be >= 0 + and <= blksize */ + const uint8_t *curblk; /* current block array: client + sets after getblk request */ + + /* xd3 sets */ + usize_t srclen; /* length of this source window */ + xoff_t srcbase; /* offset of this source window + in the source itself */ + int shiftby; /* for power-of-two blocksizes */ + int maskby; /* for power-of-two blocksizes */ + xoff_t cpyoff_blocks; /* offset of dec_cpyoff in blocks */ + usize_t cpyoff_blkoff; /* offset of copy window in + blocks, remainder */ + xoff_t getblkno; /* request block number: xd3 sets + current getblk request */ + + /* See xd3_getblk() */ + xoff_t max_blkno; /* Maximum block, if eof is known, + * otherwise, equals frontier_blkno + * (initially 0). */ + usize_t onlastblk; /* Number of bytes on max_blkno */ + int eof_known; /* Set to true when the first + * partial block is read. */ +}; + +/* The primary xd3_stream object, used for encoding and decoding. You + * may access only two fields: avail_out, next_out. Use the methods + * above to operate on xd3_stream. */ +struct _xd3_stream +{ + /* input state */ + const uint8_t *next_in; /* next input byte */ + usize_t avail_in; /* number of bytes available at + next_in */ + xoff_t total_in; /* how many bytes in */ + + /* output state */ + uint8_t *next_out; /* next output byte */ + usize_t avail_out; /* number of bytes available at + next_out */ + usize_t space_out; /* total out space */ + xoff_t current_window; /* number of windows encoded/decoded */ + xoff_t total_out; /* how many bytes out */ + + /* to indicate an error, xd3 sets */ + const char *msg; /* last error message, NULL if + no error */ + + /* source configuration */ + xd3_source *src; /* source array */ + + /* encoder memory configuration */ + usize_t winsize; /* suggested window size */ + usize_t sprevsz; /* small string, previous window + size (power of 2) */ + usize_t sprevmask; /* small string, previous window + size mask */ + usize_t iopt_size; + usize_t iopt_unlimited; + + /* general configuration */ + xd3_getblk_func *getblk; /* set nxtblk, nxtblkno to scanblkno */ + xd3_alloc_func *alloc; /* malloc function */ + xd3_free_func *free; /* free function */ + void* opaque; /* private data object passed to + alloc, free, and getblk */ + int flags; /* various options */ + + /* secondary compressor configuration */ + xd3_sec_cfg sec_data; /* Secondary compressor config: data */ + xd3_sec_cfg sec_inst; /* Secondary compressor config: inst */ + xd3_sec_cfg sec_addr; /* Secondary compressor config: addr */ + + xd3_smatcher smatcher; + + usize_t *large_table; /* table of large checksums */ + xd3_hash_cfg large_hash; /* large hash config */ + + usize_t *small_table; /* table of small checksums */ + xd3_slist *small_prev; /* table of previous offsets, + circular linked list */ + int small_reset; /* true if small table should + be reset */ + + xd3_hash_cfg small_hash; /* small hash config */ + xd3_addr_cache acache; /* the vcdiff address cache */ + xd3_encode_state enc_state; /* state of the encoder */ + + usize_t taroff; /* base offset of the target input */ + usize_t input_position; /* current input position */ + usize_t min_match; /* current minimum match + length, avoids redundent + matches */ + usize_t unencoded_offset; /* current input, first + * unencoded offset. this value + * is <= the first instruction's + * position in the iopt buffer, + * if there is at least one + * match in the buffer. */ + + /* SRCWIN */ + int srcwin_decided; /* boolean: true if srclen and + srcbase have been + decided. */ + int srcwin_decided_early; /* boolean: true if srclen + and srcbase were + decided early. */ + xoff_t srcwin_cksum_pos; /* Source checksum position */ + + /* MATCH */ + xd3_match_state match_state; /* encoder match state */ + xoff_t match_srcpos; /* current match source + position relative to + srcbase */ + xoff_t match_last_srcpos; /* previously attempted + * srcpos, to avoid loops. */ + xoff_t match_minaddr; /* smallest matching address to + * set window params (reset each + * window xd3_encode_reset) */ + xoff_t match_maxaddr; /* largest matching address to + * set window params (reset each + * window xd3_encode_reset) */ + usize_t match_back; /* match extends back so far */ + usize_t match_maxback; /* match extends back maximum */ + usize_t match_fwd; /* match extends forward so far */ + usize_t match_maxfwd; /* match extends forward maximum */ + + xoff_t maxsrcaddr; /* address of the last source + match (across windows) */ + + uint8_t *buf_in; /* for saving buffered input */ + usize_t buf_avail; /* amount of saved input */ + const uint8_t *buf_leftover; /* leftover content of next_in + (i.e., user's buffer) */ + usize_t buf_leftavail; /* amount of leftover content */ + + xd3_output *enc_current; /* current output buffer */ + xd3_output *enc_free; /* free output buffers */ + xd3_output *enc_heads[4]; /* array of encoded outputs: + head of chain */ + xd3_output *enc_tails[4]; /* array of encoded outputs: + tail of chain */ + uint32_t recode_adler32; /* set the adler32 checksum + * during "recode". */ + + xd3_rlist iopt_used; /* instruction optimizing buffer */ + xd3_rlist iopt_free; + xd3_rinst *iout; /* next single instruction */ + xd3_iopt_buflist *iopt_alloc; + + const uint8_t *enc_appheader; /* application header to encode */ + usize_t enc_appheadsz; /* application header size */ + + /* decoder stuff */ + xd3_decode_state dec_state; /* current DEC_XXX value */ + usize_t dec_hdr_ind; /* VCDIFF header indicator */ + usize_t dec_win_ind; /* VCDIFF window indicator */ + usize_t dec_del_ind; /* VCDIFF delta indicator */ + + uint8_t dec_magic[4]; /* First four bytes */ + usize_t dec_magicbytes; /* Magic position. */ + + usize_t dec_secondid; /* Optional secondary compressor ID. */ + + /* TODO: why decode breaks if this is usize_t? */ + uint32_t dec_codetblsz; /* Optional code table: length. */ + uint8_t *dec_codetbl; /* Optional code table: storage. */ + usize_t dec_codetblbytes; /* Optional code table: position. */ + + /* TODO: why decode breaks if this is usize_t? */ + uint32_t dec_appheadsz; /* Optional application header: + size. */ + uint8_t *dec_appheader; /* Optional application header: + storage */ + usize_t dec_appheadbytes; /* Optional application header: + position. */ + + usize_t dec_cksumbytes; /* Optional checksum: position. */ + uint8_t dec_cksum[4]; /* Optional checksum: storage. */ + uint32_t dec_adler32; /* Optional checksum: value. */ + + /* TODO: why decode breaks if this is usize_t? */ + uint32_t dec_cpylen; /* length of copy window + (VCD_SOURCE or VCD_TARGET) */ + xoff_t dec_cpyoff; /* offset of copy window + (VCD_SOURCE or VCD_TARGET) */ + /* TODO: why decode breaks if this is usize_t? */ + uint32_t dec_enclen; /* length of delta encoding */ + /* TODO: why decode breaks if this is usize_t? */ + uint32_t dec_tgtlen; /* length of target window */ + +#if USE_UINT64 + uint64_t dec_64part; /* part of a decoded uint64_t */ +#endif +#if USE_UINT32 + uint32_t dec_32part; /* part of a decoded uint32_t */ +#endif + + xoff_t dec_winstart; /* offset of the start of + current target window */ + xoff_t dec_window_count; /* == current_window + 1 in + DEC_FINISH */ + usize_t dec_winbytes; /* bytes of the three sections + so far consumed */ + usize_t dec_hdrsize; /* VCDIFF + app header size */ + + const uint8_t *dec_tgtaddrbase; /* Base of decoded target + addresses (addr >= + dec_cpylen). */ + const uint8_t *dec_cpyaddrbase; /* Base of decoded copy + addresses (addr < + dec_cpylen). */ + + usize_t dec_position; /* current decoder position + counting the cpylen + offset */ + usize_t dec_maxpos; /* maximum decoder position + counting the cpylen + offset */ + xd3_hinst dec_current1; /* current instruction */ + xd3_hinst dec_current2; /* current instruction */ + + uint8_t *dec_buffer; /* Decode buffer */ + uint8_t *dec_lastwin; /* In case of VCD_TARGET, the + last target window. */ + usize_t dec_lastlen; /* length of the last target + window */ + xoff_t dec_laststart; /* offset of the start of last + target window */ + usize_t dec_lastspace; /* allocated space of last + target window, for reuse */ + + xd3_desect inst_sect; /* staging area for decoding + window sections */ + xd3_desect addr_sect; + xd3_desect data_sect; + + xd3_code_table_func *code_table_func; + xd3_comp_table_func *comp_table_func; + const xd3_dinst *code_table; + const xd3_code_table_desc *code_table_desc; + xd3_dinst *code_table_alloc; + + /* secondary compression */ + const xd3_sec_type *sec_type; + xd3_sec_stream *sec_stream_d; + xd3_sec_stream *sec_stream_i; + xd3_sec_stream *sec_stream_a; + + /* state for reconstructing whole files (e.g., for merge), this only + * supports loading USIZE_T_MAX instructions, adds, etc. */ + xd3_whole_state whole_target; + + /* statistics */ + xoff_t n_scpy; + xoff_t n_tcpy; + xoff_t n_add; + xoff_t n_run; + + xoff_t l_scpy; + xoff_t l_tcpy; + xoff_t l_add; + xoff_t l_run; + + usize_t i_slots_used; + +#if XD3_DEBUG + usize_t large_ckcnt; + + /* memory usage */ + usize_t alloc_cnt; + usize_t free_cnt; +#endif +}; + +/************************************************************************** + PUBLIC FUNCTIONS + **************************************************************************/ + +/* This function configures an xd3_stream using the provided in-memory + * input buffer, source buffer, output buffer, and flags. The output + * array must be large enough or else ENOSPC will be returned. This + * is the simplest in-memory encoding interface. */ +int xd3_encode_memory (const uint8_t *input, + usize_t input_size, + const uint8_t *source, + usize_t source_size, + uint8_t *output_buffer, + usize_t *output_size, + usize_t avail_output, + int flags); + +/* The reverse of xd3_encode_memory. */ +int xd3_decode_memory (const uint8_t *input, + usize_t input_size, + const uint8_t *source, + usize_t source_size, + uint8_t *output_buf, + usize_t *output_size, + usize_t avail_output, + int flags); + +/* This function encodes an in-memory input using a pre-configured + * xd3_stream. This allows the caller to set a variety of options + * which are not available in the xd3_encode/decode_memory() + * functions. + * + * The output array must be large enough to hold the output or else + * ENOSPC is returned. The source (if any) should be set using + * xd3_set_source_and_size() with a single-block xd3_source. This + * calls the underlying non-blocking interfaces, + * xd3_encode/decode_input(), handling the necessary input/output + * states. This method may be considered a reference for any + * application using xd3_encode_input() directly. + * + * xd3_stream stream; + * xd3_config config; + * xd3_source src; + * + * memset (& src, 0, sizeof (src)); + * memset (& stream, 0, sizeof (stream)); + * memset (& config, 0, sizeof (config)); + * + * if (source != NULL) + * { + * src.size = source_size; + * src.blksize = source_size; + * src.curblkno = 0; + * src.onblk = source_size; + * src.curblk = source; + * src.max_winsize = source_size; + * xd3_set_source(&stream, &src); + * } + * + * config.flags = flags; + * config.winsize = input_size; + * + * ... set smatcher, appheader, encoding-table, compression-level, etc. + * + * xd3_config_stream(&stream, &config); + * xd3_encode_stream(&stream, ...); + * xd3_free_stream(&stream); + */ +int xd3_encode_stream (xd3_stream *stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t avail_output); + +/* The reverse of xd3_encode_stream. */ +int xd3_decode_stream (xd3_stream *stream, + const uint8_t *input, + usize_t input_size, + uint8_t *output, + usize_t *output_size, + usize_t avail_size); + +/* This is the non-blocking interface. + * + * Handling input and output states is the same for encoding or + * decoding using the xd3_avail_input() and xd3_consume_output() + * routines, inlined below. + * + * Return values: + * + * XD3_INPUT: the process requires more input: call + * xd3_avail_input() then repeat + * + * XD3_OUTPUT: the process has more output: read stream->next_out, + * stream->avail_out, then call xd3_consume_output(), + * then repeat + * + * XD3_GOTHEADER: (decoder-only) notification returned following the + * VCDIFF header and first window header. the decoder + * may use the header to configure itself. + * + * XD3_WINSTART: a general notification returned once for each + * window except the 0-th window, which is implied by + * XD3_GOTHEADER. It is recommended to use a + * switch-stmt such as: + * + * ... + * again: + * switch ((ret = xd3_decode_input (stream))) { + * case XD3_GOTHEADER: { + * assert(stream->current_window == 0); + * stuff; + * } + * // fallthrough + * case XD3_WINSTART: { + * something(stream->current_window); + * goto again; + * } + * ... + * + * XD3_WINFINISH: a general notification, following the complete + * input & output of a window. at this point, + * stream->total_in and stream->total_out are consistent + * for either encoding or decoding. + * + * XD3_GETSRCBLK: If the xd3_getblk() callback is NULL, this value + * is returned to initiate a non-blocking source read. + */ +int xd3_decode_input (xd3_stream *stream); +int xd3_encode_input (xd3_stream *stream); + +/* The xd3_config structure is used to initialize a stream - all data + * is copied into stream so config may be a temporary variable. See + * the [documentation] or comments on the xd3_config structure. */ +int xd3_config_stream (xd3_stream *stream, + xd3_config *config); + +/* Since Xdelta3 doesn't open any files, xd3_close_stream is just an + * error check that the stream is in a proper state to be closed: this + * means the encoder is flushed and the decoder is at a window + * boundary. The application is responsible for freeing any of the + * resources it supplied. */ +int xd3_close_stream (xd3_stream *stream); + +/* This arranges for closes the stream to succeed. Does not free the + * stream.*/ +void xd3_abort_stream (xd3_stream *stream); + +/* xd3_free_stream frees all memory allocated for the stream. The + * application is responsible for freeing any of the resources it + * supplied. */ +void xd3_free_stream (xd3_stream *stream); + +/* This function informs the encoder or decoder that source matching + * (i.e., delta-compression) is possible. For encoding, this should + * be called before the first xd3_encode_input. A NULL source is + * ignored. For decoding, this should be called before the first + * window is decoded, but the appheader may be read first + * (XD3_GOTHEADER). After decoding the header, call xd3_set_source() + * if you have a source file. Note: if (stream->dec_win_ind & VCD_SOURCE) + * is true, it means the first window expects there to be a source file. + */ +int xd3_set_source (xd3_stream *stream, + xd3_source *source); + +/* If the source size is known, call this instead of xd3_set_source(). + * to avoid having stream->getblk called (and/or to avoid XD3_GETSRCBLK). + * + * Follow these steps: + xd3_source source; + memset(&source, 0, sizeof(source)); + source.blksize = size; + source.onblk = size; + source.curblk = buf; + source.curblkno = 0; + int ret = xd3_set_source_and_size(&stream, &source, size); + ... + */ +int xd3_set_source_and_size (xd3_stream *stream, + xd3_source *source, + xoff_t source_size); + +/* This should be called before the first call to xd3_encode_input() + * to include application-specific data in the VCDIFF header. */ +void xd3_set_appheader (xd3_stream *stream, + const uint8_t *data, + usize_t size); + +/* xd3_get_appheader may be called in the decoder after XD3_GOTHEADER. + * For convenience, the decoder always adds a single byte padding to + * the end of the application header, which is set to zero in case the + * application header is a string. */ +int xd3_get_appheader (xd3_stream *stream, + uint8_t **data, + usize_t *size); + +/* To generate a VCDIFF encoded delta with xd3_encode_init() from + * another format, use: + * + * xd3_encode_init_partial() -- initialze encoder state (w/o hash tables) + * xd3_init_cache() -- reset VCDIFF address cache + * xd3_found_match() -- to report a copy instruction + * + * set stream->enc_state to ENC_INSTR and call xd3_encode_input as usual. + */ +int xd3_encode_init_partial (xd3_stream *stream); +void xd3_init_cache (xd3_addr_cache* acache); +int xd3_found_match (xd3_stream *stream, + usize_t pos, usize_t size, + xoff_t addr, int is_source); + +/* Gives an error string for xdelta3-speficic errors, returns NULL for + system errors */ +const char* xd3_strerror (int ret); + +/* For convenience, zero & initialize the xd3_config structure with + specified flags. */ +static inline +void xd3_init_config (xd3_config *config, + int flags) +{ + memset (config, 0, sizeof (*config)); + config->flags = flags; +} + +/* This supplies some input to the stream. + * + * For encoding, if the input is larger than the configured window + * size (xd3_config.winsize), the entire input will be consumed and + * encoded anyway. If you wish to strictly limit the window size, + * limit the buffer passed to xd3_avail_input to the window size. + * + * For encoding, if the input is smaller than the configured window + * size (xd3_config.winsize), the library will create a window-sized + * buffer and accumulate input until a full-sized window can be + * encoded. XD3_INPUT will be returned. The input must remain valid + * until the next time xd3_encode_input() returns XD3_INPUT. + * + * For decoding, the input will be consumed entirely before XD3_INPUT + * is returned again. + */ +static inline +void xd3_avail_input (xd3_stream *stream, + const uint8_t *idata, + usize_t isize) +{ + /* Even if isize is zero, the code expects a non-NULL idata. Why? + * It uses this value to determine whether xd3_avail_input has ever + * been called. If xd3_encode_input is called before + * xd3_avail_input it will return XD3_INPUT right away without + * allocating a stream->winsize buffer. This is to avoid an + * unwanted allocation. */ + XD3_ASSERT (idata != NULL || isize == 0); + + stream->next_in = idata; + stream->avail_in = isize; +} + +/* This acknowledges receipt of output data, must be called after any + * XD3_OUTPUT return. */ +static inline +void xd3_consume_output (xd3_stream *stream) +{ + stream->avail_out = 0; +} + +/* These are set for each XD3_WINFINISH return. */ +static inline +int xd3_encoder_used_source (xd3_stream *stream) { + return stream->src != NULL && stream->src->srclen > 0; +} +static inline +xoff_t xd3_encoder_srcbase (xd3_stream *stream) { + return stream->src->srcbase; +} +static inline +usize_t xd3_encoder_srclen (xd3_stream *stream) { + return stream->src->srclen; +} + +/* Checks for legal flag changes. */ +static inline +void xd3_set_flags (xd3_stream *stream, int flags) +{ + /* The bitwise difference should contain only XD3_FLUSH or + XD3_SKIP_WINDOW */ + XD3_ASSERT(((flags ^ stream->flags) & ~(XD3_FLUSH | XD3_SKIP_WINDOW)) == 0); + stream->flags = flags; +} + +/* Gives some extra information about the latest library error, if any + * is known. */ +static inline +const char* xd3_errstring (xd3_stream *stream) +{ + return stream->msg ? stream->msg : ""; +} + + +/* 64-bit divisions are expensive, which is why we require a + * power-of-two source->blksize. To relax this restriction is + * relatively easy, see the history for xd3_blksize_div(). */ +static inline +void xd3_blksize_div (const xoff_t offset, + const xd3_source *source, + xoff_t *blkno, + usize_t *blkoff) { + *blkno = (xoff_t) (offset >> source->shiftby); + *blkoff = (usize_t) (offset & source->maskby); + XD3_ASSERT (*blkoff < source->blksize); +} + +static inline +void xd3_blksize_add (xoff_t *blkno, + usize_t *blkoff, + const xd3_source *source, + const usize_t add) +{ + usize_t blkdiff; + + /* Does not check for overflow, checked in xdelta3-decode.h. */ + *blkoff += add; + blkdiff = *blkoff >> source->shiftby; + + if (blkdiff) + { + *blkno += blkdiff; + *blkoff &= source->maskby; + } + + XD3_ASSERT (*blkoff < source->blksize); +} + +#define XD3_NOOP 0U +#define XD3_ADD 1U +#define XD3_RUN 2U +#define XD3_CPY 3U /* XD3_CPY rtypes are represented as (XD3_CPY + + * copy-mode value) */ + +#if XD3_DEBUG +#define IF_DEBUG(x) x +#else +#define IF_DEBUG(x) +#endif +#if XD3_DEBUG > 1 +#define IF_DEBUG1(x) x +#else +#define IF_DEBUG1(x) +#endif +#if XD3_DEBUG > 2 +#define IF_DEBUG2(x) x +#else +#define IF_DEBUG2(x) +#endif + +#define SIZEOF_ARRAY(x) (sizeof(x) / sizeof(x[0])) + +#endif /* _XDELTA3_H_ */ diff --git a/app/src/test/cpp/viture_display_modes_test.cpp b/app/src/test/cpp/viture_display_modes_test.cpp index ea6ea5462..956e05fe7 100644 --- a/app/src/test/cpp/viture_display_modes_test.cpp +++ b/app/src/test/cpp/viture_display_modes_test.cpp @@ -1,4 +1,3 @@ -// Compile with the installed SDK's headers to verify the two mode vocabularies. #include "viture_protocol_public.h" #include "../../main/cpp/viture/display_modes.h" using namespace droiddeck::viture; 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 000000000..5f63a7274 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index afcb0d4b5..cd1662316 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -6,22 +6,28 @@ import android.os.Handler import android.os.Looper import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.gpu.TpUbwcHint import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse 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.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowBuild +import org.robolectric.util.ReflectionHelpers @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class DriverMenusAutoTest { @Before fun reset() { + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null) RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE) .edit().clear().commit() ShadowBuild.setModel("Quest 3") @@ -53,4 +59,36 @@ class DriverMenusAutoTest { assertEquals("chosen-display", SessionPrefs.androidDriver(activity)) assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) } + + @Test fun driverMenusCanBeConstructedBeforeActivityContextIsAttached() { + val menus = DriverMenus(Activity(), Handler(Looper.getMainLooper())) + assertEquals(SessionPrefs.TP_UBWC_AUTO, menus.tpUbwcMode) + } + + @Test fun refreshingDriversLoadsTheSavedUbwcModeAfterContextAttachment() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + assertEquals(SessionPrefs.TP_UBWC_ON, menus.tpUbwcMode) + assertFalse(menus.state().tpUbwcRestartRequired) + } + + @Test fun changingUbwcBeforeTheFirstSessionDoesNotRequireRestart() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + menus.refreshDrivers() + assertFalse(menus.state().tpUbwcRestartRequired) + } + + @Test fun recreatingTheMenuKeepsTheActiveHintRestartWarning() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + TpUbwcHint.forThisDevice(activity) + SessionPrefs.setTpUbwcMode(activity, SessionPrefs.TP_UBWC_ON) + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.refreshDrivers() + assertTrue(menus.state().tpUbwcRestartRequired) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt new file mode 100644 index 000000000..b45761eb9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.HomeApp.RecentsStep +import org.junit.Assert.assertEquals +import org.junit.Test + +class HomeRecentsTest { + @Test fun theLauncherHidesAVisibleTaskAndTakesItOver() { + assertEquals(RecentsStep.HIDE, HomeApp.recentsStep(hidden = true, owned = false, excluded = false)) + } + + @Test fun aTaskSomeoneElseExcludedIsNeverClaimedOrShown() { + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = false, excluded = true)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = false, owned = false, excluded = true)) + } + + @Test fun onlyATaskTheLauncherHidItselfIsShownAgain() { + assertEquals(RecentsStep.SHOW, HomeApp.recentsStep(hidden = false, owned = true, excluded = true)) + assertEquals(RecentsStep.FORGET, HomeApp.recentsStep(hidden = false, owned = true, excluded = false)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = true, excluded = true)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt new file mode 100644 index 000000000..07fc610b2 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 df4bb15fc..af3144561 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 @@ -16,7 +18,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -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 000000000..8f152d2e6 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/audio/DirectAudioTimingTest.kt b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt new file mode 100644 index 000000000..db52954f3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.audio + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DirectAudioTimingTest { + @Test + fun lowLatencyOutputKeepsTheDriverDefaults() { + assertTrue(DirectAudioTiming.environment(lowLatencyOutput = true).isEmpty()) + } + + @Test + fun outputWithoutLowLatencyGetsALongerPeriodAndBuffer() { + assertEquals(listOf("AUDIO_DIRECT_PERIOD_MS=20", "AUDIO_DIRECT_MS=60"), DirectAudioTiming.environment(lowLatencyOutput = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index 9172c5a5c..0aee9958a 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.core import android.content.Context import androidx.test.core.app.ApplicationProvider +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream import java.io.File import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -9,7 +12,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class AddonPackTest { @@ -54,4 +57,35 @@ class AddonPackTest { installed("b".repeat(64)) assertFalse(AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false).installed(context)) } + + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) + + assertTrue(pack.await(context)) + assertEquals("x", pack.file(context, "tool").readText()) + } + + @Test fun bundledPackWithTheWrongDigestIsRejected() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", "a".repeat(64), archive.length(), listOf("tool"), + bundle = { archive.inputStream() }) + + val copy = File(context.cacheDir, "copy.tar.zst") + + assertFalse(pack.bundled(context, copy)) + assertFalse(copy.exists()) + } + + private fun tarZst(vararg files: Pair<String, String>): File = + File(context.cacheDir, "sample-${System.nanoTime()}.tar.zst").apply { + TarArchiveOutputStream(ZstdOutputStream(outputStream())).use { tar -> + for ((path, text) in files) { + val bytes = text.toByteArray() + tar.putArchiveEntry(TarArchiveEntry(path).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/core/AppPermissionsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AppPermissionsTest.kt new file mode 100644 index 000000000..495bd16ba --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/AppPermissionsTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.core + +import android.Manifest +import android.app.Activity +import android.content.Context +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 35, 37], manifest = Config.NONE) +class AppPermissionsTest { + @Test fun localNetworkIsUnrestrictedBeforeAndroidSeventeen() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + shadowOf(activity).denyPermissions(Manifest.permission.ACCESS_LOCAL_NETWORK) + assertEquals(android.os.Build.VERSION.SDK_INT < 37, AppPermissions.localNetwork(activity)) + shadowOf(activity).grantPermissions(Manifest.permission.ACCESS_LOCAL_NETWORK) + assertTrue(AppPermissions.localNetwork(activity)) + } + + @Test fun startupAsksOnlyOnceAndOnlyForApplicablePermissions() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + activity.getSharedPreferences("stores", Context.MODE_PRIVATE).edit().clear().commit() + activity.getSharedPreferences("runtime-permissions", Context.MODE_PRIVATE).edit().clear().commit() + shadowOf(activity).denyPermissions(Manifest.permission.ACCESS_LOCAL_NETWORK, Manifest.permission.POST_NOTIFICATIONS) + val first = AppPermissions.startup(activity) + assertEquals(android.os.Build.VERSION.SDK_INT >= 37, Manifest.permission.ACCESS_LOCAL_NETWORK in first) + assertEquals(android.os.Build.VERSION.SDK_INT >= 33, Manifest.permission.POST_NOTIFICATIONS in first) + assertTrue(AppPermissions.startup(activity).isEmpty()) + } + + @Test @Config(sdk = [37]) fun grantedPermissionsAreNeverRequested() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + shadowOf(activity).grantPermissions(Manifest.permission.ACCESS_LOCAL_NETWORK, Manifest.permission.POST_NOTIFICATIONS) + assertTrue(AppPermissions.startup(activity).isEmpty()) + } +} 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 000000000..fa986f85b --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 ba6e31a10..000000000 --- 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/DeviceReportCpuTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DeviceReportCpuTest.kt new file mode 100644 index 000000000..88520b21c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/DeviceReportCpuTest.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.core + +import org.junit.Assert.assertEquals +import org.junit.Test + +class DeviceReportCpuTest { + @Test fun onlyFeatureListsAreReportedAndDifferentCoreCapabilitiesAreKept() { + val cpuInfo = """ + processor : 0 + Features : fp asimd aes + Serial : private-device-id + processor : 1 + Features : fp asimd aes atomics + processor : 2 + Features : fp asimd aes + """.trimIndent() + assertEquals("fp asimd aes | fp asimd aes atomics", DeviceReport.cpuFeaturesSummary(cpuInfo)) + assertEquals("not reported", DeviceReport.cpuFeaturesSummary("processor : 0\n")) + } +} 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 000000000..46725fc7f --- /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/DownloaderResumeTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt index 73fd0161c..f2ed52f7e 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt @@ -6,6 +6,9 @@ import java.net.Socket import java.nio.file.Files import java.security.MessageDigest import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit import org.junit.After import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals @@ -14,11 +17,6 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -/** - * A download that was cut off keeps its bytes, and a second call with `resume` asks for the rest - * with a Range header instead of starting again. The server is a plain socket so the first answer - * can promise the whole file and then hang up halfway. - */ class DownloaderResumeTest { private val data = ByteArray(300_000) { (it % 251).toByte() } private val cutAt = 100_000 @@ -29,6 +27,9 @@ class DownloaderResumeTest { @Volatile private var misbehave = false @Volatile private var etag: String? = "\"v1\"" @Volatile private var corrupt = false + @Volatile private var holdAfterFirstChunk = false + private var bodyStarted = CountDownLatch(1) + private var continueBody = CountDownLatch(1) @Before fun setUp() { dir = Files.createTempDirectory("downloader-resume").toFile() @@ -37,11 +38,9 @@ class DownloaderResumeTest { try { while (!server.isClosed) { val socket = server.accept() - // the client may hang up on a body it refuses; that must not stop the server runCatching { handle(socket) } } } catch (_: Exception) { - // closed by tearDown } }.apply { isDaemon = true; start() } } @@ -66,17 +65,22 @@ class DownloaderResumeTest { val content = if (corrupt && "/corrupt" in path) ByteArray(data.size) else data val from = range?.removePrefix("bytes=")?.substringBefore('-')?.toIntOrNull() if (misbehave) { - // answers a Range request with a 206 that starts at 0, and serves plain requests whole val start = if (from == null) "200 OK" else "206 Partial Content" val extra = if (from == null) "" else "Content-Range: bytes 0-${data.size - 1}/${data.size}\r\n" out.write("HTTP/1.1 $start\r\n${extra}${validator}Content-Length: ${data.size}\r\nConnection: close\r\n\r\n".toByteArray()) - out.write(content) - out.flush() + if (holdAfterFirstChunk) { + out.write(content, 0, 1024) + out.flush() + bodyStarted.countDown() + continueBody.await(5, TimeUnit.SECONDS) + } else { + out.write(content) + out.flush() + } } else if (from == null) { out.write("HTTP/1.1 200 OK\r\n${validator}Content-Length: ${data.size}\r\nConnection: close\r\n\r\n".toByteArray()) out.write(content, 0, cutAt) out.flush() - // hang up with most of the promised body still unsent } else { val rest = data.size - from out.write(("HTTP/1.1 206 Partial Content\r\nContent-Range: bytes $from-${data.size - 1}/${data.size}\r\n" + @@ -168,6 +172,47 @@ class DownloaderResumeTest { } + @Test fun cancelStopsTheTransferWithoutTryingAnotherSource() { + val first = "http://127.0.0.1:${server.localPort}/first" + val second = "http://127.0.0.1:${server.localPort}/second" + val target = File(dir, "runtime.tar.zst") + misbehave = true + val polls = java.util.concurrent.atomic.AtomicInteger() + val cancelled = java.util.function.BooleanSupplier { polls.incrementAndGet() > 2 } + assertFalse(Downloader.downloadCandidates(first, listOf(first, second), target, true, null, cancelled, null)) + assertEquals("a cancel must not fall back to the next source", listOf<String?>(null), requests.toList()) + assertTrue("the transfer stopped early (kept=${target.length()})", target.length() in 1 until data.size) + } + + @Test fun cancellationDisconnectsAStalledTransfer() { + val url = "http://127.0.0.1:${server.localPort}/first" + val target = File(dir, "runtime.tar.zst") + misbehave = true + holdAfterFirstChunk = true + val cancellation = Downloader.Cancellation() + val executor = Executors.newSingleThreadExecutor() + val cancelExecutor = Executors.newSingleThreadExecutor() + try { + val result = executor.submit<Boolean> { Downloader.downloadFile(url, target, true, null, cancellation, null) } + assertTrue("server sent the first chunk", bodyStarted.await(2, TimeUnit.SECONDS)) + val cancelled = cancelExecutor.submit { cancellation.cancel() } + cancelled.get(10, TimeUnit.SECONDS) + assertFalse("cancelled download", result.get(10, TimeUnit.SECONDS)) + assertEquals(listOf<String?>(null), requests.toList()) + } finally { + continueBody.countDown() + executor.shutdownNow() + cancelExecutor.shutdownNow() + } + } + + @Test fun aCancelBeforeTheFirstRequestSendsNothing() { + val url = "http://127.0.0.1:${server.localPort}/runtime.tar.zst" + val target = File(dir, "runtime.tar.zst") + assertFalse(Downloader.downloadFile(url, target, true, null, { true }, null)) + assertEquals(emptyList<String?>(), requests.toList()) + } + @Test fun withoutADigestOnlyTheOriginalUrlIsTried() { val url = "https://github.com/owner/repo/releases/download/v1/app.AppImage" assertEquals(listOf(url), Downloader.sources(url, null)) diff --git a/app/src/test/java/com/droiddeck/launcher/core/DroidDeckTestRunner.kt b/app/src/test/java/com/droiddeck/launcher/core/DroidDeckTestRunner.kt new file mode 100644 index 000000000..cffe69fae --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/DroidDeckTestRunner.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.core + +import org.junit.runners.model.FrameworkMethod +import org.robolectric.RobolectricTestRunner +import org.robolectric.internal.bytecode.InstrumentationConfiguration + +open class DroidDeckTestRunner(testClass: Class<*>) : RobolectricTestRunner(testClass) { + override fun createClassLoaderConfig(method: FrameworkMethod): InstrumentationConfiguration = + InstrumentationConfiguration.Builder(super.createClassLoaderConfig(method)) + .doNotAcquirePackage("com.github.luben.zstd.") + .doNotAcquirePackage("org.apache.commons.compress.") + .doNotAcquirePackage("org.apache.commons.io.") + .doNotAcquirePackage("org.tukaani.xz.") + .build() +} 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 000000000..21309e807 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt @@ -0,0 +1,49 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 37], manifest = Config.NONE) +class HostProcessTest { + @get:Rule val temporary = TemporaryFolder() + + @Test fun childPidIsAvailableWithoutReflectiveAccessToJdkInternals() { + val windows = System.getProperty("os.name").orEmpty().startsWith("Windows") + val child = if (windows) ProcessBuilder("cmd.exe", "/c", "exit 0").start() + else ProcessBuilder("/bin/sh", "-c", "exit 0").start() + try { + assertTrue(HostProcess.pidOf(child) > 0) + assertEquals(0, child.waitFor()) + } finally { + if (child.isAlive) child.destroyForcibly() + } + } + + @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 a67093e93..b93c439bf 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -3,9 +3,14 @@ package com.droiddeck.launcher.core 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 +import java.io.StringWriter class LogRedactorTest { + @get:Rule val tmp = TemporaryFolder() + @Test fun labelledJwtIsRedacted() { val out = LogRedactor.redact("Using JWT 25484942796017334") assertFalse(out.contains("25484942796017334")) @@ -195,6 +200,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) @@ -225,6 +231,103 @@ class LogRedactorTest { assertEquals(once, LogRedactor.redactForShare(once)) } + @Test fun anOversizedDirectInputIsWithheldBeforeRegex() { + val secret = "sessionid=abcdef123456" + val line = "x".repeat(LogRedactor.MAX_LINE_LENGTH) + secret + assertEquals(LogRedactor.OVERSIZED_LINE, LogRedactor.redact(line)) + assertEquals(LogRedactor.OVERSIZED_LINE, LogRedactor.redactForShare(line)) + } + + @Test fun streamWithholdsAnOversizedLogicalLineWholeAndContinues() { + val secret = "sessionid=abcdef123456" + val src = tmp.newFile("oversized.log") + src.writeText( + "before\r" + + "x".repeat(LogRedactor.MAX_LINE_LENGTH - 3) + secret + "\r\n" + + "after $secret" + ) + val out = StringWriter() + + LogRedactor.scrubTo(src, out) + + assertEquals( + "before\n${LogRedactor.OVERSIZED_LINE}\nafter sessionid=<redacted:token>\n", + out.toString(), + ) + assertFalse(out.toString().contains("abcdef123456")) + } + + @Test fun sharedStreamDistinguishesOversizedAndUnsupportedLines() { + val src = tmp.newFile("shared-lines.log") + src.writeText( + "x".repeat(LogRedactor.MAX_LINE_LENGTH + 1) + "\n" + + "private-prefix\u0000private-suffix\n" + + "after sessionid=abcdef123456\n" + ) + val out = StringWriter() + + assertTrue(LogRedactor.scrubForShare(src, out)) + + assertEquals( + "${LogRedactor.OVERSIZED_LINE}\n" + + "<unsupported or oversized line withheld>\n" + + "after sessionid=<redacted:token>\n", + out.toString(), + ) + } + + @Test fun aMaximumLengthLineBeforeCrLfIsStillScrubbed() { + val src = tmp.newFile("maximum.log") + val line = "x ".repeat(LogRedactor.MAX_LINE_LENGTH / 2) + src.writeText(line + "\r\n") + val out = StringWriter() + + LogRedactor.scrubTo(src, out) + + assertEquals(line + "\n", out.toString()) + assertFalse(out.toString().contains(LogRedactor.OVERSIZED_LINE)) + } + + @Test fun streamingScrubStopsBetweenInputChunks() { + val src = tmp.newFile("cancelled.log") + src.writeText("first safe line\n" + "x".repeat(20_000) + " sessionid=abcdef123456\n") + val out = StringWriter() + var checks = 0 + + val complete = LogRedactor.scrubTo(src, out) { ++checks >= 4 } + + assertFalse(complete) + assertFalse(out.toString().contains("abcdef123456")) + assertTrue(checks >= 4) + } + + @Test fun manyLearnedAccountsKeepBoundariesAndLiteralNames() { + val users = tmp.newFile("loginusers.vdf") + users.writeText((0 until 40).joinToString("\n") { + "\"AccountName\" \"probe_account_$it\"" + } + "\n\"PersonaName\" \"Player.+[40]\"\n") + try { + LogRedactor.learnAccounts(users) + assertEquals("owner=<redacted:account> persona=<redacted:account>", + LogRedactor.redact("owner=probe_account_39 persona=Player.+[40]")) + assertEquals("owner=probe_account_390", LogRedactor.redact("owner=probe_account_390")) + } finally { + LogRedactor.learnAccounts(tmp.root.resolve("missing-users")) + } + } + + @Test fun manyLearnedAddressesKeepOtherAddresses() { + val link = tmp.newFile("droiddeck-net") + link.writeText((1..40).joinToString("\n") { "addr 203.0.113.$it 24" }) + try { + LogRedactor.learnOwnAddresses(link) + assertEquals("local=<redacted:ip> server=203.0.113.200", + LogRedactor.redact("local=203.0.113.40 server=203.0.113.200")) + } finally { + LogRedactor.learnOwnAddresses(tmp.root.resolve("missing-network")) + } + } + @Test fun learnedAccountsComeFromBothClients() { val root = java.nio.file.Files.createTempDirectory("redactor").toFile() try { diff --git a/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt new file mode 100644 index 000000000..4aac1334e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.core + +import android.app.Application +import android.content.ComponentName +import android.content.Intent +import android.content.pm.PackageManager +import android.provider.Settings +import androidx.test.core.app.ApplicationProvider +import com.droiddeck.launcher.input.HomeButtonService +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = Application::class) +class SteamIntegrationShortcutsTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val service = ComponentName(context, HomeButtonService::class.java) + + private fun listed() = context.packageManager.queryIntentServices( + Intent("android.accessibilityservice.AccessibilityService").setPackage(context.packageName), 0, + ).any { ComponentName(it.serviceInfo.packageName, it.serviceInfo.name) == service } + + private fun choose(value: String?) = + Settings.Secure.putString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, value) + + @Test fun theShortcutsServiceIsHiddenUntilChosen() { + assertTrue(listed()) + assertFalse(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) + } + + @Test fun anUpdateKeepsAServiceTheUserAlreadyTurnedOn() { + choose(service.flattenToString()) + SteamIntegration.syncShortcutsListing(context) + assertTrue(listed()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + } + + @Test fun openingShortcutSetupListsTheServiceAndBackingOutHidesItAgain() { + SteamIntegration.setShortcutsListed(context, true) + assertTrue(listed()) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) + } + + @Test fun aChosenServiceStaysListed() { + choose("other.app/.Reader:" + service.flattenToShortString()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertTrue(listed()) + choose(service.flattenToString()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + choose("other.app/.Reader") + assertFalse(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + } + + @Test fun anUpdateHidesAnUnchosenServiceWithoutOpeningDroidDeck() { + val replaced = Intent(Intent.ACTION_MY_PACKAGE_REPLACED).setPackage(context.packageName) + assertTrue(context.packageManager.queryBroadcastReceivers(replaced, 0) + .any { it.activityInfo.name == ShortcutsListingReceiver::class.java.name }) + assertTrue(listed()) + ShortcutsListingReceiver().onReceive(context, replaced) + assertFalse(listed()) + } + + @Test fun anUpdateLeavesAChosenServiceListed() { + choose(service.flattenToString()) + ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_MY_PACKAGE_REPLACED)) + assertTrue(listed()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + } + + @Test fun otherBroadcastsChangeNothing() { + ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_BOOT_COMPLETED)) + assertTrue(listed()) + } + + @Test fun turningTheServiceOffInSettingsHidesItAtOnce() { + choose(service.flattenToString()) + val running = org.robolectric.Robolectric.buildService(HomeButtonService::class.java).create().get() + running.onUnbind(null) + assertTrue(listed()) + choose("") + running.onUnbind(null) + assertFalse(listed()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationSuggestionTest.kt b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationSuggestionTest.kt new file mode 100644 index 000000000..a15bd7af2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationSuggestionTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.core + +import android.app.Application +import androidx.test.core.app.ApplicationProvider +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SettingsReset +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class) +class SteamIntegrationSuggestionTest { + private val context: Application = ApplicationProvider.getApplicationContext() + + @Test fun closingTheSuggestionKeepsItHiddenForGood() { + assertTrue(SteamIntegration.read(context).suggested) + SteamIntegration.dismissSuggestion(context) + assertFalse(SteamIntegration.read(context).suggested) + SettingsReset.resetAll(context, gameProfiles = false) + assertFalse(SteamIntegration.read(context).suggested) + assertTrue(SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt b/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt new file mode 100644 index 000000000..a5eba9c3e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.files + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class AllFilesAccessTest { + @Test + fun androidTenAndOlderNeverAsks() { + assertFalse(AllFilesAccess.missing(sdk = 29) { false }) + } + + @Test + fun androidElevenAsksUntilGranted() { + assertTrue(AllFilesAccess.missing(sdk = 30) { false }) + assertFalse(AllFilesAccess.missing(sdk = 30) { true }) + } + + @Test + fun newerAndroidAsksUntilGranted() { + assertTrue(AllFilesAccess.missing(sdk = 35) { false }) + assertFalse(AllFilesAccess.missing(sdk = 35) { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt new file mode 100644 index 000000000..cbcf20755 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileManagerNavigationTest.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.files + +import java.io.File +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class FileManagerNavigationTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun backCannotNavigateAboveTheCurrentDriveRoot() { + val drive = tmp.newFolder("drive") + val child = File(drive, "folder").apply { mkdir() } + + assertTrue(canNavigateUp(child, drive)) + assertFalse(canNavigateUp(drive, drive)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt new file mode 100644 index 000000000..17b23ed1c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCancellationTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.files + +import java.io.File +import java.util.concurrent.CancellationException +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class FileOpsCancellationTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun cancellingCopyRemovesAnIncompleteNewFile() { + val source = tmp.newFile("source").apply { writeBytes(ByteArray(5 * 1024 * 1024)) } + val destination = File(tmp.root, "destination") + var cancelled = false + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> cancelled = true }) { cancelled } + } + + assertTrue(source.exists()) + assertFalse(destination.exists()) + } + + @Test fun cancellingMoveFallbackPreservesTheSourceAndExistingDestination() { + val source = tmp.newFile("source").apply { writeText("replacement") } + val destination = tmp.newFile("destination").apply { writeText("original") } + var cancelled = false + + assertThrows(CancellationException::class.java) { + FileOps.moveWithProgress(source, destination, { _, _ -> cancelled = true }) { cancelled } + } + + assertEquals("replacement", source.readText()) + assertEquals("original", destination.readText()) + } + + @Test fun aCommittedMoveFinishesRemovingTheSourceDespiteCancellation() { + val source = tmp.newFile("source").apply { writeText("replacement") } + val destination = tmp.newFile("destination").apply { writeText("original") } + val isCancelled = { destination.readText() == "replacement" } + + assertTrue(FileOps.moveWithProgress(source, destination, null, isCancelled)) + + assertTrue(isCancelled()) + assertEquals("replacement", destination.readText()) + assertFalse(source.exists()) + assertEquals(setOf("destination"), tmp.root.list()!!.toSet()) + } + + @Test fun cancellingTheSizeScanStopsBeforeCreatingTheDestination() { + val source = tmp.newFolder("source") + repeat(3) { File(source, "file-$it").writeText("content") } + val destination = File(tmp.root, "destination") + var checks = 0 + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, null) { + assertFalse(destination.exists()) + ++checks > 2 + } + } + + assertEquals(3, checks) + assertFalse(destination.exists()) + assertEquals(3, source.listFiles()?.size) + } + + @Test fun cancellingCopyRemovesANewDestinationDirectory() { + val source = tmp.newFolder("source") + val payload = File(source, "nested/payload").apply { + parentFile!!.mkdirs() + writeText("content") + } + val destination = File(tmp.root, "destination") + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertEquals("content", payload.readText()) + assertFalse(destination.exists()) + } + + @Test fun cancellingCopyPreservesAnExistingDestinationDirectory() { + val source = tmp.newFolder("source") + File(source, "nested/payload").apply { + parentFile!!.mkdirs() + writeText("replacement") + } + val destination = tmp.newFolder("destination") + val existing = File(destination, "keep").apply { writeText("original") } + + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(source, destination, { _, _ -> throw CancellationException("cancel") }) + } + + assertEquals("original", existing.readText()) + assertEquals(setOf("keep"), destination.list()!!.toSet()) + } + + @Test fun cancellingRecursiveDeleteStopsBeforeTheNextFile() { + val directory = tmp.newFolder("directory") + repeat(3) { File(directory, "file-$it").writeText("content") } + var checks = 0 + + assertThrows(CancellationException::class.java) { + FileOps.delete(directory) { ++checks > 3 } + } + + assertTrue(directory.exists()) + assertEquals(2, directory.listFiles()?.size) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt index ac13ac781..1489aca64 100644 --- a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt @@ -13,7 +13,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class FileOpsCopyTest { @@ -53,27 +53,25 @@ class FileOpsCopyTest { assertEquals("replacement", src.readText()) } - @Test fun cancellingStopsATreeOfEmptyFiles() { + @Test fun cancellingRemovesANewTreeOfEmptyFiles() { val src = tmp.newFolder("source") for (name in listOf("a", "b", "c")) File(src, name).createNewFile() val dst = File(tmp.root, "dest") - var checks = 0 assertThrows(CancellationException::class.java) { - FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + FileOps.copyWithProgress(src, dst, null) { dst.list()?.isNotEmpty() == true } } - assertEquals(1, dst.list()!!.size) + assertFalse(dst.exists()) assertEquals(3, src.list()!!.size) } - @Test fun cancellingStopsATreeOfEmptyFolders() { + @Test fun cancellingRemovesANewTreeOfEmptyFolders() { val src = tmp.newFolder("source") for (name in listOf("a", "b", "c")) File(src, name).mkdir() val dst = File(tmp.root, "dest") - var checks = 0 assertThrows(CancellationException::class.java) { - FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + FileOps.copyWithProgress(src, dst, null) { dst.list()?.isNotEmpty() == true } } - assertEquals(1, dst.list()!!.size) + assertFalse(dst.exists()) } @Test fun aCompletedCopyReplacesTheDestination() { diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt index 03ad97a19..e8625f180 100644 --- a/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class FileOpsLinksTest { 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 000000000..279c69b2a --- /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/AddedExesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt index 00b9988bd..1e57175d1 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -112,6 +112,148 @@ class AddedExesTest { assertEquals(listOf(pick.path), AddedGames.scan(app).map { it.exe.path }) } + private fun result(r: AddedGames.AddResult): AddedGames.Game = when (r) { + is AddedGames.AddResult.Added -> r.game + is AddedGames.AddResult.Existing -> r.game + is AddedGames.AddResult.Switched -> r.game + else -> throw AssertionError("not added: $r") + } + + private fun visualNovels(): File { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "VNs/Albatross/Albatross Log.exe")) + exe(File(storage, "VNs/Rance 01/Rance01.exe")) + exe(File(storage, "VNs/Angel Beats/SiglusEngine.exe")) + exe(File(storage, "VNs/Sayonara/SiglusEngine.exe")) + return storage + } + + @Test fun aGroupFolderOnGameStorageListsEachGameInsideIt() { + val storage = visualNovels() + val vns = File(storage, "VNs") + assertEquals(listOf("Albatross", "Angel Beats", "Rance 01", "Sayonara").map { File(vns, it).path }, + AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aGroupFolderWithFoldersHoldingNoGameStillListsEachGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + File(vns, "steamapps/common").mkdirs() + File(vns, "Notes/readme.txt").apply { parentFile!!.mkdirs(); writeText("x") } + assertEquals(listOf("Albatross", "Angel Beats", "Rance 01", "Sayonara").map { File(vns, it).path }, + AddedGames.scan(app).map { it.folder.path }) + val pick = File(vns, "Rance 01/Rance01.exe") + assertEquals(pick.parentFile!!.path, result(AddedGames.addExe(app, pick)).folder.path) + assertEquals(4, AddedGames.scan(app).size) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun anExePickedInAGroupFolderOnGameStorageIsItsOwnGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + SessionPrefs.setAddedGameExe(app, vns.path, File(vns, "Albatross/Albatross Log.exe").path) + for (pick in listOf("Rance 01/Rance01.exe", "Sayonara/SiglusEngine.exe", "Angel Beats/SiglusEngine.exe")) { + val game = result(AddedGames.addExe(app, File(vns, pick))) + assertEquals(File(vns, pick).parentFile!!.path, game.folder.path) + } + assertEquals(4, AddedGames.scan(app).size) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aRemovedGroupFolderOnGameStorageStaysRemoved() { + val storage = visualNovels() + val group = File(storage, "VNs") + val pick = File(group, "Rance 01/Rance01.exe") + AddedGames.remove(app, group) + val game = result(AddedGames.addExe(app, pick)) + assertEquals(pick.parentFile!!.path, game.folder.path) + assertTrue(group.path in SessionPrefs.removedAddedGames(app)) + assertEquals(listOf(pick.parentFile!!.path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aSiblingExeOfAnAddedGameOnGameStorageSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + val held = exe(File(storage, "Game/bin/Game.exe")) + val pick = exe(File(storage, "Game/launcher/Launcher.exe")) + val game = File(storage, "Game") + AddedExes.put(app, AddedExes.Entry(game.path, held.path)) + val result = AddedGames.addExe(app, pick) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(game.path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aHiddenFolderInAGroupIsAddedAsItsOwnGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + val pick = exe(File(vns, ".Gamma/Gamma.exe")) + val game = result(AddedGames.addExe(app, pick)) + assertEquals(pick.parentFile!!.path, game.folder.path) + assertTrue(AddedGames.scan(app).any { it.folder.path == pick.parentFile!!.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aFolderThatDeclaresItsExeInASubfolderStaysOneGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Halo/Content/Halo.exe")) + exe(File(storage, "Halo/Tools/ModKit.exe")) + File(storage, "Halo/MicrosoftGame.config").writeText("<Game><Executable Name=\"Content\\Halo.exe\" /></Game>") + assertEquals(listOf(File(storage, "Halo").path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aGroupFolderTheUserAddedAsOneGameStaysOneGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + AddedExes.put(app, AddedExes.Entry(vns.path, File(vns, "Albatross/Albatross Log.exe").path)) + assertEquals(listOf(vns.path), AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aGameWithBuildFoldersOnGameStorageStaysOneGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Oddworld/x64/Oddworld.exe")) + exe(File(storage, "Oddworld/x86/Oddworld.exe")) + exe(File(storage, "Episodes/Episode1/Episode1.exe")) + File(storage, "Episodes/Movies").mkdirs() + assertEquals(listOf("Episodes", "Oddworld").map { File(storage, it).path }, AddedGames.scan(app).map { it.folder.path }) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aSiblingExeOfAGameOnGameStorageSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Game/bin/Game.exe")) + val pick = exe(File(storage, "Game/launcher/Launcher.exe")) + val result = AddedGames.addExe(app, pick) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(File(storage, "Game").path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + + @Test fun aDeeperExeOfAGameOnGameStorageStillSwitchesThatGame() { + val storage = tmp.newFolder("PC Games") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "SD card") + exe(File(storage, "Example/Example.exe")) + val deep = exe(File(storage, "Example/bin/Example64.exe")) + val result = AddedGames.addExe(app, deep) + assertTrue(result is AddedGames.AddResult.Switched) + assertEquals(File(storage, "Example").path, (result as AddedGames.AddResult.Switched).game.folder.path) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + @Test fun anotherBuildOfTheSameExeInASiblingFolderSwitchesTheGame() { noGamesFolders() val held = onStorage("Games2/Oddworld/x64/Oddworld.exe") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt index 473c43922..0d9749a69 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt @@ -11,7 +11,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -154,6 +154,98 @@ class AddedGameArtFillTest { assertFalse(File(AddedGameArt.cacheDir(app, second), AddedGameArt.EXTRAS_TRIED).exists()) } + private fun steamFrom(asked: MutableList<String>, bytes: Byte, search: Int? = null, slotsAsked: MutableList<Set<Slot>> = ArrayList()) = AddedGameArt.Sources( + storeLogo = { false }, + steamSearch = { if (search == null) fail("searched although the game names its appid"); search }, + steam = { id, cache, slots -> + asked += id + slotsAsked += slots + slots.forEach { File(cache, steamNames.getValue(it)).writeBytes(byteArrayOf(bytes)) } + slots.isNotEmpty() + }, + sgdbGame = { _, _, _ -> null }, + sgdb = { _, _, _, _ -> false }, + ) + + @Test fun artOfTheAppTheFilesNamedBeforeIsFetchedAgain() { + val g = game("Peak", 0x8100000AL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1))) + File(g.folder, "steam_appid.txt").writeText("3527290") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("1029210", "3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(AddedGameArt.cacheDir(app, g), "p.jpg").readBytes()) + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 3))) + assertEquals(2, asked.size) + } + + @Test fun aPictureTheUserChoseOutlivesTheChange() { + val g = game("Peak", 0x8100000BL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 1)) + val picked = File(tmp.root, "mine.jpg").apply { writeBytes(byteArrayOf(7)) } + assertTrue(AddedGameArt.store(AddedGameArt.cacheDir(app, g), Slot.COVER, AddedGameArt.Option(AddedGameArt.FILE, picked.path, picked.path))) + File(g.folder, "steam_appid.txt").writeText("3527290") + val asked = ArrayList<String>() + val slots = ArrayList<Set<Slot>>() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, slotsAsked = slots)) + assertArrayEquals(byteArrayOf(7), AddedGameArt.resolve(app, g).portrait!!.readBytes()) + assertEquals(listOf("3527290"), asked) + assertEquals(listOf(setOf(Slot.WIDE, Slot.BACKGROUND, Slot.LOGO)), slots) + val cache = AddedGameArt.cacheDir(app, g) + assertArrayEquals(byteArrayOf(2), File(cache, "header.jpg").readBytes()) + assertArrayEquals(byteArrayOf(2), File(cache, "hero.jpg").readBytes()) + assertFalse(File(cache, AddedGameArt.REFETCH).exists()) + } + + private fun olderBuildsArt(g: AddedGames.Game, marker: String): File = AddedGameArt.cacheDir(app, g).apply { + mkdirs() + File(this, "steam-appid").writeText(marker) + steamNames.values.forEach { File(this, it).writeBytes(byteArrayOf(1)) } + } + + @Test fun anOlderBuildsSpacewarMarkerGoesWithItsArt() { + val g = game("Peak", 0x8100000DL, cover = false) + File(g.folder, "steam_appid.txt").writeText("480") + val cache = olderBuildsArt(g, "480") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun anOlderBuildsMatchStaysWhileTheFilesNameNoApp() { + val g = game("Hades", 0x8100000EL, cover = false) + File(g.folder, "steam_appid.txt").delete() + val cache = olderBuildsArt(g, "1145360") + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 2))) + assertEquals("1145360", File(cache, "steam-appid").readText()) + assertArrayEquals(byteArrayOf(1), File(cache, "p.jpg").readBytes()) + } + + @Test fun anOlderBuildsMatchGivesWayToTheAppTheFilesName() { + val g = game("Peak", 0x8100000FL, cover = false) + File(g.folder, "steam_appid.txt").writeText("3527290") + val cache = olderBuildsArt(g, "1029210") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun filesThatStopNamingAnAppFallBackToTheGamesName() { + val g = game("Peak", 0x8100000CL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList<String>() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1)) + File(g.folder, "steam_appid.txt").writeText("480") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("1029210", "3527290"), asked) + } + @Test fun nothingIsFetchedWhenArtIsOff() { SessionPrefs.setAddedGamesArt(app, false) val calls = Calls() diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt index 1f1e30c81..a2e641560 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.frontend +import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.stores.CredentialCipher import org.json.JSONArray import org.json.JSONObject @@ -13,7 +14,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -65,6 +66,29 @@ class AddedGameArtLookupTest { assertEquals(SteamMatch.Certainty.NAME, match.certainty) } + @Test fun anEarlierBuildsSpacewarLookupIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + val legacy = File(tmp.newFolder(), "steam-appid").apply { writeText("480") } + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK", legacy = legacy) { 3527290 }.appId) + } + + @Test fun aSavedSpacewarMatchIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + SteamMatch.put(app, dir.path, SteamMatch.Match(480, SteamMatch.Certainty.NAME, "store search", System.currentTimeMillis())) + assertNull(SteamMatch.resolve(app, dir.path, exe, "PEAK").appId) + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK") { 3527290 }.appId) + } + + @Test fun aStoreSearchAnsweringSpacewarIsNoMatch() { + val dir = tmp.newFolder("Spacewar Fan Remake") + val exe = File(dir, "game.exe").apply { writeText("x") } + val match = SteamMatch.resolve(app, dir.path, exe, "Spacewar Fan Remake") { 480 } + assertNull(match.appId) + assertEquals(SteamMatch.Certainty.NONE, match.certainty) + } + @Test fun aStoreResultIsTakenOnlyWhenItsNameMatches() { assertNull(AddedGameArt.pickStoreResult("My Obscure Game", listOf("10" to "Totally Different", "11" to "Another One"))) assertEquals("20", AddedGameArt.pickStoreResult("Hades", listOf("19" to "Hades II Soundtrack Bundle Extra", "20" to "Hades"))) @@ -92,8 +116,9 @@ class AddedGameArtLookupTest { assertEquals("build", SteamGridDb.pick("", "build")) assertEquals("build", SteamGridDb.pick(" ", "build")) assertEquals("", SteamGridDb.pick("", "")) - assertEquals("", SteamGridDb.builtInKey()) - assertEquals("", SteamGridDb.key(app)) + val builtIn = SteamGridDb.builtInKey() + assertTrue(builtIn == BuildConfig.SGDB_API_KEY) + assertTrue(SteamGridDb.key(app) == builtIn.trim()) } @Test fun theUsersKeyIsSealedOnDiskAndClears() { @@ -106,7 +131,7 @@ class AddedGameArtLookupTest { assertEquals("abcdef0123456789secretkey", SteamGridDb.key(app)) SteamGridDb.setUserKey(app, "") assertFalse(file.exists()) - assertEquals("", SteamGridDb.key(app)) + assertTrue(SteamGridDb.key(app) == SteamGridDb.builtInKey().trim()) } @Test fun aFailedLookupIsNotRememberedAsNoMatch() { diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameEditsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameEditsTest.kt index 3697ef9a7..d41f158f8 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameEditsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameEditsTest.kt @@ -13,7 +13,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File 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 000000000..610f00bb4 --- /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/AddedGamesCandidatesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCandidatesTest.kt index f2881c712..ac4afdfc2 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCandidatesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCandidatesTest.kt @@ -9,7 +9,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesRemoveTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesRemoveTest.kt index 00da0980e..791e9a063 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesRemoveTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesRemoveTest.kt @@ -8,7 +8,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesScanTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesScanTest.kt index 26ebf6700..8f5599995 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesScanTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesScanTest.kt @@ -7,7 +7,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSteamEditsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSteamEditsTest.kt index 953c3989f..7266dad1b 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSteamEditsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesSteamEditsTest.kt @@ -13,7 +13,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt index 410d298ac..b38261b5e 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt @@ -9,7 +9,7 @@ import java.io.File import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt index a4e3b0028..8630702ed 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameFileSyncTest.kt @@ -5,7 +5,7 @@ import com.droiddeck.launcher.session.SessionPrefs import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt index bcae5c8fe..e23c71d57 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt @@ -11,7 +11,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowContentResolver diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt index d67170d1e..1bd80fea4 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt @@ -31,8 +31,25 @@ class GameIdentifierTest { fun steamAppIdTxt_inSteamSettingsSubdir_isFound() { val dir = tmp.newFolder("Game") File(dir, "steam_settings").mkdirs() - File(dir, "steam_settings/steam_appid.txt").writeText("480") - assertEquals(480, GameIdentifier.identify(exeIn(dir)).appId) + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_namesNoGame() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_emu.ini").writeText("[Settings]\nAppId=480\n") + assertNull(GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_fallsThroughToTheGamesOwnId() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_settings").mkdirs() + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) } @Test @@ -44,6 +61,30 @@ class GameIdentifierTest { assertEquals(GameIdentifier.Source.STEAM_EMU_INI, id.source) } + @Test + fun spacewarManifest_namesNoGame() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + File(game, "steam_appid.txt").writeText("3527290") + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals(GameIdentifier.Source.STEAM_APPID_TXT, id.source) + assertTrue(id.name != "Spacewar") + } + + @Test + fun spacewarManifest_leavesTheGamesOwnManifestForTheSameFolder() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + File(steamapps, "appmanifest_3527290.acf").writeText(""""AppState" { "appid" "3527290" "name" "PEAK" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals("PEAK", id.name) + assertEquals(GameIdentifier.Source.STEAM_MANIFEST_ACF, id.source) + } + @Test fun steamManifestAcf_matchedByInstalldir_givesAppIdAndName() { val steamapps = tmp.newFolder("steamapps") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt index 002085daf..a87b8d2e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchIntentTest.kt @@ -4,7 +4,7 @@ import android.content.Intent import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt index 1fbd8c491..08398d03d 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLaunchLinkTest.kt @@ -13,7 +13,7 @@ import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 5a577f5b3..e3fe3f4ea 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt @@ -11,7 +11,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -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/GameShortcutsIconTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameShortcutsIconTest.kt index 7f7f2b2b5..9159c5d83 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameShortcutsIconTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameShortcutsIconTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt index eb101d293..a68cd790d 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt @@ -12,7 +12,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -67,6 +67,105 @@ class GamesFolderMigrationTest { assertTrue(GameStorage.gamesFolderLibraries(app).isEmpty()) } + @Test fun aFolderOfGamesInAnOldGamesFolderBecomesOneEntryPerGame() { + val pc = tmp.newFolder("PC") + val rance = File(pc, "VNs/Rance 01"); exe(pc, "VNs/Rance 01/Rance01.exe") + val albatross = File(pc, "VNs/Albatross"); exe(pc, "VNs/Albatross/Albatross Log.exe") + File(pc, "VNs/steamapps").mkdirs() + val solo = File(pc, "Solo"); exe(pc, "Solo/Solo.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + GamesFolderMigration.run(app) + assertEquals(setOf(albatross.path, rance.path, solo.path), AddedExes.list(app).map { it.folder }.toSet()) + assertEquals(setOf(albatross.path, rance.path, solo.path), AddedGames.scan(app).map { it.folder.path }.toSet()) + } + + @Test fun aRemovedOrAlreadyAddedFolderOfGamesKeepsItsState() { + val pc = tmp.newFolder("PC") + val gone = File(pc, "Gone"); exe(pc, "Gone/A/a.exe"); exe(pc, "Gone/B/b.exe") + val kept = File(pc, "Kept"); val keptExe = exe(pc, "Kept/A/a.exe"); exe(pc, "Kept/B/b.exe") + val store = File(pc, "Store"); exe(pc, "Store/Content/game.exe"); exe(pc, "Store/Tools/tool.exe") + StoreGameSidecar.file(store).writeText("""{"store":"gog","id":"2","title":"Store Game","exe":"Content/game.exe"}""") + val solo = File(pc, "Solo"); exe(pc, "Solo/Extras/viewer.exe"); exe(pc, "Solo/Content/solo.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameRemoved(app, gone.path, true) + AddedExes.put(app, AddedExes.Entry(kept.path, keptExe.path)) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).map { it.folder }.toSet() + assertEquals(setOf(File(gone, "A").path, File(gone, "B").path, kept.path, solo.path), entries) + assertTrue(SessionPrefs.removedAddedGames(app).containsAll(listOf(File(gone, "A").path, File(gone, "B").path))) + assertEquals(setOf(kept.path, solo.path), AddedGames.scan(app).map { it.folder.path }.toSet()) + } + + @Test fun aGameSelectedOutsideTheRankedFoldersStaysListed() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + exe(pc, "VNs/A/a.exe"); exe(pc, "VNs/B/b.exe") + val pick = exe(pc, "VNs/C/helper.exe") + val loose = File(pc, "Loose"); exe(pc, "Loose/A/a.exe"); exe(pc, "Loose/B/b.exe") + val loosePick = exe(pc, "Loose/setup.exe") + val lib = File(pc, "Lib"); exe(pc, "Lib/A/a.exe"); exe(pc, "Lib/B/b.exe") + val libPick = exe(pc, "Lib/steamapps/common/Tool/helper.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameExe(app, vns.path, pick.path) + SessionPrefs.setAddedGameExe(app, loose.path, loosePick.path) + SessionPrefs.setAddedGameExe(app, lib.path, libPick.path) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).associateBy { it.folder } + assertEquals(setOf(File(vns, "A").path, File(vns, "B").path, File(vns, "C").path, loose.path, lib.path), entries.keys) + assertEquals(libPick.path, entries.getValue(lib.path).exe) + assertEquals(pick.path, entries.getValue(File(vns, "C").path).exe) + assertTrue(entries.getValue(File(vns, "C").path).picked) + assertEquals(loosePick.path, entries.getValue(loose.path).exe) + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(pick.path, games.getValue(File(vns, "C").path).exe.path) + assertEquals(loosePick.path, games.getValue(loose.path).exe.path) + } + + @Test fun aSplitFolderHandsItsSettingsToTheGameItLaunched() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + exe(pc, "VNs/Albatross/Albatross.exe") + val pick = exe(pc, "VNs/Rance 01/Rance01.exe") + File(pc, "VNs/Notes").mkdirs() + val plain = File(pc, "Plain"); exe(pc, "Plain/A/a.exe"); exe(pc, "Plain/B/b.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameExe(app, vns.path, pick.path) + SessionPrefs.addedGameAppId(app, vns.path, 0x8111_2222L) + SessionPrefs.setAddedGameName(app, vns.path, "Rance") + SessionPrefs.setAddedGameLaunch(app, vns.path, "-windowed") + SessionPrefs.setAddedGameName(app, File(vns, "Rance 01").path, "Rance 01 Remake") + SessionPrefs.addedGameAppId(app, plain.path, 0x8333_4444L) + GamesFolderMigration.run(app) + val rance = File(vns, "Rance 01").path + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(0x8111_2222L, games.getValue(rance).appId) + assertEquals("Rance 01 Remake", games.getValue(rance).name) + assertEquals("-windowed", games.getValue(rance).launchOptions) + assertEquals(pick.path, games.getValue(rance).exe.path) + assertTrue(games.getValue(File(vns, "Albatross").path).appId != 0x8111_2222L) + assertEquals("", SessionPrefs.addedGameLaunch(app, File(vns, "Albatross").path)) + assertEquals(0x8333_4444L, games.getValue(File(plain, "A").path).appId) + assertTrue(games.getValue(File(plain, "B").path).appId != 0x8333_4444L) + } + + @Test fun aSplitFolderKeepsTheExeItLaunchedWithoutAPick() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + val launched = exe(pc, "VNs/Rance/VNsPlayer.exe"); exe(pc, "VNs/Rance/Rance.exe") + val other = exe(pc, "VNs/Other/Other.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.addedGameAppId(app, vns.path, 0x8555_6666L) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).associateBy { it.folder } + assertEquals(launched.path, entries.getValue(File(vns, "Rance").path).exe) + assertTrue(entries.getValue(File(vns, "Rance").path).picked) + assertFalse(entries.getValue(File(vns, "Other").path).picked) + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(launched.path, games.getValue(File(vns, "Rance").path).exe.path) + assertEquals(0x8555_6666L, games.getValue(File(vns, "Rance").path).appId) + assertEquals(other.path, games.getValue(File(vns, "Other").path).exe.path) + } + @Test fun runningAgainChangesNothing() { val pc = tmp.newFolder("PC") exe(pc, "Alpha/Alpha.exe") 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 8ecd411b0..b29011769 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt @@ -5,7 +5,7 @@ import java.io.File import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -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/LibraryCacheClientTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryCacheClientTest.kt index 40570d9e4..2ea80e2f7 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryCacheClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryCacheClientTest.kt @@ -5,7 +5,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryConcealedAppsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryConcealedAppsTest.kt index 8d00784cc..9d485d47a 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryConcealedAppsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryConcealedAppsTest.kt @@ -6,7 +6,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 000000000..1e16abaa2 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/LogoPositionTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LogoPositionTest.kt index 2fecb6503..39c2acc6f 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LogoPositionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LogoPositionTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 000000000..bc3f62aba --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 000000000..c64a11fcc --- /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/SteamGameArtTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGameArtTest.kt index 63c403dd4..13d378c68 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGameArtTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGameArtTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File 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 cc243e743..62d56d8ee 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt @@ -11,7 +11,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -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/SteamLaunchOptionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt new file mode 100644 index 000000000..2d479a3fe --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import java.io.File +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamLaunchOptionsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun config(apps: String) = listOf( + "\"UserLocalConfigStore\"", "{", "\t\"Software\"", "\t{", "\t\t\"Valve\"", "\t\t{", "\t\t\t\"Steam\"", "\t\t\t{", + apps, "\t\t\t}", "\t\t}", "\t}", "\t\"WebStorage\"", "\t{", "\t\t\"x\"\t\t\"1\"", "\t}", "}", "", + ).joinToString("\n") + + private fun apps(vararg lines: String) = (listOf("\t\t\t\t\"apps\"", "\t\t\t\t{") + lines + "\t\t\t\t}").joinToString("\n") + + private val sparking = arrayOf( + "\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}", + ) + + @Test fun replacesTheOptionsSteamHas() { + val text = config(apps(*sparking)) + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx12")!! + assertEquals(text.replace("\"-dx11\"", "\"-dx12\""), updated) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun addsOptionsToAGameThatHasNone() { + val text = config(apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t}")) + assertEquals(config(apps(*sparking)).replace("-dx11", "-vulkan"), SteamLaunchOptions.withLaunchOptions(text, 1790600, "-vulkan")) + } + + @Test fun addsTheGameAndTheAppsSectionWhenSteamHasNeither() { + val updated = SteamLaunchOptions.withLaunchOptions(config("\t\t\t\t\"language\"\t\t\"english\""), 1790600, "-dx11")!! + assertEquals( + config( + "\t\t\t\t\"language\"\t\t\"english\"\n" + + apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}"), + ), + updated, + ) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun quotesAndBackslashesAreEscapedAndReadBack() { + val options = "PROTON_LOG=1 %command% -path \"C:\\Games\\DB\"" + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, options)!! + assertEquals(true, updated.contains("\"PROTON_LOG=1 %command% -path \\\"C:\\\\Games\\\\DB\\\"\"")) + assertEquals(options, SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun emptyOptionsClearSteams() { + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, "")!! + assertEquals("", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun windowsLineEndsAreKept() { + val text = config("\t\t\t\t\"language\"\t\t\"english\"").replace("\n", "\r\n") + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx11")!! + assertEquals(false, updated.replace("\r\n", "").contains('\n')) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun onlyTheGamesOwnSectionChanges() { + val other = arrayOf( + "\t\t\t\t\t\"7\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"1790600\"", "\t\t\t\t\t\t{", "\t\t\t\t\t\t\t\"LaunchOptions\"\t\t\"keep\"", "\t\t\t\t\t\t}", "\t\t\t\t\t}", + ) + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*other, *sparking)), 1790600, "-dx12")!! + assertEquals(true, updated.contains("\"keep\"")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + assertNull(SteamLaunchOptions.launchOptions(config(apps(*other)), 1790600)) + } + + @Test fun otherFilesAreLeftAlone() { + assertNull(SteamLaunchOptions.withLaunchOptions("\"InstallConfigStore\"\n{\n}\n", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.withLaunchOptions("", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.launchOptions("", 1790600)) + } + + private fun steamHome(home: File = tmp.newFolder("Steam")): File = home.also { + File(home, "config").mkdirs() + File(home, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198021239924\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private fun localConfig(home: File, account: String) = File(home, "userdata/$account/config/localconfig.vdf").apply { parentFile!!.mkdirs() } + + @Test fun aChangeGoesToTheSignedInAccountOnly() { + val home = steamHome() + val signedIn = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + val other = localConfig(home, "123").apply { writeText(config("\t\t\t\t\"language\"\t\t\"english\"")) } + val untouched = other.readText() + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(signedIn.readText(), 1790600)) + assertEquals(untouched, other.readText()) + assertFalse(File(signedIn.parentFile, "localconfig.vdf.staged").exists()) + } + + @Test fun whatSteamWroteLastIsWhatTheGameHas() { + val home = steamHome() + val config = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + config.writeText(SteamLaunchOptions.withLaunchOptions(config.readText(), 1790600, "-vulkan")!!) + assertEquals("-vulkan", SteamLaunchOptions.steam(home, 1790600)) + assertNull(SteamLaunchOptions.steam(home, 400)) + } + + private val app get() = RuntimeEnvironment.getApplication() + + private val written = ArrayList<File>() + + private fun sessionConfig(): File { + val home = steamHome(SessionPrefs.activeSteamRoot(app)) + return localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + .also { written += it; written += File(home, "config/loginusers.vdf") } + } + + @After fun noSession() { + SessionState.running = false + SessionState.mode = SessionService.MODE_STEAM + written.forEach { it.delete() } + } + + @Test fun aValueChangedInSteamSinceItWasShownIsNotOverwritten() { + val config = sessionConfig() + assertEquals(SteamLaunchOptions.Saved.NO, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-vulkan")) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + assertEquals(SteamLaunchOptions.Saved.YES, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + } + + @Test fun aDesktopSessionLeavesTheFileToItsClient() { + val config = sessionConfig() + val before = config.readText() + SessionState.running = true + SessionState.mode = SessionService.MODE_DESKTOP + assertEquals(SteamLaunchOptions.Saved.DESKTOP, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals(before, config.readText()) + } + + @Test fun nothingIsWrittenWithoutASignedInAccountsConfig() { + assertFalse(SteamLaunchOptions.write(tmp.newFolder("NoSteam"), 1790600, "-dx11")) + val home = steamHome() + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + localConfig(home, "60974196").writeText("\"InstallConfigStore\"\n{\n}\n") + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamPicsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamPicsTest.kt index aa05b1b7a..bdfdead71 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamPicsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamPicsTest.kt @@ -13,7 +13,7 @@ import org.junit.Assert.assertTrue import org.junit.Assert.fail import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt index 448cca6a8..4b5adb21a 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt @@ -12,7 +12,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File 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 78ac65445..ad14f7e18 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt @@ -16,7 +16,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -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"))) } @@ -435,4 +446,55 @@ class WinCompSourcesTest { AutoComponents.drain(app) assertTrue(AutoComponents.queued().isEmpty()) } + + @Test fun aLostPartOfAnInstalledBundleIsReinstalledAndTheGameWaitsForIt() = withFakeWorker { + val bundle = WinComponents.Component("directmusic", "", "", "ready", listOf("dmband"), emptyList()) + AutoComponents.catalogOf = { _, _ -> catalog3 + ready("dmband") + bundle } + installedNow.addAll(listOf("directmusic", "d3dx9")) + WinComponents.setUser(app, "4242", "directmusic", true) + WinComponents.setUser(app, "4242", "d3dx9", true) + session = true + gameUp = true + assertEquals(listOf("dmband"), AutoComponents.restoreMissing(app)) + assertTrue(downloaded.isEmpty()) + assertEquals("[\"dmband\"]", AutoComponents.Pending.read(app).optJSONArray("4242").toString()) + gameUp = false + AutoComponents.drain(app) + assertEquals(listOf("dmband"), downloaded) + assertEquals(0, AutoComponents.Pending.read(app).length()) + assertTrue(AutoComponents.restoreMissing(app).isEmpty()) + } + + @Test fun aRestoreRunsADownloadQueuedBeforeTheSessionWithoutWaitingForItToEnd() = withFakeWorker { + WinComponents.setUser(app, "4243", "vcredist2019_dll", true) + session = true + AutoComponents.queueGame(app, game(tmp.newFolder("Wait"), Library.ADDED), asked = true) + AutoComponents.restoreMissing(app) + AutoComponents.restoreMissing(app) + assertEquals(listOf("vcredist2019_dll"), downloaded) + session = false + AutoComponents.drain(app) + } + + @Test fun aGameJobThatRunsFirstKeepsARestoredComponentPending() = withFakeWorker { + AutoComponents.catalogOf = { _, _ -> catalog3 + ready("dmband") } + val seen = ArrayList<List<String>>() + AutoComponents.installer = { _, c, _, _ -> + if (c.name == "dmband") seen.add(AutoComponents.Pending.ids(app, "1262580")) + downloaded.add(c.name); installedNow.add(c.name); null + } + val game = payback() + WinComponents.setUser(app, "1262580", "dmband", true) + session = true + gameUp = true + AutoComponents.queueInSession(app, game) + AutoComponents.restoreMissing(app) + gameUp = false + AutoComponents.drain(app) + assertEquals(1, seen.size) + assertTrue("dmband" in seen.single()) + assertEquals(0, AutoComponents.Pending.read(app).length()) + session = false + AutoComponents.drain(app) + } } 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 fbf077910..a3b0dd027 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt @@ -6,7 +6,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.File @@ -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/CalibrationDistanceCheckTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationDistanceCheckTest.kt index e28b5b7d7..86c5d2a18 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationDistanceCheckTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationDistanceCheckTest.kt @@ -4,7 +4,7 @@ import org.junit.Assert.* import org.junit.Test import java.util.Locale import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import com.droiddeck.launcher.R diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationObservationDataTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationObservationDataTest.kt index 4452f91cf..4eec9db84 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationObservationDataTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/CalibrationObservationDataTest.kt @@ -5,7 +5,7 @@ import org.json.JSONObject import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/Glasses3dRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/Glasses3dRoutingTest.kt index d40441552..b36a2941b 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/Glasses3dRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/Glasses3dRoutingTest.kt @@ -9,7 +9,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesCallbacksTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesCallbacksTest.kt index f2b097e74..450c01be1 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesCallbacksTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesCallbacksTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt index 923f98848..5c736c13b 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -93,7 +93,6 @@ class GlassesDisplayTest { @Test fun gtMaxSmartGlassesEdidUsesTheSameOutputSelectionAsViture() { val panel = display("SmartGlasses", productName = "SmartGlasses", productId = "980") assertEquals(panel.displayId, Glasses.selectGlassesDisplay(listOf(panel), usbPresent = true)?.displayId) - // The display remains usable while USB control reconnects during a mode switch. assertEquals(panel.displayId, Glasses.selectGlassesDisplay(listOf(panel), usbPresent = false)?.displayId) } @@ -126,7 +125,6 @@ class GlassesDisplayTest { } } - // Robolectric exposes display names and flags, but has no product-metadata setter. @Implements(Display::class) class ProductMetadataDisplay : ShadowDisplay() { var productMetadata: DeviceProductInfo? = null diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuCaptureTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuCaptureTest.kt index e2a5f683d..36afcba05 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuCaptureTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuCaptureTest.kt @@ -17,7 +17,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.android.controller.ActivityController import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuControllerTest.kt index 3c539f0ef..e5032d300 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuControllerTest.kt @@ -13,7 +13,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.android.controller.ActivityController import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt index d1cd22769..0192d9840 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt @@ -63,7 +63,6 @@ class GlassesMenuProjectionTest { private object GlassesMenuProjection { data class Uv(val x: Float, val y: Float) - // Row-major head-to-anchor rotation; +Y is up, -Z is forward, output UV starts at the top left. fun intersect(frame: GlassesMenuPose.Frame, rayX: Float, rayY: Float, eye: Float, halfWidth: Float, distance: Float, aspect: Float): Uv? { if (frame.rotation.size != 9 || frame.position.size != 3 || frame.rotation.any { !it.isFinite() } || 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 b8306b936..974da93d7 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt @@ -1,17 +1,20 @@ 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 import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.annotation.Implementation import org.robolectric.annotation.Implements @@ -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/GlassesOutputHandoffTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt index e1258f489..4a3df9284 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt @@ -12,7 +12,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -30,7 +30,6 @@ class GlassesOutputHandoffTest { private lateinit var screen: GlassesScreen @Before fun setup() { - // Exercise the output lifecycle without starting the native Linux runtime. activity = Robolectric.buildActivity(SessionActivity::class.java).get() phone = SurfaceView(activity) ReflectionHelpers.setField(activity, "surfaceView", phone) @@ -46,7 +45,7 @@ class GlassesOutputHandoffTest { @Test fun selectingGlassesDoesNotHidePhoneOrClaimOutputBeforeAttachment() { assertFalse(active()) assertEquals(View.VISIBLE, phone.visibility) - attach(phone.holder) // A late phone callback must not complete the handoff. + attach(phone.holder) assertFalse(active()) assertEquals(View.VISIBLE, phone.visibility) } 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 51d9aa7b7..5c4b38d23 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) @@ -190,11 +183,11 @@ class GlassesRenderingTest { picture3d = GlassesSettings.PICTURE_SCREEN) for (state in listOf(ultra.copy(displayId = -1), GlassesState())) { val preview = GlassesRendering.cardboard(base, settings, state, false, true) - assertTrue(preview.enabled) // Published as headset proximity, preventing standby. + assertTrue(preview.enabled) assertTrue(preview.mono) assertEquals(Cardboard.SOURCE_SBS, preview.source) assertEquals(Cardboard.Viewer.NONE.id, preview.viewer) - assertTrue(preview.headTracking) // Phone preference, not dormant glasses settings. + assertTrue(preview.headTracking) assertFalse(base.enabled) assertSame(base, GlassesRendering.cardboard(base, settings, state, false, false)) } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesScreenTest.kt index 6d1ecb1c2..3233ba2d2 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesScreenTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSessionModesTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSessionModesTest.kt index efea73336..775fc9ac4 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSessionModesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSessionModesTest.kt @@ -18,7 +18,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt index 02ab5aca8..ce801611a 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt @@ -17,7 +17,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -251,8 +251,6 @@ class GlassesSteamVrTest { .set(activity, LoadingState(activity).apply { visible = false }) SessionState.steamVr = true SessionState.mode = SessionService.MODE_STEAM - // Hold the external worker so status transitions can be exercised - // without launching a Linux runtime from the host test process. val worker = SessionActivity::class.java.getDeclaredField("steamVrWorker") .apply { isAccessible = true }.get(null) as ThreadPoolExecutor val blocked = CountDownLatch(1) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesTrackingRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesTrackingRoutingTest.kt index 3409d6f83..7ba91cb43 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesTrackingRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesTrackingRoutingTest.kt @@ -20,7 +20,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode 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 225805dc6..d01c75295 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt @@ -16,7 +16,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -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/HandImageBufferTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/HandImageBufferTest.kt index 2dc41cf1e..05aeae292 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/HandImageBufferTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/HandImageBufferTest.kt @@ -7,7 +7,7 @@ import com.google.mediapipe.framework.image.MPImage import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/LumaRgbDiagnosticTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/LumaRgbDiagnosticTest.kt index 91174de49..41ddab82e 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/LumaRgbDiagnosticTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/LumaRgbDiagnosticTest.kt @@ -9,7 +9,7 @@ import org.json.JSONObject import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt index 996b8fa8c..6b587c70d 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt @@ -4,7 +4,7 @@ import android.content.Context import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -115,8 +115,6 @@ class RayNeoCalibrationTest { val upright = RayNeoOrientationFilter(profile.rotationXDeg, profile.gtMaxAxes, saved) .update(sample(floatArrayOf(-0.02f, 8.819f, 4.106f), reading.gyroDps)) assertArrayEquals(floatArrayOf(1f, 0f, 0f, 0f), upright, 0.001f) - // This was the reported failure: the same physical pose cannot calibrate - // through the Max's permutation and 35-degree mounting correction. assertNull(finish(RayNeoCalibrationCollector(RayNeoSensorAxes(35f, true), 0), sample = reading)) } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoEndpointsTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoEndpointsTest.kt index 933df6220..9261e341c 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoEndpointsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoEndpointsTest.kt @@ -6,7 +6,7 @@ import android.hardware.usb.UsbInterface import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.shadow.api.Shadow import org.robolectric.util.ReflectionHelpers diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt index 832d220c7..8d367a9d9 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt @@ -9,7 +9,7 @@ import java.time.Duration import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.annotation.Implementation import org.robolectric.annotation.Implements @@ -102,7 +102,6 @@ class RayNeoLinkTest { val cmd = bytes[1].toInt() and 0xff commands += cmd if (gtTraffic && cmd in listOf(0, 1)) { - // Notifications and unrelated ACKs can precede the requested response. for (other in listOf(0x08, 6, 7, 0x50)) { responses += ByteArray(64).apply { this[0] = 0x99.toByte(); this[1] = 0xc8.toByte(); this[2] = 64 diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt index c05b7eb19..0dc767629 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt @@ -79,8 +79,6 @@ class RayNeoOrientationFilterTest { val first = screen(filter.update(sample(0, level))) val ref = HeadPose.recenter(first) var q = FloatArray(4) - // Physical 30-degree turn over one second, through the complete shared - // VITURE conversion and recenter pipeline. GT signs match device captures. repeat(100) { i -> val a = Math.toRadians((i + 1) * 0.3) val accel = when (axis) { diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt index 0cf666308..03fcd5bb5 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt @@ -116,7 +116,7 @@ class RayNeoProtocolTest { @Test fun tickWrapDoesNotIntroduceOrientationJump() { val filter = RayNeoOrientationFilter(0f) filter.update(sample(0xfffffff0L, 90f)) - val q = filter.update(sample(84, 90f)) // 100 ticks = 10ms across uint32 rollover. + val q = filter.update(sample(84, 90f)) assertEquals(kotlin.math.sin(Math.PI * 0.005).toFloat(), q[2], 1e-4f) } } 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 c2cf38e33..538958801 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/glasses/SpatialControllerModeTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/SpatialControllerModeTest.kt index ec647f69c..f054aec2f 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/SpatialControllerModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/SpatialControllerModeTest.kt @@ -3,10 +3,11 @@ package com.droiddeck.launcher.glasses import java.nio.ByteBuffer import java.nio.ByteOrder import org.junit.After +import org.junit.Before import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -15,6 +16,8 @@ class SpatialControllerModeTest { private fun snapshot(): ByteBuffer = (SpatialTracking::class.java.getDeclaredField("buffer") .apply { isAccessible = true }.get(null) as ByteBuffer).duplicate().order(ByteOrder.LITTLE_ENDIAN) + @Before fun outputOnGlasses() = SpatialTracking.setOutputUsesGlasses(true) + @After fun cleanUp() { SpatialTracking.setSteadyHandAim(false) SpatialTracking.setControllers(false, false) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/StereoCalibrationProfileTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/StereoCalibrationProfileTest.kt index e61fde825..6c1a54947 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/StereoCalibrationProfileTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/StereoCalibrationProfileTest.kt @@ -4,7 +4,7 @@ import org.json.JSONObject import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureLinkTest.kt index 18a374052..8970b7495 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureLinkTest.kt @@ -21,7 +21,7 @@ import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.Implementation diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt index 0bc140777..3be90f93c 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt @@ -71,8 +71,8 @@ class VitureSdkTest { val s = kotlin.math.sin(Math.PI / 12).toFloat() val c = kotlin.math.cos(Math.PI / 12).toFloat() for ((axis, expected) in listOf( - 2 to floatArrayOf(-0.5f, 0f, -0.8660254f), // Observed left turn: positive Y. - 1 to floatArrayOf(0f, 0.5f, -0.8660254f), // Observed upward look: positive X. + 2 to floatArrayOf(-0.5f, 0f, -0.8660254f), + 1 to floatArrayOf(0f, 0.5f, -0.8660254f), 3 to floatArrayOf(-0.5f, 0.8660254f, 0f), )) { val q = floatArrayOf(c, 0f, 0f, 0f).apply { this[axis] = s } @@ -84,7 +84,6 @@ class VitureSdkTest { @Test fun ultraOpenGlAxesMatchExistingGlassesHeadTracker() { val a = sqrt(0.5f) - // OpenGL Y yaw maps to NWU Z; OpenGL X pitch maps to negative NWU Y. assertArrayEquals(floatArrayOf(0f, 0f, a, a), VitureSdkPose.toGlasses(floatArrayOf(a, 0f, a, 0f), true), 0.00001f) assertArrayEquals(floatArrayOf(0f, -a, 0f, a), diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2LinkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2LinkTest.kt index 475a0c4d4..cd7629a67 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2LinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2LinkTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.IOException import java.nio.ByteBuffer diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt index 95f0cfb55..993d33d82 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt @@ -1,5 +1,4 @@ -// Fixtures adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. -// Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. +// Fixtures adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. package com.droiddeck.launcher.glasses import org.junit.Assert.assertArrayEquals diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealLinkTest.kt index 9273dfb4b..57266966d 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealLinkTest.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.glasses import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.ByteArrayOutputStream import java.io.InputStream diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealNetworkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealNetworkTest.kt index 348ba36d3..529624eef 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealNetworkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealNetworkTest.kt @@ -6,7 +6,7 @@ import android.net.RouteInfo import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers import org.robolectric.util.ReflectionHelpers.ClassParameter.from diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt index 578d334a6..4aa94d69b 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt @@ -63,10 +63,8 @@ class XrealOrientationFilterTest { @Test fun capturedNeutralGravityStartsUprightBeforeRecenter() { val pose = XrealOrientationFilter().update(sample(1000000, accel = Vec3(-0.0909f, -9.6529f, -1.0731f)))!! - // An upright start must not contain the previous approximately 180-degree - // pitch correction. Check before recenter can hide a mounting error. assertTrue(kotlin.math.abs(pose[3]) > 0.99f) val screen = matrix(pose) - assertTrue(screen[7] > 0.99f) // Screen up points toward shared world +Z. + assertTrue(screen[7] > 0.99f) } } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt index 0deee75dd..c84cd7cdb 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt @@ -93,7 +93,6 @@ class XrealProtocolTest { assertEquals(0x2822, XrealProtocol.read(requests).command) repeat(3) { assertEquals(0x275e, XrealProtocol.read(requests).command) } assertEquals(0, requests.available()) - // Actual 1S busy response remains an error, never a successful ack. assertFalse(XrealProtocol.acknowledged(byteArrayOf(0x22, 3, 8, 0x89.toByte(), 0x27))) } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt index c9a0fa7b4..0e010ff41 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/AutoDriverTrialTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/AutoPicksTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/AutoPicksTest.kt index 83f32a36e..08794d8cf 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/AutoPicksTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/AutoPicksTest.kt @@ -4,7 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/CardboardTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/CardboardTest.kt index 27ea94c92..8b412ec26 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/CardboardTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/CardboardTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import kotlin.math.PI import kotlin.math.cos diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt index 6082d3ddf..ac67cd126 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt @@ -13,7 +13,7 @@ import org.junit.Assert.fail import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt index ba2a53f4e..6ff43cb12 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt @@ -111,6 +111,9 @@ class DriverPairsTest { assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(840), pairs)) assertEquals("other 8xx keep WinNative", DriverPairs.WN_BALANCED, DriverPairs.recommendedKey(gpu(830), pairs)) assertEquals(DriverPairs.WN_BALANCED, DriverPairs.recommendedKey(gpu(825), pairs)) - assertEquals(DriverPairs.BANNER, DriverPairs.recommendedKey(gpu(740), pairs)) + assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(740), pairs)) + assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(722), pairs)) + assertEquals(DriverPairs.BANNER_ONEUI, DriverPairs.recommendedKey(gpu(740, oneUi = true), pairs)) + assertEquals(DriverPairs.BANNER, DriverPairs.recommendedKey(gpu(650), pairs)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt index f4c3b79ea..e5aa7821e 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt @@ -5,7 +5,7 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt index bee21343d..7348210c9 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt @@ -28,7 +28,6 @@ class GpuDetectionTest { } @Test fun nonAdrenoRenderersAreNeverAdrenoWhateverNumberTheyCarry() { - // Xclipse (Exynos), Mali and Immortalis names; familyOf ignores the number off Adreno. assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, 0)) assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, GpuInfo.threeDigits("Samsung Xclipse 920"))) assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, GpuInfo.threeDigits("Xclipse 940"))) @@ -64,6 +63,18 @@ class GpuDetectionTest { assertEquals(Support.UNSUPPORTED, info(false, 830).support) } + @Test fun adreno722IsSupportedOnlyOnTheRetroidPocketDuo() { + assertEquals(true, GpuInfo.verifiedOn(722, "Retroid Pocket Duo")) + assertEquals(false, GpuInfo.verifiedOn(722, "Retroid Pocket 5")) + assertEquals(false, GpuInfo.verifiedOn(720, "Retroid Pocket Duo")) + assertEquals(false, GpuInfo.verifiedOn(740, "Retroid Pocket Duo")) + val duo = info(true, 722).copy(verifiedDevice = true) + assertEquals(Support.TESTED, duo.support) + assertEquals("Supported", duo.supportText) + assertEquals(Family.A7XX_LOW, duo.family) + assertEquals(Support.UNTESTED, info(true, 722).support) + } + @Test fun userFacingTextPerTier() { assertEquals("Supported", info(true, 830).supportText) assertEquals("Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device", info(true, 850).supportText) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/LosslessTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/LosslessTest.kt index 158351477..8c937b801 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/LosslessTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/LosslessTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt index e54564dba..7a6daf420 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt @@ -17,7 +17,7 @@ class SteamVrDeviceLossLogTest { assertFalse(log.poll()) file.appendText("-4\n") assertTrue(log.poll()) - assertTrue(log.poll()) // Keep pending until the activity is foreground. + assertTrue(log.poll()) } @Test fun onlyExplicitDeviceLossTriggersRecovery() { diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettingsTest.kt index 1f14a9ef7..119aee123 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettingsTest.kt @@ -6,7 +6,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoveryTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoveryTest.kt index 8407df8f8..2d6d3a4fb 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoveryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrRecoveryTest.kt @@ -8,7 +8,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrShutdownTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrShutdownTest.kt index 2e4f58c29..8e2f75a5d 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrShutdownTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrShutdownTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt index fe5183cfa..3335a55aa 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TpUbwcHintTest.kt @@ -3,13 +3,23 @@ package com.droiddeck.launcher.gpu import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test +import com.droiddeck.launcher.session.SessionPrefs class TpUbwcHintTest { @Test fun a740OnABlobV6xxTurnsTheHintOff() { assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676.53")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676.75")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.676")) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.699.10")) + } + + @Test fun a740OnThePocoBlobTurnsTheHintOn() { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.676.76")) + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.676.80")) } @Test fun a740OnANewerBlobTurnsTheHintOn() { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.700.0")) assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, "512.762.10")) } @@ -18,6 +28,24 @@ class TpUbwcHintTest { assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, null, samsung = true)) } + @Test fun onOverridesThePocoRuleEvenWhenTheVersionIsUnreadable() { + for (version in listOf("512.676.1", "512.676.53", "garbage", null)) { + assertEquals("enable_tp_ubwc_flag_hint=1", TpUbwcHint.features(740, version, mode = SessionPrefs.TP_UBWC_ON)) + } + } + + @Test fun offOverridesSamsungAndNewerBlobs() { + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, "512.762.10", mode = SessionPrefs.TP_UBWC_OFF)) + assertEquals("enable_tp_ubwc_flag_hint=0", TpUbwcHint.features(740, null, samsung = true, mode = SessionPrefs.TP_UBWC_OFF)) + } + + @Test fun overridesDoNotApplyToOtherGpus() { + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF)) { + assertNull(TpUbwcHint.features(750, "512.762.10", mode = mode)) + assertNull(TpUbwcHint.features(0, null, mode = mode)) + } + } + @Test fun otherGpusKeepTheirDriverDefault() { assertNull(TpUbwcHint.features(750, "512.762.10")) assertNull(TpUbwcHint.features(830, "512.676.53")) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt index 95713589e..738c87dc2 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/TurnipDriverAutoTest.kt @@ -1,14 +1,20 @@ package com.droiddeck.launcher.gpu +import android.os.Environment +import android.os.Build import com.droiddeck.launcher.session.QuestExperimental +import com.droiddeck.launcher.session.SessionPrefs +import java.io.File +import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowBuild +import org.robolectric.util.ReflectionHelpers @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -16,10 +22,23 @@ class TurnipDriverAutoTest { @Before fun reset() { ShadowBuild.setModel("Phone") ShadowBuild.setDevice("phone") + overrideFile().delete() } + @After fun cleanUp() { + overrideFile().delete() + SessionPrefs.setAndroidDriver(RuntimeEnvironment.getApplication(), TurnipDriver.AUTO) + File(RuntimeEnvironment.getApplication().filesDir, "graphics_driver/test-pinned").deleteRecursively() + } + + private fun overrideFile() = File(Environment.getExternalStorageDirectory(), "Download/droiddeck-driver") + + private fun gpu(model: Int, adreno: Boolean = true) = GpuInfo( + "test GPU", model, GpuInfo.familyOf(adreno, model), "", false, + ) + @Test fun questModelsUseTheirPatchedDriverAsTheFallback() { - val driver = TurnipDriver(RuntimeEnvironment.getApplication()) + val driver = TurnipDriver(RuntimeEnvironment.getApplication()) { error("Quest must not use generic GPU detection") } for (model in listOf("Quest 3", "Quest 3S", "Quest 2")) { ShadowBuild.setModel(model) assertEquals(if (model == "Quest 2") QuestExperimental.DRIVER_A6XX else QuestExperimental.DRIVER, @@ -27,8 +46,54 @@ class TurnipDriverAutoTest { } } - @Test fun otherDevicesRetainTheGenericFallback() { - assertEquals("turnip25.1.0", TurnipDriver(RuntimeEnvironment.getApplication()).autoId()) + @Test fun aNonAdrenoDeviceDoesNotAutomaticallyLoadTurnip() { + assertEquals(GpuInfo.Family.NOT_ADRENO, GpuInfo.detect().family) + assertEquals("system", TurnipDriver(RuntimeEnvironment.getApplication()).autoId()) + } + + @Test fun autoSelectionUsesTheDetectedFamilyAndModel() { + val context = RuntimeEnvironment.getApplication() + for ((detected, expected) in listOf( + gpu(0, adreno = false) to "system", + gpu(0) to "turnip25.1.0", + gpu(650) to "turnip26.3.0-a6xx", + gpu(730) to "turnip25.1.0", + gpu(850) to "turnip-sdk36", + )) { + var calls = 0 + assertEquals(expected, TurnipDriver(context) { calls++; detected }.autoId()) + assertEquals(1, calls) + } + } + + @Test fun nonAdrenoDoesNotUseTheAndroid16TurnipFallback() { + val context = RuntimeEnvironment.getApplication() + val sdk = Build.VERSION.SDK_INT + try { + ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SDK_INT", 36) + assertEquals("system", TurnipDriver(context) { gpu(0, adreno = false) }.autoId()) + assertEquals("turnip-sdk36", TurnipDriver(context) { gpu(0) }.autoId()) + } finally { + ReflectionHelpers.setStaticField(Build.VERSION::class.java, "SDK_INT", sdk) + } + } + + @Test fun externalOverrideStillTakesPriorityOverDetection() { + val driver = TurnipDriver(RuntimeEnvironment.getApplication()) { error("override must precede detection") } + overrideFile().parentFile!!.mkdirs() + overrideFile().writeText("system") + assertEquals("system", driver.autoId()) + overrideFile().writeText("a8") + assertEquals("turnip-sdk36", driver.autoId()) + } + + @Test fun aManuallySelectedImportedDriverStillTakesPriorityOverDetection() { + val context = RuntimeEnvironment.getApplication() + val dir = File(context.filesDir, "graphics_driver/test-pinned").apply { mkdirs() } + File(dir, "meta.json").writeText("""{"libraryName":"test.so"}""") + File(dir, "test.so").writeText("") + SessionPrefs.setAndroidDriver(context, "test-pinned") + assertEquals("test-pinned", TurnipDriver(context) { error("manual choice must precede detection") }.install()) } @Test fun normalizedGpuModelsSelectExistingGenerationDrivers() { diff --git a/app/src/test/java/com/droiddeck/launcher/handtracking/HandTrackingTest.kt b/app/src/test/java/com/droiddeck/launcher/handtracking/HandTrackingTest.kt index 614269942..a5a942ba8 100644 --- a/app/src/test/java/com/droiddeck/launcher/handtracking/HandTrackingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/handtracking/HandTrackingTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt new file mode 100644 index 000000000..7fdf0fee3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -0,0 +1,231 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Bitmap +import android.graphics.Canvas +import android.os.Looper +import android.os.SystemClock +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.io.ByteArrayOutputStream +import java.time.Duration +import java.util.Base64 +import kotlin.math.sqrt + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "xhdpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class DroidDeckHudPanelTest { + @Test fun minimalIsTheSizeTheHudStartsWith() { + assertEquals(DroidDeckHudSize.MINIMAL, DroidDeckHudSize.from(DroidDeckHudConfig.DEFAULTS["hudSize"])) + } + + @Test fun theHudStartsLocked() { + assertEquals("1", DroidDeckHudConfig.DEFAULTS["hudLocked"]) + } + + @Test fun everySizeDrawsTheDPanelWithEverythingInsideIt() { + val stats = FrameStats() + var now = 1_000_000_000L + repeat(2_000) { i -> + val frametime = if (i == 1_700) 25_600_000L else 2_850_000L + now += frametime + stats.add(frametime, now) + } + val snapshot = SNAPSHOT + for (size in DroidDeckHudSize.values()) { + if (size == DroidDeckHudSize.STRIP) continue + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to size.token))) + view.setFrameStats(stats) + view.showForTest(snapshot, "DXVK", now) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-${size.token.uppercase()}-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + + val panel = view.panelForTest()!! + assertTrue("$size panel inside the view", + panel.left > 0f && panel.top > 0f && panel.right < view.width && panel.bottom < view.height) + view.graphForTest()?.let { graph -> + val r = view.panelRadiusForTest() + val d = maxOf(panel.top + r - graph.top, graph.bottom - (panel.bottom - r), 0f) + val edge = panel.right - r + sqrt(r * r - d * d) + assertTrue("$size graph clears the round side", graph.right <= edge) + } + } + } + + @Test fun stripIsOneLineAcrossTheParentWithTheClockOnTheRight() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("showBattery" to "1"))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + + assertTrue(view.isStrip) + assertEquals(2400, view.measuredWidth) + val lines = view.linesForTest() + assertEquals(lines.toString(), 1, lines.size) + val line = lines.single() + listOf("DXVK", "fps", "GPU", "CPU", "RAM", "BAT 79%").forEach { assertTrue(line, it in line) } + assertTrue(line, line.indexOf("DXVK") < line.indexOf("GPU") && line.indexOf("GPU") < line.indexOf("BAT")) + + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + } + + @Test fun stripLeavesOffWhatNoLongerFitsBeforeTheClock() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(700, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 700, 400) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val line = view.linesForTest().single() + assertTrue(line, "fps" in line) + assertFalse(line, "BAT" in line) + } + + @Test fun stripFollowsTheHudScaleInHeightAndKeepsTheFullWidth() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + fun at(scale: Int): Pair<Float, Float> { + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("hudScale" to scale.toString()))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP$scale-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + return Pair(view.contentWidth, view.contentHeight) + } + val small = at(70); val big = at(150) + assertEquals(2400f, small.first); assertEquals(2400f, big.first) + assertEquals(big.second / small.second, 150f / 70f, 0.01f) + } + + @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { + fun pill(vararg settings: Pair<String, String>): List<String> { + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.PILL.token) + settings)) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest() + } + val all = pill("showBattery" to "1") + assertTrue(all.toString(), all.any { "BAT 79% · 34°C · 16.0W" in it }) + assertEquals(all.toString(), 1, all.count { "BAT" in it }) + assertFalse(all.toString(), all.single { "RAM" in it }.contains("BAT")) + + val noMemory = pill("showBattery" to "1", "showRAM" to "0") + assertTrue(noMemory.toString(), noMemory.none { "RAM" in it }) + assertTrue(noMemory.toString(), noMemory.any { "BAT 79% · 34°C · 16.0W" in it }) + + val defaults = pill() + assertTrue(defaults.toString(), defaults.any { "BAT 34°C · 16.0W" in it }) + val wattsOnly = pill("showBatteryTemp" to "0") + assertTrue(wattsOnly.toString(), wattsOnly.any { "BAT 16.0W" in it }) + val nothing = pill("showBatteryTemp" to "0", "showPower" to "0") + assertTrue(nothing.toString(), nothing.none { "BAT" in it }) + } + + @Test fun aLockedHudLetsTouchesThroughOnlyWhereAControlTakesThem() { + val app = RuntimeEnvironment.getApplication() + var reached = 0 + val under = View(app).apply { + setOnTouchListener { _, e -> if (e.actionMasked == MotionEvent.ACTION_DOWN) reached++; true } + } + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(under, FrameLayout.LayoutParams(2000, 2000)) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + var control = false + hud.passesTouchAt = { _, _ -> control } + val locks = ArrayList<Boolean>() + hud.setOnLockChangedListener { locks += it } + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + assertTrue(hud.width > 0 && hud.height > 0) + fun touch(holdMs: Long = 50L) { + val x = hud.width / 2f; val y = hud.height / 2f + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(holdMs)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + } + control = true + touch() + assertEquals("an unlocked HUD keeps the touch (tap, drag, long press)", 0, reached) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "1"))) + touch() + assertEquals("a locked HUD passes it to the control under it", 1, reached) + control = false + touch() + assertEquals("a locked HUD keeps a touch no control takes", 1, reached) + touch(holdMs = ViewConfiguration.getLongPressTimeout() + 300L) + assertEquals("a long press there unlocks it", listOf(false), locks) + } + + @Test fun aDockedHudIsJustTheFpsTabAndATapBringsItBack() { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + ("hudDock" to "left"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + hud.measure(unspecified, unspecified) + hud.layout(0, 0, hud.measuredWidth, hud.measuredHeight) + assertEquals(DroidDeckHudDock.LEFT, hud.dock) + assertTrue("a tab, not the panel: ${hud.width}x${hud.height}", hud.width < 400 && hud.height < 200) + val docks = ArrayList<String>() + hud.setOnDockChangedListener { docks += it } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + MotionEvent.obtain(down, down + 40, MotionEvent.ACTION_UP, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + assertEquals("a locked, docked HUD still answers a tap", listOf("none"), docks) + } + + private companion object { + val SNAPSHOT = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, + 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), + intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302), + 2_700_000_000L, 6_400_000_000L, 31_000L, 9_000L) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt new file mode 100644 index 000000000..15656e6a8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt @@ -0,0 +1,137 @@ +package com.droiddeck.launcher.hud + +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 kotlin.random.Random + +class FrameStatsTest { + private class Mango { + val frametimeData = ArrayList<Float>(List(200) { 0f }) + var lastPresentTime = 0L + var lastFpsUpdate = 0L + var framesSinceUpdate = 0L + var fps = 0.0 + + fun update(frametimeNs: Long, now: Long) { + val elapsed = now - lastFpsUpdate + if (lastPresentTime != 0L) { + frametimeData.add(frametimeNs / 1000000f) + frametimeData.removeAt(0) + } + if (elapsed >= 500000000L) { + fps = 1000000000.0 * framesSinceUpdate / elapsed + framesSinceUpdate = 0 + lastFpsUpdate = now + } + lastPresentTime = now + framesSinceUpdate++ + } + } + + @Test fun readingsMatchMangoHudFrameByFrame() { + val random = Random(7) + val stats = FrameStats() + val mango = Mango() + var now = 5_000_000_000L + val graph = FloatArray(FrameStats.GRAPH_FRAMES) + repeat(20_000) { i -> + val frametime = when { + i % 977 == 0 -> 100_000_000L + i % 131 == 0 -> 33_000_000L + else -> 2_700_000L + random.nextLong(-400_000L, 400_000L) + } + now += frametime + stats.add(frametime, now) + mango.update(frametime, now) + assertEquals("fps at frame $i", mango.fps.toFloat(), stats.fps, 0.0001f) + assertEquals(1000f / maxOf(mango.fps.toFloat(), 1f), stats.frametimeMs(), 0.0001f) + if (i % 499 == 0 || i < 210) { + stats.graph(graph) + assertArrayEquals("graph at frame $i", mango.frametimeData.toFloatArray(), graph, 0f) + assertEquals(mango.frametimeData.min(), stats.graphMinMs(), 0f) + assertEquals(mango.frametimeData.max(), stats.graphMaxMs(), 0f) + } + } + } + + @Test fun compositorFramesWakeTheHudWhenGamescopeSharesNone() { + val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")) + var now = 1_000_000_000L + assertFalse(feed.poll(now)) + feed.onCompositorFrame(now) + now += 16_666_667L + feed.onCompositorFrame(now) + assertTrue(feed.poll(now)) + assertFalse(feed.poll(now + 1)) + } + + @Test fun aCompletedPeriodIsCountedWhenMangoHudWouldRedraw() { + val stats = FrameStats() + var now = 1_000_000_000L + stats.add(10_000_000L, now) + assertEquals(1L, stats.fpsUpdates) + repeat(49) { now += 10_000_000L; stats.add(10_000_000L, now) } + assertEquals(1L, stats.fpsUpdates) + now += 10_000_000L; stats.add(10_000_000L, now) + assertEquals(2L, stats.fpsUpdates) + assertEquals(100f, stats.fps, 0.01f) + } + + @Test fun aSteadyRateReadsExactlyWithoutMillisecondRounding() { + val stats = FrameStats() + var now = 1_000_000_000L + val frametime = 16_666_667L + repeat(600) { now += frametime; stats.add(frametime, now) } + assertEquals(60f, stats.fps, 0.01f) + val lows = stats.lows(now) + assertEquals(60f, lows.low1Fps, 0.01f) + assertEquals(60f, lows.low01Fps, 0.01f) + assertEquals(60f, stats.averageFps(), 0.01f) + } + + @Test fun stuttersShowInTheGraphAndTheLows() { + val stats = FrameStats() + var now = 1_000_000_000L + repeat(1000) { i -> + val frametime = if (i % 100 == 50) 100_000_000L else 2_700_000L + now += frametime + stats.add(frametime, now) + } + assertEquals(100f, stats.graphMaxMs(), 0.001f) + assertEquals(2.7f, stats.graphMinMs(), 0.001f) + assertEquals(10f, stats.lows(now).low01Fps, 0.01f) + assertEquals(370.37f, stats.lows(now).low1Fps, 0.01f) + } + + @Test fun pausesStayOutOfTheAverageAndLowsButNotTheGraph() { + val stats = FrameStats() + var now = 1_000_000_000L + repeat(300) { now += 10_000_000L; stats.add(10_000_000L, now) } + now += 3_000_000_000L + stats.add(3_000_000_000L, now) + assertEquals(100f, stats.lows(now).low01Fps, 0.01f) + assertEquals(3000f, stats.graphMaxMs(), 0.01f) + } + + @Test fun resetStartsOver() { + val stats = FrameStats() + var now = 1_000_000_000L + repeat(300) { now += 10_000_000L; stats.add(10_000_000L, now) } + stats.reset() + assertEquals(0f, stats.fps, 0f) + assertEquals(0f, stats.graphMaxMs(), 0f) + assertEquals(FrameStats.Lows.EMPTY, stats.lows(now)) + } + + @Test fun engineNamesFollowMangoHud() { + assertEquals("DXVK", GameFrameFeed.engineLabel("DXVK")) + assertEquals("VKD3D", GameFrameFeed.engineLabel("vkd3d")) + assertEquals("ZINK", GameFrameFeed.engineLabel("mesa zink")) + assertEquals("GAMESCOPE", GameFrameFeed.engineLabel("gamescope")) + assertEquals("GAMESCOPE", GameFrameFeed.engineLabel("")) + assertEquals("VULKAN", GameFrameFeed.engineLabel("UnityEngine")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt new file mode 100644 index 000000000..4de40ea2a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt @@ -0,0 +1,68 @@ +package com.droiddeck.launcher.hud + +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.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class MangoReadingsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun readings() = MangoReadings(tmp.root, tmp.root) + + @Test fun cpuLoadFollowsMangoHudsFormulaAndTruncates() { + val stat = File(tmp.root, "stat") + val m = readings() + stat.writeText("cpu 1000 100 500 8000 400 50 50 0 200 0\ncpu0 500 50 250 4000 200 25 25 0 100 0\ncpu1 500 50 250 4000 200 25 25 0 100 0\nintr 0\n") + m.cpu(stat) + stat.writeText("cpu 1500 100 700 8600 500 60 70 10 300 0\ncpu0 900 50 400 4100 250 30 35 10 200 0\ncpu1 600 50 300 4500 250 30 35 0 100 0\nintr 0\n") + val cpu = m.cpu(stat)!! + assertEquals((740 * 100f / 1440).toInt(), cpu.percent) + assertEquals(51, cpu.percent) + assertArrayEquals(intArrayOf(((300 + 165 + 10 + 100) * 100f / (300 + 165 + 10 + 100 + 150)).toInt(), ((100 + 65) * 100f / (100 + 65 + 550)).toInt()), cpu.perCore) + } + + @Test fun anUnchangedCounterKeepsTheLastLoad() { + val stat = File(tmp.root, "stat") + val m = readings() + stat.writeText("cpu 100 0 0 100 0 0 0 0 0 0\n") + m.cpu(stat) + stat.writeText("cpu 200 0 0 100 0 0 0 0 0 0\n") + assertEquals(100, m.cpu(stat)!!.percent) + assertEquals(100, m.cpu(stat)!!.percent) + } + + private fun battery(status: String, chargeNow: Long, chargeFull: Long, powerUw: Long) { + val dir = File(tmp.root, "sys/power_supply/BAT1").apply { mkdirs() } + File(dir, "status").writeText("$status\n") + File(dir, "charge_now").writeText("$chargeNow\n") + File(dir, "charge_full").writeText("$chargeFull\n") + File(dir, "power_now").writeText("$powerUw\n") + } + + @Test fun batteryHidesWattsWhileChargingAsMangoHudDoes() { + battery("Discharging", 3_622_942, 3_854_193, 8_760_000) + val discharging = readings().battery()!! + assertEquals(94, discharging.percent) + assertEquals(8.76f, discharging.watts, 0.001f) + assertFalse(discharging.charging) + battery("Charging", 3_622_942, 3_854_193, 8_760_000) + val charging = readings().battery()!! + assertEquals(0f, charging.watts, 0f) + assertTrue(charging.charging) + } + + @Test fun noBatteryFolderMeansNoReading() { + assertNull(readings().battery()) + } + + @Test fun gpuLoadIsTheLeadingNumber() { + val f = File(tmp.root, "perf_now").apply { writeText(" 6 %\n") } + assertEquals(6.0, MangoReadings.leadingNumber(f)!!, 0.0) + } +} 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 000000000..9f20548b7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -0,0 +1,271 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34, 37], 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()) + } + + @Test fun withHoldsOffTapsStillWorkButHoldsAndChordsDoNothing() { + val noHold = BackQamInput(changes::add, taps::add, holds = { false }) + fun press(action: Int) = noHold.onKeyEvent(KeyEvent(action, KeyEvent.KEYCODE_BACK), true) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(500) + assertEquals(listOf(false), taps) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + assertEquals(listOf(false, true), taps) + taps.clear() + press(KeyEvent.ACTION_DOWN) + advance(2000) + assertTrue(press(KeyEvent.ACTION_UP)) + press(KeyEvent.ACTION_DOWN) + noHold.onChordInput() + press(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(changes.isEmpty()) + 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 d7dd5307a..68f4db451 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt @@ -1,61 +1,184 @@ package com.droiddeck.launcher.input import android.os.Looper +import android.view.InputDevice import android.view.MotionEvent import java.time.Duration import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class DirectTouchHoldTest { - private val events = mutableListOf<String>() + private val touches = mutableListOf<String>() + private val buttons = mutableListOf<String>() private val hold = DirectTouchHold(8f, object : PointerGestures.Listener { override fun onMove(x: Float, y: Float) {} override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { assertEquals(PointerGestures.BTN_RIGHT, button) - events += "$pressed at $x,$y" + buttons += "$pressed at $x,$y" } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) { events += "cancel touch" } + }, object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) { touches += "down $pointerId at $x,$y" } + override fun move(pointerId: Int, x: Float, y: Float) { touches += "move $pointerId at $x,$y" } + override fun up(pointerId: Int, x: Float, y: Float) { touches += "up $pointerId at $x,$y" } + override fun cancel() { touches += "cancel" } + }).also { it.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 500)) } - @Test fun holdReleasesRawTouchBeforeClickAndConsumesTheLift() { - assertFalse(touch(MotionEvent.ACTION_DOWN)) - advance(500) - assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) - assertTrue(touch(MotionEvent.ACTION_UP)) + @Test fun holdClicksRightWithoutTouchingTheGame() { + touch(MotionEvent.ACTION_DOWN) + advance(400) + assertTrue(buttons.isEmpty()) + advance(100) + assertEquals(listOf("true at 40.0,30.0"), buttons) advance(50) - assertEquals("false at 40.0,30.0", events.last()) - assertFalse(touch(MotionEvent.ACTION_DOWN)) + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_MOVE, 44f) + touch(MotionEvent.ACTION_UP) + assertTrue(touches.isEmpty()) + } + + @Test fun tapForwardsTheTouchWhenItLifts() { + touch(MotionEvent.ACTION_DOWN) + advance(100) + touch(MotionEvent.ACTION_UP, 50f) + assertEquals(listOf("down 0 at 40.0,30.0"), touches) + advance(50) + assertEquals(listOf("down 0 at 40.0,30.0", "up 0 at 50.0,30.0"), touches) + assertTrue(buttons.isEmpty()) + } + + @Test fun noneBehaviorForwardsTheTouchAtOnce() { + hold.configure(TouchGestureConfig(directHoldBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_NONE)) + touch(MotionEvent.ACTION_DOWN) + assertEquals(listOf("down 0 at 40.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_MOVE, 60f) + assertEquals("move 0 at 60.0,30.0", touches.last()) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals("up 0 at 60.0,30.0", touches.last()) + } + + @Test fun dragForwardsTheTouchOnceItMoves() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 60f) + assertEquals(listOf("down 0 at 40.0,30.0", "move 0 at 60.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals("up 0 at 60.0,30.0", touches.last()) + } + + @Test fun dragKeepsForwardingWithinTheSlop() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 44f) + assertTrue(touches.isEmpty()) + touch(MotionEvent.ACTION_UP, 44f) + advance(50) + assertEquals(listOf("down 0 at 40.0,30.0", "up 0 at 44.0,30.0"), touches) + } + + @Test fun stillHoldClicksRightWithTheDefaultConfig() { + hold.configure(TouchGestureConfig()) + touch(MotionEvent.ACTION_DOWN) + advance(2000) + touch(MotionEvent.ACTION_MOVE) + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_UP) + assertTrue(touches.isEmpty()) + } + + @Test fun longPressFollowsTheConfiguredDelay() { + hold.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 800)) + touch(MotionEvent.ACTION_DOWN) + advance(700) + assertTrue(buttons.isEmpty()) + advance(100) + assertEquals(listOf("true at 40.0,30.0"), buttons) hold.cancel() } - @Test fun tapDragSecondFingerAndCancellationDoNotRightClick() { - for (action in listOf(MotionEvent.ACTION_UP, MotionEvent.ACTION_MOVE, - MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_CANCEL)) { - touch(MotionEvent.ACTION_DOWN) - assertFalse(touch(action, 60f)) - advance(600) - assertTrue(events.isEmpty()) - hold.cancel() - } + @Test fun holdBehaviorKeepsTheButtonUntilTheLift() { + hold.configure(TouchGestureConfig(longPressDelay = 500, + directHoldBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_HOLD)) + touch(MotionEvent.ACTION_DOWN) + advance(500) + assertEquals(listOf("true at 40.0,30.0"), buttons) + advance(1000) + assertEquals(listOf("true at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_UP) + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + assertTrue(touches.isEmpty()) + } + + @Test fun secondFingerForwardsTheTouchAndDropsTheHold() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_POINTER_DOWN, 60f) + assertEquals(listOf("down 0 at 40.0,30.0", "down 0 at 60.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_UP, 60f) } @Test fun modeChangeCancelsPendingHoldAndReleasesAnActiveClick() { touch(MotionEvent.ACTION_DOWN) hold.cancel() advance(600) - assertTrue(events.isEmpty()) + assertTrue(buttons.isEmpty()) + assertTrue(touches.isEmpty()) touch(MotionEvent.ACTION_DOWN) advance(500) hold.cancel() + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + } + + @Test fun cancelForwardsACancelWhenTheTouchIsLive() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 60f) + hold.cancel() + assertEquals(listOf("down 0 at 40.0,30.0", "move 0 at 60.0,30.0", "cancel"), touches) + } + + @Test fun cancelDropsAPendingLift() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_UP, 60f) + hold.cancel() advance(100) - assertEquals(listOf("cancel touch", "true at 40.0,30.0", "false at 40.0,30.0"), events) + assertEquals(listOf("down 0 at 40.0,30.0", "cancel"), touches) + } + + @Test fun aQuickSecondTapLiftsTheFirstInsteadOfCancellingIt() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_UP, 50f) + advance(20) + touch(MotionEvent.ACTION_DOWN, 60f) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals( + listOf("down 0 at 40.0,30.0", "up 0 at 50.0,30.0", "down 0 at 60.0,30.0", "up 0 at 60.0,30.0"), + touches, + ) + } + + @Test fun theSecondFingerLiftsWithItsOwnId() { + multi(MotionEvent.ACTION_DOWN, 0, 0 to 40f) + multi(MotionEvent.ACTION_POINTER_DOWN, 1, 0 to 40f, 1 to 60f) + multi(MotionEvent.ACTION_POINTER_UP, 0, 0 to 40f, 1 to 60f) + multi(MotionEvent.ACTION_UP, 0, 1 to 60f) + advance(100) + assertEquals( + listOf("down 0 at 40.0,30.0", "down 1 at 60.0,30.0", "up 0 at 40.0,30.0", "up 1 at 60.0,30.0"), + touches, + ) } private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) @@ -63,4 +186,23 @@ class DirectTouchHoldTest { val event = MotionEvent.obtain(0, 0, action, x, 30f, 0) return hold.onTouch(event).also { event.recycle() } } + private fun multi(action: Int, index: Int, vararg points: Pair<Int, Float>): Boolean { + val properties = Array(points.size) { + MotionEvent.PointerProperties().apply { + id = points[it].first + toolType = MotionEvent.TOOL_TYPE_FINGER + } + } + val coords = Array(points.size) { + MotionEvent.PointerCoords().apply { + x = points[it].second + y = 30f + pressure = 1f + size = 1f + } + } + val event = MotionEvent.obtain(0, 0, action or (index shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), + points.size, properties, coords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0) + return hold.onTouch(event).also { event.recycle() } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt new file mode 100644 index 000000000..86784334a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -0,0 +1,68 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.hardware.display.DisplayManager +import android.view.Display +import androidx.test.core.app.ApplicationProvider +import com.droiddeck.launcher.session.SessionPrefs +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class DualScreenTest { + private val context: Context = ApplicationProvider.getApplicationContext() + private val displays = context.getSystemService(DisplayManager::class.java) + + @Test fun internalPanelsCountAsBuiltIn() { + assertTrue(DualScreen.isBuiltIn(1, "Anything")) + assertFalse(DualScreen.isBuiltIn(2, "Retroid Pocket Duo")) + assertFalse(DualScreen.isBuiltIn(5, "AYN Thor")) + } + + @Test fun knownModelsCountWhenTheTypeIsHidden() { + assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) + assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) + assertFalse(DualScreen.isBuiltIn(null, "Pixel 8")) + } + + @Test fun aSecondPanelNeedsATouchscreenOfItsOwnSize() { + val top = 1920 to 1080 + val bottom = 1280 to 960 + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080, 1280 to 960))) + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1080 to 1920, 960 to 1280))) + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080, 1279 to 959))) + assertFalse(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080))) + assertFalse(DualScreen.hasOwnTouchPanel(bottom, top, emptyList())) + } + + @Test fun aPhantomPanelTheSizeOfTheMainScreenIsNotASecondScreen() { + val main = 1920 to 1080 + assertFalse(DualScreen.hasOwnTouchPanel(main, main, listOf(1920 to 1080))) + assertFalse(DualScreen.hasOwnTouchPanel(main, main, listOf(1080 to 1920))) + assertTrue(DualScreen.hasOwnTouchPanel(main, main, listOf(1920 to 1080, 1920 to 1080))) + assertTrue(DualScreen.hasOwnTouchPanel(main, null, listOf(1920 to 1080))) + } + + @Test fun oneScreenDevicesGetNoSecondScreenInAnyMode() { + for (mode in DualScreen.modes) { + SessionPrefs.setDualScreenMode(context, mode) + assertNull(DualScreen.display(context, displays, Display.DEFAULT_DISPLAY)) + assertNull(DualScreen.anyDisplay(displays, Display.DEFAULT_DISPLAY)) + } + } + + @Test fun modeDefaultsToAutomaticAndIgnoresUnknownValues() { + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenMode(context)) + SessionPrefs.setDualScreenMode(context, "sideways") + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenMode(context)) + SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt index b210be520..4806b1643 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.input import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/input/GestureRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/GestureRoutingTest.kt index a9e672ea5..2bf23a26a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/GestureRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/GestureRoutingTest.kt @@ -12,7 +12,7 @@ import java.time.Duration import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config 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 000000000..c71798911 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt @@ -0,0 +1,91 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.shadows.ShadowBuild + +@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 genericLayoutMoveHomeHoldsGuideLikeHome() { + val down = KeyEvent(10, 110, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_HOME, 0, 0, 10, 102) + val up = KeyEvent(10, 200, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MOVE_HOME, 0, 0, 10, 102) + assertTrue(input.onKeyEvent(down, true)) + assertTrue(input.onKeyEvent(up, 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) + } + + private fun quickMenu(action: Int) = KeyEvent(10, 110, action, KeyEvent.KEYCODE_HOME, 0, 0, 10, 194) + + @Test fun duoQuickMenuHomePassesThroughToTheSystemAndCancelsAHeldGuide() { + ShadowBuild.setModel("Retroid Pocket Duo") + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true)) + assertFalse(input.onKeyEvent(quickMenu(KeyEvent.ACTION_DOWN), true)) + assertEquals(listOf(true, false), states) + assertEquals(1, cancellations) + assertFalse(input.onKeyEvent(quickMenu(KeyEvent.ACTION_UP), true)) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), true)) + assertEquals(listOf(true, false), states) + } + + @Test fun theSameScanCodeStillHoldsGuideOnOtherDevices() { + ShadowBuild.setModel("Retroid Pocket 5") + assertTrue(input.onKeyEvent(quickMenu(KeyEvent.ACTION_DOWN), true)) + assertTrue(input.onKeyEvent(quickMenu(KeyEvent.ACTION_UP), true)) + assertEquals(listOf(true, false), states) + } +} 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 43f0a8d82..a75084b5c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt @@ -12,13 +12,14 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf 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/JoyConTest.kt b/app/src/test/java/com/droiddeck/launcher/input/JoyConTest.kt index a47d1c0c7..80893ed57 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConTest.kt @@ -9,7 +9,7 @@ import org.junit.After import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt index eff919752..1cbbe3cc4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KeyboardHostTest.kt @@ -11,7 +11,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config 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 a1bb94bf1..c6d98a7f0 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -12,7 +12,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode @@ -173,6 +173,17 @@ class OnScreenControlsTest { assertEquals(-1, field(control("rs"), "pressedBy")) } + @Test fun takesTouchAtMatchesWhatATouchDoes() { + var checked = 0 + for (x in 0 until 1200 step 40) for (y in 0 until 800 step 40) { + val expected = view.takesTouchAt(x.toFloat(), y.toFloat()) + assertEquals("($x, $y)", expected, touch(MotionEvent.ACTION_DOWN, 0 to (x.toFloat() to y.toFloat()))) + touch(MotionEvent.ACTION_UP, 0 to (x.toFloat() to y.toFloat())) + if (expected) checked++ + } + assertTrue("some points land on controls", checked > 0) + } + @Test fun fixedSticksAndEditorRemainVisibleAtSavedPositions() { ControllerPrefs.setAdaptiveSticks(context, false) view.reload() @@ -236,6 +247,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 000000000..468471591 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -0,0 +1,463 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 homeGuideHoldsOnThePrimaryPlayerWithoutABuiltinPad() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + bridge.setHomeGuidePressed(true) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.setHomeGuidePressed(false) + assertFalse(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun homeGuideAndControllerGuideReleaseIndependentlyOnThePrimaryPlayer() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE)) + bridge.setHomeGuidePressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.ACTION_UP)) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE)) + bridge.setHomeGuidePressed(false) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.ACTION_UP)) + assertFalse(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun removingThePrimaryPlayerForgetsItsHomeGuide() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP)) + bridge.setHomeGuidePressed(true) + bridge.onDeviceRemoved(device.id) + JoyConPadTest.RecordingWriter.pads.remove(1) + bridge.cancelHomeGuide() + bridge.setHomeGuidePressed(false) + assertNull(JoyConPadTest.RecordingWriter.pads[1]) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun cancellingHomeGuideOnAPlayerSlotKeepsItsHeldControls() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_A)) + bridge.setHomeGuidePressed(true) + bridge.cancelHomeGuide() + val pad = requireNotNull(JoyConPadTest.RecordingWriter.pads[1]) + assertFalse(pad.isDown(PadState.GUIDE)) + assertTrue(pad.isDown(PadState.A)) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @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)) + } + + 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 1d2e1a10e..8327bf96e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt @@ -9,7 +9,7 @@ import android.view.MotionEvent import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -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/PadMouseTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadMouseTest.kt index 82364a0f8..d534e55b0 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadMouseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadMouseTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt index a0c5bc986..7e310d0cf 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt new file mode 100644 index 000000000..c9f01e42b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt @@ -0,0 +1,254 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.hardware.input.InputManager +import android.view.InputDevice +import android.view.KeyCharacterMap +import android.view.KeyEvent +import com.droiddeck.launcher.input.PhysicalShortcuts.Action +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.shadows.InputDeviceBuilder + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) +class PhysicalShortcutsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + private val router = PhysicalShortcutRouter() + private val actions = mutableListOf<Action>() + private lateinit var pad: InputDevice + + @Before fun setUp() { + ControllerPrefs.prefs(context).edit().clear().commit() + pad = device(10, "retroid") + } + + @Test fun defaultsDoNotInterceptAnyButton() { + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + for (code in listOf(KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BUTTON_MODE, + KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_1)) { + assertFalse(route(key(code))) + assertFalse(route(key(code, KeyEvent.ACTION_UP))) + } + assertTrue(actions.isEmpty()) + } + + @Test fun assignmentPersistsAndConsumesTheWholePressWithoutRepeating() { + assign(key(), Action.STEAM) + assertEquals(listOf(PhysicalShortcuts.Binding(button(key()), Action.STEAM)), PhysicalShortcuts.read(context)) + assertTrue(route(key())) + assertTrue(route(key(repeat = 1))) + assertTrue(route(key(repeat = 2))) + assertTrue(route(key(action = KeyEvent.ACTION_UP))) + assertEquals(listOf(Action.STEAM), actions) + assertFalse(route(key(action = KeyEvent.ACTION_UP))) + } + + @Test fun releaseIsConsumedEvenIfAnActionChangedTheRoutingContextOrSettings() { + assign(key(), Action.DROIDDECK) + assertTrue(route(key())) + router.bindings = emptyList() + assertTrue(route(key(action = KeyEvent.ACTION_UP), enabled = false, steam = false)) + assertEquals(listOf(Action.DROIDDECK), actions) + } + + @Test fun aRepeatedDownWithoutAnInitialPressDoesNotTriggerAnAction() { + assign(key(), Action.QAM) + assertTrue(route(key(repeat = 1))) + assertTrue(route(key(action = KeyEvent.ACTION_UP))) + assertTrue(actions.isEmpty()) + } + + @Test fun disabledMappedConfirmLeavesTheWholePressForDrawerNavigation() { + assign(key(KeyEvent.KEYCODE_BUTTON_A), Action.DROIDDECK) + assertFalse(route(key(KeyEvent.KEYCODE_BUTTON_A), enabled = false)) + assertFalse(route(key(KeyEvent.KEYCODE_BUTTON_A, repeat = 1), enabled = false)) + assertFalse(route(key(KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP), enabled = false)) + assertTrue(actions.isEmpty()) + } + + @Test fun mappedConfirmOpeningTheDrawerConsumesItsReleaseWithoutStayingHeld() { + assign(key(KeyEvent.KEYCODE_BUTTON_A), Action.DROIDDECK) + assertTrue(route(key(KeyEvent.KEYCODE_BUTTON_A))) + assertTrue(route(key(KeyEvent.KEYCODE_BUTTON_A, repeat = 1), enabled = false)) + assertTrue(route(key(KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP), enabled = false)) + assertFalse(route(key(KeyEvent.KEYCODE_BUTTON_A), enabled = false)) + assertFalse(route(key(KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP), enabled = false)) + assertTrue(route(key(KeyEvent.KEYCODE_BUTTON_A))) + assertTrue(route(key(KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP))) + assertEquals(listOf(Action.DROIDDECK, Action.DROIDDECK), actions) + } + + @Test fun aResumePressKeepsItsRepeatsAndReleaseInTheResumePath() { + assign(key(), Action.STEAM) + assertFalse(route(key(), enabled = false)) + assertFalse(route(key(repeat = 1), enabled = false)) + assertFalse(route(key(action = KeyEvent.ACTION_UP), enabled = false)) + assertTrue(actions.isEmpty()) + assertTrue(route(key())) + assertEquals(listOf(Action.STEAM), actions) + } + + @Test fun steamActionsAreInactiveOutsideSteamAndAllActionsRespectDisabledContexts() { + for (action in Action.entries) { + assign(key(), action) + assertFalse(route(key(), enabled = false)) + assertFalse(route(key(action = KeyEvent.ACTION_UP), enabled = false)) + assertEquals(action == Action.DROIDDECK, route(key(), steam = false)) + route(key(action = KeyEvent.ACTION_UP), steam = false) + } + assertEquals(listOf(Action.DROIDDECK), actions) + } + + @Test fun reassigningAButtonReplacesItsPreviousAction() { + assign(key(), Action.STEAM) + assign(key(), Action.QAM) + assertEquals(listOf(Action.QAM), PhysicalShortcuts.read(context).map { it.action }) + assertTrue(route(key())) + assertEquals(listOf(Action.QAM), actions) + } + + @Test fun reassigningAnActionOnlyReplacesThatControllersBinding() { + val second = device(11, "bluetooth") + assign(key(), Action.STEAM) + assign(key(device = second), Action.STEAM) + assign(key(KeyEvent.KEYCODE_BUTTON_2), Action.STEAM) + val saved = PhysicalShortcuts.read(context) + assertEquals(2, saved.size) + assertTrue(saved.any { it.button.sameInput(button(key(device = second))) }) + assertTrue(saved.any { it.button.sameInput(button(key(KeyEvent.KEYCODE_BUTTON_2))) }) + assertFalse(route(key())) + } + + @Test fun deviceIdentitySurvivesReconnectionButDoesNotMatchAnUnrelatedController() { + assign(key(), Action.QAM) + assertFalse(route(key(device = device(11, "other")))) + val reconnected = device(12, "retroid") + assertTrue(route(key(device = reconnected))) + assertEquals(listOf(Action.QAM), actions) + } + + @Test fun scanCodesDistinguishButtonsSharingAnAndroidKeyCode() { + assign(key(scan = 700), Action.STEAM) + assign(key(scan = 701), Action.QAM) + assertEquals(2, PhysicalShortcuts.read(context).size) + assertTrue(route(key(scan = 700))) + assertTrue(route(key(scan = 701))) + assertFalse(route(key(scan = 702))) + assertEquals(listOf(Action.STEAM, Action.QAM), actions) + } + + @Test fun keyboardLikeExtraButtonsCanBeExplicitlyAssignedWithoutChangingKeyboardDefaults() { + val keyboard = device(11, "m1-keyboard", InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_ALPHABETIC) + val m1 = key(KeyEvent.KEYCODE_F1, device = keyboard) + assertFalse(PadBridge.isControllerKeyEvent(m1)) + assign(m1, Action.STEAM) + assertTrue(route(m1)) + assertFalse(route(key(KeyEvent.KEYCODE_F2, device = keyboard))) + assertEquals(listOf(Action.STEAM), actions) + } + + @Test fun virtualAndSystemKeysCannotBeAssigned() { + val virtual = device(-1, "virtual") + assertNull(PhysicalShortcuts.button(key(device = virtual))) + for (code in listOf(KeyEvent.KEYCODE_HOME, KeyEvent.KEYCODE_POWER, KeyEvent.KEYCODE_APP_SWITCH, + KeyEvent.KEYCODE_SLEEP, KeyEvent.KEYCODE_WAKEUP, KeyEvent.KEYCODE_VOLUME_UP, + KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) { + assertNull(PhysicalShortcuts.button(key(code))) + } + assertNull(PhysicalShortcuts.button(key(KeyEvent.KEYCODE_UNKNOWN, scan = 0))) + assertNotNull(PhysicalShortcuts.button(key(KeyEvent.KEYCODE_UNKNOWN, scan = 700))) + } + + @Test fun drawerDirectionalKeysRemainAvailableForNavigation() { + for (code in listOf(KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN, + KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT)) { + assertTrue(PhysicalShortcuts.isDrawerNavigationKey(key(code))) + } + assertFalse(PhysicalShortcuts.isDrawerNavigationKey(key(KeyEvent.KEYCODE_BUTTON_A))) + } + + @Test fun resetAndRemovalPreserveOtherControllerSettings() { + ControllerPrefs.setSelectSteam(context, true) + ControllerPrefs.setTarget(context, "a", "b") + assign(key(), Action.STEAM) + assign(key(KeyEvent.KEYCODE_BUTTON_2), Action.QAM) + PhysicalShortcuts.remove(context, PhysicalShortcuts.read(context).first()) + assertEquals(listOf(Action.QAM), PhysicalShortcuts.read(context).map { it.action }) + PhysicalShortcuts.remove(context, PhysicalShortcuts.read(context).single()) + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + assertTrue(ControllerPrefs.read(context).selectSteam) + assertEquals("b", ControllerPrefs.target(context, "a")) + assign(key(), Action.STEAM) + ControllerPrefs.resetAll(context) + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + } + + @Test fun disconnectAndPauseClearHeldButtons() { + assign(key(), Action.QAM) + assertTrue(route(key())) + router.onDeviceRemoved(pad.id) + assertFalse(route(key(action = KeyEvent.ACTION_UP))) + assertTrue(route(key())) + router.clear() + assertFalse(route(key(action = KeyEvent.ACTION_UP))) + assertTrue(route(key())) + assertEquals(listOf(Action.QAM, Action.QAM, Action.QAM), actions) + } + + @Test fun malformedPreferencesDoNotCrashInputDispatch() { + ControllerPrefs.prefs(context).edit().putString("physicalShortcuts", "invalid").commit() + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + } + + @Test fun malformedEntriesDoNotDiscardValidAssignmentsWhenSaving() { + assign(key(), Action.STEAM) + assign(key(KeyEvent.KEYCODE_BUTTON_2), Action.QAM) + val entries = JSONArray(ControllerPrefs.prefs(context).getString("physicalShortcuts", null)) + val damaged = JSONArray().put(entries.getJSONObject(0)).put(JSONObject().put("action", "STEAM")) + .put("not an object").put(entries.getJSONObject(1)) + ControllerPrefs.prefs(context).edit().putString("physicalShortcuts", damaged.toString()).commit() + assertEquals(listOf(Action.STEAM, Action.QAM), PhysicalShortcuts.read(context).map { it.action }) + assign(key(KeyEvent.KEYCODE_BUTTON_3), Action.DROIDDECK) + assertEquals(listOf(Action.STEAM, Action.QAM, Action.DROIDDECK), + PhysicalShortcuts.read(context).map { it.action }) + } + + @Test fun buttonSummaryKeepsTechnicalDetailsSeparate() { + val select = button(key(KeyEvent.KEYCODE_BUTTON_SELECT, scan = 314)) + val androidName = KeyEvent.keyCodeToString(KeyEvent.KEYCODE_BUTTON_SELECT) + assertEquals(androidName.removePrefix("KEYCODE_").removePrefix("BUTTON_"), select.label) + assertFalse(select.label.contains("(314)")) + } + + private fun assign(event: KeyEvent, action: Action) { + PhysicalShortcuts.assign(context, button(event), action) + router.bindings = PhysicalShortcuts.read(context) + } + + private fun button(event: KeyEvent) = requireNotNull(PhysicalShortcuts.button(event)) + + private fun route(event: KeyEvent, enabled: Boolean = true, steam: Boolean = true) = + router.onKey(event, enabled, steam) { actions.add(it) } + + private fun key(code: Int = KeyEvent.KEYCODE_BUTTON_1, action: Int = KeyEvent.ACTION_DOWN, + repeat: Int = 0, scan: Int = 700, device: InputDevice = pad): KeyEvent = + KeyEvent(100L, 100L, action, code, repeat, 0, device.id, scan, 0, device.sources) + + private fun device(id: Int, descriptor: String, sources: Int = InputDevice.SOURCE_GAMEPAD, + type: Int = InputDevice.KEYBOARD_TYPE_NONE): InputDevice { + val device = InputDeviceBuilder.newBuilder().setId(id).setName("Test $descriptor") + .setDescriptor(descriptor).setSources(sources).setKeyboardType(type) + .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + return device + } +} 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 000000000..bdf99b63f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt @@ -0,0 +1,140 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 takesTouchAtMatchesWhatATouchDoes() { + val keys = ScreenKeys(context) { _, _ -> } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_W)) + var checked = 0 + for (x in 0 until 1000 step 25) for (y in 0 until 600 step 25) { + val expected = keys.takesTouchAt(x.toFloat(), y.toFloat()) + val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0) + assertEquals("($x, $y)", expected, keys.onTouchEvent(down)) + down.recycle() + MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_UP, x.toFloat(), y.toFloat(), 0).also { keys.onTouchEvent(it); it.recycle() } + if (expected) checked++ + } + assertTrue("some points land on the key", checked > 0) + } + + @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/ScrollTouchGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt index 60436eaab..ec473e953 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt new file mode 100644 index 000000000..f1ed57778 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.input + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SecondScreenModeTest { + @Test fun withNothingRememberedTheDashboardOpens() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true)) + } + + @Test fun withNothingRememberedAndNoDashboardTheControllerPicksThePanel() { + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false)) + } + + @Test fun thePanelTheUserPickedLastOpensAgain() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true)) + } + + @Test fun deckControlsNeedTheDeckPad() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false, dashboard = true)) + } + + @Test fun anUnknownOrClosedChoiceFallsBackToTheDefault() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("none", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("gone", deckPad = false, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("none", deckPad = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad = false)) + } + + @Test fun theDashboardOpensAgainOnlyWhileItHasPages() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("dashboard", deckPad = false)) + } + + @Test fun theDesktopOpensAgainOnlyWhileItCanRun() { + assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, desktop = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("desktop", deckPad = false)) + } + + @Test fun withNothingRememberedTheDesktopIsNeverPicked() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, desktop = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, desktop = true)) + } +} 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 7b2a55e2e..1cba27f5b 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt @@ -17,7 +17,7 @@ import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -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,12 @@ 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() {} - }) {} + }, object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) {} + override fun move(pointerId: Int, x: Float, y: Float) {} + override fun up(pointerId: Int, x: Float, y: Float) {} + override fun cancel() {} + }).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/input/SessionKeyboardPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt index 7ba52e168..a45321a6d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt @@ -17,7 +17,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt index 610f7499e..41028fdd6 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionTouchRoutingTest.kt @@ -12,7 +12,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt index 96ff9a1c4..0a43776b4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt new file mode 100644 index 000000000..3017aadab --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33]) +class SteamVolumeKeysTest { + private val adjustments = mutableListOf<Int>() + + private fun key(code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat) + + private fun dispatch(code: Int, enabled: Boolean = true, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + SteamVolumeKeys.dispatch(key(code, action, repeat), enabled, adjustments::add) + + @Test fun enabledKeysAdjustOncePerDownAndConsumeRelease() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, action = KeyEvent.ACTION_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_RAISE, AudioManager.ADJUST_RAISE, AudioManager.ADJUST_LOWER), adjustments) + } + + @Test fun muteTogglesOnlyOnInitialPress() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_TOGGLE_MUTE), adjustments) + } + + @Test fun disabledAndNonVolumeKeysFallThrough() { + for (code in listOf(KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) { + assertFalse(dispatch(code, enabled = false)) + assertFalse(dispatch(code, enabled = false, action = KeyEvent.ACTION_UP)) + } + assertFalse(dispatch(KeyEvent.KEYCODE_BUTTON_A)) + assertTrue(adjustments.isEmpty()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/ThreeFingerTapTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ThreeFingerTapTest.kt index 5738f72bb..15171820e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ThreeFingerTapTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ThreeFingerTapTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index a036849b1..581106e74 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -25,12 +25,17 @@ class TouchpadGesturesTest { private val listener = object : PointerGestures.Listener { override fun onMove(x: Float, y: Float) { events += "move" } override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { - val name = if (button == PointerGestures.BTN_RIGHT) "right" else "left" + val name = when (button) { PointerGestures.BTN_RIGHT -> "right"; PointerGestures.BTN_MIDDLE -> "middle"; else -> "left" } events += "$name ${if (pressed) "down" else "up"}" } override fun onWheel(steps: Int) { events += "wheel $steps" } override fun onLongPress() { events += "long press" } + override fun onScroll(dx: Float, dy: Float) { events += "scroll" } + override fun onScrollEnd() { events += "scroll end" } + override fun onZoom(steps: Int) { events += "zoom $steps" } + override fun onThreeFingerTap(): Boolean { events += "three tap"; return claimThreeTap } } + private var claimThreeTap = false @Before fun setUp() { touchpad = TouchpadGestures(SLOP, listener) @@ -41,12 +46,68 @@ class TouchpadGesturesTest { @Test fun tapHoldsTheLeftButtonBeforeReleasingIt() { tap() assertEquals(listOf("left down"), events) - advance(40) + advance(TouchTiming.CLICK_MS - 10) assertEquals(listOf("left down"), events) advance(100) assertEquals(listOf("left down", "left up"), events) } + @Test fun threeFingerTapClicksTheMiddleButtonWhenUnclaimed() { + threeFingerTap() + assertEquals(listOf("three tap", "middle down", "middle up"), events) + } + + @Test fun claimedThreeFingerTapSkipsTheMiddleButton() { + claimThreeTap = true + threeFingerTap() + assertEquals(listOf("three tap"), events) + } + + private fun threeFingerTap() { + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 2, 1 to (400f to 300f), 2 to (600f to 310f), 3 to (800f to 320f)) + advance(60) + touch(MotionEvent.ACTION_POINTER_UP, 2, 1 to (400f to 300f), 2 to (600f to 310f), 3 to (800f to 320f)) + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(100) + } + + @Test fun desktopTwoFingerSlideScrollsSmoothlyAndStops() { + touchpad.desktop = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 300f)) + for (step in 1..5) { + advance(16) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 300f + step * 20f), 2 to (600f to 300f + step * 20f)) + } + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 400f), 2 to (600f to 400f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 400f)) + advance(100) + assertTrue(events.contains("scroll")) + assertEquals("scroll end", events.last()) + assertFalse(events.any { it.startsWith("right") || it.startsWith("wheel") }) + } + + @Test fun desktopPinchZoomsWithoutScrolling() { + touchpad.desktop = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (500f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (500f to 300f), 2 to (600f to 300f)) + for (step in 1..6) { + advance(16) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (500f - step * 30f to 300f), 2 to (600f + step * 30f to 300f)) + } + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (320f to 300f), 2 to (780f to 300f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (320f to 300f)) + advance(100) + assertTrue(events.isNotEmpty() && events.all { it.startsWith("zoom -") }) + } + @Test fun twoFingerTapHoldsTheRightButtonBeforeReleasingIt() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(10) @@ -56,7 +117,7 @@ class TouchpadGesturesTest { advance(10) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) assertEquals(listOf("right down"), events) - advance(30) + advance(TouchTiming.CLICK_MS - 20) assertEquals(listOf("right down"), events) advance(100) assertEquals(listOf("right down", "right up"), events) @@ -71,7 +132,7 @@ class TouchpadGesturesTest { advance(10) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) assertEquals(listOf("right down"), events) - advance(40) + advance(TouchTiming.CLICK_MS - 10) assertEquals(listOf("right down"), events) advance(100) assertEquals(listOf("right down", "right up"), events) diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt index ad85d6245..159de77a6 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -82,9 +82,9 @@ class TouchscreenGesturesTest { @Test fun aVeryFastDoubleTapKeepsFullPressesAndAReleaseGap() { tap(); tap(); advance(250) assertEquals(4, leftClicks.size) - assertTrue(leftClicks[1].time - leftClicks[0].time >= 50) - assertTrue(leftClicks[2].time - leftClicks[1].time >= 50) - assertTrue(leftClicks[3].time - leftClicks[2].time >= 50) + assertTrue(leftClicks[1].time - leftClicks[0].time >= TouchTiming.CLICK_MS) + assertTrue(leftClicks[2].time - leftClicks[1].time >= TouchTiming.CLICK_MS) + assertTrue(leftClicks[3].time - leftClicks[2].time >= TouchTiming.CLICK_MS) } @Test fun doubleTapUsesTheFirstClickLocationDespiteNormalFingerDrift() { @@ -121,7 +121,7 @@ class TouchscreenGesturesTest { gestures.configure(TouchGestureConfig(tapEnabled = false)) tap(); tap(); advance(250) assertEquals(4, leftClicks.size) - assertTrue(leftClicks[2].time - leftClicks[1].time >= 50) + assertTrue(leftClicks[2].time - leftClicks[1].time >= TouchTiming.CLICK_MS) } @Test fun aRapidThirdTapDoesNotDiscardThePendingSecondClick() { @@ -285,11 +285,11 @@ class TouchscreenGesturesTest { @Test fun twoFingerTapKeepsItsPressAfterTheLastFingerLifts() { twoFingerTap() assertEquals(listOf("button 273 true"), buttons()) - advance(49) + advance(TouchTiming.CLICK_MS - 1) assertEquals(1, rightClicks.size) advance(1) assertEquals(listOf(true, false), rightClicks.map { it.down }) - assertEquals(50L, rightClicks[1].time - rightClicks[0].time) + assertEquals(TouchTiming.CLICK_MS, rightClicks[1].time - rightClicks[0].time) } @Test fun threeFingerKeyboardTapHasAnObservablePressAndReleases() { @@ -298,14 +298,14 @@ class TouchscreenGesturesTest { assertEquals(listOf("key 18 true"), events.filter { it.startsWith("key") }) advance(50) assertEquals(listOf("key 18 true", "key 18 false"), events.filter { it.startsWith("key") }) - assertEquals(50L, timedKeys.last().first - timedKeys.first().first) + assertEquals(TouchTiming.CLICK_MS, timedKeys.last().first - timedKeys.first().first) } @Test fun twoFingerKeyboardTapHasAnObservablePressAndReleases() { gestures.configure(TouchGestureConfig(twoFingerTapAction = "key_E")) twoFingerTap(); advance(50) assertEquals(listOf(true, false), timedKeys.map { it.third }) - assertEquals(50L, timedKeys.last().first - timedKeys.first().first) + assertEquals(TouchTiming.CLICK_MS, timedKeys.last().first - timedKeys.first().first) } @Test fun threeFingerMouseTapHasAnObservablePressAndReleases() { @@ -314,7 +314,7 @@ class TouchscreenGesturesTest { assertEquals(listOf("button 273 true"), buttons()) advance(50) assertEquals(listOf(true, false), rightClicks.map { it.down }) - assertEquals(50L, rightClicks[1].time - rightClicks[0].time) + assertEquals(TouchTiming.CLICK_MS, rightClicks[1].time - rightClicks[0].time) } @Test fun cancellingAMultiFingerTapReleasesItsButtonAndStopsCallbacks() { @@ -338,7 +338,7 @@ class TouchscreenGesturesTest { gestures.configure(TouchGestureConfig(tapAction = "right_click", doubleTapEnabled = false)) tap(); tap(); advance(250) assertEquals(listOf(true, false, true, false), rightClicks.map { it.down }) - assertTrue(rightClicks[2].time - rightClicks[1].time >= 50) + assertTrue(rightClicks[2].time - rightClicks[1].time >= TouchTiming.CLICK_MS) } @Test fun aFastTwoFingerSwipeDuringSettlingDoesNotClick() { @@ -738,7 +738,7 @@ class TouchscreenGesturesTest { @Test fun pinchReversalDoesNotConsumeOldDirectionRemainder() { startPinch() events.clear() - movePinch(4.5f) // Nine pixels toward zooming in, short of a step. + movePinch(4.5f) assertTrue(events.none { it.startsWith("wheel") }) for (i in 1..10) movePinch(4.5f - i * .5f) assertEquals(listOf("wheel 1"), events.filter { it.startsWith("wheel") }) @@ -794,16 +794,13 @@ class TouchscreenGesturesTest { override fun moveTo(x: Float, y: Float) { cachedX = x; clientX = x } override fun prepareRelativePan() { cachedX = 960f; clientX = 960f } override fun moveBy(dx: Float, dy: Float, relative: Boolean) { - // Before pointer lock, the compositor delivers an absolute - // position even when we inject a relative delta. The game - // only requests lock after seeing this first pan movement. cachedX += dx clientX = cachedX } override fun button(code: Int, down: Boolean) { if (code == 274) { middleDown = down - if (down) clientX = 960f // The client warps to the middle when pan starts. + if (down) clientX = 960f } } override fun key(code: Int, down: Boolean) {} diff --git a/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt new file mode 100644 index 000000000..240e26a17 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.MotionEvent +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import java.time.Duration + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TwoFingerGesturesTest { + private val calls = mutableListOf<String>() + private val gestures = TwoFingerGestures(8f, object : TwoFingerGestures.Listener { + override fun cancelTouch() { calls += "cancel" } + override fun replay(event: MotionEvent) { calls += "replay ${event.actionMasked}" } + override fun rightClick(x: Float, y: Float) { calls += "right $x,$y" } + override fun scrollStart(x: Float, y: Float) { calls += "start $x,$y" } + override fun scroll(dx: Float, dy: Float) { calls += "scroll $dx,$dy" } + override fun scrollEnd() { calls += "end" } + }) + private var time = 1000L + private var downTime = 0L + private val a = 1 to (400f to 300f) + private val b = 2 to (500f to 300f) + + @Test fun tapRightClicksWhereTheFirstFingerLanded() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + time += 20 + assertTrue(touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b)) + time += 80 + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("cancel", "right 400.0,300.0"), calls) + } + + @Test fun holdRightClicksOnce() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.HOLD_MS + 10)) + time += 600 + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("cancel", "right 400.0,300.0"), calls) + } + + @Test fun slidingTogetherScrollsLikeAWheel() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + time += 20 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 260f), 2 to (500f to 260f))) + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 200f), 2 to (500f to 200f))) + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 200f), 2 to (500f to 200f))) + assertTrue(touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 200f))) + assertEquals(listOf("cancel", "start 450.0,260.0", "scroll 0.0,60.0", "end"), calls) + } + + @Test fun pinchPassesThroughForZoom() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (350f to 300f), 2 to (550f to 300f))) + assertEquals(listOf("replay 0", "replay 5", "replay 2"), calls) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.HOLD_MS + 10)) + assertFalse(touch(MotionEvent.ACTION_MOVE, 0, 1 to (340f to 300f), 2 to (560f to 300f))) + assertFalse(touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (340f to 300f), 2 to (560f to 300f))) + assertFalse(touch(MotionEvent.ACTION_UP, 0, 1 to (340f to 300f))) + assertEquals(3, calls.size) + } + + @Test fun oneFingerTapIsReplayedOnRelease() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + assertTrue(calls.isEmpty()) + time += 60 + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("replay 0", "replay 1"), calls) + } + + @Test fun oneFingerStillIsReplayedAfterTheLandingWindow() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.LAND_MS + 10)) + assertEquals(listOf("replay 0"), calls) + time += 600 + assertFalse(touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b)) + assertFalse(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertFalse(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("replay 0"), calls) + } + + @Test fun oneFingerDragIsReplayedOnceItMoves() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 16 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (402f to 300f))) + assertTrue(calls.isEmpty()) + time += 16 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (440f to 300f))) + assertEquals(listOf("replay 0", "replay 2", "replay 2"), calls) + assertFalse(touch(MotionEvent.ACTION_MOVE, 0, 1 to (480f to 300f))) + assertFalse(touch(MotionEvent.ACTION_UP, 0, 1 to (480f to 300f))) + } + + private fun touch(action: Int, index: Int, vararg pointers: Pair<Int, Pair<Float, Float>>): Boolean { + if (action == MotionEvent.ACTION_DOWN) downTime = time + val properties = pointers.map { (id, _) -> + MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } + }.toTypedArray() + val coords = pointers.map { (_, at) -> + MotionEvent.PointerCoords().apply { x = at.first; y = at.second; pressure = 1f; size = 1f } + }.toTypedArray() + val masked = action or (index shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + val event = MotionEvent.obtain(downTime, time, masked, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0) + return gestures.onTouch(event).also { event.recycle() } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt new file mode 100644 index 000000000..b0fd45a04 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt @@ -0,0 +1,47 @@ +package com.droiddeck.launcher.runtime + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AccountsMergeTest { + private val own = "root:x:10123:10123:root:/root:/bin/bash" + private val zero = "root:x:0:0:root:/root:/bin/bash" + + @Test fun systemUsersSurvive() { + val existing = "root:x:0:0:root:/root:/bin/bash\ndaemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin\n_apt:x:42:65534::/nonexistent:/usr/sbin/nologin\nmessagebus:x:100:102::/nonexistent:/usr/sbin/nologin\n" + assertEquals("$own\n$zero\ndaemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin\n_apt:x:42:65534::/nonexistent:/usr/sbin/nologin\nmessagebus:x:100:102::/nonexistent:/usr/sbin/nologin\n", + LinuxRuntime.mergedAccounts(existing, 2, own, zero, 10123)) + } + + @Test fun anOldSingleLineFileIsReplacedOnce() { + val merged = LinuxRuntime.mergedAccounts("$own\n", 2, own, zero, 10123) + assertEquals("$own\n$zero\n", merged) + assertEquals(merged, LinuxRuntime.mergedAccounts(merged, 2, own, zero, 10123)) + } + + @Test fun anotherAppUidIsDropped() { + assertEquals("$own\n$zero\n", LinuxRuntime.mergedAccounts("root:x:10099:10099:root:/root:/bin/bash\n", 2, own, zero, 10123)) + } + + @Test fun noFileYet() { + assertEquals("$own\n$zero\n", LinuxRuntime.mergedAccounts(null, 2, own, zero, 10123)) + } + + @Test fun groupsKeepMembers() { + val existing = "root:x:0:\nsudo:x:27:\naudio:x:29:pulse\n" + assertEquals("root:x:10123:\nroot:x:0:\nsudo:x:27:\naudio:x:29:pulse\n", + LinuxRuntime.mergedAccounts(existing, 2, "root:x:10123:", "root:x:0:", 10123)) + } + + @Test fun storageGroupsAreAddedWithRoot() { + assertEquals("root:x:0:\nsudo:x:27:\nsdcard_rw:x:1015:root\nmedia_rw:x:1023:root\neverybody:x:9997:root\n", + LinuxRuntime.withStorageGroups("root:x:0:\nsudo:x:27:\n")) + } + + @Test fun existingStorageGroupsGainRootOnce() { + val existing = "root:x:0:\nmedia_rw:x:1023:pulse\nsdcard_rw:x:1015:root\nshared:x:9997:\n" + val updated = LinuxRuntime.withStorageGroups(existing) + assertEquals("root:x:0:\nmedia_rw:x:1023:pulse,root\nsdcard_rw:x:1015:root\nshared:x:9997:root\n", updated) + assertEquals(updated, LinuxRuntime.withStorageGroups(updated)) + } +} 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 000000000..7ce8fb1db --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/BundledProotTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BundledProotTest.kt new file mode 100644 index 000000000..96762e38b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BundledProotTest.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.content.ContextWrapper +import android.content.pm.ApplicationInfo +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.core.AddonPack +import java.io.File +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 37], manifest = Config.NONE) +class BundledProotTest { + @get:Rule val temporary = TemporaryFolder() + + private fun context(): Pair<Context, File> { + val base = RuntimeEnvironment.getApplication() + val native = temporary.newFolder("native") + val files = temporary.newFolder("files") + val info = ApplicationInfo(base.applicationInfo).apply { nativeLibraryDir = native.path } + return object : ContextWrapper(base) { + override fun getApplicationInfo() = info + override fun getFilesDir() = files + } to native + } + + @Test fun onlyAMatchedInstalledPairIsReportedAsBundledProot() { + val (context, native) = context() + File(native, "libproot.so").writeText("executable") + assertFalse(LinuxRuntime.patchedProot(context)) + File(native, "libproot-loader.so").writeText("loader") + assertTrue(LinuxRuntime.patchedProot(context)) + assertEquals(File(native, "libproot.so"), LinuxRuntime.prootBinary(context)) + assertEquals(File(native, "libproot-loader.so"), LinuxRuntime.prootLoader(context)) + assertEquals(LinuxRuntime.PROOT_BUNDLED, LinuxRuntime.prootSource(context)) + assertTrue(ProotFastPath.allows(true, false, LinuxRuntime.prootSource(context))) + } + + @Test fun downloadedPackCannotReplaceTheKernelExecutableLoaderPair() { + val (context, native) = context() + for (name in listOf("libproot.so", "libproot-loader.so")) File(native, name).writeText("installed") + val pack = File(context.filesDir, "addons/proot/${BuildConfig.PACK_PROOT_SHA256}").apply { mkdirs() } + for (name in listOf("libproot.so", "libproot-loader.so")) File(pack, name).writeText("downloaded") + File(pack, AddonPack.COMPLETE).writeText(BuildConfig.PACK_PROOT_SHA256) + assertTrue(AddonPack.PROOT.installed(context)) + assertEquals(native, LinuxRuntime.prootBinary(context).parentFile) + assertEquals(native, LinuxRuntime.prootLoader(context).parentFile) + } +} 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 2cb5e5edd..f1cd82abd 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -14,7 +14,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class BwrapSpawnerTest { @@ -119,6 +119,42 @@ class BwrapSpawnerPlanTest { assertEquals("org.example.Game", plan.env["FLATPAK_ID"]) } + @Test fun sandboxesStartThroughTheirOwnEnvByDefault() { + val plan = BwrapSpawner.plan(RuntimeEnvironment.getApplication(), request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/usr/bin/env", plan.envTool) + } + + @Test fun fexSandboxesStartThroughTheEnvTheyBringAndSkipArmPreloads() { + 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") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")) + .put("envTool", "/run/droiddeck-fex/bin/env"), dir) + assertEquals("/run/droiddeck-fex/bin/env", plan.envTool) + assertFalse(plan.env.containsKey("LD_PRELOAD")) + assertFalse(plan.binds.any { it.guest.startsWith("/run/droiddeck-preload") }) + } finally { + listOf(lib, preload).forEach { it.delete() } + } + } + + @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() } @@ -145,4 +181,25 @@ class BwrapSpawnerPlanTest { assertFalse(plan.binds.any { it.guest.startsWith("/app/bin/") }) assertFalse(File(dir, "zypak-wrapper").exists()) } + + @Test fun preloadsStayOutOfSandboxesWithAnOlderGlibc() { + val base = Files.createTempDirectory("glibc").toFile() + try { + val rootfs = File(base, "rootfs") + File(rootfs, "usr/local/lib").mkdirs() + File(rootfs, "etc").mkdirs() + File(rootfs, "etc/ld.so.preload").writeText("/usr/local/lib/libone.so\n/usr/local/lib/libtwo.so\n") + File(rootfs, "usr/local/lib/libone.so").writeText("x GLIBC_2.17 y GLIBC_2.34 z") + File(rootfs, "usr/local/lib/libtwo.so").writeText("GLIBC_2.38 GLIBC_2.25") + val old = File(base, "old-libc").apply { writeText("GNU C Library (Ubuntu GLIBC 2.23-0ubuntu11) stable release version 2.23, by Roland") } + val new = File(base, "new-libc").apply { writeText("GNU C Library (Ubuntu GLIBC 2.43-0ubuntu1) stable release version 2.43.") } + val same = File(base, "same-libc").apply { writeText("stable release version 2.38.") } + assertFalse(BwrapSpawner.preloadFits(rootfs.path, old.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, new.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, same.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, File(base, "missing").path)) + } finally { + base.deleteRecursively() + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeckyPluginInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeckyPluginInstallTest.kt index 080828ba9..e590d2388 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DeckyPluginInstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeckyPluginInstallTest.kt @@ -7,7 +7,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class DeckyPluginInstallTest { diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopCatalogTest.kt index 5738b50c4..8b4232a72 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopCatalogTest.kt @@ -9,7 +9,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class DesktopCatalogTest { diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt index 9040171c4..d2c303d13 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt @@ -76,4 +76,22 @@ class DesktopFileRemovalTest { file("var/lib/pacman/local/base-1/files", "%FILES%\nusr/\nusr/bin/\nusr/bin/gamescope\n\n%BACKUP%\netc/config\n") assertEquals(setOf("usr/bin/gamescope"), DesktopFileRemoval.runtimeFiles(root)) } + + @Test fun desktopPackageRecordsAreNotRuntimeFilesAndAreRemovedWithTheDesktop() { + file("var/lib/pacman/local/base-1/files", "%FILES%\nusr/bin/gamescope\n") + file("var/lib/pacman/local/kate-26.04.3-1/files", "%FILES%\nusr/bin/kate\n") + file("var/lib/pacman/local/kate-26.04.3-1/desc", "%NAME%\nkate\n") + file("var/lib/pacman/local/htop-3.5.3-1/files", "%FILES%\nusr/bin/htop\n") + file("var/lib/pacman/sync/droiddeck.db", "db") + file("var/lib/pacman/droiddeck-desktop", "stamp") + file("usr/share/droiddeck/pacman/desktop-packages.txt", "kate 26.04.3-1\n../../etc 1\n") + val records = DesktopFileRemoval.desktopRecords(root) + assertEquals(setOf("kate-26.04.3-1"), records) + assertEquals(setOf("usr/bin/gamescope", "usr/bin/htop"), DesktopFileRemoval.runtimeFiles(root)) + DesktopFileRemoval.removeRecords(root, records) + assertFalse(File(root, "var/lib/pacman/local/kate-26.04.3-1").exists()) + assertTrue(File(root, "var/lib/pacman/local/htop-3.5.3-1/files").exists()) + assertFalse(File(root, "var/lib/pacman/sync/droiddeck.db").exists()) + assertFalse(File(root, "var/lib/pacman/droiddeck-desktop").exists()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopMaintenanceTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopMaintenanceTest.kt index 55b46fe6f..c6cd27150 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopMaintenanceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopMaintenanceTest.kt @@ -60,4 +60,46 @@ class DesktopMaintenanceTest { assertTrue(LinuxRuntimeInstaller.beginMaintenance(null, "retry")!!.run(null) { null }) assertNull(LinuxRuntimeInstaller.removalError()) } + @Test(timeout = 15000) fun timeoutInterruptsTheMaintenanceOwnerAndReleasesTheReservation() { + SessionState.running = false + SessionState.phase = SessionPhase.IDLE + val operation = LinuxRuntimeInstaller.beginMaintenance(null, "Maintenance")!! + val entered = CountDownLatch(1) + val result = java.util.concurrent.atomic.AtomicReference<Boolean>() + val worker = Thread { + result.set(operation.run(null) { + entered.countDown() + CountDownLatch(1).await() + null + }) + } + worker.start() + try { + assertTrue(entered.await(5, TimeUnit.SECONDS)) + LinuxRuntimeInstaller.cancelActiveOperation() + worker.join(5000) + assertFalse(worker.isAlive) + assertEquals(false, result.get()) + assertFalse(LinuxRuntimeInstaller.isBusy()) + } finally { + worker.interrupt() + worker.join(5000) + } + } + + @Test(timeout = 15000) fun cancellationBeforeWorkerStartNeverRunsMaintenanceWork() { + SessionState.running = false + SessionState.phase = SessionPhase.IDLE + val operation = LinuxRuntimeInstaller.beginMaintenance(null, "Maintenance")!! + LinuxRuntimeInstaller.cancelActiveOperation() + val entered = java.util.concurrent.atomic.AtomicBoolean() + val result = java.util.concurrent.atomic.AtomicReference<Boolean>() + val worker = Thread { result.set(operation.run(null) { entered.set(true); null }) } + worker.start() + worker.join(5000) + assertFalse(worker.isAlive) + assertFalse(entered.get()) + assertEquals(false, result.get()) + assertFalse(LinuxRuntimeInstaller.isBusy()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt new file mode 100644 index 000000000..2aa580279 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt @@ -0,0 +1,145 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import java.io.File +import java.nio.file.Files +import java.util.zip.GZIPOutputStream +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class DesktopPackTest { + private val parent = Files.createTempDirectory("pack").toFile() + private val root = File(parent, "root").apply { mkdirs() } + + @After fun tearDown() { FileUtils.delete(parent) } + + private fun file(path: String, text: String) = File(root, path).apply { parentFile?.mkdirs(); writeText(text) } + + private fun line(kind: Char, path: String): String { + val file = File(root, path) + return when { + Files.isSymbolicLink(file.toPath()) -> "$kind\tL\t0\t${Files.readSymbolicLink(file.toPath())}\t$path" + file.isDirectory -> "$kind\tD\t0\t-\t$path" + else -> "$kind\tF\t${file.length()}\t${Hashes.sha256(file)}\t$path" + } + } + + private fun manifest(lines: List<String>) { + val target = File(root, "${DesktopPack.META}/files.tsv.gz").apply { parentFile?.mkdirs() } + GZIPOutputStream(target.outputStream()).bufferedWriter().use { w -> lines.forEach { w.write(it); w.write("\n") } } + } + + private fun installed(): List<String> { + File(root, DesktopPack.INFO).apply { parentFile?.mkdirs() } + .writeText("""{"tag":"ubuntu-r1-desktop","url":"https://example.invalid/d.tar.zst","sha256":"00","size":5}""") + file("usr/bin/runtime-tool", "runtime") + file("${DesktopPack.META}/originals/var/lib/dpkg/status", "Package: bash\n") + file("${DesktopPack.META}/originals/etc/gone.conf", "removed by the desktop") + file("${DesktopPack.META}/originals/etc/group", "root:x:0:") + file("${DesktopPack.META}/originals/etc/hosts", "runtime hosts") + file("etc/group", "root:x:0:\nsddm:x:120:") + file("etc/hosts", "desktop hosts") + file("var/lib/dpkg/status", "Package: bash\n\nPackage: kwin\n") + file("usr/bin/kwin_wayland", "kwin") + file("usr/share/kwin/effect.qml", "effect") + file("usr/share/kwin/edited.qml", "original") + Files.createSymbolicLink(File(root, "usr/bin/kwin").toPath(), File("kwin_wayland").toPath()) + val lines = listOf( + line('N', "usr/share/kwin"), line('N', "usr/bin/kwin_wayland"), line('N', "usr/share/kwin/effect.qml"), + line('N', "usr/share/kwin/edited.qml"), line('N', "usr/bin/kwin"), line('C', "var/lib/dpkg/status"), line('C', "etc/group"), line('C', "etc/hosts"), + "R\tF\t22\tx\tetc/gone.conf", "N\tF\t1\tx\t../escape", + ) + file("usr/share/kwin/edited.qml", "changed by the user") + file("etc/hosts", "edited by the user") + file("var/lib/dpkg/status", "Package: bash\n\nPackage: kwin\n\nPackage: vlc\n") + return lines + } + + @Test fun readsThePackTheRuntimeNames() { + installed() + val info = DesktopPack.info(root)!! + assertEquals("ubuntu-r1-desktop", info.tag) + assertEquals(5L, info.size) + } + + @Test fun removingPutsTheRuntimeBackAndKeepsWhatTheUserChanged() { + manifest(installed()) + val result = DesktopPack.remove(root) + assertEquals("Package: bash\n", File(root, "var/lib/dpkg/status").readText()) + assertEquals("removed by the desktop", File(root, "etc/gone.conf").readText()) + assertEquals("root:x:0:", File(root, "etc/group").readText()) + assertEquals("edited by the user", File(root, "etc/hosts").readText()) + assertFalse(File(root, "usr/bin/kwin_wayland").exists()) + assertFalse(Files.exists(File(root, "usr/bin/kwin").toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) + assertFalse(File(root, "usr/share/kwin/effect.qml").exists()) + assertEquals("changed by the user", File(root, "usr/share/kwin/edited.qml").readText()) + assertTrue(File(root, "usr/share/kwin").isDirectory) + assertEquals("runtime", File(root, "usr/bin/runtime-tool").readText()) + assertFalse(File(root, DesktopPack.META).exists()) + assertFalse(DesktopPack.installed(root)) + assertEquals(3, result.removed) + assertEquals(3, result.restored) + assertEquals(3, result.kept) + } + + @Test fun emptiedDirectoriesGoAway() { + val lines = installed() + File(root, "usr/share/kwin/edited.qml").delete() + manifest(lines) + DesktopPack.remove(root) + assertFalse(File(root, "usr/share/kwin").exists()) + assertTrue(File(root, "usr/share").isDirectory) + } + + @Test fun finishingAnInstallDeletesWhatTheDesktopRemoved() { + file("etc/gone.conf", "runtime copy") + manifest(listOf("R\tF\t22\tx\tetc/gone.conf", "R\tF\t1\tx\t../outside")) + File(root.parentFile, "outside").writeText("keep") + DesktopPack.finishInstall(root) + assertFalse(File(root, "etc/gone.conf").exists()) + assertTrue(File(root.parentFile, "outside").exists()) + File(root.parentFile, "outside").delete() + } + + @Test fun theDesktopKeepsPackagesTheUserInstalledBeforeIt() { + val bash = "Package: bash\nArchitecture: arm64\nVersion: 5.2" + val vim = "Package: vim\nArchitecture: arm64\nVersion: 9" + val kwin = "Package: kwin\nArchitecture: arm64\nVersion: 6.6" + file("var/lib/dpkg/status", "$bash\n\n$vim\n\n") + DesktopPack.prepareInstall(root) + file("${DesktopPack.META}/originals/var/lib/dpkg/status", "$bash\n\n") + file("var/lib/dpkg/status", "$bash\n\n$kwin\n\n") + manifest(listOf(line('C', "var/lib/dpkg/status"))) + DesktopPack.finishInstall(root) + assertEquals("$bash\n\n$kwin\n\n$vim\n\n", File(root, "var/lib/dpkg/status").readText()) + assertFalse(File(root, "var/lib/dpkg/status.droiddeck").exists()) + + val vlc = "Package: vlc\nArchitecture: arm64\nVersion: 3" + file("var/lib/dpkg/status", "$bash\n\n$kwin\n\n$vim\n\n$vlc\n\n") + DesktopPack.remove(root) + assertEquals("$bash\n\n$vim\n\n$vlc\n\n", File(root, "var/lib/dpkg/status").readText()) + } + + @Test fun mergingKeepsTheTargetWhenBothSidesChangedAPackage() { + val base = "Package: a\nVersion: 1\n\nPackage: b\nVersion: 1\n\nPackage: c\nVersion: 1\n" + val target = "Package: a\nVersion: 2\n\nPackage: b\nVersion: 1\n\nPackage: c\nVersion: 1\n" + val mine = "Package: a\nVersion: 3\n\nPackage: b\nVersion: 3\n" + assertEquals("Package: a\nVersion: 2\n\nPackage: b\nVersion: 3\n\n", DesktopPack.mergeStatus(base, target, mine)) + } + + @Test fun pathsMayNotLeaveTheRuntime() { + assertNull(DesktopPack.inside(root, "../x")) + assertNull(DesktopPack.inside(root, "/etc/passwd")) + Files.createSymbolicLink(File(root, "link").toPath(), root.parentFile.toPath()) + assertNull(DesktopPack.inside(root, "link/x")) + assertEquals(File(root, "usr/x"), DesktopPack.inside(root, "usr/./x")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt index 250a65535..3b73e8745 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt @@ -10,7 +10,7 @@ import org.junit.After import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) 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 000000000..6f9faede1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt @@ -0,0 +1,164 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 everyVolumeStepIsPublishedWithoutWaitingForThePoll() { + for (level in 2..5) { + audio.setStreamVolume(AudioManager.STREAM_MUSIC, level, 0) + context.sendBroadcast(android.content.Intent("android.media.VOLUME_CHANGED_ACTION")) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(level.toString(), File(directory, "volume.state").readText().split(" ").first()) + } + } + + @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/FlatpakManagerArchTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/FlatpakManagerArchTest.kt new file mode 100644 index 000000000..a7cd04c46 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/FlatpakManagerArchTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.runtime + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import java.io.File +import java.nio.file.Files + +class FlatpakManagerArchTest { + private lateinit var dir: File + + @Before fun setUp() { + dir = Files.createTempDirectory("flatpak-arch").toFile() + } + + @After fun tearDown() { + dir.deleteRecursively() + } + + private fun install(arch: String, branch: String) { + File(dir, "$arch/$branch/active").mkdirs() + } + + @Test fun armDevicesAlsoListX86Builds() { + assertEquals(listOf("aarch64", "x86_64"), FlatpakManager.arches("aarch64")) + assertEquals(listOf("x86_64"), FlatpakManager.arches("x86_64")) + } + + @Test fun anX86OnlyInstallIsFound() { + install("x86_64", "master") + val (arch, branch) = FlatpakManager.installedBranch(dir, "aarch64")!! + assertEquals("x86_64", arch) + assertEquals("master", branch.name) + } + + @Test fun theNativeBuildWinsWhenBothAreInstalled() { + install("x86_64", "master") + install("aarch64", "stable") + assertEquals("aarch64", FlatpakManager.installedBranch(dir, "aarch64")!!.first) + } + + @Test fun aBranchWithoutAnActiveDeployIsNotInstalled() { + File(dir, "x86_64/master").mkdirs() + assertNull(FlatpakManager.installedBranch(dir, "aarch64")) + } + + @Test fun x86BuildsOnArmLaunchWithTheirArch() { + val x86 = FlatpakManager.App("io.github.ebkr.r2modman", "r2modman", null, "master", null, "x86_64") + val arm = FlatpakManager.App("org.example.App", "App", null, "stable", null, "aarch64") + assertEquals(listOf("--arch=x86_64", "io.github.ebkr.r2modman"), FlatpakManager.launchArgs(x86, "aarch64")) + assertEquals(listOf("org.example.App"), FlatpakManager.launchArgs(arm, "aarch64")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt new file mode 100644 index 000000000..239acfae0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt @@ -0,0 +1,102 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import java.io.File +import java.nio.file.Files +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class L2sLinkTest { + private val dir = Files.createTempDirectory("l2s").toFile() + + @After fun tearDown() { FileUtils.delete(dir) } + + @Test fun aHardLinkBecomesProotsLinkLayout() { + val bin = File(dir, "usr/bin").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + val tail = File(bin, "tail") + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, tail)) + val intermediate = File(bin, ".l2s.coreutils0001") + assertEquals(intermediate.toPath(), Files.readSymbolicLink(coreutils.toPath())) + assertEquals(intermediate.toPath(), Files.readSymbolicLink(tail.toPath())) + assertEquals(File(bin, ".l2s.coreutils0001.0002").toPath(), Files.readSymbolicLink(intermediate.toPath())) + assertEquals("multicall", tail.readText()) + assertEquals("multicall", coreutils.readText()) + } + + @Test fun eachFurtherLinkRaisesTheCount() { + val bin = File(dir, "usr/bin").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(bin, "tail"))) + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(bin, "head"))) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(bin, "tail"), File(bin, "cat"))) + val final = File(bin, ".l2s.coreutils0001.0004") + assertTrue(final.isFile) + assertFalse(File(bin, ".l2s.coreutils0001.0002").exists()) + for (name in listOf("coreutils", "tail", "head", "cat")) assertEquals("multicall", File(bin, name).readText()) + } + + @Test fun aSecondFileWithTheSameNameGetsItsOwnChain() { + val a = File(dir, "a").apply { mkdirs() } + val existing = File(a, ".l2s.tool0001").apply { writeText("taken") } + val tool = File(a, "tool").apply { writeText("tool") } + assertTrue(LinuxRuntimeInstaller.l2sLink(tool, File(a, "alias"))) + assertEquals("taken", existing.readText()) + assertEquals(File(a, ".l2s.tool0002").toPath(), Files.readSymbolicLink(tool.toPath())) + assertEquals("tool", File(a, "alias").readText()) + } + + @Test fun linksMadeInStagingStillResolveAfterTheTreeIsRenamed() { + val staging = File(dir, "linuxfs.new") + val live = File(dir, "linuxfs") + val bin = File(staging, "usr/bin").apply { mkdirs() } + val cargo = File(staging, "usr/lib/cargo/bin/coreutils").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(cargo, "echo"), staging, live)) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(cargo, "echo"), File(cargo, "cat"), staging, live)) + assertEquals(File(live, "usr/bin/.l2s.coreutils0001").toPath(), Files.readSymbolicLink(File(cargo, "echo").toPath())) + assertTrue(File(staging, "usr/bin/.l2s.coreutils0001.0003").isFile) + + assertTrue(staging.renameTo(live)) + + for (rel in listOf("usr/bin/coreutils", "usr/lib/cargo/bin/coreutils/echo", "usr/lib/cargo/bin/coreutils/cat")) + assertEquals(rel, "multicall", File(live, rel).readText()) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(live, "usr/bin/coreutils"), File(live, "usr/bin/tail"))) + assertEquals("multicall", File(live, "usr/bin/tail").readText()) + assertTrue(File(live, "usr/bin/.l2s.coreutils0001.0004").isFile) + } + + @Test fun aHardLinkTargetMayAlreadyBeAnL2sLinkToTheFinalTree() { + val staging = File(dir, "linuxfs.new") + val live = File(dir, "linuxfs") + val bin = File(staging, "usr/bin").apply { mkdirs() } + File(bin, "coreutils").writeText("multicall") + assertTrue(LinuxRuntimeInstaller.l2sLink(File(bin, "coreutils"), File(bin, "["), staging, live)) + assertEquals(File(bin, "coreutils"), LinuxRuntimeInstaller.hardLinkTarget(staging, "./usr/bin/coreutils")) + assertTrue(LinuxRuntimeInstaller.l2sLink(LinuxRuntimeInstaller.hardLinkTarget(staging, "./usr/bin/coreutils"), File(bin, "ls"), staging, live)) + assertTrue(staging.renameTo(live)) + assertEquals("multicall", File(live, "usr/bin/ls").readText()) + } + + @Test fun aHardLinkTargetCannotLeaveTheTree() { + val tree = File(dir, "tree").apply { mkdirs() } + val outside = File(dir, "outside").apply { mkdirs() } + Files.createSymbolicLink(File(tree, "escape").toPath(), outside.toPath()) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "../outside/x")) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "escape/x")) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "..")) + assertEquals(File(tree, "x"), LinuxRuntimeInstaller.hardLinkTarget(tree, "./x")) + } + + @Test fun directoriesAndPlainSymlinksAreLeftAlone() { + val d = File(dir, "d").apply { mkdirs() } + assertFalse(LinuxRuntimeInstaller.l2sLink(d, File(dir, "e"))) + val target = File(dir, "t").apply { writeText("t") } + val link = File(dir, "link") + Files.createSymbolicLink(link.toPath(), target.toPath()) + assertFalse(LinuxRuntimeInstaller.l2sLink(link, File(dir, "other"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeLiveFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeLiveFilesTest.kt index baa6011f6..508f45608 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeLiveFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeLiveFilesTest.kt @@ -12,7 +12,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeProcFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeProcFilesTest.kt index 1638132af..025d84f69 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeProcFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeProcFilesTest.kt @@ -7,7 +7,7 @@ import org.junit.After import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/PackageExtractTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/PackageExtractTest.kt index fb4e908c1..5ed15424e 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/PackageExtractTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/PackageExtractTest.kt @@ -13,7 +13,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) 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 5d4eb1d8e..a4221a5db 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt @@ -1,13 +1,21 @@ 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 class ProotFastPathTest { private val root = File("/data/data/com.droiddeck.launcher/files/linuxfs") + @Test fun guestEnvironmentCarriesTheHostAndroidApi() { + for (sdk in listOf(33, 35, 36)) { + assertTrue(ProotFastPath.guestEnv(root, emptyList(), "test", sdk).contains("PROOT_FP_ANDROID_API=$sdk")) + } + } + @Test fun aSessionsUsualBindsGetAKey() { val binds = (1..87).map { "/host/$it:/guest/$it" } assertNotNull(ProotFastPath.key(root, binds)) @@ -17,4 +25,13 @@ 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)) + assertTrue(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_BUNDLED)) + 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/RuntimeAutoUpdateTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt new file mode 100644 index 000000000..43c67e573 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeAutoUpdateTest.kt @@ -0,0 +1,48 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class) +class RuntimeAutoUpdateTest { + private val context get() = RuntimeEnvironment.getApplication() + + @Test fun anInstalledRuntimeBehindTheCatalogUpdatesByItself() { + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2")) + } + + @Test fun noRuntimeOrTheSameOneIsLeftAlone() { + assertFalse(RuntimeAutoUpdate.claim(context, null, "ubuntu-r1-rc2")) + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc2", "ubuntu-r1-rc2")) + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", null)) + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "")) + } + + @Test fun aFailingUpdateStopsTryingAfterAFewLaunches() { + repeat(RuntimeAutoUpdate.MAX_ATTEMPTS) { assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", it * RuntimeAutoUpdate.RETRY_MS)) } + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", 10 * RuntimeAutoUpdate.RETRY_MS)) + } + + @Test fun aRetryWaitsBeforeUsingTheNextTry() { + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", 1_000L)) + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", 2_000L)) + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", 1_000L + RuntimeAutoUpdate.RETRY_MS)) + } + + @Test fun aNewerCatalogReleaseStartsAgain() { + repeat(RuntimeAutoUpdate.MAX_ATTEMPTS) { RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", it * RuntimeAutoUpdate.RETRY_MS) } + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc3", 5 * RuntimeAutoUpdate.RETRY_MS)) + } + + @Test fun goingBackToAnEarlierReleaseKeepsItsCount() { + repeat(RuntimeAutoUpdate.MAX_ATTEMPTS) { RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", it * RuntimeAutoUpdate.RETRY_MS) } + assertTrue(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc3", 5 * RuntimeAutoUpdate.RETRY_MS)) + assertFalse(RuntimeAutoUpdate.claim(context, "ubuntu-r1-rc1", "ubuntu-r1-rc2", 10 * RuntimeAutoUpdate.RETRY_MS)) + } +} 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 000000000..e2843c7b4 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 318e6b980..83d43250f 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/RuntimeRemovalUiTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalUiTest.kt index 8f690302d..962cd757b 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalUiTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalUiTest.kt @@ -11,7 +11,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 000000000..15961981c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt @@ -0,0 +1,286 @@ +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, "opt/droiddeck/wincomponents/d3dx9/component.json") + 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", + "opt/droiddeck/wincomponents/d3dx9/component.json", + "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 aMenuEntryTheNewRuntimeShipsIsNotCarried() { + val old = tmp.newFolder("old").also { + put(it, "root/save.dat", "mine") + put(it, "usr/share/applications/droiddeck-return-gaming.desktop", "old runtime") + put(it, "usr/share/applications/droiddeck-steam-x64.desktop", "made by the old desktop") + } + val staging = tmp.newFolder("new").also { + put(it, "root/.bashrc", "shipped") + put(it, "usr/share/applications/droiddeck-return-gaming.desktop", "new runtime") + } + + val paths = RuntimeFileTree.existingUserPaths(old, staging) + + assertTrue("root" in paths) + assertTrue("usr/share/applications/droiddeck-steam-x64.desktop" in paths) + assertFalse("usr/share/applications/droiddeck-return-gaming.desktop" in paths) + RuntimeFileTree.carryUserData(old, staging, false, paths) + assertEquals("new runtime", File(staging, "usr/share/applications/droiddeck-return-gaming.desktop").readText()) + } + + @Test fun cachesTiedToThePreviousRuntimeAreDropped() { + val root = tmp.newFolder("rt") + val keep = listOf("root/.cache/mozilla/cache2/entry", "root/.cache/droiddeck/session.log", + "root/.local/share/droiddeck/apt/packages.txt", "root/.local/share/Steam/steam.sh", "root/.config/kwinrc") + val drop = listOf("root/.local/share/droiddeck/pacman/packages.txt", "root/.cache/droiddeck/pacman-restore.log", + "root/.cache/mesa_shader_cache_db/index", "root/.cache/mesa_shader_cache/a/b", "root/.cache/appstream/x.xb", + "root/.cache/discover/c", "root/.cache/ksycoca6_en-POSIX_abc", "root/.cache/plasma_theme_Vapor.kcache", + "root/.cache/kwinsession.kcache", "root/.cache/qtshadercache-arm64-little_endian-lp64/s", + "root/.cache/event-sound-cache.tdb.1.aarch64-unknown-linux-gnu", "root/.cache/fontconfig/x.cache-9") + (keep + drop).forEach { put(root, it) } + + RuntimeFileTree.dropStaleState(root) + + keep.forEach { assertTrue(it, File(root, it).exists()) } + drop.forEach { assertFalse(it, File(root, it).exists()) } + } + + @Test fun droppingStateWithoutAHomeDoesNothing() { + RuntimeFileTree.dropStaleState(tmp.newFolder("empty")) + } + + @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/runtime/SeededMacTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt new file mode 100644 index 000000000..e7a521263 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/SeededMacTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.runtime + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotEquals +import org.junit.Test + +class SeededMacTest { + @Test + fun theAndroidIdSeedsAStableLocalMac() { + val mac = LinuxNetworkLinkComponent.seededMac { "0123456789abcdef" } + assertEquals(mac, LinuxNetworkLinkComponent.seededMac { "0123456789abcdef" }) + assertNotEquals(mac, LinuxNetworkLinkComponent.seededMac { null }) + assertEquals(0x02, mac.substringBefore(':').toInt(16) and 0x03) + } + + @Test + fun aRomThatThrowsOnTheAndroidIdReadFallsBackToTheDefaultSeed() { + val mac = LinuxNetworkLinkComponent.seededMac { throw IllegalArgumentException("Illegal char: - at offset 8") } + assertEquals(LinuxNetworkLinkComponent.seededMac { null }, mac) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/AddedGameMoveTest.kt b/app/src/test/java/com/droiddeck/launcher/session/AddedGameMoveTest.kt index c549adf59..feb34d32e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/AddedGameMoveTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/AddedGameMoveTest.kt @@ -4,7 +4,7 @@ import android.content.Context import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 0c94f8225..ed79779ba 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -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 ca68f5867..5b60404fc 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt @@ -5,7 +5,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -29,7 +29,6 @@ class BootMovieLibraryTest { private fun movie(name: String) = File(movies, name).also { it.parentFile!!.mkdirs(); it.writeText("movie") } - /** A movie DroidDeck itself imported: kept in the library, copied into Steam's folder and noted in the list. */ private fun imported(title: String, source: String = BootMovieLibrary.SOURCE_IMPORT, repo: String? = null): String { val staged = File(BootMovieLibrary.libraryDir(app), ".t-${System.nanoTime()}-${Thread.currentThread().id}.staged").also { it.parentFile!!.mkdirs(); it.writeText("movie") } return BootMovieLibrary.commit(app, staged, title, source, repo)!! @@ -178,17 +177,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" } @@ -236,11 +257,9 @@ class BootMovieLibraryTest { steamPicks("b.webm") assertTrue(BootMovie.syncFromSteam(app)) assertEquals("file:b.webm", BootMovie.choice(app)) - // Picking another one here is not undone by the same Steam setting. BootMovie.select(app, "file:a.webm") assertFalse(BootMovie.syncFromSteam(app)) assertEquals("file:a.webm", BootMovie.choice(app)) - // A new pick inside Steam is adopted again. movie("c.webm") steamPicks("c.webm") assertTrue(BootMovie.syncFromSteam(app)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/BootMovieTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BootMovieTest.kt index 5518870e3..8e673c7e1 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieTest.kt @@ -5,7 +5,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt new file mode 100644 index 000000000..19046dc27 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomNotificationsTest { + private val own = "com.droiddeck.launcher" + + @Test fun messagesFromOtherAppsAreKept() { + assertTrue(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = "Kurt", text = "ready?")) + } + + @Test fun ownOngoingSummaryAndEmptyNotificationsAreSkipped() { + assertFalse(BottomNotifications.keep(own, own, ongoing = false, groupSummary = false, title = "Session", text = "running")) + assertFalse(BottomNotifications.keep(own, "com.spotify", ongoing = true, groupSummary = false, title = "Song", text = "Artist")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = true, title = "2 messages", text = "")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = " ", text = "")) + } + + @Test fun anUpdatedNotificationMovesToTheTopOnce() { + val list = mutableListOf( + BottomNotification("a", "App", "one", "", 1L), + BottomNotification("b", "App", "two", "", 2L), + ) + BottomNotifications.add(list, BottomNotification("b", "App", "two again", "", 3L)) + assertEquals(listOf("b", "a"), list.map { it.key }) + assertEquals("two again", list.first().title) + } + + @Test fun theListKeepsTheNewestThirty() { + val list = mutableListOf<BottomNotification>() + repeat(35) { BottomNotifications.add(list, BottomNotification("k$it", "App", "t$it", "", it.toLong())) } + assertEquals(30, list.size) + assertEquals("k34", list.first().key) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt new file mode 100644 index 000000000..0731f6b90 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class BottomScreenshotsTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun fileNamesSortByTime() { + val name = BottomScreenshots.fileName(0L) + assertTrue(name, name.startsWith("DroidDeck_") && name.endsWith(".jpg")) + assertEquals(29, name.length) + } + + @Test fun steamScreenshotsAreFoundAndThumbnailsSkipped() { + val root = tmp.root + val shots = File(root, "root/.local/share/Steam/userdata/2932373/760/remote/220/screenshots") + File(shots, "thumbnails").mkdirs() + File(shots, "20261031010101_1.jpg").writeText("x") + File(shots, "thumbnails/20261031010101_1.jpg").writeText("x") + File(shots, "screenshots.vdf").writeText("x") + val x64 = File(root, "root/.droiddeck-x64/.local/share/Steam/userdata/2932373/760/remote/440/screenshots") + x64.mkdirs() + File(x64, "20261031020202_1.jpg").writeText("x") + val found = BottomScreenshots.steam(root).map { it.file!!.name }.sorted() + assertEquals(listOf("20261031010101_1.jpg", "20261031020202_1.jpg"), found) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt new file mode 100644 index 000000000..60dae948b --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 000000000..10fc665d3 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/ComponentsNightlyCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt index 8fbb0bacd..5dbd3163f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt @@ -55,11 +55,9 @@ class ComponentsNightlyCatalogTest { val nVkEc = item("DD-vkd3d-proton-arm64ec-3.0.1+455-nightly.wcp", "vkd3d", n) val pairs = ComponentsManager.nightlyPairs(listOf(dxvk, ec, gpl, fex, vk) + others + listOf(nDxvk, nEc, nGpl, nFex, nVk, nVkEc)) assertEquals(mapOf(dxvk to nDxvk, ec to nEc, gpl to nGpl, fex to nFex, vk to nVk), pairs) - // Two nightlies for one stable build: the newer one wins. val nDxvkNewer = item("DD-dxvk-3.1.1+154-nightly.wcp", "dxvk", n) assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvkNewer, nDxvk))) assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvk, nDxvkNewer))) - // A nightly of a version with no stable build pairs with nothing. assertEquals(emptyMap<Any, Any>(), ComponentsManager.nightlyPairs(listOf(item("dxvk-3.1-linux.wcp", "dxvk", "Dxvk-Linux"), nDxvk))) } 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 000000000..1ed4ed9b6 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 000000000..31bef7c03 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 8a25bf4e7..6bf3c106e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt @@ -1,12 +1,11 @@ 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 import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -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/EsyncPacksTest.kt b/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt index 7d44b1087..a174905c4 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/EsyncPacksTest.kt @@ -17,7 +17,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.ByteArrayInputStream diff --git a/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt index 3f4fa2f75..8c9efc0b2 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/FexCatalogTest.kt @@ -4,7 +4,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 3f5e6e8e4..1947ec56a 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt @@ -12,7 +12,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -29,6 +29,17 @@ 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) { + } + } + } + @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/GameEnvironmentStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt index 6645c6ee1..26da75d6d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt @@ -4,14 +4,17 @@ import android.content.Context import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.runtime.LinuxRuntime 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.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -21,10 +24,137 @@ class GameEnvironmentStoreTest { @Before fun setUp() { context = RuntimeEnvironment.getApplication() + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .remove("logs") + .remove("gameDebugLogsEnabled") + .commit() guest = File(LinuxRuntime.rootDir(context), "root/.config/droiddeck/game-environment.json") File(context.filesDir, "game-environment.json").delete() } + @After fun tearDown() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .remove("logs") + .remove("gameDebugLogsEnabled") + .commit() + } + + @Test fun gameDebugLogsAreOffByDefault() { + assertFalse(SessionPrefs.gameDebugLogsEnabled(context)) + + GameEnvironmentStore.save(context, GameEnvironment.Config()) + + assertFalse(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + } + + @Test fun gameDebugLogsRequireSessionLogsAndPreserveCustomDiagnostics() { + val config = GameEnvironment.Config(shared = mapOf("PROTON_LOG" to "0", "WINEDEBUG" to "+warn")) + GameEnvironmentStore.save(context, config) + + SessionPrefs.setGameDebugLogsEnabled(context, true) + var published = JSONObject(guest.readText()) + assertTrue(published.getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + assertEquals("0", published.getJSONObject("shared").getString("PROTON_LOG")) + assertEquals("+warn", published.getJSONObject("shared").getString("WINEDEBUG")) + assertEquals(config, GameEnvironmentStore.read(context)) + + SessionPrefs.setLogsEnabled(context, false) + published = JSONObject(guest.readText()) + assertFalse(published.getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + assertTrue(SessionPrefs.gameDebugLogsEnabled(context)) + + SessionPrefs.setLogsEnabled(context, true) + assertTrue(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + } + + @Test fun failedGameDebugOptOutLeavesTheEnabledPreferenceVisible() { + assertTrue(SessionPrefs.setGameDebugLogsEnabled(context, true)) + assertTrue(SessionPrefs.gameDebugLogsEnabled(context)) + val guestDirectory = guest.parentFile!! + guestDirectory.deleteRecursively() + guestDirectory.parentFile!!.mkdirs() + guestDirectory.writeText("blocks the guest configuration directory\n") + try { + assertFalse(SessionPrefs.setGameDebugLogsEnabled(context, false)) + assertTrue(SessionPrefs.gameDebugLogsEnabled(context)) + } finally { + guestDirectory.delete() + guestDirectory.mkdirs() + GameEnvironmentStore.publish(context) + } + assertTrue(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + } + + @Test fun unchangedEffectiveDiagnosticsDoNotRequireGuestPublication() { + assertFalse(SessionPrefs.gameDebugLogsEnabled(context)) + val guestDirectory = guest.parentFile!! + guestDirectory.deleteRecursively() + guestDirectory.parentFile!!.mkdirs() + guestDirectory.writeText("blocks the guest configuration directory\n") + try { + assertTrue(SessionPrefs.setLogsEnabled(context, false)) + assertFalse(SessionPrefs.logsEnabled(context)) + } finally { + guestDirectory.delete() + guestDirectory.mkdirs() + SessionPrefs.setLogsEnabled(context, true) + GameEnvironmentStore.publish(context) + } + } + + @Test fun logPreferenceUpdatesUseThePublisherLock() { + GameEnvironmentStore.publish(context) + val entered = CountDownLatch(1) + val finished = CountDownLatch(1) + lateinit var thread: Thread + synchronized(GameEnvironmentStore) { + thread = Thread { + entered.countDown() + SessionPrefs.setGameDebugLogsEnabled(context, true) + finished.countDown() + } + thread.start() + assertTrue(entered.await(5, TimeUnit.SECONDS)) + assertFalse(finished.await(100, TimeUnit.MILLISECONDS)) + assertFalse(SessionPrefs.gameDebugLogsEnabled(context)) + assertFalse(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + } + assertTrue(finished.await(5, TimeUnit.SECONDS)) + thread.join() + assertTrue(SessionPrefs.gameDebugLogsEnabled(context)) + assertTrue(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + } + + @Test fun gameDebugLogsWaitForARetainedSessionFolder() { + assertNull(SessionPaths.current()) + assertTrue(SessionPaths.currentSessionLogsRetained(context)) + GameEnvironmentStore.publish(context) + SessionPrefs.setLogsEnabled(context, false) + val cacheSession = SessionPaths.beginOrCurrent(context, "game-debug-logs") + try { + assertFalse(SessionPaths.currentSessionLogsRetained(context)) + + SessionPrefs.setLogsEnabled(context, true) + SessionPrefs.setGameDebugLogsEnabled(context, true) + assertTrue(SessionPrefs.gameDebugLogsEnabled(context)) + assertFalse(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + + assertEquals(cacheSession, SessionPaths.take()) + SessionPaths.release(context, cacheSession) + val retainedSession = SessionPaths.beginOrCurrent(context, "game-debug-logs") + assertTrue(SessionPaths.currentSessionLogsRetained(context)) + + GameEnvironmentStore.publish(context) + assertTrue(JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) + assertEquals(retainedSession, SessionPaths.current()) + } finally { + SessionPaths.take()?.let { ended -> + SessionPaths.release(context, ended) + ended.deleteRecursively() + } + } + } + @Test fun savedSettingsAndPublishedSettingsPreserveUnsetsAndLiteralValues() { val config = GameEnvironment.Config( shared = mapOf("LITERAL" to "a=b 'quoted' $(echo test)", "EMPTY" to ""), diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameProfileManagerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameProfileManagerTest.kt index 77b2895c3..e74fde15f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameProfileManagerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameProfileManagerTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt index f731c4f1c..c0dad288e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameStorageTest.kt @@ -7,7 +7,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt new file mode 100644 index 000000000..a7c0a8cfa --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt @@ -0,0 +1,223 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config +import java.nio.ByteBuffer +import java.nio.ByteOrder + +class GameTelemetryTest { + private fun packet(size: Int, fill: ByteBuffer.() -> Unit): ByteArray = + ByteBuffer.allocate(size).order(ByteOrder.LITTLE_ENDIAN).apply(fill).array() + + @Test fun codemastersFloatsBecomeADash() { + val data = packet(264) { + putFloat(7 * 4, 25f) + putFloat(29 * 4, 0.8f) + putFloat(31 * 4, 0.1f) + putFloat(33 * 4, 3f) + putFloat(36 * 4, 1f) + putFloat(37 * 4, 650f) + putFloat(63 * 4, 800f) + putFloat(45 * 4, 30f) + putFloat(46 * 4, 60f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(90f, t.speedKmh!!, 0.01f) + assertEquals("3", t.gear) + assertEquals(6500f, t.rpm!!, 0.01f) + assertEquals(8000f, t.maxRpm!!, 0.01f) + assertEquals(2, t.lap) + assertEquals(0.5f, t.fuel!!, 0.001f) + } + + @Test fun codemastersShortPacketFromDirtShowdown() { + val data = packet(152) { + putFloat(1 * 4, 80.085f) + putFloat(7 * 4, 10.739f) + putFloat(29 * 4, 0.816f) + putFloat(33 * 4, 1f) + putFloat(37 * 4, 827.531f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(38.66f, t.speedKmh!!, 0.01f) + assertEquals("1", t.gear) + assertEquals(8275.31f, t.rpm!!, 0.01f) + assertEquals(0.816f, t.throttle!!, 0.001f) + assertEquals(1, t.lap) + assertEquals(80.085f, t.currentLapS!!, 0.001f) + assertNull(t.maxRpm) + assertNull(t.laps) + assertNull(t.position) + assertNull(t.fuel) + assertNull(t.lastLapS) + } + + @Test fun codemastersReverseAndNeutral() { + fun gear(g: Float) = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, packet(264) { putFloat(33 * 4, g) }, 264)!!.gear + assertEquals("N", gear(0f)) + assertEquals("R", gear(-1f)) + assertEquals("R", gear(10f)) + } + + @Test fun forzaHorizonDashSitsTwelveBytesLater() { + val dash = 232 + 12 + val data = packet(324) { + putInt(0, 1) + putFloat(8, 8000f) + putFloat(16, 5000f) + putFloat(dash + 12, 50f) + put(dash + 71, 255.toByte()) + put(dash + 75, 4) + putShort(dash + 68, 2) + put(dash + 70, 5) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(180f, t.speedKmh!!, 0.01f) + assertEquals("4", t.gear) + assertEquals(1f, t.throttle!!, 0.001f) + assertEquals(3, t.lap) + assertEquals(5, t.position) + } + + @Test fun forzaMotorsportDashFollowsTheSled() { + val data = packet(311) { + putInt(0, 1) + putFloat(232 + 12, 10f) + put(232 + 75, 0) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(36f, t.speedKmh!!, 0.01f) + assertEquals("R", t.gear) + } + + @Test fun forzaInMenusHasNoDash() { + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, packet(324) {}, 324)!! + assertNull(t.speedKmh) + } + + @Test fun outGaugeGearsAreShiftedByOne() { + val data = packet(96) { + put(10, 3) + putFloat(12, 20f) + putFloat(16, 4000f) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals("2", t.gear) + assertEquals(72f, t.speedKmh!!, 0.01f) + assertEquals(4000f, t.rpm!!, 0.01f) + } + + @Test fun listensOnIpv4Loopback() { + assertTrue(GameTelemetry.LISTEN_ADDRESS is java.net.Inet4Address) + assertEquals("127.0.0.1", GameTelemetry.LISTEN_ADDRESS.hostAddress) + } + + @Test fun shortPacketsAreIgnored() { + assertNull(GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, ByteArray(148), 148)) + assertNull(GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, ByteArray(40), 40)) + assertNull(GameTelemetry.parse(1234, ByteArray(400), 400)) + } + + @Test fun codemastersGForceAndSteering() { + val data = packet(152) { + putFloat(30 * 4, -0.5f) + putFloat(33 * 4, 2f) + putFloat(34 * 4, 1.2f) + putFloat(35 * 4, -0.8f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(-0.5f, t.steer!!, 1e-4f) + assertEquals(1.2f, t.gLat!!, 1e-4f) + assertEquals(-0.8f, t.gLon!!, 1e-4f) + } + + @Test fun forzaReadsBestLapSteeringGForceAndTires() { + val dash = 232 + val data = packet(311) { + putInt(0, 1) + putFloat(20, 9.81f) + putFloat(28, -4.905f) + putFloat(dash + 24, 212f) + putFloat(dash + 28, 32f) + putFloat(dash + 32, 194f) + putFloat(dash + 36, 176f) + putFloat(dash + 52, 81.5f) + put(dash + 75, 3) + put(dash + 76, (-127).toByte()) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(1f, t.gLat!!, 1e-3f) + assertEquals(-0.5f, t.gLon!!, 1e-3f) + assertEquals(listOf(100f, 0f, 90f, 80f), t.tireTempsC!!.map { Math.round(it).toFloat() }) + assertEquals(81.5f, t.bestLapS!!, 1e-4f) + assertEquals(-1f, t.steer!!, 1e-4f) + } + + @Test fun forzaWithoutTireDataLeavesThemOut() { + val data = packet(311) { putInt(0, 1); put(232 + 75, 2) } + assertNull(GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!!.tireTempsC) + } + + @Test fun outGaugeReadsTurboTemperaturesAndLights() { + val data = packet(92) { + put(10, 3) + putFloat(20, 0.8f) + putFloat(24, 92f) + putFloat(36, 104f) + putInt(40, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS or GameTelemetry.DL_HANDBRAKE) + putInt(44, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals(0.8f, t.turboBar!!, 1e-4f) + assertEquals(92f, t.engineTempC!!, 1e-4f) + assertEquals(104f, t.oilTempC!!, 1e-4f) + assertEquals(GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS, t.lights) + } + + @Test fun outGaugeZeroFieldsStayHidden() { + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, packet(92) { put(10, 2) }, 92)!! + assertNull(t.turboBar) + assertNull(t.engineTempC) + assertNull(t.lights) + } +} + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GameStatusFilesTest { + @Test fun warThunderShowsNumbersOnlyDuringAMatch() { + assertEquals(emptyList<Pair<String, String>>(), GameStatusFiles.warThunder("""{"valid": false}""")) + val rows = GameStatusFiles.warThunder("""{"valid": true, "H, m": 1520, "TAS, km/h": 512.4, "name": "x"}""") + assertEquals(listOf("H, m" to "1520", "TAS, km/h" to "512.4"), rows) + } + + @Test fun warThunderKeepsEveryNumberForTheFlightLayout() { + val json = buildString { + append("{\"valid\": true") + for (i in 0 until 20) append(", \"k$i\": $i") + append(", \"IAS, km/h\": 512, \"throttle 1, %\": 110}") + } + val rows = GameStatusFiles.warThunder(json) + assertEquals(22, rows.size) + assertTrue(com.droiddeck.launcher.ui.FlightLabels.drawable(rows)) + assertEquals("110", rows.toMap()["throttle 1, %"]) + } + + @Test fun eliteAtTheMenusShowsNothing() { + assertNull(GameStatusFiles.elite("""{"timestamp": "2026-10-31T02:00:00Z", "event": "Status", "Flags": 0}""")) + } + + @Test fun eliteInFlight() { + val e = GameStatusFiles.elite("""{"Flags": 16777240, "Pips": [4, 8, 0], "Fuel": {"FuelMain": 16.0, "FuelReservoir": 0.43}, + "Cargo": 2.0, "LegalState": "Clean", "Balance": 1234567}""")!! + assertEquals(16.0, e.fuelMain!!, 0.001) + assertEquals(listOf(4, 8, 0), e.pips) + assertEquals("Clean", e.legal) + assertEquals(1234567L, e.balance) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt index 16f5d7d2c..8233957e2 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt @@ -9,9 +9,7 @@ class GameThreadHintsTest { @Test fun `a thread joins above 60 percent and leaves under 15`() { assertEquals(emptySet<Int>(), GameThreadHints.pick(emptySet(), mapOf(1 to 0.55))) assertEquals(setOf(1), GameThreadHints.pick(emptySet(), mapOf(1 to 0.68))) - // Faster where it was moved, or capped by the display, it stays boosted at 25%... assertEquals(setOf(1), GameThreadHints.pick(setOf(1), mapOf(1 to 0.25))) - // ...and is let go once it idles. assertEquals(emptySet<Int>(), GameThreadHints.pick(setOf(1), mapOf(1 to 0.1))) } @@ -28,8 +26,8 @@ class GameThreadHintsTest { assertTrue(GameThreadHints.holdsPace(119.0, 120.0)) assertTrue(GameThreadHints.holdsPace(60.5, 120.0)) assertTrue(GameThreadHints.holdsPace(30.0, 120.0)) - assertFalse(GameThreadHints.holdsPace(92.0, 120.0)) // falling behind: boost + assertFalse(GameThreadHints.holdsPace(92.0, 120.0)) assertFalse(GameThreadHints.holdsPace(105.0, 120.0)) - assertFalse(GameThreadHints.holdsPace(3.0, 120.0)) // headless or loading: boost + assertFalse(GameThreadHints.holdsPace(3.0, 120.0)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt new file mode 100644 index 000000000..996035e31 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt @@ -0,0 +1,114 @@ +package com.droiddeck.launcher.session + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class GpuLayerLoadTest { + @get:Rule val tmp = TemporaryFolder() + private var now = 0L + private fun load(dir: File) = GpuStatsComponent.LayerLoad(dir, clock = { now }) + private fun write(dir: File, pid: Int, busyNs: Long) = File(dir, "$pid").writeText("%20d %-32s\n".format(busyNs, "game")) + + @Test fun busyTimeOfAllProcessesOverWallTime() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + write(dir, 100, 1_000_000_000L) + write(dir, 200, 5_000_000_000L) + now = 10_000_000_000L + assertNull(load.percent()) + write(dir, 100, 1_300_000_000L) + write(dir, 200, 5_100_000_000L) + now += 1_000_000_000L + assertEquals(40L, load.percent()) + } + + @Test fun aNewProcessStartsFromItsOwnTotalAndAGoneOneStopsCounting() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + write(dir, 100, 2_000_000_000L) + now = 1L + load.percent() + File(dir, "100").delete() + write(dir, 300, 9_000_000_000L) + now += 500_000_000L + assertEquals(0L, load.percent()) + write(dir, 300, 9_250_000_000L) + now += 500_000_000L + assertEquals(50L, load.percent()) + } + + @Test fun capsAtFullAndIgnoresOtherFiles() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + File(dir, "on").createNewFile() + write(dir, 1, 0L) + write(dir, 2, 0L) + now = 1L + load.percent() + write(dir, 1, 900_000_000L) + write(dir, 2, 900_000_000L) + now += 1_000_000_000L + assertEquals(100L, load.percent()) + } + + @Test fun theOnFlagFollowsTheHudAndHidingDropsTheBaseline() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + load.wanted(true) + assertTrue(File(dir, "on").exists()) + write(dir, 1, 100L) + now = 1L + load.percent() + load.wanted(false) + assertFalse(File(dir, "on").exists()) + load.wanted(true) + now += 1_000L + assertNull(load.percent()) + } + + @Test fun theCompositorsOwnGpuTimeAddsToTheGames() { + val dir = tmp.newFolder("gpu-load") + var compositor: Long? = 7_000_000_000L + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, extra = { compositor }) + write(dir, 100, 1_000_000_000L) + now = 1L + assertNull(load.percent()) + write(dir, 100, 1_600_000_000L) + compositor = 7_150_000_000L + now += 1_000_000_000L + assertEquals(75L, load.percent()) + compositor = null + write(dir, 100, 1_900_000_000L) + now += 1_000_000_000L + assertEquals(30L, load.percent()) + } + + @Test fun onlyTheCompositorCountsWhenNoGameReportsYet() { + val dir = File(tmp.root, "never-created") + var compositor = 0L + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, extra = { compositor }) + now = 1L + load.percent() + compositor = 200_000_000L + now += 1_000_000_000L + assertEquals(20L, load.percent()) + } + + @Test fun compositorTimingFollowsTheHudOnlyOnChanges() { + val dir = tmp.newFolder("gpu-load") + val calls = mutableListOf<Boolean>() + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, onWanted = { calls += it }) + load.wanted(true) + load.wanted(true) + load.wanted(false) + load.wanted(true) + load.clear() + assertEquals(listOf(true, false, true, false), calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt new file mode 100644 index 000000000..f0d7478d8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt @@ -0,0 +1,74 @@ +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 GpuMemstoreLoadTest { + private var busy = 0L + private var samples = 0L + private var moves = 0L + private var available = true + private val load = GpuStatsComponent.MemstoreLoad { if (available) longArrayOf(busy, samples, moves) else null } + + private fun tick(newSamples: Long, newBusy: Long, newMoves: Long = 1) { + samples += newSamples + busy += newBusy + moves += newMoves + } + + @Test fun notTrustedUntilNewWorkIsSeen() { + assertNull(load.percent()) + tick(500, 400, newMoves = 0) + assertNull(load.percent()) + assertFalse(load.working) + tick(500, 300) + assertEquals(70L, load.percent()) + assertTrue(load.working) + } + + @Test fun givesUpWhenTheTimestampsNeverMove() { + load.percent() + repeat(10) { + tick(500, 250, newMoves = 0) + assertNull(load.percent()) + } + assertTrue(load.failed) + tick(500, 250) + assertNull(load.percent()) + assertFalse(load.working) + } + + @Test fun averagesOverTheLastTwoReads() { + load.percent() + tick(500, 500) + assertEquals(100L, load.percent()) + tick(500, 0) + assertEquals(50L, load.percent()) + tick(500, 0, newMoves = 0) + assertEquals(0L, load.percent()) + } + + @Test fun pausingStartsANewWindow() { + load.percent() + tick(500, 500) + load.percent() + load.pause() + tick(0, 0, newMoves = 0) + assertNull(load.percent()) + tick(500, 100) + assertEquals(20L, load.percent()) + } + + @Test fun noReadingWithoutNewSamplesOrCounts() { + load.percent() + tick(500, 100) + load.percent() + assertNull(load.percent()) + available = false + tick(500, 100) + assertNull(load.percent()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/HudDefaultTest.kt b/app/src/test/java/com/droiddeck/launcher/session/HudDefaultTest.kt new file mode 100644 index 000000000..787949f63 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/HudDefaultTest.kt @@ -0,0 +1,39 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import org.junit.After +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class HudDefaultTest { + private lateinit var context: Context + + @Before fun setUp() { + context = ApplicationProvider.getApplicationContext() + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @After fun tearDown() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun aNewInstallStartsWithTheHudOff() { + assertFalse(SessionPrefs.hudEnabled(context)) + } + + @Test fun aHudTheUserTurnedOnStaysOn() { + SessionPrefs.setHudEnabled(context, true) + assertTrue(SessionPrefs.hudEnabled(context)) + } + + @Test fun aHudTheUserTurnedOffStaysOff() { + SessionPrefs.setHudEnabled(context, false) + assertFalse(SessionPrefs.hudEnabled(context)) + } +} 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 000000000..c06282349 --- /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 000000000..a4e495131 --- /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 84c995ee2..c26d36a54 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import java.io.File @@ -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 5ce8030d5..28bb6585b 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt @@ -2,11 +2,12 @@ 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 import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -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() { - assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, SessionPrefs.orientation(context)) - for (value in listOf( - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, - )) { + @Test fun sessionChoicesPersistGloballyWithLandscapeAsTheDefault() { + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) + 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() - assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, SessionPrefs.orientation(context)) + 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 000000000..c2d0ca835 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt @@ -0,0 +1,33 @@ +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 sessionLimitPacesThePhone() { + assertEquals(45, SessionPrefs.compositorFpsLimit(0, 45)) + } + + @Test fun sessionLimitNeverExceedsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60, 90)) + assertEquals(30, SessionPrefs.compositorFpsLimit(60, 30)) + } + + @Test fun pictureInPictureHoldsTheSessionToThirty() { + assertEquals(SessionPrefs.PIP_FPS, SessionPrefs.compositorFpsLimit(0, pip = true)) + assertEquals(SessionPrefs.PIP_FPS, SessionPrefs.compositorFpsLimit(0, 60, pip = true)) + assertEquals(20, SessionPrefs.compositorFpsLimit(0, 20, pip = true)) + } + + @Test fun pictureInPictureKeepsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60, pip = true)) + } + + @Test fun mirroringKeepsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerfModeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerfModeTest.kt index d4afbbfdd..0e5226702 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PerfModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PerfModeTest.kt @@ -4,7 +4,7 @@ import android.view.Display import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowDisplayManager 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 fcf85ddb9..7c49bda7c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import java.io.File @@ -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 0e0f16cf2..a961badd3 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -11,7 +11,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -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/QuestExperimentalTest.kt b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt index 8c0f6896a..a243a67c7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowBuild diff --git a/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt index 8c5361aec..3f9469fa8 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt @@ -16,7 +16,7 @@ import org.junit.Before import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -115,6 +115,22 @@ class RumbleComponentTest { assertFalse(pad.vibrating) } + @Test fun quietingStopsAHeldEffectAndDropsEffectsUntilLifted() { + val pad = FakeMotors() + rumble.controllerMotors = { pad } + activeController(PAD_ID) + effect(strong = 40000, weak = 20000, ms = RumbleComponent.HOLD_MS) + rumble.quiet(true) + assertFalse(pad.vibrating) + idle(RumbleComponent.KEEPALIVE_MS * 4 + 100) + assertEquals("the keepalive restarted the motors while quiet", 1, pad.played.size) + effect(strong = 40000, weak = 20000) + assertFalse("an effect played while quiet", pad.vibrating) + rumble.quiet(false) + effect(strong = 40000, weak = 20000) + assertTrue(pad.vibrating) + } + @Test fun aHeldEffectFollowsTheGamesNewStrength() { val pad = FakeMotors() rumble.controllerMotors = { pad } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionBackgroundPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionBackgroundPrefsTest.kt index 0daf6f99b..f182ddb79 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionBackgroundPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionBackgroundPrefsTest.kt @@ -5,7 +5,7 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -18,8 +18,9 @@ class SessionBackgroundPrefsTest { context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } - @Test fun nativeIsOptInAndDoesNotChangeDesktopOrExistingPolicies() { - assertEquals(SessionPrefs.SUSPEND_MANUAL, SessionPrefs.suspendPolicy(context, "steam")) + @Test fun nativeIsTheSteamDefaultWithoutChangingOtherModesOrSavedPolicies() { + assertEquals(SessionPrefs.SUSPEND_NATIVE, SessionPrefs.suspendPolicy(context, "steam")) + assertEquals(SessionPrefs.SUSPEND_MANUAL, SessionPrefs.suspendPolicy(context, SessionService.MODE_RUN)) for (policy in listOf(SessionPrefs.SUSPEND_AUTO, SessionPrefs.SUSPEND_MANUAL, SessionPrefs.SUSPEND_NEVER, SessionPrefs.SUSPEND_NATIVE)) { SessionPrefs.setSuspendPolicy(context, "steam", policy) @@ -28,6 +29,14 @@ class SessionBackgroundPrefsTest { } } + @Test fun automaticPipDefaultsOnAndHonorsSavedChoices() { + assertEquals(true, SessionPrefs.pipAutoEnter(context)) + SessionPrefs.setPipAutoEnter(context, false) + assertEquals(false, SessionPrefs.pipAutoEnter(context)) + SessionPrefs.setPipAutoEnter(context, true) + assertEquals(true, SessionPrefs.pipAutoEnter(context)) + } + @Test fun directGamesUseAutoWithoutOverwritingSteamsNativeChoice() { SessionPrefs.setSuspendPolicy(context, SessionService.MODE_STEAM, SessionPrefs.SUSPEND_NATIVE) assertEquals(SessionPrefs.SUSPEND_AUTO, SessionPrefs.suspendPolicy(context, SessionService.MODE_RUN)) 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 48d77d0b0..82512c0b9 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,25 @@ import org.junit.Assert.* import org.junit.Test class SessionDisplayTest { + private val scaledFollow = listOf("follow/1.5", "follow/2", "follow/2.5", "follow/3", "follow/4") + + @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")) @@ -23,18 +42,19 @@ class SessionDisplayTest { @Test fun optionsListTheHeightsThePanelCanShowThenThePanel() { val thor = SessionDisplay.resolutionOptions(1920 to 1080) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), thor) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, thor) + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(2400 to 1080)) - assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(3120 to 1440)) val small = SessionDisplay.resolutionOptions(1280 to 720) - assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), small) + assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, small) assertEquals(1280 to 720, SessionDisplay.resolveChoice(1280 to 720, SessionDisplay.MATCH_SCREEN)) assertEquals(2560 to 1440, SessionDisplay.resolveChoice(2560 to 1440, SessionDisplay.MATCH_SCREEN)) } @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 +87,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 +107,38 @@ class SessionDisplayTest { assertNull(SessionDisplay.followSize(640, 360)) } + @Test fun scaledFollowDividesTheWindowAndStaysEven() { + assertEquals(1260 to 540, SessionDisplay.resolveChoice(1080 to 2520, "follow/2")) + assertEquals(540 to 1260, SessionDisplay.resolveChoice(2520 to 1080, "follow/2", portrait = true)) + assertEquals(1092 to 984, SessionDisplay.followSize(2185, 1969, scale = 2f)) + assertEquals(656 to 728, SessionDisplay.followSize(1968, 2184, scale = 3f)) + assertNull(SessionDisplay.followSize(640, 360, scale = 2f)) + assertEquals(720 to 1600, SessionDisplay.resolveChoice(2400 to 1080, "follow/1.5", portrait = true)) + assertEquals(1600 to 720, SessionDisplay.resolveChoice(1080 to 2400, "follow/1.5")) + assertNull(SessionDisplay.followScale("follow/1.0")) + } + + @Test fun onlyKnownFollowChoicesCountAsFollow() { + assertEquals(1f, SessionDisplay.followScale(SessionDisplay.FOLLOW_SCREEN)) + assertEquals(3f, SessionDisplay.followScale("follow/3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.26")) + assertEquals("follow/1.3", SessionDisplay.followScaled(1.3f)) + assertEquals("follow/2", SessionDisplay.followScaled(2f)) + assertNull(SessionDisplay.followScale("follow/1")) + assertNull(SessionDisplay.followScale("follow/x")) + assertNull(SessionDisplay.followScale("follow/9")) + assertNull(SessionDisplay.followScale("720p")) + assertFalse(SessionDisplay.isFollow(SessionDisplay.MATCH_SCREEN)) + } + + @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 +160,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/SessionEndHintTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt new file mode 100644 index 000000000..9429299f3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.session + +import android.app.Application +import com.droiddeck.launcher.R +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.gpu.GpuInfo +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +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.Robolectric +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implementation +import org.robolectric.annotation.Implements +import org.robolectric.util.ReflectionHelpers +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config( + sdk = [33], application = Application::class, qualifiers = "en-rUS", + instrumentedPackages = ["com.droiddeck.launcher.gpu.GpuInfo"], + shadows = [SessionEndHintTest.DetectedGpu::class], +) +class SessionEndHintTest { + @get:Rule val temporary = TemporaryFolder() + private lateinit var activity: SessionActivity + private var previousArchitecture: String? = null + + @Before + fun setUp() { + previousArchitecture = SessionState.steamClientArch + DetectedGpu.family = GpuInfo.Family.NOT_ADRENO + activity = Robolectric.buildActivity(SessionActivity::class.java).get() + SessionState.steamClientArch = "arm64" + } + + @After + fun tearDown() { + SessionState.steamClientArch = previousArchitecture + DetectedGpu.family = GpuInfo.Family.NOT_ADRENO + } + + @Test + fun sigillOnArm64IncludesTheExperimentalX64Fallback() { + SessionState.steamClientArch = "arm64" + + assertEquals( + activity.getString(R.string.session_end_steam_sigill) + "\n" + activity.getString(R.string.session_end_steam_try_x64), + hintText(sigillLog()), + ) + } + + @Test + fun sigillOnX86_64DoesNotSuggestSwitchingToItself() { + SessionState.steamClientArch = "x86_64" + + assertEquals(activity.getString(R.string.session_end_steam_sigill), hintText(sigillLog())) + } + + @Test + fun sigillWithUnknownArchitectureDoesNotAssumeArm64() { + SessionState.steamClientArch = null + + assertEquals(activity.getString(R.string.session_end_steam_sigill), hintText(sigillLog())) + } + + @Test + fun vulkanFailureOnAdrenoSelectsTheDriverHint() { + for (family in listOf(GpuInfo.Family.A6XX, GpuInfo.Family.ADRENO_UNKNOWN)) { + DetectedGpu.family = family + + assertEquals(family.name, activity.getString(R.string.session_end_vulkan_device), hintText(vulkanLog())) + } + } + + @Test + fun vulkanFailureOnNonAdrenoExplainsTheMissingLinuxDriver() { + DetectedGpu.family = GpuInfo.Family.NOT_ADRENO + + assertEquals(activity.getString(R.string.session_end_gpu_unsupported), hintText(vulkanLog())) + } + + @Test + fun missingEmptyAndUnrelatedLogsHaveNoHint() { + assertNull(hint(null)) + assertNull(hint(File(temporary.root, "missing.log"))) + assertNull(hint(log(""))) + assertNull(hint(log("game: Illegal instruction\n== steam exited rc=132"))) + } + + private fun sigillLog() = log("== STEP 12:00:00 starting the Steam client\n== steam exited rc=132\n") + + private fun vulkanLog() = log("[gamescope] [Error] vulkan: failed to find physical device\n") + + private fun log(text: String): File = temporary.newFile().apply { writeText(text) } + + private fun hint(log: File?): Any? = SessionActivity::class.java + .getDeclaredMethod("sessionEndHint", File::class.java).apply { isAccessible = true }.invoke(activity, log) + + private fun hintText(log: File): String { + val result = hint(log) + assertNotNull(result) + return ReflectionHelpers.getField(result, "text") + } + + @Implements(value = GpuInfo.Companion::class, isInAndroidSdk = false) + class DetectedGpu { + @Implementation + fun detect(): GpuInfo = GpuInfo("test GPU", if (family == GpuInfo.Family.A6XX) 610 else 0, family, "", false) + + companion object { + var family = GpuInfo.Family.NOT_ADRENO + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLaunchFailureTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLaunchFailureTest.kt new file mode 100644 index 000000000..e36f23750 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLaunchFailureTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class SessionLaunchFailureTest { + private fun find(vararg lines: String) = SessionLaunchFailure.find(lines.asSequence()) + + @Test fun installedSteamThatExitsWithSigillHasACpuFailureHint() { + assertEquals(SessionLaunchFailure.STEAM_ILLEGAL_INSTRUCTION, find( + "== STEP 06:35:36.987 Steam client ready", + "== STEP 06:35:41.058 starting the Steam client", + "/usr/local/bin/droiddeck-session: line 309: 1192 Illegal instruction steam", + "== steam exited rc=132", + "(EE) failed to read Wayland events: Broken pipe", + )) + } + + @Test fun gamescopeWithoutAPhysicalDeviceHasAGraphicsFailureHint() { + assertEquals(SessionLaunchFailure.VULKAN_DEVICE_MISSING, find( + "[gamescope] [\u001b[0;31mError\u001b[0m] \u001b[0;37mvulkan:\u001b[0m failed to find physical device", + "SDL_Vulkan_CreateSurface failed: VK_KHR_wayland_surface extension is not enabled in the Vulkan instance.Failed to create backend.", + )) + } + + @Test fun unrelatedIllegalInstructionsAndExitCodesAreNotBlamedOnSteam() { + assertNull(find("game: Illegal instruction", "== steam exited rc=132")) + assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=139")) + assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=1320")) + assertNull(find("== STEP 12:00:00 starting the Steam client", "== steam exited rc=0")) + } + + @Test fun onlyTheLatestClientAttemptCounts() { + assertNull(find( + "== STEP 12:00:00 starting the Steam client", "== steam exited rc=132", + "== STEP 12:01:00 starting the Steam client", "== steam exited rc=0", + )) + } + + @Test fun aLaterSuccessfulDeviceSelectionClearsTheGraphicsFailure() { + assertNull(find( + "[gamescope] [Error] vulkan: failed to find physical device", + "[gamescope] [Info] vulkan: selecting physical device 'Turnip Adreno (TM) 610': queue family 0", + )) + } + + @Test fun aNewSessionDoesNotReuseAnOldFailure() { + assertNull(find( + "== STEP 12:00:00 starting the Steam client", "== steam exited rc=132", + "== droiddeck-session Fri Oct 23 12:01:00 mode=steam", + )) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt index bc1718bff..13faace59 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt @@ -1,17 +1,22 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.LogRedactor +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.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale import java.util.zip.ZipFile @RunWith(RobolectricTestRunner::class) @@ -147,6 +152,41 @@ class SessionLogShareTest { assertTrue(zip(folder).values.none { it.contains(leaked) }) } + @Test fun aDirectoryListingFailureLeavesTheTreeUnrecordedButDoesNotStopSiblingScrubbing() { + val folder = tmp.newFolder("2026-10-06-06-listing") + val unavailable = File(folder, "unavailable").apply { mkdirs() } + val unavailableLog = File(unavailable, "session.log").apply { writeText("$secret\n") } + val availableLog = File(folder, "available/session.log").apply { + parentFile!!.mkdirs() + writeText("$secret\n") + } + + assertFalse(SessionArtifacts.scrubAndMark(folder, listFiles = { + if (it == unavailable) null else it.listFiles() + })) + + assertTrue(unavailableLog.readText().contains(leaked)) + assertFalse(availableLog.readText().contains(leaked)) + assertFalse(File(folder, ".scrubbed-r${LogRedactor.RULES_VERSION}").exists()) + assertFalse(File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).exists()) + } + + @Test fun aFailedScrubStillRecordsTheCollectionEventWithoutCompletingTheFolder() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val folder = tmp.newFolder("2026-10-06-06-collect") + File(folder, "wayland.log").writeText("test compositor log\n") + File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).apply { + mkdirs() + resolve("blocker").writeText("force marker write failure\n") + } + + SessionArtifacts.collect(context, folder, "test") + + assertTrue(File(folder, "events.jsonl").readText().contains("session.artifacts_collected")) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + assertFalse(File(folder, ".scrubbed-r${LogRedactor.RULES_VERSION}").exists()) + } + @Test fun steamLogsPastTheSizeLimitStayOut() { val folder = tmp.newFolder("2026-10-06-07-steam") File(folder, "session.log").writeText("ok\n") @@ -160,4 +200,322 @@ class SessionLogShareTest { assertTrue("steam/console_log.txt" in names) assertFalse("steam/cef_log.previous.txt" in names) } + + @Test fun streamingComparisonPreservesUnchangedFileAndReplacesChangedFile() { + val folder = tmp.newFolder("2026-10-06-08-steam") + val unchanged = File(folder, "unchanged.log") + unchanged.bufferedWriter().use { out -> repeat(5000) { out.write("safe diagnostic $it\n") } } + val originalModified = 1_600_000_000_000L + assertTrue(unchanged.setLastModified(originalModified)) + val changed = File(folder, "changed.log") + changed.bufferedWriter().use { out -> + repeat(5000) { out.write("safe diagnostic $it\n") } + out.write("$secret\n") + } + + assertTrue(SessionArtifacts.scrubAndMark(folder)) + + assertEquals(originalModified, unchanged.lastModified()) + assertFalse(changed.readText().contains(leaked)) + assertTrue(changed.readText().contains("sessionid=<redacted:token>")) + } + + @Test fun historicalScrubDefersWithoutLeavingMarkersAndResumes() { + val folder = tmp.newFolder("2026-10-06-09-steam") + val log = File(folder, "session.log").apply { writeText("$secret\n") } + val rulesMarker = File(folder, ".scrubbed-r${LogRedactor.RULES_VERSION}").apply { writeText("stale\n") } + val treeMarker = File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).apply { writeText("rules ${LogRedactor.RULES_VERSION}\n") } + + SessionState.running = true + try { + assertFalse(SessionArtifacts.scrubAndMark(folder, stopWhenSessionStarts = true)) + } finally { + SessionState.running = false + } + assertFalse(rulesMarker.exists()) + assertFalse(treeMarker.exists()) + assertTrue(log.readText().contains(leaked)) + + assertTrue(SessionArtifacts.scrubAndMark(folder, stopWhenSessionStarts = true)) + assertFalse(log.readText().contains(leaked)) + assertTrue(File(folder, ".scrubbed-r${LogRedactor.RULES_VERSION}").isFile) + } + + @Test fun historicalScrubCancellationDuringStreamingPreservesTheOriginal() { + val folder = tmp.newFolder("2026-10-06-10-steam") + val original = "first safe line\n" + "x".repeat(20_000) + " $secret\n" + val log = File(folder, "session.log").apply { writeText(original) } + var checks = 0 + + assertFalse(SessionArtifacts.scrubAndMark(folder, stopWhenSessionStarts = true) { ++checks >= 4 }) + + assertEquals(original, log.readText()) + assertFalse(File(folder, ".session.log.scrub").exists()) + assertFalse(File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).exists()) + } + + @Test fun historicalScrubCancellationBeforeComparisonPreservesTheOriginal() { + val folder = tmp.newFolder("2026-10-06-11-steam") + val original = "safe diagnostic\n" + val log = File(folder, "session.log").apply { writeText(original) } + val temporary = File(folder, ".session.log.scrub") + + assertFalse(SessionArtifacts.scrubAndMark(folder, stopWhenSessionStarts = true) { temporary.length() > 0 }) + + assertEquals(original, log.readText()) + assertFalse(temporary.exists()) + assertFalse(File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).exists()) + } + + @Test fun historicalScrubDoesNotReplaceALogThatChangedBeforeCommit() { + val folder = tmp.newFolder("2026-10-06-12-steam") + val original = "sessionid=$leaked\n" + val appended = "writer finished after collection started\n" + val log = File(folder, "session.log").apply { writeText(original) } + + assertFalse(SessionArtifacts.scrubAndMark(folder, beforeReplace = { it.appendText(appended) })) + + assertEquals(original + appended, log.readText()) + assertFalse(File(folder, ".session.log.scrub").exists()) + assertFalse(File(folder, ".scrubbed-r${LogRedactor.RULES_VERSION}").exists()) + assertFalse(File(folder, SessionArtifacts.SCRUBBED_TREE_MARKER).exists()) + } + + @Test fun comparisonCancellationWinsOverAnImmediateLengthMismatch() { + val left = tmp.newFile("left.log").apply { writeText("short\n") } + val right = tmp.newFile("right.log").apply { writeText("a different length\n") } + + assertNull(SessionArtifacts.sameContents(left, right) { true }) + } + + @Test fun recoveryRetryKeepsItsSteamLogsWhenALaterSessionLeftNoFolder() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val folder = File(com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context), "2026-10-08-01-steam").apply { mkdirs() } + val saved = File(folder, "steam/console_log.txt").apply { + parentFile!!.mkdirs() + writeText("session A\n") + } + File(folder, "ended-without-teardown.txt").writeText("recovery attempted before session B\n") + val runtime = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.local/share/Steam/logs/console_log.txt").apply { + parentFile!!.mkdirs() + writeText("session B\n") + } + + SessionArtifacts.finishAbandoned(context) + + assertEquals("session A\n", saved.readText()) + assertEquals("session B\n", runtime.readText()) + assertTrue(File(folder, "ended-without-teardown.txt").readText().contains("runtime capture did not finish")) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + } + + @Test fun abandonedRecoveryDoesNotCopyLogsFromANewerCompletedSession() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val logs = com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context) + val folder = File(logs, "2026-10-08-02-steam").apply { mkdirs() } + val saved = File(folder, "steam/console_log.txt").apply { + parentFile!!.mkdirs() + writeText("session A\n") + } + File(logs, "2026-10-08-03-steam").apply { mkdirs() } + .resolve(SessionArtifacts.COMPLETE_MARKER).writeText("finished session B\n") + File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.local/share/Steam/logs/console_log.txt").apply { + parentFile!!.mkdirs() + writeText("session B\n") + } + + SessionArtifacts.finishAbandoned(context) + + assertEquals("session A\n", saved.readText()) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + } + + @Test fun startupRecoveryRunsBeforeVacMarkerArmWhileOrdinaryCleanupDefers() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) + val folder = File(com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context), "2999-12-31-99-startup-recovery") + val marker = File(root, "root/.droiddeck-vac-diagnostics") + val launches = File(root, "root/.droiddeck-vac-launches") + val runtimeSteamLog = File(SessionPrefs.steamRoot(context, "arm64"), "logs/startup-recovery-vac.log") + val sessionLog = File(folder, "session.log") + val crashLog = File(folder, "crash.log") + val previousRunning = SessionState.running + val previousPhase = SessionState.phase + try { + folder.deleteRecursively() + folder.mkdirs() + SessionArtifacts.recordClient(folder, "arm64") + sessionLog.writeText("$secret\n") + marker.apply { parentFile!!.mkdirs(); writeText("0\narm64\n") } + launches.writeText("startup VAC evidence\n") + runtimeSteamLog.apply { parentFile!!.mkdirs(); writeText("startup VAC evidence\n") } + SessionState.running = true + SessionState.phase = SessionPhase.STARTING_GUEST + + SessionArtifacts.finishAbandoned(context) + + assertFalse(File(folder, "ended-without-teardown.txt").exists()) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionArtifacts.finishAbandoned(context, beforeGuestStart = true) + + assertEquals("startup VAC evidence\n", File(folder, "steam/startup-recovery-vac.log").readText()) + assertTrue(File(folder, "vac.txt").readText().contains("startup VAC evidence")) + assertTrue(File(folder, ".recovery-runtime-captured").isFile) + assertTrue(crashLog.isFile && crashLog.length() > 0L) + assertTrue(sessionLog.readText().contains(leaked)) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + + assertFalse(sessionLog.readText().contains(leaked)) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + } finally { + SessionState.running = previousRunning + SessionState.phase = previousPhase + folder.deleteRecursively() + runtimeSteamLog.delete() + marker.delete() + launches.delete() + } + } + + @Test fun startupRecoveryExcludesCurrentFolderAndCapturesDeferredRuntime() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) + val logs = com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context) + val day = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date()) + val olderFolder = File(logs, "$day-8999-older-recovery") + val folder = File(logs, "$day-9000-deferred-recovery") + val marker = File(root, "root/.droiddeck-vac-diagnostics") + val launches = File(root, "root/.droiddeck-vac-launches") + val runtimeSteamLog = File(SessionPrefs.steamRoot(context, "arm64"), "logs/deferred-recovery-vac.log") + val previousRunning = SessionState.running + val previousPhase = SessionState.phase + val previousLogsEnabled = SessionPrefs.logsEnabled(context) + var currentFolder: File? = null + try { + olderFolder.deleteRecursively() + olderFolder.mkdirs() + folder.deleteRecursively() + folder.mkdirs() + SessionArtifacts.recordClient(folder, "arm64") + File(folder, "ended-without-teardown.txt").writeText("recovery began before session start\n") + marker.apply { parentFile!!.mkdirs(); writeText("0\narm64\n") } + launches.writeText("deferred VAC evidence\n") + runtimeSteamLog.apply { parentFile!!.mkdirs(); writeText("deferred VAC evidence\n") } + SessionState.running = true + SessionState.phase = SessionPhase.STARTING_GUEST + SessionPrefs.setLogsEnabled(context, true) + currentFolder = SessionPaths.beginOrCurrent(context, "current-session") + + SessionArtifacts.finishAbandoned(context, beforeGuestStart = true) + + assertEquals("deferred VAC evidence\n", File(folder, "steam/deferred-recovery-vac.log").readText()) + assertTrue(File(folder, "vac.txt").readText().contains("deferred VAC evidence")) + assertTrue(File(folder, ".recovery-runtime-captured").isFile) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + assertFalse(File(olderFolder, "ended-without-teardown.txt").exists()) + assertFalse(File(olderFolder, SessionArtifacts.COMPLETE_MARKER).exists()) + assertFalse(File(currentFolder, "ended-without-teardown.txt").exists()) + assertFalse(File(currentFolder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + assertTrue(File(olderFolder, SessionArtifacts.COMPLETE_MARKER).isFile) + assertFalse(File(currentFolder, SessionArtifacts.COMPLETE_MARKER).exists()) + } finally { + SessionState.running = previousRunning + SessionState.phase = previousPhase + SessionPaths.take()?.let { SessionPaths.release(context, it) } + currentFolder?.deleteRecursively() + SessionPrefs.setLogsEnabled(context, previousLogsEnabled) + olderFolder.deleteRecursively() + folder.deleteRecursively() + runtimeSteamLog.delete() + marker.delete() + launches.delete() + } + } + + @Test fun failedPreGuestRuntimeCaptureWritesNeitherCaptureNorCompleteMarker() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) + val folder = File(com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context), "9999-12-31-01-vac-failure") + val marker = File(root, "root/.droiddeck-vac-diagnostics") + val launches = File(root, "root/.droiddeck-vac-launches") + val runtimeSteamLog = File(SessionPrefs.steamRoot(context, "arm64"), "logs/expired-recovery.log") + val crashLog = File(folder, "crash.log") + val previousRunning = SessionState.running + try { + folder.deleteRecursively() + folder.mkdirs() + SessionArtifacts.recordClient(folder, "arm64") + File(folder, "ended-without-teardown.txt").writeText("recovery began before session start\n") + val firstCrashSnapshot = "first crash snapshot\n".toByteArray() + crashLog.writeBytes(firstCrashSnapshot) + File(folder, "vac.txt").mkdirs() + marker.apply { parentFile!!.mkdirs(); writeText("0\narm64\n") } + launches.writeText("VAC evidence that cannot be reported\n") + runtimeSteamLog.apply { parentFile!!.mkdirs(); writeText("session A\n") } + SessionState.running = true + + SessionArtifacts.finishAbandoned(context, beforeGuestStart = true) + + assertFalse(File(folder, ".recovery-runtime-captured").exists()) + assertTrue(File(folder, ".recovery-runtime-expired").isFile) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + assertArrayEquals(firstCrashSnapshot, crashLog.readBytes()) + + File(folder, "vac.txt").deleteRecursively() + runtimeSteamLog.writeText("session B\n") + SessionArtifacts.finishAbandoned(context, beforeGuestStart = true) + + assertEquals("session A\n", File(folder, "steam/expired-recovery.log").readText()) + assertArrayEquals(firstCrashSnapshot, crashLog.readBytes()) + assertTrue(File(folder, "ended-without-teardown.txt").readText().contains("runtime capture did not finish")) + assertFalse(File(folder, SessionArtifacts.COMPLETE_MARKER).exists()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + + assertArrayEquals(firstCrashSnapshot, crashLog.readBytes()) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + } finally { + SessionState.running = previousRunning + folder.deleteRecursively() + runtimeSteamLog.delete() + marker.delete() + launches.delete() + } + } + + @Test fun emptyCrashSnapshotIsPreservedAcrossRecovery() { + val context: android.content.Context = RuntimeEnvironment.getApplication() + val folder = File(com.droiddeck.launcher.runtime.LinuxRuntime.logDir(context), "9999-12-31-02-empty-crash") + val crashLog = File(folder, "crash.log") + val previousRunning = SessionState.running + try { + folder.deleteRecursively() + folder.mkdirs() + crashLog.writeBytes(ByteArray(0)) + SessionState.running = true + + SessionArtifacts.finishAbandoned(context, beforeGuestStart = true) + assertTrue(crashLog.isFile) + assertEquals(0L, crashLog.length()) + + SessionState.running = false + SessionArtifacts.finishAbandoned(context) + assertTrue(crashLog.isFile) + assertEquals(0L, crashLog.length()) + assertTrue(File(folder, SessionArtifacts.COMPLETE_MARKER).isFile) + } finally { + SessionState.running = previousRunning + folder.deleteRecursively() + } + } } 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 95893adde..43be1b29d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import java.nio.charset.StandardCharsets import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -11,7 +12,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -20,6 +21,47 @@ import org.robolectric.annotation.Config class SessionLogShareZipTest { private val app get() = RuntimeEnvironment.getApplication() + @Test fun aLargeSteamLogIsRedactedInTheSharedArchive() { + val session = File(LinuxRuntime.logDir(app), "2026-10-08-02-steam").apply { mkdirs() } + val raw = File(session, "steam-42.log") + val earlySecret = "early-sessionid-abcdef123456" + val trailingSecret = "late-refresh-token-abcdef123456" + try { + raw.bufferedWriter().use { out -> + out.write("sessionid=$earlySecret") + val chunk = "x".repeat(8192) + repeat(8192) { out.write(chunk) } + out.write("\nrefresh_token=$trailingSecret\n") + } + assertTrue(raw.length() > 64L * 1024 * 1024) + + val zip = SessionLogShare.zipFolder(app, session)!! + ZipFile(zip).use { archive -> + val entry = archive.getEntry("${session.name}/steam-42.log")!! + archive.getInputStream(entry).use { input -> + val expected = "${com.droiddeck.launcher.core.LogRedactor.OVERSIZED_LINE}\n" + val prefix = ByteArray(expected.toByteArray(StandardCharsets.UTF_8).size) + var offset = 0 + while (offset < prefix.size) { + val count = input.read(prefix, offset, prefix.size - offset) + assertTrue("zip entry ended before its scrubbed prefix", count > 0) + offset += count + } + assertEquals(expected, String(prefix, StandardCharsets.UTF_8)) + input.bufferedReader().use { reader -> + val trailing = requireNotNull(reader.readLine()) + assertFalse("trailing secret survived", trailing.contains(trailingSecret)) + assertEquals("refresh_token=<redacted:token>", trailing) + assertEquals(null, reader.readLine()) + } + } + } + } finally { + SessionLogShare.clear(app) + session.deleteRecursively() + } + } + @Test fun everyTextFileInTheZipIsScrubbedAndTheStoresAndToolsLogsComeAlong() { val logs = LinuxRuntime.logDir(app) val session = File(logs, "2026-10-08-01-steam").apply { mkdirs() } @@ -30,7 +72,6 @@ class SessionLogShareZipTest { "Authorization: Bearer abc.def.ghi\n" + "kept: EResult 5, app 1086940, steamapps/common/Game\n" ) - // StoreLogFiles.prune, started by App.onCreate, deletes a stores log named for a day over a week old. val storesLog = "stores-" + SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date()) + ".log" File(logs, "stores").apply { mkdirs() }.resolve(storesLog).writeText("epic: f_token=zzzzzzzz12 window 32\n") File(logs, SessionPaths.TOOLS_DIR).apply { mkdirs() }.resolve("flatpak-install.log").writeText("== install\nCookie: steamLoginSecure=76561198000000000%7C%7Ceyabc\n") @@ -50,6 +91,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 03a324391..a81d2c7d4 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt @@ -6,13 +6,23 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment 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/SessionSleepRequestTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSleepRequestTest.kt index b136d5fd0..c47c00372 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSleepRequestTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSleepRequestTest.kt @@ -10,7 +10,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode 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 000000000..3b996ae3d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt @@ -0,0 +1,98 @@ +package com.droiddeck.launcher.session + +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 +import java.io.File +import java.io.IOException +import java.io.Writer + +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")) + } + + @Test fun aCopyFailurePreservesThePreviousSnapshotAndRemovesPartialStaging() { + val logs = tmp.newFolder("logs") + val session = tmp.newFolder("session") + val out = tmp.newFolder("out") + File(logs, "console_log.txt").writeText("new complete line\n") + val snapshot = File(out, "console_log.txt").apply { writeText("previous valid snapshot\n") } + lateinit var staging: File + + val copied = SessionArtifacts.copySessionLogs(logs, session, out) { target -> + staging = target + val delegate = target.bufferedWriter() + object : Writer() { + private var failed = false + + override fun write(buffer: CharArray, offset: Int, length: Int) { + if (!failed) { + delegate.write(buffer, offset, minOf(length, 4)) + delegate.flush() + failed = true + } + throw IOException("injected writer failure") + } + + override fun flush() = delegate.flush() + override fun close() = delegate.close() + } + } + + assertTrue(copied.isEmpty()) + assertEquals("previous valid snapshot\n", snapshot.readText()) + assertFalse(staging.exists()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 02b38143e..230eb1f12 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.session import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder import java.util.concurrent.AbstractExecutorService import java.util.concurrent.RejectedExecutionException import java.util.concurrent.TimeUnit @@ -86,6 +88,105 @@ class SessionSuspendControllerTest { assertTrue(disabled.pagedOut.isEmpty()) } + @Test fun resumeReadsThePagedOutMemoryBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + val resumed = fixture.signals.drop(before) + assertEquals(listOf(GAME), resumed.filter { it.signal == URG }.map { it.pid }) + assertTrue(resumed.indexOfLast { it.signal == CONT } < resumed.indexOfFirst { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + assertTrue(fixture.game.threads.all { it.state == 'S' }) + val again = fixture.signals.size + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(again).any { it.signal == URG }) + assertEquals(1, fixture.pagedIn.size) + } + + @Test fun noReadBackAfterAFreezeWithoutPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.any { it.signal == URG }) + assertTrue(fixture.pagedIn.isEmpty()) + } + + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 3_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackNeedsTwiceTheSwapAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 5_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackKeepsATenthOfMemTotalAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.totalKb = 40_000_000L + fixture.availableKb = 6_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun noReadBackWithARamCap() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.readBackAllowed = false + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { if (fixture.now >= 200 && fixture.signals.none { it.signal == STOP }) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertFalse(fixture.signals.any { it.signal == STOP }) + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(1, fixture.pagedIn.single().first) + assertEquals(0L, fixture.pagedIn.single().second) + assertTrue(fixture.pagedIn.single().third > 0L) + } + + @Test fun cancelledFreezeLeavesAPendingPageOutHandlerReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) + } + @Test fun cpuMustBeStableAcrossTwoCompleteSnapshots() { val fixture = fixture(17) var changes = 0 @@ -168,6 +269,40 @@ class SessionSuspendControllerTest { assertFalse(fixture.signals.drop(before).any { it.pid == helper.pid }) } + @Test fun frozenTimeIsAddedToTheGuestClockBeforeItContinues() { + val fixture = fixture(17) + fixture.clock.writeBytes(shift(5_000_000L)) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 90_000L + fixture.controller.resume { assertTrue(it) } + val expected = 5_000_000L + 90_000L * 1_000_000L + assertEquals(expected, fixture.clockAtContinue) + assertEquals(expected, shift(fixture.clock)) + fixture.controller.resume { assertTrue(it) } + assertEquals(expected, shift(fixture.clock)) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 1_000L + fixture.controller.closeAndResume {} + assertEquals(expected + 1_000L * 1_000_000L, shift(fixture.clock)) + } + + @Test fun rolledBackFreezeLeavesTheGuestClockAlone() { + val fixture = fixture(17) + fixture.clock.writeBytes(shift(0L)) + fixture.neverStop = true + fixture.controller.freeze { assertFalse(it) } + fixture.controller.resume { } + assertEquals(0L, shift(fixture.clock)) + } + + @Test fun missingClockFileIsNotCreated() { + val fixture = fixture(17) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 5_000L + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.clock.exists()) + } + @Test fun timeoutRollsBackAllKnownProcessesAndAudio() { val fixture = fixture(17) fixture.neverStop = true @@ -312,6 +447,10 @@ class SessionSuspendControllerTest { assertEquals(0, fixture.audioSuspends) } + private fun shift(value: Long) = ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(value).array() + + private fun shift(file: File) = ByteBuffer.wrap(file.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long + private fun fixture(count: Int, executor: QueueExecutor = InlineExecutor()) = Fixture(temporary.newFolder(), temporary.newFolder(), count, executor) @@ -337,10 +476,17 @@ class SessionSuspendControllerTest { var rootGone = false var afterSleep: (() -> Unit)? = null val control = File(tmp, ".bl-zram") + val clock = File(tmp, ".bl-clock") + var clockAtContinue: Long? = null val pagedOut = mutableListOf<Triple<Int, Long, Long>>() + val pagedIn = mutableListOf<Triple<Int, Long, Long>>() + var availableKb = 8_000_000L + var totalKb = 16_000_000L + var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false + private var pagingIn = false var unacknowledged = -1 var handlerStalls = false var handlerReplaced = false @@ -349,10 +495,14 @@ class SessionSuspendControllerTest { { rootPid }, { helpers }, { audioSuspends++ }, { audioResumes++ }, proc, ::signal, ::threadSignal, ::sleep, { now }, executor, zramControl = control, + clockControl = clock, + nowNanos = { now * 1_000_000L }, pagedOut = { processes, unacknowledged, resident, swap, _, _ -> pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, + readBackAllowed = { readBackAllowed }, + pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) init { sync() } @@ -367,8 +517,11 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - pagingOut = true + if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { + if (clockAtContinue == null && clock.isFile) { + clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long + } continuing = true if (!(pid == GAME && blockGameContinue)) group.threads.forEach { if (it.state != 'Z') it.state = 'S' } } @@ -398,6 +551,12 @@ class SessionSuspendControllerTest { pagingOut = false } } + if (pagingIn) { + val moved = minOf(gameSwapKb, 1_000_000L) + gameSwapKb -= moved + gameResidentKb += moved + if (gameSwapKb == 0L) pagingIn = false + } if (root.threads.first().state != 'T' && !continuing) game.threads.forEach { if (it.state != 'Z') { it.state = 'S'; it.cpu++ } } @@ -406,6 +565,7 @@ class SessionSuspendControllerTest { } fun sync() { + File(proc, "meminfo").writeText("MemTotal:\t$totalKb kB\nMemFree:\t1000 kB\nMemAvailable:\t$availableKb kB\n") for (group in groups) { val dir = File(proc, group.pid.toString()) if (group == root && rootGone) { dir.deleteRecursively(); continue } 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 e73905cbe..327d4a22e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -27,17 +27,21 @@ 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") + assertTrue(SessionPrefs.setGameDebugLogsEnabled(app, true)) SessionPrefs.setHudShowFps(app, false) SessionPrefs.setHudShowBattery(app, false) SessionPrefs.setHudShowGraph(app, false) SessionPrefs.setHudColor(app, "amber") SessionPrefs.setHudOpacity(app, 40) + SessionPrefs.setDroidDeckHudConfig(app, "hudSize=mega,showFPSGraph=0") + SessionPrefs.setDroidDeckHudPosition(app, 120f, 40f) ControllerPrefs.setOpacity(app, 40) AppUiPrefs.setScale(app, 150) FrameGen.set(app, FrameGen.Mode(FrameGen.ENGINE_DDFG, 3)) @@ -46,25 +50,46 @@ 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)) + assertFalse(SessionPrefs.gameDebugLogsEnabled(app)) + val guest = java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), + "root/.config/droiddeck/game-environment.json") + assertFalse(org.json.JSONObject(guest.readText()).getBoolean(GameEnvironmentStore.GAME_DEBUG_LOGS)) assertTrue(SessionPrefs.hudShowFps(app)) assertTrue(SessionPrefs.hudShowBattery(app)) assertTrue(SessionPrefs.hudShowGraph(app)) assertEquals(SessionPrefs.HUD_COLOR_MINT, SessionPrefs.hudColor(app)) assertEquals(SessionPrefs.HUD_OPACITY_DEFAULT, SessionPrefs.hudOpacity(app)) - assertEquals("32.4°C", PerfHud.batteryCelsius(324)) - assertNull(PerfHud.batteryCelsius(0)) + assertNull(SessionPrefs.droidDeckHudConfig(app)) + assertNull(SessionPrefs.droidDeckHudPosition(app)) assertEquals(100, ControllerPrefs.read(app).opacity) assertEquals(AppUiPrefs.DEFAULT_SCALE, AppUiPrefs.scale(app)) assertEquals(FrameGen.Mode.OFF.engine, FrameGen.engine(app)) assertFalse(prefs("steam_touch").contains("gyro")) } + @Test fun aFailedDebugOptOutDoesNotHideTheEnabledPreference() { + assertTrue(SessionPrefs.setGameDebugLogsEnabled(app, true)) + val directory = java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), + "root/.config/droiddeck") + directory.deleteRecursively() + directory.writeText("blocks configuration publication") + try { + assertFalse(SettingsReset.resetAll(app, gameProfiles = false)) + assertTrue(SessionPrefs.gameDebugLogsEnabled(app)) + } finally { + directory.delete() + directory.mkdirs() + GameEnvironmentStore.publish(app) + } + } + @Test fun libraryAndRecordsAreKept() { val folder = "/storage/emulated/0/Games/Foo" SessionPrefs.setAddedGameName(app, folder, "Foo") diff --git a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt new file mode 100644 index 000000000..f355ef9da --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ShaderPrecachePrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).deleteRecursively() + } + + @Test fun clientWithoutConfigStartsWithPrecachingOff() { + assertEquals(false, SessionPrefs.pendingShaderPrecache(context)) + assertEquals(false, SessionPrefs.shaderPrecache(context)) + } + + @Test fun existingConfigKeepsTheClientsChoice() { + val config = SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).resolve("config/config.vdf") + config.parentFile!!.mkdirs() + config.writeText("\"InstallConfigStore\" {}") + assertNull(SessionPrefs.pendingShaderPrecache(context)) + assertEquals(true, SessionPrefs.shaderPrecache(context)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/StartupMovieConfigTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StartupMovieConfigTest.kt index c14fc0231..f8f046746 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/StartupMovieConfigTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/StartupMovieConfigTest.kt @@ -8,7 +8,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt new file mode 100644 index 000000000..636e7e439 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class StatsLayoutTest { + @Test fun unknownIdsFallBackToTheDefaults() { + assertEquals(StatsStrip.PANEL, StatsStrip.from(null)) + assertEquals(StatsStrip.RINGS, StatsStrip.from("rings")) + assertEquals(StatsDash.AUTO, StatsDash.from("gone")) + assertEquals(StatsDash.TRACE, StatsDash.from("trace")) + } + + @Test fun tappingTheStripCyclesThroughEveryStyle() { + assertEquals(StatsStrip.TILES, StatsStrip.PANEL.next()) + assertEquals(StatsStrip.RINGS, StatsStrip.TILES.next()) + assertEquals(StatsStrip.PANEL, StatsStrip.RINGS.next()) + } + + @Test fun autoPicksTheDashByTheGamesFormat() { + assertEquals(StatsDash.SPEEDOMETER, StatsDash.AUTO.resolve("Codemasters")) + assertEquals(StatsDash.CIRCUIT, StatsDash.AUTO.resolve("Forza")) + assertEquals(StatsDash.DIALS, StatsDash.AUTO.resolve("OutGauge")) + assertEquals(StatsDash.TRACE, StatsDash.TRACE.resolve("Forza")) + } + + @Test fun tappingTheDashMovesOnFromTheOneOnScreen() { + assertEquals(StatsDash.CIRCUIT, StatsDash.tapped(StatsDash.SPEEDOMETER)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.GLANCE)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.AUTO)) + } + + @Test fun automaticSpeedUnitsFollowTheRegion() { + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("gb")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("DE")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("")) + assertEquals(SpeedUnit.KMH, SpeedUnit.KMH.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.MPH.resolve("DE")) + } + + @Test fun speedUnitsCycleAndConvert() { + assertEquals(SpeedUnit.AUTO, SpeedUnit.from(null)) + assertEquals(SpeedUnit.MPH, SpeedUnit.from("mph")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.next()) + assertEquals(SpeedUnit.MPH, SpeedUnit.KMH.next()) + assertEquals(SpeedUnit.AUTO, SpeedUnit.MPH.next()) + assertEquals(62.1f, 100f * SpeedUnit.MPH.perKmh, 0.05f) + assertEquals(100f, 100f * SpeedUnit.KMH.perKmh, 0f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDeckRepoTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDeckRepoTest.kt index 4458985f8..fd95ffb18 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDeckRepoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDeckRepoTest.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.session import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 e60c6dcd9..52920aefc 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/SteamDownloadsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt new file mode 100644 index 000000000..ff6e7a4ae --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SteamDownloadsTest { + private fun manifest(flags: Long, done: Long, total: Long) = """ + "AppState" + { + "appid" "220" + "name" "Half-Life 2" + "StateFlags" "$flags" + "BytesToDownload" "$total" + "BytesDownloaded" "$done" + } + """.trimIndent() + + @Test fun anAppUnfinishedInBothSteamHomesIsListedOnce() { + val arm = SteamDownload("220", "Half-Life 2", 10L, 100L) + val x86 = SteamDownload("220", "Half-Life 2", 60L, 100L) + val other = SteamDownload("440", "Team Fortress 2", 5L, 50L) + assertEquals(listOf(x86, other), SteamDownloads.onePerApp(listOf(arm, x86, other))) + } + + @Test fun anInstalledGameIsNotADownload() { + assertNull(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(4, 100, 100))) + } + + @Test fun aRunningUpdateShowsItsBytes() { + val d = SteamDownloads.fromManifest("220", "Half-Life 2", manifest(1026, 40, 100))!! + assertEquals(40L, d.done) + assertEquals(100L, d.total) + } + + @Test fun aPausedUpdateSaysSo() { + assertTrue(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(514, 40, 100))!!.paused) + } + + @Test fun anUpdateNotSizedYetIsStillListed() { + assertEquals(0L, SteamDownloads.fromManifest("220", "Half-Life 2", manifest(6, 0, 0))!!.total) + } + + @Test fun onlyShaderUpdatesStillRunningCount() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,Downloading,", + "[2026-10-30 06:33:02] AppID 440 Shader update changed : Running Update,", + "[2026-10-30 06:33:03] AppID 440 Shader update changed : None", + "[2026-10-30 06:33:03] AppID 570 App update changed : Running Update,", + ) + assertEquals(listOf("220"), SteamDownloads.runningShaderUpdates(log)) + } + + @Test fun aClientRestartForgetsOlderShaderUpdates() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,", + "[2026-10-30 07:00:00] Client version: 1761000000", + ) + assertEquals(emptyList<String>(), SteamDownloads.runningShaderUpdates(log)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt new file mode 100644 index 000000000..7a1723b95 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SteamGameProcessTest { + @get:Rule val tmp = TemporaryFolder() + + private fun cmdline(vararg args: String) = args.joinToString("\u0000", postfix = "\u0000").toByteArray() + + @Test fun theSessionsOwnSearchesAreNotAGame() { + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-a", "-f", "SteamLaunch AppId=[0-9]"))) + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-f", "reaper SteamLaunch"))) + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-f", "reaper SteamLaunch AppId=976310( |$)"))) + assertFalse(SteamGameProcess.matches(cmdline("sh", "-c", "pgrep -f 'proton waitforexitandrun'"))) + assertFalse(SteamGameProcess.matches(cmdline("/usr/bin/steam", "steam://rungameid/976310"))) + } + + @Test fun steamsReaperAndProtonAreAGame() { + assertTrue(SteamGameProcess.matches(cmdline("/root/.local/share/Steam/steamrtarm64/reaper", "SteamLaunch", "AppId=976310", "--", + "/root/.local/share/Steam/compatibilitytools.d/droiddeck-proton-arm64/proton", "waitforexitandrun", "MK11.exe"))) + assertTrue(SteamGameProcess.matches(cmdline("python3", "/proton", "waitforexitandrun", "game.exe"))) + } + + @Test fun runningLooksAtEveryProcess() { + val proc = tmp.newFolder("proc") + fun process(pid: String, vararg args: String) = File(proc, pid).apply { mkdirs() }.resolve("cmdline").writeBytes(cmdline(*args)) + process("100", "pgrep", "-a", "-f", "SteamLaunch AppId=[0-9]") + process("self", "reaper", "SteamLaunch", "AppId=1") + assertFalse(SteamGameProcess.running(proc)) + process("200", "reaper", "SteamLaunch", "AppId=976310", "--", "proton", "waitforexitandrun", "MK11.exe") + assertTrue(SteamGameProcess.running(proc)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt new file mode 100644 index 000000000..05fc9c2a6 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SteamIdleSleepTest { + @get:Rule val temp = TemporaryFolder() + + private val keys = listOf( + "IdleSuspendBatterySeconds", "IdleSuspendACSeconds", + ) + + private fun home(vararg steamBody: String): File = temp.newFolder().also { + File(it, "config").mkdirs() + File(it, "config/config.vdf").writeText( + "\"InstallConfigStore\"\n{\n\t\"Software\"\n\t{\n\t\t\"Valve\"\n\t\t{\n\t\t\t\"Steam\"\n\t\t\t{\n" + + steamBody.joinToString("") + "\t\t\t}\n\t\t}\n\t}\n}\n", + ) + } + + private fun text(home: File) = File(home, "config/config.vdf").readText() + private fun value(text: String, key: String) = Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + + @Test fun freshClientGetsBothSleepTimersDisabled() { + val home = home() + assertTrue(SessionFiles.disableIdleSleep(home)) + keys.forEach { assertEquals(it, "0", value(text(home), it)) } + } + + @Test fun existingSleepTimersAreReplacedBesideTheOtherSettings() { + val home = home( + "\t\t\t\t\"system\"\n\t\t\t\t{\n\t\t\t\t\t\"IdleSuspendACSeconds\"\t\t\"900\"\n" + + "\t\t\t\t\t\"IdleScreensaverACSeconds\"\t\t\"300\"\n\t\t\t\t\t\"IdleBacklightDimBatterySeconds\"\t\t\"120\"\n\t\t\t\t}\n", + ) + assertTrue(SessionFiles.disableIdleSleep(home)) + keys.forEach { assertEquals(it, "0", value(text(home), it)) } + assertEquals("300", value(text(home), "IdleScreensaverACSeconds")) + assertEquals("120", value(text(home), "IdleBacklightDimBatterySeconds")) + } + + @Test fun aChoiceMadeInSteamIsResetAtTheNextSession() { + val home = home() + SessionFiles.disableIdleSleep(home) + File(home, "config/config.vdf").writeText(text(home).replace("\"IdleSuspendACSeconds\"\t\t\"0\"", "\"IdleSuspendACSeconds\"\t\t\"600\"")) + assertTrue(SessionFiles.disableIdleSleep(home)) + assertEquals("0", value(text(home), "IdleSuspendACSeconds")) + } + + @Test fun clientWithoutAConfigIsRetriedNextSession() { + val home = temp.newFolder() + assertFalse(SessionFiles.disableIdleSleep(home)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt new file mode 100644 index 000000000..5cde78ca3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher.session + +import android.app.Application +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class) +class SteamImportPromptTest { + @get:Rule val temp = TemporaryFolder() + + private fun ask(root: File, text: String) = File(root, "root/.cache/droiddeck").apply { mkdirs() }.resolve("steam-import.json").writeText(text) + + @Test fun aRequestFromTheGuestIsRead() { + val root = temp.newFolder() + ask(root, """{"token":"7","games":["Absolum","","Hades"]}""") + assertEquals(SteamImportPrompt.Ask("7", listOf("Absolum", "Hades")), SteamImportPrompt.read(root)) + } + + @Test fun noRequestOrABrokenOneIsIgnored() { + val root = temp.newFolder() + assertNull(SteamImportPrompt.read(root)) + ask(root, "{") + assertNull(SteamImportPrompt.read(root)) + ask(root, """{"games":["Hades"]}""") + assertNull(SteamImportPrompt.read(root)) + } + + @Test fun theAnswerCarriesTheTokenAndTheChoice() { + val root = temp.newFolder() + for ((now, choice) in listOf(true to "now", false to "later")) { + SteamImportPrompt.answer(root, "9", now) + val json = JSONObject(File(root, "root/.cache/droiddeck/steam-import.answer").readText()) + assertEquals("9", json.getString("token")) + assertEquals(choice, json.getString("choice")) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt new file mode 100644 index 000000000..6f4e0a3cf --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.frontend.Library +import java.io.File +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamLibrariesTest { + private val app get() = RuntimeEnvironment.getApplication() + @get:Rule val tmp = TemporaryFolder() + + private fun added(path: String, label: String = File(path).name): SteamLibraries.Entry = + (SteamLibraries.add(app, path, label) as SteamLibraries.AddResult.Added).entry + + @Test fun addedLibrariesGetStableMountsThatSurviveRenameAndRemoval() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val docs = added(tmp.newFolder("Documents").path, "Docs") + val usb = added(tmp.newFolder("USB").path) + assertEquals(listOf("/mnt/droiddeck-lib/1", "/mnt/droiddeck-lib/2"), SteamLibraries.list(app).map { it.guest }) + assertTrue(File(docs.path, "steamapps").isDirectory) + + SteamLibraries.rename(app, docs.id, "My \"Docs\"") + assertEquals("My Docs", SteamLibraries.list(app).first().label) + assertEquals("/mnt/droiddeck-lib/1", SteamLibraries.list(app).first().guest) + + SteamLibraries.remove(app, docs.id) + assertEquals(listOf(usb.id), SteamLibraries.list(app).map { it.id }) + assertTrue(File(docs.path, "steamapps").isDirectory) + assertEquals("3", added(tmp.newFolder("Again").path).id) + } + + @Test fun overlappingFoldersAndAFifthLibraryAreRefused() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val games = tmp.newFolder("Games") + added(games.path) + assertTrue(SteamLibraries.add(app, games.path) is SteamLibraries.AddResult.Refused) + assertTrue(SteamLibraries.add(app, File(games, "inner").apply { mkdirs() }.path) is SteamLibraries.AddResult.Refused) + repeat(SteamLibraries.MAX - 1) { added(tmp.newFolder("L$it").path) } + assertTrue(SteamLibraries.add(app, tmp.newFolder("Full").path) is SteamLibraries.AddResult.Refused) + } + + @Test fun addedLibrariesAreListedMappedAndKeepGamesFoldersFromDoubling() { + val pc = tmp.newFolder("PC") + File(pc, "steamapps").mkdirs() + File(pc, "steamapps/appmanifest_220.acf").writeText("x") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + val lib = added(pc.path, "PC") + assertTrue(GameStorage.gamesFolderLibraries(app).isEmpty()) + assertEquals(1, Library.steamLibraries(app, "arm64").count { it.first == pc }) + assertTrue(Library.steamLibraries(app, "x86_64").any { it.first == File(pc, GameStorage.X64_CARD_DIR) }) + assertEquals(File(pc, "steamapps/common"), AddedGames.hostPath(app, "${lib.guest}/steamapps/common")) + val docs = added(tmp.newFolder("Documents").path) + assertEquals("${docs.guest}/steamapps", AddedGames.guestPath(app, File(docs.path, "steamapps"))) + val nested = File(pc, "Other").apply { mkdirs() } + SteamLibraries.remove(app, lib.id) + assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) + } + + @Test fun unreadableOrInvalidEntriesAreDropped() { + assertTrue(SteamLibraries.parse("{oops").isEmpty()) + assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) + assertEquals("b", SteamLibraries.parse("""[{"id":"2","path":"/b","label":""}]""").single().label) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamRepairTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamRepairTest.kt index edffce8fa..08ab10d9a 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamRepairTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamRepairTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt new file mode 100644 index 000000000..0b8fadada --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class SteamWebLoginTest { + private fun hex(s: String) = ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } + + @Test fun chromiumV10ValuesDecrypt() { + val encrypted = hex("7631300b9cf0a6eee9cf1aaac601b85ca37cf9fe9e67078564f0e05835ae2aa3d9b0ab") + assertEquals("0123456789abcdef01234567", SteamWebLogin.decrypt(encrypted, hostHashed = false)) + } + + @Test fun newerStoresDropTheHostHash() { + val encrypted = hex("7631304d4114329f1e692e807b8b044d67460f5e14d92ffb48b9f83be318ebd0d84c727674aea32f351b8a33c8aa42553dfeb5") + assertEquals("hello", SteamWebLogin.decrypt(encrypted, hostHashed = true)) + } + + @Test fun otherFormatsAreSkipped() { + assertNull(SteamWebLogin.decrypt("v11garbage".toByteArray(), hostHashed = false)) + assertNull(SteamWebLogin.decrypt(ByteArray(2), hostHashed = false)) + } + + @Test fun theSignInIsSentTheWaySteamPagesSendIt() { + assertEquals("steamLoginSecure=76561190000000000%7C%7Ca.b.c; Path=/; Secure; HttpOnly", + SteamWebLogin.header("steamLoginSecure", "76561190000000000||a.b.c", httpOnly = true)) + assertEquals("sessionid=0123; Path=/; Secure", SteamWebLogin.header("sessionid", "0123", httpOnly = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt index 844931bbb..ebf2b7eb2 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SyncBackendTest.kt @@ -6,16 +6,40 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class SyncBackendTest { private val context: Context = RuntimeEnvironment.getApplication() @Test - fun aFreshInstallStartsOnEsync() { - assertEquals(SessionPrefs.SYNC_ESYNC, SessionPrefs.syncBackend(context)) + fun aFreshInstallStartsOnNtsync() { + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) assertEquals(false, SessionPrefs.fsyncFirst(context)) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) + } + + @Test + fun anEarlierChoiceMovesToNtsyncOnce() { + for (earlier in listOf(SessionPrefs.SYNC_ESYNC, SessionPrefs.SYNC_FSYNC, SessionPrefs.SYNC_WINESERVER)) { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + SessionPrefs.setSyncBackend(context, earlier) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_NTSYNC, SessionPrefs.syncBackend(context)) + } + } + + @Test + fun aChoiceMadeAfterTheMoveIsKept() { + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_ESYNC) + SessionPrefs.applyNtsyncDefault(context) + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_ESYNC) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_ESYNC, SessionPrefs.syncBackend(context)) + SessionPrefs.setSyncBackend(context, SessionPrefs.SYNC_WINESERVER) + SessionPrefs.applyNtsyncDefault(context) + assertEquals(SessionPrefs.SYNC_WINESERVER, SessionPrefs.syncBackend(context)) } @Test @@ -34,6 +58,7 @@ class SyncBackendTest { @Test fun pickingATabTurnsSyncBackOn() { + SessionPrefs.setFastSync(context, false) SessionPrefs.setSyncFallback(context, false) SessionPrefs.setFsyncFirst(context, false) assertEquals(SessionPrefs.SYNC_WINESERVER, SessionPrefs.syncBackend(context)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt new file mode 100644 index 000000000..248b4a179 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class TelemetryOutputTest { + @get:Rule val tmp = TemporaryFolder() + + private val showdown = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<hardware_settings_config>\n" + + "\t<audio mono=\"false\" />\n\t<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" delay=\"1\" extradata=\"0\" />\n" + + "</hardware_settings_config>\n" + + @Test fun turningOnPointsTheMotionLineHereAndKeepsTheRest() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertTrue(on.contains("<motion enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" extradata=\"3\" />")) + assertEquals(showdown.replace("ip=\"dbox\"", "ip=\"127.0.0.1\"").replace("extradata=\"0\"", "extradata=\"3\""), on) + assertTrue(TelemetryOutput.pointsHere(TelemetryOutput.element(on)!!.value)) + assertFalse(TelemetryOutput.pointsHere(TelemetryOutput.element(showdown)!!.value)) + } + + @Test fun theUdpLineWinsOverTheMotionLineAndLongerTagsAreIgnored() { + val xml = "<x><motion_platform><dbox enabled=\"true\" /></motion_platform>" + + "<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" />" + + "<udp enabled=\"false\" extradata=\"0\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" /></x>" + assertTrue(TelemetryOutput.element(xml)!!.value.startsWith("<udp ")) + val on = TelemetryOutput.turnedOn(xml)!! + assertTrue(on.contains("<udp enabled=\"true\" extradata=\"3\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" />")) + assertTrue(on.contains("<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" />")) + assertNull(TelemetryOutput.element("<x><motion_platform enabled=\"true\" /></x>")) + } + + @Test fun turningOffPutsTheOriginalLineBackOrSwitchesItOff() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertEquals(showdown, TelemetryOutput.turnedOff(on, showdown)) + assertTrue(TelemetryOutput.turnedOff(on, null)!!.contains("<motion enabled=\"false\" ip=\"127.0.0.1\"")) + } + + @Test fun missingAttributesAreAdded() { + assertEquals("<udp enabled=\"true\" ip=\"127.0.0.1\" />", TelemetryOutput.withAttr("<udp enabled=\"true\" />", "ip", "127.0.0.1")) + assertEquals("<udp a=\"1\" port=\"20777\">", TelemetryOutput.withAttr("<udp a=\"1\">", "port", "20777")) + assertTrue(TelemetryOutput.pointsHere("<udp enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" />")) + } + + @Test fun scanFindsTheGameAndARoundTripRestoresTheFile() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val config = configFile(compatdata, "2848447563", "DiRT Showdown") + config.writeText(showdown) + configFile(compatdata, "12345", "Some Other Game").writeText("<hardware_settings_config />") + + val games = TelemetryOutput.scan(listOf(compatdata)) + assertEquals(listOf("DiRT Showdown"), games.map { it.name }) + assertEquals("2848447563", games[0].prefixId) + assertFalse(games[0].on) + + assertTrue(TelemetryOutput.set(games[0], true)) + assertTrue(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).isFile) + assertTrue(TelemetryOutput.scan(listOf(compatdata))[0].on) + + assertTrue(TelemetryOutput.set(games[0], false)) + assertEquals(showdown, config.readText()) + assertFalse(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).exists()) + assertFalse(TelemetryOutput.scan(listOf(compatdata))[0].on) + } + + @Test fun theRunningGameIsMatchedByItsPrefixId() { + assertTrue(TelemetryOutput.isRunning("2848447563", "2848447563")) + assertTrue(TelemetryOutput.isRunning("-1446519733", "2848447563")) + assertFalse(TelemetryOutput.isRunning("2848447563", "690790")) + assertFalse(TelemetryOutput.isRunning("2848447563", null)) + assertTrue(TelemetryOutput.isRunning("2848447563", "program:/games/x.exe")) + } + + @Test fun automaticSkipsGamesThatAreOnSwitchedOffOrRunning() { + val f = File("x") + val dirt4 = TelemetryOutput.Game("DiRT 4", "421020", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + val grid = TelemetryOutput.Game("GRID", "703860", f, on = true) + val games = listOf(dirt4, rally, grid) + assertEquals(listOf(dirt4, rally), TelemetryOutput.automaticTargets(games, emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(games, setOf("421020/DiRT 4"), null)) + assertEquals(listOf(dirt4), TelemetryOutput.automaticTargets(games, emptySet(), "690790")) + assertEquals("690790/DiRT Rally 2.0", TelemetryOutput.key(rally)) + } + + @Test fun switchingAutomaticOffRestoresOnlyGamesDroidDeckChanged() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val changed = configFile(compatdata, "2848447563", "DiRT Showdown").apply { writeText(showdown) } + val own = configFile(compatdata, "690790", "DiRT Rally 2.0") + .apply { writeText("<x><udp enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" /></x>") } + assertTrue(TelemetryOutput.set(TelemetryOutput.scan(listOf(compatdata)).first { it.name == "DiRT Showdown" }, true)) + val targets = TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), null) + assertEquals(listOf(changed), targets.map { it.file }) + assertTrue(own.isFile) + assertTrue(TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), "2848447563").isEmpty()) + } + + @Test fun automaticTurnsOnDirt3AndShowdownLikeTheOtherGames() { + val f = File("x") + val showdownGame = TelemetryOutput.Game("DiRT Showdown", "2848447563", f, on = false) + val dirt3 = TelemetryOutput.Game("DiRT3", "321040", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + assertEquals(listOf(showdownGame, dirt3, rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), setOf("2848447563/DiRT Showdown", "321040/DiRT3"), null)) + } + + private fun configFile(compatdata: File, id: String, game: String): File = + File(compatdata, "$id/pfx/drive_c/users/steamuser/Documents/My Games/$game/hardwaresettings/hardware_settings_config.xml") + .apply { parentFile!!.mkdirs() } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/TextureFilteringPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TextureFilteringPrefsTest.kt index c59cd52fd..ebbcc1f48 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/TextureFilteringPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/TextureFilteringPrefsTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt new file mode 100644 index 000000000..f4921b0c7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TpUbwcPrefsTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.gpu.TpUbwcHint +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 com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TpUbwcPrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null) + ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun missingOrInvalidChoiceUsesAuto() { + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putString("tpUbwcMode", "invalid").commit() + assertEquals(SessionPrefs.TP_UBWC_AUTO, SessionPrefs.tpUbwcMode(context)) + } + + @Test fun overrideIsStoredWithoutChangingDriverChoices() { + SessionPrefs.setAndroidDriver(context, "display") + SessionPrefs.setLinuxDriver(context, "runtime") + for (mode in listOf(SessionPrefs.TP_UBWC_ON, SessionPrefs.TP_UBWC_OFF, SessionPrefs.TP_UBWC_AUTO)) { + SessionPrefs.setTpUbwcMode(context, mode) + assertEquals(mode, SessionPrefs.tpUbwcMode(context)) + assertEquals("display", SessionPrefs.androidDriver(context)) + assertEquals("runtime", SessionPrefs.linuxDriver(context)) + } + } + + @Test fun changingTheSavedChoiceKeepsTheProcessChoiceUntilRestart() { + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + val initial = TpUbwcHint.forThisDevice(context) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_OFF) + assertTrue(TpUbwcHint.restartRequired(context)) + assertEquals(SessionPrefs.TP_UBWC_ON, TpUbwcHint.activeMode) + assertEquals(initial, TpUbwcHint.forThisDevice(context)) + SessionPrefs.setTpUbwcMode(context, SessionPrefs.TP_UBWC_ON) + assertFalse(TpUbwcHint.restartRequired(context)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/UsbLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/session/UsbLinkTest.kt new file mode 100644 index 000000000..7921ddfee --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/UsbLinkTest.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.nio.file.Files +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test + +class UsbLinkTest { + private lateinit var sys: File + + @Before fun setUp() { sys = Files.createTempDirectory("usblink").toFile() } + + @After fun tearDown() { + Files.walk(sys.toPath()).use { paths -> paths.sorted(Comparator.reverseOrder()).forEach { Files.deleteIfExists(it) } } + } + + private val mounts = """ + /dev/block/dm-5 /data ext4 rw 0 0 + /dev/fuse /storage/8C5A-1F23 fuse rw 0 0 + /dev/block/vold/public:8,97 /mnt/media_rw/8C5A-1F23 fuseblk rw 0 0 + """.trimIndent() + + private fun drive(deviceSpeed: String, otherHub: String) { + val controller = File(sys, "devices/platform/xhci") + val hub = File(controller, "usb1").apply { mkdirs(); File(this, "speed").writeText("480\n"); File(this, "idVendor").writeText("1d6b\n") } + File(controller, "usb2").apply { mkdirs(); File(this, "speed").writeText("$otherHub\n"); File(this, "idVendor").writeText("1d6b\n") } + val device = File(hub, "1-1").apply { mkdirs() } + File(device, "speed").writeText("$deviceSpeed\n") + File(device, "idVendor").writeText("04e8\n") + File(device, "busnum").writeText("1\n") + File(device, "devnum").writeText("7\n") + File(device, "manufacturer").writeText("Samsung\n") + File(device, "product").writeText("PSSD T7\n") + val part = File(device, "1-1:1.0/host1/target1:0:0/1:0:0:0/block/sdg/sdg1").apply { mkdirs() } + File(sys, "dev/block").mkdirs() + Files.createSymbolicLink(File(sys, "dev/block/8:97").toPath(), part.toPath()) + File(sys, "bus/usb/devices").mkdirs() + Files.createSymbolicLink(File(sys, "bus/usb/devices/usb1").toPath(), hub.toPath()) + } + + @Test fun findsTheUsbSpeedOfADriveBehindItsMount() { + drive("480", "10000") + val link = UsbLink.forPath("/storage/8C5A-1F23/Games", mounts, sys)!! + assertEquals("8:97", link.device) + assertEquals(480.0, link.mbps, 0.0) + assertEquals("Samsung PSSD T7", link.name) + assertEquals(10000.0, link.portMbps!!, 0.0) + assertEquals("1-7", link.plug) + assertEquals("3/1-7/8:97@480.0", UsbLink.dismissKey(3, link)) + assertFalse(UsbLink.SlowDrive("k", link.name, link.mbps, link.portMbps).portLimited) + } + + @Test fun aPortWithoutSuperSpeedIsReportedAsTheLimit() { + drive("480", "480") + val link = UsbLink.forPath("/storage/8C5A-1F23", mounts, sys)!! + assertTrue(UsbLink.SlowDrive("k", link.name, link.mbps, link.portMbps).portLimited) + } + + @Test fun anUnknownPortSpeedIsNotReportedAsTheLimit() { + drive("480", "10000") + Files.delete(File(sys, "bus/usb/devices/usb1").toPath()) + val link = UsbLink.forPath("/storage/8C5A-1F23", mounts, sys)!! + assertNull(link.portMbps) + assertFalse(UsbLink.SlowDrive("k", link.name, link.mbps, link.portMbps).portLimited) + } + + @Test fun internalStorageAndUnknownMountsHaveNoLink() { + drive("480", "10000") + assertNull(UsbLink.forPath("/storage/emulated/0/Games", mounts, sys)) + assertNull(UsbLink.forPath("/storage/ABCD-0000", mounts, sys)) + } + + @Test fun mountsPickTheLongestMatchingMountPoint() { + assertEquals("8:97", UsbLink.mountDevice("/mnt/media_rw/8C5A-1F23/Games/PC", mounts)) + assertNull(UsbLink.mountDevice("/mnt/media_rw/8C5A-1F230", mounts)) + assertEquals("name:sda1", UsbLink.mountDevice("/mnt/usb/a", "/dev/block/sda1 /mnt/usb vfat rw 0 0")) + } + + @Test fun rawMountPathsAreTreatedAsTheirStorageVolume() { + assertEquals("/storage/8C5A-1F23/Games", UsbLink.storagePath("/mnt/media_rw/8C5A-1F23/Games")) + assertEquals("/storage/emulated/0/Games", UsbLink.storagePath("/storage/emulated/0/Games")) + assertTrue(UsbLink.external(UsbLink.storagePath("/mnt/media_rw/8C5A-1F23/Games"))) + } + + @Test fun generationsFollowTheLinkSpeed() { + assertEquals("USB 1.1", UsbLink.generation(12.0)) + assertEquals("USB 2.0", UsbLink.generation(480.0)) + assertEquals("USB 3.2 Gen 1", UsbLink.generation(5000.0)) + assertEquals("USB 3.2 Gen 2", UsbLink.generation(10000.0)) + assertEquals(42, UsbLink.megabytesPerSecond(480.0)) + } +} 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 656c56c9a..58beb0865 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt @@ -5,7 +5,7 @@ import org.json.JSONObject import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -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 000000000..ee591d713 --- /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/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 794e01d44..0cfbf2e05 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -92,6 +92,30 @@ class SteamStorageTest { assertEquals(emptyMap<String, String>(), SteamStorage.compatMappings("\"x\" {}")) } + @Test fun readsShaderPrecacheFromConfig() { + val vdf = """ + "InstallConfigStore" + { + "Software" { "Valve" { "Steam" { "ShaderCacheManager" + { + "HasCurrentBucket" "1" + "DisableShaderCache" "1" + } } } } + } + """.trimIndent() + assertEquals(false, SteamStorage.shaderPrecache(vdf)) + assertEquals(true, SteamStorage.shaderPrecache(vdf.replace("\"DisableShaderCache\"\t\t\"1\"", "\"DisableShaderCache\"\t\t\"0\""))) + assertEquals(true, SteamStorage.shaderPrecache("\"InstallConfigStore\" {}")) + assertEquals(true, SteamStorage.shaderPrecache(""" + "InstallConfigStore" + { + // "DisableShaderCache" "1" + "Other" { "DisableShaderCache" "1" } + "Software" { "Valve" { "Steam" { "ShaderCacheManager" { "DisableShaderCache" "0" } } } } + } + """.trimIndent())) + } + @Test fun readsCustomToolName() { val vdf = "\"compatibilitytools\"\n{\n \"compat_tools\"\n {\n \"GE-Proton11-9-aarch64\"\n {\n \"install_path\" \".\"\n }\n }\n}" assertEquals("GE-Proton11-9-aarch64", SteamStorage.compatToolName(vdf)) diff --git a/app/src/test/java/com/droiddeck/launcher/storage/StorageScanTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/StorageScanTest.kt index 6425820af..68ce2abde 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/StorageScanTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/StorageScanTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/stores/AchievementNotificationsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/AchievementNotificationsTest.kt index 3efda39d0..9a859c16d 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/AchievementNotificationsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/AchievementNotificationsTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudPlanTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudPlanTest.kt index 5338fd343..3dc08cc1c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudPlanTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudPlanTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt index 63beea565..b3dff3260 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 a88c8b954..675c1e009 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 000000000..ea4e953e0 --- /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 0c3044743..a3be7c8c9 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -4,10 +4,11 @@ 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 -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -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 000000000..df7ba8f2b --- /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 000000000..33959c731 --- /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/GogCometGenerationTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/GogCometGenerationTest.kt index 0590ec158..2dd2c0a9d 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/GogCometGenerationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/GogCometGenerationTest.kt @@ -6,7 +6,7 @@ import org.junit.After import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/stores/MatureContentTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/MatureContentTest.kt index ec6b2062b..531bcd094 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/MatureContentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/MatureContentTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 d0e7ef94f..8a315f3a1 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 2dde17cab..2aceecadd 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.stores +import android.app.Application import org.json.JSONObject import org.junit.After import org.junit.Assert.assertEquals @@ -9,7 +10,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File @@ -18,7 +19,7 @@ import javax.crypto.SecretKey import javax.crypto.spec.SecretKeySpec @RunWith(RobolectricTestRunner::class) -@Config(sdk = [33]) +@Config(sdk = [33], application = Application::class) class StoreAccountsCipherTest { private val app get() = RuntimeEnvironment.getApplication() private fun newKey(): SecretKey = SecretKeySpec(ByteArray(32).also { SecureRandom().nextBytes(it) }, "AES") @@ -201,4 +202,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/StoreCacheTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt index c01e4202f..0ec4a1312 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertNotSame import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt index e545cc77d..e3b91ff6f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt @@ -4,7 +4,6 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertSame import org.junit.Test -/** Filling a grid one card at a time: what is on screen stays put, what is new lands where its title belongs. */ class StoreCatalogPatchTest { private fun item(id: String, title: String, image: String? = null) = CatalogItem(Store.GOG, id, title, imageUrl = image, owned = true) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt index b7ad90b56..8c7c42f6f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt @@ -6,7 +6,7 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 c40ef5b20..8f1f8ea0c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -5,10 +5,13 @@ 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 +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowStatFs @@ -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,69 @@ 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 xodusRootsKeepEveryOtherStoreRootAtTheSameGuestPath() { + val card = File(app.filesDir, "card2").apply { mkdirs() } + val library = File(app.filesDir, "card/steam").apply { mkdirs() } + File(library, "Games").mkdirs() + SessionPrefs.setDefaultStorageFolder(app, card.path, "Card 2") + SessionPrefs.setGameStorage(app, library.path, "Card") + + val xodus = StoreInstallRoot.externalRootsForXodus(app) + assertTrue(xodus.containsAll(StoreInstallRoot.externalRoots(app))) + assertTrue(xodus.any { it.first.absolutePath == File(library, "Games").absolutePath }) + } + + @Test fun theSteamLibraryGetsItsOwnGuestPathWhenItSharesACardWithAnotherStoreRoot() { + val card = File(app.filesDir, "same-card/Games") + val library = File(app.filesDir, "same-card/steam/Games") + val base = "/mnt/droiddeck-stores/ABCD-1234" + + val roots = StoreInstallRoot.withSelectedLibrary(listOf(card to base), library, base) + assertEquals(2, roots.map { it.second }.distinct().size) + assertEquals(base, roots.single { it.first == card }.second) + assertTrue(roots.single { it.first == library }.second.startsWith("$base-")) + assertEquals("${roots.single { it.first == library }.second}/Xbox/Doom", + StoreInstallRoot.externalGuestPath(File(library, "Xbox/Doom"), roots)) + assertEquals(roots, StoreInstallRoot.withSelectedLibrary(roots, library, base)) + } + + @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/StoreLanguageTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreLanguageTest.kt index c97ac2a3a..bdd2e8d0b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreLanguageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreLanguageTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.util.Locale diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreLaunchTest.kt index 898e074f6..90b64fdd7 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreLaunchTest.kt @@ -6,7 +6,7 @@ import com.droiddeck.launcher.session.SessionPrefs import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreLogoTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreLogoTest.kt index 71a6c1d8e..a72d1f968 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreLogoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreLogoTest.kt @@ -15,7 +15,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode 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 000000000..027a1db73 --- /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 000000000..f1141a871 --- /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 000000000..415c6c7cf --- /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/download/DownloadQueueRetryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt index 879e8de91..2a4a74791 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt @@ -12,7 +12,7 @@ import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith import org.json.JSONArray -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowStatFs @@ -75,7 +75,6 @@ class DownloadQueueRetryTest { DownloadQueue.clear(app, item.key) assertNull(DownloadQueue.entry(item.key)) - // A card resume (including the restored paused path) must retain its real target. val card = File(app.filesDir, "retry-card").apply { mkdirs() } SessionPrefs.setGameStorage(app, card.path, "Card") val target = File(card, "Games") 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 720e122c1..f73a65658 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 @@ -8,7 +8,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import java.io.File import java.security.MessageDigest @@ -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/epic/EpicCredentialStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicCredentialStoreTest.kt index d80b476a0..604c712f7 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicCredentialStoreTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicCredentialStoreTest.kt @@ -12,7 +12,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import java.security.SecureRandom diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt index a3f156e1b..fbb5e1791 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicShelvesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicShelvesTest.kt index 3dddd02b5..299d80abc 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicShelvesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicShelvesTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogCdnTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogCdnTest.kt index 324338e17..d4a80c78e 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogCdnTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogCdnTest.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.stores.gog import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 000000000..7d1697c10 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/gog/GogListingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt index 0c6502e93..0cbd91f46 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt @@ -4,10 +4,9 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config -/** The account listing: everything the tab needs to draw a library before a product is asked about. */ @RunWith(RobolectricTestRunner::class) @Config(sdk = [33]) class GogListingTest { diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt new file mode 100644 index 000000000..c66e59a3b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt @@ -0,0 +1,402 @@ +package com.droiddeck.launcher.stores.gog + +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadState +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File +import java.nio.file.Files +import java.util.concurrent.atomic.AtomicBoolean + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GogMaintenanceTest { + @get:Rule val temporary = TemporaryFolder() + + @Test fun selectsPublicBranchAndTreatsBuildIdsAsOpaque() { + val builds = JSONObject("""{"items":[ + {"os":"windows","branch":"beta","build_id":"99","generation":2,"link":"https://example.invalid/beta"}, + {"os":"windows","branch":null,"build_id":"0002","generation":2,"version_name":"RC-final","link":"https://example.invalid/current"}, + {"os":"windows","branch":null,"build_id":"10","generation":2,"link":"https://example.invalid/old"}]}""") + assertEquals("0002", GogBuild.select(builds)!!.id) + assertEquals("99", GogBuild.select(builds, branch = "beta")!!.id) + assertEquals("10", GogBuild.select(builds, pinned = "10")!!.id) + assertNull(GogBuild.select(builds, pinned = "missing")) + assertNull(GogBuild.select(builds, branch = "private")) + } + + @Test fun migrationRetainsKnownBuildLanguageAndInstalledProducts() { + val folder = temporary.newFolder() + File(folder, "_gog_manifest.json").writeText("""{"gameId":"1","buildId":"000123"}""") + File(folder, "goggame-2.info").writeText("{}") + val sidecar = StoreGameSidecar(Store.GOG, "1", "Game", "game.exe", installVersion = "000123", + args = listOf("--custom"), env = mapOf("DD_TEST" to "1"), cloud = false, achievements = false, + extra = mapOf(StoreLanguage.EXTRA to "pl-PL")) + val record = GogInstallRecord.migrate(folder, sidecar) + assertEquals("000123", record.build) + assertEquals("pl-PL", record.language) + assertEquals(listOf("1", "2"), record.products) + assertEquals(record.json().toString(), GogInstallRecord.read(folder)!!.json().toString()) + assertEquals(listOf("--custom"), sidecar.args) + assertFalse(sidecar.cloud) + } + + @Test fun missingManifestNeverInventsLatestBuild() { + val folder = temporary.newFolder() + val record = GogInstallRecord.migrate(folder, StoreGameSidecar(Store.GOG, "1", "Game", "game.exe")) + assertEquals("offline", record.source) + assertEquals("", record.build) + assertEquals(0, record.files.length()) + } + + @Test fun offlineRefreshWithDlcRequiresAnAuthenticMatchingDepotBuild() { + val extracted = temporary.newFolder() + val app = File(extracted, "app").apply { mkdirs() } + val target = GogInstallRecord("1", "depot", build = "0000123", products = listOf("1", "2")) + assertThrows(IllegalArgumentException::class.java) { GogOffline.validateDepotInstaller(extracted, target) } + File(app, "goggame-1.info").writeText("""{"buildId":"0000999"}""") + assertThrows(IllegalArgumentException::class.java) { GogOffline.validateDepotInstaller(extracted, target) } + File(app, "goggame-1.info").writeText("""{"buildId":"0000123"}""") + GogOffline.validateDepotInstaller(extracted, target) + File(app, "goggame-1.info").delete() + GogOffline.validateDepotInstaller(extracted, target.copy(source = "offline", build = "")) + } + + @Test fun offlineRefreshRetainsTheExistingExecutableLayout() { + val installed = temporary.newFolder() + val extracted = temporary.newFolder() + val app = File(extracted, "app").apply { mkdirs() } + File(app, "game.exe").writeText("replacement") + File(installed, "goggame-1.info").writeText("{}") + assertEquals(extracted, GogOffline.layout(extracted, installed, "1", "game.exe").source) + assertEquals("", GogOffline.layout(extracted, installed, "1", "game.exe").prefix) + File(installed, "goggame-1.info").delete() + assertEquals(extracted, GogOffline.layout(extracted, installed, "1", "app/game.exe").source) + val flat = temporary.newFolder() + val legacy = GogOffline.layout(flat, installed, "1", "app/game.exe") + assertEquals(flat, legacy.source) + assertEquals("app/", legacy.prefix) + } + + @Test fun offlineInstallerMatchesRegionalLanguageWithoutChoosingAnotherLanguage() { + val downloads = JSONObject("""{"installers":[ + {"id":"de","os":"windows","language":"de","files":[{"downlink":"https://example.invalid/de"}]}, + {"id":"en","os":"windows","language":"en","files":[{"downlink":"https://example.invalid/en"}]}]}""") + assertEquals("en", GogMaintenance.offlineInstaller(downloads, "en-US").id) + assertThrows(IllegalStateException::class.java) { GogMaintenance.offlineInstaller(downloads, "pl-PL") } + downloads.getJSONArray("installers").put(0, JSONObject("""{"id":"neutral","os":"windows","language":"Neutral","files":[{"downlink":"https://example.invalid/neutral"}]}""")) + assertEquals("en", GogMaintenance.offlineInstaller(downloads, "en-US").id) + assertEquals("neutral", GogMaintenance.offlineInstaller(downloads, "pl-PL").id) + } + + @Test fun incompleteOfflineExtractionCannotReplaceOrRemoveInstalledFiles() { + val folder = temporary.newFolder() + StoreGameSidecar(Store.GOG, "1", "Game", "game.exe").write(folder) + val game = File(folder, "game.exe").apply { writeText("installed game") } + val old = GogInstallRecord("1", "depot", files = JSONArray().put(JSONObject().put("path", game.name) + .put("size", game.length()).put("md5", GogFiles.hash(game)))) + old.write(folder) + val extracted = temporary.newFolder() + File(extracted, "goggame-1.ico").writeText("ancillary file") + assertThrows(IllegalStateException::class.java) { + GogOffline.applyRefresh(GogMaintenance.Proposal(folder, old, old.copy(source = "offline"), GogOperation.REFRESH, 0, 0), extracted, null, AtomicBoolean(false)) + } + assertEquals("installed game", game.readText()) + assertFalse(File(folder, "goggame-1.ico").exists()) + assertEquals("depot", GogInstallRecord.read(folder)!!.source) + val migrated = old.copy(files = JSONArray()) + migrated.write(folder) + assertThrows(IllegalStateException::class.java) { + GogOffline.applyRefresh(GogMaintenance.Proposal(folder, migrated, migrated.copy(source = "offline"), GogOperation.REFRESH, 0, 0), extracted, null, AtomicBoolean(false)) + } + assertEquals("installed game", game.readText()) + assertFalse(File(folder, "goggame-1.ico").exists()) + assertEquals("depot", GogInstallRecord.read(folder)!!.source) + assertEquals(0, GogInstallRecord.read(folder)!!.files.length()) + } + + @Test fun offlineRefreshCombinesRootPayloadAndAppPlaceholdersInBothLayouts() { + for (nested in listOf(false, true)) { + val folder = temporary.newFolder() + val executable = if (nested) "app/game.exe" else "game.exe" + StoreGameSidecar(Store.GOG, "1", "Game", executable).write(folder) + val game = File(folder, executable).apply { parentFile!!.mkdirs(); writeText("old game") } + val old = GogInstallRecord("1", "offline", files = JSONArray().put(JSONObject().put("path", executable) + .put("size", game.length()).put("md5", GogFiles.hash(game)))) + old.write(folder) + val extracted = temporary.newFolder() + File(extracted, "game.exe").writeText("complete new game") + File(extracted, "Data").mkdirs() + File(extracted, "app/Data/SaveGame").mkdirs() + File(extracted, "app/Data/SaveGame/dummy.txt").writeBytes(byteArrayOf()) + File(extracted, "tmp").mkdirs() + File(extracted, "tmp/installer.exe").writeText("installer support") + GogOffline.applyRefresh(GogMaintenance.Proposal(folder, old, old, GogOperation.REFRESH, 0, 0), extracted, null, AtomicBoolean(false)) + assertEquals("complete new game", game.readText()) + assertTrue(File(folder, (if (nested) "app/" else "") + "Data/SaveGame/dummy.txt").isFile) + assertFalse(File(folder, "tmp").exists()) + assertTrue(GogInstallRecord.read(folder)!!.files.objects().any { it.getString("path") == executable }) + } + } + + @Test fun offlineRefreshDefersDlcCleanupAndRecordPublicationUntilDepotCompletion() { + val folder = temporary.newFolder() + StoreGameSidecar(Store.GOG, "1", "Game", "base.exe").write(folder) + val base = File(folder, "base.exe").apply { writeText("old base") } + val dlc = File(folder, "dlc.bin").apply { writeText("old DLC") } + val obsolete = File(folder, "old.bin").apply { writeText("obsolete") } + val save = File(folder, "save.dat").apply { writeText("player progress") } + fun entry(file: File, product: String) = JSONObject().put("path", file.name).put("size", file.length()) + .put("md5", GogFiles.hash(file)).put("product", product).put("offset", 0).put("remotePath", file.name) + val old = GogInstallRecord("1", "depot", build = "old", products = listOf("1", "2"), + files = JSONArray().put(entry(base, "1")).put(entry(dlc, "2")).put(entry(obsolete, "1"))) + old.write(folder) + val recordFile = File(GogFiles.dir(folder), "installed.json") + val record = recordFile.readText() + val extracted = temporary.newFolder() + val app = File(extracted, "app").apply { mkdirs() } + File(app, "goggame-1.info").writeText("""{"buildId":"new"}""") + val replacement = File(app, "base.exe").apply { writeText("new base") } + val expectedDlc = File(temporary.newFolder(), "dlc.bin").apply { writeText("new DLC") } + val target = old.copy(build = "new", files = JSONArray().put(entry(replacement, "1")).put(entry(expectedDlc, "2"))) + GogOffline.applyRefresh(GogMaintenance.Proposal(folder, old, target, GogOperation.REFRESH, 0, 0), extracted, null, AtomicBoolean(false)) + assertEquals("new base", base.readText()) + assertEquals("old DLC", dlc.readText()) + assertTrue(obsolete.isFile) + assertEquals(record, recordFile.readText()) + val server = java.net.ServerSocket(0, 1, java.net.InetAddress.getByName("127.0.0.1")) + val worker = Thread { + server.accept().use { client -> + val reader = client.getInputStream().bufferedReader() + while (!reader.readLine().isNullOrEmpty()) Unit + val content = expectedDlc.readBytes() + client.getOutputStream().apply { + write("HTTP/1.1 206 Partial Content\r\nContent-Length: ${content.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(content); flush() + } + } + }.apply { isDaemon = true; start() } + try { + GogFallback.transfer(folder, JSONObject().put("files", target.files).put("oldFiles", old.files) + .put("links", JSONObject().put("2", JSONArray().put("http://127.0.0.1:${server.localPort}"))), null, AtomicBoolean(false)) + assertEquals("new DLC", dlc.readText()) + assertFalse(obsolete.exists()) + assertEquals("player progress", save.readText()) + assertEquals(record, recordFile.readText()) + } finally { server.close(); worker.join(2000) } + } + + @Test fun authenticIdentityOverridesAStaleLegacyMarkerWithoutTreatingSchemaAsVersion() { + val folder = temporary.newFolder() + File(folder, "_gog_manifest.json").writeText("""{"buildId":"old"}""") + File(folder, "goggame-1.id").writeText("""{"buildId":"patched"}""") + File(folder, "goggame-1.info").writeText("""{"version":1}""") + val record = GogInstallRecord.migrate(folder, StoreGameSidecar(Store.GOG, "1", "Game", "game.exe", installVersion = "old")) + assertEquals("patched", record.build) + assertEquals("", record.version) + } + + @Test fun authenticGenerationOneResolvesProductDepotsAndRetainsHashesAndBuild() { + fun fixture(name: String) = JSONObject(javaClass.classLoader!!.getResource("gog/$name")!!.readText()) + val build = GogBuild("3301", "", 1, "", "https://example.invalid/repository.json") + val requested = ArrayList<String>() + val snapshot = GogContent.snapshot(GogInstallRecord("1207658940", "depot"), build, "unused") { url, _ -> + requested.add(url) + when { + url == build.link -> fixture("rayman-gen1-repository.json") + url.endsWith("a01f6fb8-55a8-4f33-bc5b-5f5d2f591775.json") -> fixture("rayman-gen1-neutral.json") + url.endsWith("ec88140c-2589-41a0-bbf3-8fc1f215fe5a.json") -> fixture("rayman-gen1-english-excerpt.json") + else -> error("Unexpected metadata: $url") + } + } + assertEquals("3301", snapshot.build) + assertEquals(1, snapshot.generation) + assertEquals(4, snapshot.files.length()) + val support = snapshot.files.getJSONObject(0) + assertEquals("support/1207658940/galaxy_rayman2_2.1.0.39.exe", support.getString("path")) + assertEquals("ee2c247373733f29782395f1f92622f6", support.getString("md5")) + val game = snapshot.files.getJSONObject(1) + assertEquals("Data/World/Levels/Raycap/Raycap.snd", game.getString("path")) + assertEquals(384206096L, game.getLong("offset")) + assertEquals("1207658940/main.bin", game.getString("remotePath")) + assertTrue(requested.drop(1).all { "/1207658940/windows/31847977/" in it }) + GogFiles.validate(snapshot.files, temporary.newFolder()) + } + + @Test fun multipartPatchNamesVersionsLanguageAndChecksumsSurviveParsing() { + val downloads = JSONObject("""{"patches":[ + {"id":"patch-1","name":"Patch A to B","version":"B","language":"pl","os":"windows","files":[ + {"id":"part0","filename":"patch_original.exe","downlink":"https://example.invalid/0","size":3,"md5":"abc"}, + {"id":"part1","filename":"patch_original-1.bin","downlink":"https://example.invalid/1","size":4}]}, + {"id":"linux","os":"linux","files":[{"downlink":"https://example.invalid/linux"}]}]}""") + val patch = GogOfflineDownload.parse(downloads, "patches").single() + assertEquals("Patch A to B", patch.name) + assertEquals("B", patch.version) + assertEquals("pl", patch.language) + assertEquals(7, patch.size) + assertEquals(listOf("patch_original.exe", "patch_original-1.bin"), patch.parts.map { it.name }) + assertEquals("abc", patch.parts.first().md5) + assertEquals("patch_(52404)+special.exe", GogContent.downloadFilename("https://example.invalid/patch_%2852404%29+special.exe?token=temporary")) + } + + @Test fun pathsRejectTraversalSymlinksCaseCollisionsAndMetadataOverlap() { + val folder = temporary.newFolder() + for (path in listOf("../escape", "/absolute", "C:/file", "a/./file", "a//file")) { + assertThrows(IllegalArgumentException::class.java) { GogFiles.inside(folder, path) } + } + val files = JSONArray("""[{"path":"Game.exe"},{"path":"game.exe"}]""") + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(files, folder) } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"Data/a"},{"path":"data/b"}]"""), folder) } + File(folder, "Game.bin").writeText("original") + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"game.bin"}]"""), folder) } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":".droiddeck-store.json"}]"""), folder) } + val outside = temporary.newFolder() + try { Files.createSymbolicLink(File(folder, "link").toPath(), outside.toPath()) } + catch (_: java.nio.file.FileSystemException) { return } + assertThrows(IllegalArgumentException::class.java) { GogFiles.inside(folder, "link/game.exe") } + } + + @Test fun sameSizeCorruptionFailsVerificationAndLanguageVariantsRemainDistinct() { + val folder = temporary.newFolder() + val file = File(folder, "game.bin").apply { writeText("original") } + val expected = JSONObject().put("path", file.name).put("size", file.length()).put("md5", GogFiles.hash(file)) + file.writeText("modified") + assertFalse(GogFiles.matches(folder, expected)) + assertTrue(GogContent.languageSelected(listOf("*"), "zh-Hant")) + assertFalse(GogContent.languageSelected(listOf("zh-Hans"), "zh-Hant")) + assertTrue(GogContent.languageSelected(listOf("Polish"), "pl")) + } + + @Test fun persistedManifestsContainNoCredentialsOrTemporaryLinks() { + val input = JSONObject("""{"buildId":"1","clientSecret":"secret","urls":[{"url":"https://example.invalid/?token=secret"}], + "products":[{"productId":"2","clientSecret":"nested"}],"dependencies":["ISI"]}""") + val text = GogContent.sanitize(input).toString() + assertFalse(text.contains("secret")) + assertFalse(text.contains("https://")) + assertTrue(text.contains("ISI")) + } + + @Test fun interruptedExternalPatchRestoresRecoveryWithoutExecutingAgain() { + val app = RuntimeEnvironment.getApplication() + val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "Patch recovery").apply { mkdirs() } + try { + val sidecar = StoreGameSidecar(Store.GOG, "recovery-test", "Patch recovery", "game.exe", + args = listOf("--custom"), env = mapOf("SETTING" to "value"), cloud = false, + achievements = false, state = StoreGameSidecar.STATE_UPDATING) + sidecar.write(folder) + val previous = sidecar.toJson().toString() + GogFiles.write(GogFiles.journal(folder), JSONObject().put("operation", "PATCH").put("phase", "patch-applying")) + val item = CatalogItem(Store.GOG, sidecar.id, sidecar.title, imageUrl = null, extra = mapOf( + GogMaintenance.OPERATION to "PATCH", GogMaintenance.FOLDER to folder.path)) + GogMaintenance.restore(app, item) + assertEquals(DownloadState.FAILED, DownloadQueue.entry(item.key)?.state) + assertTrue(DownloadQueue.entry(item.key)!!.error!!.contains("recovery")) + assertEquals(previous, StoreGameSidecar.read(folder)!!.toJson().toString()) + assertEquals("patch-applying", GogFiles.read(GogFiles.journal(folder))!!.getString("phase")) + DownloadQueue.clear(app, item.key) + } finally { folder.deleteRecursively() } + } + + @Test fun signedOutCheckRemainsAFailureInsteadOfCurrent() { + val app = RuntimeEnvironment.getApplication() + com.droiddeck.launcher.stores.StoreAccounts.clear(app, Store.GOG) + GogMaintenance.reset() + val folder = temporary.newFolder() + val game = com.droiddeck.launcher.stores.InstalledStoreGame( + StoreGameSidecar(Store.GOG, "signed-out-check", "Check", "game.exe", installVersion = "opaque-build"), folder) + GogMaintenance.check(app, game, force = true) + val deadline = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < deadline) { + org.robolectric.shadows.ShadowLooper.idleMainLooper() + if (GogMaintenance.checks[game.sidecar.id]?.state == GogMaintenance.State.FAILED) break + Thread.sleep(10) + } + assertEquals(GogMaintenance.State.FAILED, GogMaintenance.checks[game.sidecar.id]?.state) + assertTrue(GogMaintenance.checks[game.sidecar.id]!!.reason.contains("Sign in")) + } + + @Test fun pauseBeforeInstallerClaimCannotStartExternalApplication() { + val app = RuntimeEnvironment.getApplication() + val ready = java.util.concurrent.CountDownLatch(1) + val proceed = java.util.concurrent.CountDownLatch(1) + val finished = java.util.concurrent.CountDownLatch(1) + val applied = AtomicBoolean(false) + val item = com.droiddeck.launcher.stores.download.DownloadEntry(Store.GOG, "installer-claim", "Installer claim") + DownloadQueue.enqueue(app, item) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + ready.countDown() + try { + check(proceed.await(5, java.util.concurrent.TimeUnit.SECONDS)) + handle.interruptible(false) + applied.set(true) + return null + } finally { finished.countDown() } + } + override fun cancel(deleteFiles: Boolean) {} + } + } + try { + assertTrue(ready.await(5, java.util.concurrent.TimeUnit.SECONDS)) + DownloadQueue.pause(item.key) + proceed.countDown() + assertTrue(finished.await(5, java.util.concurrent.TimeUnit.SECONDS)) + assertFalse(applied.get()) + } finally { + proceed.countDown() + val deadline = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(5) + while (DownloadQueue.entry(item.key)?.state == DownloadState.RUNNING && System.nanoTime() < deadline) Thread.sleep(10) + DownloadQueue.clear(app, item.key) + } + } + + @Test fun fileFallbackVerifiesRemoteBytesAndPreservesOriginalOnCorruption() { + val folder = temporary.newFolder() + val content = "verified remote content".toByteArray() + val original = File(folder, "game.bin").apply { writeText("local data") } + val server = java.net.ServerSocket(0, 10, java.net.InetAddress.getByName("127.0.0.1")) + var reply = content + var transferred = 0 + val worker = Thread { + while (!server.isClosed) { + val client = try { server.accept() } catch (_: java.io.IOException) { break } + client.use { + val reader = it.getInputStream().bufferedReader() + while (!reader.readLine().isNullOrEmpty()) Unit + it.getOutputStream().apply { + write("HTTP/1.1 206 Partial Content\r\nContent-Length: ${reply.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(reply); flush(); transferred += reply.size + } + } + } + }.apply { isDaemon = true; start() } + try { + val expected = File(folder, "expected").apply { writeBytes(content) } + val file = JSONObject().put("path", "game.bin").put("size", content.size).put("md5", GogFiles.hash(expected)) + .put("product", "1").put("offset", 0).put("remotePath", "data") + val plan = JSONObject().put("files", JSONArray().put(file)).put("links", JSONObject().put("1", JSONArray().put("http://127.0.0.1:${server.localPort}"))) + reply = ByteArray(content.size) { 65 } + assertThrows(IllegalStateException::class.java) { GogFallback.transfer(folder, plan, null, AtomicBoolean(false)) } + assertEquals("local data", original.readText()) + reply = content + GogFallback.transfer(folder, plan, null, AtomicBoolean(false)) + assertArrayEquals(content, original.readBytes()) + val before = transferred + GogFallback.transfer(folder, plan, null, AtomicBoolean(false)) + assertEquals(before, transferred) + } finally { server.close(); worker.join(2000) } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogResumeSpaceTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogResumeSpaceTest.kt index 4934b5898..8f1f4efa5 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogResumeSpaceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogResumeSpaceTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowStatFs diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchArchivesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchArchivesTest.kt new file mode 100644 index 000000000..e8ab5f10f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchArchivesTest.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.stores.itch + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import java.io.File +import java.nio.file.Files + +class ItchArchivesTest { + private lateinit var dir: File + + @Before fun setUp() { + dir = Files.createTempDirectory("itch-archives").toFile() + } + + @After fun tearDown() { + Files.walk(dir.toPath()).sorted(Comparator.reverseOrder()).forEach { Files.deleteIfExists(it) } + } + + private fun file(name: String, vararg head: Int, size: Int = 64): File { + val f = File(dir, name) + f.parentFile?.mkdirs() + val bytes = ByteArray(maxOf(size, head.size)) + head.forEachIndexed { i, b -> bytes[i] = b.toByte() } + f.writeBytes(bytes) + return f + } + + @Test fun kindsComeFromTheContentNotTheName() { + assertEquals("7z", ItchArchives.kind(file("data.bin", 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C), "data.bin")) + assertEquals("zip", ItchArchives.kind(file("a.7z", 0x50, 0x4B, 3, 4), "a.7z")) + assertEquals("rar", ItchArchives.kind(file("b", 0x52, 0x61, 0x72, 0x21), "b")) + assertEquals("exe", ItchArchives.kind(file("Game.exe", 0x50, 0x4B), "Game.exe")) + } + + @Test fun theLargestArchiveInsideIsUnpackedNext() { + file("readme.txt", 0x48, 0x69) + file("VotV.7z", 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C, size = 4096) + file("extras/art.zip", 0x50, 0x4B, 3, 4, size = 128) + assertEquals("VotV.7z", ItchArchives.inner(dir)?.name) + } + + @Test fun archivesDeeperThanTwoFoldersAreLeftAlone() { + file("a/b/c/deep.zip", 0x50, 0x4B, 3, 4) + assertNull(ItchArchives.inner(dir)) + } + + @Test fun nothingPackedMeansNothingToUnpack() { + file("game.pak", 0x00, 0x01) + file("notes.txt", 0x48, 0x69) + assertNull(ItchArchives.inner(dir)) + } + + @Test fun aNamedArchiveWithoutASignatureIsSkipped() { + file("extras.zip", 0x48, 0x69, size = 8192) + file("game.7z", 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C, size = 128) + assertEquals("game.7z", ItchArchives.inner(dir)?.name) + } + + @Test fun symlinksAreNotFollowed() { + val root = File(dir, "root").apply { mkdirs() } + val outside = File(dir, "outside").apply { mkdirs() } + File(outside, "keep.zip").writeBytes(byteArrayOf(0x50, 0x4B, 3, 4)) + Files.createSymbolicLink(File(root, "link").toPath(), outside.toPath()) + Files.createSymbolicLink(File(root, "linked.zip").toPath(), File(outside, "keep.zip").toPath()) + assertNull(ItchArchives.inner(root)) + } +} 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 000000000..d3ebf12e5 --- /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/ItchBuildsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBuildsTest.kt new file mode 100644 index 000000000..a9630d9e8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBuildsTest.kt @@ -0,0 +1,57 @@ +package com.droiddeck.launcher.stores.itch + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class ItchBuildsTest { + private fun file(id: Int, type: String, sub: String, size: Int = 10) = + JSONObject().put("id", id).put("type", type).put("sub_type", sub).put("size", size).put("state", "uploaded") + + private fun build(id: Int, vararg files: JSONObject) = JSONObject().put("id", id).put("files", JSONArray(files.toList())) + + private fun path(vararg builds: JSONObject) = JSONObject().put("upgrade_path", JSONObject().put("builds", JSONArray(builds.toList()))) + + @Test fun buildIdReadsBothKeyStylesAndIgnoresMissingValues() { + assertEquals("55", ItchBuilds.buildId(JSONObject().put("build_id", 55))) + assertEquals("56", ItchBuilds.buildId(JSONObject().put("buildId", "56"))) + assertEquals("", ItchBuilds.buildId(JSONObject().put("build_id", JSONObject.NULL))) + assertEquals("", ItchBuilds.buildId(JSONObject().put("build_id", 0))) + assertEquals("", ItchBuilds.buildId(JSONObject().put("build_id", "00"))) + assertEquals("57", ItchBuilds.buildId(JSONObject().put("build_id", "057"))) + assertEquals("", ItchBuilds.buildId(JSONObject())) + } + + @Test fun pathSkipsTheInstalledBuildAndPrefersOptimizedPatches() { + val reply = path( + build(1, file(11, "patch", "default")), + build(2, file(21, "patch", "default", 5), file(22, "patch", "optimized", 3), file(23, "signature", "default")), + ) + val steps = ItchBuilds.steps(reply, 1, 2) { it.optJSONArray("files") }!! + assertEquals(1, steps.size) + assertEquals(2L, steps.single().buildId) + assertEquals(22L, steps.single().patchFile) + assertEquals(3L, steps.single().patchSize) + assertEquals(23L, steps.single().signatureFile) + } + + @Test fun pathIsRefusedWithoutASignatureOrAPatchOrTheRightEnd() { + val noSignature = path(build(1), build(2, file(21, "patch", "default"))) + assertNull(ItchBuilds.steps(noSignature, 1, 2) { it.optJSONArray("files") }) + val noPatch = path(build(1), build(2, file(23, "signature", "default"))) + assertNull(ItchBuilds.steps(noPatch, 1, 2) { it.optJSONArray("files") }) + val wrongEnd = path(build(1), build(3, file(31, "patch", "default"), file(32, "signature", "default"))) + assertNull(ItchBuilds.steps(wrongEnd, 1, 2) { it.optJSONArray("files") }) + assertNull(ItchBuilds.steps(JSONObject(), 1, 2) { it.optJSONArray("files") }) + } + + @Test fun pathNeedsFilesFromALookupWhenTheBuildListsNone() { + val reply = path(JSONObject().put("id", 1), JSONObject().put("id", 2)) + val steps = ItchBuilds.steps(reply, 1, 2) { JSONArray().put(file(21, "patch", "default")).put(file(23, "signature", "default")) }!! + assertEquals(21L, steps.single().patchFile) + } +} 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 000000000..77fe2b2d7 --- /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 000000000..1b7d8336f --- /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/itch/ItchStagingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchStagingTest.kt new file mode 100644 index 000000000..226ef3b9b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchStagingTest.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.stores.itch + +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 +import java.io.File + +class ItchStagingTest { + @get:Rule val tmp = TemporaryFolder() + + private fun file(root: File, path: String, text: String) = File(root, path).also { it.parentFile?.mkdirs(); it.writeText(text) } + + @Test fun newFilesReplaceOldOnesAndEverythingElseStays() { + val game = tmp.newFolder("game") + val staged = tmp.newFolder("staged") + file(game, "game.exe", "old") + file(game, "data/level.dat", "old") + file(game, "saves/slot1.sav", "mine") + file(game, ".droiddeck-store.json", "record") + file(staged, "game.exe", "new") + file(staged, "data/level.dat", "new") + file(staged, "data/extra.dat", "new") + file(staged, "saves/default.sav", "new") + ItchStaging.merge(staged, game) + assertEquals("new", File(game, "game.exe").readText()) + assertEquals("new", File(game, "data/level.dat").readText()) + assertEquals("new", File(game, "data/extra.dat").readText()) + assertEquals("mine", File(game, "saves/slot1.sav").readText()) + assertEquals("new", File(game, "saves/default.sav").readText()) + assertEquals("record", File(game, ".droiddeck-store.json").readText()) + assertTrue(staged.listFiles().orEmpty().all { it.isDirectory && it.listFiles().orEmpty().isEmpty() }) + } + + @Test fun aFileReplacingADirectoryAndTheOtherWayRound() { + val game = tmp.newFolder("game") + val staged = tmp.newFolder("staged") + file(game, "a/inner.txt", "old") + file(game, "b", "old") + file(staged, "a", "new") + file(staged, "b/inner.txt", "new") + ItchStaging.merge(staged, game) + assertTrue(File(game, "a").isFile) + assertEquals("new", File(game, "a").readText()) + assertEquals("new", File(game, "b/inner.txt").readText()) + assertFalse(File(game, "a/inner.txt").exists()) + } + + @Test fun deletingFollowsNoLinkOutOfTheTree() { + val outside = tmp.newFolder("outside") + file(outside, "keep.txt", "keep") + val staged = tmp.newFolder("staged") + file(staged, "own.txt", "x") + java.nio.file.Files.createSymbolicLink(File(staged, "link").toPath(), outside.toPath()) + ItchStaging.delete(staged) + assertFalse(staged.exists()) + assertEquals("keep", File(outside, "keep.txt").readText()) + } + + @Test fun aLinkInTheGameIsReplacedNotFollowed() { + val outside = tmp.newFolder("outside") + file(outside, "keep.txt", "keep") + val game = tmp.newFolder("game") + java.nio.file.Files.createSymbolicLink(File(game, "data").toPath(), outside.toPath()) + val staged = tmp.newFolder("staged") + file(staged, "data/level.dat", "new") + ItchStaging.merge(staged, game) + assertEquals("keep", File(outside, "keep.txt").readText()) + assertFalse(File(outside, "level.dat").exists()) + assertEquals("new", File(game, "data/level.dat").readText()) + } + + @Test fun theInstallRecordIsNeverReplacedByTheArchive() { + val game = tmp.newFolder("game") + val staged = tmp.newFolder("staged") + file(game, ".droiddeck-store.json", "record") + file(staged, ".droiddeck-store.json", "forged") + file(staged, "sub/.droiddeck-store.json", "nested") + ItchStaging.merge(staged, game) + assertEquals("record", File(game, ".droiddeck-store.json").readText()) + assertEquals("nested", File(game, "sub/.droiddeck-store.json").readText()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchUpdatesTest.kt new file mode 100644 index 000000000..8193235c3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchUpdatesTest.kt @@ -0,0 +1,84 @@ +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 ItchUpdatesTest { + private fun upload(id: String, updated: String, filename: String = "game-$id.zip", windows: Boolean = true, type: String = "default") = + JSONObject().put("id", id).put("filename", filename).put("updated_at", updated).put("type", type).put("storage", "hosted") + .put("platforms", JSONObject().put("windows", windows).put("linux", !windows)) + + private fun list(vararg uploads: JSONObject) = JSONArray().also { a -> uploads.forEach { a.put(it) } } + + @Test fun aNewerStampOnTheSameUploadIsAnUpdate() { + val update = ItchUpdates.evaluate(list(upload("7", "2026-10-20T10:00:00Z")), "7", "2026-09-01T10:00:00Z")!! + assertEquals("7", update.uploadId) + assertEquals("2026-10-20T10:00:00Z", update.updatedAt) + assertFalse(update.replaced) + } + + @Test fun theSameStampIsNotAnUpdate() { + assertNull(ItchUpdates.evaluate(list(upload("7", "2026-09-01T10:00:00Z")), "7", "2026-09-01T10:00:00Z")) + } + + @Test fun anOlderStampIsNotAnUpdate() { + assertNull(ItchUpdates.evaluate(list(upload("7", "2026-08-01T10:00:00Z")), "7", "2026-09-01T10:00:00Z")) + } + + @Test fun aMissingUploadFallsBackToTheNewestWindowsOneAndAsksFirst() { + val update = ItchUpdates.evaluate( + list(upload("8", "2026-10-01T10:00:00Z"), upload("9", "2026-10-05T10:00:00Z"), upload("10", "2026-10-09T10:00:00Z", windows = false)), + "7", "2026-09-01T10:00:00Z", + )!! + assertEquals("9", update.uploadId) + assertTrue(update.replaced) + } + + @Test fun aReplacedUploadWithNoWindowsBuildLeftIsNotOffered() { + val linux = list(upload("8", "2026-10-01T10:00:00Z", windows = false)) + assertNull(ItchUpdates.evaluate(linux, "7", "2026-09-01T10:00:00Z")) + assertNull(ItchUpdates.evaluate(linux, "", "2026-09-01T10:00:00Z")) + } + + @Test fun aWindowsBuildOfAnotherTypeBeatsALinuxDefaultOne() { + val update = ItchUpdates.evaluate( + list(upload("8", "2026-10-09T10:00:00Z", windows = false), upload("9", "2026-10-01T10:00:00Z", type = "other")), + "7", "2026-09-01T10:00:00Z", + )!! + assertEquals("9", update.uploadId) + assertTrue(update.replaced) + } + + @Test fun anUnknownInstalledVersionNeverReportsAnUpdate() { + assertNull(ItchUpdates.evaluate(list(upload("7", "2026-10-20T10:00:00Z")), "7", "")) + } + + @Test fun noAnswerOrNoWindowsBuildMeansNoUpdate() { + assertNull(ItchUpdates.evaluate(null, "7", "2026-09-01T10:00:00Z")) + assertNull(ItchUpdates.evaluate(JSONArray(), "7", "2026-09-01T10:00:00Z")) + } + + @Test fun anInstallWithoutAnUploadIdComparesTheNewestWindowsBuild() { + val update = ItchUpdates.evaluate(list(upload("8", "2026-10-01T10:00:00Z")), "", "2026-09-01T10:00:00Z")!! + assertEquals("8", update.uploadId) + assertFalse(update.replaced) + assertNull(ItchUpdates.evaluate(list(upload("8", "2026-08-01T10:00:00Z")), "", "2026-09-01T10:00:00Z")) + } + + @Test fun foundUpdatesSurviveTheCache() { + val found = mapOf("itch:a/b" to ItchUpdate("9", "2026-10-05T10:00:00Z", "b.zip", true)) + val back = ItchUpdates.decode(ItchUpdates.encode(found)) + assertEquals(setOf("itch:a/b"), back.keys) + assertEquals("9", back.getValue("itch:a/b").uploadId) + assertTrue(back.getValue("itch:a/b").replaced) + assertEquals(emptyMap<String, ItchUpdate>(), ItchUpdates.decode(null)) + assertEquals(emptyMap<String, ItchUpdate>(), ItchUpdates.decode("not json")) + } +} 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 c4f95c091..a59450e34 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 000000000..bbe2e11f9 --- /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 8d545d20c..ca0735091 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 000000000..c2d723f7b --- /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/sync/SyncSnapshotTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncSnapshotTest.kt new file mode 100644 index 000000000..9f7799904 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncSnapshotTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.sync + +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class SyncSnapshotTest { + private fun folder(state: String = "idle", global: Long = 100, need: Long = 0, blocked: Boolean = false, paused: Boolean = false, errors: Int = 0) = + SyncFolder("id", "Saves", "/p", paused, blocked, state, global, need, errors, emptyList()) + + private fun snapshot(vararg folders: SyncFolder) = SyncSnapshot("me", folders.toList(), emptyList(), emptyList(), emptyList(), 0, 0) + + @Test + fun syncingReportsPercentOfActiveFolders() { + val s = snapshot(folder("syncing", global = 1000, need = 360), folder()) + assertTrue(s.syncing) + assertEquals(64, s.percent) + assertEquals(360, s.needBytes) + } + + @Test + fun blockedOrFailingFoldersNeedAttention() { + assertTrue(snapshot(folder(blocked = true, paused = true)).needsAttention) + assertTrue(snapshot(folder(errors = 2)).needsAttention) + assertTrue(snapshot(folder("idle", need = 5)).needsAttention) + assertFalse(snapshot(folder(paused = true, errors = 2)).needsAttention) + } + + @Test + fun unreadableFolderStatusShowsAsError() { + val config = JSONObject("""{"id":"saves","label":"Saves","path":"/p","paused":false,"devices":[{"deviceID":"DEV1"}]}""") + val f = SyncthingParse.folder(config, SyncthingParse.unreadableStatus(), blocked = false, names = mapOf("DEV1" to "Desktop PC")) + assertEquals("error", f.state) + assertTrue(f.errors > 0) + assertTrue(f.outOfSync) + assertFalse(f.syncing) + assertEquals(listOf("Desktop PC"), f.sharedWith) + assertTrue(snapshot(f).needsAttention) + } + + @Test + fun parsesPendingFoldersWithDeviceNames() { + val json = JSONObject("""{"emu":{"offeredBy":{"DEV1":{"label":"Emulation saves","time":"2026-01-01T00:00:00Z"}}}}""") + val pending = SyncthingParse.pendingFolders(json, mapOf("DEV1" to "Desktop PC")) + assertEquals(listOf(SyncPendingFolder("emu", "Emulation saves", "Desktop PC", "DEV1")), pending) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt new file mode 100644 index 000000000..4d51bde19 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt @@ -0,0 +1,83 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SyncthingConfigTest { + @get:Rule val tmp = TemporaryFolder() + + private val generated = """ + <configuration version="51"> + <folder id="abc" label="Camera" path="/storage/emulated/0/DCIM" type="sendreceive"> + <paused>false</paused> + </folder> + <folder id="def" label="Saves" path="/data/user/0/app/Sync/saves" type="sendreceive"> + <paused>false</paused> + </folder> + <device id="PEER" name="Desktop" compression="metadata"> + <address>dynamic</address> + <paused>false</paused> + </device> + <gui enabled="true" tls="true" debugging="false"> + <address>127.0.0.1:8384</address> + <user>droiddeck</user> + <apikey>key123</apikey> + </gui> + <options> + <listenAddress>default</listenAddress> + <localAnnouncePort>21027</localAnnouncePort> + <urAccepted>0</urAccepted> + <startBrowser>true</startBrowser> + </options> + <defaults> + <folder id="" label="" path="~" type="sendreceive"></folder> + </defaults> + </configuration> + """.trimIndent() + + private val ports = SyncthingPorts(22100, 21127) + + @Test + fun pausesDisallowedFoldersBeforeLaunch() { + val out = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { !it.startsWith("/storage/emulated/0/DCIM") } + val camera = out.substringAfter("id=\"abc\"").substringBefore("</folder>") + val saves = out.substringAfter("id=\"def\"").substringBefore("</folder>") + assertTrue(camera.contains("<paused>true</paused>")) + assertTrue(saves.contains("<paused>false</paused>")) + } + + @Test + fun pausesDevicesBeforeLaunchWhenPolicyRequires() { + val paused = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync", pauseDevices = true) { true } + assertTrue(paused.substringAfter("id=\"PEER\"").substringBefore("</device>").contains("<paused>true</paused>")) + val open = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync", pauseDevices = false) { true } + assertTrue(open.substringAfter("id=\"PEER\"").substringBefore("</device>").contains("<paused>false</paused>")) + } + + @Test + fun replacesConfigFileWithoutLeavingStagedCopy() { + val dir = tmp.newFolder() + val file = File(dir, "config.xml").apply { writeText(generated) } + SyncthingConfig.apply(file, ports, File("/data/st/gui.sock"), File("/ext/Sync"), false) { true } + assertEquals(SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true }, file.readText()) + assertEquals(listOf("config.xml"), dir.list()!!.toList()) + } + + @Test + fun applyIsStable() { + val once = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true } + assertEquals(once, SyncthingConfig.apply(once, ports, "/data/st/gui.sock", "/ext/Sync") { true }) + } + + @Test + fun guiListensOnlyOnPrivateSocket() { + val gui = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true }.substringAfter("<gui").substringBefore("</gui>") + assertTrue(gui.contains("<address>/data/st/gui.sock</address>")) + assertTrue(gui.contains("<unixSocketPermissions>600</unixSocketPermissions>")) + assertTrue(gui.contains("tls=\"false\"")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt new file mode 100644 index 000000000..94d7f1584 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File +import java.nio.file.Files + +class SyncthingGuardTest { + @get:Rule val tmp = TemporaryFolder() + + private fun setup(): Triple<SyncthingGuard, File, File> { + val data = tmp.newFolder("data") + val external = tmp.newFolder("external") + val home = File(external, "Sync").apply { mkdirs() } + val config = File(data, "files/syncthing").apply { mkdirs() } + return Triple(SyncthingGuard(home, listOf(data, external), listOf(config)), data, external) + } + + @Test + fun allowsFoldersInsideAppStorage() { + val (guard, data, external) = setup() + assertTrue(guard.allows(File(external, "Sync/Game saves").path)) + assertTrue(guard.allows(File(data, "files/linux/home").path)) + assertTrue(guard.allows("~/Shared")) + assertTrue(guard.allows(external.path)) + } + + @Test + fun blocksFoldersOutsideAppStorage() { + val (guard, _, _) = setup() + assertFalse(guard.allows(tmp.newFolder("DCIM").path)) + assertFalse(guard.allows("/storage/emulated/0/Download")) + assertFalse(guard.allows("")) + assertFalse(guard.allows("relative/path")) + } + + @Test + fun blocksSyncthingsOwnConfig() { + val (guard, data, _) = setup() + assertFalse(guard.allows(File(data, "files/syncthing").path)) + assertFalse(guard.allows(File(data, "files/syncthing/keys").path)) + } + + @Test + fun blocksFoldersHoldingSyncthingsConfig() { + val (guard, data, _) = setup() + assertFalse(guard.allows(data.path)) + assertFalse(guard.allows(File(data, "files").path)) + } + + @Test + fun blocksSiblingWithSharedPrefix() { + val (guard, _, external) = setup() + assertFalse(guard.allows(external.path + "-other")) + } + + @Test + fun blocksSymlinkPointingOutside() { + val (guard, _, external) = setup() + val outside = tmp.newFolder("outside") + val link = File(external, "Sync/link") + Files.createSymbolicLink(link.toPath(), outside.toPath()) + assertFalse(guard.allows(link.path)) + assertFalse(guard.allows(File(link, "child").path)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt new file mode 100644 index 000000000..1efb0d919 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.ByteArrayOutputStream + +class SyncthingHttpTest { + private fun response(raw: String) = SyncthingHttp.readResponse(raw.byteInputStream(Charsets.ISO_8859_1)) + + @Test + fun readsContentLengthBody() { + assertEquals(200 to """{"ping":"pong"}""", response("HTTP/1.1 200 OK\r\nContent-Length: 15\r\n\r\n{\"ping\":\"pong\"}")) + } + + @Test + fun readsChunkedBody() { + assertEquals(403 to "CSRF Error", response("HTTP/1.1 403 Forbidden\r\nTransfer-Encoding: chunked\r\n\r\n4\r\nCSRF\r\n6\r\n Error\r\n0\r\n\r\n")) + } + + @Test + fun writesOneShotRequest() { + val out = ByteArrayOutputStream() + SyncthingHttp.writeRequest(out, "POST", "/rest/system/pause", listOf("X-API-Key" to "k"), null) + val text = out.toString("ISO-8859-1") + assertTrue(text.startsWith("POST /rest/system/pause HTTP/1.1\r\n")) + assertTrue(text.contains("Connection: close\r\n")) + assertTrue(text.endsWith("X-API-Key: k\r\nContent-Length: 0\r\n\r\n")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt new file mode 100644 index 000000000..3bb8017bb --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SyncthingPortsTest { + @Test + fun skipsBusyPorts() { + val busy = setOf(22100, 21127) + val picked = SyncthingPortPicker.pick({ it !in busy }, { it !in busy }) + assertEquals(SyncthingPorts(22101, 21128), picked) + } + + @Test(expected = IllegalStateException::class) + fun failsWhenNoPortIsFree() { + SyncthingPortPicker.pick({ false }, { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingServiceTimeoutTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingServiceTimeoutTest.kt new file mode 100644 index 000000000..c4d3e44aa --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingServiceTimeoutTest.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.sync + +import android.app.Activity +import android.content.pm.ServiceInfo +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [35, 37], manifest = Config.NONE) +class SyncthingServiceTimeoutTest { + @Test fun timeoutStopsRestartLoopAndUserReturnResumesWithoutChangingPreferences() { + val app = RuntimeEnvironment.getApplication() + val previous = Thread.getDefaultUncaughtExceptionHandler() + val controller = Robolectric.buildService(SyncthingService::class.java).create() + try { + SyncPrefs.setEnabled(app, false) + Syncthing.init(app) + SyncPrefs.setRunMode(app, SyncPrefs.RUN_BACKGROUND) + SyncPrefs.setEnabled(app, true) + Syncthing.evaluate() + val shadow = shadowOf(app) + assertEquals(SyncthingService::class.java.name, shadow.nextStartedService?.component?.className) + controller.get().onTimeout(1, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) + Syncthing.evaluate() + assertNull(shadow.nextStartedService) + assertTrue(SyncPrefs.enabled(app)) + assertEquals(SyncPrefs.RUN_BACKGROUND, SyncPrefs.runMode(app)) + val activity = Robolectric.buildActivity(Activity::class.java).setup() + assertEquals(SyncthingService::class.java.name, shadow.nextStartedService?.component?.className) + activity.pause().stop().destroy() + } finally { + SyncPrefs.setEnabled(app, false) + Syncthing.evaluate() + controller.destroy() + Thread.setDefaultUncaughtExceptionHandler(previous) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt index 56a6db50b..65225da5d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt new file mode 100644 index 000000000..34df15ff0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomChatPageTest { + @Test fun steamSitesOpenOthersDoNot() { + assertTrue(steamChatAllows("steamcommunity.com")) + assertTrue(steamChatAllows("login.steampowered.com")) + assertTrue(steamChatAllows("steam-chat.com")) + assertTrue(steamChatAllows("community.cloudflare.steamstatic.com")) + assertFalse(steamChatAllows("steamcommunity.com.example.net")) + assertFalse(steamChatAllows("evilsteamcommunity.com")) + assertFalse(steamChatAllows(null)) + } + + @Test fun chatFitScriptUsesADotDecimalInEveryLocale() { + val before = java.util.Locale.getDefault() + try { + java.util.Locale.setDefault(java.util.Locale.GERMANY) + val js = steamChatFitScript(821, 0.75f) + assertTrue(js.contains("m.content='width=821, initial-scale=0.75'")) + assertTrue(js.contains("s.textContent='$STEAM_CHAT_FIT_CSS'")) + assertFalse(STEAM_CHAT_FIT_CSS.contains('\'')) + } finally { + java.util.Locale.setDefault(before) + } + } + + @Test fun theGroupChatListLeavesRoomForTheOnlineFriends() { + assertTrue(STEAM_CHAT_FIT_CSS.contains(".ChatRoomList_Empty{display:none!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chatRoomListContainer{height:auto!important;max-height:25vh!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chat_main>:has(~.chat_main_flex){display:none!important}")) + } + + @Test fun desktopAgentKeepsTheWebViewChromeVersion() { + val ua = desktopUserAgent("Mozilla/5.0 (Linux; Android 15; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/141.0.7390.122 Mobile Safari/537.36") + assertEquals("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.7390.122 Safari/537.36", ua) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt new file mode 100644 index 000000000..5d167e14e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomDashboardTest { + @Test fun theRememberedPageOpensAgain() { + assertEquals("shots", pickBottomPage("shots", listOf("downloads", "shots"))) + } + + @Test fun aGoneOrMissingPageFallsBackToTheFirst() { + assertEquals("downloads", pickBottomPage("gone", listOf("downloads", "shots"))) + assertEquals("downloads", pickBottomPage(null, listOf("downloads", "shots"))) + assertNull(pickBottomPage("shots", emptyList())) + } + + @Test fun withNothingPickedTheChatOpens() { + val ids = listOf("telemetry", "downloads", "notifications", "screenshots", "chat") + assertEquals("chat", pickBottomPage(null, ids)) + assertEquals("chat", pickBottomPage("gone", ids)) + assertEquals("telemetry", pickBottomPage("telemetry", ids)) + assertEquals("screenshots", pickBottomPage("screenshots", ids)) + } + + @Test fun aGameStartShowsTheInGameStats() { + assertEquals("telemetry", pageForGameStart(listOf("telemetry", "downloads", "chat"))) + assertNull(pageForGameStart(listOf("downloads", "chat"))) + } + + @Test fun tabNamesShowOnlyWhileEveryTabFits() { + assertTrue(bottomTabsWithLabels(640f, 4)) + assertFalse(bottomTabsWithLabels(640f, 5)) + assertFalse(bottomTabsWithLabels(360f, 3)) + } +} + +class BottomDownloadsRateTest { + @Test fun rateIsBytesPerSecondBetweenReads() { + assertEquals(1_000_000L, downloadRate(0L, 0L, 2_000_000L, 2_000L)) + } + + @Test fun noMovementOrARestartIsZero() { + assertEquals(0L, downloadRate(500L, 0L, 500L, 2_000L)) + assertEquals(0L, downloadRate(500L, 0L, 100L, 2_000L)) + assertEquals(0L, downloadRate(-1L, 0L, 100L, 2_000L)) + } +} + +class BottomTelemetryLapTimeTest { + @Test fun lapTimesReadAsMinutesSecondsMillis() { + assertEquals("1:23.456", lapTime(83.456f)) + assertEquals("0:05.000", lapTime(5f)) + } + + @Test fun eachSessionStartsWithoutAPickedTab() { + SessionBottomTab.pick("2026-11-01-01-steam", "screenshots") + assertEquals("screenshots", SessionBottomTab.picked("2026-11-01-01-steam")) + assertNull(SessionBottomTab.picked("2026-11-01-02-steam")) + assertNull(SessionBottomTab.picked(null)) + assertEquals("chat", pickBottomPage(SessionBottomTab.picked("2026-11-01-02-steam"), listOf("telemetry", "chat", "screenshots"))) + } + + @Test fun theStripNamesTheSteamClient() { + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_x86, steamClientLabel("x86_64")) + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_arm, steamClientLabel("arm64")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenTypingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenTypingTest.kt new file mode 100644 index 000000000..a8aaae6c5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenTypingTest.kt @@ -0,0 +1,64 @@ +package com.droiddeck.launcher.ui + +import android.view.KeyEvent +import androidx.compose.ui.text.TextRange +import androidx.compose.ui.text.input.CommitTextCommand +import androidx.compose.ui.text.input.DeleteAllCommand +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.ImeOptions +import androidx.compose.ui.text.input.SetSelectionCommand +import androidx.compose.ui.text.input.TextFieldValue +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class BottomScreenTypingTest { + @Test fun editsReplaceTheWholeFieldAndKeepTheCursor() { + val edits = TypingRequest.editsFor(TextFieldValue("fall", TextRange(2, 4))) + assertEquals(3, edits.size) + assertTrue(edits[0] is DeleteAllCommand) + assertEquals("fall", (edits[1] as CommitTextCommand).text) + val selection = edits[2] as SetSelectionCommand + assertEquals(2, selection.start) + assertEquals(4, selection.end) + } + + @Test fun requestForwardsTextActionAndClose() { + val sent = mutableListOf<String>() + val actions = mutableListOf<ImeAction>() + var closed = 0 + val request = TypingRequest( + TextFieldValue("a"), ImeOptions(imeAction = ImeAction.Search), + { sent += it.text }, { actions += it }, { closed++ }, + ) + request.send(TextFieldValue("ab")) + request.action() + request.close() + assertEquals(listOf("ab"), sent) + assertEquals("ab", request.value.text) + assertEquals(listOf(ImeAction.Search), actions) + assertEquals(1, closed) + } + + @Test fun panelStopsOnlyItsOwnRequest() { + val first = TypingRequest(TextFieldValue(""), ImeOptions.Default, {}, {}) + val second = TypingRequest(TextFieldValue(""), ImeOptions.Default, {}, {}) + DualScreenPanel.startTyping(second) + DualScreenPanel.stopTyping(first) + assertEquals(second, DualScreenPanel.typing) + DualScreenPanel.stopTyping(second) + assertNull(DualScreenPanel.typing) + } + + @Test fun triggersStepThroughSections() { + assertEquals(-1, dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_L2))) + assertEquals(1, dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_R2))) + assertNull(dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_L1))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt new file mode 100644 index 000000000..35f2c8cf0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BuildWatermarkTest { + @Test + fun stableAndPreviewBuildsHaveNoWatermark() { + assertNull(BuildWatermark.lines(pr = 0, ci = true, commit = "abcdef0123", title = "", branch = "")) + } + + @Test + fun prBuildShowsNumberHashAndTitle() { + assertEquals( + listOf("PR-1234 | abcdef0", "Fix: foo the bar"), + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Fix: foo the bar", branch = "x"), + ) + } + + @Test + fun longTitlesTruncateAtEightyCharacters() { + val lines = BuildWatermark.lines(pr = 7, ci = true, commit = "abcdef0", title = "a".repeat(120), branch = "")!! + assertEquals(80, lines[1].length) + assertEquals('…', lines[1].last()) + } + + @Test + fun localBuildShowsBranch() { + assertEquals( + listOf("LOCAL | abcdef0", "feat/thing"), + BuildWatermark.lines(pr = 0, ci = false, commit = "abcdef0123", title = "", branch = "feat/thing"), + ) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt index 2bf7360ed..c24497396 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt @@ -5,7 +5,7 @@ import com.droiddeck.launcher.stores.CloudSaves import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt index 4d3f1852a..41cade412 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt @@ -24,7 +24,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ComponentsPageProfileTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ComponentsPageProfileTest.kt index 501438788..acb7cce6d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ComponentsPageProfileTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ComponentsPageProfileTest.kt @@ -8,7 +8,7 @@ import com.droiddeck.launcher.frontend.Library import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt new file mode 100644 index 000000000..ea313df41 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.ui + +import android.view.MotionEvent +import android.view.View +import com.droiddeck.launcher.input.JoyConPadTest +import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.session.SessionState +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], + shadows = [JoyConPadTest.RecordingWriter::class]) +class DeckControlsPanelTest { + @Test fun takesTouchAtMatchesWhatATouchDoes() { + val directory = Files.createTempDirectory("deck-panel").toFile() + try { + SessionState.deckPad = false + for (pad in listOf(null, PadBridge(directory))) for (portraitDock in listOf(false, true)) { + val name = "pad=${pad != null} portraitDock=$portraitDock" + val panel = DeckControlsPanel(RuntimeEnvironment.getApplication(), onClose = {}, onSteamMenu = {}, onQam = {}, + pad = pad, portraitDock = portraitDock) + assertEquals(name, pad == null, panel.deckControls) + val (w, h) = if (portraitDock) 720 to 1000 else 1200 to 480 + panel.measure(View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)) + panel.layout(0, 0, w, h) + var taken = 0 + var missed = 0 + for (x in 0 until w step w / 40) for (y in 0 until h step h / 24) { + val expected = panel.takesTouchAt(x.toFloat(), y.toFloat()) + val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0) + assertEquals("$name ($x, $y)", expected, panel.dispatchTouchEvent(down)) + down.recycle() + MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_CANCEL, x.toFloat(), y.toFloat(), 0).also { panel.dispatchTouchEvent(it); it.recycle() } + if (expected) taken++ else missed++ + } + assertTrue("$name: some points land on controls", taken > 0) + assertTrue("$name: some points land between them", missed > 0) + } + } finally { + directory.deleteRecursively() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt index 3f76cac3b..93a66d38f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt @@ -19,7 +19,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt index c08c0f234..515ecfd1f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt @@ -10,7 +10,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt new file mode 100644 index 000000000..b963e9376 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -0,0 +1,84 @@ +package com.droiddeck.launcher.ui + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class DualScreenPanelOwnerTest { + private val app get() = RuntimeEnvironment.getApplication() + + @After fun clear() = DualScreenPanel.hide() + + @Test fun aLauncherThatStopsLeavesThePanelOfTheOneThatTookItOver() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.show(app, 2, 11) + DualScreenPanel.hide(10) + assertEquals(2, DualScreenPanel.shownOn) + DualScreenPanel.hide(11) + assertEquals(-1, DualScreenPanel.shownOn) + } + + @Test fun theOwnerHidesItsOwnPanel() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.hide(10) + assertEquals(-1, DualScreenPanel.shownOn) + } + + @Test fun aPausedLauncherIsOnlyBroughtBackWhenThePanelTookFocusItself() { + DualScreenPanel.show(app, 2, 10) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = false)) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun anAppTheLauncherOpenedKeepsItsScreenEvenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun aScreenFromAnotherAppKeepsTheTopScreenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + assertTrue(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.android.packageinstaller")) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun droidDecksOwnScreensAndUnresolvedIntentsDoNotYield() { + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.droiddeck.launcher")) + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", null)) + } + + @Test fun anotherTasksPauseDoesNotStopThePanelReturningFocus() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(11, true) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun aNewPanelForgetsThatTheLastLauncherWasPaused() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(10, true) + DualScreenPanel.hide() + DualScreenPanel.show(app, 2, 10) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } +} 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 3d4600f8c..0ee00d3ad 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/FlathubFocusTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FlathubFocusTest.kt index a268c46a8..53cdb4654 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/FlathubFocusTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/FlathubFocusTest.kt @@ -25,7 +25,7 @@ import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 000000000..4c0f8d05e --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 000000000..a6b907a5b --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/GameEnvironmentEditorTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameEnvironmentEditorTest.kt index 14bd5afaf..da3bf8ec6 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GameEnvironmentEditorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameEnvironmentEditorTest.kt @@ -15,7 +15,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 000000000..8e4b47a8d --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 000000000..3fd423e59 --- /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 e60f12f44..06f4dedfd 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 9f89330c1..1f0831c21 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt @@ -9,7 +9,7 @@ import com.droiddeck.launcher.frontend.Library import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -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/GestureLocalizationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GestureLocalizationTest.kt index 02d34e808..2742c81b3 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GestureLocalizationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GestureLocalizationTest.kt @@ -17,7 +17,7 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GlassesCalibrationControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GlassesCalibrationControlsTest.kt index 67dba5062..40121ac7c 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GlassesCalibrationControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GlassesCalibrationControlsTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.* import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GlassesMenuNavigationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GlassesMenuNavigationTest.kt index 7ef5078e0..186539e3e 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GlassesMenuNavigationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GlassesMenuNavigationTest.kt @@ -29,7 +29,7 @@ import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode import java.io.File diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GlassesPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GlassesPanelTest.kt index 97d049676..3ce16aec7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GlassesPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GlassesPanelTest.kt @@ -21,7 +21,7 @@ import com.droiddeck.launcher.glasses.GlassesState import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt index b64986a1e..d452c60fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt @@ -24,7 +24,7 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -144,7 +144,7 @@ class GlobalGlassesSettingsTest { onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, onSetPhantomProcessLimit = { _, _ -> }, - ), onOpenDeveloperOptions = {}, onRequestWirelessAdb = {}) + ), onOpenDeveloperOptions = {}, onRequestWirelessAdb = {}, onPairWirelessDebugging = {}) } } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/HandCameraPromptTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/HandCameraPromptTest.kt index 38f258530..a1d9ba6a7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/HandCameraPromptTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/HandCameraPromptTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt index 9b32b5036..30dd94fe5 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/HeadingLocaleTest.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.test.assertCountEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.util.Locale diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LaunchSettingsComponentsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LaunchSettingsComponentsTest.kt index 37544588f..ef427c937 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LaunchSettingsComponentsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LaunchSettingsComponentsTest.kt @@ -9,7 +9,7 @@ import org.junit.Assert.assertNull import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 000000000..d703d09be --- /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 000000000..74bc17711 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/ModeHeaderFocusTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ModeHeaderFocusTest.kt index eb35cd29d..b9dc1f7d6 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ModeHeaderFocusTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ModeHeaderFocusTest.kt @@ -17,7 +17,7 @@ import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/MotionTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/MotionTest.kt index 669410a9c..2a8cc494e 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/MotionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/MotionTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.* import org.junit.Test import org.junit.After import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavigationSelectionTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavigationSelectionTest.kt index 5332c83ab..65e0ec533 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/NavigationSelectionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavigationSelectionTest.kt @@ -12,7 +12,7 @@ import org.junit.Rule import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt new file mode 100644 index 000000000..969aa1824 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt @@ -0,0 +1,253 @@ +package com.droiddeck.launcher.ui + +import android.app.Application +import android.content.res.Configuration +import android.hardware.input.InputManager +import android.view.InputDevice +import android.view.KeyCharacterMap +import android.view.KeyEvent +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.test.* +import androidx.compose.ui.unit.Density +import androidx.compose.ui.unit.dp +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.width +import androidx.compose.ui.Modifier +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.ControllerPrefs +import com.droiddeck.launcher.input.PadBridgeRoutingTest +import com.droiddeck.launcher.input.PhysicalShortcuts +import org.junit.Assert.* +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.shadows.ShadowDialog +import java.util.Locale + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = Application::class, qualifiers = "w960dp-h640dp-land", + shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) +class PhysicalShortcutsDialogTest { + @get:Rule val compose = createRobolectricComposeRule() + private val context get() = RuntimeEnvironment.getApplication() + private lateinit var device: InputDevice + + @Before fun setUp() { + context.getSharedPreferences("controller", 0).edit().clear().commit() + device = InputDeviceBuilder.newBuilder().setId(10).setName("Retroid extra buttons") + .setDescriptor("retroid-extra").setSources(InputDevice.SOURCE_KEYBOARD) + .setKeyboardType(InputDevice.KEYBOARD_TYPE_ALPHABETIC) + .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + } + + @Test fun assignmentSavesAutomaticallyOnRelease() { + var changes = 0 + compose.setContent { DroidDeckTheme { PhysicalShortcutRows(onChanged = { changes++ }) } } + assign(PhysicalShortcuts.Action.STEAM) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN) + compose.onNodeWithText(context.getString(R.string.shortcuts_release)).assertExists() + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + compose.runOnIdle { + val binding = PhysicalShortcuts.read(context).single() + assertEquals(KeyEvent.KEYCODE_F1, binding.button.keyCode) + assertEquals(PhysicalShortcuts.Action.STEAM, binding.action) + assertEquals(1, changes) + } + } + + @Test fun buttonMappingPageOpensPhysicalShortcutAssignments() { + compose.setContent { + DroidDeckTheme { ControllerMappingPage(emptyMap(), { _, _ -> }, {}, {}) } + } + compose.onNodeWithTag("shortcuts-assign-STEAM").assertExists() + compose.onNodeWithTag("shortcuts-assign-QAM").assertExists() + compose.onNodeWithTag("shortcuts-assign-DROIDDECK").assertExists() + } + + @Test fun backCancelsCaptureWithoutSaving() { + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.QAM) + send(KeyEvent.KEYCODE_BACK, KeyEvent.ACTION_DOWN) + compose.onNodeWithTag("shortcuts-cancel").assertDoesNotExist() + compose.runOnIdle { + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + } + compose.onNodeWithTag("shortcuts-assign-QAM").assertExists() + } + + @Test fun controllerBCancelsCaptureWithoutSaving() { + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.QAM) + send(KeyEvent.KEYCODE_BUTTON_B, KeyEvent.ACTION_DOWN) + compose.onNodeWithTag("shortcuts-assign-QAM").assertExists() + assertTrue(PhysicalShortcuts.read(context).isEmpty()) + } + + @Test fun closingConflictKeepsBothPreviousAssignments() { + PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))), + PhysicalShortcuts.Action.STEAM) + PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN))), + PhysicalShortcuts.Action.QAM) + val previous = PhysicalShortcuts.read(context) + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.QAM) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertExists() + compose.onNodeWithTag("shortcuts-cancel").performScrollTo().performClick() + assertEquals(previous, PhysicalShortcuts.read(context)) + } + + @Test fun conflictingAssignmentIsNotReplacedUntilSave() { + PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))), + PhysicalShortcuts.Action.STEAM) + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.QAM) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithText(context.getString(R.string.shortcuts_conflict, + context.getString(R.string.drawer_steam_menu))).assertExists() + val button = requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))) + compose.onAllNodesWithText("${button.label} · ${button.name}").assertCountEquals(2) + assertEquals(PhysicalShortcuts.Action.STEAM, PhysicalShortcuts.read(context).single().action) + compose.onNodeWithTag("shortcuts-save").performScrollTo().performClick() + compose.runOnIdle { assertEquals(PhysicalShortcuts.Action.QAM, PhysicalShortcuts.read(context).single().action) } + } + + @Test fun removalRestoresDefaultAndPreservesOtherAssignmentsAndControllerSettings() { + ControllerPrefs.setSelectSteam(context, true) + PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))), + PhysicalShortcuts.Action.STEAM) + PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN))), + PhysicalShortcuts.Action.QAM) + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.STEAM) + send(KeyEvent.KEYCODE_F3, KeyEvent.ACTION_DOWN) + compose.onNodeWithTag("shortcuts-remove").performScrollTo().performClick() + compose.runOnIdle { + assertEquals(PhysicalShortcuts.Action.QAM, PhysicalShortcuts.read(context).single().action) + assertTrue(ControllerPrefs.read(context).selectSteam) + } + compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(context.getString(R.string.game_settings_default)) + } + + @Test fun retryRecoversFromAMissingReleaseWithoutSavingTheOldButton() { + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.STEAM) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN) + compose.onNodeWithTag("shortcuts-retry").performScrollTo().performClick() + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + send(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + send(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + val button = requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN))) + compose.onNodeWithText("${button.label} · ${button.name}").assertExists() + compose.runOnIdle { assertEquals(KeyEvent.KEYCODE_F2, PhysicalShortcuts.read(context).single().button.keyCode) } + } + + @Test fun longControllerNameDoesNotSqueezeTheMenuLabelInANarrowDrawer() { + val button = requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.ACTION_DOWN))) + .copy(name = "Xbox Wireless Controller with a long device name") + PhysicalShortcuts.assign(context, button, PhysicalShortcuts.Action.STEAM) + compose.setContent { + DroidDeckTheme { + Box(Modifier.width(360.dp)) { PhysicalShortcutRows() } + } + } + val control = compose.onNodeWithTag("shortcuts-assign-STEAM").getUnclippedBoundsInRoot() + val label = compose.onNodeWithText(context.getString(R.string.drawer_steam_menu)).getUnclippedBoundsInRoot() + assertTrue(control.right - control.left < 200.dp) + assertTrue("Menu label must not wrap vertically: $label", label.bottom - label.top <= 48.dp) + compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(context.getString(R.string.ctrl_custom)) + compose.onNodeWithText("${button.label} · ${button.name}").assertExists() + } + + @Test fun replacingSameActionsButtonSavesWithoutConfirmation() { + val oldButton = requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))) + PhysicalShortcuts.assign(context, oldButton, PhysicalShortcuts.Action.STEAM) + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.STEAM) + send(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN) + assertEquals(oldButton, PhysicalShortcuts.read(context).single().button) + send(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + compose.runOnIdle { assertEquals(KeyEvent.KEYCODE_F2, PhysicalShortcuts.read(context).single().button.keyCode) } + } + + @Test + @Config(qualifiers = "de-rDE-w400dp-h850dp-port") + fun narrowLargeTextKeepsTranslatedCaptureReachableAndSavesOnRelease() { + compose.setContent { + val density = LocalDensity.current + CompositionLocalProvider(LocalDensity provides Density(density.density, fontScale = 1.5f)) { + DroidDeckTheme { PhysicalShortcutRows() } + } + } + assign(PhysicalShortcuts.Action.DROIDDECK) + compose.onNodeWithText(context.getString(R.string.shortcuts_capture, + context.getString(R.string.shortcuts_dd_menu))).assertExists() + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN) + send(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_UP) + compose.onNodeWithTag("shortcuts-save").assertDoesNotExist() + compose.runOnIdle { assertEquals(PhysicalShortcuts.Action.DROIDDECK, PhysicalShortcuts.read(context).single().action) } + } + + @Test + @Config(qualifiers = "ar-rEG-w400dp-h850dp-port") + fun rightToLeftDialogKeepsCancelReachable() { + compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } } + assign(PhysicalShortcuts.Action.QAM) + compose.onNodeWithTag("shortcuts-cancel").performScrollTo().assertIsDisplayed().performClick() + compose.onNodeWithTag("shortcuts-assign-QAM").assertExists() + } + + @Test fun everySupportedLanguageHasALocalizedShortcutTitleAndValidFormatArguments() { + val languages = mutableListOf<String>() + context.resources.getXml(R.xml.locales_config).use { xml -> + while (xml.next() != org.xmlpull.v1.XmlPullParser.END_DOCUMENT) { + if (xml.eventType == org.xmlpull.v1.XmlPullParser.START_TAG && xml.name == "locale") { + languages.add(xml.getAttributeValue("http://schemas.android.com/apk/res/android", "name")) + } + } + } + val english = context.getString(R.string.shortcuts_title) + for (language in languages) { + val config = Configuration(context.resources.configuration).apply { setLocale(Locale.forLanguageTag(language)) } + val localized = context.createConfigurationContext(config) + if (language != "en") assertNotEquals(language, english, localized.getString(R.string.shortcuts_title)) + assertTrue(localized.getString(R.string.shortcuts_capture, "ACTION").contains("ACTION")) + assertTrue(localized.getString(R.string.shortcuts_conflict, "ACTION").contains("ACTION")) + val detected = localized.getString(R.string.shortcuts_detected, "DEVICE", "BUTTON") + assertTrue(detected.contains("DEVICE")) + assertTrue(detected.contains("BUTTON")) + } + } + + private fun assign(action: PhysicalShortcuts.Action) { + compose.onNodeWithTag("shortcuts-assign-${action.name}").performClick() + } + + private fun send(code: Int, action: Int) { + compose.runOnIdle { + assertTrue(ShadowDialog.getLatestDialog().window!!.callback.dispatchKeyEvent(event(code, action))) + } + compose.waitForIdle() + } + + private fun event(code: Int, action: Int) = + KeyEvent(100L, 100L, action, code, 0, 0, device.id, 700, 0, InputDevice.SOURCE_KEYBOARD) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt index 9ed572671..255b5c939 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PickListingTest.kt @@ -8,7 +8,7 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import java.io.File @@ -29,6 +29,17 @@ class PickListingTest { assertEquals(listOf("alarms", "Android", "DCIM", "Documents", "Download", "Games", "Winlator"), listing.folders.map { it.dir.name }) } + @Test fun hiddenDirectoriesAndExecutablesCanBeShownOnRequest() { + val root = storage() + val hidden = File(root, ".Games").apply { mkdirs() } + File(hidden, "Game.exe").writeText("game") + assertFalse(pickListing(root, PickKind.EXE).folders.any { it.dir.name == ".Games" }) + val listing = pickListing(root, PickKind.EXE, showHidden = true) + assertTrue(listing.folders.any { it.dir.name == ".Games" }) + assertTrue(listing.files.any { it.name == ".hidden.exe" }) + assertEquals(listOf("Game.exe"), pickListing(hidden, PickKind.EXE).files.map { it.name }) + } + @Test fun onlyExesForAGameOnlyImagesForArt() { val root = storage() assertEquals(listOf("game.EXE", "Setup.exe"), pickListing(root, PickKind.EXE).files.map { it.name }) 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 000000000..54f8f37d7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -0,0 +1,146 @@ +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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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").scrollWithClock() + 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").scrollWithClock() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Add game").assertIsDisplayed() + compose.onNodeWithText("Filter").scrollWithClock() + 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 = { _, _ -> }, + ) + private fun SemanticsNodeInteraction.scrollWithClock(): SemanticsNodeInteraction { + val previous = compose.mainClock.autoAdvance + compose.mainClock.autoAdvance = true + return try { + performScrollTo() + } finally { + compose.mainClock.autoAdvance = previous + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PresetScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PresetScaleTest.kt index 244918291..0369f55dc 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PresetScaleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PresetScaleTest.kt @@ -17,7 +17,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 51da840cb..02d6c9319 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,11 +10,13 @@ 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 -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @@ -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/RobolectricComposeRule.kt b/app/src/test/java/com/droiddeck/launcher/ui/RobolectricComposeRule.kt index b21ffa60d..a26973f87 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/RobolectricComposeRule.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/RobolectricComposeRule.kt @@ -8,6 +8,7 @@ import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf fun createRobolectricComposeRule() = createComposeRule().also { + RingVeil.reset() val context = RuntimeEnvironment.getApplication() shadowOf(context.packageManager).addActivityIfNotPresent( ComponentName(context, ComponentActivity::class.java), diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt index c1d5ad10d..35561a41d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt @@ -19,7 +19,8 @@ class SessionDrawerPageTest { assertEquals(SessionDrawerPage.DISPLAY, connected.step(SessionDrawerPage.SECOND_SCREEN, 1)) assertEquals(sessionDrawerPages(false), connected.filter { it != SessionDrawerPage.SECOND_SCREEN }) for (pages in listOf(connected, sessionDrawerPages(false))) { - assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.DISPLAY, 1)) + assertEquals(SessionDrawerPage.HUD, pages.step(SessionDrawerPage.DISPLAY, 1)) + assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.HUD, 1)) assertEquals(SessionDrawerPage.VR, pages.step(SessionDrawerPage.EFFECTS, 1)) assertEquals(SessionDrawerPage.GAMES, pages.step(SessionDrawerPage.VR, 1)) assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.GAMES, 1)) 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 04d3f5632..7a5950278 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -7,8 +7,9 @@ import android.view.InputDevice import android.view.KeyEvent import android.view.View import android.view.ViewGroup -import android.widget.Button +import android.widget.TextView import androidx.compose.ui.test.* +import androidx.compose.ui.semantics.SemanticsProperties.StateDescription import androidx.compose.runtime.MutableState import com.droiddeck.launcher.R import com.droiddeck.launcher.SessionActivity @@ -21,13 +22,14 @@ import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.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.Robolectric -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @@ -71,10 +73,82 @@ class SessionSecondScreenTest { compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertDoesNotExist() } + @Test fun provisionalBottomScreenPanelSettlesOnlyOnceTheSessionIsInFront() { + SessionState.mode = SessionService.MODE_STEAM + val previousMode = SessionState.secondScreenMode + val previousProvisional = SessionState.secondScreenProvisional + SessionState.secondScreenMode = SecondScreenMode.NONE + try { + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val pip: MutableState<Boolean> = ReflectionHelpers.getField(activity, "pipUi\$delegate") + fun settle() = ReflectionHelpers.callInstanceMethod<Unit>(activity, "settleDualScreenControls") + SessionState.secondScreenProvisional = true + ReflectionHelpers.setField(activity, "started", true) + pip.value = true + settle() + assertTrue(SessionState.secondScreenProvisional) + pip.value = false + ReflectionHelpers.setField(activity, "started", false) + settle() + assertTrue(SessionState.secondScreenProvisional) + ReflectionHelpers.setField(activity, "started", true) + settle() + assertFalse(SessionState.secondScreenProvisional) + } finally { + SessionState.secondScreenMode = previousMode + SessionState.secondScreenProvisional = previousProvisional + } + } + + @Test fun terminalOpenedBeforeItWasReadyIsRetriedButOtherPanelsAreLeftAlone() { + SessionState.mode = SessionService.MODE_STEAM + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) + val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, {}, {}, {}) + try { + panel.show() + panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) + val root = panel.window!!.decorView + val trackpad = descendants(root).toList() + panel.retryTerminal() + assertEquals(trackpad, descendants(root).toList()) + panel.showMode(SecondScreenMode.TERMINAL) + val notReady = context.getString(R.string.second_terminal_not_ready) + val before = descendants(root).filter { (it as? TextView)?.text == notReady }.single() + panel.retryTerminal() + val after = descendants(root).filter { (it as? TextView)?.text == notReady }.single() + assertTrue(before !== after) + } finally { + panel.closeControls() + } + } + @Test fun desktopTrackpadOmitsSteamShortcuts() = checkShortcuts(steam = false) @Test fun steamTrackpadKeepsWorkingSteamShortcuts() = checkShortcuts(steam = true) + @Test fun trackpadMenuButtonOnlyAppearsWhenTheMenuCanMove() { + SessionState.mode = SessionService.MODE_STEAM + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) + val label = context.getString(R.string.touch_droiddeck_menu) + for (movable in listOf(false, true)) { + var menus = 0 + val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, + {}, {}, {}, onMenu = if (movable) ({ menus++ }) else null) + try { + panel.create() + panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) + val buttons = descendants(panel.window!!.decorView).filter { it.contentDescription == label }.toList() + assertEquals(if (movable) 1 else 0, buttons.size) + buttons.forEach { it.performClick() } + assertEquals(if (movable) 1 else 0, menus) + } finally { + panel.closeControls() + } + } + } + @Test @Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) fun controllerBumpersReachTheSecondScreenInBothSessionModes() { @@ -85,7 +159,7 @@ class SessionSecondScreenTest { SessionState.mode = mode val activity = Robolectric.buildActivity(SessionActivity::class.java).get() fun <T> state(name: String): MutableState<T> = ReflectionHelpers.getField(activity, "$name\$delegate") - state<Boolean>("drawerOpen").value = true + state<Boolean>("drawerOpenState").value = true state<Boolean>("drawerControllerActive").value = true state<List<SecondScreenDisplay>>("secondScreenDisplays").value = listOf(SecondScreenDisplay(1, "Bottom screen")) for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.SECOND_SCREEN, @@ -97,6 +171,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, "drawerOpenState\$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>() @@ -124,9 +261,9 @@ class SessionSecondScreenTest { try { panel.create() panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) - val buttons = descendants(panel.window!!.decorView).filterIsInstance<Button>().toList() + val buttons = descendants(panel.window!!.decorView).filterIsInstance<TextView>().filter { it.isClickable }.toList() assertTrue(buttons.any { it.text == context.getString(R.string.second_show_keyboard) }) - val shortcuts = buttons.filter { it.text == "STEAM" || it.text == "…" } + val shortcuts = buttons.filter { it.text == "STEAM" || it.text == "•••" } if (steam) { assertEquals(2, shortcuts.size) shortcuts.forEach { it.performClick() } @@ -145,8 +282,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/SpatialSetupTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SpatialSetupTest.kt index be609f39e..9bc0977af 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SpatialSetupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SpatialSetupTest.kt @@ -13,7 +13,7 @@ import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SteamHomeHeadsetTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SteamHomeHeadsetTest.kt index 14aed407e..1163b6979 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SteamHomeHeadsetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SteamHomeHeadsetTest.kt @@ -18,7 +18,7 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) 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 000000000..48f8637d6 --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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/StepOutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt index 482e584f3..aed8786a7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt @@ -8,7 +8,7 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode @@ -37,6 +37,34 @@ class StepOutTest { assertEquals(300f, b.bottom, 0.5f) } + @Test fun aLeftMenuWithRoomStaysLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(1900f, 20f, 1980f, 80f), hostWidth = 2400f, wanted = 840f)) + } + + @Test fun aLeftMenuNearTheLeftEdgeOpensRight() { + assertEquals(StepSide.Right, fitStepSide(StepSide.Left, Rect(300f, 20f, 420f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aRightMenuNearTheRightEdgeOpensLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Right, Rect(900f, 20f, 1000f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aSqueezedMenuKeepsItsSideWhenTheOtherSideIsNarrower() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(600f, 20f, 700f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun theOutlineReachFollowsTheChosenSide() { + val wide = Rect(600f, 20f, 700f, 80f) + assertEquals(600f to 300f, stepReach(StepSide.Left, wide, hostWidth = 1080f, width = 400)) + assertEquals(700f to 1000f, stepReach(StepSide.Right, wide, hostWidth = 1080f, width = 400)) + } + + @Test fun theOutlineReachStaysInsideTheHost() { + val near = Rect(100f, 20f, 200f, 80f) + assertEquals(100f to 0f, stepReach(StepSide.Left, near, hostWidth = 1080f, width = 400)) + assertEquals(200f to 1080f, stepReach(StepSide.Right, near, hostWidth = 1080f, width = 1200)) + } + @Test fun aClosedOutlineIsJustThePill() { val path = Path() stepPathRight(path, pill, right = pill.right, bottom = pill.bottom, pullTop = pill.bottom + 6f, box = 16f, fillet = 10f, pillCorner = 12f) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt index 3b47a8490..638115467 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.assertFalse import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config 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 ad1b13df7..2fe9509d8 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 000000000..0ff60768b --- /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 com.droiddeck.launcher.core.DroidDeckTestRunner as 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 a5578a0f7..000000000 --- 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/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt index b6f4de204..94433ba11 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @@ -132,4 +132,40 @@ class ThemeColorsTest { assertTrue(Themes.all.any { it.id == Themes.GRADIENT }) assertEquals(Themes.GRAPHITE, Themes.byId("nonsense").id) } + + @Test fun innerGamerSitsJustAboveGradientInTheThemeList() { + val ids = Themes.all.map { it.id } + assertEquals(ids.indexOf(Themes.GRADIENT) - 1, ids.indexOf(Themes.INNER_GAMER)) + } + + @Test fun innerGamerButtonTextIsReadableAlongTheGradientAtEveryHue() { + var hue = 0f + while (hue < 360f) { + val p = Themes.innerGamer(hue) + assertEquals(Themes.INNER_GAMER, p.id) + for (i in 0..100) { + val f = i / 100f + val blend = Color( + p.primary.red + (p.primary2.red - p.primary.red) * f, + p.primary.green + (p.primary2.green - p.primary.green) * f, + p.primary.blue + (p.primary2.blue - p.primary.blue) * f, + ) + assertTrue("hue $hue at $f", contrast(p.onPrimary, blend) >= 4.49f) + } + hue += Themes.RGB_HUE_STEP + } + } + + @Test fun innerGamerFollowsTheHueAndTheSpeedIsSavedAndKeptInRange() { + Themes.moveRgbHue(120f) + assertEquals(Themes.innerGamer(120f).primary, Themes.byId(Themes.INNER_GAMER).primary) + Themes.setRgbSpeed(app, 7) + assertEquals(7, SessionPrefs.rgbSpeed(app)) + Themes.setRgbSpeed(app, 99) + assertEquals(Themes.RGB_SPEEDS, Themes.rgbSpeed) + Themes.setRgbSpeed(app, 0) + assertEquals(1, SessionPrefs.rgbSpeed(app)) + Themes.setRgbSpeed(app, 1) + assertTrue(Themes.rgbCycleMillis(1) > Themes.rgbCycleMillis(10)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/TouchGestureDialogTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/TouchGestureDialogTest.kt index 3189deba6..0c21a43ad 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/TouchGestureDialogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/TouchGestureDialogTest.kt @@ -13,7 +13,7 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config diff --git a/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt index 3275e622f..c9d27f2ef 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt @@ -8,7 +8,7 @@ import com.droiddeck.launcher.glasses.TrackingRecovery import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode @@ -78,7 +78,6 @@ class TrackingRecoveryViewTest { difference+=abs(((actual ushr 16) and 255)-((reference ushr 16) and 255)) } } - // Native text rasterization can round a translated glyph edge differently. assertTrue("Eye at x=$x changed $changed pixels",changed<pixels/1000) assertTrue("Eye at x=$x has different content",difference.toDouble()/(pixels*3)<0.1) } diff --git a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt index ada2ff3be..523fb3e73 100644 --- a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt @@ -8,6 +8,7 @@ import com.droiddeck.launcher.update.AppUpdates.Offer import com.droiddeck.launcher.update.AppUpdates.PreviewChange import com.droiddeck.launcher.update.AppUpdates.PreviewHistoryKind import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.json.JSONArray @@ -16,7 +17,7 @@ import org.junit.Assert.assertTrue import org.junit.Assert.fail import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import java.io.IOException @RunWith(RobolectricTestRunner::class) @@ -285,4 +286,69 @@ class AppUpdatesTest { } catch (_: IOException) { } } + + @Test fun anOlderStableIsGuessedStableAndSaved() { + val g = AppUpdates.guessFollow(catalog, me("eeeeeee999", version = "0.1.9")) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertTrue(g.certain) + } + + @Test fun anOlderBuildInPreviewHistoryKeepsStableAsAnUncertainGuess() { + val withHistory = AppUpdates.Catalog(stable, release("1111111"), emptyList(), 0L, recentPreview) + val g = AppUpdates.guessFollow(withHistory, me("2".repeat(40), version = "0.1.0")) + assertEquals(Channel.STABLE, g.follow.channel) + assertFalse(g.certain) + } + + @Test fun anOlderCataloguedBuildDoesNotPersistAGuessAndExplicitChoicesStillWin() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + val preferences = context.getSharedPreferences("app_updates", android.content.Context.MODE_PRIVATE) + preferences.edit().clear().commit() + try { + val installed = me("2".repeat(40), version = "0.1.0") + val newerStable = release("0".repeat(40), version = "9999.0.0") + val currentPreview = release(installed.commit) + val newerCatalog = AppUpdates.Catalog(newerStable, currentPreview, emptyList(), 0L) + assertEquals(Channel.STABLE, AppUpdates.follow(context, newerCatalog, installed).channel) + assertNull(preferences.getString("channel", null)) + assertEquals(Channel.STABLE, AppUpdates.follow(context, null, installed).channel) + assertNull(preferences.getString("channel", null)) + for (choice in listOf(Follow(Channel.STABLE), Follow(Channel.NIGHTLY), Follow(Channel.TEST, 93))) { + AppUpdates.setFollow(context, choice) + val actual = AppUpdates.follow(context, newerCatalog, installed) + assertEquals(choice.channel, actual.channel) + assertEquals(choice.pr, actual.pr) + } + } finally { + preferences.edit().clear().commit() + } + } + + @Test fun runningTheCatalogStableIsCertainStable() { + val g = AppUpdates.guessFollow(catalog, me(stable.commit)) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertTrue(g.certain) + } + + @Test fun aPublishedPreviewPastStableIsGuessedNightlyWithoutSaving() { + val withHistory = AppUpdates.Catalog(stable, release("1111111"), emptyList(), 0L, recentPreview) + val g = AppUpdates.guessFollow(withHistory, me("2".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.NIGHTLY, g.follow.channel) + assertFalse(g.certain) + } + + @Test fun anUncataloguedNewerBuildStaysStableForNow() { + val g = AppUpdates.guessFollow(catalog, me("9".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.STABLE, g.follow.channel) + assertFalse(g.certain) + val offline = AppUpdates.guessFollow(null, me("9".repeat(40), version = "0.3.0")) + assertEquals(AppUpdates.Channel.STABLE, offline.follow.channel) + assertFalse(offline.certain) + } + + @Test fun aPullRequestBuildIsCertainTest() { + val g = AppUpdates.guessFollow(catalog, me("ccccccc2222222222222222222222222222222", pr = 93)) + assertEquals(AppUpdates.Channel.TEST, g.follow.channel) + assertTrue(g.certain) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt b/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt index 15c09f8b3..4e7a7e1b9 100644 --- a/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt @@ -7,7 +7,7 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner +import com.droiddeck.launcher.core.DroidDeckTestRunner as RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) diff --git a/app/src/test/resources/gog/README.md b/app/src/test/resources/gog/README.md new file mode 100644 index 000000000..88e237a11 --- /dev/null +++ b/app/src/test/resources/gog/README.md @@ -0,0 +1,8 @@ +Generation 1 fixtures from GOG's public Rayman 2 repository, timestamp 31847977, +retrieved 2026-10-28. The repository and Neutral depot are complete. The English +depot is an excerpt containing its first three original file entries. + +https://gog-cdn-fastly.gog.com/content-system/v1/manifests/1207658940/windows/31847977/repository.json + +The fixtures retain provider paths, support flags, range offsets, and original +hexadecimal hashes. They contain no game payload, credentials, or signed links. diff --git a/app/src/test/resources/gog/rayman-gen1-english-excerpt.json b/app/src/test/resources/gog/rayman-gen1-english-excerpt.json new file mode 100644 index 000000000..dfca15da8 --- /dev/null +++ b/app/src/test/resources/gog/rayman-gen1-english-excerpt.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "depot": { + "name": "Rayman 2 - The Great Escape", + "files": [ + { + "offset": 384206096, + "hash": "a08070ecde7f746779259f7ce5775747", + "url": "1207658940/main.bin", + "path": "/Data/World/Levels/Raycap/Raycap.snd", + "size": 32 + }, + { + "offset": 114255832, + "hash": "67165fe729ffda351a04e8bd92e05531", + "url": "1207658940/main.bin", + "path": "/Data/World/Sound/Bnk_29.bnm", + "size": 76 + }, + { + "offset": 97474601, + "hash": "2d2e0b308cae5ff44a620fd32bf6cb4d", + "url": "1207658940/main.bin", + "path": "/Data/World/Sound/Bnk_43.bnm", + "size": 76 + } + ] + } +} diff --git a/app/src/test/resources/gog/rayman-gen1-neutral.json b/app/src/test/resources/gog/rayman-gen1-neutral.json new file mode 100644 index 000000000..fde2b6929 --- /dev/null +++ b/app/src/test/resources/gog/rayman-gen1-neutral.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "depot": { + "name": "Rayman 2 - The Great Escape", + "files": [ + { + "offset": 0, + "path": "1207658940/galaxy_rayman2_2.1.0.39.exe", + "size": 1258944, + "support": true, + "hash": "ee2c247373733f29782395f1f92622f6", + "url": "1207658940/main.bin" + } + ] + } +} diff --git a/app/src/test/resources/gog/rayman-gen1-repository.json b/app/src/test/resources/gog/rayman-gen1-repository.json new file mode 100644 index 000000000..33922d842 --- /dev/null +++ b/app/src/test/resources/gog/rayman-gen1-repository.json @@ -0,0 +1,65 @@ +{ + "product": { + "timestamp": 31847977, + "depots": [ + { + "languages": [ + "Neutral" + ], + "size": "1258944", + "gameIDs": [ + "1207658940" + ], + "systems": [ + "Windows" + ], + "manifest": "a01f6fb8-55a8-4f33-bc5b-5f5d2f591775.json" + }, + { + "languages": [ + "English" + ], + "size": "505011865", + "gameIDs": [ + "1207658940" + ], + "systems": [ + "Windows" + ], + "manifest": "ec88140c-2589-41a0-bbf3-8fc1f215fe5a.json" + }, + { + "redist": "nGlide", + "size": "0", + "targetDir": "/" + } + ], + "support_commands": [ + { + "languages": [ + "Neutral" + ], + "executable": "/galaxy_rayman2_2.1.0.39.exe", + "gameID": "1207658940", + "argument": "", + "systems": [ + "Windows" + ] + } + ], + "installDirectory": "Rayman 2", + "rootGameID": "1207658940", + "gameIDs": [ + { + "gameID": "1207658940", + "name": { + "en": "Rayman 2 - The Great Escape" + }, + "dependencies": [], + "standalone": true + } + ], + "projectName": "Rayman 2 - The Great Escape" + }, + "version": 1 +} diff --git a/app/src/test/resources/robolectric.properties b/app/src/test/resources/robolectric.properties index 3f67ea5ac..3bfb71f72 100644 --- a/app/src/test/resources/robolectric.properties +++ b/app/src/test/resources/robolectric.properties @@ -1 +1 @@ -sdk=35 +sdk=28,37 diff --git a/artwork/boot-animation-source/embed_sound.py b/artwork/boot-animation-source/embed_sound.py index 7354e3c32..18bc9c7d2 100644 --- a/artwork/boot-animation-source/embed_sound.py +++ b/artwork/boot-animation-source/embed_sound.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Embed droiddeck-boot-sound.wav into droiddeck-boot.html (MP3, base64) for the preview page.""" import base64, re, subprocess from pathlib import Path here = Path(__file__).parent diff --git a/artwork/boot-animation-source/render.py b/artwork/boot-animation-source/render.py index 66a32dbcd..2f4643ad0 100644 --- a/artwork/boot-animation-source/render.py +++ b/artwork/boot-animation-source/render.py @@ -1,15 +1,4 @@ #!/usr/bin/env python3 -"""Render the DroidDeck boot animation to .webm (Steam) or .mp4 (H.264). - -Usage: python3 render.py [WIDTH] [HEIGHT] [FPS] [OUT] [light|dark] - python3 render.py 1280 720 30 droiddeck-boot.webm - python3 render.py 1920 1080 60 droiddeck-boot.mp4 - python3 render.py 1280 720 30 droiddeck-boot-dark.webm dark - -Needs: pip install playwright && playwright install chromium, plus ffmpeg with libvpx. -The animation is drawn by droiddeck-boot.html (same folder); each frame gets real -motion blur (180-degree shutter, up to 48 sub-frames when things move fast). -""" import base64, os, shutil, subprocess, sys, tempfile, time from pathlib import Path from playwright.sync_api import sync_playwright diff --git a/artwork/boot-animation-source/sound.py b/artwork/boot-animation-source/sound.py index 6919dfbc9..b0a7d6c64 100644 --- a/artwork/boot-animation-source/sound.py +++ b/artwork/boot-animation-source/sound.py @@ -1,18 +1,4 @@ #!/usr/bin/env python3 -"""DroidDeck boot animation: procedural sound design. - -Every sound is synthesized (no samples) and placed on the exact physics events the animation -engine reports (events.json, exported by events.py). Key: D major. - - legs (arch) lands on a muted D - ball lands on A, the second bounce a quieter echo - bowl lands on F# - balancing silence - jump silence - lock a soft landing in the same voice, then all those notes together as the D chord - -Usage: python3 sound.py [events.json] [out.wav] -""" import json, sys import numpy as np from scipy import signal @@ -32,7 +18,6 @@ D3, A3, D4, E4, Fs4, A4, B4, Cs5, D5, E5, Fs5, A5, D6 = [hz(n) for n in (50, 57, def tt(dur): return np.arange(int(dur * SR)) / SR def edge(x, a_ms=1.0, r_ms=4.0): - """Click-free start and end.""" na, nr = max(1, int(a_ms * SR / 1000)), max(1, int(r_ms * SR / 1000)) x[:na] *= np.sin(np.linspace(0, np.pi / 2, na)) ** 2 x[-nr:] *= np.cos(np.linspace(0, np.pi / 2, nr)) ** 2 @@ -51,7 +36,6 @@ def modal(freqs, decays, amps, dur): return y def glide(f0, f1, tau, dur): - """Sine whose pitch moves exponentially from f0 to f1.""" t = tt(dur); f = f1 + (f0 - f1) * np.exp(-t / tau) return np.sin(2 * np.pi * np.cumsum(f) / SR) @@ -69,7 +53,6 @@ def put(t0, st, gain=1.0): j = min(N, i + st.shape[1]); MIX[:, i:j] += gain * st[:, :j - i] def wood(amp, f0=520, size=1.0, thump=0.0, dur=.35): - """Hard wood / toy-block clack. thump adds body for heavy landings.""" r = [1, 1.93, 2.81, 4.13, 5.62] y = modal([f0 * k for k in r], [s * size for s in (.055, .034, .022, .014, .009)], [1, .55, .42, .26, .16], dur) y += .7 * noise_burst(dur, 1400, 7500, .0035) @@ -77,7 +60,6 @@ def wood(amp, f0=520, size=1.0, thump=0.0, dur=.35): return edge(y * amp) def bonk(amp, f): - """Hollow rubber ball on a board: round pitched body, soft click, tiny board knock.""" d = .42; t = tt(d) y = glide(f * 1.28, f, .018, d) * np.exp(-t / (.09 + .05 * amp)) y += .22 * glide(f * 2.45, f * 2.3, .02, d) * np.exp(-t / .035) @@ -87,7 +69,6 @@ def bonk(amp, f): return edge(y * amp, a_ms=.6) def bowl_ring(amp, f=A4, dur=2.4, dscale=1.0): - """Struck metal bowl: inharmonic partials, each split in two for the slow beating shimmer.""" t = tt(dur); y = np.zeros_like(t) for k, dec, a, beat in zip((1, 2.71, 5.12, 8.21), tuple(d * dscale for d in (1.25, .62, .3, .15)), (1, .45, .24, .12), (.9, 1.7, 2.6, 3.1)): for s in (-1, 1): @@ -107,7 +88,6 @@ def marimba(f, amp, damp=1.0): return edge(y * amp, a_ms=1.5, r_ms=40) def svf_whoosh(env, fc, q=.9): - """Noise through a band-pass whose centre follows fc(t): air moving past a spinning piece.""" x = rng.standard_normal(len(env)); y = np.zeros_like(x); ic1 = ic2 = 0.0 for i in range(len(x)): g = np.tan(np.pi * min(fc[i], SR * .45) / SR); k = 1 / q @@ -117,7 +97,6 @@ def svf_whoosh(env, fc, q=.9): return y * env def epiano(f, amp, dur=2.8, decay=1.5): - """FM electric piano: bright tine at the strike that mellows as the index falls.""" t = tt(dur) idx = 1.7 * np.exp(-t / .22) + .22 y = np.sin(2 * np.pi * f * t + idx * np.sin(2 * np.pi * f * t)) @@ -125,7 +104,6 @@ def epiano(f, amp, dur=2.8, decay=1.5): return edge(y * np.exp(-t / decay) * amp, a_ms=3, r_ms=60) def tock(f, amp, decay=.42, sub=0.0): - """A landing as a muted note in the chord's own FM e-piano voice: felt contact, no pitch bend.""" d = 1.5; t = tt(d) idx = 1.3 * np.exp(-t / .07) + .18 y = np.sin(2 * np.pi * f * t + idx * np.sin(2 * np.pi * f * t)) * np.exp(-t / decay) diff --git a/build.gradle b/build.gradle index 70c4e0532..6e6dde7f8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:8.8.0' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0' - classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.0' + classpath 'com.android.tools.build:gradle:9.5.0' + classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.10' } } diff --git a/docs/agent-control.md b/docs/agent-control.md index 98cf552e3..5dc16253e 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 c39ae8d14..625d8188e 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/arm64-steam-client.md b/docs/development/arm64-steam-client.md new file mode 100644 index 000000000..bb9120017 --- /dev/null +++ b/docs/development/arm64-steam-client.md @@ -0,0 +1,59 @@ +# Native arm64 Steam client: channel and runtime + +The default client is Valve's arm64 Linux build (`steamrtarm64/steam`). Valve does not support it, but +publishes it on the Steam Deck client channels. `droiddeck-steam-install` installs it and +`droiddeck-session` starts it with `STEAM_RUNTIME=1`. + +## Channel + +- The default is `steamdeck_publicbeta` (manifest `steam_client_steamdeck_publicbeta_linuxarm64`). + Valve also publishes `steam_client_steamdeck_stable_linuxarm64`. +- `droiddeck-steam-install --channel` prints the channel in use. The session passes that value as + `-clientbeta` and writes it to `package/beta`. The two must match, or the client loops on rc 42. +- Setting: `BL_STEAM_CHANNEL`, otherwise `~/.config/droiddeck/steam-channel`, set to `beta` or + `stable`. A set channel never changes on its own. +- With no setting, the client falls back to `steamdeck_stable` automatically. It stays on stable + (`package/droiddeck-channel`) until a setting says otherwise. The fallback happens: + - when the client was started two more times without being shown after the start-failure repair + (`package/droiddeck-unconfirmed`: two unconfirmed starts trigger a repair, which writes + `repaired`; two more unconfirmed starts trigger the fallback); + - when the beta manifest has no `*_linuxarm64_linuxarm64` component. The install log then lists the + manifest's block names, so a renamed or removed arm64 build can be seen. +- The x86-64 client keeps `steamdeck_publicbeta` (see [x86-64-steam-client.md](x86-64-steam-client.md)). + +## Steam Runtime container + +Valve's 2026-10-15 beta made the x86 Linux client 64-bit and put it in a Steam Runtime container +(pressure-vessel). The container needs unprivileged user and mount namespaces and a D-Bus session bus, +which an Android app does not have. The x86-64 path already works around this. The arm64 client gets the +same treatment if Valve containerizes it too: + +- `STEAM_STEAMRT_RECURSION_GUARD=1` is exported for both clients. It tells the client that it is + already inside its container, so after an update it does not re-execute itself through + `pressure-vessel-wrap` (bwrap). +- `droiddeck-steamrt-shim <client dir> <shim dir>` builds the shim when the client carries + `pv-runtime/steam-runtime-steamrt` or a `steam-runtime-check-requirements` probe: + - Valve's runtime is linked file by file; + - the probe is replaced with `exit 0`; + - its own `steam-runtime-launch-client` runs commands directly. + + For the arm64 client the session then starts it with `STEAM_RUNTIME_STEAMRT` and `PATH` pointing + at `~/.droiddeck-steamrt-shim` and logs "Valve containerized the arm64 Steam client". Without those + files the shim is not built and the start is unchanged. + +## What Valve's manifests carry (checked 2026-10-22) + +- `steam_client_steamdeck_publicbeta_linuxarm64` (1792626604) and `steam_client_steamdeck_stable_linuxarm64` + (1792618285) have the same blocks. Three platforms share them: + - `*_linuxarm64_linuxarm64`: the native client (`steamrtarm64/`, `linuxarm64/`). No pressure-vessel, no + `steam-runtime-check-requirements`. These are the only platform blocks the installer keeps. + - `*_steamrt_linuxarm64`: Valve's x86-64 SteamRT 3c client (`steamrt64/steam` is an x86-64 ELF) with + `steamrt64/pv-runtime/steam-runtime-steamrt` (pressure-vessel, `steam-runtime-check-requirements`, + `steam-runtime-launch-client`). This is the containerized client the 2026-10-15 beta made the default on + x86. Valve ships it to arm64 hosts as well, presumably to run under FEX. The installer skips it. + - `bins_androidarm64_linuxarm64`: `androidarm64/libsteamclient.so`, `steamservice.so` and friends. +- `steam_client_steamdeck_publicbeta_ubuntu12` has stopped at 1792108788, while stable `ubuntu12` follows + stable (1792618285). On beta the 32-bit `ubuntu12` client no longer gets updates. +- If a future manifest drops `*_linuxarm64_linuxarm64`, the installer logs the block list and moves to + stable. If stable drops it too, the remaining option is the x86-64 client under FEX + ([x86-64-steam-client.md](x86-64-steam-client.md)). diff --git a/docs/development/dd-fg.md b/docs/development/dd-fg.md new file mode 100644 index 000000000..81cb43a9e --- /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 e121d4caf..1dbaf7131 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 000000000..e84027a8a --- /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 a6e02b8e2..ba435af2c 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -52,6 +52,67 @@ environment entries and is intentionally narrower than **Reset game profile**. Values are literal strings, with no shell expansion; quotes are only needed when the consuming program expects them. +## Game debug logs + +Under **Setup > Diagnostics**, enable **Session logs** and **Game debug logs** +before reproducing a Windows game problem. Game debug logs is off by default and +is available when Session logs is enabled. It applies to the next game launch through DroidDeck's +Valve or third-party Proton wrapper, including added games and store shortcuts. +A running game must be restarted. If the current session began with Session logs +disabled, restart that session first: its existing log folder is disposable, and +the UI shows a restart reminder instead of enabling logs that would be discarded. + +| Generated setting | Effective value while enabled | +| --- | --- | +| `PROTON_LOG` | `1` | +| `PROTON_LOG_DIR`, `PROTON_CRASH_REPORT_DIR`, `DXVK_LOG_PATH` | The actual session log directory | +| `DXVK_LOG_LEVEL` | `debug` | +| `VKD3D_DEBUG` | `info` | +| `WINEDEBUG` | Valid custom channels plus Proton's standard diagnostic channels | + +Diagnostics take precedence over conflicting inherited, shared, or per-game log +settings while the switch is on. Wine channel selectors are normalized and +deduplicated with the last selector winning; required exception, module, and +timestamp channels are applied last, including when a profile contains `-all`. +Custom channels from `PROTON_LOG` are retained when valid. Malformed channel tokens +are omitted; an oversized list falls back to the standard diagnostic channels. + +Saved profiles and Steam launch options are unchanged. The launcher merges a +process-environment map, so every variable has one value and paths containing +spaces, quotes, or shell characters stay literal. Existing arguments and +`%command%` are not reconstructed. Disabling the switch restores the user's normal +settings on the next launch. It does not change Steam probes or native Linux +programs, whose ordinary output remains in the session log. + +After reproducing once, stop the session and use **Latest session logs > Share +logs**. The archive includes the generated Wine/Proton and graphics logs. Debug +logging can reduce performance and consume storage; disable it after collecting +the report. If the session log directory is unavailable, the launcher reports +that diagnostics were skipped instead of writing uncollected files elsewhere. + +A Unity game under FEX (`UnityPlayer.dll` for Windows builds under Proton, +`UnityPlayer.so` or `GameAssembly.so` for native Linux builds started by +**Linux x86 (FEX)**) keeps FEX's TSO on when the Default profile's FEX preset +turns it off: without TSO such games can deadlock or crash (seen with Megabonk +and Crab Game). A FEX preset chosen for the game itself still applies. + +Games launched through Proton get `vblank_mode=0`, so OpenGL does not wait for +each screen refresh. Wine asks for a swap interval of 1 on every OpenGL window, and WineD3D's front-buffer +drawing (DirectDraw, Direct3D 1–7) never lowers it, so those games ran at the +refresh rate even with no frame limit (AIO Direct3D 7: 144 fps at 144 Hz, about +2,260 with the wait off). Steam's Frame Limit still holds a game: while it is on, +gamescope's WSI layer presents every swapchain in FIFO at the limit. A +`vblank_mode` from the launch options or the environment editor is kept, and +**Remove** in the editor leaves Mesa's own default. + +A game launch (`waitforexitandrun`) also gets +`GAMESCOPE_WSI_MIN_IMAGE_COUNT=8` and `GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1`, +so an uncapped game keeps drawing while gamescope turns buffers around. The +session itself no longer sets them: the Steam client's UI renders through the +same WSI layer, and with eight images and no frame limit it drew flat out +(about 240 frames a second at 120 Hz) and heated the device. Values set in the +launch options or the environment editor are kept. + ## Defaults and available suggestions The initial configuration enables Mesa shader caching with @@ -92,7 +153,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/gog-maintenance.md b/docs/development/gog-maintenance.md new file mode 100644 index 000000000..9676db590 --- /dev/null +++ b/docs/development/gog-maintenance.md @@ -0,0 +1,114 @@ +# GOG maintenance + +Installed GOG games are checked after library refresh and when details open. +Successful automatic checks are throttled to 30 minutes; two metadata workers +run at most. Manual checks bypass the throttle. Downloads and application always +require a user action. Unknown metadata, authentication failures, and network +errors remain distinct from a current installation. + +## Records and recovery + +`.droiddeck-gog/installed.json` is a schema-versioned installation inventory. +It retains source, generation, opaque build identifier, branch, display version, +language, installed products, sanitized manifests, and file hashes/chunks. +Migration uses the existing marker, sidecar, and authentic GOG metadata; missing +historical content is never replaced with the latest manifest as an assumed +description of installed files. +Authentic `goggame-*.id` build metadata takes precedence over legacy markers; +the numeric `version` field in a GOG info file is a schema, not a game version. + +`operation.json` pins the operation, exact folder, previous sidecar/inventory, +target, and phase. Staged chunks are durable work and are rehashed on resume. +The existing download queue persists GOG operation/folder details; older queue +entries keep their install behavior. Uncertain external patch operations cannot +be retried as ordinary downloads. Existing sidecar choices and prefix locations +are retained. Newly entitled DLC is not added automatically. + +Depot updates and repair verify files, reuse matching chunks, and stage changed +files on the installation filesystem. Replacements are atomic per file. There +is no whole-game rollback: interrupted application keeps the journal and blocks +launch until recovery. Obsolete managed files are deleted only when they still +match their previous content. Untracked and modified obsolete files survive. + +The native maintenance contract separates network, reused, and applied bytes. +Generation 1 range downloads retain authentic hashes and never trust equal +size alone. A verified Java file-download path remains available when the native +library is unavailable. Free-space checks include staged replacements and +transfer payloads; a full offline refresh uses a conservative size estimate. + +## Deltas and installers + +Galaxy deltas are requested for the exact source/target pair, and used only +when smaller than missing chunks. Source, payload, and reconstructed target are +verified independently. Decoder errors, unsupported features, or changed source +content fall back to verified chunks. Reconstruction is serialized and bounded +below 64 MiB. Upstream decoder sources and notices are pinned under +`app/src/main/rust/stores/vendor/xdelta3`; Gradle tracks those build inputs. + +Offline patches preserve provider grouping and filenames. Download metadata is +resolved before confirmation; no patch chain is inferred from a filename. +Installer application is interactive through the selected game's Proton tool +and actual prefix. A detached Linux helper owns the installer, tracks prefix +children, writes durable status, and excludes cloud/achievement game-launch +hooks. Registry setup uses the existing GOG script path and authentic setup +payloads. Installer exit alone does not establish the installed version: the +app reconciles the resulting build against a manifest and checks its files. +Unverifiable results require recovery/full refresh instead of silently restoring +the previous manifest. External installer cancellation belongs to the installer. +Setup runs the script interpreter only when an actual GOG script exists, and +registers the authentic installation path, version, and build in the selected +prefix. Patch filenames are decoded from provider URLs without changing literal +plus signs or multipart names. Offline refresh retains the existing executable +layout and includes empty files and directories. Installers can put payload files +at the extraction root while placing placeholders under `app/`; refresh combines +both locations and verifies the selected executable before changing installed +files. Installer language selection accepts the installed locale's base language +and never silently chooses an unrelated language. Refresh with selected DLC also +requires authentic matching depot metadata and completes the selected depots +before publishing the installed record or deleting obsolete content. + +Short helper status requests detect a dead installer owner or abandoned start. +Session loss or suspension requires recovery; it never triggers automatic replay. +The maintenance menu offers result verification for interrupted patch operations. + +The same POSIX record lease excludes maintenance and game launches from DD or +Steam. Session staging publishes the helper to existing Linux installations. +Maintenance processes use full x87 precision. Some installers copy 64-bit data +through x87 integer loads/stores; FEX's reduced-precision mode rounds those values +and corrupts path strings. This override is local to maintenance and leaves the +saved game performance profile unchanged. See [FEX issue #5827](https://github.com/FEX-Emu/FEX/issues/5827). + +## References and validation + +The manifest/chunk/delta approach follows +[heroic-gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl/blob/main/gogdl/dl/objects/v2.py). +Generation 1 layout is checked against actual public Rayman 2 manifests in +`app/src/test/resources/gog`. Setup requirements are informed by +[Heroic's GOG setup](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/blob/main/src/backend/storeManagers/gog/setup.ts). +The separation of depot and offline maintenance is also reflected in +[Lutris](https://github.com/lutris/lutris/blob/master/lutris/services/gog.py). +[innoextract](https://constexpr.org/innoextract/) extracts data; it does not run +installer scripts and checks. + +Automated coverage includes hash verification, moved/repeated chunk reuse, +interrupted staging, corrupt deltas and fallback, generation 1 same-size +corruption, path protection, multipart metadata, external patch recovery, +launch leases, prefix process detection, and the Java fallback. Run Rust and +Linux helper suites in WSL. JVM results, release/native/runtime-input checks, +CI results, and actual-device evidence must be reported separately in the PR. + +Thor testing has verified a real Rayman 2 depot update, repair of deliberately +corrupted Rayman content, process-death download recovery, shared Java/Linux +launch exclusion, and a Neo Cab repair on external SD storage with its sidecar +unchanged. The owned ELDERBORN 1.08-to-1.09 standalone patch initially failed with +`Path not found`: a Wine file trace showed corrupted path characters under reduced +x87 precision. With full precision, the actual patch completed through DD's normal +installer UI, returned zero, and its files matched all 381 entries in target build +`55745895026856358`. The saved performance configuration was byte-for-byte unchanged. +The patched game then reached its main menu through the existing Steam shortcut; +its process used the ordinary reduced-precision setting rather than the installer's +full-precision override. The original sidecar remained identical and the operation +journal cleared after verification. +Rayman 2 also launches through its existing Steam shortcut after maintenance and +reaches its interactive language menu. Its existing cloud download remains on +the ordinary game-launch path; patch execution bypasses that path. diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md new file mode 100644 index 000000000..aa1f26a6b --- /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-butler.md b/docs/development/itch-butler.md new file mode 100644 index 000000000..be13e5e0f --- /dev/null +++ b/docs/development/itch-butler.md @@ -0,0 +1,24 @@ +# itch.io patch updates with butler + +An update to an itch game that was published with butler can be applied as a patch instead of downloading the whole upload again. Everything else keeps the full update described in [itch-updates.md](itch-updates.md). + +## Pack + +`butler`, `7z.so` and `libc7zip.so` ship as the `butler` add-on pack (`tools/packs/build.sh`). The pack is fetched from `broth.itch.zone` by version, and `tools/packs/butler/release.env` pins the version and the SHA-256 of the zip. The `linux-arm64` build needs glibc 2.29. The first patch update that finds no pack starts its download and does a full update; later updates use it. + +## When a patch is used + +All of these must hold, or the update falls back to the full download: + +- the installed copy and the new upload are the same upload id and both have a build id (`buildId` is kept in the sidecar's `extra`) +- the upgrade path `/builds/{installed}/upgrade-paths/{new}` has at most four builds, each with a patch file, and the last one has a signature +- the patches together are no larger than the full upload +- `butler apply` exits 0 and the result matches the new build's signature + +## How it is applied + +Patches and the signature are fetched from `/wharf/builds/{build}/files/{file}/download` with the API key; the redirect to storage is followed without the key. `butler apply -d` writes the whole new game into `.droiddeck-update` inside the game folder and leaves the installed files alone, files the game wrote (saves) are ignored, and `--signature` makes butler check the result against the new build. From there the update is the same as a full one: the executable is picked, `ItchStaging.merge` swaps the files in, and the record is rewritten. A failure at any point deletes the staging folder and continues with the full download. + +## What is not verified + +The upgrade-path and build-file field names (`upgrade_path`, `files`, `sub_type`) and the `download_key_id` query on the file download follow the published API listing and butler's own request paths, and have not been tried against a real game. A game whose install does not match its build exactly, for example one whose files were flattened on install, falls back to the full update. diff --git a/docs/development/itch-collections.md b/docs/development/itch-collections.md new file mode 100644 index 000000000..9a2f1419a --- /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 000000000..3db9fde5d --- /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/itch-updates.md b/docs/development/itch-updates.md new file mode 100644 index 000000000..574253b9f --- /dev/null +++ b/docs/development/itch-updates.md @@ -0,0 +1,44 @@ +# itch.io updates + +An installed itch game is checked against the uploads itch lists for it. A game with an update shows an +Update label on its Library tile and an Update button on its game page. A Check for updates button sits +in the top right of an installed itch game's page, next to the delete button, and checks that game only. + +## Detection + +The install record (`.droiddeck-store.json`) keeps three things from the install: the upload's +`updated_at` as `installVersion`, and `gameId`, `downloadKeyId` and `uploadId` in `extra`. +`ItchUpdates.evaluate` compares them with `GET /games/<id>/uploads`: + +- the installed upload is still listed and its `updated_at` is later: an update to the same upload; +- the installed upload is gone: the newest Windows upload is offered as a replaced build; +- an install without an `uploadId` compares the newest Windows upload's stamp; +- an unknown installed version or no answer from itch never reports an update. + +The automatic check walks the installed itch games one at a time, one second apart, and logs +`itch.io: checked <n> installed games, <m> with updates`. It runs when the itch tab opens, at most every +six hours. The button on a game page checks only that game, at any time, answers with a toast ("Update +available", "Up to date" or "Sync failed") and logs `itch.io: checked <title>, ...`. A game itch did not answer for keeps its last +result, and the six-hour clock only advances after a fully answered pass. Results are kept in the itch +preferences until the update is installed or the account signs out. + +## Installing + +The Update button reruns the normal install over the game's own folder, keeping its storage location. +For a replaced build the game page asks first and names the new file. + +An update never extracts into the live game. The download goes to the scratch folder, as for any +install, and the archive is unpacked into `.droiddeck-update` inside the game folder. The new build is +checked there (an executable must be found) before a single game file is touched. A failed or cancelled +download or extraction removes the staging folder and leaves the game as it was. + +Only then does `ItchStaging.merge` move the staged files into place, which are renames inside one +folder: a staged file replaces the file with the same path, directories are merged, and anything the new +build does not contain (saves, settings, the install record, launcher and art) stays. The install record +is marked updating just before the move, so an interruption in that short step is resumable, and the +finished record carries the new `installVersion` and `uploadId`. Free space for one extra copy of the +build is needed while the update runs. + +A cancel that arrives before the files are moved in stops the update and removes the staging folder. Once +the move has started the update is past the point of no return: it finishes and writes the new record, so +a cancel during that short step cannot leave new files under an old record. diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 217650b53..bcf3424c1 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/proroot-analysis.md b/docs/development/proroot-analysis.md new file mode 100644 index 000000000..7d4139c35 --- /dev/null +++ b/docs/development/proroot-analysis.md @@ -0,0 +1,547 @@ +# proroot: what it does and what DroidDeck can take from it + +Static analysis of [coderredlab/proroot](https://github.com/coderredlab/proroot) v1.2.8 +(`c01039ab`, 2026-06-17). The repository holds only five arm64 binaries and a README. The licence is +proprietary, and redistributing modified binaries is not allowed, so only the ideas below are +usable, not the code. The binaries were read with the NDK's `llvm-readelf`, `llvm-nm`, +`llvm-objdump` and `llvm-strings`. `libproroot-stub-loader.so` and `libproroot-bridge.so` still carry +`.symtab`, and `libproroot-runtime.so` exports about 260 names, so the function names below are +proroot's own. + +## Architecture + +proroot does not use ptrace. Everything runs inside the guest process. + +| file | kind | role | +|---|---|---| +| `libproroot.so` | bionic PIE executable | Launcher. Parses `-r/-b/-w/-0/--link2symlink`, writes a config file (`.proroot-config-<pid>`, passed down as `PROROOT_CFG_FD`), and execs the guest through `libproroot-linker.so` or the stub loader. | +| `libproroot-linker.so` | freestanding PIE, run as an executable | A from-scratch glibc dynamic linker ("cleanroom linker") that replaces `ld-linux-aarch64.so.1`. It maps the program and its `DT_NEEDED` libraries, relocates them, sets up static TLS, and stubs `_dl_*` and `__tunable_get_val`. It finds `_rtld_global_ro` through a table of offsets per glibc version ("no offset table for glibc X, patches skipped"). It also installs a SIGSYS handler with an allow-list. | +| `libproroot-stub-loader.so` | freestanding static PIE | Userland `exec`. It maps the target and its `PT_INTERP` itself and builds the stack and auxv. It then **rewrites the `svc #0` sites** in the loaded images (`proroot_svc_scan`, `proroot_svc_patch_apply`, `select_trampoline_for_site`) to branch into per-syscall trampolines (`proroot_tramp_openat`, `_statx`, `_faccessat2`, `_clone3`, `_rt_sigaction`, `_shmget`, ...). Sites it cannot patch fall back to an in-process seccomp `RET_TRAP` filter with a SIGSYS handler ("trampoline fallback, activating trap-mode fallback"). | +| `libproroot-runtime.so` | glibc `LD_PRELOAD` | Hooks about 200 libc entry points: path translation, fake root (`fake_id0_*`), link2symlink, exec routing, SysV shm, netlink, `/proc` and `/sys` views, `brk`, a fake DRM/KMS and GBM device plus libseat for compositors, X11 and Unix-socket fixups. After load it **patches the svc sites in glibc itself** (`patch_libc_syscalls`). | +| `libproroot-bridge.so` | static `ET_EXEC` at `0x7000000000` | The "trampoline" for static guest binaries. It installs a path-trap seccomp filter plus a SIGSYS handler, maps the target, and serves a virtual `/proc` (`status`, `stat`, `cmdline`, `environ`, `mounts`, `mountinfo`, `fdinfo`, `auxv`). | + +The executable files all live in `nativeLibraryDir`, which is the only place an app may exec from. +That is why the dynamic linker and the static loader each have their own userland loader. proot +handles the same constraint with `libproot-loader.so`. + +## How the in-process syscall interception works + +1. **Patching svc sites in glibc** (`patch_phdr_callback`, called through `dl_iterate_phdr`): + - It scans only an allow-list of objects: `libc.so.6`/`libc-`, `ld-linux`, `libpthread`, + `librt`, `libdl`. Main executables get patched early only for listed programs (apt, dpkg, + curl, openssl, node, chromium/electron/playwright, passwd/useradd/...). Other programs are + patched later (`log_deferred_libc_patch`, `PROROOT_FORCE_EARLY_PATCH`). + - In each executable `PT_LOAD` it finds `svc #0` (`0xd4000001`). It checks the instructions + before it for a `mov x8, #nr` it recognises. One fixed glibc `openat` call sequence gets + special treatment: its `bl` is redirected to a relay (`emit_openat_call_relay_entry`). + - The site is replaced with a `b`/`bl` to a relay stub on a page allocated within ±128 MiB + (`alloc_relay_page`). Sites out of range are logged as `bl-out-of-range`; `large-image + multi-cover tramp` places extra relay pages for big images. + - **Write path:** it first tries `mprotect(PROT_READ|PROT_WRITE|PROT_EXEC)` on the segment. + If that is refused, it `pwrite`s the 4-byte instruction through `/proc/self/mem`. Either way + it then calls `__clear_cache`. The log line counts sites by kind: `patched %d seccomp + %d + path (%d relay) + %d brk`. +2. **In-process SIGSYS fallback**: + - A BPF filter allows syscalls whose instruction pointer is inside proroot's own code and + returns `SECCOMP_RET_TRAP` for the path, exec, clone and wait syscalls from anywhere else. + The IP check is the same idea as our patch 0014, with TRAP instead of TRACE. + - The handler emulates the call and writes the result into the signal frame. Guest SIGSYS + handlers are kept and chained (`proroot_record_user_sigsys`, `invoke_user_sigsys`). +3. **Keeping SIGSYS deliverable**, the objection in option 4 of + [proot-performance](proot-performance.md): + - The `sigprocmask` and `pthread_sigmask` hooks call `sigtrap_unblocked_mask`, which + `sigdelset`s `SIGSYS` (and `SIGTRAP` for some guests) from any `SIG_BLOCK`/`SIG_SETMASK` set. + - `rt_sigaction` is guarded so the guest cannot replace the handler (`proroot_tramp_rt_sigaction`, + the `sigaction_guard` trace points). + - The raw `rt_sigprocmask` that glibc makes internally, for example `pthread_create` blocking + every signal, goes through a patched svc site. The stub loader and the runtime both compare + against syscall 135. +4. **Android-blocked syscalls are answered in-process.** The stub loader dispatches + `set_robust_list`, `rseq`, `faccessat2`, `clone3`, `futex_waitv` and `seccomp`. The runtime + emulates SysV shm (`emu_shm*`), `set*id`/`get*id` under `-0`, and `brk` + (`emulate_guest_brk`, over a reserved mapping). + +## Compared with DroidDeck + +| | DroidDeck (proot + 0001–0018 + `libblfastpath.so`) | proroot | +|---|---|---| +| exec, `PT_INTERP`, `/proc/self/exe` | proot's loader under ptrace, 0.4–0.8 ms per exec | Its own loaders, with no tracer; also needs its own ld.so with a glibc offset table | +| path calls through libc wrappers | fast path, about 0.6–1.9 µs | runtime hooks | +| path calls from glibc internals (ld.so, fts, realpath, nss, `__open_nocancel`) and raw `svc` | **still go to proot (15–60 µs)** | **patched svc sites** | +| Android-blocked syscalls (`set_robust_list`, `faccessat2`, `clone3`, ...) | SIGSYS stop answered by proot (0016 etc.), one ptrace round trip and one signal round trip each | in-process | +| `brk` | proot emulation, a trap per call (mitigated by `top_pad`) | in-process emulation | +| correctness fallback | proot is always there | limited in-process seccomp/SIGSYS handling; no general tracer fallback, so calls outside the filter can run unconfined or be emulated incorrectly | +| long Unix socket paths | fast path `/proc/self/fd/N/name` aliases | short socket aliases (`proroot_create_short_unix_socket_alias`) | +| rseq | `GLIBC_TUNABLES=glibc.pthread.rseq=0` | trampoline | + +proroot is not a model for replacing proot. It has no tracer to fall back on, so a missed call +site or an unexpected glibc build silently breaks isolation or correctness. Its own linker depends +on glibc internals for each version. Proton, Wine, FEX and Steam's self-updating ELFs are a much +wider surface than the Node, Python and Chromium workloads proroot was tested on. Its value for +DroidDeck is as a fast path *in front of* proot. + +## What is worth taking + +1. **Patch glibc's svc sites from `libblfastpath.so`'s constructor.** This is the largest gain + and the cheapest way to do option 6 in [proot-performance](proot-performance.md) ("a proot-aware + glibc") without rebuilding glibc. + - For `libc.so.6` (and `ld-linux-aarch64.so.1` for runtime `dlopen`), rewrite each `svc #0` + that follows a recognised `mov x8, #nr` for the path syscalls the fast path already handles. + The rewrite is a `b` to a relay that calls the existing translator. + - The relay issues the syscall from the `0xffff00000` trampoline page, which 0014 already lets + through. Anything the translator declines is re-issued from an svc in the relay page, outside + the trampoline, so proot traps it exactly as it does today. Correctness still rests on proot. + - This covers fts (`find` over 2.7k files, unchanged today), realpath, nss, `__open_nocancel`, + and `dlopen` after start-up. + - Library loading at start-up, before the constructor runs, still traps. +2. **Answer the Android-blocked syscalls through those relays.** + - `set_robust_list` and `get_robust_list`: keep the head in TLS, as 0016 already does in + proot. + - `faccessat2`: answer `ENOSYS`, or translate it when flags are 0, as the wrapper does. + - `clone3`: answer `ENOSYS` before Android 15, so glibc falls back to `clone`. + - `futex_waitv`: droiddeck-fsync already handles this. + - Each one removes a SIGSYS stop plus a ptrace round trip, about 30–50 µs. `set_robust_list` + alone is one per thread, which matters for Steam/CEF and Wine thread churn. +3. **The `/proc/self/mem` write as a fallback for patching.** If the app domain refuses + `mprotect(PROT_WRITE|PROT_EXEC)` on rootfs (`app_data_file`) text, i.e. an `execmod` denial, + a write through `/proc/self/mem` makes the page copy-on-write without an `mprotect`. That page + is never writable and executable at once. Check this on the Thor before relying on it. The + same question is still open for the trampoline page (`execmem`). +4. **Keep SIGSYS unblocked if in-process `SECCOMP_RET_TRAP` is ever used.** Strip `SIGSYS` in the + `sigprocmask`/`pthread_sigmask`/`rt_sigprocmask` paths, and keep the handler installed while + chaining the guest's. This only becomes safe once item 1 covers glibc's internal + `rt_sigprocmask`. It is a prerequisite, not a recommendation to switch. +5. **Cache patch sites by build-id.** proroot rescans each image on every exec and defers patching + for most programs to keep exec cheap. A scan of libc's roughly 1.5 MiB of text is cheap, but a + per-build-id site table, written once in `/tmp` by the fast path, would make it free. + +Not worth taking: the cleanroom ld.so and its glibc offset table; the userland exec loader (proot +already does this); the fake DRM/GBM/libseat device (DroidDeck has its own compositor path); +netlink and SysV shm (`netif.c` and `sysv.c` already cover these); and the long-socket aliasing +(the fast path covers it). + +## Open questions before prototyping item 1 + +- Does the app domain allow `mprotect(RWX)` on a private mapping of an `app_data_file`? Does a + `/proc/self/mem` write work under the app's SELinux context and proot's own `ptrace` attach? + `/proc/self/mem` writes need `PTRACE_MODE_ATTACH` on self, which is always allowed. +- How many `libc.so.6` path syscall sites fall outside a recognisable `mov x8, #nr` window? For + example, `syscall()` takes the number in a register, which needs the existing `syscall()` hook. +- Patched pages become private copies, about 4 KiB per patched page per process. Measure RSS + across the Steam/CEF tree. +- Equivalence: run `bench/equiv.py` plus a `find`/`realpath`/nss workload with `PROOT_FP_STATS`. + Compare the trap counts from patch 0018 before and after. + +## First implementation and Thor validation (2026-10-27) + +`tools/proot/fastpath/svc-patch.h`, included by `fastpath.c`, implements the first +slice of item 1. It runs automatically in fresh processes using the replacement +`libblfastpath.so` when the ordinary fast-path configuration and tracer-key check +succeed. Set `PROOT_FP_PATCH_SVC=0` to disable it for troubleshooting or comparisons; +`PROOT_FP_PATCH_SVC=1` also explicitly enables it. It skips processes that already have multiple threads, +and declines SVE/SME hardware because the relay preserves the base ARM64 register state. + +The scanner visits executable segments of the loaded `libc.so.6` and +`ld-linux-aarch64.so.1`. It only patches `openat` and `newfstatat` sites with an +unshifted `movz x8/w8, #nr` within the preceding eight instructions. Intervening +instructions must belong to a small allow-list of argument moves/sign-extension, +immediate moves, stack loads/stores and NOPs that leave x8 unchanged. Branches, +calls, x8 writes and unknown instructions stop recognition. This includes libc's +non-adjacent O_CREAT sequences. Register-number dispatchers and other syscall +numbers remain under PRoot. No glibc version offsets, proroot code, or modified +proroot binaries are used. + +Each replacement is a four-byte `b` into a nearby relay. Relay pages are filled while +writable, then changed to RX before publishing any branch. Text writes use +`/proc/self/mem`; failure leaves the site unpatched. The relay preserves x1–x30, all +32 SIMD registers, NZCV, FPCR/FPSR and the caller's `errno`, returning a raw kernel-style +result in x0. It calls the existing path translator, using the existing allowed +trampoline for translated calls. Declined and recursive calls execute an ordinary +`svc` in this library, where PRoot still intercepts them. No SIGSYS handler or new +seccomp filter is installed. `PROOT_FP_STATS=1` adds `fastpath-svc` exit counters. + +The connected AYN Thor was running runtime r9, glibc 2.43, with a 4 KiB page size in +`u:r:untrusted_app_27:s0`. `bench/svc-probe.c`, run through the app's guest bridge, +confirmed all of the following while PRoot was attached: + +- An RX private mapping of the rootfs libc accepted `mprotect(RWX)`. +- `/proc/self/mem` accepted a changed byte in that RX mapping; readback and restoration + succeeded, and the backing file stayed unchanged. +- An anonymous RW mapping could be changed to RX. +- libc contained 415 `svc #0` sites: 327 with an adjacent number load, 76 with a + number load only within the preceding eight instructions, and 12 with neither. + The linker contained 56 sites, 45 adjacent and 11 nearby-only. Nearby counts are + scan statistics, not proof that the number remains live at the syscall. + +The initial adjacent-only scanner patched nine sites; the final scanner patched +14, including file-creation paths, across libc and the linker. It used two relay +pages in standalone validation processes. `bench/svc-check.c` exercises the +actual emitted relay and checks raw success/error results, errno, x1–x30, q0–q31, +NZCV, FPCR/FPSR, four simultaneous threads, the multi-thread patching guard, and fork. +Null arguments and unsupported flags fall back to PRoot. The instruction decoder +and exact ±128 MiB branch limits also have a host regression test. + +Default-policy validation on the Thor confirmed that an unset `PROOT_FP_PATCH_SVC` +and explicit `1` both patched 14 sites; explicit `0` left all 415 libc and 56 linker +syscall sites unchanged. The register/thread/fork check also passed with the +environment flag unset. + +Five alternating pairs of `bench/svc-workload.c` runs compared the same replacement +library with patching off/on, with fast-path stats enabled in both. The workload +gets `fstatat` and `__open64_nocancel` directly from libc, bypassing the preload's +public wrappers, and makes 5,000 of each call against a prepared regular file: + +| median | wrappers only | svc patching | +|---|---:|---:| +| internal `fstatat` | 38.6 µs | 3.0 µs | +| internal open + close | 39.3 µs | 5.8 µs | +| voluntary context switches over both loops | 10,000 | 0 | + +### SD allocation and writes + +`bench/svc-storage.c` separates the operations relevant to Steam downloads. Three +alternating pairs ran on internal `/tmp` and the selected `/mnt/droiddeck-sd` library, +with Steam idle and no simultaneous local Steam download. Each fresh directory held 64 long-named files +extended to 256 KiB, followed by 1,000 libc-internal stats and a 64 MiB sequential +write followed by `fdatasync`. Both modes used the same replacement library; only +`PROOT_FP_PATCH_SVC` changed. Medians on SD were: + +| phase | wrappers only | svc patching | +|---|---:|---:| +| create/extend/close 64 files | 1.500 s | 1.486 s | +| 1,000 internal stats | 61.2 ms | 5.4 ms | +| 64 MiB write calls | 43.9 ms | 40.9 ms | +| final `fdatasync` | 2.514 s | 2.539 s | + +Internal allocation fell from 7.1 ms to 1.9 ms; internal stats fell from 39.5 ms +to 2.5 ms. Internal `fdatasync` varied from 36 to 164 ms across individual runs. +The patched SD workload recorded 1,065 internal calls handled in-process, covering +64 file creations, 1,000 stats and the streaming-file creation. Per-phase medians +are independent and should not be added as a median whole-run duration. + +The SD metadata gain does not establish faster Steam downloads. File creation +improved by only a few percent, and write/flush speed did not improve in this probe. +The remaining SD cost is much larger than the saved syscall-interception time. +The earlier [Thor SD investigation](thor-sd-storage-investigation.md) likewise +identified native exFAT metadata waits; the current benchmark does not independently +attribute those waits to a particular mount flag. A real Steam install comparison +must separate preallocation, transfer/staging and final commit before claiming an +end-to-end improvement. + +### Real Steam downloads to SD + +Four fresh installs of owned, initially uninstalled **7 Billion Humans** (792100) +used library folder 1, `/mnt/droiddeck-sd`, and were uninstalled between trials. +Each downloaded 228,935,584 bytes and staged 237,717,350 bytes in 19 files, ending +at BuildID 8016557, depots 792101/5052600457178655633 and +792104/8245917369753676198. Every trial logged zero reused/stored/delta bytes at +the start and completed with `No Error`. Existing installed games were retained. + +The repeat off/on pair used the exact same replacement library, SHA-256 +`ab605c021aee271cd49fa1cb337d7ff0c762dbac198b711e9818639c0cd4b17d`. +The first off run used the earlier adjacent-only build, with patching disabled. +Only the patching environment flag changed for the final pair. Times below come +from Steam's one-second-resolution `content_log.txt`; total starts at Reconfiguring +and ends at scheduler completion, excluding session startup: + +| trial | patching | preallocate | download/stage | commit to completion | total | +|---|---|---:|---:|---:|---:| +| first baseline | off | 1 s | 123 s | 1 s | 135 s | +| first patched | on | <1 s | 47 s | 1 s | 50 s | +| repeat baseline | off | <1 s | 30 s | 1 s | 33 s | +| repeat patched | on | <1 s | 29 s | 2 s | 32 s | + +Reconfiguration accounts for the remaining total time. The first baseline +overlapped another Steam client's network download; that client's telemetry must +not be mistaken for the Thor's. Later samples were filtered to local client `0`. +The repeat pair reached similar network rates, roughly 7–8 MB/s while transferring. +All four attempts logged the same unsupported large-file preallocation retry. + +**This does not demonstrate a useful SD-download speedup.** The apparent initial +135→50 second gain disappeared when baseline was repeated. The final 33 versus +32 seconds is within this small experiment's timing/network variability. This +19-file title also does not settle performance for games with thousands of loose +files. Metadata calls clearly improve, while SD creation/writeback remain the +stronger next targets. No network settings, SD mount flags or root privileges +were changed for these tests. + +The internal-call equivalence workload, including fts, realpath, reentrant NSS, +runtime dlopen, missing paths and fallback errors, matched `PROOT_FP_OFF=1` at both +the default parent-cache TTL and TTL 0. The existing `equiv.py` also matched after +normalizing random/thermal read payloads to their lengths, volatile PID values in +the `/proc` directory listing, and tolerating Android's +denied `/dev` directory read. Its root fixtures were relocated into a temporary tree. + +`equiv2.py` used temporary root/SD fixtures, normalized `/proc/<self-pid>` output, +and tolerated the SD filesystem's unsupported symlink creation. Its patched output +matched the wrapper-only output at both TTLs. **It did not fully match PRoot:** +binding a Unix socket in the selected SD bind returned EPERM with the existing +wrappers, whereas PRoot succeeded. This mismatch reproduced with svc patching off; +it is a separate existing fast-path socket issue. The suite is not a clean full +equivalence pass. `equiv3.py` was not run because it rewrites live NSS configuration. + +A fresh Steam session using the override and `PROOT_FP_PATCH_SVC=1` rendered its +library UI. Sonic Mania (584400) gained focus and rendered its title screen. This +is startup smoke coverage, not gameplay or a Steam startup-speed measurement. +The installed PRoot pack emitted no profiling start/counter records despite the +queued profiling setting; the profiler report had `hasCounters: false`. That is a +measurement gap, not evidence of zero remaining traps. + +### Expanded relay coverage (before the safety follow-up) + +The subsequent revision keeps patching enabled by default and shares the existing +wrapper translators with 20 path syscall numbers: openat, newfstatat, statx, +readlinkat, faccessat, mkdirat, unlinkat, renameat, renameat2, symlinkat, fchmodat, +utimensat, truncate, statfs, getxattr, lgetxattr, listxattr, llistxattr, +inotify_add_watch and getcwd. This is an allowlist of safely recognized sites, not +a claim that every glibc implementation contains every site. Unsupported paths, +flags, instructions and inaccessible pointers still use the original PRoot route. +Input/output copies use process_vm_readv/writev rather than dereferencing arbitrary +guest pointers. The device matrix checks error priority, protected buffers and a +NUL-terminated path ending at a page boundary. + +The app forwards its Android SDK as `PROOT_FP_ANDROID_API`. With a known SDK, +set_robust_list retains the head in TLS and returns ENOSYS, matching patch 0016; +self get_robust_list uses that head. Uncaptured heads and other TIDs fall back to +PRoot. This does not implement kernel robust-mutex owner-death recovery. faccessat2 +returns ENOSYS for glibc's fallback. clone3 returns ENOSYS only before API 35; +it is never executed from the C relay, since successful clone3 would change the +child's stack. The [Android 14 allowlist](https://android.googlesource.com/platform/bionic/+/refs/heads/android14-release/libc/SECCOMP_ALLOWLIST_COMMON.TXT) +omits clone3 and the [Android 15 allowlist](https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/libc/SECCOMP_ALLOWLIST_COMMON.TXT) +includes it. Unknown platforms leave these sites untouched. Existing droiddeck-fsync +handling of futex_waitv is unchanged. + +Build-ID tables in `/tmp/.droiddeck-svc-v1-<api>-<build-id>` cache relative site +offsets. Every hit revalidates executable-segment bounds, alignment, the current +SVC opcode and the recognized syscall number. Missing, malformed, truncated, +overly permissive or symlinked tables trigger a rescan; writes use a private +temporary file and atomic rename. Images without a readable GNU build-ID still +scan normally. `PROOT_FP_SVC_CACHE=0` disables caching for comparison. Changes to +the accepted instruction/syscall set must bump the cache version. + +On the Thor's glibc 2.43 / Android 13, 49 sites patch across libc and the loader. +Warm cached discovery took 60–63 microseconds in two samples versus roughly +0.6–0.7 milliseconds for the earlier uncached scan; patch publication took about +0.28 milliseconds. These are constructor phases, not whole Steam startup times. +Five alternating expanded-library pairs measured median internal stat at 39.5→4.9 +microseconds and open/close at 41.2→6.4 microseconds, with 10,000→0 voluntary +context switches over both loops. The earlier SD/download tables above describe +the initial 14-site revision and must not be attributed to this expanded build. + +Five alternating pairs of `svc-threads` additionally measured thread create/join +at 138→113 microseconds, libc faccessat at 51.6→14.7 microseconds, and libc getcwd +at 46.8→4.1 microseconds. Each run creates 128 threads and executes 2,000 calls +to each libc entry point, bypassing the exported preload wrappers with dlsym. +The access call includes glibc's faccessat2 fallback. + +Repeated `/usr/bin/true` launches expose the startup tradeoff. Five batches of +40 children per mode measured medians of 3.834 ms with wrappers only, 4.882 ms +with uncached patching and 4.731 ms with cached patching, including subprocess +launch/wait and enabled exit statistics. Discovery across the 200 launches per +patched mode fell from a median 496 to 59 microseconds; publishing patches took +261/267 microseconds. The cache removes scanning work, but constructor setup and +patching still cost time for very short programs. No overall exec speedup is claimed. + +Three alternating storage pairs with the expanded library measured: + +| SD phase | wrappers only | expanded relays | +|---|---:|---:| +| create/extend/close 64 files | 1.556 s | 1.514 s | +| 1,000 internal stats | 73.2 ms | 12.5 ms | +| 64 MiB write calls | 54.2 ms | 55.1 ms | +| final fdatasync | 2.799 s | 2.730 s | + +These phase medians do not establish a general write-speed improvement. Internal +allocation was 7.1→3.6 ms and internal stats 49.8→7.7 ms; the SD filesystem's +allocation and flush waits remain much larger than the interception savings. + +### Expanded-build Steam SD comparison + +Owned, initially uninstalled Half-Life (70) supplies a larger file tree: 4,525 +installed files / 589,603,955 bytes, BuildID 15961492. Each fresh trial initially +scheduled 294,238,640 download bytes, 589,603,955 staged bytes and 4,488 preallocated +files on `/mnt/droiddeck-sd`. Steam reported successful installation in every run. +Local client `0` telemetry was selected. Times use one-second content-log timestamps; +total runs from the first main-app Reconfiguring event to scheduler completion. + +| trial | patching | initial preallocate | transfer/stage window | final commit | total | +|---|---|---:|---:|---:|---:| +| first baseline | off | 90 s | 52 s | 204 s | 350 s | +| expanded, default setting | on | 94 s | 48 s | 184 s | 326 s | +| repeat baseline | off | 97 s | 69 s | 175 s | 341 s | + +The patched and repeat-baseline trials use the same final library SHA-256 +`af4f66680dcfbd5002f641ffe206cdc7bd89400be169d3ef21c4e0ee7f979589`. +The first baseline used the preceding build with patching disabled; the only +subsequent production change corrected explicitly cleared robust-list TLS state. +All initial download records showed zero stored/reused/delta bytes. Shader updates +interrupted the main download in each trial; the transfer window includes those +pauses. On the repeat baseline, reconfiguration retained two small files already +downloaded during that same trial, so the final resumed job scheduled 294,236,672 +download / 589,599,865 stage bytes and committed 4,572 entries rather than 4,574. +This is not pre-existing payload reuse; the earlier fresh schedule is retained +in the measurement records. + +The observed whole-install difference does not establish a reliable SD speedup: +the repeat baseline committed faster than the patched run, while its transfer +window was slower. Allocation also did not improve. The 326 versus 341–350 second +totals combine network, shader scheduling and SD variability. The syscall gains +are demonstrated independently; these samples do not show that they fix Steam's +SD allocation/commit bottleneck. The test title was removed between trials; an +interrupted first uninstall left a repair queue, which was cleared by removing +only that task-created title while Steam was stopped before the subsequent fresh +trial. Existing installed games were retained. + +The expanded ABI matrix passes raw return values, errno, all x1–x30 and q0–q31, +NZCV and non-default FPCR/FPSR, four concurrent threads with distinct robust heads, fork, 100 +signals on an alternate stack, deferred cancellation, cancellation/cleanup of a +blocked libc FIFO open, clearing/restoring a robust head, and 32 thread create/join +cycles. Constructor patching still refuses a process with multiple live threads. +Host tests exercise corrupted cache entries, invalid offsets/opcodes, mismatched +API/version, unsafe file modes, symlinks and truncation. The Android unit test +checks API forwarding. The existing preload/agent selection passed 79 tests with +two skips before the cache regression test was added. +API-selection probes patch 45 sites with an unknown SDK, 49 with API 33 and 48 +with simulated API 35; unset and explicit 1 agree, and explicit 0 leaves the +original sites intact. This does not substitute for testing on Android 15 hardware. + +CI at 40b7c480 passed 1,427 Python/native tests (49 skips), 2,630 Android tests and +162 Rust host tests, plus APK compilation. A local release APK built successfully, +passed runtime-payload/native-library checks and was signed with the installed +release certificate. The full local Windows JVM run reported 150 failures / 2,568 +tests (eight skips), including Unix-path, symlink and permission assumptions; +the four ProotFastPath tests passed in both local variants. The passing full +suite evidence is the Linux CI run, not a clean Windows full-suite result. + +Internal fts/realpath/NSS/dlopen and the normalized first equivalence suite still +match PRoot at both cache TTLs. The write suite still matches wrapper-only output +and reproduces the same existing SD Unix-socket mismatch described above. +No in-process RET_TRAP filter is installed, so the proposed SIGSYS mask/handler +machinery is not applicable. Startup loader traps before the constructor and +raw calls in arbitrary guest ELFs remain outside the patch scope. Additional +glibc builds, Android versions, unwind behavior, Steam/CEF tree RSS and matching +patch-0018 tracer measurements remain coverage gaps. + +Build the tools with the same ARM64 glibc toolchain as the fast path: + +```sh +aarch64-linux-gnu-gcc -O2 -Wall -Wextra -pthread \ + -o svc-check tools/proot/bench/svc-check.c -ldl +aarch64-linux-gnu-gcc -O2 -Wall -Wextra \ + -o svc-probe tools/proot/bench/svc-probe.c -ldl +aarch64-linux-gnu-gcc -O2 -Wall -Wextra \ + -o svc-workload tools/proot/bench/svc-workload.c -ldl +aarch64-linux-gnu-gcc -O2 -Wall -Wextra \ + -o svc-storage tools/proot/bench/svc-storage.c -ldl +aarch64-linux-gnu-gcc -O2 -Wall -Wextra -pthread \ + -o svc-threads tools/proot/bench/svc-threads.c -ldl +``` + +Run `svc-probe` inside the app's guest environment, not from `adb shell`. +`svc-check` embeds the fast path and requires its normal enabled tracer environment. +For that embedded-library check, start with PROOT_FP_PATCH_SVC=0 when the session +also preloads a fast-path library (including through /etc/ld.so.preload). The check +then enables its own copy at main before creating threads, keeping another copy +from owning the glibc patch sites. The other tools use the normal preload. +For `svc-workload`, pass a prepared directory containing `file` and a `link` symlink +to it; add any second argument to enable timing. Use the documented library override +workflow in [proot-performance](proot-performance.md) for a fresh session. No extra +environment setting is needed; use `PROOT_FP_PATCH_SVC=0` for the unpatched comparison. +`svc-storage` takes a new, unused directory name; it creates and removes its own test +files and directory. It writes 64 MiB plus 16 MiB of file extensions per run. + +### Safety follow-up (2026-10-28) + +Path patching remains enabled by default. Robust-list registration/query sites are +now deliberately excluded: a device regression test reproduced disagreement +between the relay's private TLS head and an unpatched raw get_robust_list call in +the preceding implementation. Both directions now use the existing PRoot/kernel +route, including cleared heads. This preserves the host's actual return policy: +the installed Thor runtime accepts set_robust_list with zero, whereas the removed +emulation returned ENOSYS. PRoot patch 0016 can instead return ENOSYS when Android +blocks registration; neither policy is replaced by private relay state. + +The build-ID cache is version 2 because the accepted syscall set changed. The +current glibc 2.43/API-33 build patches 47 sites rather than 49. faccessat2 and +pre-Android-15 clone3 fallback acceleration remain; droiddeck-fsync is unchanged. +The earlier 138-to-113-microsecond thread result belongs to the retired robust-list +implementation and must not be claimed for the current code. + +Relays now save the original post-SVC program counter and supply unwind metadata +for the saved caller registers. Device tests force an unwind from inside the +translator through a patched libc frame and verify caller cleanup. A signal handler +also exits with siglongjmp; a later call recovers the abandoned recursion guard +and resumes acceleration. These tests supplement deferred and blocked-FIFO +cancellation; they are not a claim of arbitrary asynchronous-cancellation safety. + +Compiler stack-usage output identified multiple nested PATH_MAX-sized frames. +Before entering them, a small dispatcher checks the active alternate signal stack +and cached writable stack mapping. Alternate-stack calls and calls with less than +96 KiB remaining use PRoot. Main-stack growth respects the current RLIMIT_STACK +and leaves space above the preceding mapping. The implementation adds only a few +TLS words, not a large private translation stack. Tests cover a restricted thread +stack, normal/alternate-stack signals, main-stack growth and a reduced/unavailable +stack limit. User-managed stacks and arbitrary mid-helper non-local exits remain +broader compatibility risks, not proven consequence-free cases. + +On Thor/Android 13, the embedded and shared-PIC matrices pass on glibc 2.43; +the shared-PIC matrix also passes with a separately loaded glibc 2.39. They cover register/FP/errno preservation, mixed raw +and relay robust calls, pointer and page boundaries, readlink buffers of target +length minus one through plus two, thread churn, fork, signal/non-local exits, +forced unwinding and limited stack space. Readlink preserves PRoot's existing +translated-link length behavior; bytes beyond the reported payload are unspecified. + +Test-process seccomp filters separately deny opening /proc/self/mem, nearby relay +mappings, executable mprotect and patch writes. All four device cases leave zero +patched sites and a working original libc syscall. Host injection additionally +checks that one failed site write permits other sites to install. Concurrent +atomic symlink replacement passes 3,000 internal stat/readlink iterations at both +zero and default cache TTLs. These are bounded tests; they do not prove every +possible filesystem race or reproduce a real SELinux execmod denial. + +Five new alternating pairs measured: + +| operation | wrappers only | hardened relays | +|---|---:|---:| +| libc-internal stat | 50.1 us | 5.9 us | +| libc-internal open/close | 51.9 us | 7.1 us | +| libc faccessat | 52.0 us | 20.2 us | +| libc getcwd | 51.7 us | 4.6 us | +| thread create/join | 129 us | 144 us | +| complete tiny exec/wait | 5.04 ms | 5.96 ms | + +The metadata gains survive the safety checks. This run shows no thread-creation +gain, and the roughly 0.9 ms tiny-exec cost remains. The earlier SD download and +flush results are historical measurements of the preceding build; no new claim +that SD media writes or whole Steam installs become reliably faster follows from +these syscall results. Android 15+ ARM64 and 16 KiB-page hardware remain untested. + +Three alternating pairs also measured session start through the Steam Big Picture +Home page becoming ready, using its DOM/Recent Games content rather than merely +the compositor's first frame. Off runs took 48.76/43.47/47.02 seconds; on runs took +43.43/45.25/50.40 seconds. The 47.02-to-45.25-second medians sit within overlapping +run-to-run variation and do not establish a reliable whole-client startup win. +These use the signed bundled-library build without overrides; the final stack-gap +guard only increases the reserved distance above other mappings. + +At Home-ready plus 20 seconds, three one-second-spaced process-memory samples per +run gave Steam/CEF-only median PSS of 1,223.1 MiB off and 1,233.9 MiB on. Including +their active Python/Wine descendants gave 1,243.7/1,254.6 MiB. The five Steam/CEF +processes were selected by executable name; descendants were included by parent +PID. Per-run Steam/CEF medians ranged 1,217.9–1,240.9 MiB off and +1,194.8–1,244.9 MiB on. The roughly 11 MiB median increase is smaller than this +variation, but it is not evidence of zero memory cost. PSS avoids counting shared +pages in full for each process. Startup and memory comparisons used one unchanged +APK; no downloads or games were initiated during them. + +CodeRabbit follow-up: the workload now compares canonical paths, so relative and +absolute fixture arguments agree. All SVC bench tools keep their checks active +under NDEBUG; their clock, syscall and thread operations cannot silently disappear. +Both cases were rebuilt with -DNDEBUG and checked on Thor. The memory-file-denial +test now blocks only O_RDWR opens and asserts the single-thread check still works, +so it reaches the intended /proc/self/mem failure. The initial proroot comparison +also distinguishes its limited in-process fallback from a general tracer. +The request to return to default-off was addressed through the interruption/unwind +fixes and tests while retaining the requested default. The proposed readlink count +change was not applied because exact boundary tests reproduce the current PRoot +behavior; changing that inherited policy belongs in a separate correctness change. diff --git a/docs/development/steam-display-scaling.md b/docs/development/steam-display-scaling.md index 9551de73a..3cc677db7 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 7967dd650..571a208c1 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -7,7 +7,9 @@ importer as Added Games. Existing Steam manifests are preserved. `droiddeck-steam-games watch` runs beside the client. It identifies a game by an existing manifest's install directory, a `steam_appid.txt` beside the game or selected executable, or a unique normalized title from Steam's store search with an explicit -country. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; +country. A `steam_appid.txt` naming 480 (Spacewar, the Steamworks SDK sample that Steam +emulators and multiplayer fixes use in place of the game) identifies nothing; the +launcher's artwork matching ignores it too. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; multiple matches still remain unresolved. Artwork's fuzzy matching is deliberately not used for identity. Ambiguous or unresolved titles remain non-Steam games. @@ -42,12 +44,28 @@ the earlier importer are migrated, with the matching source symlink still presen registration fails, the game remains a shortcut. Once Steam takes over an install, manage it in Steam; forgetting an Added Games folder only removes its shortcuts. +An import is undone (its symlink and manifest, never the folder) when the folder was +imported as Spacewar, or when a snapshot of the folder's current files names another app. +The folder is then imported as that app if the account owns it, else it is a shortcut +again. A failed title lookup undoes nothing. The launcher likewise drops artwork it +fetched for the app the files named before and fetches it again; pictures the user chose +are kept. + The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the Android launcher uses the same title and Proton prefix as Steam. Other accounts do not inherit those routes. Managed shortcuts are replaced; user-created shortcuts and 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/steam-launch-hardware.md b/docs/development/steam-launch-hardware.md new file mode 100644 index 000000000..234dedeac --- /dev/null +++ b/docs/development/steam-launch-hardware.md @@ -0,0 +1,61 @@ +# Steam startup failures on older CPUs and non-Adreno GPUs + +These are different failures, even when neither reaches the Steam interface. + +## Steam exits with SIGILL (#1376) + +The [Redmi Note 8 report](https://github.com/Droid-Deck/DroidDeck/issues/1376) +shows gamescope selecting Adreno 610 successfully, all 17 client parts being +downloaded, and the native Steam executable immediately exiting with status +132 (`Illegal instruction`). The failure occurs after installation, not during +the runtime download. The supplied logs do not identify the faulting program +counter or CPU feature flags, so they cannot establish the exact instruction. + +The official ARM64 Steam client and web helper inspected during this +investigation contain LSE atomic instructions. This is a compatibility concern +for CPUs without LSE, not proof that LSE caused this particular crash. Device +reports now include only the kernel's CPU `Features` lists, without unrelated +`/proc/cpuinfo` fields such as serial numbers. + +After SIGILL, the failure screen explains the signal and, for an ARM64 client, +points to **Steam settings → Steam client → x86-64 (experimental)**. This is an +explicit user choice with an additional download and emulation overhead. It +does not establish that the device can run every component or game. + +The x86-64 client normally reuses a matching-build native ARM web helper. +When CPU feature flags explicitly lack `atomics`, it now retains the existing +x86 web helper instead. Otherwise the fallback could re-enter native code +containing the same instruction class. All reported core feature lists must +include that exact flag; absent or unreadable feature data retains the prior +behavior. Explicit x86-helper selection and the client-build matching rule +remain unchanged. + +## gamescope cannot find a Vulkan device (#1368) + +The [MT6993 report](https://github.com/Droid-Deck/DroidDeck/issues/1368) shows a +non-Adreno device starting with an Adreno Turnip display driver, followed by +gamescope failing to find a physical device through the Linux freedreno ICD. +Steam has not been started in that trace. + +Automatic Android display-driver selection now leaves non-Adreno GPUs on the +system driver rather than choosing Turnip from the Android SDK version. An +Adreno GPU with an unknown model still uses the existing SDK fallback; Quest, +external overrides and manual selections retain their priority. The failure +screen distinguishes an unavailable Linux Vulkan device from a failed Steam +download. + +This does not implement MT6993/Mali graphics support. The Linux session needs +a driver for that GPU and kernel, and the Android compositor also has Vulkan +requirements. The system Android driver alone does not provide the Linux +driver; the desktop's software rendering does not replace the outer +compositor. Removing the unsupported-device notice or importing Adreno +Turnip cannot supply these missing components. + +## Verification boundary + +Regression tests cover actual automatic driver selection, log classification +and the x86 client's web-helper selection. The supplied session logs can be +replayed through the classifier. No target phone was available, and the +specific ARM64 instruction fault has not been reproduced under a debugger. +Neither report should be treated as verified fixed on hardware based on these +tests alone. diff --git a/docs/development/stores.md b/docs/development/stores.md index 4fb78f4da..1209b7c47 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/themes.md b/docs/development/themes.md index b7f1a01eb..4bb122c6f 100644 --- a/docs/development/themes.md +++ b/docs/development/themes.md @@ -23,3 +23,17 @@ Setup shows Primary and Secondary under the theme when Gradient is chosen, each square. It opens `ColorPickerDialog`: a wheel (hue and saturation, touch), hue / saturation / brightness sliders (they work with a controller) and a hex box, with the old and new colour side by side. OK applies it. + +## Inner Gamer theme + +`Themes.INNER_GAMER` is an RGB theme: the accent walks round the colour wheel. It sits just above +Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the +theme while it is chosen. + +`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text +keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one +`rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it. +Compose applies Android's animator scale to it, and the colour holds still when animations are off +in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the +app only when the colour visibly moves; a slow cycle costs few recompositions. + diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index f11923fe7..cf2561368 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`. @@ -53,7 +53,8 @@ arm64 client down first. ("Steam now requires user namespaces") when `steam-runtime-check-requirements`' bwrap probe cannot create a user namespace, which no Android app can. `STEAM_RUNTIME_STEAMRT` points at `steamrt-shim`: Valve's runtime linked file by file with only the probe replaced (`exit 0`). proot - is the container, as for the arm64 client. + is the container, as for the arm64 client. `droiddeck-steamrt-shim` builds it, and builds the same + shim for the arm64 client if that one is containerized too ([arm64-steam-client.md](arm64-steam-client.md)). - **Re-exec after an update.** The client re-executes itself inside the SteamRT container through `pressure-vessel-wrap` (bwrap). `STEAM_STEAMRT_RECURSION_GUARD=1` says it is already inside one; the FEX rootfs with the client's `steamrt64` libraries is that container. @@ -209,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 @@ -290,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 @@ -333,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/media/steam-to-desktop.gif b/docs/media/steam-to-desktop.gif new file mode 100644 index 000000000..f190e0cad Binary files /dev/null and b/docs/media/steam-to-desktop.gif differ diff --git a/docs/releases/0.6.7.md b/docs/releases/0.6.7.md new file mode 100644 index 000000000..7e7a673d5 --- /dev/null +++ b/docs/releases/0.6.7.md @@ -0,0 +1,287 @@ +# DroidDeck 0.6.7 + +<p align="center"><a href="https://discord.gg/JRGAvawjsm"><img src="https://img.shields.io/badge/Discord-Join%20the%20community-5865F2?logo=discord&logoColor=white" alt="Join the DroidDeck Discord"></a></p> + +<!-- Maintainer check: Steam, Proton downloads and the games themselves come from Valve and the stores and are not part of DroidDeck; the intro below only claims DroidDeck's own code and the packs it builds. --> + +**DroidDeck is 100% open source. No ads. No telemetry. No source withheld.** + +Since 0.6.0, **28 people** sent **210 pull requests**, and **15 of them were first-timers**. 68% of the pull requests came from the community. Thank you to everyone who sent code, translations, device testing and bug reports. + +**0.6.7 in 30 seconds** + +- **One Library** for every game you own, with a new game page and art-first cards + + <img src="media/0.6.7/library.gif" width="50%" alt="The Library switching source chips, changing the card size and opening the Filter menu"> + +- **Handhelds that feel like a native SteamOS install:** Steam’s brightness and volume sliders control the device, volume buttons show Steam’s indicator, and holding Back works as QAM for Steam Input chords + + <img src="media/0.6.7/steam-input-chords.gif" width="40%" alt="Holding Back on a Retroid Pocket Duo while Steam shows its list of shortcuts"> + +- **Sleep that actually sleeps:** in overnight testing, a game left suspended lost only **2%** battery + + <img src="media/0.6.7/pause-resume.gif" width="50%" alt="Pausing from the session menu, the paused frame as a grey card with a glass Resume button, then resuming"> + +- **Xbox Cloud Gaming:** stream a game straight from its page, with no install, and an optional native player with DroidDeck’s frame generation + + <img src="media/0.6.7/xbox-cloud-gaming.gif" width="50%" alt="Streaming Deep Rock Galactic with Xbox Cloud Gaming, then the in-stream menu and performance overlay"> + +- **Battle.net** as a store, with games installing straight from Stores + + <img src="media/0.6.7/battlenet-store.jpg" width="50%" alt="The Battle.net store's catalog as a grid of Blizzard and partner games"> + +- **The full Ubuntu desktop experience:** Ubuntu 26.04 LTS with Kubuntu’s Plasma, Discover, `apt`, Flatpak and Snap. Your Android keyboard and your Android Downloads and Documents folders work right on the desktop + + <img src="media/0.6.7/ubuntu-desktop-discover.jpg" width="40%" alt="Discover on the Kubuntu desktop listing apps from Ubuntu's catalog, on a RedMagic tablet"> + <img src="media/0.6.7/ubuntu-desktop-keyboard.gif" width="40%" alt="Tapping the search field in the Kubuntu app menu: the Android keyboard opens, kate is typed and Enter opens Kate"> + +- **Dual-screen handhelds** like the Retroid Pocket Duo and AYN Thor now use their second screen: the launcher’s menu and the keyboard move to the bottom screen while the top screen updates live, and the in-game menu can open there too + + <img src="media/0.6.7/dual-screen-launcher.jpg" width="40%" alt="DroidDeck on a Retroid Pocket Duo: the Steam home on the top screen and the section menu on the bottom screen"> + <img src="media/0.6.7/dual-screen-steam-keyboard.gif" width="40%" alt="Tapping Steam's search on the Retroid Pocket Duo: the keyboard opens on the bottom screen and the search fills in on the top screen"> + +- A much bigger **itch.io** store, and **GOG** updates, repair and offline patches + +- **DroidDeck HUD**, a new custom HUD to complement MangoHud, with lots of customizability + + <img src="media/0.6.7/droiddeck-hud.gif" width="50%" alt="Tapping the DroidDeck HUD to step through its five sizes while a game runs"> + +- **Portrait mode** for the launcher and for sessions, plus a much improved **Android app and widget launcher**: search, sorting, filters, folders and resizable widgets + + <img src="media/0.6.7/portrait-launcher.gif" width="30%" alt="The launcher in portrait with navigation along the bottom edge, moving through Library, Stores and Components"> + <img src="media/0.6.7/apps-page.gif" width="30%" alt="The Apps page in portrait: searching, sorting, filtering, adding an app to a new folder, and adding a widget and resizing it"> + +- **Increased performance**, **lower power draw when you cap the frame rate**, and **reduced heat** + + <img src="media/0.6.7/faster-since-0.6.0.png" width="80%" alt="Before and after charts for Wine exceptions, ntsync, process snapshots, Steam menu 1% lows and power draw at a 60 fps limit"> + + +### Features + +- Merged **Games and the store libraries into one Library**, with **one game page for every source**. The Library lists the games you have installed and, in the same grid, the games you own in each store you are signed in to, split into **Installed** and **Not installed**. Source chips (Steam, GOG, Epic, Amazon, Xbox, itch, Added) filter the list, and LB and RB switch between them. A **Filter** menu next to Sort picks **Installed only** or **All owned games** and remembers the choice, and the source tabs follow the order set in Stores. Stores is now only for getting games. The game page has About, Achievements, Launch, Saves & cloud and Install tabs, works fully with a d-pad, and takes Xbox installs and content management with it. Store games show their download size and installed size again, and the filter stays available when the Stores tab is turned off. (@xXJSONDeruloXx, [#1460](https://github.com/Droid-Deck/DroidDeck/pull/1460), [#1586](https://github.com/Droid-Deck/DroidDeck/pull/1586), [#1591](https://github.com/Droid-Deck/DroidDeck/pull/1591), [#1700](https://github.com/Droid-Deck/DroidDeck/pull/1700)) + + <img src="media/0.6.7/library.gif" width="50%" alt="The Library switching source chips, changing the card size and opening the Filter menu, with installed games first and owned games below"> + <img src="media/0.6.7/game-page.jpg" width="50%" alt="A GOG game's page with its art as the backdrop, the frosted Play capsule and the tab bar"> + <img src="media/0.6.7/game-page-4x3.jpg" width="50%" alt="The same game page on the 4:3 screen, with Game files and Shortcut collapsed into a More menu and the resource links row"> + <img src="media/0.6.7/library-4x3.jpg" width="50%" alt="The Library on the 4:3 screen with art-only cards"> + +- **Making your handheld feel like a native SteamOS install.** This is a whole group of changes with one goal. **Steam’s brightness and volume sliders now control the device’s real brightness and media volume**, and changes you make on the device show up in Steam. The volume buttons show **Steam’s volume indicator instead of Android’s**, and holding a volume key moves the slider in steady steps. **Native Steam Input chords** work too: holding the **Back** button acts like the QAM button on a real Steam Deck, with Steam’s own shortcut list on screen. Left bumper zooms, right bumper takes a screenshot, the left stick up or down changes the brightness, and holding B force quits the running game. A tap of Back still opens the session menu, and a double tap still swaps it, with a **Double-tap window** setting from 100 to 800 ms. It is all set up in one place, a **Steam integration** group in Setup > Overview (and in the Steam settings sheet), with switches for Wi-Fi names, brightness, DroidDeck as Home and Home button shortcuts. Holding Home sends the Steam Guide button, including on Retroid Nova pads, and the AYN button on the Thor keeps opening AYN’s panel. (@xXJSONDeruloXx, [#1621](https://github.com/Droid-Deck/DroidDeck/pull/1621), [#1628](https://github.com/Droid-Deck/DroidDeck/pull/1628), [#1632](https://github.com/Droid-Deck/DroidDeck/pull/1632), [#1637](https://github.com/Droid-Deck/DroidDeck/pull/1637), [#1643](https://github.com/Droid-Deck/DroidDeck/pull/1643), [#1674](https://github.com/Droid-Deck/DroidDeck/pull/1674), [#1689](https://github.com/Droid-Deck/DroidDeck/pull/1689), [#1704](https://github.com/Droid-Deck/DroidDeck/pull/1704), [#1731](https://github.com/Droid-Deck/DroidDeck/pull/1731)) + + <img src="media/0.6.7/steam-input-chords.gif" width="40%" alt="Holding Back on a Retroid Pocket Duo while Steam shows its list of shortcuts, then using the held Back chords"> + <img src="media/0.6.7/steam-integration.jpg" width="50%" alt="Setup > Overview with the Steam integration group: Wi-Fi names, Brightness, DroidDeck as Home and Home button shortcuts"> + +- **Art-first cards.** Library and store cards are now just the game's art, with the name and size on a slim fade across the bottom and a corner chip for updates, resumes and download percent. A new **Display** menu in both headers sets the card size in five steps and shows or hides the title and the size. Banner art is trimmed at the sides and portrait art sits over a blurred fill, so nothing is cropped to a near match. (@xXJSONDeruloXx, [#1744](https://github.com/Droid-Deck/DroidDeck/pull/1744), [#1747](https://github.com/Droid-Deck/DroidDeck/pull/1747)) +- The **game page now uses the game's art as its backdrop**, with frosted capsules for Install, Play and the game's other actions, Metacritic and HowLongToBeat beside them, and a full-width tab bar. On the 4:3 layout Game files, Proton prefix, Shortcut and Edit art collapse into a **More** menu. (@xXJSONDeruloXx, [#1738](https://github.com/Droid-Deck/DroidDeck/pull/1738)) +- Game pages in the Library and in Stores get a row of **resource links**: PCGamingWiki, guides and a web search, plus ProtonDB and Steam Cloud for Steam games. The links work with a controller. (@xXJSONDeruloXx, [#1630](https://github.com/Droid-Deck/DroidDeck/pull/1630)) +- A new **Sidebar labels** toggle in Setup > Launcher. It is off by default, which gives the slim icon-only rail, and turning it on shows names under the icons. (@xXJSONDeruloXx, [#1749](https://github.com/Droid-Deck/DroidDeck/pull/1749)) + + <img src="media/0.6.7/sidebar-labels.gif" width="50%" alt="Turning Sidebar labels on and off in Setup > Launcher, the rail widening to show names"> + +- Added **Xbox Cloud Gaming**. Stream Xbox games from their store page or the Games tab, with the web player by default and an opt-in **native player** on Android 10 and up that runs DroidDeck's own frame generation on the stream (DD-FG 2x and LSFG 2x, 3x and 4x), with a frame-rate target from 10 to 165 fps. The Xbox library gets a Cloud filter next to All, Owned and Game Pass. Xbox games also run with the 0.2.12 Xbox backend. You do not need to install a game to play it: add it to your Library from its page and press **Stream**. The in-stream menu has screen effects, stream quality and a performance overlay with fps, ping, bitrate and decode time. (@The412Banner, @devSharaku, [#1531](https://github.com/Droid-Deck/DroidDeck/pull/1531), [#1729](https://github.com/Droid-Deck/DroidDeck/pull/1729)) + + <img src="media/0.6.7/xbox-cloud-gaming.gif" width="50%" alt="Pressing Stream on Deep Rock Galactic's page without installing it, getting a cloud console, then the in-stream menu, the Xbox guide and the performance overlay settings. Ads from the free tier are cut"> + <img src="media/0.6.7/xbox-cloud-game-page.jpg" width="50%" alt="A not-installed game's page in the Library with Stream, Install, In Library and Remove from Library"> + <img src="media/0.6.7/xbox-cloud-stream-menu.jpg" width="40%" alt="The in-stream menu: Resume, Xbox menu, Screen effects, Stream quality, Performance overlay and sound, and Leave"> + <img src="media/0.6.7/xbox-cloud-hud.jpg" width="50%" alt="The performance overlay in the corner of a cloud stream showing fps, ping, resolution, bitrate and decode time"> + + +- Added **Battle.net** as a store. It runs Blizzard’s real client in its own Proton prefix, with its games in the Library, Steam and the desktop, and the memory options Diablo IV and Diablo II: Resurrected need on an 11 GB phone. Games then **install straight from Stores**, with a location picker, downloads in the Downloads tab, pause and resume, updates and uninstall, and no Battle.net window to babysit. The catalog shows as a grid that scrolls, and games the Battle.net Agent no longer tracks stay out of the Library. (@kayakyakr, @maxjivi05, [#979](https://github.com/Droid-Deck/DroidDeck/pull/979), [#1602](https://github.com/Droid-Deck/DroidDeck/pull/1602), [#1610](https://github.com/Droid-Deck/DroidDeck/pull/1610), [#1611](https://github.com/Droid-Deck/DroidDeck/pull/1611)) + + <img src="media/0.6.7/battlenet-store.jpg" width="50%" alt="The Battle.net store's catalog as a grid of Blizzard and partner games"> + +- **GOG updates, repair and offline patches.** Installed GOG games get automatic update checks, depot updates, repair that reuses verified chunks, Galaxy delta patches that fall back to verified chunks, recovery journals, and standalone patches run through Proton. Saves, prefixes, shortcuts and settings are kept, and DLC you newly own is not installed on its own. (@xXJSONDeruloXx, [#1722](https://github.com/Droid-Deck/DroidDeck/pull/1722)) +- The **itch.io store is much bigger**. The Store tab browses by sort and price with paging and a disk cache, filters by platform and tag, and opens a version picker when you install, which also installs free games you do not own yet. Collections filter the Library, and installed games are checked for updates, which install safely into a staging folder first. (@FX192, [#1473](https://github.com/Droid-Deck/DroidDeck/pull/1473), [#1497](https://github.com/Droid-Deck/DroidDeck/pull/1497), [#1503](https://github.com/Droid-Deck/DroidDeck/pull/1503), [#1597](https://github.com/Droid-Deck/DroidDeck/pull/1597), [#1665](https://github.com/Droid-Deck/DroidDeck/pull/1665)) +- A **new custom DroidDeck HUD to complement MangoHud**, with lots of customizability. Tap it to cycle Full, Tiles, Pill, Minimal and Mega, drag it to move it and long-press to lock it. The Performance HUD page in the in-game menu sets size, opacity, colors, outline, which readouts show and °C or °F, and exports a diagnostics report. It reads the same numbers as Steam’s MangoHud overlay, so the two agree. (@The412Banner, [#1743](https://github.com/Droid-Deck/DroidDeck/pull/1743)) + + <img src="media/0.6.7/droiddeck-hud.gif" width="50%" alt="Tapping the DroidDeck HUD to step through Full, Tiles, Pill, Minimal and Mega while a game runs"> + <img src="media/0.6.7/hud-vs-mangohud.jpg" width="50%" alt="The DroidDeck HUD in Full size next to Steam's MangoHud bar, both reading the same frame rate, CPU, GPU and memory"> + +- **DroidDeck-Proton is now the default Proton.** It is downloaded once the runtime is set up, kept up to date, and each update replaces the older build without losing prefixes, game profiles or pinned choices. Picking Proton Experimental again afterwards sticks. **Other installed Proton builds also update themselves** when the app opens, while the device is idle on an unmetered connection, and older builds and pinned selections are kept. (@maxjivi05, @xXJSONDeruloXx, [#1540](https://github.com/Droid-Deck/DroidDeck/pull/1540), [#1510](https://github.com/Droid-Deck/DroidDeck/pull/1510)) +- The **Apps page is now a launcher home**, with search, filters and sorting, an A–Z scroller, folders, widgets, app shortcuts, hidden apps, swiping between pages, and pin requests from other apps. It lists work-profile apps too. (@xXJSONDeruloXx, [#1686](https://github.com/Droid-Deck/DroidDeck/pull/1686)) + + <img src="media/0.6.7/apps-page.gif" width="35%" alt="The Apps page in portrait: searching, sorting Z to A, filtering, adding an app to a new folder, adding a widget and making it wider and taller"> +- **Portrait is now supported** in two independent places. The launcher can follow device rotation or stay in portrait, with navigation along the bottom edge. Steam, game and desktop sessions can use Portrait or follow device rotation on their own, and **Controls below the game** places a landscape game above the touch controls on portrait phones and handhelds. (@xXJSONDeruloXx, [#1606](https://github.com/Droid-Deck/DroidDeck/pull/1606), [#1612](https://github.com/Droid-Deck/DroidDeck/pull/1612), [#1677](https://github.com/Droid-Deck/DroidDeck/pull/1677)) + + <img src="media/0.6.7/portrait-launcher.gif" width="50%" alt="The launcher in portrait with navigation along the bottom edge, moving through Library, Stores and Components"> + <img src="media/0.6.7/portrait-library.jpg" width="50%" alt="The Library in portrait"> + <img src="media/0.6.7/controls-below.jpg" width="50%" alt="Controls below the game in a portrait Steam session"> + +- **Dual-screen handhelds** such as the Retroid Pocket Duo and AYN Thor use their second screen. The launcher’s sections move to a menu on the bottom screen, and L2 and R2 switch them. Text fields type on the bottom screen while the top updates live. In a session, the trackpad and keyboard or the Deck controls open on the bottom screen, and **Bottom screen menu** opens the in-game menu there, so the game keeps the whole top screen. Steam’s text fields open the Android keyboard on the bottom screen instead of covering the game. Setup > Launcher has **Dual screen** (Automatic, On, Off) and the bottom screen switches; devices with one screen are unchanged. (@maxjivi05, [#1734](https://github.com/Droid-Deck/DroidDeck/pull/1734)) + + <img src="media/0.6.7/dual-screen-launcher.jpg" width="50%" alt="DroidDeck on a Retroid Pocket Duo: the Steam home on the top screen and the section menu on the bottom screen"> + <img src="media/0.6.7/dual-screen-steam-keyboard.gif" width="50%" alt="Tapping Steam's search on the Retroid Pocket Duo: the keyboard opens on the bottom screen, the search fills in on the top screen, and Enter puts the Deck controls back"> + +- **The Linux runtime is now Ubuntu 26.04 LTS**, with **Kubuntu’s Plasma desktop as a separate download** that adds only the files it needs; removing it puts the runtime back. `sudo`, `apt` and Discover work, with apt, Flatpak and Snap, and the packages and sources you add come back after a runtime update. DroidDeck’s Mesa, KWin and gamescope are held, so `apt full-upgrade` cannot replace them. Tapping a text field on the desktop opens the Android keyboard, and `~/Downloads` and `~/Documents` are Android’s folders. (@maxjivi05, @kingokksa, [#1733](https://github.com/Droid-Deck/DroidDeck/pull/1733)) + + <img src="media/0.6.7/ubuntu-desktop-discover.jpg" width="50%" alt="Discover on the Kubuntu desktop listing apps from Ubuntu's catalog, on a RedMagic tablet"> + <img src="media/0.6.7/ubuntu-desktop-keyboard.gif" width="50%" alt="Tapping the search field in the Kubuntu app menu: the Android keyboard opens, kate is typed and Enter opens Kate"> + +- The Kubuntu desktop’s default layout is now **one bottom panel** with Kickoff, the task manager and the system tray, instead of a top bar. Existing desktops keep the layout they have. (@maxjivi05, [#1772](https://github.com/Droid-Deck/DroidDeck/pull/1772)) + +- The **child-process limit is fixed with a guide**. “Fix it for me” opens a floating pairing guide over Android Settings that ticks off each Wireless debugging step as it happens, and with developer options off a shorter guide turns them on first. (@xXJSONDeruloXx, [#1682](https://github.com/Droid-Deck/DroidDeck/pull/1682), [#1726](https://github.com/Droid-Deck/DroidDeck/pull/1726)) + + <img src="media/0.6.7/guided-pairing.gif" width="50%" alt="Fix it for me opening a floating guide over Android Settings that turns on developer options, Wireless debugging and pairing, then returns to DroidDeck"> +- **Suspend and sleep are far more efficient.** In overnight testing, a game left suspended lost only **2%** battery. The microphone is released before a session freezes, so the device can really sleep (before, a Thor held the audio-input wake lock for 9 hours with no kernel suspend and a flat 120 mA draw), controller rumble stops when the device sleeps, the Steam logs are no longer re-read after every stop (that kept a core busy for about 45 s), and the zRAM step waits until the game window is focused. A **Pause** button and a paused-frame card, below, let you hold a session on purpose. (@xXJSONDeruloXx, @maxjivi05, @0x1Nawaf, [#1389](https://github.com/Droid-Deck/DroidDeck/pull/1389), [#1668](https://github.com/Droid-Deck/DroidDeck/pull/1668), [#1505](https://github.com/Droid-Deck/DroidDeck/pull/1505), [#1406](https://github.com/Droid-Deck/DroidDeck/pull/1406)) + +- Added a **Pause button to the session menu**. It pauses in every Background behavior and holds until you press Resume, even if you leave the app and return. The paused session is now shown as a grey card of the last frame with a glass Resume button. (@xXJSONDeruloXx, [#1701](https://github.com/Droid-Deck/DroidDeck/pull/1701), [#1403](https://github.com/Droid-Deck/DroidDeck/pull/1403)) + + <img src="media/0.6.7/pause-resume.gif" width="50%" alt="Pausing from the session menu, the paused frame as a grey card with a glass Resume button, then resuming"> + +- Added a **microphone toggle** to the session menu for sessions started with microphone support. While it is off, Steam’s voice capture stops. (@xXJSONDeruloXx, [#1506](https://github.com/Droid-Deck/DroidDeck/pull/1506)) +- Added **on-screen keys for any key or key combo** such as Ctrl+C, F5 or Tab, placed anywhere over the session. They work in Steam and non-Steam sessions with either on-screen pad. (@kingokksa, [#1305](https://github.com/Droid-Deck/DroidDeck/pull/1305)) + + <img src="media/0.6.7/screen-keys.gif" width="50%" alt="Adding an F5 key and an Esc key from the Add key keyboard in the screen key editor"> + +- Added an **Inner Gamer** RGB theme whose accent walks around the color wheel, with a Speed slider. The color picker’s hex box also stays above the keyboard now. (@FX192, [#1365](https://github.com/Droid-Deck/DroidDeck/pull/1365)) + + <img src="media/0.6.7/inner-gamer-theme.gif" width="50%" alt="The Inner Gamer theme cycling its accent color across the Play Steam button and the loading screen"> + +- **Per-game CPU cores.** A game profile can set `DROIDDECK_GAME_CORES` (for example `0-4`), so a light game does not wake every core. Windows games now see only the cores they are pinned to, and **Windows CPU 0 is a fast core**, which doubled GTA IV from 32 to 64 fps in testing. (@xXJSONDeruloXx, @maxjivi05, @The412Banner, [#1566](https://github.com/Droid-Deck/DroidDeck/pull/1566), [#1635](https://github.com/Droid-Deck/DroidDeck/pull/1635), [#1697](https://github.com/Droid-Deck/DroidDeck/pull/1697)) +- Added **Performance > Memory** sliders for a **RAM cap** and a **VRAM cap**, and a switch to **keep Steam uncompressed while a game runs** for phones that kill the session after the zRAM step. (@jazzyjamesgames, @xXJSONDeruloXx, [#1537](https://github.com/Droid-Deck/DroidDeck/pull/1537), [#1565](https://github.com/Droid-Deck/DroidDeck/pull/1565)) + + <img src="media/0.6.7/memory-caps.jpg" width="50%" alt="Performance > Memory with the Compress Steam switch and the RAM cap slider"> + +- A **Shader pre-caching** switch in the Steam settings turns Steam’s shader downloads on or off without a trip to the desktop. (@xXJSONDeruloXx, [#1400](https://github.com/Droid-Deck/DroidDeck/pull/1400)) +- Added **Game debug logs** in Setup > Diagnostics. The next Proton game launch collects Wine, DXVK and VKD3D logs in the session folder, and shared logs are redacted in bounded steps. (@wallentx, [#1061](https://github.com/Droid-Deck/DroidDeck/pull/1061)) + + <img src="media/0.6.7/game-debug-logs.jpg" width="50%" alt="Setup > Diagnostics with the Game debug logs switch"> + +- **Default storage for new installs.** Setup > Storage remembers where store installs go, and USB, SD card and SSD drives that Android hides from apps are detected and offered. (@dwicao, [#1520](https://github.com/Droid-Deck/DroidDeck/pull/1520)) + + <img src="media/0.6.7/storage-default.jpg" width="50%" alt="Setup > Storage with the Default storage choice"> + +- A **Reset prefix** button on each installed game in Storage > Game data deletes its Wine prefix so Steam recreates it on the next launch. (@xXJSONDeruloXx, [#1724](https://github.com/Droid-Deck/DroidDeck/pull/1724)) + + <img src="media/0.6.7/reset-prefix.jpg" width="50%" alt="Storage > Game data with a Clear shaders and a Reset prefix button on each game"> + +- DroidDeck **warns when a game library drive is linked at USB 2.0 speed**, names the drive and its real-world speed, and suggests a USB 3 cable. (@maxjivi05, [#1746](https://github.com/Droid-Deck/DroidDeck/pull/1746)) +- The **file manager** has Return to start and Exit buttons, and Back returns to the folder you came from, keeping up to 50 steps of history across drives. The Add Games picker can show dot-prefixed folders. (@K11MCH1, @xXJSONDeruloXx, @ZiYan416, [#1301](https://github.com/Droid-Deck/DroidDeck/pull/1301), [#1562](https://github.com/Droid-Deck/DroidDeck/pull/1562), [#1363](https://github.com/Droid-Deck/DroidDeck/pull/1363)) +- An optional **HTTP proxy for downloads** in Setup > Download, for networks where GitHub’s catalogs and release downloads are reset. (@VIIII4, [#1474](https://github.com/Droid-Deck/DroidDeck/pull/1474)) + + <img src="media/0.6.7/http-proxy.jpg" width="50%" alt="Setup with the HTTP proxy row under Downloads"> + +- Games can **stretch 16:9 to screens wider than 16:9** such as 20:9 phones, instead of showing black bars. (@xXJSONDeruloXx, [#1558](https://github.com/Droid-Deck/DroidDeck/pull/1558)) +- The **arm64 and x86-64 Steam clients share installed games**, so a game installed in one shows as installed in the other. **Remote Play from a PC now decodes on the arm64 client.** (@maxjivi05, [#1509](https://github.com/Droid-Deck/DroidDeck/pull/1509), [#1638](https://github.com/Droid-Deck/DroidDeck/pull/1638)) +- Steam’s **Browse buttons open a file chooser** for Add a Non-Steam Game, a shortcut’s target and library folders, on both the arm64 and x86-64 clients. (@maxjivi05, @xXJSONDeruloXx, [#1498](https://github.com/Droid-Deck/DroidDeck/pull/1498), [#1557](https://github.com/Droid-Deck/DroidDeck/pull/1557), [#1560](https://github.com/Droid-Deck/DroidDeck/pull/1560)) +- Games the Steam client installs on Windows with an install script now **install the redistributables the script runs**, such as OpenAL for DiRT 3. (@xXJSONDeruloXx, [#1561](https://github.com/Droid-Deck/DroidDeck/pull/1561)) +- **Desktop games run on the GPU** in a window of their own, and the performance HUD shows their real frame rate. (@maxjivi05, [#1584](https://github.com/Droid-Deck/DroidDeck/pull/1584), [#1608](https://github.com/Droid-Deck/DroidDeck/pull/1608)) +- Launching a game while a Proton build installs now **keeps the launch on the loading screen with the installer’s progress** and continues by itself. (@xXJSONDeruloXx, [#1629](https://github.com/Droid-Deck/DroidDeck/pull/1629), [#1666](https://github.com/Droid-Deck/DroidDeck/pull/1666)) +- **Low latency mode** is one switch for controller and touch input, on by default. A gamescope cursor option, off by default, is available in Performance. (@xXJSONDeruloXx, @0x1Nawaf, [#1604](https://github.com/Droid-Deck/DroidDeck/pull/1604), [#1407](https://github.com/Droid-Deck/DroidDeck/pull/1407)) +- **GPU drivers:** an Adreno 740 UBWC override under GPU drivers > Advanced, and an Auto driver choice that no longer picks a Turnip build for non-Adreno GPUs. **Rokid Max 2** glasses are recognized. (@Vabian124, @Danbro007, @informalTechCode, [#1099](https://github.com/Droid-Deck/DroidDeck/pull/1099), [#1380](https://github.com/Droid-Deck/DroidDeck/pull/1380), [#1535](https://github.com/Droid-Deck/DroidDeck/pull/1535)) + +### Improvements + +- **Performance** + - The **latest benchmark scores**, with every performance fix since 0.6.0, are on [@The412Banner’s performance page](https://the412banner.github.io/DroidDeck/performance-mode/). + - **Faster x86 games under FEX.** Wine’s arm64 context switches no longer go through a kernel signal, so an x86 `RaiseException` handled in Proton costs 2.2–2.7 µs instead of 14.7–20.3 µs and RDR2 makes about 47% fewer proot stops during launch. Wine’s process list reads memory counters straight from `/proc`, which cut a Windows process snapshot from 5.9–7.6 ms to 2.4–3.4 ms and RDR2’s status-file copies from about 7,000 a minute to 9. (@maxjivi05, [#1371](https://github.com/Droid-Deck/DroidDeck/pull/1371), [#1374](https://github.com/Droid-Deck/DroidDeck/pull/1374)) + - **`ntsync` is the default Wine sync and is far faster.** Event ping-pong between two threads takes 1.7–2.0 µs instead of 24–29 µs, and semaphore and mutex waits take about 0.12 µs. (@maxjivi05, [#1401](https://github.com/Droid-Deck/DroidDeck/pull/1401)) + - **Fewer syscalls through proot.** glibc’s own file calls and FEX’s raw `stat`, `readlink` and `statx` calls now use the fast path, and the fast path works on kernels older than 4.11. A session no longer starts on the slow built-in proot when the add-on pack is missing. (@xXJSONDeruloXx, @maxjivi05, @RewCrew, @0x1Nawaf, [#1687](https://github.com/Droid-Deck/DroidDeck/pull/1687), [#1757](https://github.com/Droid-Deck/DroidDeck/pull/1757), [#947](https://github.com/Droid-Deck/DroidDeck/pull/947), [#1395](https://github.com/Droid-Deck/DroidDeck/pull/1395)) + - **Smoother frame pacing.** Steam’s Frame Limit is the only frame limit and gamescope and the limit follow the screen’s refresh rate, a new frame is drawn the moment it arrives, the screen tick runs on its own thread, and gamescope repeats less work for every frame. A game held to a 60 fps limit drew 7.1 W instead of 9.5 W in testing. (@The412Banner, @xXJSONDeruloXx, @0x1Nawaf, [#1650](https://github.com/Droid-Deck/DroidDeck/pull/1650), [#1663](https://github.com/Droid-Deck/DroidDeck/pull/1663), [#1609](https://github.com/Droid-Deck/DroidDeck/pull/1609), [#1563](https://github.com/Droid-Deck/DroidDeck/pull/1563), [#1616](https://github.com/Droid-Deck/DroidDeck/pull/1616), [#1707](https://github.com/Droid-Deck/DroidDeck/pull/1707), [#1678](https://github.com/Droid-Deck/DroidDeck/pull/1678), [#1672](https://github.com/Droid-Deck/DroidDeck/pull/1672), [#1706](https://github.com/Droid-Deck/DroidDeck/pull/1706), [#1405](https://github.com/Droid-Deck/DroidDeck/pull/1405)) + - OpenGL and DirectDraw games no longer wait for each screen refresh, Steam’s D3D driver query no longer starts Wine in `compatdata/0`, and the Steam home page’s ambient motion keeps going. (@The412Banner, @xXJSONDeruloXx, [#1715](https://github.com/Droid-Deck/DroidDeck/pull/1715), [#1708](https://github.com/Droid-Deck/DroidDeck/pull/1708), [#1550](https://github.com/Droid-Deck/DroidDeck/pull/1550), [#1592](https://github.com/Droid-Deck/DroidDeck/pull/1592)) + - **Snapdragon 8 Gen 2 no longer pins Steam to one core by default**, which lifted the Steam menu’s 1% low from 41.7 fps to 62.5 fps in testing. (@maxjivi05, [#1441](https://github.com/Droid-Deck/DroidDeck/pull/1441)) + - DD-FG skips the flow images it never uses, **saving 9 to 37 MiB**, the Steam artwork scan lists each directory once, GPU stats keep working while clocks are pinned, and Steam’s shader setting is read off the main thread. (@ddd-ms, @xXJSONDeruloXx, [#1556](https://github.com/Droid-Deck/DroidDeck/pull/1556), [#1466](https://github.com/Droid-Deck/DroidDeck/pull/1466), [#1416](https://github.com/Droid-Deck/DroidDeck/pull/1416), [#1482](https://github.com/Droid-Deck/DroidDeck/pull/1482)) + - Adding games to Steam is quicker because the launch no longer rescans the whole library. (@kingokksa, [#1595](https://github.com/Droid-Deck/DroidDeck/pull/1595)) + - The hidden **Epic Games Launcher** kept open for sign-in no longer loads its Store and Fab pages while an Epic game runs, which had used about a core each and grown past 1 GB, and it is compressed while games run. (@maxjivi05, [#1764](https://github.com/Droid-Deck/DroidDeck/pull/1764)) +- **Steam client download** resumes, retries, shows megabytes and no longer pauses out of sight, which finishes the first Steam setup on a slow connection. (@maxjivi05, [#587](https://github.com/Droid-Deck/DroidDeck/pull/587)) +- **Focus glide** is consistent across primary buttons, dialogs, popup menus and more controls, grid scrolling moves one row at a time, and Nova layouts have scrolling store tabs and full portrait art. (@xXJSONDeruloXx, [#1588](https://github.com/Droid-Deck/DroidDeck/pull/1588), [#1750](https://github.com/Droid-Deck/DroidDeck/pull/1750), [#1574](https://github.com/Droid-Deck/DroidDeck/pull/1574)) +- Steam’s battery reading is **100% while charging** instead of 99%. (@xXJSONDeruloXx, [#1577](https://github.com/Droid-Deck/DroidDeck/pull/1577)) +- New sessions **follow automatic rotation, Native background behavior and automatic Picture-in-Picture** by default. (@maxjivi05, @xXJSONDeruloXx, [#1420](https://github.com/Droid-Deck/DroidDeck/pull/1420), [#1727](https://github.com/Droid-Deck/DroidDeck/pull/1727)) +- Sessions started without Steam **show the game’s settings in the menu** and use the launch options set in Steam’s Properties. (@kingokksa, @xXJSONDeruloXx, [#1113](https://github.com/Droid-Deck/DroidDeck/pull/1113), [#1552](https://github.com/Droid-Deck/DroidDeck/pull/1552)) +- A **failed Steam client start** now explains itself: the arm64 client falls back to Valve’s stable build when the beta one keeps failing, and Illegal-instruction and Vulkan failures say what to do. (@ovurrsl, @Danbro007, [#1340](https://github.com/Droid-Deck/DroidDeck/pull/1340), [#1380](https://github.com/Droid-Deck/DroidDeck/pull/1380)) +- **Translations:** Arabic text that mixes in English words reads right to left. (@maxjivi05, [#1568](https://github.com/Droid-Deck/DroidDeck/pull/1568)) +- **Building and testing DroidDeck** is faster and safer. CI runs its checks in parallel, reuses verified runtime components, avoids history blobs and the release-note GIFs, and retries network flakes. Contributors listed in `.github/trusted-test-builds.txt` get release-signed test builds for their fork PRs, and `tools/deploy_fast.py` grafts session helper changes into the latest main APK. A PRoot profiler can test fast-path libraries without an APK rebuild, Podman and x86 hosts can build, and the LICENSE notice names DroidDeck. (@xXJSONDeruloXx, @maxjivi05, @angelrenefm, @superboo07, @The412Banner, [#1409](https://github.com/Droid-Deck/DroidDeck/pull/1409), [#1412](https://github.com/Droid-Deck/DroidDeck/pull/1412), [#1417](https://github.com/Droid-Deck/DroidDeck/pull/1417), [#1719](https://github.com/Droid-Deck/DroidDeck/pull/1719), [#1725](https://github.com/Droid-Deck/DroidDeck/pull/1725), [#1735](https://github.com/Droid-Deck/DroidDeck/pull/1735), [#1737](https://github.com/Droid-Deck/DroidDeck/pull/1737), [#1739](https://github.com/Droid-Deck/DroidDeck/pull/1739), [#1646](https://github.com/Droid-Deck/DroidDeck/pull/1646), [#1721](https://github.com/Droid-Deck/DroidDeck/pull/1721), [#1528](https://github.com/Droid-Deck/DroidDeck/pull/1528), [#1527](https://github.com/Droid-Deck/DroidDeck/pull/1527), [#1440](https://github.com/Droid-Deck/DroidDeck/pull/1440), [#1741](https://github.com/Droid-Deck/DroidDeck/pull/1741), [#1690](https://github.com/Droid-Deck/DroidDeck/pull/1690), [#1694](https://github.com/Droid-Deck/DroidDeck/pull/1694), [#1423](https://github.com/Droid-Deck/DroidDeck/pull/1423), [#1435](https://github.com/Droid-Deck/DroidDeck/pull/1435), [#1545](https://github.com/Droid-Deck/DroidDeck/pull/1545), [#1767](https://github.com/Droid-Deck/DroidDeck/pull/1767)) + +### Fixed + +- Fixed **Steam on ROMs that refuse the Android ID read**, the Android 14 Redmi K70 bug where tapping Steam dropped back to the main screen. (@maxjivi05, [#1421](https://github.com/Droid-Deck/DroidDeck/pull/1421)) +- Fixed **other apps recording game audio** (DroidDeck now opts in to playback capture). (@maxjivi05, [#1430](https://github.com/Droid-Deck/DroidDeck/pull/1430)) +- Fixed **the app staying in one landscape side** since 0.6.0 even with auto-rotate on. (@maxjivi05, [#1420](https://github.com/Droid-Deck/DroidDeck/pull/1420)) +- Fixed **Ubisoft games**: Ubisoft Connect installs again from Steam’s install script, and its overlay is turned off so games stop crashing about 12 seconds after launch. (@maxjivi05, [#1449](https://github.com/Droid-Deck/DroidDeck/pull/1449), [#1463](https://github.com/Droid-Deck/DroidDeck/pull/1463)) +- Fixed games that need **D3D12 feature level 12_1**: Caravan SandWitch starts, Cyberpunk 2077 gets past ray tracing setup, and RoboCop: Rogue City and ReSkate run. (@maxjivi05, @xXJSONDeruloXx, [#1431](https://github.com/Droid-Deck/DroidDeck/pull/1431), [#1553](https://github.com/Droid-Deck/DroidDeck/pull/1553), [#1641](https://github.com/Droid-Deck/DroidDeck/pull/1641)) +- Fixed **Unity and Godot games**: FEX’s TSO stays on for Unity games, and Godot games that are not .NET keep Sentry. (@coffeemeist3r, @maxjivi05, [#1415](https://github.com/Droid-Deck/DroidDeck/pull/1415), [#1626](https://github.com/Droid-Deck/DroidDeck/pull/1626)) +- Fixed more **game-specific starts**: Skyrim’s voice lines play with XACT audio, World of Warcraft starts on DirectX 11, StarCraft starts its 32-bit client and keeps your FEX and DXVK choices on later Proton builds, Black Ops III and Dark Souls Remastered skip umu-protonfixes, The Crew 2 no longer shows a black screen because of D3DGear, and Forza Horizon 6 gets a short Xbox install path. (@xXJSONDeruloXx, @maxjivi05, @The412Banner, [#1554](https://github.com/Droid-Deck/DroidDeck/pull/1554), [#1576](https://github.com/Droid-Deck/DroidDeck/pull/1576), [#1564](https://github.com/Droid-Deck/DroidDeck/pull/1564), [#1653](https://github.com/Droid-Deck/DroidDeck/pull/1653), [#1508](https://github.com/Droid-Deck/DroidDeck/pull/1508), [#1627](https://github.com/Droid-Deck/DroidDeck/pull/1627), [#1625](https://github.com/Droid-Deck/DroidDeck/pull/1625)) +- Fixed **x86 Linux programs under FEX**: names in `LD_PRELOAD` are kept, x86 AppImages packed with sharun start, and x86 programs use DroidDeck’s own FEX build. (@maxjivi05, [#1419](https://github.com/Droid-Deck/DroidDeck/pull/1419), [#1622](https://github.com/Droid-Deck/DroidDeck/pull/1622)) +- Fixed **Xbox**: sign-in on phones with a slow StrongBox keystore, Xodus on external and SD storage, Minecraft for Windows starting, and a plain “sign in again” message when Microsoft rejects the download’s licenses. (@The412Banner, @xXJSONDeruloXx, @maxjivi05, [#1521](https://github.com/Droid-Deck/DroidDeck/pull/1521), [#1429](https://github.com/Droid-Deck/DroidDeck/pull/1429), [#1492](https://github.com/Droid-Deck/DroidDeck/pull/1492), [#1483](https://github.com/Droid-Deck/DroidDeck/pull/1483)) +- Fixed **GOG**: Galaxy SDK cloud saves are found and written to the right folder, the offline-installer fallback extracts natively on ARM, and sign-in pages use the browser’s own user agent so Cloudflare’s check passes. (@FanGoH, @moronigranja, @diegodru, [#970](https://github.com/Droid-Deck/DroidDeck/pull/970), [#1178](https://github.com/Droid-Deck/DroidDeck/pull/1178), [#1174](https://github.com/Droid-Deck/DroidDeck/pull/1174), [#1500](https://github.com/Droid-Deck/DroidDeck/pull/1500)) +- Fixed **Epic** paused installs, which keep what they downloaded and resume the rest instead of starting over. (@maxjivi05, [#1504](https://github.com/Droid-Deck/DroidDeck/pull/1504)) +- Fixed **Steam Input mouse clicks, scrolling and pointer moves** not reaching games since 0.6.0. (@maxjivi05, [#1485](https://github.com/Droid-Deck/DroidDeck/pull/1485)) +- Fixed **input**: on-screen controls work while the touchpad finger is down, a still Direct touch stays held unless Long press is on, Back chords no longer leak the partner’s input, Retroid Nova M1 and M2 map correctly, and queued chords are dropped when a controller disconnects. (@maxjivi05, @xXJSONDeruloXx, [#1633](https://github.com/Droid-Deck/DroidDeck/pull/1633), [#1578](https://github.com/Droid-Deck/DroidDeck/pull/1578), [#1628](https://github.com/Droid-Deck/DroidDeck/pull/1628), [#1571](https://github.com/Droid-Deck/DroidDeck/pull/1571), [#1632](https://github.com/Droid-Deck/DroidDeck/pull/1632)) +- Fixed **Steam’s compatibility tool** going back to the default after you changed it in Steam, and Proton’s EasyAntiCheat and BattlEye runtimes showing up as games. (@The412Banner, @maxjivi05, [#1347](https://github.com/Droid-Deck/DroidDeck/pull/1347), [#1457](https://github.com/Droid-Deck/DroidDeck/pull/1457)) +- Fixed Steam’s **Default startup movie** being replaced by DroidDeck’s animation, and **the signed-in Steam account** not being found with two accounts. (@maxjivi05, @l4nr3, [#1459](https://github.com/Droid-Deck/DroidDeck/pull/1459), [#1398](https://github.com/Droid-Deck/DroidDeck/pull/1398)) +- Fixed the **desktop and KDE Steam client**: games present through software WSI and no longer close on launch, the library helper stops when the client exits, and the Desktop page no longer overlaps on phones. (@maxjivi05, [#1518](https://github.com/Droid-Deck/DroidDeck/pull/1518), [#1519](https://github.com/Droid-Deck/DroidDeck/pull/1519), [#1494](https://github.com/Droid-Deck/DroidDeck/pull/1494)) +- Fixed the **performance HUD** measuring a different surface from Steam’s overlay, and the desktop-window fps. (@maxjivi05, [#1617](https://github.com/Droid-Deck/DroidDeck/pull/1617), [#1608](https://github.com/Droid-Deck/DroidDeck/pull/1608)) +- Fixed **stored components** that could not be deleted after a Proton update, left their originals behind when a Proton was removed, or were refused as in use. (@maxjivi05, @ovurrsl, [#1434](https://github.com/Droid-Deck/DroidDeck/pull/1434), [#1481](https://github.com/Droid-Deck/DroidDeck/pull/1481), [#1144](https://github.com/Droid-Deck/DroidDeck/pull/1144)) +- Fixed **Flatpak**, which now runs on the Ubuntu runtime: apps see the device’s network so WebRTC streams connect, `flatpak ps` and `flatpak kill` see running apps and stop their whole sandbox, sandboxed shortcuts are focused in gaming mode, setup clears a package lock left by an interrupted run, and it says why setup failed. (@maxjivi05, @xXJSONDeruloXx, [#1548](https://github.com/Droid-Deck/DroidDeck/pull/1548), [#1524](https://github.com/Droid-Deck/DroidDeck/pull/1524), [#1619](https://github.com/Droid-Deck/DroidDeck/pull/1619), [#1580](https://github.com/Droid-Deck/DroidDeck/pull/1580), [#1733](https://github.com/Droid-Deck/DroidDeck/pull/1733)) +- Fixed **Battle.net**: shared logs carry Battle.net’s and Blizzard’s own logs. (@maxjivi05, [#1573](https://github.com/Droid-Deck/DroidDeck/pull/1573)) +- Fixed the **last-played time** of added and store games, Fill scaling and Steam magnification turning the picture black, and the Android volume panel showing over Steam’s. (@xXJSONDeruloXx, [#1551](https://github.com/Droid-Deck/DroidDeck/pull/1551), [#1634](https://github.com/Droid-Deck/DroidDeck/pull/1634), [#1689](https://github.com/Droid-Deck/DroidDeck/pull/1689)) +- Fixed a **session that would not start** when the agent environment could not be prepared, and a first-run desktop or Proton install that kept downloading after Cancel. (@xXJSONDeruloXx, @ovurrsl, [#1579](https://github.com/Droid-Deck/DroidDeck/pull/1579), [#1042](https://github.com/Droid-Deck/DroidDeck/pull/1042)) +- Fixed **updates and security**: Stable users are no longer moved to Nightly by a channel guess, and the update status receiver only acts on DroidDeck’s own install session. (@ovurrsl, [#1067](https://github.com/Droid-Deck/DroidDeck/pull/1067), [#1015](https://github.com/Droid-Deck/DroidDeck/pull/1015)) +- Fixed **settings and storage**: chosen game art survives a Steam account switch, the session report keeps its thermal lines when one query is refused, and the prefix a Steam client made for a shortcut is reused. (@ovurrsl, @kingokksa, [#1026](https://github.com/Droid-Deck/DroidDeck/pull/1026), [#991](https://github.com/Droid-Deck/DroidDeck/pull/991), [#1107](https://github.com/Droid-Deck/DroidDeck/pull/1107)) +- Fixed UI details: the Stores and Library search closes with its X or Back, a store game’s description fills the free height, the Storage summary stacks in narrow panes, the navigation highlight follows the scrolled bar and Android app icons are sharp, and the compatibility tools screen blooms in. (@maxjivi05, @xXJSONDeruloXx, [#1567](https://github.com/Droid-Deck/DroidDeck/pull/1567), [#1493](https://github.com/Droid-Deck/DroidDeck/pull/1493), [#1736](https://github.com/Droid-Deck/DroidDeck/pull/1736), [#1677](https://github.com/Droid-Deck/DroidDeck/pull/1677), [#1666](https://github.com/Droid-Deck/DroidDeck/pull/1666)) +- Fixed the Steam download monitor stalling the main thread on a long content log. (@maxjivi05, [#1456](https://github.com/Droid-Deck/DroidDeck/pull/1456)) +- A Linux runtime update keeps imported AppImages, script apps and catalog emulators. (@ovurrsl, [#1062](https://github.com/Droid-Deck/DroidDeck/pull/1062)) +- Fixed the launch log pointing at a drawer switch that does not exist, and gesture settings showing outside gesture mode. (@DrummingBird1, @xXJSONDeruloXx, [#1354](https://github.com/Droid-Deck/DroidDeck/pull/1354), [#1654](https://github.com/Droid-Deck/DroidDeck/pull/1654)) +- Games started from another launcher return to it when they close. (@maxjivi05, [#1438](https://github.com/Droid-Deck/DroidDeck/pull/1438)) +- Fixed **updating Steam from Big Picture** ending the session. (@maxjivi05, [#1733](https://github.com/Droid-Deck/DroidDeck/pull/1733)) +- Fixed the **DroidDeck HUD**: the Pill size shows battery level, temperature and watts on one row, and a locked HUD lets on-screen controls under it work. New HUDs start locked, and the Performance HUD settings lose an extra line of explanatory text. (@The412Banner, @xXJSONDeruloXx, [#1763](https://github.com/Droid-Deck/DroidDeck/pull/1763), [#1768](https://github.com/Droid-Deck/DroidDeck/pull/1768)) +- On the **Retroid Pocket Duo**, a double press of Home opens Retroid’s quick menu during a Steam session, and its Adreno 722 shows as Supported. (@maxjivi05, [#1734](https://github.com/Droid-Deck/DroidDeck/pull/1734)) + +- Fixed **Steam exiting within a second on the Ubuntu runtime**, which was missing a library DD-Turnip needs to load. (@xXJSONDeruloXx, [#1773](https://github.com/Droid-Deck/DroidDeck/pull/1773)) +- Fixed the **Ubuntu desktop**: Electron and Chromium apps installed from apt, such as VS Code, Discord, Obsidian, Signal and Chrome, start instead of closing right away, and desktop apps can save read-only game files such as Fallout: New Vegas’s INI. (@maxjivi05, [#1775](https://github.com/Droid-Deck/DroidDeck/pull/1775), [#1781](https://github.com/Droid-Deck/DroidDeck/pull/1781)) + +### Community + +DroidDeck is built in the open by the people who use it. These are everyone whose code is in 0.6.7: + +| Contributor | Pull requests | +|---|---| +| @xXJSONDeruloXx | 79: Library and game page, portrait, QAM sync, Steam integration, GOG maintenance, pause, mic, CI and more | +| @maxjivi05 | 67: Battle.net, DroidDeck-Proton, Ubuntu runtime, dual screens, FEX and Wine performance, game fixes and more | +| @The412Banner | 19: Xbox Cloud Gaming, DroidDeck HUD, frame pacing, gamescope performance, game fixes | +| @ovurrsl | 8: updates and security, runtime and storage fixes, Steam fallback | +| @FX192 | 6: itch.io store, Inner Gamer theme | +| @kingokksa | 4: on-screen keys, game settings without Steam, prefix reuse | +| @0x1Nawaf | 4: slow proot, frame pacing, zRAM and gamescope cursor | +| @moronigranja | 2: GOG installer fallback, GOG cloud saves | +| @ddd-ms | 2: artwork scans, DD-FG memory | +| @RewCrew | [#947](https://github.com/Droid-Deck/DroidDeck/pull/947): fast proot path on old kernels | +| @FanGoH | [#970](https://github.com/Droid-Deck/DroidDeck/pull/970): GOG Galaxy SDK cloud saves | +| @kayakyakr | [#979](https://github.com/Droid-Deck/DroidDeck/pull/979): Battle.net | +| @wallentx | [#1061](https://github.com/Droid-Deck/DroidDeck/pull/1061): game debug logs | +| @Vabian124 | [#1099](https://github.com/Droid-Deck/DroidDeck/pull/1099): Adreno 740 UBWC override | +| @K11MCH1 | [#1301](https://github.com/Droid-Deck/DroidDeck/pull/1301): file manager Return and Exit | +| @DrummingBird1 | [#1354](https://github.com/Droid-Deck/DroidDeck/pull/1354): zero-copy launch log | +| @ZiYan416 | [#1363](https://github.com/Droid-Deck/DroidDeck/pull/1363): hidden folders in the game picker | +| @Danbro007 | [#1380](https://github.com/Droid-Deck/DroidDeck/pull/1380): Turnip choice and Steam startup errors | +| @l4nr3 | [#1398](https://github.com/Droid-Deck/DroidDeck/pull/1398): signed-in Steam account | +| @coffeemeist3r | [#1415](https://github.com/Droid-Deck/DroidDeck/pull/1415): TSO for Unity games | +| @superboo07 | [#1440](https://github.com/Droid-Deck/DroidDeck/pull/1440): Xbox backend cross compilation | +| @VIIII4 | [#1474](https://github.com/Droid-Deck/DroidDeck/pull/1474): HTTP proxy for downloads | +| @diegodru | [#1500](https://github.com/Droid-Deck/DroidDeck/pull/1500): GOG sign-in user agent | +| @dwicao | [#1520](https://github.com/Droid-Deck/DroidDeck/pull/1520): default storage | +| @angelrenefm | [#1527](https://github.com/Droid-Deck/DroidDeck/pull/1527): Podman image build | +| @informalTechCode | [#1535](https://github.com/Droid-Deck/DroidDeck/pull/1535): Rokid Max 2 | +| @jazzyjamesgames | [#1537](https://github.com/Droid-Deck/DroidDeck/pull/1537): RAM and VRAM caps | +| @devSharaku | [#1729](https://github.com/Droid-Deck/DroidDeck/pull/1729): Xbox backend 0.2.12 | + +<!-- Full PR lists per contributor are in contributors.md. --> + +### New contributors + +- @ddd-ms made their first contribution in [#1466](https://github.com/Droid-Deck/DroidDeck/pull/1466). +- @RewCrew made their first contribution in [#947](https://github.com/Droid-Deck/DroidDeck/pull/947). +- @FanGoH made their first contribution in [#970](https://github.com/Droid-Deck/DroidDeck/pull/970). +- @kayakyakr made their first contribution in [#979](https://github.com/Droid-Deck/DroidDeck/pull/979). +- @Vabian124 made their first contribution in [#1099](https://github.com/Droid-Deck/DroidDeck/pull/1099). +- @K11MCH1 made their first contribution in [#1301](https://github.com/Droid-Deck/DroidDeck/pull/1301). +- @DrummingBird1 made their first contribution in [#1354](https://github.com/Droid-Deck/DroidDeck/pull/1354). +- @ZiYan416 made their first contribution in [#1363](https://github.com/Droid-Deck/DroidDeck/pull/1363). +- @l4nr3 made their first contribution in [#1398](https://github.com/Droid-Deck/DroidDeck/pull/1398). +- @superboo07 made their first contribution in [#1440](https://github.com/Droid-Deck/DroidDeck/pull/1440). +- @VIIII4 made their first contribution in [#1474](https://github.com/Droid-Deck/DroidDeck/pull/1474). +- @diegodru made their first contribution in [#1500](https://github.com/Droid-Deck/DroidDeck/pull/1500). +- @dwicao made their first contribution in [#1520](https://github.com/Droid-Deck/DroidDeck/pull/1520). +- @jazzyjamesgames made their first contribution in [#1537](https://github.com/Droid-Deck/DroidDeck/pull/1537). +- @devSharaku made their first contribution in [#1729](https://github.com/Droid-Deck/DroidDeck/pull/1729). + +[Full changelog](https://github.com/Droid-Deck/DroidDeck/compare/0.6.0...0.6.7) diff --git a/docs/releases/0.6.9.md b/docs/releases/0.6.9.md new file mode 100644 index 000000000..1b6a6c5cf --- /dev/null +++ b/docs/releases/0.6.9.md @@ -0,0 +1,86 @@ +# DroidDeck 0.6.9 + +<p align="center"><a href="https://discord.gg/JRGAvawjsm"><img src="https://img.shields.io/badge/Discord-Join%20the%20community-5865F2?logo=discord&logoColor=white" alt="Join the DroidDeck Discord"></a></p> + +<!-- Maintainer check: Steam, Proton downloads and the games themselves come from Valve and the stores and are not part of DroidDeck; the intro below only claims DroidDeck's own code and the packs it builds. --> + +**DroidDeck is 100% open source. No ads. No telemetry. No source withheld.** + +Since 0.6.7, **5 people** sent **60 pull requests**. 30% of the pull requests came from the community. Thank you to everyone who sent code, translations, device testing and bug reports. This is a bug fix release: most of it fixes what you reported after 0.6.7. + +Fittingly for 0.6.9, the top and bottom screens on the Pocket Duo and AYN Thor have finally stopped fighting for dominance and learned to work together. + +**0.6.9 in 30 seconds** + +- **Dual-screen handhelds** like the Retroid Pocket Duo and AYN Thor no longer show “DroidDeck isn’t responding”, no longer jump back over other apps, and keep the bottom-screen panel you picked +- **Steam stops restarting at every start** to import added games, and asks first +- **Steam’s UI runs at the full refresh rate again**, with the heat fix kept, and a session left in picture-in-picture drops to **30 fps** to save battery +- **Cutscenes play again** with DroidDeck-Proton, and the **x86-64 Steam client** starts again on the Ubuntu runtime +- **Windows components survive runtime updates**, and the **Linux runtime updates by itself** +- **Xbox games run from their own folder** again, so Doom 64 and Unity games start +- **Banking apps** open again: Android listed DroidDeck’s optional Home button accessibility service even while it was off, which some banking apps block. It never reads your screen +- New: **controller button shortcuts**, **launch options for Steam games** in DroidDeck, a **frame limit for games started without Steam**, and a **DroidDeck HUD** you can pinch to resize and dock as an FPS tab + +### Features + +- Added **controller button shortcuts**: physical buttons can open Steam, Quick Access or DroidDeck’s menus, set per controller, with a reset. Buttons you leave unassigned work as before. Find them in Setup > Controller > Button mapping. (@jmarti326, [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202)) + + <img src="media/0.6.9/controller-shortcuts.jpg" width="50%" alt="Button mapping on a Retroid Pocket Duo with the new Physical button shortcuts group: Steam menu, Open Quick Access Menu and DroidDeck menu, each set to Default"> +- Added **launch options for Steam games** to a game’s Edit screen (the pencil on its page), so you can set options such as `-dx11` without opening Steam. They are the same launch options as in Steam’s Properties: a change in either one shows in both. (@K11MCH1, [#1888](https://github.com/Droid-Deck/DroidDeck/pull/1888)) +- Added a **Frame limit** for games started without Steam, on the Display page of the session drawer: Off, 30, 40, 45, 60, 90 or 120 fps. It applies live and lasts for the session. Steam games keep Steam’s own Frame Limit. (@xXJSONDeruloXx, [#1813](https://github.com/Droid-Deck/DroidDeck/pull/1813)) +- The HUD is now **DroidDeck HUD**. **Pinch with two fingers to resize it** from 50% to 200%, and **drag it past a screen edge to dock it as a small FPS tab**. (@xXJSONDeruloXx, [#1868](https://github.com/Droid-Deck/DroidDeck/pull/1868)) +- **x86_64 Flatpak apps run through FEX**. The r2modman bundle starts and loads its list of 334 games on a RedMagic Astra 2, and Flathub installs fall back to an app’s x86_64 build when it has no ARM one. A bundle built for an architecture DroidDeck cannot run is refused with a clear message before it downloads. (@maxjivi05, [#1875](https://github.com/Droid-Deck/DroidDeck/pull/1875), [#1873](https://github.com/Droid-Deck/DroidDeck/pull/1873)) +- The **Linux runtime updates by itself** when a new one is out, never during a game or desktop session. (@maxjivi05, [#1787](https://github.com/Droid-Deck/DroidDeck/pull/1787)) +- **itch.io updates download as patches** for games with butler builds, instead of the whole game again. (@FX192, [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829)) +- The desktop’s fastfetch shows the **DroidDeck mark** as its logo. (@xXJSONDeruloXx, [#1778](https://github.com/Droid-Deck/DroidDeck/pull/1778)) + +### Improvements + +- **.NET games start faster**: they keep the FEX preset’s multiblock setting, so Stardew Valley starts in **45 s instead of 85 s** on the Retroid Pocket Duo. (@maxjivi05, [#1880](https://github.com/Droid-Deck/DroidDeck/pull/1880)) +- On low-memory devices, **Battle.net is compressed with the Steam client** while one of its games runs. Battle.net.exe alone used 345 MB on the Retroid Pocket Duo. (@maxjivi05, [#1882](https://github.com/Droid-Deck/DroidDeck/pull/1882)) +- Steam’s **Sleep after** timers start every session as Disabled, since Android decides when the device sleeps. New Steam installs start with **shader pre-caching off**. (@xXJSONDeruloXx, [#1848](https://github.com/Droid-Deck/DroidDeck/pull/1848), [#1861](https://github.com/Droid-Deck/DroidDeck/pull/1861)) +- The Library starts with **portrait covers** on new installs, and the Steam home drops its “Runtime installs on first Play” chip. Your saved layout is kept. (@xXJSONDeruloXx, [#1857](https://github.com/Droid-Deck/DroidDeck/pull/1857), [#1854](https://github.com/Droid-Deck/DroidDeck/pull/1854)) +- A **USB drive that is mounted but unreadable**, as on some Samsung phones, now explains itself and opens the All files access page, from the side rail too. (@maxjivi05, [#1872](https://github.com/Droid-Deck/DroidDeck/pull/1872)) +- **Translations:** every string added since the last pass is in all 32 languages. (@maxjivi05, [#1855](https://github.com/Droid-Deck/DroidDeck/pull/1855)) +- **Building and testing DroidDeck:** test and local builds show a faint PR, commit and title watermark, and the required-check tests match the CI gate. (@xXJSONDeruloXx, @maxjivi05, [#1863](https://github.com/Droid-Deck/DroidDeck/pull/1863), [#1864](https://github.com/Droid-Deck/DroidDeck/pull/1864), [#1866](https://github.com/Droid-Deck/DroidDeck/pull/1866), [#1874](https://github.com/Droid-Deck/DroidDeck/pull/1874)) + +### Fixed + +- Fixed **“DroidDeck isn’t responding” on dual-screen handhelds** when input reached the bottom screen or the bottom screen took focus, which stopped controller navigation and RB/LB on the Stores tab. Seen on the AYN Thor and Retroid Pocket Duo. (@maxjivi05, [#1806](https://github.com/Droid-Deck/DroidDeck/pull/1806), [#1871](https://github.com/Droid-Deck/DroidDeck/pull/1871)) +- Fixed **dual-screen handhelds** taking over other apps: DroidDeck no longer jumps back over apps opened from outside it, such as iisu, an app sent to the Primary screen stays in front, the update install prompt survives a bottom-screen tap, and the home launcher stays out of Recents. (@maxjivi05, @xXJSONDeruloXx, [#1828](https://github.com/Droid-Deck/DroidDeck/pull/1828), [#1797](https://github.com/Droid-Deck/DroidDeck/pull/1797), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed the **bottom screen**: it keeps the panel you picked, such as Trackpad or Terminal, across games, keeps DroidDeck’s controls up while a game loads, keeps the manual second-screen option when Dual screen is Off, and the Stop button no longer wraps letter by letter on the AYN Thor. (@maxjivi05, @xXJSONDeruloXx, [#1803](https://github.com/Droid-Deck/DroidDeck/pull/1803), [#1840](https://github.com/Droid-Deck/DroidDeck/pull/1840), [#1777](https://github.com/Droid-Deck/DroidDeck/pull/1777), [#1805](https://github.com/Droid-Deck/DroidDeck/pull/1805)) +- Fixed the **AYN Odin 2, Odin 2 Mini and Odin 2 Portal** losing their side rail and Back menu: Automatic dual screen now needs a real second touchscreen. On Meta Quest the launcher opens as a landscape window. (@maxjivi05, [#1801](https://github.com/Droid-Deck/DroidDeck/pull/1801), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed **games launched from a frontend** such as Cocoon or iisu sitting on the home screen instead of starting. (@maxjivi05, @xXJSONDeruloXx, [#1789](https://github.com/Droid-Deck/DroidDeck/pull/1789), [#1844](https://github.com/Droid-Deck/DroidDeck/pull/1844)) +- Fixed **Steam restarting within seconds of every start** to import added games, which cut off game shortcuts. DroidDeck now asks with Restart now or Later. (@maxjivi05, [#1795](https://github.com/Droid-Deck/DroidDeck/pull/1795)) +- Fixed **Steam’s UI lag and heat** since 0.6.7 while keeping it at the panel’s full refresh rate, and a session left in **picture-in-picture** now draws at 30 fps, which saved about 1 W on a RedMagic Astra 2. (@maxjivi05, [#1809](https://github.com/Droid-Deck/DroidDeck/pull/1809), [#1841](https://github.com/Droid-Deck/DroidDeck/pull/1841), [#1842](https://github.com/Droid-Deck/DroidDeck/pull/1842)) +- Fixed the **performance HUD** turning itself on: it is off by default again, and your own choice is kept. (@maxjivi05, [#1807](https://github.com/Droid-Deck/DroidDeck/pull/1807)) +- Fixed **cutscenes and in-game videos** with DroidDeck-Proton: Resident Evil Revelations no longer waits forever on a loading screen and Kingdom Hearts HD 1.5+2.5 no longer crashes at cutscenes. (@maxjivi05, [#1823](https://github.com/Droid-Deck/DroidDeck/pull/1823)) +- Fixed the **Ubuntu runtime** without the desktop installed: the x86-64 Steam client starts again and survives its first self-update, ARMSX2, melonDS and Cemu start, and Steam’s Browse buttons, smart-card and speech support and GPU info in Steam work. (@maxjivi05, [#1825](https://github.com/Droid-Deck/DroidDeck/pull/1825), [#1793](https://github.com/Droid-Deck/DroidDeck/pull/1793), [#1802](https://github.com/Droid-Deck/DroidDeck/pull/1802)) +- Fixed **Windows components** (DirectX, Visual C++, XAudio, PhysX and more) disappearing after a runtime update. Lost ones are downloaded again, missing parts of bundles are reinstalled, and a launch waits for the restore. (@maxjivi05, [#1786](https://github.com/Droid-Deck/DroidDeck/pull/1786), [#1788](https://github.com/Droid-Deck/DroidDeck/pull/1788)) +- Fixed **Xbox games** running from the drive root: Doom 64, Unity games and AI: The Somnium Files start again. (@maxjivi05, [#1804](https://github.com/Droid-Deck/DroidDeck/pull/1804)) +- Fixed **Battle.net**: games install to Android storage, microSD cards and USB SSDs without the “logging on as an administrator” error, and its windows scale to screens above 1080p instead of opening tiny. (@maxjivi05, [#1791](https://github.com/Droid-Deck/DroidDeck/pull/1791), [#1832](https://github.com/Droid-Deck/DroidDeck/pull/1832)) +- Fixed **Mortal Kombat 11** and other games with a launch-option picker being closed while the picker was open. (@maxjivi05, [#1869](https://github.com/Droid-Deck/DroidDeck/pull/1869)) +- Fixed a **three-finger tap pasting clipboard text** in touchpad mode, the default for desktop sessions and Steam’s desktop UI. It now opens the keyboard there too, as in every other touch mode. (@xXJSONDeruloXx, [#1903](https://github.com/Droid-Deck/DroidDeck/pull/1903)) +- Fixed **DirectAudio crackling** on devices where Android refuses low-latency output, such as the AYN Thor. (@maxjivi05, [#1862](https://github.com/Droid-Deck/DroidDeck/pull/1862)) +- Fixed **banking apps** such as UBS refusing to open while DroidDeck 0.6.7 was installed. Nothing was wrong with your device or your accounts. 0.6.7 added an optional **accessibility service for Home button shortcuts** (Setup > Steam integration > Home button shortcuts), which lets you hold Home for Steam Guide chords. It only listens for button presses, and it cannot see your screen or read anything in other apps. Even when you never turned it on, Android listed it as installed, and some banking apps block any app outside the Play Store that has an accessibility service able to read button presses, to be safe. DroidDeck now only lists the service while you have it turned on in Android’s Accessibility settings, so banking apps open normally. If you use Home button shortcuts, the service stays on and those banking apps will still see it, because that is how accessibility services work. (@maxjivi05, [#1824](https://github.com/Droid-Deck/DroidDeck/pull/1824)) +- Fixed **added games showing up as Spacewar**: a game whose `steam_appid.txt` says 480, as Steam emulators and multiplayer fixes write it, such as PEAK, is no longer imported into Steam as Spacewar. An earlier import is undone, your game folder is left untouched, and a game whose Steam app ID changes follows it, with its art fetched again. (@K11MCH1, [#1896](https://github.com/Droid-Deck/DroidDeck/pull/1896)) +- Fixed **folders of games on game storage**, such as Rance 01, showing as one combined game, and adding a game changing another game’s exe. (@maxjivi05, [#1810](https://github.com/Droid-Deck/DroidDeck/pull/1810), [#1822](https://github.com/Droid-Deck/DroidDeck/pull/1822)) +- Fixed **Linux games on an NTFS USB drive** closing after about 14 seconds on their first start. (@maxjivi05, [#1850](https://github.com/Droid-Deck/DroidDeck/pull/1850)) +- Fixed **itch.io games** whose download is an archive inside an archive, such as Voices of the Void. (@maxjivi05, [#1800](https://github.com/Droid-Deck/DroidDeck/pull/1800)) +- Fixed the **Steam and desktop clock** staying on GMT instead of the Android time zone, and **Teardown** dropping to 30 fps under a Steam frame limit. (@maxjivi05, [#1790](https://github.com/Droid-Deck/DroidDeck/pull/1790)) +- Fixed Steam’s **Add a Non-Steam Game > Browse** button in the desktop session when another app holds port 8080 and Decky is on. (@maxjivi05, [#1798](https://github.com/Droid-Deck/DroidDeck/pull/1798)) +- Fixed **desktop video wallpapers** racing ahead after DroidDeck comes back from the background, and the Library’s Filter, Sort, Display and Collections menus being cut off in portrait. (@maxjivi05, [#1833](https://github.com/Droid-Deck/DroidDeck/pull/1833), [#1827](https://github.com/Droid-Deck/DroidDeck/pull/1827)) + +### Community + +DroidDeck is built in the open by the people who use it. These are everyone whose code is in 0.6.9: + +| Contributor | Pull requests | +|---|---| +| @maxjivi05 | 42: dual screens, Steam restarts and refresh rate, Ubuntu runtime, Windows components, Xbox, Battle.net, Flatpak through FEX and more | +| @xXJSONDeruloXx | 14: DroidDeck HUD, frame limit without Steam, frontend launches, touchpad keyboard tap, Steam defaults, Library covers and more | +| @K11MCH1 | 2: launch options for Steam games, Spacewar imports | +| @jmarti326 | [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202): controller button shortcuts | +| @FX192 | [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829): itch.io patch updates | + +[Full changelog](https://github.com/Droid-Deck/DroidDeck/compare/0.6.7...0.6.9) diff --git a/docs/releases/media/0.6.7/apps-page.gif b/docs/releases/media/0.6.7/apps-page.gif new file mode 100644 index 000000000..210149c75 Binary files /dev/null and b/docs/releases/media/0.6.7/apps-page.gif differ diff --git a/docs/releases/media/0.6.7/battlenet-store.jpg b/docs/releases/media/0.6.7/battlenet-store.jpg new file mode 100644 index 000000000..0b160d272 Binary files /dev/null and b/docs/releases/media/0.6.7/battlenet-store.jpg differ diff --git a/docs/releases/media/0.6.7/controls-below.jpg b/docs/releases/media/0.6.7/controls-below.jpg new file mode 100644 index 000000000..effca4e39 Binary files /dev/null and b/docs/releases/media/0.6.7/controls-below.jpg differ diff --git a/docs/releases/media/0.6.7/droiddeck-hud.gif b/docs/releases/media/0.6.7/droiddeck-hud.gif new file mode 100644 index 000000000..c0f70bc02 Binary files /dev/null and b/docs/releases/media/0.6.7/droiddeck-hud.gif differ diff --git a/docs/releases/media/0.6.7/dual-screen-launcher.jpg b/docs/releases/media/0.6.7/dual-screen-launcher.jpg new file mode 100644 index 000000000..cd00e9f1b Binary files /dev/null and b/docs/releases/media/0.6.7/dual-screen-launcher.jpg differ diff --git a/docs/releases/media/0.6.7/dual-screen-steam-keyboard.gif b/docs/releases/media/0.6.7/dual-screen-steam-keyboard.gif new file mode 100644 index 000000000..dd7a38c91 Binary files /dev/null and b/docs/releases/media/0.6.7/dual-screen-steam-keyboard.gif differ diff --git a/docs/releases/media/0.6.7/faster-since-0.6.0.png b/docs/releases/media/0.6.7/faster-since-0.6.0.png new file mode 100644 index 000000000..9cf5b659f Binary files /dev/null and b/docs/releases/media/0.6.7/faster-since-0.6.0.png differ diff --git a/docs/releases/media/0.6.7/game-debug-logs.jpg b/docs/releases/media/0.6.7/game-debug-logs.jpg new file mode 100644 index 000000000..5ab7549e5 Binary files /dev/null and b/docs/releases/media/0.6.7/game-debug-logs.jpg differ diff --git a/docs/releases/media/0.6.7/game-page-4x3.jpg b/docs/releases/media/0.6.7/game-page-4x3.jpg new file mode 100644 index 000000000..a8c7fd7d1 Binary files /dev/null and b/docs/releases/media/0.6.7/game-page-4x3.jpg differ diff --git a/docs/releases/media/0.6.7/game-page.jpg b/docs/releases/media/0.6.7/game-page.jpg new file mode 100644 index 000000000..f25329802 Binary files /dev/null and b/docs/releases/media/0.6.7/game-page.jpg differ diff --git a/docs/releases/media/0.6.7/guided-pairing.gif b/docs/releases/media/0.6.7/guided-pairing.gif new file mode 100644 index 000000000..dd6edf0c1 Binary files /dev/null and b/docs/releases/media/0.6.7/guided-pairing.gif differ diff --git a/docs/releases/media/0.6.7/http-proxy.jpg b/docs/releases/media/0.6.7/http-proxy.jpg new file mode 100644 index 000000000..79c4241f4 Binary files /dev/null and b/docs/releases/media/0.6.7/http-proxy.jpg differ diff --git a/docs/releases/media/0.6.7/hud-vs-mangohud.jpg b/docs/releases/media/0.6.7/hud-vs-mangohud.jpg new file mode 100644 index 000000000..bcdc81af3 Binary files /dev/null and b/docs/releases/media/0.6.7/hud-vs-mangohud.jpg differ diff --git a/docs/releases/media/0.6.7/inner-gamer-theme.gif b/docs/releases/media/0.6.7/inner-gamer-theme.gif new file mode 100644 index 000000000..b6b7a9eda Binary files /dev/null and b/docs/releases/media/0.6.7/inner-gamer-theme.gif differ diff --git a/docs/releases/media/0.6.7/library-4x3.jpg b/docs/releases/media/0.6.7/library-4x3.jpg new file mode 100644 index 000000000..16fe1b77a Binary files /dev/null and b/docs/releases/media/0.6.7/library-4x3.jpg differ diff --git a/docs/releases/media/0.6.7/library.gif b/docs/releases/media/0.6.7/library.gif new file mode 100644 index 000000000..a8e8e8c7b Binary files /dev/null and b/docs/releases/media/0.6.7/library.gif differ diff --git a/docs/releases/media/0.6.7/memory-caps.jpg b/docs/releases/media/0.6.7/memory-caps.jpg new file mode 100644 index 000000000..0b05802bc Binary files /dev/null and b/docs/releases/media/0.6.7/memory-caps.jpg differ diff --git a/docs/releases/media/0.6.7/pause-resume.gif b/docs/releases/media/0.6.7/pause-resume.gif new file mode 100644 index 000000000..90f1ad2c0 Binary files /dev/null and b/docs/releases/media/0.6.7/pause-resume.gif differ diff --git a/docs/releases/media/0.6.7/portrait-launcher.gif b/docs/releases/media/0.6.7/portrait-launcher.gif new file mode 100644 index 000000000..36aeede67 Binary files /dev/null and b/docs/releases/media/0.6.7/portrait-launcher.gif differ diff --git a/docs/releases/media/0.6.7/portrait-library.jpg b/docs/releases/media/0.6.7/portrait-library.jpg new file mode 100644 index 000000000..92da78a43 Binary files /dev/null and b/docs/releases/media/0.6.7/portrait-library.jpg differ diff --git a/docs/releases/media/0.6.7/portrait-steam.jpg b/docs/releases/media/0.6.7/portrait-steam.jpg new file mode 100644 index 000000000..5bfde441f Binary files /dev/null and b/docs/releases/media/0.6.7/portrait-steam.jpg differ diff --git a/docs/releases/media/0.6.7/reset-prefix.jpg b/docs/releases/media/0.6.7/reset-prefix.jpg new file mode 100644 index 000000000..f20a4c243 Binary files /dev/null and b/docs/releases/media/0.6.7/reset-prefix.jpg differ diff --git a/docs/releases/media/0.6.7/screen-keys.gif b/docs/releases/media/0.6.7/screen-keys.gif new file mode 100644 index 000000000..544ffc2f5 Binary files /dev/null and b/docs/releases/media/0.6.7/screen-keys.gif differ diff --git a/docs/releases/media/0.6.7/sidebar-labels.gif b/docs/releases/media/0.6.7/sidebar-labels.gif new file mode 100644 index 000000000..63863f534 Binary files /dev/null and b/docs/releases/media/0.6.7/sidebar-labels.gif differ diff --git a/docs/releases/media/0.6.7/steam-input-chords.gif b/docs/releases/media/0.6.7/steam-input-chords.gif new file mode 100644 index 000000000..86fb9e6dd Binary files /dev/null and b/docs/releases/media/0.6.7/steam-input-chords.gif differ diff --git a/docs/releases/media/0.6.7/steam-integration.jpg b/docs/releases/media/0.6.7/steam-integration.jpg new file mode 100644 index 000000000..196985ae6 Binary files /dev/null and b/docs/releases/media/0.6.7/steam-integration.jpg differ diff --git a/docs/releases/media/0.6.7/storage-default.jpg b/docs/releases/media/0.6.7/storage-default.jpg new file mode 100644 index 000000000..6cadb0a55 Binary files /dev/null and b/docs/releases/media/0.6.7/storage-default.jpg differ diff --git a/docs/releases/media/0.6.7/ubuntu-desktop-discover.jpg b/docs/releases/media/0.6.7/ubuntu-desktop-discover.jpg new file mode 100644 index 000000000..795c444b6 Binary files /dev/null and b/docs/releases/media/0.6.7/ubuntu-desktop-discover.jpg differ diff --git a/docs/releases/media/0.6.7/ubuntu-desktop-keyboard.gif b/docs/releases/media/0.6.7/ubuntu-desktop-keyboard.gif new file mode 100644 index 000000000..9388738d7 Binary files /dev/null and b/docs/releases/media/0.6.7/ubuntu-desktop-keyboard.gif differ diff --git a/docs/releases/media/0.6.7/xbox-cloud-game-page.jpg b/docs/releases/media/0.6.7/xbox-cloud-game-page.jpg new file mode 100644 index 000000000..fc80ba954 Binary files /dev/null and b/docs/releases/media/0.6.7/xbox-cloud-game-page.jpg differ diff --git a/docs/releases/media/0.6.7/xbox-cloud-gaming.gif b/docs/releases/media/0.6.7/xbox-cloud-gaming.gif new file mode 100644 index 000000000..c631d9f7f Binary files /dev/null and b/docs/releases/media/0.6.7/xbox-cloud-gaming.gif differ diff --git a/docs/releases/media/0.6.7/xbox-cloud-hud.jpg b/docs/releases/media/0.6.7/xbox-cloud-hud.jpg new file mode 100644 index 000000000..c45933c32 Binary files /dev/null and b/docs/releases/media/0.6.7/xbox-cloud-hud.jpg differ diff --git a/docs/releases/media/0.6.7/xbox-cloud-overlay-settings.jpg b/docs/releases/media/0.6.7/xbox-cloud-overlay-settings.jpg new file mode 100644 index 000000000..b69be932c Binary files /dev/null and b/docs/releases/media/0.6.7/xbox-cloud-overlay-settings.jpg differ diff --git a/docs/releases/media/0.6.7/xbox-cloud-stream-menu.jpg b/docs/releases/media/0.6.7/xbox-cloud-stream-menu.jpg new file mode 100644 index 000000000..a77a5e6cd Binary files /dev/null and b/docs/releases/media/0.6.7/xbox-cloud-stream-menu.jpg differ diff --git a/docs/releases/media/0.6.9/controller-shortcuts.jpg b/docs/releases/media/0.6.9/controller-shortcuts.jpg new file mode 100644 index 000000000..1916d51f9 Binary files /dev/null and b/docs/releases/media/0.6.9/controller-shortcuts.jpg differ diff --git a/docs/smart-glasses-support.md b/docs/smart-glasses-support.md index 416b0c3f4..0446bdb34 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,13 +43,17 @@ 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. In **Automatic** picture mode, ordinary flat content is duplicated in full into both eyes on an SBS display. **Virtual screen** adds a configurable screen plane and tracking. **Side-by-side game** is for content that already contains separate eye images. SteamVR uses its direct stereo view and field-of-view control. +With **game on glasses** the compositor draws the guest pointer into its own scene as the last blended draw and mirrors it into both eyes for a side-by-side picture, while the phone stops drawing its Compose cursor. Over the app's own UI — the drawer, the PC keyboard, the achievements panel, PiP controls and the phone panel shown while the glasses have the picture — Android's pointer returns instead, so those controls are still clickable with a mouse. + +The pointer is left out of the picture when it cannot be drawn where the game is: while a game holds the pointer lock (it draws its own), and for a game the compositor cannot import — an AHardwareBuffer-only surface, or HDR frames it has no texture for. Those games stay on their own display layer, because composing the scene would drop the game itself. An importable HDR game that would otherwise stay on its own layer is composed through the screen swapchain, so there the pointer does fit. + ## Setup and app-wide behavior 1. Connect the glasses through a compatible video/data connection. Accept USB access when requested. For XREAL 1S, Android must also expose the glasses' USB-Ethernet network; the app leaves Steam's Internet connection on its normal network. diff --git a/docs/testing/steam-in-kde.md b/docs/testing/steam-in-kde.md index c199aca81..306e9a20d 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b29e48e44..2e8422a4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/tools/aaudio-sink/android-volume.h b/tools/aaudio-sink/android-volume.h new file mode 100644 index 000000000..3ab4d9d0c --- /dev/null +++ b/tools/aaudio-sink/android-volume.h @@ -0,0 +1,123 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <stdio.h> +#include <pulsecore/core-rtclock.h> +#include <pulsecore/core-subscribe.h> + +#define ANDROID_VOLUME_IDLE_MS 100 +#define ANDROID_VOLUME_ACTIVE_MS 16 +#define ANDROID_VOLUME_ACTIVE_TICKS 40 + +struct android_volume { + pa_sink *sink; + char *directory; + pa_time_event *timer; + unsigned active_ticks; +}; + +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); + 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) { + if (android_volume_read(bridge->directory, &level, &maximum, &muted)) { + pa_cvolume volume; + bool changed = false; + 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); + changed = true; + } + if (bridge->sink->muted != !!muted) { + pa_sink_mute_changed(bridge->sink, !!muted); + changed = true; + } + if (changed) bridge->active_ticks = ANDROID_VOLUME_ACTIVE_TICKS; + } + } else { + bridge->active_ticks = ANDROID_VOLUME_ACTIVE_TICKS; + } + pa_xfree(request); + pa_xfree(mute_request); + pa_xfree(processing); + pa_xfree(mute_processing); + unsigned delay_ms = ANDROID_VOLUME_IDLE_MS; + if (bridge->active_ticks) { + bridge->active_ticks--; + delay_ms = ANDROID_VOLUME_ACTIVE_MS; + } + pa_core_rttime_restart(bridge->sink->core, event, pa_rtclock_now() + delay_ms * 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() + ANDROID_VOLUME_IDLE_MS * 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 619bd2673..e79a20a54 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/build_local.sh b/tools/build_local.sh index a980d70a6..7952d7a0e 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -24,7 +24,8 @@ java_dir="${JAVA_HOME:-/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents [[ -x "$java_dir/bin/java" ]] || java_dir="${HOME}/.local/share/mise/installs/java/temurin-17" [[ "$java_dir" == */homebrew/* ]] && echo "using homebrew java path: $java_dir" [[ "$java_dir" == */mise/* ]] && echo "using mise java path: $java_dir" -image_name=${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3} +. "${repo_root}/tools/docker_platform.sh" +image_name=${DROIDDECK_BUILD_IMAGE} build_variant=${DROIDDECK_BUILD_VARIANT:-release} case "$build_variant" in debug) gradle_task=assembleDebug ;; @@ -44,7 +45,7 @@ if ! command -v docker >/dev/null 2>&1; then echo "Docker is required to cross-compile the glibc ARM64 preload libraries." >&2 exit 1 fi -for tool in curl tar zstd shasum unzip python3; do +for tool in curl tar zstd shasum unzip python3 go; do if ! command -v "${tool}" >/dev/null 2>&1; then echo "${tool} is required to build the CI-equivalent APK." >&2 exit 1 @@ -85,8 +86,6 @@ trap 'exit 143' TERM cache_dir=${DROIDDECK_BUILD_CACHE:-"${HOME}/.cache/droiddeck-build"} mkdir -p "${cache_dir}" -# Steps whose output depends only on tracked sources are kept per input hash in the -# shared cache, so a rerun or a fresh worktree copies them instead of rebuilding. inputs_hash() { (cd "${repo_root}" && { printf '%s\n' "$1"; shift; find "$@" -type f ! -name '*.pyc' | LC_ALL=C sort | xargs shasum -a 256; }) \ | shasum -a 256 | cut -d' ' -f1 @@ -104,7 +103,6 @@ save_step() { part=$(mktemp -d "${stored}.part.XXXXXX") (cd "$3" && tar -cf - .) | tar -xf - -C "${part}" touch "${part}/.complete" - # Another checkout may have published the same key meanwhile; its copy is equivalent. if [[ -e "${stored}" ]]; then rm -rf "${part}"; else mv "${part}" "${stored}" || rm -rf "${part}"; fi } @@ -113,7 +111,7 @@ image_id=$(docker image inspect --format '{{.Id}}' "${image_name}") rm -rf -- "${linuxfs_dir}" mkdir -p "${linuxfs_dir}" -docker run --rm --platform linux/amd64 \ +docker run --rm --platform "${docker_platform}" \ --user "$(id -u):$(id -g)" \ -v "${repo_root}:/src" -w /src "${image_name}" bash -lc ' set -euo pipefail @@ -180,6 +178,13 @@ if ! restore_step vr "${vr_key}" "${vr_out}"; then save_step vr "${vr_key}" "${vr_out}" fi +gpuload_out="${linuxfs_dir}/usr/local/lib/droiddeck-gpuload" +gpuload_key=$(inputs_hash "${image_id} ${ndk_version} ${VK_INCLUDE:-}" tools/gpuload) +if ! restore_step gpuload "${gpuload_key}" "${gpuload_out}"; then + DROIDDECK_BUILD_IMAGE="${image_name}" "${repo_root}/tools/gpuload/build.sh" "${gpuload_out}" + save_step gpuload "${gpuload_key}" "${gpuload_out}" +fi + github_repo=${DROIDDECK_GITHUB_REPOSITORY:-} if [[ -z "${github_repo}" ]]; then origin_url=$(git -C "${repo_root}" remote get-url origin) @@ -221,7 +226,7 @@ fi . "${repo_root}/tools/linuxfs/uruntime.env" uruntime_binary=$(cached "${URUNTIME_SHA256}" "${URUNTIME_ASSET}" \ - bash -c 'curl -fsSL --retry 3 -o "$out" "$0"' "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}") + bash -c 'curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "$out" "$0"' "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}") mkdir -p "${linuxfs_dir}/usr/local/lib/droiddeck" "${linuxfs_dir}/usr/local/share/licenses/uruntime" install -m644 "${uruntime_binary}" "${linuxfs_dir}/usr/local/lib/droiddeck/uruntime" install -m644 "${repo_root}/tools/linuxfs/licenses/uruntime-LICENSE" "${linuxfs_dir}/usr/local/share/licenses/uruntime/LICENSE" @@ -256,7 +261,7 @@ mkdir -p "${msi_pkgs}" "${msi_dir}" while read -r package_sha256 package_url; do [[ -n "${package_url}" ]] || continue package_archive=$(cached "${package_sha256}" "$(basename "${package_url}")" \ - bash -c 'curl -fsSL --retry 3 -o "$out" "$0"' "${package_url}") + bash -c 'curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "$out" "$0"' "${package_url}") tar -xJf "${package_archive}" -C "${msi_pkgs}" done < <(grep -v '^#' "${repo_root}/tools/msitools/packages.txt") for tool in msiinfo cabextract; do install -m644 "${msi_pkgs}/usr/bin/${tool}" "${msi_dir}/${tool}"; done @@ -276,14 +281,14 @@ mkdir -p "${mango_dir}" "${mango_pkgs}" while read -r package_sha256 package_url; do [[ -n "${package_url}" ]] || continue package_archive=$(cached "${package_sha256}" "$(basename "${package_url}")" \ - bash -c 'curl -fsSL --retry 3 -o "$out" "$0"' "${package_url}") + bash -c 'curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "$out" "$0"' "${package_url}") zstd -dc "${package_archive}" | tar -xf - -C "${mango_pkgs}" done < <(grep -v '^#' "${repo_root}/tools/mangoapp/packages.txt") install -m644 "${mango_pkgs}/usr/bin/mangoapp" "${mango_dir}/mangoapp" for library in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1; do cp -L "${mango_pkgs}/usr/lib/${library}" "${mango_dir}/${library}" done -docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" -v "${repo_root}:/src" -w /src "${image_name}" \ +docker run --rm --platform "${docker_platform}" --user "$(id -u):$(id -g)" -v "${repo_root}:/src" -w /src "${image_name}" \ aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wl,-soname,libtracefs.so.1 \ -o app/src/main/assets/linuxfs/usr/local/lib/mangoapp/libtracefs.so.1 tools/mangoapp/libtracefs-shim.c mkdir -p "${linuxfs_dir}/usr/local/bin" @@ -294,7 +299,7 @@ mkdir -p "${pw_pkgs}" while read -r package_sha256 package_url; do [[ -n "${package_url}" ]] || continue package_archive=$(cached "${package_sha256}" "$(basename "${package_url}")" \ - bash -c 'curl -fsSL --retry 3 -o "$out" "$0"' "${package_url}") + bash -c 'curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "$out" "$0"' "${package_url}") zstd -dc "${package_archive}" | tar -xf - -C "${pw_pkgs}" done < <(grep -v '^#' "${repo_root}/tools/pipewire/packages.txt") "${repo_root}/tools/pipewire/assemble.sh" "${pw_pkgs}" "${linuxfs_dir}/usr/local/lib/droiddeck-pipewire.tzst" @@ -303,7 +308,7 @@ pa_source=${DROIDDECK_PA13_SOURCE_DIR:-"${staging_dir}/pulseaudio-13.0"} if [[ -z "${DROIDDECK_PA13_SOURCE_DIR:-}" ]]; then pa_tarball="${cache_dir}/pulseaudio-13.0.tar.gz" if [[ ! -s "${pa_tarball}" ]] || ! tar -tzf "${pa_tarball}" >/dev/null 2>&1; then - curl -fsSL -o "${pa_tarball}.part" \ + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "${pa_tarball}.part" \ https://github.com/pulseaudio/pulseaudio/archive/refs/tags/v13.0.tar.gz mv "${pa_tarball}.part" "${pa_tarball}" fi @@ -336,6 +341,27 @@ else (cd "${proot_out}" && shasum -a 256 libproot.so libproot-loader.so > .proot-outputs) fi +syncthing_src="${repo_root}/tools/syncthing/syncthing-android/syncthing/src/github.com/syncthing/syncthing" +git -C "${repo_root}" submodule update --init --recursive tools/syncthing/syncthing-android +syncthing_inputs=$(printf '%s\n' "$(cd "${repo_root}" && shasum -a 256 tools/syncthing/build.sh \ + tools/syncthing/syncthing-android/gradle/libs.versions.toml)" \ + "$(git -C "${syncthing_src}" rev-parse HEAD)" \ + "$(git -C "${syncthing_src}" diff --binary HEAD | shasum -a 256)" \ + "$(cd "${syncthing_src}" && git ls-files -z --others --exclude-standard | xargs -0 shasum -a 256)" \ + "${ndk_version}" | shasum -a 256 | cut -d' ' -f1) +if [[ -f "${proot_out}/libsyncthingnative.so" \ + && "$(cat "${proot_out}/.syncthing-inputs" 2>/dev/null)" = "${syncthing_inputs}" ]]; then + echo "syncthing: sources unchanged, keeping ${proot_out}/libsyncthingnative.so" +else + syncthing_stage="${staging_dir}/syncthing" + if ! restore_step syncthing "${syncthing_inputs}" "${syncthing_stage}"; then + "${repo_root}/tools/syncthing/build.sh" "${syncthing_stage}" + save_step syncthing "${syncthing_inputs}" "${syncthing_stage}" + fi + install -m755 "${syncthing_stage}/libsyncthingnative.so" "${proot_out}/" + echo "${syncthing_inputs}" > "${proot_out}/.syncthing-inputs" +fi + bundle_dir="${staging_dir}/pulseaudio-bundle" mkdir -p "${bundle_dir}" zstd -dc "${bundle_asset}" | tar -xf - -C "${bundle_dir}" diff --git a/tools/cardboard/test_cardboard_params.c b/tools/cardboard/test_cardboard_params.c index 8b284cf6a..e1f761c1e 100644 --- a/tools/cardboard/test_cardboard_params.c +++ b/tools/cardboard/test_cardboard_params.c @@ -45,8 +45,6 @@ int main(void) { cardboard_push_constants(&q, pose, 0, 0, 0, 0, pc); CHECK(isfinite(pc[17]) && isfinite(pc[19])); - // Narrow optical profiles and the lower SteamVR slider values must reach - // the projection unchanged, rather than all becoming a 30-degree view. const float glasses_fovs[] = {22.0f, 23.3f, 24.0f, 25.8f, 29.0f}; for (unsigned i = 0; i < sizeof(glasses_fovs) / sizeof(glasses_fovs[0]); i++) { q.fov_deg = glasses_fovs[i]; diff --git a/tools/check_glasses_menu_shader.py b/tools/check_glasses_menu_shader.py index 1b775b3e3..45ed20677 100644 --- a/tools/check_glasses_menu_shader.py +++ b/tools/check_glasses_menu_shader.py @@ -156,7 +156,6 @@ def main(): read(0,0,width,height,0x1908,0x1401,actual) samples = [] for x, y in coords: - # Readback is GL bottom-up; coordinates below are image top-left. offset = ((height-1-y)*width+x)*4 rgb = list(actual[offset:offset+3]) eye = 0 if mono or x < width/2 else 1 diff --git a/tools/ci/install-ubuntu-packages.sh b/tools/ci/install-ubuntu-packages.sh new file mode 100644 index 000000000..1597613aa --- /dev/null +++ b/tools/ci/install-ubuntu-packages.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +set -euo pipefail +missing=() +for package in "$@"; do + if [ "$(dpkg-query -W -f='${Status}' "$package" 2>/dev/null || true)" != 'install ok installed' ]; then + missing+=("$package") + fi +done +if [ "${#missing[@]}" = 0 ]; then + echo "Ubuntu build dependencies are already installed." + exit 0 +fi +options=( + -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources + -o Dir::Etc::sourceparts=- + -o Acquire::Retries=1 + -o Acquire::http::Timeout=15 + -o Acquire::https::Timeout=15 + -o DPkg::Lock::Timeout=30 +) +install_packages() { + echo "Updating Ubuntu package indexes." + sudo timeout --kill-after=10s 60s apt-get "${options[@]}" -o APT::Update::Error-Mode=any update -q || return $? + echo "Installing: ${missing[*]}" + sudo timeout --kill-after=10s 120s env DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get "${options[@]}" install -y -q --no-install-recommends "${missing[@]}" +} +if install_packages; then + exit 0 +fi +echo "::warning::Runner mirror failed or timed out; retrying with the official Ubuntu mirror." +sources=$(mktemp --suffix=.sources) +trap 'rm -f "$sources"' EXIT +mirror=https://archive.ubuntu.com/ubuntu +case "$(dpkg --print-architecture)" in + arm64) mirror=https://ports.ubuntu.com/ubuntu-ports ;; +esac +sed -E "s@^URIs:.*@URIs: $mirror@" /etc/apt/sources.list.d/ubuntu.sources > "$sources" +chmod 644 "$sources" +options[1]="Dir::Etc::sourcelist=$sources" +install_packages diff --git a/tools/ci/resolve-ndk.sh b/tools/ci/resolve-ndk.sh new file mode 100644 index 000000000..61df33c50 --- /dev/null +++ b/tools/ci/resolve-ndk.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -euo pipefail +repo=$(cd "$(dirname "$0")/../.." && pwd) +source "$repo/tools/ci/toolchains.env" +ndk="$ANDROID_HOME/ndk/$CI_ANDROID_NDK_VERSION" +if [ ! -f "$ndk/source.properties" ]; then + sdkmanager --sdk_root="$ANDROID_HOME" --install "ndk;$CI_ANDROID_NDK_VERSION" +fi +actual=$(sed -n 's/^Pkg.Revision *= *//p' "$ndk/source.properties" | tr -d '\r') +test "$actual" = "$CI_ANDROID_NDK_VERSION" +{ + echo "NDK_VERSION=$actual" + echo "ANDROID_NDK_HOME=$ndk" + echo "ANDROID_NDK_ROOT=$ndk" + echo "ANDROID_NDK_LATEST_HOME=$ndk" +} >> "$GITHUB_ENV" diff --git a/tools/ci/run-python-tests.sh b/tools/ci/run-python-tests.sh new file mode 100755 index 000000000..c2f5a4169 --- /dev/null +++ b/tools/ci/run-python-tests.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -uo pipefail +cd "$(dirname "$0")/../.." +groups=${PYTHON_TEST_GROUPS:-3} +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT +index=0 +while read -r file; do + module=$(basename "$file" .py) + echo "$module" >> "$work/group-$((index % groups)).list" + index=$((index + 1)) +done < <(ls -S tools/tests/test_*.py) +pids=() +for list in "$work"/group-*.list; do + ( + PYTHONPATH=tools/tests python3 -m unittest $(cat "$list") > "${list%.list}.log" 2>&1 + echo $? > "${list%.list}.status" + ) & + pids+=($!) +done +wait "${pids[@]}" +failed=0 +for list in "$work"/group-*.list; do + echo "::group::$(basename "$list"): $(tr '\n' ' ' < "$list" | cut -c1-120)" + cat "${list%.list}.log" + echo "::endgroup::" + if [ "$(cat "${list%.list}.status")" != 0 ]; then + failed=1 + echo "::error::$(basename "$list") failed" + fi +done +exit "$failed" diff --git a/tools/ci/toolchains.env b/tools/ci/toolchains.env new file mode 100644 index 000000000..ac365f2bb --- /dev/null +++ b/tools/ci/toolchains.env @@ -0,0 +1 @@ +CI_ANDROID_NDK_VERSION=30.0.16248370 diff --git a/tools/comet/build-local.sh b/tools/comet/build-local.sh index d809cae50..9adc9549d 100644 --- a/tools/comet/build-local.sh +++ b/tools/comet/build-local.sh @@ -1,14 +1,19 @@ #!/usr/bin/env bash set -euo pipefail repo=$(cd "$(dirname "$0")/../.." && pwd) -image=${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3} -docker run --rm --platform linux/amd64 -v "$repo:/src" \ - -v "${HOME}/.cache/droiddeck-comet-rust:/rust" -w /src \ +. "$repo/tools/docker_platform.sh" +image=${DROIDDECK_BUILD_IMAGE} +platform=${DROIDDECK_DOCKER_PLATFORM} +rust_cache="${HOME}/.cache/droiddeck-comet-rust${platform#linux/amd64}" +rust_cache=${rust_cache/\/arm64/-arm64} +docker run --rm --platform "$platform" -v "$repo:/src" \ + -v "${rust_cache}:/rust" -w /src \ -e CARGO_HOME=/rust/cargo -e RUSTUP_HOME=/rust/rustup "$image" bash -lc ' set -euo pipefail trap "chown -R '"$(id -u):$(id -g)"' app/build/comet app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet /rust 2>/dev/null || true" EXIT apt-get update -qq apt-get install -y -qq curl git unzip ca-certificates pkg-config >/dev/null + git config --global --add safe.directory "*" export PATH=/rust/cargo/bin:$PATH if ! command -v cargo >/dev/null; then curl -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.90.0 diff --git a/tools/comet/build.sh b/tools/comet/build.sh index b32fc7586..044aae258 100644 --- a/tools/comet/build.sh +++ b/tools/comet/build.sh @@ -16,7 +16,7 @@ cargo build --locked --release --target aarch64-unknown-linux-gnu install -m644 target/aarch64-unknown-linux-gnu/release/comet "$out/comet" zip="$cache/dummy-service.zip" if ! echo "7fc5facd1fce4d516cd3ce527e7e4dbe0bfd17649cea805e8ea7c37d4ba58d9a $zip" | sha256sum -c - >/dev/null 2>&1; then - curl -fsSL --retry 3 -o "$zip" https://github.com/imLinguin/comet/releases/download/v0.3.2/dummy-service.zip + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "$zip" https://github.com/imLinguin/comet/releases/download/v0.3.2/dummy-service.zip fi echo "7fc5facd1fce4d516cd3ce527e7e4dbe0bfd17649cea805e8ea7c37d4ba58d9a $zip" | sha256sum -c - unzip -o "$zip" GalaxyCommunication.exe update-permissions.exe -d "$out" diff --git a/tools/components/README.md b/tools/components/README.md new file mode 100644 index 000000000..782d8b9f1 --- /dev/null +++ b/tools/components/README.md @@ -0,0 +1,65 @@ +# Runtime component preparation + +`recipes.json` owns component source inputs, builders, outputs, package requirements +and pinned downloads. `prepare.py` runs those recipes, calculates cache identities, +installs the union of missing tools and verifies the prepared artifact handoff. +Builders live in `recipes/`; the workflow describes scheduling and gates. + +```mermaid +flowchart LR + Source[Pin source tree] --> Components[Prepare verified components] + Source --> Xbox[Xbox ARM64 backend] + Source --> Tests[Python and native tests] + Components --> APK[Compile APK and Android tests] + Xbox --> APK + APK --> Gate[Compile and test APK gate] + Tests --> Gate + Gate --> Publish[Main only: signing and publishing] +``` + +All workers verify the same source tree. The component artifact records that tree, +recipe identities and every output hash; the APK worker verifies the inventory +before building. This handoff verifies consistency within the same CI run. It is +not independent provenance for arbitrary artifacts. Source policy checks, tests, +APK content/ABI checks and signing/publication gates remain in place. + +`tools/ci/toolchains.env` pins the Android NDK shared by component, APK and native +test workers. Linux builds use Ubuntu 24.04. Recipe and input changes invalidate +the relevant component cache; ordinary caches remain performance aids. + +## Verified preload snapshots + +`preloads.lock.json` pins a small immutable preload archive. It records each +binary's hash, its producing main CI run, the original APK artifact identity and +digest, source/header hashes, the ARM64 build recipe and x86 compiler-image inputs. +It covers core ARM64 preloads and the x86 preload libraries. VR, Android native +libraries, Comet and Xbox use their registered recipes and existing release pins +or component caches. + +Every build compares current source inputs, including transitive quoted headers, +and build recipes with this manifest. Changed groups rebuild from source. A +missing release also selects a rebuild. Corrupt archives, unexpected files and +binary hash mismatches fail the build. Existing preload checks, runtime packaging +checks and all test jobs still run. + +The trust anchor is the manifest in the pinned main base. A new or changed PR +manifest is independently checked against a successful `push` build of main: +GitHub must confirm the run/source/workflow and original APK artifact digest, and +every claimed binary must match that APK. The claimed source inputs and recipe +must match that run's Git source. A PR cannot establish trust by changing both a +binary and its claimed checksum. This is approved-build reuse, not a claim of +bit-for-bit reproducible compilation or a signed SLSA attestation. + +To refresh after source or compiler changes: + +1. Let a main build compile and test the new inputs. +2. Run `python tools/components/preloads.py snapshot --run RUN_ID`. +3. Publish `app/build/component-snapshot/preloads.tar.gz` to + DroidDeck-Components as `preloads-<full archive SHA-256>`, without replacing an + existing release. Include the manifest and producing run in the release notes. +4. Review and commit the updated manifest. CI independently checks its origin. + +The workflow dispatch `rebuild_preloads` option forces source compilation even +when an approved snapshot matches. Use it when refreshing a compiler or system +header revision. Runner image updates do not silently replace an approved binary; +the producing run remains the record of its compiler environment. diff --git a/tools/components/build-arm64-preloads.sh b/tools/components/build-arm64-preloads.sh new file mode 100644 index 000000000..a38a1edaa --- /dev/null +++ b/tools/components/build-arm64-preloads.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -euo pipefail +D=${1:?output directory} +mkdir -p "$D" +aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ + -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ + -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libfakeinput.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ + -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c +aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/libssbs.so" +mkdir -p "$D/usr/local/bin" +aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$D/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl +aarch64-linux-gnu-strip --strip-unneeded "$D/usr/local/bin/droiddeck-clipboard" diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json new file mode 100644 index 000000000..45beb4152 --- /dev/null +++ b/tools/components/preloads.lock.json @@ -0,0 +1,126 @@ +{ + "archive_sha256": "cb6487a94f25a3068fd07958174eb5b5e14f709655ff4ef0a8cdbd99138513b2", + "arm64_recipe": "1c92a1b0669277de3e78e9f292634affb5b5a19d5ea49d3ad8610c1dc638c2fb", + "groups": { + "arm64": { + "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h": "396c56761034a4ed783543ee3312c6ec64d63b2a1cf7eecf1939c23251f25adf", + "app/src/main/cpp/fakeinput_steam.cpp": "3d11e859ca58a42a9da92a3fc589d404df790e151f7e18ea6114645750e70ef5", + "app/src/main/cpp/venc/venc_proto.h": "2242ddbc8981d14a33bac70264bb3e7f701fd1c3ebb988e17bbb2b19b6b808f7", + "tools/linuxfs/clipboard/clipboard.c": "96291c2bbc040c83caabf059ab3e95a9ed90d6a768c759d7cb4c0b64706bddfa", + "tools/linuxfs/preload/binfmt.c": "0933cc49cb53f0aa1206e2eae516d38dc3337e74174be07e10619c42aa56792b", + "tools/linuxfs/preload/dircache.c": "8e7f19ea4a1198783d53a3f357326c6177da157b0cc7e0d22e1670963e1c26e7", + "tools/linuxfs/preload/drm.c": "e0eabab0d8ed9e841918e827bf87168efa7f2dfb8404169e9bed3ab5eda2836c", + "tools/linuxfs/preload/fsync.c": "795c114c2a05d3f250d07145d04c5658091699da3b96290da36348ccadfb0c09", + "tools/linuxfs/preload/inputudev.c": "2648248d3d235a582eb8459709e0a85de537c03ac10c5040fbfb50d9846c68eb", + "tools/linuxfs/preload/kgslid.c": "88a7875fd5289930204d155d92ac9d15492cd06db16ed87aa9c95af37f3e7089", + "tools/linuxfs/preload/kgslpoll.c": "f0d853d919a52487c04cbda5fb3fa22269da54b7f4ee2f7dd3b5bd9909418670", + "tools/linuxfs/preload/links.c": "b7bbcf9112393b152f358fe6f8dc9a1955f0c8532e1eddf016a971415cd13c64", + "tools/linuxfs/preload/lock.c": "f71b3fd40e6a2b74908d3cdc601e8748699ae9c7a89b542d2445b999015ffd66", + "tools/linuxfs/preload/net.c": "335853c8ea0e9a8ebbc5a5500dc4bded9c34c4310a6ab8aa46b07d5ce1c2b55e", + "tools/linuxfs/preload/netif.c": "cc26d50b8d4639d8dd4697811bbf85c9d9f31761f9504a4af42473de3cb22b3c", + "tools/linuxfs/preload/noexec.c": "1855aeaeda3d506329bd9af1107580c74d1f56787c411b2e01c0a8a9d4059c7b", + "tools/linuxfs/preload/ntsync.c": "0614c48af0c062bfcb4c30141efe1b792b340767a67d2fe92ee9877d2ba16e0d", + "tools/linuxfs/preload/opens.c": "92ae4aea16aa457a898dedf4a70eb332d80d3b1e77f3a60bace7715a4317399e", + "tools/linuxfs/preload/pathcache.c": "eb0d4b5238fe6c8891e805d90bd837e466754100c978fad2d0ff717116b9b8a3", + "tools/linuxfs/preload/perms.c": "f600619c4ca130f69001ed7ad7bd74a3dc215b14c61479c45bb770f916d244b9", + "tools/linuxfs/preload/pulseguard.c": "57674ea40283e53a27bc78362de1ba41ee972d172ea38b1f818b1d6eed0abe65", + "tools/linuxfs/preload/quest_kgsl.c": "59d9b8416be6a1c680f1d1e4c2427d2cbb7b415344261adb357d9d211ec95cfe", + "tools/linuxfs/preload/robust.c": "9eb6c0ed50e0f48a8cfb86bd92587f471354bdf2531b9177f4b3ab83bdfed39a", + "tools/linuxfs/preload/rptouch.c": "0e3f8bf2f9a41324361f38fa4da8d2d47593c9555f0cabf8228767397846c7c3", + "tools/linuxfs/preload/space.c": "118389bcc89dfa2b4230b80915e21d2d4331c4cff1f5a58265f85e6ecb5c29d2", + "tools/linuxfs/preload/storage.c": "08a8b46c3588f3160bb8608489768010ec36d5ccdb2b25a431ec9d6fcd413a6e", + "tools/linuxfs/preload/sysv.c": "49774ee5e2e39b84dcfadf63abdc741b3df236cb11783744a1280adee36965e8", + "tools/linuxfs/preload/tracefs.c": "be3f8a2f032b56e6e08a931e77a9386aea4bb93421a482271e06386ec0c469b6", + "tools/linuxfs/preload/tracer.c": "f34e5377c891b0a8d00489245d66f96bc352df4cd90f47a951dcadae980af4c1", + "tools/linuxfs/preload/udevmon.c": "2045dfb883cfb6e2016c359a3dc3af17f3b8f383f6dd0d5dfee407ef0d344852", + "tools/linuxfs/preload/usr2.c": "6ae704380b45a9b3a74c4fe2b3ce4482470dae59ced26cf0aee64f4b4dcc11f9", + "tools/linuxfs/preload/venc.c": "24c3c46fe49d28adfc8c977e52c9cc407f534b26f56d94b3425b8bb01803dba8", + "tools/linuxfs/preload/vmwrite.c": "1a3ea2ec4354e0716c17f7db537b19ab82bcd524f2aece2fa5dec89b076a2188", + "tools/linuxfs/preload/webhelper.c": "a8213a7a96b407459c83fb93365cfe58fd05964e7bb262b8061c1c0792a6aac8", + "tools/linuxfs/preload/writewatch.c": "61e395d1caa184d329dead0e36c4e92cb1069b1154ac36581f37406c1c242240", + "tools/linuxfs/preload/xmode.c": "9a09995bf52d40b07f16828bcc545b59b8fb1ba60d9cb09f14f7f31dba1e65a6", + "tools/linuxfs/preload/zram.c": "12bcf07459728d4a7ede6fa0fea8deb330f7c5d0f0dd61e610e81b9efecd4262", + "tools/linuxfs/ssbs/ssbs_adapter.c": "9e4e0fe637f7b8f91f12d8151f02e8d31bcb4294be2b2c62d3cd3ce76f200306", + "tools/proot/fastpath/audit.c": "bfe347a2ddaceef40a78d7d590e4e679724ee4c82f3f1f1e3c7017a18ad536d4", + "tools/proot/fastpath/fastpath.c": "4cd07b25ba14f6faa6bac5091ae323ded6b646dbb34b9e5a92ea6385e4d37cb5", + "tools/quest/kgsl_compat.c": "111afffda7a6df2469610f6c342ae086b1a97a559c586efc4a28015b86efd6bd", + "tools/quest/kgsl_compat.h": "2e9e0eb647530a35277954b7e61a22ee958067fe46056a608fb32f40f273f1bf" + }, + "x86": { + "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h": "396c56761034a4ed783543ee3312c6ec64d63b2a1cf7eecf1939c23251f25adf", + "app/src/main/cpp/fakeinput_steam.cpp": "3d11e859ca58a42a9da92a3fc589d404df790e151f7e18ea6114645750e70ef5", + "app/src/main/cpp/venc/venc_proto.h": "2242ddbc8981d14a33bac70264bb3e7f701fd1c3ebb988e17bbb2b19b6b808f7", + "tools/linuxfs/build-x86-preloads.sh": "d0820252809881db89db5a17427e74b9aa4964aae70623cb7f4b474e90c7a23b", + "tools/linuxfs/debian-image.env": "1c79dea4314c784042a5c59208765c8401771098f293185d61a157d89edf6e52", + "tools/linuxfs/fex/faultreport.c": "573bf780f32f7256dc2fbf40fe850d67e67c354509fdedcac3ff7f1a261daac3", + "tools/linuxfs/fex/vulkanpin.c": "f2693ac2be8d15f7881115e61b1c6b3fe4aeec8f603584c6fce5b0f046563d51", + "tools/linuxfs/fex/webkitinput.c": "693ffd6c8c8c97e87156444ad2255c84dbf22cd0053d135fb8d9be094b5534d1", + "tools/linuxfs/preload/binfmt.c": "0933cc49cb53f0aa1206e2eae516d38dc3337e74174be07e10619c42aa56792b", + "tools/linuxfs/preload/dircache.c": "8e7f19ea4a1198783d53a3f357326c6177da157b0cc7e0d22e1670963e1c26e7", + "tools/linuxfs/preload/drm.c": "e0eabab0d8ed9e841918e827bf87168efa7f2dfb8404169e9bed3ab5eda2836c", + "tools/linuxfs/preload/fsync.c": "795c114c2a05d3f250d07145d04c5658091699da3b96290da36348ccadfb0c09", + "tools/linuxfs/preload/inputudev.c": "2648248d3d235a582eb8459709e0a85de537c03ac10c5040fbfb50d9846c68eb", + "tools/linuxfs/preload/kgslid.c": "88a7875fd5289930204d155d92ac9d15492cd06db16ed87aa9c95af37f3e7089", + "tools/linuxfs/preload/kgslpoll.c": "f0d853d919a52487c04cbda5fb3fa22269da54b7f4ee2f7dd3b5bd9909418670", + "tools/linuxfs/preload/links.c": "b7bbcf9112393b152f358fe6f8dc9a1955f0c8532e1eddf016a971415cd13c64", + "tools/linuxfs/preload/lock.c": "f71b3fd40e6a2b74908d3cdc601e8748699ae9c7a89b542d2445b999015ffd66", + "tools/linuxfs/preload/net.c": "335853c8ea0e9a8ebbc5a5500dc4bded9c34c4310a6ab8aa46b07d5ce1c2b55e", + "tools/linuxfs/preload/netif.c": "cc26d50b8d4639d8dd4697811bbf85c9d9f31761f9504a4af42473de3cb22b3c", + "tools/linuxfs/preload/noexec.c": "1855aeaeda3d506329bd9af1107580c74d1f56787c411b2e01c0a8a9d4059c7b", + "tools/linuxfs/preload/ntsync.c": "0614c48af0c062bfcb4c30141efe1b792b340767a67d2fe92ee9877d2ba16e0d", + "tools/linuxfs/preload/opens.c": "92ae4aea16aa457a898dedf4a70eb332d80d3b1e77f3a60bace7715a4317399e", + "tools/linuxfs/preload/pathcache.c": "eb0d4b5238fe6c8891e805d90bd837e466754100c978fad2d0ff717116b9b8a3", + "tools/linuxfs/preload/perms.c": "f600619c4ca130f69001ed7ad7bd74a3dc215b14c61479c45bb770f916d244b9", + "tools/linuxfs/preload/pulseguard.c": "57674ea40283e53a27bc78362de1ba41ee972d172ea38b1f818b1d6eed0abe65", + "tools/linuxfs/preload/quest_kgsl.c": "59d9b8416be6a1c680f1d1e4c2427d2cbb7b415344261adb357d9d211ec95cfe", + "tools/linuxfs/preload/robust.c": "9eb6c0ed50e0f48a8cfb86bd92587f471354bdf2531b9177f4b3ab83bdfed39a", + "tools/linuxfs/preload/rptouch.c": "0e3f8bf2f9a41324361f38fa4da8d2d47593c9555f0cabf8228767397846c7c3", + "tools/linuxfs/preload/space.c": "118389bcc89dfa2b4230b80915e21d2d4331c4cff1f5a58265f85e6ecb5c29d2", + "tools/linuxfs/preload/storage.c": "08a8b46c3588f3160bb8608489768010ec36d5ccdb2b25a431ec9d6fcd413a6e", + "tools/linuxfs/preload/sysv.c": "49774ee5e2e39b84dcfadf63abdc741b3df236cb11783744a1280adee36965e8", + "tools/linuxfs/preload/tracefs.c": "be3f8a2f032b56e6e08a931e77a9386aea4bb93421a482271e06386ec0c469b6", + "tools/linuxfs/preload/tracer.c": "f34e5377c891b0a8d00489245d66f96bc352df4cd90f47a951dcadae980af4c1", + "tools/linuxfs/preload/udevmon.c": "2045dfb883cfb6e2016c359a3dc3af17f3b8f383f6dd0d5dfee407ef0d344852", + "tools/linuxfs/preload/usr2.c": "6ae704380b45a9b3a74c4fe2b3ce4482470dae59ced26cf0aee64f4b4dcc11f9", + "tools/linuxfs/preload/venc.c": "24c3c46fe49d28adfc8c977e52c9cc407f534b26f56d94b3425b8bb01803dba8", + "tools/linuxfs/preload/vmwrite.c": "1a3ea2ec4354e0716c17f7db537b19ab82bcd524f2aece2fa5dec89b076a2188", + "tools/linuxfs/preload/webhelper.c": "a8213a7a96b407459c83fb93365cfe58fd05964e7bb262b8061c1c0792a6aac8", + "tools/linuxfs/preload/writewatch.c": "61e395d1caa184d329dead0e36c4e92cb1069b1154ac36581f37406c1c242240", + "tools/linuxfs/preload/xmode.c": "9a09995bf52d40b07f16828bcc545b59b8fb1ba60d9cb09f14f7f31dba1e65a6", + "tools/linuxfs/preload/zram.c": "12bcf07459728d4a7ede6fa0fea8deb330f7c5d0f0dd61e610e81b9efecd4262", + "tools/quest/kgsl_compat.c": "111afffda7a6df2469610f6c342ae086b1a97a559c586efc4a28015b86efd6bd", + "tools/quest/kgsl_compat.h": "2e9e0eb647530a35277954b7e61a22ee958067fe46056a608fb32f40f273f1bf" + } + }, + "origin": { + "artifact": 12520502054, + "artifact_sha256": "b7e800a1884a516ec52b050b7f904f9881427bca4579f660b909fd18f15e49ff", + "commit": "b76f13f7acc0af0cc00369dde61fb88e40529e6d", + "run": 39992155294, + "url": "https://github.com/Droid-Deck/DroidDeck/actions/runs/39992155294" + }, + "outputs": { + "i386/libblsession.so": "5343cdb704217ddc81ee593e67d5987363dc7b5ac78bd4bd36000219e5063268", + "i386/libfakeinput.so": "188d88dfb13b6e2f2df948e7b8b4d9ec604770f55d1ea5b6b9e21ad56a74ce5e", + "i386/libfaultreport.so": "95f9ef60f04a13ee60cfbd4d2d2efb60a7063b722e646c78c9dc27162292877b", + "libblaudit.so": "6c6abe89baf5d7309babee0c3372a4b00c2b689e2a63de38c5e9a660626509b5", + "libblfastpath.so": "0e1f151b5c1c5ea9dd380ad58d09f8fe7ba3ae037d0991cb3eef6899e9d5ec83", + "libblsession.so": "29d4b5ea46dba941107e02c0ee544244b137a339cada43bff65c350f2ef2755a", + "libfakeinput.so": "5f6dc3aea05de2dc1fbe0bbfac2ce4d11e3d47f761c6b06c8badb15fe1904392", + "libssbs.so": "c288ed0da26c2481aff270d1cdafe1205061c4a300c2c46ae1b53c6e0c94f44b", + "usr/local/bin/droiddeck-clipboard": "ec50e8f67fdf76372927189b0fdb670f9b70fd3484f2fe3e833bc8f9fdc44205", + "x86_64/libblsession.so": "61d19f06aebab6a789f8c99f687af9903376bfc853e46b70c48a2ce5e497accc", + "x86_64/libfakeinput.so": "8663dd2086bf8ae53069a480dd9ae4619109d32f0947a29e2ce38f07a21ae2e6", + "x86_64/libfaultreport.so": "bb0dc9165d0d764473e552508650edd586df16d620fc5b16b8b1c5740a28ce22", + "x86_64/libvulkan-thunk.so": "74f01b652d7e8179561a096a552328b68da640cc4bad3981edd38e6afbf90243", + "x86_64/libwebkitinput.so": "9b07380a7b017397b9c56bb7bb1161e046b0c6a647fc413888904606b0def6d0" + }, + "toolchain": { + "arm64": "Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe", + "x86": "Debian bullseye compiler image and recipe pinned by source inputs" + }, + "version": 1, + "x86_recipe": "36d06d49f7a4bff5ef675c1e03ce5a5b61498df4c36b9d15a938b41564f755cc" +} diff --git a/tools/components/preloads.py b/tools/components/preloads.py new file mode 100644 index 000000000..808d51046 --- /dev/null +++ b/tools/components/preloads.py @@ -0,0 +1,288 @@ +import argparse +import gzip +import http.client +import hashlib +import io +import json +import os +import posixpath +import re +from pathlib import Path +import subprocess +import tarfile +import textwrap +import urllib.error +import urllib.request +from zipfile import ZipFile + +ROOT = Path(__file__).resolve().parents[2] +REPO = 'Droid-Deck/DroidDeck' +LOCK = 'tools/components/preloads.lock.json' +DEFINITIONS = json.loads((ROOT / 'tools/components/recipes.json').read_text()) +INPUTS = {group: DEFINITIONS[name]['source_inputs'] for group, name in + [('arm64', 'arm64-preloads'), ('x86', 'x86-preloads')]} +OUTPUTS = {group: DEFINITIONS[name]['snapshot_outputs'] for group, name in + [('arm64', 'arm64-preloads'), ('x86', 'x86-preloads')]} +COMMON = [name for name in INPUTS['arm64'] if name in INPUTS['x86']] +FILES = set(sum(OUTPUTS.values(), [])) + + +def sha(data): + return hashlib.sha256(data).hexdigest() + + +def run(*args, root=ROOT): + return subprocess.check_output(args, cwd=root) + + +def api(path): + return json.loads(run('gh', 'api', 'repos/' + REPO + '/' + path)) + + +def source_files(group, root=ROOT, commit=None, patterns=None): + patterns = patterns if patterns is not None else INPUTS[group] + if commit: + paths = run('git', 'ls-tree', '-r', '--name-only', commit, '--', *patterns, root=root).decode().splitlines() + read = lambda path: run('git', 'show', f'{commit}:{path}', root=root) + else: + paths = run('git', 'ls-files', '--cached', '--others', '--exclude-standard', '--', *patterns, root=root).decode().splitlines() + read = lambda path: (root / path).read_bytes() + paths = [p for p in paths if not p.endswith('.md') and '__pycache__' not in p and not p.endswith('.pyc')] + if not paths: + raise ValueError('No preload inputs found') + result = {} + pending = list(paths) + while pending: + path = pending.pop() + if path in result: + continue + if path.startswith('../') or path.startswith('/'): + raise ValueError('Preload include escapes repository') + content = read(path).replace(b'\r\n', b'\n') + result[path] = sha(content) + for include in re.findall(rb'^\s*#\s*include\s*"([^"\n]+)"', content, re.M): + pending.append(posixpath.normpath(posixpath.join(posixpath.dirname(path), include.decode()))) + workflow = (run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() if commit + else (root / '.github/workflows/build.yml').read_text()) + job = 'components' if re.search(r'(?m)^ components:', workflow) else 'build' + runner = re.search(r'(?ms)^ ' + job + r':\n.*?^ runs-on: ([^\n]+)', workflow) + if runner is None: + raise ValueError('APK build runner policy is missing') + result['@runner'] = sha(runner[1].strip().encode()) + return dict(sorted(result.items())) + + +def recipe(root=ROOT, commit=None): + def read(path): + return (run('git', 'show', f'{commit}:{path}', root=root).decode() if commit + else (root / path).read_text()) + script = 'tools/components/build-arm64-preloads.sh' + if commit and run('git', 'ls-tree', commit, script, root=root) == b'': + workflow = read('.github/workflows/build.yml') + text = workflow[workflow.index(' aarch64-linux-gnu-g++ -shared'):] + text = textwrap.dedent(text[:text.index(' VK_INCLUDE=')]) + else: + text = read(script) + preamble = '#!/usr/bin/env bash\nset -euo pipefail\nD=${1:?output directory}\nmkdir -p "$D"\n' + if not text.startswith(preamble): + return sha(text.encode()) + text = text[len(preamble):] + return sha(text.replace('\r\n', '\n').encode()) + + +def x86_recipe(root=ROOT, commit=None): + path = 'tools/components/recipes/x86-preloads.sh' + if commit and not run('git', 'ls-tree', commit, path, root=root): + workflow = run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() + section = workflow[workflow.index(' - name: Build the x86 preloads'):] + text = section.split(' run: |\n', 1)[1].split('\n - name:', 1)[0] + text = textwrap.dedent(text).rstrip() + '\n' + else: + text = (run('git', 'show', f'{commit}:{path}', root=root).decode() if commit + else (root / path).read_text()) + text = text.removeprefix('#!/usr/bin/env bash\n') + return sha(text.replace('\r\n', '\n').encode()) + + +def artifact_bytes(origin, cache): + build = api(f"actions/runs/{origin['run']}") + if (build['event'] != 'push' or build['head_branch'] != 'main' or build['conclusion'] != 'success' + or build['head_sha'] != origin['commit'] or build['path'] != '.github/workflows/build.yml' + or build['repository']['full_name'] != REPO): + raise ValueError('Snapshot is not from a successful main APK build') + artifact = api(f"actions/artifacts/{origin['artifact']}") + if (artifact['name'] != 'droiddeck-apk' or artifact['workflow_run']['id'] != origin['run'] + or artifact['digest'] != 'sha256:' + origin['artifact_sha256']): + raise ValueError('Original APK artifact identity or digest mismatch') + cache.mkdir(parents=True, exist_ok=True) + path = cache / (origin['artifact_sha256'] + '.zip') + if not path.exists(): + path.write_bytes(run('gh', 'api', f"repos/{REPO}/actions/artifacts/{origin['artifact']}/zip")) + content = path.read_bytes() + if sha(content) != origin['artifact_sha256']: + raise ValueError('Original APK archive checksum mismatch') + with ZipFile(io.BytesIO(content)) as archive: + names = [name for name in archive.namelist() if name.endswith('.apk')] + if len(names) != 1: + raise ValueError('Expected one original APK') + with ZipFile(io.BytesIO(archive.read(names[0]))) as apk: + return {name: apk.read('assets/linuxfs/' + name) for name in FILES} + + +def validate_lock(data): + if data.get('version') != 1 or set(data['groups']) != set(INPUTS): + raise ValueError('Unsupported preload snapshot') + if set(data['outputs']) != FILES: + raise ValueError('Unexpected preload output set') + for digest in [data['archive_sha256'], *data['outputs'].values()]: + if len(digest) != 64 or any(c not in '0123456789abcdef' for c in digest): + raise ValueError('Invalid preload checksum') + + +def producer_sources(group, commit, root=ROOT): + config = 'tools/components/recipes.json' + if run('git', 'ls-tree', commit, config, root=root): + definitions = json.loads(run('git', 'show', f'{commit}:{config}', root=root)) + name = 'arm64-preloads' if group == 'arm64' else 'x86-preloads' + patterns = definitions[name]['source_inputs'] + else: + if group == 'arm64': + text = run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() + text = text[text.index(' aarch64-linux-gnu-g++ -shared'):] + text = text[:text.index(' VK_INCLUDE=')] + else: + text = run('git', 'show', f'{commit}:tools/linuxfs/build-x86-preloads.sh', root=root).decode() + patterns = re.findall(r'\b((?:tools|app)/[\w./*+-]+\.(?:cpp|c|h))(?=\s|$)', text) + if group == 'x86': + patterns += ['tools/linuxfs/fex', 'tools/linuxfs/build-x86-preloads.sh', 'tools/linuxfs/debian-image.env'] + return source_files(group, root, commit, patterns) + + +def prove_origin(data, cache, root=ROOT): + content = artifact_bytes(data['origin'], cache) + if {name: sha(value) for name, value in content.items()} != data['outputs']: + raise ValueError('Snapshot binaries differ from the original main APK') + commit = data['origin']['commit'] + run('git', 'fetch', '--no-tags', 'origin', commit, root=root) + for group in INPUTS: + if source_files(group, root, commit) != data['groups'][group]: + raise ValueError('Snapshot inputs differ from the producing source') + for name, checksum in producer_sources(group, commit, root).items(): + if data['groups'][group].get(name) != checksum: + raise ValueError('Snapshot omits or changes a producing build dependency') + if recipe(root, commit) != data['arm64_recipe']: + raise ValueError('Snapshot recipe differs from the producing source') + if x86_recipe(root, commit) != data['x86_recipe']: + raise ValueError('Snapshot x86 recipe differs from the producing source') + + +def unpack(content, data): + if sha(content) != data['archive_sha256']: + raise ValueError('Preload archive checksum mismatch') + result = {} + total = 0 + with tarfile.open(fileobj=io.BytesIO(content), mode='r:gz') as archive: + for entry in archive: + if entry.name not in FILES or entry.name in result or not entry.isfile() or entry.size > 32 * 1024 * 1024: + raise ValueError('Unsafe or unexpected preload archive entry') + total += entry.size + if total > 64 * 1024 * 1024: + raise ValueError('Preload archive exceeds expanded size limit') + value = archive.extractfile(entry).read() + if sha(value) != data['outputs'][entry.name]: + raise ValueError('Preload binary checksum mismatch') + result[entry.name] = value + if set(result) != FILES: + raise ValueError('Incomplete preload archive') + return result + + +def restore(root=ROOT): + data = json.loads((root / LOCK).read_text()) + validate_lock(data) + matching = {group: source_files(group, root) == data['groups'][group] for group in INPUTS} + matching['arm64'] &= recipe(root) == data['arm64_recipe'] + matching['x86'] &= x86_recipe(root) == data.get('x86_recipe') + if os.environ.get('FORCE_PRELOAD_REBUILD') == 'true': + matching = dict.fromkeys(INPUTS, False) + if any(matching.values()): + base = os.environ.get('COMPONENT_TRUSTED_BASE') + approved = None + if base: + result = subprocess.run(['git', 'show', f'{base}:{LOCK}'], cwd=root, capture_output=True) + if result.returncode == 0: + approved = json.loads(result.stdout) + if approved != data: + try: + prove_origin(data, root / 'app/build/component-downloads', root) + except (subprocess.CalledProcessError, OSError, http.client.HTTPException): + print('Snapshot origin is unavailable; rebuilding without trusting the snapshot.') + matching = dict.fromkeys(INPUTS, False) + if any(matching.values()): + url = (f"https://github.com/Droid-Deck/DroidDeck-Components/releases/download/" + f"preloads-{data['archive_sha256']}/preloads.tar.gz") + try: + with urllib.request.urlopen(url, timeout=60) as response: + content = response.read(64 * 1024 * 1024) + except (OSError, http.client.HTTPException) as error: + if isinstance(error, urllib.error.HTTPError) and error.code not in (404, 429) and error.code < 500: + raise + print('Preload snapshot is unavailable; rebuilding from source.') + matching = dict.fromkeys(INPUTS, False) + else: + binaries = unpack(content, data) + for group, matches in matching.items(): + if matches: + for name in OUTPUTS[group]: + path = root / 'app/src/main/assets/linuxfs' / name + if not path.resolve().is_relative_to(root.resolve()) or path.is_symlink(): + raise ValueError('Preload output escapes repository or is a symlink') + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(binaries[name]) + path.chmod(0o755 if name.endswith('droiddeck-clipboard') else 0o644) + for group, matches in matching.items(): + print(f"{group}: {'verified snapshot reused' if matches else 'inputs changed or snapshot unavailable; rebuild required'}") + if os.environ.get('GITHUB_OUTPUT'): + with open(os.environ['GITHUB_OUTPUT'], 'a') as output: + output.write(f'{group}={str(matches).lower()}\n') + return matching + + +def snapshot(run_id, destination, root=ROOT): + build = api(f'actions/runs/{run_id}') + candidates = api(f'actions/runs/{run_id}/artifacts?per_page=100')['artifacts'] + artifact = next(a for a in candidates if a['name'] == 'droiddeck-apk') + origin = dict(run=run_id, commit=build['head_sha'], artifact=artifact['id'], + artifact_sha256=artifact['digest'].removeprefix('sha256:'), + url=build['html_url']) + content = artifact_bytes(origin, root / 'app/build/component-downloads') + run('git', 'fetch', '--no-tags', 'origin', origin['commit'], root=root) + data = dict(version=1, origin=origin, groups={g: source_files(g, root, origin['commit']) for g in INPUTS}, + arm64_recipe=recipe(root, origin['commit']), x86_recipe=x86_recipe(root, origin['commit']), + outputs={name: sha(value) for name, value in content.items()}, + toolchain=dict(arm64='Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe', + x86='Debian bullseye compiler image and recipe pinned by source inputs')) + stream = io.BytesIO() + with gzip.GzipFile(fileobj=stream, mode='wb', mtime=0) as compressed: + with tarfile.open(fileobj=compressed, mode='w') as archive: + for name, value in sorted(content.items()): + entry = tarfile.TarInfo(name) + entry.size, entry.mode = len(value), 0o644 + archive.addfile(entry, io.BytesIO(value)) + destination.mkdir(parents=True, exist_ok=True) + (destination / 'preloads.tar.gz').write_bytes(stream.getvalue()) + data['archive_sha256'] = sha(stream.getvalue()) + (root / LOCK).write_text(json.dumps(data, indent=2, sort_keys=True) + '\n') + print('Snapshot SHA-256: ' + data['archive_sha256']) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('operation', choices=['restore', 'snapshot']) + parser.add_argument('--run', type=int) + parser.add_argument('--out', type=Path, default=ROOT / 'app/build/component-snapshot') + args = parser.parse_args() + if args.operation == 'restore': + restore() + else: + snapshot(args.run, args.out) diff --git a/tools/components/prepare.py b/tools/components/prepare.py new file mode 100644 index 000000000..acccf54e8 --- /dev/null +++ b/tools/components/prepare.py @@ -0,0 +1,166 @@ +import argparse +import hashlib +import json +import os +from pathlib import Path, PurePosixPath +import shutil +import subprocess +import tarfile + +ROOT = Path(__file__).resolve().parents[2] +REGISTRY = 'tools/components/recipes.json' +TREES = ['app/src/main/assets/linuxfs', 'app/src/main/assets/directaudio', + 'app/src/main/assets/droiddeck-esync', 'app/build/prepared-assets', + 'app/build/component-records'] +LIBRARIES = ['app/src/main/jniLibs/arm64-v8a/' + name for name in + ('libproot.so', 'libproot-loader.so', 'libdirectaudiorelay.so')] +MANIFEST = 'app/build/prepared-components.json' + + +def digest(path): + with path.open('rb') as stream: + return hashlib.file_digest(stream, 'sha256').hexdigest() + + +def registry(root=ROOT): + return json.loads((root / REGISTRY).read_text()) + + +def identity(name, root=ROOT): + spec = registry(root)[name] + paths = subprocess.check_output(['git', 'ls-files', '--cached', '--others', '--exclude-standard', + '--', *spec['inputs'], *spec.get('source_inputs', [])], cwd=root, text=True).splitlines() + values = {} + for name_ in sorted(set(paths)): + if '__pycache__' in name_ or name_.endswith(('.pyc', '.md')): + continue + content = (root / name_).read_bytes() + if b'\0' not in content: + content = content.replace(b'\r\n', b'\n') + values[name_] = hashlib.sha256(content).hexdigest() + policy = dict(spec=spec, sources=values, runner=os.environ.get('RUNNER_OS', 'Linux'), + architecture=os.environ.get('RUNNER_ARCH', 'X64')) + entrypoint = root / 'tools/components/prepare.py' + if entrypoint.is_file(): + policy['entrypoint'] = hashlib.sha256(entrypoint.read_bytes().replace(b'\r\n', b'\n')).hexdigest() + installer = root / 'tools/ci/install-ubuntu-packages.sh' + if spec.get('packages') and installer.is_file(): + policy['installer'] = hashlib.sha256(installer.read_bytes().replace(b'\r\n', b'\n')).hexdigest() + if spec.get('ndk'): + policy['ndk'] = os.environ.get('NDK_VERSION', '') + policy['ndk_policy'] = hashlib.sha256((root / 'tools/ci/toolchains.env').read_bytes().replace(b'\r\n', b'\n')).hexdigest() + return hashlib.sha256(json.dumps(policy, sort_keys=True).encode()).hexdigest() + + +def prepare(name, root=ROOT): + spec = registry(root)[name] + prepare_tools([name], root) + if 'command' in spec: + command = spec['command'] + else: + script = (root / spec['script']).resolve() + if not script.is_relative_to((root / 'tools/components').resolve()): + raise ValueError('Recipe script escapes components directory') + command = ['bash', str(script)] + environment = dict(os.environ) + if spec.get('source'): + environment.update(COMPONENT_SOURCE_URL=spec['source']['url'], + COMPONENT_SOURCE_SHA256=spec['source']['sha256']) + subprocess.run(command, cwd=root, env=environment, check=True) + missing = [name_ for name_ in spec['outputs'] if not (root / name_).is_file()] + if missing: + raise ValueError(f'{name} did not prepare required outputs: {missing}') + record = dict(component=name, input_sha256=identity(name, root), + outputs={p: digest(root / p) for p in spec['outputs']}) + destination = root / 'app/build/component-records' / (name + '.json') + destination.parent.mkdir(parents=True, exist_ok=True) + destination.write_text(json.dumps(record, sort_keys=True, indent=2) + '\n') + + +def prepare_tools(names, root=ROOT): + packages = sorted({package for name in names for package in registry(root)[name].get('packages', [])}) + if packages: + subprocess.run(['bash', 'tools/ci/install-ubuntu-packages.sh', *packages], cwd=root, check=True) + + +def files(root=ROOT): + result = [] + for name in TREES: + folder = root / name + if not folder.is_dir() or folder.is_symlink(): + raise ValueError('Missing prepared component tree: ' + name) + for path in folder.rglob('*'): + if path.is_symlink(): + raise ValueError('Symlink in prepared components: ' + str(path)) + if path.is_file(): + result.append(path.relative_to(root).as_posix()) + for name in LIBRARIES: + if not (root / name).is_file() or (root / name).is_symlink(): + raise ValueError('Missing prepared component library: ' + name) + result.append(name) + return sorted(result) + + +def pack(destination, root=ROOT): + names = files(root) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=root, text=True).strip() + data = dict(version=1, source_tree=tree, run=os.environ.get('GITHUB_RUN_ID', ''), + recipes={name: identity(name, root) for name in registry(root)}, + files={name: digest(root / name) for name in names}) + (root / MANIFEST).write_text(json.dumps(data, sort_keys=True, indent=2) + '\n') + destination.parent.mkdir(parents=True, exist_ok=True) + with tarfile.open(destination, mode='w:gz', compresslevel=1) as archive: + for name in names + [MANIFEST]: + archive.add(root / name, arcname=name, recursive=False) + + +def unpack(archive_path, source_tree, root=ROOT): + total = 0 + seen = set() + with tarfile.open(archive_path, mode='r:gz') as archive: + for entry in archive: + allowed = entry.name in LIBRARIES + [MANIFEST] or any(entry.name.startswith(p + '/') for p in TREES) + path = root / entry.name + total += entry.size + if (not allowed or '\\' in entry.name or '..' in PurePosixPath(entry.name).parts + or PurePosixPath(entry.name).as_posix() != entry.name + or not entry.isfile() or entry.name in seen or len(seen) >= 100000 + or entry.size > 512 * 1024 * 1024 + or total > 2 * 1024**3 or not path.resolve().is_relative_to(root.resolve()) + or path.is_symlink()): + raise ValueError('Unsafe prepared component archive') + seen.add(entry.name) + path.parent.mkdir(parents=True, exist_ok=True) + with path.open('wb') as output: + shutil.copyfileobj(archive.extractfile(entry), output) + path.chmod(entry.mode & 0o777) + data = json.loads((root / MANIFEST).read_text()) + actual = {name: digest(root / name) for name in files(root)} + recipes = {name: identity(name, root) for name in registry(root)} + if (data.get('version') != 1 or data['source_tree'] != source_tree or data['files'] != actual + or data['recipes'] != recipes): + raise ValueError('Prepared components do not match the pinned source tree and file hashes') + print('Prepared component source identity and all output hashes verified.') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('recipe') + parser.add_argument('--archive', type=Path, default=ROOT / 'app/build/prepared-components.tar.gz') + parser.add_argument('--tree') + args = parser.parse_args() + if args.recipe == 'plan': + for name in registry(): + value = identity(name) + print(f'{name}: {value}') + if os.environ.get('GITHUB_OUTPUT'): + with open(os.environ['GITHUB_OUTPUT'], 'a') as stream: + stream.write(f'{name}={value}\n') + elif args.recipe == 'tools': + prepare_tools(os.environ.get('COMPONENTS_TO_BUILD', '').split()) + elif args.recipe == 'pack': + pack(args.archive) + elif args.recipe == 'unpack': + unpack(args.archive, args.tree) + else: + prepare(args.recipe) diff --git a/tools/components/recipes.json b/tools/components/recipes.json new file mode 100644 index 000000000..ab7d40b4a --- /dev/null +++ b/tools/components/recipes.json @@ -0,0 +1,243 @@ +{ + "runtime": { + "script": "tools/components/recipes/runtime.sh", + "inputs": [ + "tools/components/recipes/runtime.sh", + "tools/quest", + "tools/linuxfs/overlay", + "tools/linuxfs/desktop", + "tools/linuxfs/licenses", + "tools/linuxfs/uruntime.env", + "tools/gamescope/release.env", + "tools/wlroots/release.env", + "tools/mangoapp", + "tools/msitools", + "tools/pipewire", + "tools/vr", + "tools/gpuload", + "app/src/main/cpp/waylandcomp/generated", + "app/src/main/cpp/waylandcomp/src/headpose_shm.h", + "app/src/main/cpp/waylandcomp/src/spatialpose_shm.h", + "app/src/main/cpp/venc/venc_proto.h" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/bin/gamescope", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" + ], + "ndk": true, + "packages": [ + "gcc-aarch64-linux-gnu", + "g++-aarch64-linux-gnu", + "libvulkan1", + "mesa-vulkan-drivers" + ] + }, + "esync": { + "script": "tools/components/recipes/esync.sh", + "inputs": [ + "tools/components/recipes/esync.sh", + "tools/droiddeck-esync/release.env" + ], + "outputs": [ + "app/src/main/assets/droiddeck-esync/index.json", + "app/src/main/assets/droiddeck-esync/index.json.sig" + ] + }, + "debian-image": { + "script": "tools/components/recipes/debian-image.sh", + "inputs": [ + "tools/components/recipes/debian-image.sh" + ], + "outputs": [] + }, + "x86-preloads": { + "script": "tools/components/recipes/x86-preloads.sh", + "inputs": [ + "tools/components/recipes/x86-preloads.sh", + "tools/linuxfs/build-x86-preloads.sh", + "tools/linuxfs/preload", + "tools/linuxfs/fex" + ], + "outputs": [ + "app/src/main/assets/linuxfs/x86_64/libfakeinput.so", + "app/src/main/assets/linuxfs/x86_64/libblsession.so", + "app/src/main/assets/linuxfs/x86_64/libfaultreport.so", + "app/src/main/assets/linuxfs/i386/libfakeinput.so", + "app/src/main/assets/linuxfs/i386/libblsession.so", + "app/src/main/assets/linuxfs/i386/libfaultreport.so", + "app/src/main/assets/linuxfs/x86_64/libwebkitinput.so", + "app/src/main/assets/linuxfs/x86_64/libvulkan-thunk.so" + ], + "source_inputs": [ + "app/src/main/cpp/fakeinput_steam.cpp", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h", + "app/src/main/cpp/venc/venc_proto.h", + "tools/linuxfs/preload", + "tools/quest/kgsl_compat.c", + "tools/quest/kgsl_compat.h", + "tools/linuxfs/fex", + "tools/linuxfs/build-x86-preloads.sh", + "tools/linuxfs/debian-image.env" + ], + "snapshot_outputs": [ + "x86_64/libfakeinput.so", + "x86_64/libblsession.so", + "x86_64/libfaultreport.so", + "i386/libfakeinput.so", + "i386/libblsession.so", + "i386/libfaultreport.so", + "x86_64/libwebkitinput.so", + "x86_64/libvulkan-thunk.so" + ] + }, + "pulseaudio-source": { + "script": "tools/components/recipes/pulseaudio-source.sh", + "inputs": [ + "tools/components/recipes/pulseaudio-source.sh" + ], + "outputs": [ + "pa13/src/pulsecore/module.h" + ], + "source": { + "url": "https://github.com/pulseaudio/pulseaudio/archive/refs/tags/v13.0.tar.gz", + "sha256": "bd7980bc9bd44bd3b3363545dabd19476ebf4d6bb6d2527e7d179256394a6758" + } + }, + "directaudio": { + "script": "tools/components/recipes/directaudio.sh", + "inputs": [ + "tools/components/recipes/directaudio.sh", + "tools/directaudio" + ], + "outputs": [ + "app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" + ], + "ndk": true + }, + "audio": { + "script": "tools/components/recipes/audio.sh", + "inputs": [ + "tools/aaudio-sink", + "tools/directaudio", + "tools/components/recipes/audio.sh", + "app/src/main/assets/pulseaudio.tzst" + ], + "outputs": [ + "app/build/prepared-assets/pulseaudio.tzst" + ], + "ndk": true + }, + "proot": { + "script": "tools/components/recipes/proot.sh", + "inputs": [ + "tools/proot", + "tools/components/recipes/proot.sh" + ], + "outputs": [ + "app/src/main/jniLibs/arm64-v8a/libproot.so", + "app/src/main/jniLibs/arm64-v8a/libproot-loader.so" + ], + "ndk": true + }, + "comet": { + "script": "tools/components/recipes/comet.sh", + "inputs": [ + "tools/comet", + "tools/components/recipes/comet.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet/comet", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet/version" + ], + "packages": [ + "gcc-aarch64-linux-gnu" + ] + }, + "arm64-preloads": { + "script": "tools/components/recipes/arm64-preloads.sh", + "inputs": [ + "tools/components/build-arm64-preloads.sh", + "tools/linuxfs/preload", + "app/src/main/cpp/fakeinput_steam.cpp", + "tools/components/recipes/arm64-preloads.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/libfakeinput.so", + "app/src/main/assets/linuxfs/libblsession.so", + "app/src/main/assets/linuxfs/libblfastpath.so", + "app/src/main/assets/linuxfs/libblaudit.so", + "app/src/main/assets/linuxfs/libssbs.so", + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard" + ], + "packages": [ + "gcc-aarch64-linux-gnu", + "g++-aarch64-linux-gnu" + ], + "source_inputs": [ + "app/src/main/cpp/fakeinput_steam.cpp", + "app/src/main/cpp/adrenotools/src/hook/kgsl.h", + "app/src/main/cpp/venc/venc_proto.h", + "tools/linuxfs/preload", + "tools/quest/kgsl_compat.c", + "tools/quest/kgsl_compat.h", + "tools/proot/fastpath", + "tools/linuxfs/ssbs", + "tools/linuxfs/clipboard" + ], + "snapshot_outputs": [ + "libfakeinput.so", + "libblsession.so", + "libblfastpath.so", + "libblaudit.so", + "libssbs.so", + "usr/local/bin/droiddeck-clipboard" + ] + }, + "preload-snapshot": { + "command": [ + "python3", + "tools/components/preloads.py", + "restore" + ], + "inputs": [ + "tools/components/preloads.py", + "tools/components/preloads.lock.json" + ], + "outputs": [] + }, + "xbox": { + "script": "tools/components/recipes/xbox.sh", + "inputs": [ + "tools/xbox", + "tools/components/recipes/xbox.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox/xodus-cli", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox/xodus-service" + ], + "packages": [ + "build-essential", + "pkg-config", + "libssl-dev", + "protobuf-compiler", + "cmake", + "xz-utils" + ] + }, + "dirt-ws2": { + "script": "tools/components/recipes/dirt-ws2.sh", + "inputs": [ + "tools/dirt-ws2", + "tools/components/recipes/dirt-ws2.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt/ws2_32.dll" + ], + "packages": [ + "clang", + "lld", + "llvm" + ] + } +} diff --git a/tools/components/recipes/arm64-preloads.sh b/tools/components/recipes/arm64-preloads.sh new file mode 100644 index 000000000..c6a227c2e --- /dev/null +++ b/tools/components/recipes/arm64-preloads.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +bash tools/components/build-arm64-preloads.sh app/src/main/assets/linuxfs diff --git a/tools/components/recipes/audio.sh b/tools/components/recipes/audio.sh new file mode 100644 index 000000000..819421d7c --- /dev/null +++ b/tools/components/recipes/audio.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +set -euo pipefail +export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" +tools/aaudio-sink/build.sh "$PWD/pa13" "$PWD/sink-out" +rm -rf pa-bundle && mkdir -p pa-bundle +tar --use-compress-program=unzstd -xf app/src/main/assets/pulseaudio.tzst -C pa-bundle +test ! -f pa-bundle/modules/arm64/module-aaudio-sink.so +install -m755 sink-out/module-aaudio-sink.so pa-bundle/modules/arm64/module-aaudio-sink.so +install -m755 sink-out/module-directaudio-native-sink.so pa-bundle/modules/arm64/module-directaudio-native-sink.so +(cd pa-bundle && tar --use-compress-program='zstd -19' -cf ../pulseaudio.tzst .) +mkdir -p app/build/prepared-assets +mv pulseaudio.tzst app/build/prepared-assets/pulseaudio.tzst +tar --use-compress-program=unzstd -tf app/build/prepared-assets/pulseaudio.tzst | grep -c '\.so$' +rm -rf pa-bundle sink-out diff --git a/tools/components/recipes/comet.sh b/tools/components/recipes/comet.sh new file mode 100644 index 000000000..e47d3e3d5 --- /dev/null +++ b/tools/components/recipes/comet.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -euo pipefail +rustup toolchain install 1.90.0 --profile minimal +rustup target add --toolchain 1.90.0 aarch64-unknown-linux-gnu +RUSTUP_TOOLCHAIN=1.90.0 bash tools/comet/build.sh diff --git a/tools/components/recipes/debian-image.sh b/tools/components/recipes/debian-image.sh new file mode 100644 index 000000000..f982225dc --- /dev/null +++ b/tools/components/recipes/debian-image.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail +. tools/linuxfs/debian-image.env +image=public.ecr.aws/docker/library/debian:bullseye +if gh release download "$DEBIAN_IMAGE_TAG" -R "$GITHUB_REPOSITORY" -p "$DEBIAN_IMAGE_ASSET" -O /tmp/debian-image.tar.zst \ + && { [ -z "$DEBIAN_IMAGE_SHA256" ] || echo "$DEBIAN_IMAGE_SHA256 /tmp/debian-image.tar.zst" | sha256sum -c -; }; then + zstd -dc /tmp/debian-image.tar.zst | docker load + rm -f /tmp/debian-image.tar.zst +else + echo "::warning::the hosted Debian image could not be fetched; pulling from the registry instead" + for attempt in 1 2 3 4 5; do + docker pull "$image" && break + [ "$attempt" -lt 5 ] || { echo "::error::could not pull $image after $attempt attempts"; exit 1; } + echo "pull attempt $attempt failed (registry busy?); retrying in $((attempt * 30)) s" + sleep $((attempt * 30)) + done +fi +docker image ls "$image" diff --git a/tools/components/recipes/directaudio.sh b/tools/components/recipes/directaudio.sh new file mode 100644 index 000000000..c684f0262 --- /dev/null +++ b/tools/components/recipes/directaudio.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +tools/directaudio/fetch.sh "$PWD" "$PWD/sink-out" \ No newline at end of file diff --git a/tools/components/recipes/dirt-ws2.sh b/tools/components/recipes/dirt-ws2.sh new file mode 100644 index 000000000..77a407088 --- /dev/null +++ b/tools/components/recipes/dirt-ws2.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +bash tools/dirt-ws2/build.sh app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt diff --git a/tools/components/recipes/esync.sh b/tools/components/recipes/esync.sh new file mode 100644 index 000000000..460ded772 --- /dev/null +++ b/tools/components/recipes/esync.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -euo pipefail +if [ -f tools/droiddeck-esync/release.env ]; then + . tools/droiddeck-esync/release.env + release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}" + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET" + echo "$SYNC_BUNDLE_SHA256 sync-bundle.tzst" | sha256sum -c - + mkdir -p app/src/main/assets/droiddeck-esync + tar --use-compress-program=unzstd -xf sync-bundle.tzst -C app/src/main/assets/droiddeck-esync + rm sync-bundle.tzst + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o sync-index.json "$release_url/index.json" + revoked=$(python3 -c 'import json, sys; print(" ".join(p["id"] for p in json.load(open(sys.argv[1]))["packs"] if p.get("revoked") is True))' sync-index.json) + for id in $revoked; do + if [ -e "app/src/main/assets/droiddeck-esync/packs/$id.tzst" ]; then + echo "::warning::$SYNC_BUNDLE_ASSET carries revoked pack $id; it is left out of the APK (point tools/droiddeck-esync/release.env at a newer bundle)" + rm -f "app/src/main/assets/droiddeck-esync/packs/$id.tzst" + fi + done + rm sync-index.json + test -f app/src/main/assets/droiddeck-esync/index.json + test -f app/src/main/assets/droiddeck-esync/index.json.sig + ls -lR app/src/main/assets/droiddeck-esync +fi diff --git a/tools/components/recipes/proot.sh b/tools/components/recipes/proot.sh new file mode 100644 index 000000000..9bf7699e8 --- /dev/null +++ b/tools/components/recipes/proot.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +export NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" +tools/proot/build.sh app/src/main/jniLibs/arm64-v8a diff --git a/tools/components/recipes/pulseaudio-source.sh b/tools/components/recipes/pulseaudio-source.sh new file mode 100644 index 000000000..a30e86494 --- /dev/null +++ b/tools/components/recipes/pulseaudio-source.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -euo pipefail +curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o pa.tar.gz "$COMPONENT_SOURCE_URL" +echo "$COMPONENT_SOURCE_SHA256 pa.tar.gz" | sha256sum -c - +mkdir -p pa13 && tar -xzf pa.tar.gz -C pa13 --strip-components=1 && rm pa.tar.gz diff --git a/tools/components/recipes/runtime.sh b/tools/components/recipes/runtime.sh new file mode 100644 index 000000000..aa5273d27 --- /dev/null +++ b/tools/components/recipes/runtime.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +set -euo pipefail +D=app/src/main/assets/linuxfs +mkdir -p "$D" +VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ + tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" +VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ + tools/gpuload/build.sh --native "$D/usr/local/lib/droiddeck-gpuload" +for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do + install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" +done +for f in tools/linuxfs/overlay/usr/bin/* tools/linuxfs/overlay/usr/bin/steamos-polkit-helpers/*; do + [ -f "$f" ] && install -Dm644 "$f" "$D/${f#tools/linuxfs/overlay/}" +done +if [ -f tools/gamescope/release.env ]; then + . tools/gamescope/release.env + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o gamescope.tzst "https://github.com/${GAMESCOPE_REPO:-${GITHUB_REPOSITORY}}/releases/download/${GAMESCOPE_TAG}/gamescope.tzst" + echo "${GAMESCOPE_SHA256} gamescope.tzst" | sha256sum -c - + tar --use-compress-program=unzstd -xf gamescope.tzst -C "$D" + test -f "$D/usr/local/bin/gamescope" + rm gamescope.tzst +fi +. tools/linuxfs/uruntime.env +curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o uruntime "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}" +echo "${URUNTIME_SHA256} uruntime" | sha256sum -c - +install -Dm644 uruntime "$D/usr/local/lib/droiddeck/uruntime" +install -Dm644 tools/linuxfs/licenses/uruntime-LICENSE "$D/usr/local/share/licenses/uruntime/LICENSE" +rm uruntime +M="$D/usr/local/lib/mangoapp" +mkdir -p "$M" mango-pkgs +grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o mango-pkgs/pkg.tar.zst "$url" + echo "$sum mango-pkgs/pkg.tar.zst" | sha256sum -c - + tar --use-compress-program=unzstd -xf mango-pkgs/pkg.tar.zst -C mango-pkgs + rm mango-pkgs/pkg.tar.zst +done +install -m644 mango-pkgs/usr/bin/mangoapp "$M/mangoapp" +for so in libfmt.so.10 libspdlog.so.1.13 libglfw.so.3 libtraceevent.so.1; do + cp -L "mango-pkgs/usr/lib/$so" "$M/$so" +done +aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wl,-soname,libtracefs.so.1 \ + -o "$M/libtracefs.so.1" tools/mangoapp/libtracefs-shim.c +aarch64-linux-gnu-strip --strip-unneeded "$M/libtracefs.so.1" +install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" +rm -rf mango-pkgs +ls -l "$M" +mkdir -p pw-pkgs +grep -v '^#' tools/pipewire/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o pw-pkgs/pkg.tar.zst "$url" + echo "$sum pw-pkgs/pkg.tar.zst" | sha256sum -c - + tar --use-compress-program=unzstd -xf pw-pkgs/pkg.tar.zst -C pw-pkgs + rm pw-pkgs/pkg.tar.zst +done +tools/pipewire/assemble.sh pw-pkgs "$D/usr/local/lib/droiddeck-pipewire.tzst" +rm -rf pw-pkgs +ls -l "$D/usr/local/lib/droiddeck-pipewire.tzst" +T="$D/usr/local/lib/droiddeck-msitools" +mkdir -p "$T" msi-pkgs +grep -v '^#' tools/msitools/packages.txt | while read -r sum url; do + [ -n "$url" ] || continue + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o msi-pkgs/pkg.tar.xz "$url" + echo "$sum msi-pkgs/pkg.tar.xz" | sha256sum -c - + tar -xJf msi-pkgs/pkg.tar.xz -C msi-pkgs + rm msi-pkgs/pkg.tar.xz +done +install -m644 msi-pkgs/usr/bin/msiinfo "$T/msiinfo" +install -m644 msi-pkgs/usr/bin/cabextract "$T/cabextract" +install -m644 msi-pkgs/usr/lib/7zip/7z "$T/7z" +install -m644 msi-pkgs/usr/lib/7zip/7z.so "$T/7z.so" +for so in libmsi-1.0.so.0 libgsf-1.so.114 libgcab-1.0.so.0; do + cp -L "msi-pkgs/usr/lib/$so" "$T/$so" +done +for f in NOTICE GPL-2 GPL-3 LGPL-2.1 7zip-License 7zip-unRarLicense; do + install -Dm644 "tools/msitools/licenses/$f" "$D/usr/local/share/licenses/droiddeck-msitools/$f" +done +rm -rf msi-pkgs +ls -l "$T" +install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" +install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" +install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" +install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$D/usr/local/bin/kwin_wayland_wrapper" +install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" +ls -lR "$D" diff --git a/tools/components/recipes/x86-preloads.sh b/tools/components/recipes/x86-preloads.sh new file mode 100644 index 000000000..c107c543b --- /dev/null +++ b/tools/components/recipes/x86-preloads.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -euo pipefail +docker run --rm -v "$PWD:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' + set -euo pipefail + install_compilers() { + apt-get -o Acquire::Check-Valid-Until=false update -qq && + DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends gcc g++ gcc-multilib g++-multilib binutils >/dev/null + } + printf "deb http://deb.debian.org/debian bullseye main\ndeb http://security.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list + if ! install_compilers; then + printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list + install_compilers + fi + tools/linuxfs/build-x86-preloads.sh app/src/main/assets/linuxfs +' +sudo chown -R "$(id -u):$(id -g)" app/src/main/assets/linuxfs +ls -l app/src/main/assets/linuxfs/x86_64 app/src/main/assets/linuxfs/i386 diff --git a/tools/components/recipes/xbox.sh b/tools/components/recipes/xbox.sh new file mode 100644 index 000000000..87c953656 --- /dev/null +++ b/tools/components/recipes/xbox.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +rustup toolchain install 1.99.0 --profile minimal +bash tools/xbox/build.sh diff --git a/tools/deploy_fast.py b/tools/deploy_fast.py new file mode 100644 index 000000000..958ac3051 --- /dev/null +++ b/tools/deploy_fast.py @@ -0,0 +1,324 @@ +#!/usr/bin/env python3 +"""Deploy session-helper changes by grafting them into the latest main CI APK. + +Downloads the newest release-signed main build from DroidDeck-CI that this checkout +descends from, replaces the helper assets whose sources differ from that build, re-signs +the result with the local release signer and optionally installs it. Any other change +(Kotlin, resources, native code, runtime components, deletions) stops the run so a full +build covers it. +""" +import argparse +import copy +import hashlib +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import time +from zipfile import ZipFile + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT / 'tools/release')) +from check_session_assets import source_assets + +CI_REPO = 'Droid-Deck/DroidDeck-CI' +CACHE = Path.home() / '.cache/droiddeck-donors' +IGNORED_PREFIXES = ('docs/', '.github/', 'tools/tests/', 'tools/ci/') +IGNORED_FILES = {'.gitignore', 'LICENSE', 'tools/deploy_fast.py'} +SIGNATURE_SUFFIXES = ('.SF', '.RSA', '.DSA', '.EC') +SIGNER = Path(os.environ.get('LOCALAPPDATA', '')) / 'DroidDeckSigning/Sign-DroidDeckApk.ps1' +PWSH_FALLBACK = Path.home() / '.cache/codex-runtimes/codex-primary-runtime/dependencies/native/powershell/pwsh.exe' + + +class Refused(Exception): + pass + + +def run_bounded(command, timeout, **options): + try: + return subprocess.run(command, timeout=timeout, **options) + except subprocess.TimeoutExpired: + raise Refused(' '.join(map(str, command[:4])) + ' timed out') + + +def git(*args, check=True): + result = run_bounded(['git', '-C', str(ROOT), *args], 300, capture_output=True, check=False) + if check and result.returncode: + raise Refused('git ' + ' '.join(args) + ' failed: ' + result.stderr.decode(errors='replace').strip()) + return result.stdout + + +def digest(path): + return hashlib.sha256(Path(path).read_bytes()).hexdigest() + + +def is_ignored(path): + return path in IGNORED_FILES or path.endswith('.md') or path.startswith(IGNORED_PREFIXES) + + +def graft_targets(): + return {source.relative_to(ROOT).as_posix(): asset for source, asset in source_assets().items()} + + +def changed_paths(donor_commit): + changes = {} + fields = git('diff', '--name-status', '-z', '--no-renames', donor_commit).decode().split('\0') + for status, path in zip(fields[0::2], fields[1::2]): + changes[path] = status + for path in filter(None, git('ls-files', '-z', '-o', '--exclude-standard').decode().split('\0')): + changes[path] = 'A' + return changes + + +def classify(changes, targets, donor_entries): + grafts, ignored, blocked = {}, [], {} + for path, status in sorted(changes.items()): + if is_ignored(path): + ignored.append(path) + elif path not in targets: + blocked[path] = 'not a graftable session helper' + elif status == 'D': + blocked[path] = 'deleted helper' + elif targets[path] not in donor_entries: + blocked[path] = 'new helper the donor APK does not carry' + else: + grafts[path] = targets[path] + return grafts, ignored, blocked + + +def helper_bytes(path): + data = (ROOT / path).read_bytes() + return data if b'\0' in data else data.replace(b'\r\n', b'\n') + + +def graft(donor, replacements, output): + with ZipFile(donor) as source, ZipFile(output, 'w') as target: + for info in source.infolist(): + name = info.filename + if name.startswith('META-INF/') and (name == 'META-INF/MANIFEST.MF' or name.endswith(SIGNATURE_SUFFIXES)): + continue + data = replacements.get(name) + if data is None: + data = source.read(name) + entry = copy.copy(info) + entry.extra = b'' + target.writestr(entry, data, compress_type=info.compress_type) + missing = set(replacements) - {i.filename for i in ZipFile(output).infolist()} + if missing: + raise Refused('Replacement entries missing from the output: ' + ', '.join(sorted(missing))) + + +def release_tags(limit=60): + out = run_bounded(['gh', 'release', 'list', '-R', CI_REPO, '--limit', str(limit), '--json', 'tagName'], + 120, capture_output=True, text=True) + if out.returncode: + raise Refused('Could not list DroidDeck-CI releases: ' + out.stderr.strip()) + return [item['tagName'] for item in json.loads(out.stdout) if item['tagName'].startswith('main-')] + + +def donor_commit(tag): + short = tag.removeprefix('main-') + commit = git('rev-parse', '--verify', '--quiet', short + '^{commit}', check=False).decode().strip() + if not commit: + git('fetch', '--no-tags', 'origin', 'main') + commit = git('rev-parse', '--verify', short + '^{commit}').decode().strip() + return commit + + +def is_ancestor(commit): + return subprocess.run(['git', '-C', str(ROOT), 'merge-base', '--is-ancestor', commit, 'HEAD']).returncode == 0 + + +def pick_tag(requested): + if requested: + return requested + for tag in release_tags(): + try: + if is_ancestor(donor_commit(tag)): + return tag + except Refused: + continue + raise Refused('No recent DroidDeck-CI main build is an ancestor of this checkout; merge main first.') + + +def fetch_donor(tag): + folder = CACHE / tag + apk = folder / f'DroidDeck-{tag}.apk' + sums = folder / 'SHA256SUMS.txt' + if not (apk.is_file() and sums.is_file()): + folder.mkdir(parents=True, exist_ok=True) + for pattern in (apk.name, sums.name): + try: + result = run_bounded(['gh', 'release', 'download', tag, '-R', CI_REPO, '-p', pattern, + '-D', str(folder), '--clobber'], 900, capture_output=True, text=True) + if result.returncode: + raise Refused('Download failed: ' + result.stderr.strip()) + except Refused: + apk.unlink(missing_ok=True) + raise + expected = dict(reversed(line.split(None, 1)) for line in sums.read_text().splitlines() if line.strip()) + if digest(apk) != expected.get(apk.name, '').strip(): + apk.unlink() + raise Refused('Donor APK does not match SHA256SUMS.txt: ' + apk.name) + return apk + + +def sdk_root(): + return Path(os.environ.get('ANDROID_HOME') or os.environ.get('ANDROID_SDK_ROOT') or Path.home() / 'android-sdk') + + +def apksigner(): + candidates = sorted((sdk_root() / 'build-tools').glob('*/apksigner*'), reverse=True) + for path in candidates: + if path.suffix in ('', '.bat'): + return str(path) + raise Refused('apksigner not found under ' + str(sdk_root() / 'build-tools')) + + +def signer_sha256(apk): + result = subprocess.run([apksigner(), 'verify', '--print-certs', str(apk)], capture_output=True, text=True) + if result.returncode: + raise Refused('APK signature does not verify: ' + (result.stdout + result.stderr).strip()) + for line in result.stdout.splitlines(): + if 'certificate SHA-256 digest:' in line: + return line.rsplit(':', 1)[1].strip().lower() + raise Refused('apksigner reported no certificate digest') + + +def pwsh(): + found = shutil.which('pwsh') + if found: + return found + if PWSH_FALLBACK.is_file(): + return str(PWSH_FALLBACK) + raise Refused('PowerShell 7 (pwsh) is required for the local signer') + + +def signing_env(): + common = Path(git('rev-parse', '--path-format=absolute', '--git-common-dir').decode().strip()) + for candidate in (os.environ.get('DROIDDECK_SIGNING_ENV'), ROOT / '.signing.env', common.parent / '.signing.env'): + if candidate and Path(candidate).is_file(): + return Path(candidate).resolve() + return None + + +def version_key(path): + return [int(part) if part.isdigit() else -1 for part in path.parent.name.replace('-', '.').split('.')] + + +def sign_with_env(env_file, unsigned, signed): + complete = [path for path in (sdk_root() / 'build-tools').glob('*/aapt') + if all((path.parent / tool).is_file() for tool in ('zipalign', 'apksigner'))] + build_tools = sorted(complete, key=version_key, reverse=True) + if not build_tools: + raise Refused('no build-tools with aapt, zipalign and apksigner under ' + str(sdk_root() / 'build-tools')) + script = 'set -a; cd "$(dirname "$1")"; . "$1"; set +a; BUILD_TOOLS="$5" exec "$2" "$3" standard "$4"' + result = subprocess.run(['bash', '-c', script, 'sign', str(env_file), str(ROOT / 'tools/release/sign-apk.sh'), + str(unsigned), str(signed), str(build_tools[0].parent.resolve())], + capture_output=True, text=True) + if result.returncode or not signed.is_file(): + raise Refused('Signing failed:\n' + (result.stdout + result.stderr).strip()) + + +def sign(unsigned, signed): + if not SIGNER.is_file() and (env_file := signing_env()): + return sign_with_env(env_file, unsigned, signed) + def quoted(value): + return "'" + str(value).replace("'", "''") + "'" + command = (f"if (-not (Test-Path -LiteralPath {quoted(SIGNER)})) {{ Write-Error 'Local signer not found'; exit 1 }}; " + f"& {quoted(SIGNER)} -InputApk {quoted(unsigned)} -OutputApk {quoted(signed)} -SdkRoot {quoted(sdk_root())}") + result = subprocess.run([pwsh(), '-NoProfile', '-Command', command], capture_output=True, text=True) + if result.returncode or not signed.is_file(): + raise Refused('Signing failed:\n' + (result.stdout + result.stderr).strip()) + + +def verify_output(apk, grafts, pinned): + if signer_sha256(apk) != pinned: + raise Refused('Output is not signed with the release certificate') + with ZipFile(apk) as package: + for path, asset in grafts.items(): + if package.read(asset) != helper_bytes(path): + raise Refused('Grafted helper does not match its source: ' + asset) + for path, asset in graft_targets().items(): + if asset in package.namelist() and package.read(asset) != helper_bytes(path): + raise Refused('Stale helper in the output: ' + asset) + + +def install(apk): + adb = Path(os.environ.get('ADB') or sdk_root() / 'platform-tools/adb.exe') + if not adb.is_file(): + adb = Path(shutil.which('adb') or '') + if not adb.is_file(): + raise Refused('adb not found; set ADB or ANDROID_HOME') + serial = subprocess.run([sys.executable, str(ROOT / 'tools/adb_device.py'), '--adb', str(adb)], + capture_output=True, text=True) + if serial.returncode: + raise Refused(serial.stderr.strip() or 'No device resolved') + device = serial.stdout.strip() + result = subprocess.run([str(adb), '-s', device, 'install', '-r', '--no-incremental', str(apk)]) + if result.returncode: + raise Refused('adb install failed (a different signing certificate needs a manual uninstall)') + print('Installed on ' + device) + + +def run(args): + pinned = (ROOT / 'keystore/release-signer.sha256').read_text().strip().lower() + tag = pick_tag(args.donor) + commit = donor_commit(tag) + if not is_ancestor(commit): + raise Refused(f'{tag} is not an ancestor of this checkout; merge main or pick an older build') + donor = fetch_donor(tag) + if signer_sha256(donor) != pinned: + raise Refused('Donor APK is not signed with the release certificate') + with ZipFile(donor) as package: + entries = set(package.namelist()) + grafts, ignored, blocked = classify(changed_paths(commit), graft_targets(), entries) + print(f'Donor {tag} ({commit[:7]})') + for path in ignored: + print(' ignored', path) + for path, asset in grafts.items(): + print(' graft ', path, '->', asset) + if blocked: + for path, reason in blocked.items(): + print(' BLOCKED', path, f'({reason})') + raise Refused('Changes outside the graftable set; run tools/build_local.sh for these.') + if not grafts: + print('Nothing to graft; the donor already matches this checkout.') + if not args.plan: + print('Donor APK:', donor) + if args.install: + install(donor) + return + if args.plan: + return + out_dir = ROOT / 'app/build/outputs/apk/fast' + out_dir.mkdir(parents=True, exist_ok=True) + stamp = f'{tag}-{git("rev-parse", "--short", "HEAD").decode().strip()}-{int(time.time())}' + unsigned = out_dir / f'unsigned-{stamp}.apk' + signed = out_dir / f'DroidDeck-fast-{stamp}.apk' + graft(donor, {asset: helper_bytes(path) for path, asset in grafts.items()}, unsigned) + try: + sign(unsigned, signed) + finally: + unsigned.unlink(missing_ok=True) + verify_output(signed, grafts, pinned) + print('Signed APK:', signed) + if args.install: + install(signed) + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('--donor', help='DroidDeck-CI main tag such as main-4aa19b6; default is the newest ancestor build') + parser.add_argument('--plan', action='store_true', help='Show what would be grafted without building') + parser.add_argument('--install', action='store_true', help='Install the signed APK on the connected device') + try: + run(parser.parse_args()) + except Refused as error: + parser.exit(2, str(error) + '\n') + + +if __name__ == '__main__': + main() diff --git a/tools/desktop-kde/README.md b/tools/desktop-kde/README.md index f2303b26f..53c6c5531 100644 --- a/tools/desktop-kde/README.md +++ b/tools/desktop-kde/README.md @@ -11,8 +11,30 @@ icon, Plasma's default bottom panel, and "Return to Gaming Mode" and Steam on th - `overlay/`: our files on top - system-wide KDE defaults in `/etc/xdg`, the Vapor theme and its layout script, the menu entries Steam and Return to Gaming Mode use. +pacman works on the desktop. `pacman-db.py` writes an install record for every package the desktop +ships into `/var/lib/pacman/local`, and builds the `droiddeck` repository: Arch Linux ARM's core, +extra and alarm databases as they were at build time, with the runtime's and the desktop's own +packages at the installed versions. The release carries that database (`droiddeck.db`) and the +packages `mirror.txt` names; everything else downloads from Arch Linux ARM as a `CacheServer`, so its +404s never disable a mirror. Installs therefore resolve against the desktop's exact Qt and KDE +versions, and `pacman -Syu` only ever moves packages the user added. + +- `/usr/local/bin/pacman` runs the real pacman with `/usr/share/droiddeck/pacman/pacman.conf`, first + copying in the shipped database and dropping the runtime's records for packages the desktop + replaced (`prepare`). As root it adds `--needed` to installs, so guides that reinstall + something the desktop has just skip it. +- `sudo`, `su` and `sudoedit` run commands as root: the session is the app's own Android user, and + `libdroiddeck-root.so` (`root/root.c`, preloaded by `sudo`) reports uid 0, accepts ownership + changes and shows the runtime's 0700 directories as 0755. It grants nothing the user lacked. +- `hooks/droiddeck-system.hook` refuses to remove or replace any runtime or desktop package; + `droiddeck-remember.hook` keeps the user's own packages in + `~/.local/share/droiddeck/pacman/packages.txt`, and `restore` (autostarted) reinstalls them after a + runtime update and upgrades them after a desktop update. Hooks that need systemd, udev, kernel + modules or an initramfs are masked. + `.github/workflows/build-desktop-kde.yml` builds it and, run with a new tag, publishes it as a -release in Droid-Deck/DroidDeck-Components. `release.env` pins the tag, sha256 and size the apk +release in Droid-Deck/DroidDeck-Components (tags with `-rc` are published as pre-releases for testing +before an app build points at them). `release.env` pins the tag, sha256 and size the apk installs (`DesktopCatalog.desktopEntry`); a published tag is never replaced, so a changed package is a new tag and a `release.env` update. @@ -20,6 +42,8 @@ At run time the desktop is started by `tools/linuxfs/desktop/droiddeck-desktop` at every session): Plasma's own `startplasma-wayland`, with KWin nested in the app's compositor through `kwin_wayland_wrapper`. The package's `kwin-compositor` marker selects OpenGL through Zink for KWin 6.8, which removed QPainter. Older packages retain their software compositor. +KWin runs without Gallium's threaded context and without overlay layers. With the threaded context, KWin crashed +uploading windows' shared-memory buffers by reading past their end, and the host shows only a single buffer. On Android the launcher explicitly selects the KGSL render node; the nested backend can use it when the host's dmabuf feedback cannot name a DRM device. Games and emulators from the menu go through `droiddeck-gpu`, and Steam goes back to the app as a Steam session. @@ -35,6 +59,9 @@ The behavior is enabled only with `DROIDDECK_NESTED_SCALE`, which the desktop sc `0002-select-explicit-nested-render-node.patch` lets that nested backend use one explicitly selected `KWIN_RENDER_NODES` device when host feedback cannot identify it. It does not guess between GPUs or change normal KWin device selection. +`0003-forward-nested-scroll-source.patch` passes the host's scroll source, wheel steps and scroll stops +through the nested backend, which upstream leaves as a TODO. Two-finger touch scrolling then reaches +apps as touchpad scrolling, and wheel steps stay whole clicks. `pins/mesa/desc` keeps Mesa 26.2.4 and its actual package dependencies ahead of the rolling repository metadata. Mesa 26.2.5 crashes in Zink shader compilation on Thor with the selected @@ -44,7 +71,7 @@ both build jobs verify the Arch Linux ARM signature and pinned SHA-256 as for ev The desktop workflow replaces the same-version `kwin_wayland` executable and `libkwin.so`; the rest comes from the signature-checked Arch packages. `desktop-kde.kwin.txt` records the source, patch, executable, library and build package hashes. Corresponding source is -https://download.kde.org/stable/plasma/6.8.0/kwin-6.8.0.tar.xz plus the patch in this repository. +https://download.kde.org/stable/plasma/6.8.2/kwin-6.8.2.tar.xz plus the patch in this repository. The inventories use `.gzip` rather than `.gz`: Android's asset packer expands `.gz` and strips its suffix. The shared local/CI runtime payload check verifies the exact APK names and bytes. diff --git a/tools/desktop-kde/build-kwin.sh b/tools/desktop-kde/build-kwin.sh index cff8d075f..d3620257c 100644 --- a/tools/desktop-kde/build-kwin.sh +++ b/tools/desktop-kde/build-kwin.sh @@ -6,7 +6,7 @@ here=$(cd "$(dirname "$0")" && pwd) source "$here/kwin.env" source "$here/mesa.env" version=$DESKTOP_KWIN_VERSION -source_sha=4bfaf31e29a8f9fdf231dc3bbb9b09b0ce07cae9fee7a01cfc86425ece796258 +source_sha=ea5e68d957c7d70abed97222a592d4445fda29129e20942658badd224ee138b4 mirror=https://fl.us.mirror.archlinuxarm.org/aarch64 builder=68B3537F39A313B3E574D06777193F152BDBE6A6 work=$(mktemp -d) @@ -52,6 +52,7 @@ sudo mount -t proc proc "$work/root/proc" sudo tar -xf "$work/kwin.tar.xz" -C "$work/root/build" sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0001-respect-nested-desktop-scale.patch" sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0002-select-explicit-nested-render-node.patch" +sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0003-forward-nested-scroll-source.patch" sudo chroot "$work/root" /usr/bin/env PATH=/usr/bin:/bin HOME=/root LC_ALL=C.UTF-8 \ /usr/bin/cmake -S "/build/kwin-$version" -B /build/out -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBEXECDIR=lib \ @@ -72,6 +73,7 @@ grep -aq DROIDDECK_NESTED_SCALE "$out/libkwin.so.$version" echo "KWin $version source sha256 $source_sha" echo "Patch sha256 $(sha256sum "$here/patches/0001-respect-nested-desktop-scale.patch" | cut -d' ' -f1)" echo "Render node patch sha256 $(sha256sum "$here/patches/0002-select-explicit-nested-render-node.patch" | cut -d' ' -f1)" + echo "Scroll source patch sha256 $(sha256sum "$here/patches/0003-forward-nested-scroll-source.patch" | cut -d' ' -f1)" echo "Executable sha256 $(sha256sum "$out/kwin_wayland" | cut -d' ' -f1)" echo "Library sha256 $(sha256sum "$out/libkwin.so.$version" | cut -d' ' -f1)" echo 'Build packages (Arch Linux ARM signatures verified):' diff --git a/tools/desktop-kde/build.sh b/tools/desktop-kde/build.sh index b8d8a0efc..04ad5fbb5 100755 --- a/tools/desktop-kde/build.sh +++ b/tools/desktop-kde/build.sh @@ -38,6 +38,12 @@ while read -r entry sum; do done < "$work/pkglist.txt" cp -a "$here/overlay/." "$work/root/" +mkdir -p "$work/root/usr/lib/droiddeck" +${CC_AARCH64:-aarch64-linux-gnu-gcc} -shared -fPIC -O2 -Wall -Wextra \ + -o "$work/root/usr/lib/droiddeck/libdroiddeck-root.so" "$here/root/root.c" -ldl +${STRIP_AARCH64:-aarch64-linux-gnu-strip} --strip-unneeded "$work/root/usr/lib/droiddeck/libdroiddeck-root.so" +python3 "$here/pacman-db.py" "$work/db" "$pkgs" "$work/pkglist.txt" "$here/runtime-packages.txt" \ + "$here/mirror.txt" "${DESKTOP_KDE_RELEASE_TAG:-}" "$work/root" "$out/repo" if [ -n "${KDE_KWIN_OVERRIDE:-}" ]; then kwin_package=$(awk '$1 ~ /^extra\/kwin-.*-aarch64\.pkg\.tar\./ {print $1}' "$work/pkglist.txt") @@ -61,7 +67,7 @@ if [ -d "$work/root/usr/share/locale" ]; then echo "i18n: $(wc -l < "$out/desktop-kde.i18n.txt") language packs" fi -rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/man" "$work/root/usr/share/info" \ +rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/info" \ "$work/root/usr/share/gtk-doc" "$work/root/usr/include" "$work/root/usr/lib/pkgconfig" \ "$work/root/usr/lib/cmake" "$work/root/usr/share/help" find "$work/root/usr/share/locale" -mindepth 1 -maxdepth 1 -type d ! -name 'en*' -exec rm -rf {} + 2>/dev/null || true diff --git a/tools/desktop-kde/closure.py b/tools/desktop-kde/closure.py index 2c74e299f..73d3781a4 100755 --- a/tools/desktop-kde/closure.py +++ b/tools/desktop-kde/closure.py @@ -1,11 +1,4 @@ #!/usr/bin/env python3 -"""The packages the KDE desktop package ships: the dependency closure of the seeds over Arch Linux -ARM's extracted repository databases, minus what the runtime already has at a version that serves. - - closure.py <db dir with x_core, x_extra, x_alarm> <runtime-packages.txt> <seeds.txt> - -Prints one "repo/filename sha256" per package to ship (the sha256 the repository database gives). -""" import collections import os import re @@ -107,7 +100,6 @@ def main(): providers[pname].append((name, pver or pkgs[name]["version"])) def resolve(dep): - """The package to take for a dependency string, and whether the runtime's copy serves.""" name, op, want = parse_dep(dep) if name in runtime and satisfies(runtime[name], op, want): return name, True diff --git a/tools/desktop-kde/kwin.env b/tools/desktop-kde/kwin.env index d6ef0cee9..6ad1968d5 100644 --- a/tools/desktop-kde/kwin.env +++ b/tools/desktop-kde/kwin.env @@ -1 +1 @@ -DESKTOP_KWIN_VERSION=6.8.0 +DESKTOP_KWIN_VERSION=6.8.2 diff --git a/tools/desktop-kde/mirror.txt b/tools/desktop-kde/mirror.txt new file mode 100644 index 000000000..ea885249f --- /dev/null +++ b/tools/desktop-kde/mirror.txt @@ -0,0 +1,16 @@ +neovim +tmux +screen +rsync +jq +ripgrep +fd +bat +ncdu +btop +fastfetch +lsof +strace +python-pip +nodejs +npm diff --git a/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop b/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop new file mode 100644 index 000000000..4263cc7c5 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Restore pacman packages +Exec=/usr/share/droiddeck/pacman/restore +NoDisplay=true +OnlyShowIn=KDE; +X-KDE-autostart-phase=2 diff --git a/tools/desktop-kde/overlay/usr/local/bin/pacman b/tools/desktop-kde/overlay/usr/local/bin/pacman new file mode 100755 index 000000000..ddbfbb8c7 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/pacman @@ -0,0 +1,31 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +[ -r "$dir/pacman.conf" ] || exec /usr/bin/pacman "$@" +"$dir/prepare" || exit 1 +install=0 +if [ "$(id -u)" = 0 ]; then + letters= install=1 + for arg in "$@"; do + case $arg in + --) break ;; + --sync) letters+=S ;; + --search|--info|--clean|--groups|--list|--print|--print-format|--downloadonly) install=0 ;; + --*) ;; + -*) letters+=${arg#-} ;; + esac + done + case $letters in *S*) ;; *) install=0 ;; esac + case $letters in *[sicglpw]*) install=0 ;; esac + [ "$install" = 1 ] && set -- --needed "$@" +fi +[ "$install" = 1 ] || exec /usr/bin/pacman --config "$dir/pacman.conf" "$@" +/usr/bin/pacman --config "$dir/pacman.conf" "$@" && exit 0 +status=$? +mapfile -t paths < <("$dir/adopt" "$@") +[ ${#paths[@]} -gt 0 ] || exit "$status" +overwrite=() +for path in "${paths[@]}"; do overwrite+=(--overwrite "$path"); done +/usr/bin/pacman --config "$dir/pacman.conf" "${overwrite[@]}" "$@" || exit +mapfile -t shared < <(/usr/bin/pacman --config "$dir/pacman.conf" -Qqd 2>/dev/null | grep -xF -f /var/lib/pacman/droiddeck-shared) +[ ${#shared[@]} -eq 0 ] || /usr/bin/pacman --config "$dir/pacman.conf" -D --asexplicit "${shared[@]}" >/dev/null +"$dir/remember" diff --git a/tools/desktop-kde/overlay/usr/local/bin/su b/tools/desktop-kde/overlay/usr/local/bin/su new file mode 100755 index 000000000..02f2e55d7 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/su @@ -0,0 +1,32 @@ +#!/bin/bash +login=0 command= shell= +while [ $# -gt 0 ]; do + case $1 in + -|-l|--login) login=1; shift ;; + -c|--command) [ $# -ge 2 ] || { echo "su: option requires an argument -- 'c'" >&2; exit 1; }; command=$2; shift 2 ;; + --command=*) command=${1#*=}; shift ;; + -s|--shell) [ $# -ge 2 ] || { echo "su: option requires an argument -- 's'" >&2; exit 1; }; shell=$2; shift 2 ;; + --shell=*) shell=${1#*=}; shift ;; + -m|-p|--preserve-environment|-P|--pty|-f|--fast) shift ;; + -h|--help) echo "usage: su [-] [-c command] [-s shell] [root]"; exit 0 ;; + -V|--version) echo "DroidDeck su: runs a root shell inside the DroidDeck desktop"; exit 0 ;; + --) shift; break ;; + -*) echo "su: invalid option -- '${1#-}'" >&2; exit 1 ;; + *) break ;; + esac +done +user=${1:-root} +[ $# -gt 0 ] && shift +case $user in + root|0|"$(id -un 2>/dev/null)") ;; + *) echo "su: user $user does not exist or the user entry does not contain all the required fields" >&2; exit 1 ;; +esac +args=() +[ "$login" = 1 ] && args+=(-i) +if [ -n "$shell" ]; then + if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" "$shell" -c "$command" "$@"; fi + exec /usr/local/bin/sudo "${args[@]}" "$shell" "$@" +fi +if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" -s "$command"; fi +[ "$login" = 1 ] && exec /usr/local/bin/sudo -i +exec /usr/local/bin/sudo -s diff --git a/tools/desktop-kde/overlay/usr/local/bin/sudo b/tools/desktop-kde/overlay/usr/local/bin/sudo new file mode 100755 index 000000000..0f10f02e3 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/sudo @@ -0,0 +1,94 @@ +#!/bin/bash +lib=/usr/lib/droiddeck/libdroiddeck-root.so +me=${0##*/} +usage() { + echo "usage: $me [-EHiknsSv] [-u user] [-g group] [-D directory] [--] command [arg ...]" + echo " $me -e file ..." +} +known_user() { + case $1 in + ''|root|0|'#0'|"$(id -un 2>/dev/null)"|"#$(id -ru 2>/dev/null)") return 0 ;; + esac + echo "$me: unknown user $1" >&2 + exit 1 +} + +login=0 shell=0 edit=0 background=0 dir= +[ "$me" = sudoedit ] && edit=1 +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -h|--help) usage; exit 0 ;; + -V|--version) echo "DroidDeck sudo: runs commands as root inside the DroidDeck desktop"; exit 0 ;; + -l|--list) echo "User $(id -un 2>/dev/null) may run the following commands on $(uname -n):"; echo " (ALL : ALL) ALL"; exit 0 ;; + -v|--validate|-K|--remove-timestamp) exit 0 ;; + -k|--reset-timestamp) shift; [ $# -eq 0 ] && exit 0 ;; + -i|--login) login=1; shift ;; + -s|--shell) shell=1; shift ;; + -e|--edit) edit=1; shift ;; + -b|--background) background=1; shift ;; + -E|--preserve-env|--preserve-env=*|-H|--set-home|-n|--non-interactive|-S|--stdin|-P|--preserve-groups|-A|--askpass|-B|--bell|-N|--no-update) shift ;; + -u|--user|-g|--group) [ $# -ge 2 ] || { usage >&2; exit 1; }; known_user "$2"; shift 2 ;; + --user=*|--group=*) known_user "${1#*=}"; shift ;; + -u*|-g*) known_user "${1:2}"; shift ;; + -D|--chdir) [ $# -ge 2 ] || { usage >&2; exit 1; }; dir=$2; shift 2 ;; + --chdir=*) dir=${1#*=}; shift ;; + -p|--prompt|-C|--close-from|-r|--role|-t|--type|-T|--command-timeout|-R|--chroot) [ $# -ge 2 ] || { usage >&2; exit 1; }; shift 2 ;; + --prompt=*|--close-from=*|--role=*|--type=*|--command-timeout=*) shift ;; + -[A-Za-z][A-Za-z]*) + flags=${1#-}; shift + split=() + while [ -n "$flags" ]; do + split+=("-${flags:0:1}") + case ${flags:0:1} in + u|g|D|p|C|r|t|T|R) [ -n "${flags:1}" ] && split+=("${flags:1}"); flags= ;; + *) flags=${flags:1} ;; + esac + done + set -- "${split[@]}" "$@" + ;; + -*) echo "$me: invalid option -- '${1#-}'" >&2; usage >&2; exit 1 ;; + *) break ;; + esac +done + +if [ "$edit" = 1 ]; then + [ $# -gt 0 ] || { usage >&2; exit 1; } + editor=${SUDO_EDITOR:-${VISUAL:-${EDITOR:-nano}}} + exec $editor "$@" +fi + +if [ ! -r "$lib" ]; then + echo "$me: $lib is missing; reinstall the desktop from DroidDeck's Desktop page" >&2 + exit 1 +fi +case ":${LD_PRELOAD:-}:" in + *":$lib:"*) ;; + *) export LD_PRELOAD="$lib${LD_PRELOAD:+:$LD_PRELOAD}" ;; +esac +export SUDO_USER=${SUDO_USER:-$(id -un 2>/dev/null)} +export SUDO_UID=${SUDO_UID:-$(id -ru 2>/dev/null)} +export SUDO_GID=${SUDO_GID:-$(id -rg 2>/dev/null)} +export SUDO_COMMAND="$*" +[ -z "$dir" ] || cd "$dir" || exit 1 + +target_shell=$(getent passwd "$(id -un 2>/dev/null)" | cut -d: -f7) +target_shell=${target_shell:-/bin/bash} +if [ "$login" = 1 ]; then + cd "${HOME:-/root}" 2>/dev/null + if [ $# -gt 0 ]; then set -- "$target_shell" -l -c "$*"; else set -- "$target_shell" -l; fi +elif [ "$shell" = 1 ]; then + if [ $# -gt 0 ]; then set -- "${SHELL:-$target_shell}" -c "$*"; else set -- "${SHELL:-$target_shell}"; fi +elif [ $# -eq 0 ]; then + usage >&2 + exit 1 +elif ! command -v "$1" >/dev/null 2>&1; then + echo "$me: $1: command not found" >&2 + exit 1 +fi + +if [ "$background" = 1 ]; then + "$@" & + exit 0 +fi +exec "$@" diff --git a/tools/desktop-kde/overlay/usr/local/bin/sudoedit b/tools/desktop-kde/overlay/usr/local/bin/sudoedit new file mode 120000 index 000000000..3b0e384e5 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/sudoedit @@ -0,0 +1 @@ +sudo \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop new file mode 100644 index 000000000..9b9f23812 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi Zeroconf Browser +Exec=/usr/bin/avahi-discover +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop new file mode 100644 index 000000000..46c4ebc18 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi SSH Server Browser +Exec=/usr/bin/bssh +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop new file mode 100644 index 000000000..8aa902547 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi VNC Server Browser +Exec=/usr/bin/bvnc +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop new file mode 100644 index 000000000..77719ad7c --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Server +Exec=foot --server +Icon=foot +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop new file mode 100644 index 000000000..bf59b5c19 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Client +Exec=footclient +Icon=foot +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop new file mode 100644 index 000000000..31fd6bd08 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Hardware Locality lstopo +Exec=lstopo +Icon=hwloc +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop new file mode 100644 index 000000000..8e494cc19 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=IBus Preferences +Exec=ibus-setup +Icon=ibus-setup +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop new file mode 100644 index 000000000..f4e2dce80 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 test Utility +Exec=qv4l2 +Icon=qv4l2 +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop new file mode 100644 index 000000000..3e01700fa --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 video capture utility +Exec=qvidcap +Icon=qvidcap +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt new file mode 100755 index 000000000..7539159a1 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt @@ -0,0 +1,117 @@ +#!/usr/bin/python3 +import hashlib +import os +import re +import subprocess +import sys +import tarfile + +SHARE = "/usr/share/droiddeck/pacman" +LIB = "/var/lib/pacman" +CACHE = "/var/cache/pacman/pkg" +SHARED = os.path.join(LIB, "droiddeck-shared") +SHARED_FILES = SHARED + "-files" + + +def owned(): + paths = set() + local = os.path.join(LIB, "local") + for entry in os.listdir(local): + try: + with open(os.path.join(local, entry, "files"), encoding="utf-8", errors="surrogateescape") as f: + lines = f.read().split("\n") + except OSError: + continue + reading = False + for line in lines: + if line.startswith("%"): + reading = line == "%FILES%" + elif reading and line: + paths.add(line.rstrip("/")) + return paths + + +def same(archive, member, path): + if member.issym(): + return os.path.islink(path) and os.readlink(path) == member.linkname + if not member.isfile() or os.path.islink(path) or not os.path.isfile(path): + return False + if os.path.getsize(path) != member.size: + return False + with archive.extractfile(member) as packaged, open(path, "rb") as installed: + return hashlib.file_digest(packaged, "sha256").digest() == hashlib.file_digest(installed, "sha256").digest() + + +def planned(args): + query = [] + for arg in args: + if arg == "--refresh" or arg == "--noconfirm": + continue + if re.fullmatch(r"-[A-Za-z]+", arg): + arg = arg.replace("y", "") + if arg == "-": + continue + query.append(arg) + run = subprocess.run(["/usr/bin/pacman", "--config", os.path.join(SHARE, "pacman.conf"), "--noconfirm", *query, + "--print", "--print-format", "%n %f"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, + text=True) + if run.returncode != 0: + return [] + return [line.split(" ", 1) for line in run.stdout.splitlines() if " " in line] + + +def main(): + targets = [(name, os.path.join(CACHE, os.path.basename(file))) for name, file in planned(sys.argv[1:])] + targets = [(name, path) for name, path in targets if os.path.isfile(path)] + if not targets: + return 0 + have = owned() + paths, names = [], [] + for name, path in targets: + found = False + with tarfile.open(path) as archive: + for member in archive: + if member.isdir() or member.name.startswith("."): + continue + if member.name in have or not os.path.lexists("/" + member.name) or os.path.isdir("/" + member.name): + continue + if not same(archive, member, "/" + member.name): + continue + paths.append("/" + member.name) + found = True + if found: + names.append(name) + if not paths: + return 0 + shared = set() + try: + with open(SHARED) as f: + shared = {line.strip() for line in f if line.strip()} + except OSError: + pass + with open(SHARED + ".tmp", "w") as f: + f.write("".join(f"{name}\n" for name in sorted(shared | set(names)))) + os.replace(SHARED + ".tmp", SHARED) + files = set() + try: + with open(SHARED_FILES, encoding="utf-8", errors="surrogateescape") as f: + files = {line.rstrip("\n") for line in f if line.strip()} + except OSError: + pass + with open(SHARED_FILES + ".tmp", "w", encoding="utf-8", errors="surrogateescape") as f: + f.write("".join(f"{path}\n" for path in sorted(files | set(paths)))) + os.replace(SHARED_FILES + ".tmp", SHARED_FILES) + print(f":: Other DroidDeck software already installed {len(paths)} files from {' '.join(names)}.", file=sys.stderr) + print(":: pacman will take them over and keep these packages installed so that software keeps working.", + file=sys.stderr) + for path in paths: + print(re.sub(r"([\\*?\[])", r"\\\1", path)) + return 0 + + +if __name__ == "__main__": + try: + sys.exit(main()) + except (OSError, tarfile.TarError) as e: + print(f"error: could not check for files other DroidDeck software installed: {e}", file=sys.stderr) + sys.exit(1) diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook new file mode 120000 index 000000000..dc1dc0cde --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook new file mode 100644 index 000000000..0469fefc2 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook @@ -0,0 +1,11 @@ +[Trigger] +Operation = Install +Operation = Upgrade +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Remembering the packages you installed... +When = PostTransaction +Exec = /usr/share/droiddeck/pacman/remember diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook new file mode 100644 index 000000000..05254db4e --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook @@ -0,0 +1,9 @@ +[Trigger] +Operation = Upgrade +Type = Package +Target = * + +[Action] +Description = Putting back files other DroidDeck software needs... +When = PostTransaction +Exec = /usr/share/droiddeck/pacman/keep restore diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook new file mode 100644 index 000000000..5b7b5d48f --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook @@ -0,0 +1,9 @@ +[Trigger] +Operation = Upgrade +Type = Package +Target = * + +[Action] +Description = Saving files other DroidDeck software needs... +When = PreTransaction +Exec = /usr/share/droiddeck/pacman/keep save diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook new file mode 100644 index 000000000..917ec2220 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook @@ -0,0 +1,11 @@ +[Trigger] +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Checking for files other DroidDeck software needs... +When = PreTransaction +Exec = /usr/share/droiddeck/pacman/shared +NeedsTargets +AbortOnFail diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep new file mode 100755 index 000000000..23117fe3e --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep @@ -0,0 +1,26 @@ +#!/bin/bash +list=/var/lib/pacman/droiddeck-shared-files +store=/var/lib/pacman/droiddeck-shared-keep +[ -s "$list" ] || exit 0 +case $1 in + save) + mkdir -p "$store" + while IFS= read -r path; do + [ -e "$path" ] || [ -L "$path" ] || continue + mkdir -p "$store${path%/*}" + rm -f -- "$store$path" + cp -a -- "$path" "$store$path" + done < "$list" + ;; + restore) + [ -d "$store" ] || exit 0 + while IFS= read -r path; do + [ -e "$path" ] || [ -L "$path" ] && continue + [ -e "$store$path" ] || [ -L "$store$path" ] || continue + mkdir -p "${path%/*}" + cp -a -- "$store$path" "$path" + done < "$list" + rm -rf -- /var/lib/pacman/droiddeck-shared-keep + ;; +esac +exit 0 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare new file mode 100755 index 000000000..5923ce87e --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +import hashlib +import os +import shutil +import sys + +SHARE = "/usr/share/droiddeck/pacman" +LIB = "/var/lib/pacman" +STATE = os.path.join(LIB, "droiddeck-desktop") + + +def digest(path): + with open(path, "rb") as f: + return hashlib.sha256(f.read()).hexdigest() + + +def main(): + for path in ("/var/cache/pacman/pkg", os.path.join(LIB, "sync"), "/etc/pacman.d/hooks", "/var/log"): + os.makedirs(path, exist_ok=True) + stamp = digest(os.path.join(SHARE, "desktop-packages.txt")) + " " + digest(os.path.join(SHARE, "droiddeck.db")) + try: + with open(STATE) as f: + if f.read().strip() == stamp: + return 0 + except OSError: + pass + want = dict(line.split() for line in open(os.path.join(SHARE, "desktop-packages.txt")) if line.strip()) + local = os.path.join(LIB, "local") + for entry in os.listdir(local): + desc = os.path.join(local, entry, "desc") + if not os.path.isfile(desc): + continue + name = version = None + with open(desc, encoding="utf-8", errors="replace") as f: + lines = f.read().split("\n") + for i, line in enumerate(lines[:-1]): + if line == "%NAME%": + name = lines[i + 1] + elif line == "%VERSION%": + version = lines[i + 1] + if name in want and version != want[name]: + shutil.rmtree(os.path.join(local, entry)) + shutil.copyfile(os.path.join(SHARE, "droiddeck.db"), os.path.join(LIB, "sync", "droiddeck.db")) + with open(STATE + ".tmp", "w") as f: + f.write(stamp + "\n") + os.replace(STATE + ".tmp", STATE) + return 0 + + +if __name__ == "__main__": + try: + sys.exit(main()) + except OSError as e: + print(f"error: could not prepare pacman's database: {e}", file=sys.stderr) + sys.exit(1) diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse new file mode 100755 index 000000000..b19dccaf8 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse @@ -0,0 +1,5 @@ +#!/bin/bash +packages=$(tr '\n' ' ') +echo "error: ${packages% } came with DroidDeck, so pacman can't remove or replace it." >&2 +echo "error: DroidDeck updates these itself; packages you installed with pacman are yours to change." >&2 +exit 1 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember new file mode 100755 index 000000000..d798211a8 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember @@ -0,0 +1,15 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +state=/root/.local/share/droiddeck/pacman +mkdir -p "$state" +if [ -z "${DROIDDECK_PACMAN_RESTORING:-}" ] && explicit=$(/usr/bin/pacman --config "$dir/pacman.conf" -Qqe 2>/dev/null); then + printf '%s\n' "$explicit" | grep -vxF -f "$dir/system-packages.txt" > "$state/packages.txt.tmp" + if [ $? -le 1 ] && [ -f "$state/packages.txt.tmp" ]; then + mv -f "$state/packages.txt.tmp" "$state/packages.txt" + else + rm -f "$state/packages.txt.tmp" + fi +fi +[ -s "$state/restored" ] || sha256sum "$dir/droiddeck.db" | cut -d' ' -f1 > "$state/restored" +rm -f /var/cache/pacman/pkg/*.pkg.tar.* /var/cache/pacman/pkg/*.pkg.tar.*.sig 2>/dev/null +exit 0 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore new file mode 100755 index 000000000..a1e6331af --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore @@ -0,0 +1,37 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +state=/root/.local/share/droiddeck/pacman +list=$state/packages.txt +log=/root/.cache/droiddeck/pacman-restore.log +[ -s "$list" ] && [ -r "$dir/pacman.conf" ] || exit 0 +pacman() { /usr/local/bin/pacman "$@"; } +"$dir/prepare" || exit 0 +snapshot=$(sha256sum "$dir/droiddeck.db" | cut -d' ' -f1) +mapfile -t missing < <(grep -vxF -f <(pacman -Qq 2>/dev/null) "$list") +done_for=$(cat "$state/restored" 2>/dev/null) +[ ${#missing[@]} -eq 0 ] && [ "$done_for" = "$snapshot" ] && exit 0 +attempt="$snapshot ${missing[*]}" +[ "$(cat "$state/attempted" 2>/dev/null)" = "$attempt" ] && exit 0 +tries=$(cat "$state/tries" 2>/dev/null) +count=0 +[ "${tries#* }" = "$attempt" ] && count=${tries%% *} +count=$((count + 1)) +echo "$count $attempt" > "$state/tries" +[ "$count" -ge 3 ] && echo "$attempt" > "$state/attempted" +export DROIDDECK_PACMAN_RESTORING=1 +mkdir -p "${log%/*}" +notify() { notify-send -a DroidDeck -i system-software-update "$@" 2>/dev/null; } +notify "Restoring your packages" "Reinstalling software you added with pacman after a DroidDeck update." +export LD_PRELOAD="/usr/lib/droiddeck/libdroiddeck-root.so${LD_PRELOAD:+:$LD_PRELOAD}" +{ + date + ok=1 + [ "$done_for" = "$snapshot" ] || pacman -Su --noconfirm || ok=0 + [ ${#missing[@]} -eq 0 ] || pacman -S --needed --noconfirm "${missing[@]}" || ok=0 +} >> "$log" 2>&1 +if [ "$ok" = 1 ]; then + echo "$snapshot" > "$state/restored" + notify "Packages restored" "Your pacman packages are installed again." +else + notify "Some packages couldn't be restored" "See $log, then try sudo pacman -S in Konsole." +fi diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared new file mode 100755 index 000000000..1cd211ba2 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared @@ -0,0 +1,7 @@ +#!/bin/bash +list=/var/lib/pacman/droiddeck-shared +[ -s "$list" ] || exit 0 +mapfile -t packages < <(grep -xF -f "$list") +[ ${#packages[@]} -eq 0 ] && exit 0 +echo "error: ${packages[*]} shares files with other DroidDeck software, so pacman can't remove it." >&2 +exit 1 diff --git a/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE index a806a082e..12938c69a 100644 --- a/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE +++ b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE @@ -8,8 +8,8 @@ Third-party files in DroidDeck's KDE desktop package (tools/desktop-kde/overlay) - steam.svg: Papirus icon theme (https://github.com/PapirusDevelopmentTeam/papirus-icon-theme), GPL-3.0. -- kwin_wayland: KWin 6.8.0, GPL-2.0-or-later. Built with DroidDeck's nested desktop scale patch. - Corresponding source: https://download.kde.org/stable/plasma/6.8.0/kwin-6.8.0.tar.xz and +- kwin_wayland: KWin 6.8.2, GPL-2.0-or-later. Built with DroidDeck's nested desktop scale patch. + Corresponding source: https://download.kde.org/stable/plasma/6.8.2/kwin-6.8.2.tar.xz and https://github.com/Droid-Deck/DroidDeck/tree/fix/kde-desktop-followups/tools/desktop-kde/patches (the source and patch hashes are recorded in desktop-kde.kwin.txt beside the package). diff --git a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js index e27c370d3..7598c22ab 100644 --- a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +++ b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -14,6 +14,14 @@ kickoff.currentConfigGroup = ["Shortcuts"]; kickoff.writeConfig("global", "Alt+F1"); kickoff.currentConfigGroup = ["General"]; kickoff.writeConfig("icon", "distributor-logo-steamdeck"); +kickoff.writeConfig("favorites", [ + "preferred://browser", + "applications:org.kde.dolphin.desktop", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", + "applications:org.kde.discover.desktop", + "applications:systemsettings.desktop", +]); panel.addWidget("org.kde.plasma.pager"); @@ -24,6 +32,7 @@ tasks.writeConfig("launchers", [ "preferred://filemanager", "preferred://browser", "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", ]); panel.addWidget("org.kde.plasma.marginsseparator"); diff --git a/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js b/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js new file mode 100644 index 000000000..ee5384608 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js @@ -0,0 +1,11 @@ +panels().forEach(function (panel) { + panel.widgets("org.kde.plasma.icontasks").forEach(function (tasks) { + tasks.currentConfigGroup = ["General"]; + var launchers = tasks.readConfig("launchers"); + if (typeof launchers === "string") launchers = launchers.length ? launchers.split(",") : []; + if (launchers.indexOf("applications:org.kde.kate.desktop") < 0) { + launchers.push("applications:org.kde.kate.desktop"); + tasks.writeConfig("launchers", launchers); + } + }); +}); diff --git a/tools/desktop-kde/pacman-db.py b/tools/desktop-kde/pacman-db.py new file mode 100755 index 000000000..ce2282e76 --- /dev/null +++ b/tools/desktop-kde/pacman-db.py @@ -0,0 +1,258 @@ +#!/usr/bin/env python3 +import base64 +import hashlib +import io +import os +import re +import subprocess +import sys +import tarfile +import time + +REPOS = ("core", "extra", "alarm") +FIELDS = ("NAME", "VERSION", "BASE", "DESC", "URL", "ARCH", "BUILDDATE", "INSTALLDATE", "PACKAGER", "SIZE", + "GROUPS", "LICENSE", "VALIDATION", "REPLACES", "DEPENDS", "OPTDEPENDS", "CONFLICTS", "PROVIDES", "XDATA") +PKGINFO = {"pkgname": "NAME", "pkgbase": "BASE", "pkgver": "VERSION", "pkgdesc": "DESC", "url": "URL", + "builddate": "BUILDDATE", "packager": "PACKAGER", "size": "SIZE", "arch": "ARCH", "license": "LICENSE", + "replaces": "REPLACES", "group": "GROUPS", "conflict": "CONFLICTS", "provides": "PROVIDES", + "depend": "DEPENDS", "optdepend": "OPTDEPENDS", "xdata": "XDATA"} +BLOCKED = re.compile(r"^(sudo|opendoas|doas|mkinitcpio.*|linux|linux-.*|.*-firmware|firmware-.*|grub|uboot-.*|" + r"raspberrypi-.*|archlinuxarm-keyring|pacman|pacman-mirrorlist)$") +ALARM = "http://mirror.archlinuxarm.org/aarch64" +RELEASES = "https://github.com/Droid-Deck/DroidDeck-Components/releases/download" +BUILDER = "68B3537F39A313B3E574D06777193F152BDBE6A6" + + +def read_entry(path): + fields, key = {}, None + for name in ("desc", "depends"): + file = os.path.join(path, name) + if not os.path.exists(file): + continue + for line in open(file, encoding="utf-8", errors="replace"): + line = line.rstrip("\n") + if line.startswith("%") and line.endswith("%") and len(line) > 2: + key = line.strip("%") + fields[key] = [] + elif line == "": + key = None + elif key: + fields[key].append(line) + return fields + + +def write_fields(fields, order): + out = [] + for key in order: + values = fields.get(key) + if values: + out.append("%" + key + "%\n" + "".join(v + "\n" for v in values)) + return "\n".join(out) + + +def dep_name(dep): + return re.split(r"[<>=]", dep, maxsplit=1)[0] + + +def asset_name(name): + return re.sub(r"[^A-Za-z0-9._-]", ".", name) + + +def package_members(path): + if path.endswith(".zst"): + data = subprocess.run(["zstd", "-dc", path], check=True, stdout=subprocess.PIPE).stdout + return tarfile.open(fileobj=io.BytesIO(data), mode="r:") + return tarfile.open(path) + + +def local_record(path, installed): + with package_members(path) as tar: + info, mtree, install, files = None, None, None, [] + for member in tar: + name = member.name.removeprefix("./") + if name == ".PKGINFO": + info = tar.extractfile(member).read().decode("utf-8", "replace") + elif name == ".MTREE": + mtree = tar.extractfile(member).read() + elif name == ".INSTALL": + install = tar.extractfile(member).read() + elif name in (".BUILDINFO", ".CHANGELOG") or not name: + continue + else: + files.append(name.rstrip("/") + ("/" if member.isdir() else "")) + if info is None or mtree is None: + raise SystemExit(f"{path}: no .PKGINFO or .MTREE") + fields, backup = {}, [] + for line in info.splitlines(): + if " = " not in line or line.startswith("#"): + continue + key, value = line.split(" = ", 1) + if key == "backup": + backup.append(value) + elif key in PKGINFO: + fields.setdefault(PKGINFO[key], []).append(value) + fields["INSTALLDATE"] = [str(installed)] + fields["VALIDATION"] = ["pgp"] + for dir_ in sorted({f.rsplit("/", 1)[0] + "/" for f in files if "/" in f.rstrip("/")}): + parts = dir_.rstrip("/").split("/") + for i in range(1, len(parts) + 1): + entry = "/".join(parts[:i]) + "/" + if entry not in files: + files.append(entry) + sums = {} + if backup: + with package_members(path) as tar: + for member in tar: + name = member.name.removeprefix("./") + if name in backup and member.isfile(): + sums[name] = hashlib.md5(tar.extractfile(member).read()).hexdigest() + listing = "%FILES%\n" + "".join(f + "\n" for f in sorted(set(files))) + if backup: + listing += "\n%BACKUP%\n" + "".join(f"{b}\t{sums.get(b, '')}\n" for b in backup) + return fields, listing, mtree, install + + +def fetch(dest, *urls): + for url in urls: + if subprocess.run(["curl", "-fsSL", "--retry", "6", "--retry-delay", "5", "--retry-all-errors", + "-o", dest, url]).returncode == 0: + return + raise SystemExit(f"could not download {os.path.basename(dest)}") + + +def main(): + dbdir, cache, pkglist, runtime_file, mirror_file, tag, root, repo = sys.argv[1:9] + here = os.path.dirname(os.path.abspath(__file__)) + installed = int(os.environ.get("SOURCE_DATE_EPOCH", time.time())) + + entries = {} + for source, path in [("extra", os.path.join(here, "pins"))] + [(r, os.path.join(dbdir, "x_" + r)) for r in REPOS]: + for entry in sorted(os.listdir(path)): + fields = read_entry(os.path.join(path, entry)) + name = fields.get("NAME", [None])[0] + if name and name not in entries: + entries[name] = (source, fields) + by_file = {fields["FILENAME"][0]: name for name, (_, fields) in entries.items()} + + runtime = dict(line.split() for line in open(runtime_file) if len(line.split()) == 2) + shipped = {} + for line in open(pkglist): + file = line.split()[0].split("/", 1)[1] + shipped[by_file[file]] = file + + local = os.path.join(root, "var/lib/pacman/local") + os.makedirs(local, exist_ok=True) + for name, file in sorted(shipped.items()): + fields, listing, mtree, install = local_record(os.path.join(cache, file), installed) + if fields["NAME"][0] != name: + raise SystemExit(f"{file}: .PKGINFO names {fields['NAME'][0]}, not {name}") + record = os.path.join(local, f"{name}-{fields['VERSION'][0]}") + os.makedirs(record, exist_ok=True) + with open(os.path.join(record, "desc"), "w") as out: + out.write(write_fields(fields, FIELDS)) + with open(os.path.join(record, "files"), "w") as out: + out.write(listing) + with open(os.path.join(record, "mtree"), "wb") as out: + out.write(mtree) + if install: + with open(os.path.join(record, "install"), "wb") as out: + out.write(install) + + system = set(runtime) | set(shipped) + available = {n for n in entries if not BLOCKED.match(n)} | system + providers = {} + for name in available: + if name in entries: + for p in entries[name][1].get("PROVIDES", []): + providers.setdefault(dep_name(p), name) + satisfied = set(system) + for name in system: + if name in entries: + satisfied.update(dep_name(p) for p in entries[name][1].get("PROVIDES", [])) + + wanted = [l.strip() for l in open(mirror_file) if l.strip() and not l.startswith("#")] + mirrored, queue = set(), list(wanted) + while queue: + dep = dep_name(queue.pop()) + if dep in satisfied: + continue + name = dep if dep in available and dep in entries else providers.get(dep) + if name is None: + raise SystemExit(f"mirror.txt: nothing in the repository provides {dep}") + if name in mirrored or name in system: + continue + mirrored.add(name) + queue.extend(entries[name][1].get("DEPENDS", [])) + + os.makedirs(repo, exist_ok=True) + for name in sorted(mirrored): + source, fields = entries[name] + file = fields["FILENAME"][0] + dest = os.path.join(repo, asset_name(file)) + if not os.path.exists(dest) or hashlib.sha256(open(dest, "rb").read()).hexdigest() != fields["SHA256SUM"][0]: + fetch(dest, f"{ALARM}/{source}/{file}") + if hashlib.sha256(open(dest, "rb").read()).hexdigest() != fields["SHA256SUM"][0]: + raise SystemExit(f"{file}: sha256 differs from the repository database's") + signature = fields.get("PGPSIG", [None])[0] + sig = dest + ".sig" + if signature: + with open(sig, "wb") as out: + out.write(base64.b64decode(signature)) + else: + fetch(sig, f"{ALARM}/{source}/{file}.sig") + check = subprocess.run(["gpgv", "--status-fd", "1", "--keyring", os.path.join(here, "archlinuxarm-builder.gpg"), + sig, dest], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True).stdout + if not re.search(rf"^\[GNUPG:\] VALIDSIG .* {BUILDER}$", check, re.M): + raise SystemExit(f"{file}: no valid Arch Linux ARM Build System signature") + if not signature: + fields["PGPSIG"] = [base64.b64encode(open(sig, "rb").read()).decode()] + os.remove(sig) + print(f"pacman: {len(shipped)} install records, {len(mirrored)} mirrored packages, " + f"{sum(os.path.getsize(os.path.join(repo, asset_name(entries[n][1]['FILENAME'][0]))) for n in mirrored) // 1048576} MiB") + + order = ["FILENAME", "NAME", "BASE", "VERSION", "DESC", "GROUPS", "CSIZE", "ISIZE", "MD5SUM", "SHA256SUM", "PGPSIG", + "URL", "LICENSE", "ARCH", "BUILDDATE", "PACKAGER", "REPLACES", "CONFLICTS", "PROVIDES", "DEPENDS", + "OPTDEPENDS", "MAKEDEPENDS", "CHECKDEPENDS", "XDATA"] + buffer = io.BytesIO() + with tarfile.open(fileobj=buffer, mode="w:gz", format=tarfile.GNU_FORMAT) as db: + for name in sorted(available): + if name in entries and (name not in runtime or name in shipped or runtime[name] == entries[name][1]["VERSION"][0]): + fields = dict(entries[name][1]) + else: + fields = {"FILENAME": [f"{name}-{runtime[name]}-aarch64.pkg.tar.xz"], "NAME": [name], + "VERSION": [runtime[name]], "ARCH": ["aarch64"]} + if name in mirrored: + fields["FILENAME"] = [asset_name(fields["FILENAME"][0])] + data = write_fields(fields, order).encode() + folder = f"{name}-{fields['VERSION'][0]}" + info = tarfile.TarInfo(folder) + info.type, info.mode, info.mtime = tarfile.DIRTYPE, 0o755, installed + db.addfile(info) + info = tarfile.TarInfo(folder + "/desc") + info.size, info.mode, info.mtime = len(data), 0o644, installed + db.addfile(info, io.BytesIO(data)) + with open(os.path.join(repo, "droiddeck.db"), "wb") as out: + out.write(buffer.getvalue()) + + share = os.path.join(root, "usr/share/droiddeck/pacman") + os.makedirs(os.path.join(share, "hooks"), exist_ok=True) + with open(os.path.join(share, "droiddeck.db"), "wb") as out: + out.write(buffer.getvalue()) + with open(os.path.join(share, "system-packages.txt"), "w") as out: + out.write("".join(n + "\n" for n in sorted(system))) + with open(os.path.join(share, "desktop-packages.txt"), "w") as out: + out.write("".join(f"{n} {entries[n][1]['VERSION'][0]}\n" for n in sorted(shipped))) + with open(os.path.join(share, "hooks", "droiddeck-system.hook"), "w") as out: + out.write("[Trigger]\nOperation = Upgrade\nOperation = Remove\nType = Package\n") + out.write("".join(f"Target = {n}\n" for n in sorted(system))) + out.write("\n[Action]\nDescription = Keeping the packages DroidDeck installed...\nWhen = PreTransaction\n" + "Exec = /usr/share/droiddeck/pacman/refuse\nNeedsTargets\nAbortOnFail\n") + server = f"{RELEASES}/{tag}" if tag else f"{RELEASES}/unpublished" + template = open(os.path.join(here, "pacman.conf.in")).read() + with open(os.path.join(share, "pacman.conf"), "w") as out: + out.write(template.replace("@SERVER@", server).replace("@ALARM@", ALARM)) + print(f"pacman: repository {server}, {len(available)} packages ({len(system)} installed by DroidDeck)") + + +if __name__ == "__main__": + main() diff --git a/tools/desktop-kde/pacman.conf.in b/tools/desktop-kde/pacman.conf.in new file mode 100644 index 000000000..f4cc4ca54 --- /dev/null +++ b/tools/desktop-kde/pacman.conf.in @@ -0,0 +1,22 @@ +[options] +RootDir = / +DBPath = /var/lib/pacman/ +CacheDir = /var/cache/pacman/pkg/ +LogFile = /var/log/pacman.log +GPGDir = /etc/pacman.d/gnupg/ +HookDir = /etc/pacman.d/hooks/ +HookDir = /usr/share/droiddeck/pacman/hooks/ +HoldPkg = pacman glibc +Architecture = aarch64 +Color +ParallelDownloads = 4 +DisableSandbox +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +NoExtract = usr/share/doc/* usr/share/gtk-doc/* usr/share/help/* + +[droiddeck] +Server = @SERVER@ +CacheServer = @ALARM@/extra +CacheServer = @ALARM@/core +CacheServer = @ALARM@/alarm diff --git a/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch b/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch index 369ce1a56..8c0b8cccb 100644 --- a/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch +++ b/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch @@ -1,13 +1,12 @@ --- a/src/backends/wayland/wayland_backend.cpp +++ b/src/backends/wayland/wayland_backend.cpp -@@ -455,6 +455,20 @@ +@@ -455,6 +455,19 @@ if (WaylandClient::LinuxDmabufV1 *dmabuf = m_display->linuxDmabuf()) { m_renderDevice = GpuManager::self()->compatibleRenderDevice(dmabuf->mainDevice()); + if (!m_renderDevice && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { + const auto nodes = GpuManager::splitPathList(qEnvironmentVariable("KWIN_RENDER_NODES")); + const auto &devices = GpuManager::self()->renderDevices(); -+ // Android's KGSL host cannot name a DRM device in its dmabuf feedback. + if (nodes.size() == 1) { + for (const auto &device : devices) { + if (device->path() == nodes.constFirst()) { diff --git a/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch b/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch new file mode 100644 index 000000000..28036135a --- /dev/null +++ b/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch @@ -0,0 +1,67 @@ +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -30,6 +30,9 @@ + + #include <QAbstractEventDispatcher> + ++#include <array> ++#include <memory> ++ + #include <drm_fourcc.h> + #include <fcntl.h> + #include <gbm.h> +@@ -124,8 +127,31 @@ + } + Q_EMIT pointerButtonChanged(button, state, std::chrono::milliseconds(time), this); + }); +- // TODO: Send discreteDelta and source as well. +- connect(pointer, &Pointer::axisChanged, this, [this](quint32 time, Pointer::Axis nativeAxis, qreal delta) { ++ auto axisSource = std::make_shared<PointerAxisSource>(PointerAxisSource::Unknown); ++ auto axisDiscrete = std::make_shared<std::array<qint32, 2>>(); ++ connect(pointer, &Pointer::axisSourceChanged, this, [axisSource](Pointer::AxisSource source) { ++ switch (source) { ++ case Pointer::AxisSource::Wheel: ++ *axisSource = PointerAxisSource::Wheel; ++ break; ++ case Pointer::AxisSource::Finger: ++ *axisSource = PointerAxisSource::Finger; ++ break; ++ case Pointer::AxisSource::Continuous: ++ *axisSource = PointerAxisSource::Continuous; ++ break; ++ case Pointer::AxisSource::WheelTilt: ++ *axisSource = PointerAxisSource::WheelTilt; ++ break; ++ default: ++ *axisSource = PointerAxisSource::Unknown; ++ break; ++ } ++ }); ++ connect(pointer, &Pointer::axisDiscreteChanged, this, [axisDiscrete](Pointer::Axis nativeAxis, qint32 discreteDelta) { ++ (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1] = discreteDelta * 120; ++ }); ++ connect(pointer, &Pointer::axisChanged, this, [this, axisSource, axisDiscrete](quint32 time, Pointer::Axis nativeAxis, qreal delta) { + PointerAxis axis; + switch (nativeAxis) { + case Pointer::Axis::Horizontal: +@@ -137,10 +163,18 @@ + default: + Q_UNREACHABLE(); + } +- Q_EMIT pointerAxisChanged(axis, delta, 0, PointerAxisSource::Unknown, false, false, std::chrono::milliseconds(time), this); ++ qint32 &discrete = (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1]; ++ Q_EMIT pointerAxisChanged(axis, delta, discrete, *axisSource, false, false, std::chrono::milliseconds(time), this); ++ discrete = 0; ++ }); ++ connect(pointer, &Pointer::axisStopped, this, [this, axisSource](quint32 time, Pointer::Axis nativeAxis) { ++ const PointerAxis axis = nativeAxis == Pointer::Axis::Vertical ? PointerAxis::Vertical : PointerAxis::Horizontal; ++ Q_EMIT pointerAxisChanged(axis, 0, 0, *axisSource, false, false, std::chrono::milliseconds(time), this); + }); + +- connect(pointer, &Pointer::frame, this, [this]() { ++ connect(pointer, &Pointer::frame, this, [this, axisSource, axisDiscrete]() { ++ *axisSource = PointerAxisSource::Unknown; ++ axisDiscrete->fill(0); + Q_EMIT pointerFrame(this); + }); + diff --git a/tools/desktop-kde/release.env b/tools/desktop-kde/release.env index 7151b3326..ae32a2d18 100644 --- a/tools/desktop-kde/release.env +++ b/tools/desktop-kde/release.env @@ -1,4 +1,4 @@ DESKTOP_KDE_REPO=Droid-Deck/DroidDeck-Components -DESKTOP_KDE_TAG=desktop-kde-r2 -DESKTOP_KDE_SHA256=9ba832677b498654136c69d8c8330434d17e4d53cd099acac9bde3ba429b35bf -DESKTOP_KDE_SIZE=846933224 +DESKTOP_KDE_TAG=desktop-kde-r3 +DESKTOP_KDE_SHA256=8b7142fcec8d86143ae39fc14ffc86907d30d9a5b5a45f49cb1b55109d6fc4eb +DESKTOP_KDE_SIZE=972598429 diff --git a/tools/desktop-kde/removal-manifests.py b/tools/desktop-kde/removal-manifests.py index 9c909dc84..1e9079697 100644 --- a/tools/desktop-kde/removal-manifests.py +++ b/tools/desktop-kde/removal-manifests.py @@ -1,14 +1,4 @@ #!/usr/bin/env python3 -"""Generate removal inventories from checksum-pinned published archives. - -Usage: removal-manifests.py <LXQt tar.zst> <KDE r1 tar.zst> <KDE r2 tar.zst> - <emulators tar.zst> <verified KDE package cache> <output dir> - <verified LXQt package cache> -Removal includes desktop applications/themes and our overlay, not their shared dependencies. -The KDE cache is verified against the published desktop-kde.packages.txt before use. -The LXQt cache contains the signed application packages listed by desktop.packages.txt; -verify their Arch Linux ARM Build System signatures before generating the inventory. -""" import gzip import hashlib import json @@ -63,10 +53,7 @@ def write(out, name, records): gz.write(('\n'.join(sorted(set(records))) + '\n').encode()) -def main(): - archives = [pathlib.Path(p) for p in sys.argv[1:5]] - cache, out, legacy_cache = map(pathlib.Path, sys.argv[5:8]) - here = pathlib.Path(__file__).resolve().parent +def application_paths(here, cache): seeds = {line.strip() for line in (here / 'seeds.txt').read_text().splitlines() if line.strip() and not line.startswith('#')} - SHARED_SEEDS packages = dict(line.split() for line in (cache / 'desktop-kde.packages.txt').read_text().splitlines()) selected = set() @@ -79,10 +66,39 @@ def main(): if sha(archive) != digest: raise ValueError(f'{filename}: source package checksum mismatch') with tarfile.open(archive) as tar: - selected.update(e.name.removeprefix('./').rstrip('/') for e in tar if not e.isdir()) + selected.update(e.name.removeprefix('./').rstrip('/') for e in tar if not e.isdir() and not e.name.removeprefix('./').startswith('.')) found.add(package) assert found == seeds, f'missing desktop packages: {seeds - found}' - selected.update(str(p.relative_to(here / 'overlay')) for p in (here / 'overlay').rglob('*') if p.is_file()) + selected.update(str(p.relative_to(here / 'overlay')) for p in (here / 'overlay').rglob('*') if p.is_file() or p.is_symlink()) + return selected, packages, seeds + + +def add(archive, tag, digest, cache, out): + here = pathlib.Path(__file__).resolve().parent + selected, packages, seeds = application_paths(here, cache) + inv = inventory(archive, digest) + generated = ('usr/share/droiddeck/pacman/', 'usr/lib/droiddeck/') + remove = gzip.decompress((out / 'kde-remove.tsv.gzip').read_bytes()).decode().splitlines() + keep = gzip.decompress((out / 'kde-keep.txt.gzip').read_bytes()).decode().splitlines() + remove += [record for path, record in inv.items() if path in selected or path.startswith(generated)] + keep += list(inv) + write(out, 'kde-remove.tsv.gzip', remove) + write(out, 'kde-keep.txt.gzip', keep) + versions = (out / 'versions.txt').read_text().split() + (out / 'versions.txt').write_text('\n'.join(dict.fromkeys(versions + [tag])) + '\n') + sources = json.loads((out / 'sources.json').read_text()) + sources['archives'][tag] = digest + sources['desktopApplications'] = {n: h for n, h in packages.items() if n.rsplit('-', 3)[0] in seeds} + (out / 'sources.json').write_text(json.dumps(sources, indent=2) + '\n') + print(tag, digest) + print('KDE removable paths', sum(path in selected or path.startswith(generated) for path in inv)) + + +def main(): + archives = [pathlib.Path(p) for p in sys.argv[1:5]] + cache, out, legacy_cache = map(pathlib.Path, sys.argv[5:8]) + here = pathlib.Path(__file__).resolve().parent + selected, packages, seeds = application_paths(here, cache) inventories = [inventory(p, pin[1]) for p, pin in zip(archives, PINS)] out.mkdir(parents=True, exist_ok=True) legacy_seeds = {line.strip() for line in (here / 'lxqt-applications.txt').read_text().splitlines() @@ -115,4 +131,7 @@ def main(): if __name__ == '__main__': - main() + if sys.argv[1:2] == ['--add']: + add(pathlib.Path(sys.argv[2]), sys.argv[3], sys.argv[4], pathlib.Path(sys.argv[5]), pathlib.Path(sys.argv[6])) + else: + main() diff --git a/tools/desktop-kde/root/root.c b/tools/desktop-kde/root/root.c new file mode 100644 index 000000000..33c63271a --- /dev/null +++ b/tools/desktop-kde/root/root.c @@ -0,0 +1,190 @@ +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <grp.h> +#include <pwd.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <unistd.h> + +#define REAL(name) static __typeof__(name) *real_##name; if (!real_##name) real_##name = dlsym(RTLD_NEXT, #name) + +static uid_t real_uid(void) { return (uid_t)syscall(SYS_getuid); } +static gid_t real_gid(void) { return (gid_t)syscall(SYS_getgid); } + +uid_t getuid(void) { return 0; } +uid_t geteuid(void) { return 0; } +gid_t getgid(void) { return 0; } +gid_t getegid(void) { return 0; } + +int getresuid(uid_t *r, uid_t *e, uid_t *s) { + if (r) *r = 0; + if (e) *e = 0; + if (s) *s = 0; + return 0; +} + +int getresgid(gid_t *r, gid_t *e, gid_t *s) { + if (r) *r = 0; + if (e) *e = 0; + if (s) *s = 0; + return 0; +} + +int setuid(uid_t u) { (void)u; return 0; } +int seteuid(uid_t u) { (void)u; return 0; } +int setgid(gid_t g) { (void)g; return 0; } +int setegid(gid_t g) { (void)g; return 0; } +int setreuid(uid_t r, uid_t e) { (void)r; (void)e; return 0; } +int setregid(gid_t r, gid_t e) { (void)r; (void)e; return 0; } +int setresuid(uid_t r, uid_t e, uid_t s) { (void)r; (void)e; (void)s; return 0; } +int setresgid(gid_t r, gid_t e, gid_t s) { (void)r; (void)e; (void)s; return 0; } +int setgroups(size_t n, const gid_t *list) { (void)n; (void)list; return 0; } +int initgroups(const char *user, gid_t group) { (void)user; (void)group; return 0; } + +static int owner_result(int rc) { + if (rc != 0 && (errno == EPERM || errno == EINVAL)) { + errno = 0; + return 0; + } + return rc; +} + +int chown(const char *path, uid_t u, gid_t g) { + REAL(chown); + return owner_result(real_chown(path, u, g)); +} + +int lchown(const char *path, uid_t u, gid_t g) { + REAL(lchown); + return owner_result(real_lchown(path, u, g)); +} + +int fchown(int fd, uid_t u, gid_t g) { + REAL(fchown); + return owner_result(real_fchown(fd, u, g)); +} + +int fchownat(int dirfd, const char *path, uid_t u, gid_t g, int flags) { + REAL(fchownat); + return owner_result(real_fchownat(dirfd, path, u, g, flags)); +} + +static struct passwd *as_root_user(struct passwd *pw) { + if (pw && pw->pw_uid == real_uid()) { + pw->pw_uid = 0; + pw->pw_gid = 0; + } + return pw; +} + +static struct group *as_root_group(struct group *gr) { + if (gr && gr->gr_gid == real_gid()) gr->gr_gid = 0; + return gr; +} + +struct passwd *getpwuid(uid_t uid) { + REAL(getpwuid); + return as_root_user(real_getpwuid(uid == 0 ? real_uid() : uid)); +} + +struct passwd *getpwnam(const char *name) { + REAL(getpwnam); + return as_root_user(real_getpwnam(name)); +} + +struct passwd *getpwent(void) { + REAL(getpwent); + return as_root_user(real_getpwent()); +} + +int getpwuid_r(uid_t uid, struct passwd *pw, char *buf, size_t len, struct passwd **out) { + REAL(getpwuid_r); + int rc = real_getpwuid_r(uid == 0 ? real_uid() : uid, pw, buf, len, out); + if (rc == 0) as_root_user(*out); + return rc; +} + +int getpwnam_r(const char *name, struct passwd *pw, char *buf, size_t len, struct passwd **out) { + REAL(getpwnam_r); + int rc = real_getpwnam_r(name, pw, buf, len, out); + if (rc == 0) as_root_user(*out); + return rc; +} + +struct group *getgrgid(gid_t gid) { + REAL(getgrgid); + return as_root_group(real_getgrgid(gid == 0 ? real_gid() : gid)); +} + +struct group *getgrnam(const char *name) { + REAL(getgrnam); + return as_root_group(real_getgrnam(name)); +} + +int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t len, struct group **out) { + REAL(getgrgid_r); + int rc = real_getgrgid_r(gid == 0 ? real_gid() : gid, gr, buf, len, out); + if (rc == 0) as_root_group(*out); + return rc; +} + +int getgrnam_r(const char *name, struct group *gr, char *buf, size_t len, struct group **out) { + REAL(getgrnam_r); + int rc = real_getgrnam_r(name, gr, buf, len, out); + if (rc == 0) as_root_group(*out); + return rc; +} + +static int shown_mode(int rc, struct stat *st) { + if (rc == 0 && S_ISDIR(st->st_mode) && (st->st_mode & 0777) == 0700) st->st_mode = (st->st_mode & ~0777) | 0755; + return rc; +} + +int stat(const char *path, struct stat *st) { + REAL(stat); + return shown_mode(real_stat(path, st), st); +} + +int lstat(const char *path, struct stat *st) { + REAL(lstat); + return shown_mode(real_lstat(path, st), st); +} + +int fstat(int fd, struct stat *st) { + REAL(fstat); + return shown_mode(real_fstat(fd, st), st); +} + +int fstatat(int dirfd, const char *path, struct stat *st, int flags) { + REAL(fstatat); + return shown_mode(real_fstatat(dirfd, path, st, flags), st); +} + +int statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *st) { + REAL(statx); + int rc = real_statx(dirfd, path, flags, mask, st); + if (rc == 0 && S_ISDIR(st->stx_mode) && (st->stx_mode & 0777) == 0700) st->stx_mode = (st->stx_mode & ~0777) | 0755; + return rc; +} + +int stat64(const char *path, struct stat64 *st) { + REAL(stat64); + return shown_mode(real_stat64(path, st), (struct stat *)st); +} + +int lstat64(const char *path, struct stat64 *st) { + REAL(lstat64); + return shown_mode(real_lstat64(path, st), (struct stat *)st); +} + +int fstat64(int fd, struct stat64 *st) { + REAL(fstat64); + return shown_mode(real_fstat64(fd, st), (struct stat *)st); +} + +int fstatat64(int dirfd, const char *path, struct stat64 *st, int flags) { + REAL(fstatat64); + return shown_mode(real_fstatat64(dirfd, path, st, flags), (struct stat *)st); +} diff --git a/tools/desktop-kde/seeds.txt b/tools/desktop-kde/seeds.txt index ed61bd8ee..a920f9700 100644 --- a/tools/desktop-kde/seeds.txt +++ b/tools/desktop-kde/seeds.txt @@ -26,3 +26,23 @@ noto-fonts-emoji xdg-utils firefox mpv +zip +unzip +7zip +unrar +less +man-db +man-pages +htop +wl-clipboard +xclip +git +wget +kcalc +okular +filelight +kfind +plasma-systemmonitor +elisa +discover +flatpak-kcm diff --git a/tools/device-smoke.sh b/tools/device-smoke.sh index bec8fed81..479088937 100755 --- a/tools/device-smoke.sh +++ b/tools/device-smoke.sh @@ -1,26 +1,31 @@ #!/usr/bin/env bash -# Smoke test of a DroidDeck build on a real device, over plain adb (no python, no root). -# -# What it does, in order, and restores afterwards: -# 1. prints the device (model, Android, kernel, page size, SoC); -# 2. installs --apk when given and launches the app; -# 3. checks that the app starts and that nothing in the crash buffer belongs to it; -# 4. changes the display density and the window size and checks the app keeps its process -# (and does not recreate the activity that is on top); -# 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. -# -# Usage: tools/device-smoke.sh [--serial SERIAL] [--apk FILE] [--pkg PACKAGE] -# [--no-density] [--no-size] [--no-fold] [--closed] -# Exit status: 0 when no check failed, 1 when one did, 2 for a usage or device problem. -# -# Not a replacement for tools/droiddeck-scenario, which drives a game through the agent bridge; -# this covers what that does not: display changes and foldable states. set -u export MSYS_NO_PATHCONV=1 MSYS2_ARG_CONV_EXCL='*' +usage() { + cat <<'EOF' +Smoke test of a DroidDeck build on a real device, over plain adb (no python, no root). + +What it does, in order, and restores afterwards: + 1. prints the device (model, Android, kernel, page size, SoC); + 2. installs --apk when given and launches the app; + 3. checks that the app starts and that nothing in the crash buffer belongs to it; + 4. changes the display density and the window size and checks the app keeps its process + (and does not recreate the activity that is on top); + 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, 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] +Exit status: 0 when no check failed, 1 when one did, 2 for a usage or device problem. + +Not a replacement for tools/droiddeck-scenario, which drives a game through the agent bridge; +this covers what that does not: display changes and foldable states. +EOF +} + pkg=com.droiddeck.launcher serial=${ANDROID_SERIAL:-} apk= @@ -39,7 +44,7 @@ while [ $# -gt 0 ]; do --no-size) do_size=0 ;; --no-fold) do_fold=0 ;; --closed) do_closed=1 ;; - -h|--help) sed -n '2,22p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + -h|--help) usage; exit 0 ;; *) echo "unknown option: $1" >&2; exit 2 ;; esac shift @@ -96,7 +101,6 @@ restore_size() { echo "$current" | grep -q 'Physical size:' || return 1 [ "$(echo "$current" | wm_override size)" = "$override_size" ] } -# An override that was already in place (a test lab pins one) is put back; otherwise the request is cancelled. restore_fold() { if [ -n "$pre_override" ]; then sh_ cmd device_state state "$pre_override" >/dev/null; else sh_ cmd device_state state reset >/dev/null; fi; } restore() { @@ -133,7 +137,7 @@ app_crashes() { pat=$(printf '%s' "$pkg" | sed 's/[.[\*^$]/\\&/g') printf '%s\n' "$out" | grep -c -E "(Process: |Cmdline: |>>> )$pat([ ,<:]|$)" || true } -relaunches_of() { # $1 = activity class fragment +relaunches_of() { sh_ logcat -b events -d 2>/dev/null | grep -E 'wm_(relaunch|destroy|create)_activity' | grep -c "$1" } @@ -214,7 +218,7 @@ if [ "$do_size" = 1 ]; then phys=$(echo "$size_snapshot" | sed -n 's/.*Physical size: \([0-9]*\)x\([0-9]*\).*/\1 \2/p' | head -1) set -- $phys if [ -n "${1:-}" ]; then - w=$(( ($2 * 2 / 3) / 2 * 2 )); h=$1 # a narrower, taller window, like a cover screen + w=$(( ($2 * 2 / 3) / 2 * 2 )); h=$1 pid0=$(app_pid) size_changed=1 wm_status=0 @@ -250,7 +254,7 @@ if [ "$do_fold" = 1 ]; then else id_of() { echo "$states" | sed -n "s/.*identifier=\([0-9]*\), name='$1'.*/\1/p" | head -1; } half=$(id_of HALF_OPENED); closed=$(id_of CLOSED) - cycle() { # $1 name $2 id + cycle() { pid0=$(app_pid) fold_changed=1 sh_ cmd device_state state "$2" >/dev/null; sleep 8 @@ -279,6 +283,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 000000000..59c071616 --- /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 af886304f..116a98a1c 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) @@ -15,7 +15,7 @@ fetch() { local name=$1 sha=$2 kept="${cache}/$2-$1" part if ! echo "${sha} ${kept}" | sha256sum -c - >/dev/null 2>&1; then part=$(mktemp "${kept}.part.XXXXXX") - curl -fsSL --retry 3 -o "${part}" \ + curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o "${part}" \ "https://github.com/${DIRECTAUDIO_REPO}/releases/download/${DIRECTAUDIO_TAG}/${name}" echo "${sha} ${part}" | sha256sum -c - >/dev/null || { echo "${name}: checksum mismatch" >&2; rm -f "${part}"; exit 1; } mv "${part}" "${kept}" @@ -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 5 --retry-all-errors --connect-timeout 20 -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 000000000..22af228c0 --- /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 5e052f0bb..95359b3ae 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/da_relay_proto.h b/tools/directaudio/sink/da_relay_proto.h index 351cdfb60..2207ae929 100644 --- a/tools/directaudio/sink/da_relay_proto.h +++ b/tools/directaudio/sink/da_relay_proto.h @@ -1,49 +1,10 @@ -/* DirectAudio relay - the contract between the driver and the relay helper. - * +/* * Copyright 2026 The412Banner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * - * WHY THIS EXISTS. The driver's whole premise is an in-process AAudio client: - * the guest's WASAPI buffers are mixed and handed to Android's audio server - * from inside the game, no daemon in the path. That is only possible when the - * game process is a bionic process. Under a glibc runtime (the Linux Steam - * client, where the game runs inside a proot'd Arch rootfs on Valve's own - * ARM64 Proton) libaaudio cannot be loaded at all: it is a bionic library and - * the rootfs's dynamic linker does not know how to bring it into a glibc - * process. The game side therefore has to stop at a boundary it CAN cross, and - * the only thing both worlds agree on is the kernel: a unix socket, a memfd and - * a futex word. - * - * SHAPE. One helper process (directaudio-relay, bionic, links libaaudio) runs - * on the Android side and listens on a unix socket. Each game process that - * needs audio connects once, sends its launch config (the same knobs the - * in-process build reads from BANNER_AUDIO_DIRECT_*), and gets back one or two - * shared rings (memfds passed with SCM_RIGHTS): - * - * render ring game (producer) -> helper (consumer) -> AAudio OUTPUT - * capture ring helper (producer, AAudio INPUT) -> game (consumer) - * - * The driver keeps its mixer and its per-voice WASAPI rings exactly as in the - * in-process build; what used to be the AAudio data callback is now a pump - * thread that keeps the render ring topped up, and the capture callback is a - * pump that drains the capture ring into the capture voices. Everything that - * needs an AAudioStream (open, adaptive buffer growth and decay, route-change - * reopen, the stalled-callback watchdog, the live-config mailbox) moves to the - * helper unchanged in spirit. - * - * COST. One extra hand-off: the ring. The helper's callback pulls a burst from - * the ring, so the ring must hold at least one burst at every callback; the - * driver keeps DA_RING_TARGET_BURSTS bursts queued and the helper raises that - * target when a callback finds the ring short. Everything else - the AAudio - * buffer, AudioFlinger's own latency - is what the in-process build pays too. - * - * WIRE FORMAT. Fixed-width, native-endian, same-machine only. The two sides are - * different libcs but the same CPU, so no marshalling beyond fixed-size structs. - * Bump DA_RELAY_VERSION on any layout change; the helper refuses a mismatch. */ #ifndef DA_RELAY_PROTO_H #define DA_RELAY_PROTO_H @@ -52,34 +13,20 @@ #include <stddef.h> #define DA_RELAY_VERSION 1 -#define DA_RING_MAGIC 0x44415247u /* 'DARG' */ -#define DA_HELLO_MAGIC 0x44414831u /* 'DAH1' */ -#define DA_ACK_MAGIC 0x44414131u /* 'DAA1' */ +#define DA_RING_MAGIC 0x44415247u +#define DA_HELLO_MAGIC 0x44414831u +#define DA_ACK_MAGIC 0x44414131u -/* Socket path. The driver reads BANNER_AUDIO_DIRECT_RELAY; when unset it falls - * back to $XDG_RUNTIME_DIR/DA_RELAY_DEFAULT_NAME, which a host that already - * hands its runtime dir into the session gets for free. */ #define DA_RELAY_ENV "BANNER_AUDIO_DIRECT_RELAY" #define DA_RELAY_DEFAULT_NAME "directaudio-relay" -/* Both rings carry float32 interleaved stereo. The render ring is always - * 48 kHz (the mixer's output rate); the capture ring runs at whatever rate the - * input stream was granted, published in da_ring.rate, and the driver resamples - * per voice as the in-process build already does. */ #define DA_RING_RATE 48000 #define DA_RING_CHANNELS 2 -/* Render ring sizing. Capacity is the ceiling adaptive growth can reach; the - * initial target is what the driver keeps queued. Two bursts: the helper's - * callback consumes one burst and wakes the pump, which then has a full burst - * period to refill before the next callback. */ #define DA_RING_CAP_MS 250 #define DA_RING_TARGET_BURSTS 2 #define DA_RING_MAX_TARGET_MS 100 -/* Capture ring: 200 ms is far more than a game ever leaves queued; on overrun - * the helper drops the newest block, matching the in-process "guest is not - * draining" behaviour of dropping data rather than blocking the mic thread. */ #define DA_CAPTURE_RING_MS 200 enum da_ring_state @@ -93,35 +40,27 @@ struct da_ring { uint32_t magic; uint32_t version; - uint32_t cap_frames; /* ring capacity in frames */ - uint32_t rate; /* frames per second of the data in this ring */ - uint32_t channels; /* DA_RING_CHANNELS */ + uint32_t cap_frames; + uint32_t rate; + uint32_t channels; uint32_t _pad0; - /* Single producer, single consumer; monotonic frame totals, wrap-safe with - * unsigned arithmetic. Producer writes widx with RELEASE after the data; - * consumer writes ridx with RELEASE after it has copied the data out. */ volatile uint32_t widx; volatile uint32_t ridx; - /* Futex word the CONSUMER of a render ring / PRODUCER of a capture ring - * bumps after each block, so the other side can sleep on it instead of - * polling. Waiters always use a timeout, so a missed wake only costs one - * period. */ volatile uint32_t wake; - volatile uint32_t quit; /* either side: tear down */ - volatile uint32_t state; /* enum da_ring_state, helper-owned */ + volatile uint32_t quit; + volatile uint32_t state; - /* Render ring only, helper-owned, read by the driver: */ - volatile int32_t target_frames; /* keep at least this many queued */ - volatile int32_t hw_buf_frames; /* AAudio buffer size right now (get_latency) */ - volatile int32_t hw_burst; /* frames per burst of the output stream */ - volatile uint32_t underruns; /* callbacks that found fewer than they needed */ - volatile uint32_t cb_count; /* data callbacks so far (liveness) */ + volatile int32_t target_frames; + volatile int32_t hw_buf_frames; + volatile int32_t hw_burst; + volatile uint32_t underruns; + volatile uint32_t cb_count; uint32_t _pad1[3]; - float data[]; /* cap_frames * channels */ + float data[]; }; static inline size_t da_ring_bytes(uint32_t cap_frames) @@ -141,62 +80,52 @@ static inline uint32_t da_ring_space(const struct da_ring *r) return r->cap_frames - da_ring_avail(r); } -/* ---- wire messages ------------------------------------------------------- */ - -#define DA_HELLO_MIC 0x01u /* also open an INPUT stream + capture ring */ -#define DA_HELLO_EXCLUSIVE 0x02u /* AAUDIO_SHARING_MODE_EXCLUSIVE requested */ +#define DA_HELLO_MIC 0x01u +#define DA_HELLO_EXCLUSIVE 0x02u #define DA_HELLO_ADAPTIVE 0x04u #define DA_HELLO_DECAY 0x08u #define DA_HELLO_WATCHDOG 0x10u -/* First message on a fresh connection, driver -> helper. Mirrors the launch - * config the in-process build derives from BANNER_AUDIO_DIRECT_* so a preset - * means the same thing under both runtimes. */ struct da_hello { - uint32_t magic; /* DA_HELLO_MAGIC */ - uint32_t version; /* DA_RELAY_VERSION */ - uint32_t flags; /* DA_HELLO_* */ - int32_t perf; /* 0 NONE, 1 LOW_LATENCY, 2 POWER_SAVING (host convention) */ - int32_t target_ms; /* AAudio buffer, ms; 0 = use target_frames or the default */ - int32_t max_ms; /* adaptive ceiling, ms; 0 = max_frames or the default */ - int32_t target_frames; /* frame forms, used only when the ms forms are 0 */ + uint32_t magic; + uint32_t version; + uint32_t flags; + int32_t perf; + int32_t target_ms; + int32_t max_ms; + int32_t target_frames; int32_t max_frames; - uint32_t stall_ms; /* watchdog: callback silent this long => rebuild */ - uint32_t quiet_ms; /* decay pacing, see the driver */ + uint32_t stall_ms; + uint32_t quiet_ms; uint32_t punish_ms; uint32_t max_backoff; - int32_t pid; /* the game process, for the log */ - uint32_t log; /* BANNER_AUDIO_DIRECT_LOG */ - char runtime_path[256]; /* BANNER_AUDIO_DIRECT_RUNTIME mailbox, "" = none */ - char name[64]; /* process name, for the log */ + int32_t pid; + uint32_t log; + char runtime_path[256]; + char name[64]; }; -#define DA_ACK_MIC_FAILED 0x01u /* mic asked for, input stream would not open */ +#define DA_ACK_MIC_FAILED 0x01u -/* Reply, helper -> driver, followed by SCM_RIGHTS carrying the ring fds: - * fd[0] = render ring, fd[1] = capture ring (present iff in_cap_frames > 0). */ struct da_ack { - uint32_t magic; /* DA_ACK_MAGIC */ - int32_t status; /* 0 = ok, else an AAudio error code (negative) */ - int32_t rate; /* output stream rate (48000) */ - int32_t burst; /* output frames per burst */ - int32_t buf_frames; /* output buffer size as opened */ - int32_t out_cap_frames; /* render ring capacity */ - int32_t in_cap_frames; /* capture ring capacity, 0 = no capture ring */ - int32_t in_rate; /* rate of the capture ring's data */ - uint32_t flags; /* DA_ACK_* */ + uint32_t magic; + int32_t status; + int32_t rate; + int32_t burst; + int32_t buf_frames; + int32_t out_cap_frames; + int32_t in_cap_frames; + int32_t in_rate; + uint32_t flags; uint32_t _pad; }; -/* Subsequent messages, driver -> helper, on the same socket. The helper never - * writes after the ack; everything it has to say is in the ring header. EOF on - * the socket is how the helper learns the game is gone. */ enum da_msg_type { - DA_MSG_MIC_START = 1, /* first capture voice started: make the mic hot */ - DA_MSG_MIC_STOP = 2, /* last capture voice gone: stop (keep open) */ + DA_MSG_MIC_START = 1, + DA_MSG_MIC_STOP = 2, DA_MSG_PING = 3, }; @@ -206,4 +135,4 @@ struct da_msg int32_t arg; }; -#endif /* DA_RELAY_PROTO_H */ +#endif diff --git a/tools/directaudio/sink/module-directaudio-native-sink.c b/tools/directaudio/sink/module-directaudio-native-sink.c index ca3eb01cc..3311fe0ed 100644 --- a/tools/directaudio/sink/module-directaudio-native-sink.c +++ b/tools/directaudio/sink/module-directaudio-native-sink.c @@ -1,24 +1,5 @@ /* - * module-directaudio-native-sink: a PulseAudio 13 sink that is DirectAudio's AAudio engine, - * in-process. For the native Linux Steam client on Android (DroidDeck, Bannerlator's Linux - * session), whose sound can only ever reach a PulseAudio daemon: this module is where that - * daemon's mixed output meets Android, one step away from AudioFlinger, with the same engine the - * game driver has - adaptive device buffer that grows a burst on every xrun, optional decay with a - * remembered floor, a primed ring with fades instead of clicks, route-change / error reopen on a - * fresh stream, and a stall watchdog. - * - * It is the relay helper's per-client OUTPUT engine (directaudio-relay.c) with the socket and the - * shared-memory ring replaced by a ring in this process, fed by the sink's IO thread exactly as - * module-directaudio-sink feeds the relay. Compared with that module there is no second process - * and no 40 ms proot safety margin: the ring here only has to cover the IO thread's own - * scheduling jitter, so it starts at two bursts and grows only if a callback finds it short. - * - * The daemon must run on the Android side (the host app's process), not inside proot, for AAudio - * to be reachable at all - which is where both host apps already run it. - * - * Field fixes carried from the relay (MaxsTechReview, Droid-Deck/DroidDeck#338): prime before - * playing, fade on an underrun, one consumer per ring across a reopen, a device buffer of at - * least two bursts. + * Derived from the AAudio engine of DirectAudio's relay helper (directaudio-relay.c) by The412Banner. * * SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -52,13 +33,14 @@ #include <pulsecore/thread-mq.h> #include <pulsecore/thread.h> -#include "da_relay_proto.h" /* struct da_ring + the ring helpers; nothing of the socket protocol */ +#include "da_relay_proto.h" PA_MODULE_AUTHOR("The412Banner"); PA_MODULE_DESCRIPTION("Android audio output: DirectAudio's AAudio engine, in-process"); 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> " @@ -76,7 +58,6 @@ PA_MODULE_USAGE( #define WATCHDOG_TICK_USEC (1 * PA_USEC_PER_SEC) #define AUDIO_NICE (-16) -/* ---- tunables: the in-process driver's, same defaults ----------------------- */ #define DA_KNEE 0.75f #define DA_DEFAULT_MS 12 #define DA_DEFAULT_MAX_MS 100 @@ -91,11 +72,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; @@ -107,17 +92,14 @@ struct userdata { pa_sample_spec ss; size_t frame_size; - /* configuration */ aaudio_performance_mode_t perf; int32_t target_ms, max_ms, ring_ms; bool adaptive, decay, limiter, watchdog_on; - /* the ring: this process's, same layout as the relay's so the engine is shared */ struct da_ring *ring; int32_t burst; int32_t ring_max_target; - /* the one OUTPUT stream and its adaptive state (the relay's struct client, minus the socket) */ AAudioStream *aq; pthread_mutex_t lock; int32_t last_xrun; @@ -129,13 +111,15 @@ struct userdata { int suspended; volatile int dead; - /* what the IO thread last logged, so engine changes made on the AAudio thread get a line */ int32_t seen_target, seen_hw_buf; uint32_t seen_underruns; pa_usec_t next_watchdog, settled_at, stats_at; unsigned int opens; }; +#include "../../aaudio-sink/android-volume.h" + + static uint64_t now_ns(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -144,8 +128,6 @@ static uint64_t now_ns(void) { static void request_reopen(struct userdata *u, const char *why); -/* ---- the engine: the relay's out_cb / open_output / reopen / watchdog, on a local ring ---- */ - static void fade(float *p, uint32_t frames, int in) { uint32_t i, ch; @@ -157,8 +139,6 @@ static void fade(float *p, uint32_t frames, int in) { } } -/* The driver's soft-knee limiter: below DA_KNEE the signal is untouched, so ordinary material is - * bit-identical; above it a smooth knee folds the overshoot back under full scale. */ static void limit(float *p, uint32_t samples) { uint32_t i; @@ -185,7 +165,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * int fade_in = 0, short_read = 0, starving = 0; uint64_t now; - /* Only the promoted stream reads the ring; an outgoing one during a reopen plays silence. */ if ((live && aq != live) || __atomic_exchange_n(&u->consuming, 1, __ATOMIC_ACQUIRE)) { memset(out, 0, (size_t) frames * DA_RING_CHANNELS * sizeof(float)); return AAUDIO_CALLBACK_RESULT_CONTINUE; @@ -240,8 +219,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * __atomic_add_fetch(&u->cb_count, 1, __ATOMIC_SEQ_CST); __atomic_store_n(&r->cb_count, u->cb_count, __ATOMIC_RELAXED); - /* The ring's own adaptive step: a short ring means the IO thread did not get scheduled in - * time - an xrun one stage earlier - so keep one more burst queued. Only grows. */ if (short_read) __atomic_add_fetch(&r->underruns, 1, __ATOMIC_RELAXED); if ((short_read || starving) && u->adaptive) { @@ -254,8 +231,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * __atomic_store_n(&r->target_frames, want, __ATOMIC_RELEASE); } - /* The device buffer: grow a burst per xrun; decay a burst after a quiet spell, never below - * the floor a punished decay taught us. */ if (u->adaptive) { int32_t xruns = AAudioStream_getXRunCount(aq); int32_t burst = AAudioStream_getFramesPerBurst(aq); @@ -304,8 +279,6 @@ static void out_error_cb(AAudioStream *aq, void *user, aaudio_result_t error) { if (aq != __atomic_load_n(&u->aq, __ATOMIC_SEQ_CST)) return; if (__atomic_load_n(&u->suspended, __ATOMIC_SEQ_CST)) return; - /* A disconnected stream (headphones plugged or unplugged, a Bluetooth route coming or going) - * can never be restarted: it has to be closed and a new one opened on the current route. */ if (error != AAUDIO_ERROR_DISCONNECTED && error != AAUDIO_ERROR_INVALID_STATE && error != AAUDIO_ERROR_INVALID_HANDLE && @@ -314,8 +287,6 @@ static void out_error_cb(AAudioStream *aq, void *user, aaudio_result_t error) { request_reopen(u, "stream error"); } -/* 48 kHz / float / stereo, buffer from the ms form rounded up to a burst and never below two, - * capacity from the ceiling. The ring target floor is two bursts or ring_ms, whichever is more. */ static aaudio_result_t open_output(struct userdata *u, AAudioStream **out) { AAudioStreamBuilder *builder = NULL; AAudioStream *aq = NULL; @@ -438,7 +409,6 @@ static void request_reopen(struct userdata *u, const char *why) { } } -/* Ticked once a second from the IO thread: a callback silent for a second is a dead stream. */ static void watchdog(struct userdata *u) { uint64_t now = now_ns(), last_cb, prev_tick; unsigned int cb; @@ -476,13 +446,10 @@ static void close_output(struct userdata *u) { AAudioStream_requestStop(aq); AAudioStream_close(aq); } - /* A reopen still in flight sees u->dead and stops; give it a moment to let go of u. */ while (__atomic_load_n(&u->reopen_running, __ATOMIC_SEQ_CST)) usleep(10000); } -/* ---- the PulseAudio side: module-directaudio-sink's producer, on the local ring ---- */ - 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); } @@ -520,7 +487,6 @@ static void produce(struct userdata *u, uint32_t frames) { __atomic_store_n(&r->widx, w + frames, __ATOMIC_RELEASE); } -/* Tops the ring up to the engine's target and narrates what the engine changed. */ static void service_ring(struct userdata *u) { struct da_ring *r = u->ring; uint32_t avail, space; @@ -579,8 +545,6 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse return pa_sink_process_msg(o, code, data, offset, chunk); } -/* A started AAudio stream keeps audioserver's AudioMix wake lock held, so the device never - * suspends while the session sleeps: stop it, and the IO thread's timer, until the sink reopens. */ static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state, pa_suspend_cause_t new_suspend_cause) { struct userdata *u = s->userdata; aaudio_result_t res = AAUDIO_OK; @@ -621,9 +585,6 @@ static void thread_func(void *userdata) { for (;;) { int ret; - /* Half a burst between visits, never blocking on the stream: clients' audio reaches this - * thread as messages pa_rtpoll_run handles, and a thread stuck in a write or a wait lets - * them run dry (the crackle #338 fixed). */ if (!u->suspended) { service_ring(u); pa_rtpoll_set_timer_relative(u->rtpoll, PA_MAX(frames_to_usec(u, u->burst) / 2, PA_USEC_PER_MSEC)); @@ -711,7 +672,6 @@ int pa__init(pa_module *m) { pthread_mutex_init(&u->lock, NULL); pa_channel_map_init_stereo(&map); - /* The ring: the relay's layout in this process's memory. */ cap_frames = DA_RING_CAP_MS_LOCAL * DA_RING_RATE / 1000; u->ring = pa_xmalloc0(da_ring_bytes(cap_frames)); u->ring->magic = DA_RING_MAGIC; @@ -766,14 +726,13 @@ int pa__init(pa_module *m) { pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_max_request(u->sink, (size_t) u->ring->target_frames * u->frame_size); - /* What clients should keep queued on their side: the ring's starting target plus the device - * buffer. Grows are reported live through GET_LATENCY. */ pa_sink_set_fixed_latency(u->sink, frames_to_usec(u, (int64_t) u->ring->target_frames + u->base_buf_frames)); if (!(u->thread = pa_thread_new("directaudio-native-sink", thread_func, u))) { 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 +758,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/dirt-ws2/README.md b/tools/dirt-ws2/README.md new file mode 100644 index 000000000..14f02478f --- /dev/null +++ b/tools/dirt-ws2/README.md @@ -0,0 +1,19 @@ +# DiRT 3 / DiRT Showdown ws2_32 stand-in + +DiRT 3 (`dirt3_game.exe`) and DiRT Showdown (`showdown.exe`, `showdown_avx.exe`) close their motion telemetry UDP +socket at the end of a race, and when leaving Joyride, but keep calling `sendto()` on it. `sendto()` fails with +WSAENOTSOCK and the game stops with "sendto failed with error 10038". The same happens on Windows. + +`ws2_32.dll` here is a 32-bit stand-in: every export jumps to the same-ordinal export of Wine's own `ws2_32.dll`; +only a `sendto()` that fails with 10038 reports 0 bytes sent instead. Same behaviour as +[DiRTTelemetryErrorFix](https://github.com/RoccoC/DiRTTelemetryErrorFix) by RoccoC (MIT), based on the original fix +by Carsten Gottschling. + +Wine loads `ws2_32` as a KnownDLL, so a copy beside the game is ignored. `droiddeck-game-env` puts the stand-in in +place of the prefix's `syswow64/ws2_32.dll` for these games while their telemetry output is on, adds +`WINEDLLOVERRIDES=ws2_32=n,b`, and puts Wine's file back when the game exits. It skips the swap when the game's +Proton already has the fix in its own `ws2_32.dll` (DroidDeck-Proton patch +`dirt-telemetry-sendto-closed-socket.patch`). + +`build.sh OUT` builds it with clang, lld and llvm-dlltool and checks its exports against `ws2_32-exports.txt` +(taken from Wine 11's `ws2_32.dll`). diff --git a/tools/dirt-ws2/build.sh b/tools/dirt-ws2/build.sh new file mode 100755 index 000000000..67a1b3be0 --- /dev/null +++ b/tools/dirt-ws2/build.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +mkdir -p "$1" +out=$(cd "$1" && pwd) +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT + +tool() { + local found + found=$(command -v "$1" || ls /usr/lib/llvm-*/bin/"$1" 2>/dev/null | sort -V | tail -n1 || true) + [ -n "$found" ] || { echo "dirt-ws2: $1 not found" >&2; exit 1; } + echo "$found" +} +clang=$(tool clang) +dlltool=$(tool llvm-dlltool) +tool ld.lld > /dev/null + +python3 "$here/gen.py" generate "$here" "$work" +"$dlltool" -m i386 -k -d "$here/kernel32.def" -l "$work/libkernel32.a" +"$clang" --target=i686-w64-mingw32 -O2 -Wall -Wextra -Werror -ffreestanding -fno-stack-protector -fno-builtin \ + -nostdlib -shared -fuse-ld=lld -o "$work/ws2_32.dll" "$here/ws2_32.c" "$work/thunks.c" "$work/ws2_32.def" \ + -L"$work" -lkernel32 -Wl,--entry,DllMain@12 -Wl,--no-insert-timestamp +python3 "$here/gen.py" verify "$here" "$work/ws2_32.dll" +install -m 644 "$work/ws2_32.dll" "$out/ws2_32.dll" diff --git a/tools/dirt-ws2/gen.py b/tools/dirt-ws2/gen.py new file mode 100644 index 000000000..02743506f --- /dev/null +++ b/tools/dirt-ws2/gen.py @@ -0,0 +1,69 @@ +import struct +import sys +from pathlib import Path + + +def exports_list(src): + rows = [] + for line in (Path(src) / 'ws2_32-exports.txt').read_text().splitlines(): + ordinal, name = line.split() + rows.append((int(ordinal), name)) + return rows + + +def generate(src, out): + rows = exports_list(src) + passed = [(o, n) for o, n in rows if n != 'sendto'] + c = ['/* Generated by tools/dirt-ws2/gen.py. */', + 'const unsigned short dirtfix_ordinals[%d] = {%s};' % (len(passed), ', '.join(str(o) for o, _ in passed)), + 'const unsigned int dirtfix_count = %d;' % len(passed), + 'void *dirtfix_real[%d];' % len(passed), + '__asm__(".text\\n"'] + for i, (o, _) in enumerate(passed): + c.append(' ".globl _dirtfix_t%d\\n_dirtfix_t%d:\\n\\tjmp *_dirtfix_real+%d\\n"' % (o, o, 4 * i)) + c.append(');') + (Path(out) / 'thunks.c').write_text('\n'.join(c) + '\n') + d = ['LIBRARY ws2_32.dll', 'EXPORTS'] + d += [' %s=%s @%d' % (n, 'dirtfix_sendto@24' if n == 'sendto' else 'dirtfix_t%d' % o, o) for o, n in rows] + (Path(out) / 'ws2_32.def').write_text('\n'.join(d) + '\n') + + +def pe_exports(path): + data = Path(path).read_bytes() + pe = struct.unpack_from('<I', data, 0x3c)[0] + machine, sections = struct.unpack_from('<HH', data, pe + 4) + optional_size = struct.unpack_from('<H', data, pe + 20)[0] + optional = pe + 24 + export_rva = struct.unpack_from('<I', data, optional + 96)[0] + table = [struct.unpack_from('<IIII', data, optional + optional_size + 40 * i + 8) for i in range(sections)] + + def offset(rva): + for size, address, raw_size, raw in table: + if address <= rva < address + max(size, raw_size): + return rva - address + raw + raise ValueError('RVA %#x outside the sections' % rva) + + base, functions, names, function_rva, name_rva, ordinal_rva = struct.unpack_from('<IIIIII', data, offset(export_rva) + 16) + named = {} + for i in range(names): + text = struct.unpack_from('<I', data, offset(name_rva) + 4 * i)[0] + index = struct.unpack_from('<H', data, offset(ordinal_rva) + 2 * i)[0] + named[index] = data[offset(text):].split(b'\0')[0].decode() + result = [(base + i, named.get(i)) for i in range(functions) if struct.unpack_from('<I', data, offset(function_rva) + 4 * i)[0]] + return machine, result + + +def verify(src, dll): + machine, found = pe_exports(dll) + if machine != 0x14c: + sys.exit('%s is not a 32-bit x86 DLL (machine %#x)' % (dll, machine)) + expected = exports_list(src) + if found != expected: + sys.exit('%s exports differ from ws2_32-exports.txt: %d found, %d expected' % (dll, len(found), len(expected))) + if b'droiddeck-dirt-ws2_32' not in Path(dll).read_bytes(): + sys.exit('%s lacks the stand-in marker' % dll) + print('%s: %d exports match, marker present' % (dll, len(found))) + + +if __name__ == '__main__': + {'generate': generate, 'verify': verify}[sys.argv[1]](sys.argv[2], sys.argv[3]) diff --git a/tools/dirt-ws2/kernel32.def b/tools/dirt-ws2/kernel32.def new file mode 100644 index 000000000..edab13316 --- /dev/null +++ b/tools/dirt-ws2/kernel32.def @@ -0,0 +1,7 @@ +LIBRARY kernel32.dll +EXPORTS + LoadLibraryW@4 + GetProcAddress@8 + GetSystemDirectoryW@8 + GetEnvironmentVariableW@12 + GetFileAttributesW@4 diff --git a/tools/dirt-ws2/ws2_32-exports.txt b/tools/dirt-ws2/ws2_32-exports.txt new file mode 100644 index 000000000..e8e555589 --- /dev/null +++ b/tools/dirt-ws2/ws2_32-exports.txt @@ -0,0 +1,135 @@ +1 accept +2 bind +3 closesocket +4 connect +5 getpeername +6 getsockname +7 getsockopt +8 htonl +9 htons +10 ioctlsocket +11 inet_addr +12 inet_ntoa +13 listen +14 ntohl +15 ntohs +16 recv +17 recvfrom +18 select +19 send +20 sendto +21 setsockopt +22 shutdown +23 socket +24 FreeAddrInfoEx +25 FreeAddrInfoExW +26 FreeAddrInfoW +27 GetAddrInfoExCancel +28 GetAddrInfoExOverlappedResult +29 GetAddrInfoExW +30 GetAddrInfoW +31 GetHostNameW +32 GetNameInfoW +33 InetNtopW +34 InetPtonW +35 WSApSetPostRoutine +36 WPUCompleteOverlappedRequest +37 WSAAccept +38 WSAAddressToStringA +39 WSAAddressToStringW +40 WSACloseEvent +41 WSAConnect +42 WSAConnectByNameA +43 WSAConnectByNameW +44 WSACreateEvent +45 WSADuplicateSocketA +46 WSADuplicateSocketW +47 WSAEnumNameSpaceProvidersA +48 WSAEnumNameSpaceProvidersW +49 WSAEnumNetworkEvents +50 WSAEnumProtocolsA +51 gethostbyaddr +52 gethostbyname +53 getprotobyname +54 getprotobynumber +55 getservbyname +56 getservbyport +57 gethostname +58 WSAEnumProtocolsW +59 WSAEventSelect +60 WSAGetOverlappedResult +61 WSAGetQOSByName +62 WSAGetServiceClassInfoA +63 WSAGetServiceClassInfoW +64 WSAGetServiceClassNameByClassIdA +65 WSAGetServiceClassNameByClassIdW +66 WSAHtonl +67 WSAHtons +68 WSAInstallServiceClassA +69 WSAInstallServiceClassW +70 WSAIoctl +71 WSAJoinLeaf +72 WSALookupServiceBeginA +73 WSALookupServiceBeginW +74 WSALookupServiceEnd +75 WSALookupServiceNextA +76 WSALookupServiceNextW +77 WSANSPIoctl +78 WSANtohl +79 WSANtohs +80 WSAPoll +81 WSAProviderConfigChange +82 WSARecv +83 WSARecvDisconnect +84 WSARecvFrom +85 WSARemoveServiceClass +86 WSAResetEvent +87 WSASend +88 WSASendDisconnect +89 WSASendMsg +90 WSASendTo +91 WSASetEvent +92 WSASetServiceA +93 WSASetServiceW +94 WSASocketA +95 WSASocketW +96 WSAStringToAddressA +97 WSAStringToAddressW +98 WSAWaitForMultipleEvents +99 WSCDeinstallProvider +100 WSCEnableNSProvider +101 WSAAsyncSelect +102 WSAAsyncGetHostByAddr +103 WSAAsyncGetHostByName +104 WSAAsyncGetProtoByNumber +105 WSAAsyncGetProtoByName +106 WSAAsyncGetServByPort +107 WSAAsyncGetServByName +108 WSACancelAsyncRequest +109 WSASetBlockingHook +110 WSAUnhookBlockingHook +111 WSAGetLastError +112 WSASetLastError +113 WSACancelBlockingCall +114 WSAIsBlocking +115 WSAStartup +116 WSACleanup +117 WSCEnumProtocols +118 WSCEnumProtocols32 +119 WSCGetApplicationCategory +120 WSCGetProviderInfo +121 WSCGetProviderPath +122 WSCInstallNameSpace +123 WSCInstallProvider +124 WSCSetApplicationCategory +125 WSCUnInstallNameSpace +126 WSCUpdateProvider +127 WSCWriteNameSpaceOrder +128 WSCWriteProviderOrder +129 freeaddrinfo +130 getaddrinfo +131 getnameinfo +132 inet_ntop +133 inet_pton +151 __WSAFDIsSet +500 WEP diff --git a/tools/dirt-ws2/ws2_32.c b/tools/dirt-ws2/ws2_32.c new file mode 100644 index 000000000..fcad74b85 --- /dev/null +++ b/tools/dirt-ws2/ws2_32.c @@ -0,0 +1,95 @@ +/* Same behaviour as DiRTTelemetryErrorFix by RoccoC (MIT), based on the fix by Carsten Gottschling. */ + +typedef unsigned short WCHAR; +typedef unsigned long DWORD; +typedef unsigned int UINT; +typedef unsigned int UINT_PTR; +typedef int BOOL; +typedef void *HMODULE; +#define WINAPI __attribute__((stdcall)) +#define WSAENOTSOCK 10038 +#define ORDINAL(n) ((const char *)(UINT_PTR)(n)) + +__attribute__((dllimport)) HMODULE WINAPI LoadLibraryW(const WCHAR *name); +__attribute__((dllimport)) void *WINAPI GetProcAddress(HMODULE module, const char *name); +__attribute__((dllimport)) UINT WINAPI GetSystemDirectoryW(WCHAR *buffer, UINT size); +__attribute__((dllimport)) DWORD WINAPI GetEnvironmentVariableW(const WCHAR *name, WCHAR *buffer, DWORD size); +__attribute__((dllimport)) DWORD WINAPI GetFileAttributesW(const WCHAR *name); + +__attribute__((used)) const char dirtfix_marker[] = "droiddeck-dirt-ws2_32"; + +extern const unsigned short dirtfix_ordinals[]; +extern const unsigned int dirtfix_count; +extern void *dirtfix_real[]; + +static int (WINAPI *real_sendto)(UINT_PTR, const char *, int, int, const void *, int); +static int (WINAPI *real_WSAGetLastError)(void); +static void (WINAPI *real_WSASetLastError)(int); + +int WINAPI dirtfix_sendto(UINT_PTR s, const char *buf, int len, int flags, const void *to, int tolen) +{ + int ret = real_sendto(s, buf, len, flags, to, tolen); + if (ret == -1 && real_WSAGetLastError() == WSAENOTSOCK) + { + real_WSASetLastError(0); + return 0; + } + return ret; +} + +static void append(WCHAR *dst, const char *src) +{ + while (*dst) dst++; + while ((*dst++ = (WCHAR)(unsigned char)*src++)); +} + +static void append_number(WCHAR *dst, UINT n) +{ + char digits[12]; + int i = 11; + + digits[i] = 0; + do digits[--i] = (char)('0' + n % 10); while (n /= 10); + append(dst, digits + i); +} + +static HMODULE load_wine_ws2_32(HMODULE self) +{ + WCHAR name[24], path[600]; + HMODULE real; + UINT n, d; + + for (d = 0; d < 16; d++) + { + name[0] = 0; + append(name, "WINEDLLDIR"); + append_number(name, d); + n = GetEnvironmentVariableW(name, path, 500); + if (!n || n >= 500) continue; + if (path[0] == '\\' && path[1] == '?' && path[2] == '?' && path[3] == '\\') path[1] = '\\'; + append(path, "\\i386-windows\\ws2_32.dll"); + if (GetFileAttributesW(path) == (DWORD)-1) continue; + if ((real = LoadLibraryW(path)) && real != self) return real; + } + n = GetSystemDirectoryW(path, 280); + if (!n || n >= 280) return 0; + path[n] = 0; + append(path, "\\ws2_32.dll"); + real = LoadLibraryW(path); + return real != self ? real : 0; +} + +BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *reserved) +{ + HMODULE real; + UINT i; + + (void)reserved; + if (reason != 1) return 1; + if (!(real = load_wine_ws2_32(self))) return 0; + for (i = 0; i < dirtfix_count; i++) dirtfix_real[i] = GetProcAddress(real, ORDINAL(dirtfix_ordinals[i])); + real_sendto = GetProcAddress(real, ORDINAL(20)); + real_WSAGetLastError = GetProcAddress(real, ORDINAL(111)); + real_WSASetLastError = GetProcAddress(real, ORDINAL(112)); + return real_sendto && real_WSAGetLastError && real_WSASetLastError; +} diff --git a/tools/docker_platform.sh b/tools/docker_platform.sh new file mode 100644 index 000000000..4d4744875 --- /dev/null +++ b/tools/docker_platform.sh @@ -0,0 +1,10 @@ +docker_platform=${DROIDDECK_DOCKER_PLATFORM:-} +if [[ -z "${docker_platform}" ]]; then + case "$(uname -m)" in arm64|aarch64) docker_platform=linux/arm64 ;; *) docker_platform=linux/amd64 ;; esac +fi +case "${docker_platform}" in linux/arm64|linux/arm64/*) docker_platform=linux/arm64 ;; esac +if [[ -z "${DROIDDECK_BUILD_IMAGE:-}" ]]; then + DROIDDECK_BUILD_IMAGE=droiddeck-local-cross:24.04-v3 + [[ "${docker_platform}" == linux/arm64 ]] && DROIDDECK_BUILD_IMAGE+=-arm64 +fi +export DROIDDECK_DOCKER_PLATFORM=${docker_platform} DROIDDECK_BUILD_IMAGE diff --git a/tools/docker_preflight.py b/tools/docker_preflight.py index b4e923275..65322fd61 100644 --- a/tools/docker_preflight.py +++ b/tools/docker_preflight.py @@ -1,4 +1,4 @@ -"""Check the engine before modifying build assets; never rebuild for a daemon error.""" +import os from pathlib import Path import subprocess import sys @@ -17,8 +17,8 @@ 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: 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], + subprocess.run(['docker', 'build', '--platform', os.environ.get('DROIDDECK_DOCKER_PLATFORM', 'linux/amd64'), '-t', sys.argv[1], '-f', str(repo / 'tools/local-cross.Dockerfile'), str(repo)], check=True) diff --git a/tools/droiddeck-scenario b/tools/droiddeck-scenario index b4590b02f..8b238ef80 100755 --- a/tools/droiddeck-scenario +++ b/tools/droiddeck-scenario @@ -146,7 +146,6 @@ class Runner: log.append(entry) def evidence(self, folder: Path) -> dict: - """What a failed run leaves behind: the screen, gamescope's focus, the session's logs.""" found = {} for name, action in ( ("screenshot", lambda: ctl.screenshot(self.adb, self.serial, str(folder / "failure.png"), None)), diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 9544e65c7..95ebc5dbe 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -21,9 +21,9 @@ 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). PACKAGE = os.environ.get("DROIDDECK_PACKAGE", "com.droiddeck.launcher") AUTHORITY = f"content://{PACKAGE}.agent" PACKAGE_NAME = re.compile(r"[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+") @@ -37,6 +37,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 @@ -107,7 +114,6 @@ def provider_call(adb: str, serial: str, method: str, arg: str | None = None, re def checked(response: dict, default_code: str) -> dict: - """A provider or guest answer, raised as a ControlError when it carries ok: false.""" if response.get("ok") is False: error = response.get("error", {}) raise ControlError(error.get("message", default_code), error.get("code", default_code)) @@ -158,7 +164,6 @@ def get_state(adb: str, serial: str) -> dict: def wait_until(adb: str, serial: str, describe: str, done, timeout: float, poll: float = 1.0) -> dict: - """Poll state until done(state) is true. A failed session ends the wait at once.""" deadline = time.monotonic() + timeout while True: state = get_state(adb, serial) @@ -195,8 +200,6 @@ def wait_for_phase(adb: str, serial: str, wanted: str, timeout: float) -> dict: def focused(state: dict, app_id: int | None) -> bool: - """The game has focus the way a player sees it: gamescope focuses it and it is in the list the - Steam client orders the base layer from. app_id None means any game (not the client).""" focus = state.get("session", {}).get("focus") or {} current = focus.get("focusedApp") if app_id is None: @@ -224,7 +227,6 @@ def add_serial(response: dict, serial: str) -> dict: def displays(adb: str, serial: str) -> list[dict]: - """Logical displays with the SurfaceFlinger (physical) id screencap and screenrecord want.""" result = run_adb(adb, serial, "shell", "dumpsys", "display", timeout=30) text = result.stdout.decode(errors="replace") devices = dict(re.findall(r'DisplayDeviceInfo\{"([^"]+)": uniqueId="local:(\d+)"', text)) @@ -292,14 +294,6 @@ def record(adb: str, serial: str, path: str, seconds: float, display: int | None def pacing_summary(text: str, package: str = PACKAGE) -> dict: - """What reached the panel, from a `dumpsys SurfaceFlinger --timestats -dump`. - - The game is on the compositor's own layer (droiddeck_wayland_game) when it has one, otherwise on - the session's SurfaceView. SurfaceFlinger keeps one record per layer AND refresh rate, so a panel - that switches between 60 and 120 Hz mid-capture splits the same layer into several records: they - are summed. A game's own fps counter does not show any of this - it counts frames handed over, not - frames shown, and 60 handed over can be 48 on screen with one in four held for two refreshes. - """ records = {"game": [], "surface": []} for part in re.split(r"^displayRefreshRate = ", text, flags=re.M)[1:]: rate = re.match(r"(\d+)", part) @@ -321,7 +315,6 @@ def pacing_summary(text: str, package: str = PACKAGE) -> dict: for ms, count in bins.items(): histogram[ms] = histogram.get(ms, 0) + count if bins: - # SurfaceFlinger bins by whole milliseconds, so one cadence spans two buckets (16.7 ms: 16 and 17). mode = max(bins, key=bins.get) off += sum(count for ms, count in bins.items() if abs(ms - mode) > 1) intervals = sum(histogram.values()) @@ -338,7 +331,6 @@ def pacing_summary(text: str, package: str = PACKAGE) -> dict: def pacing(adb: str, serial: str, seconds: float) -> dict: - """Frames on screen and their intervals over `seconds`, from SurfaceFlinger's timestats.""" seconds = max(1.0, min(600.0, seconds)) timestats = ("shell", "dumpsys", "SurfaceFlinger", "--timestats") try: @@ -479,7 +471,6 @@ def xr_capture(adb: str, serial: str, destination: Path, timeout: float) -> dict except (OSError, EOFError, zlib.error) as error: raise ControlError('Incomplete compressed XR image', 'XR_CAPTURE_FAILED') from error images[eye] = xr_ppm_to_png(pixels, linear=eye == 'source' and metadata.get('sourceColorSpace') == 'linear') - # Detect overlapping captures before publishing images with another request's metadata. check = run_adb(adb, serial, 'shell', 'cat', remote + '.json') try: unchanged = json.loads(check.stdout).get('id') == token @@ -628,6 +619,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 +823,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 +842,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") @@ -939,8 +944,17 @@ def main(argv: list[str] | None = None) -> int: args = build_parser().parse_args(argv) serial = None try: - if not PACKAGE_NAME.fullmatch(PACKAGE): # it reaches the device shell through `am start` and `content call` + if not PACKAGE_NAME.fullmatch(PACKAGE): 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/build-in-arch.sh b/tools/fex/build-in-arch.sh index ce5f68ceb..66d2c2a4e 100755 --- a/tools/fex/build-in-arch.sh +++ b/tools/fex/build-in-arch.sh @@ -1,6 +1,4 @@ #!/usr/bin/bash -# Runs inside an Arch Linux ARM container (menci/archlinuxarm:base-devel) on an arm64 runner. Arch Linux ARM ships -# no FEX package and FEX publishes no Linux binaries. set -euxo pipefail VERSION=${FEX_VERSION:-FEX-2610} WORK=/work @@ -10,7 +8,6 @@ grep -q '^DisableSandbox' /etc/pacman.conf || sed -i 's/^\[options\]/[options]\n mv /etc/pacman.d/mirrorlist.new /etc/pacman.d/mirrorlist pacman -Syu --noconfirm --needed git zstd binutils cmake ninja clang lld llvm python squashfs-tools file patchelf xxhash -# The x86 sysroot is Arch x86_64 and multilib i686 packages unpacked by pacman, never run: no scriptlets or signature checks. THUNKS=${FEX_THUNKS:-0} X86ROOT=$WORK/x86root if [ "$THUNKS" = 1 ]; then @@ -40,15 +37,12 @@ fi rm -rf fex-src out && git clone -q --depth 1 --branch "$VERSION" --recurse-submodules --shallow-submodules https://github.com/FEX-Emu/FEX.git fex-src for p in tools/fex/patches/*.patch; do patch -d fex-src -p1 --no-backup-if-mismatch < "$p"; done -# FEX's x86 toolchain files assume an x86 build machine; here the guest thunks need the x86 sysroot too. -# Arch's clang adds stack protection; its canary load in a guest thunk's prologue clobbered r11 (the host function). if [ "$THUNKS" = 1 ]; then for t in fex-src/Data/CMake/toolchain_x86_64.cmake fex-src/Data/CMake/toolchain_x86_32.cmake; do printf '\nif (X86_DEV_ROOTFS AND NOT X86_DEV_ROOTFS STREQUAL "/")\n set(CMAKE_SYSROOT "${X86_DEV_ROOTFS}")\nendif()\n' >> "$t" printf '\nset(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-stack-protector")\nset(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-stack-protector")\n' >> "$t" done fi -# TUNE_CPU none: the default (native) would tune for the runner's Neoverse cores, not the device. cmake -S fex-src -B fex-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_LINKER=lld \ @@ -60,8 +54,6 @@ cmake -S fex-src -B fex-build -G Ninja \ ninja -C fex-build DESTDIR="$WORK/out" ninja -C fex-build install install -Dm755 /usr/bin/unsquashfs out/usr/local/bin/unsquashfs -# The Linux runtime has no xxhash and no ld.so.cache: the library goes beside libFEXCore and the programs -# that need it find it through RUNPATH. install -Dm644 "$(readlink -f /usr/lib/libxxhash.so.0)" out/usr/local/lib/libxxhash.so.0 bundled=$(cd out/usr/local/lib && ls -- *.so* | sort -u) for f in out/usr/local/bin/*; do @@ -70,7 +62,6 @@ for f in out/usr/local/bin/*; do readelf -d "$f" | awk '/NEEDED/ { gsub(/[\[\]]/, "", $5); print $5 }' | grep -qxF "$bundled" \ && patchelf --set-rpath '$ORIGIN/../lib' "$f" done -# Every NEEDED soname must resolve in a stock guest: bundled here or provided by the runtime (runtime-libs.txt). for f in out/usr/local/bin/* out/usr/local/lib/*.so* out/usr/local/lib/fex-emu/HostThunks*/*.so; do [ -f "$f" ] && file "$f" | grep -q ELF || continue readelf -d "$f" | awk '/NEEDED/ { gsub(/[\[\]]/, "", $5); print $5 }' diff --git a/tools/fex/patches/0001-openat2-enosys-fallback.patch b/tools/fex/patches/0001-openat2-enosys-fallback.patch index d7914133e..af0af4fa1 100644 --- a/tools/fex/patches/0001-openat2-enosys-fallback.patch +++ b/tools/fex/patches/0001-openat2-enosys-fallback.patch @@ -10,7 +10,7 @@ index 7172460..2c80dca 100644 #include <linux/openat2.h> #include <fcntl.h> #include <filesystem> -@@ -632,6 +633,163 @@ static bool ShouldSkipOpenInEmu(int flags) { +@@ -632,6 +633,157 @@ static bool ShouldSkipOpenInEmu(int flags) { return false; } @@ -26,19 +26,15 @@ index 7172460..2c80dca 100644 + return Result; +} + -+// openat2() with RESOLVE_IN_ROOT, walked one component at a time: PRoot has no openat2 and fails it with ENOSYS. -+// DirFD is AT_FDCWD only for thunk overlays, which never resolve in the root. +static int OpenatWithoutOpenat2(int DirFD, const char* Pathname, int Flags, uint32_t Mode) { + if (DirFD == AT_FDCWD) { + return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode); + } + -+ // The kernel's MAXSYMLINKS. + constexpr uint32_t MaxSymlinks = 40; + uint32_t Symlinks {}; + std::optional<dev_t> RootDev {}; + -+ // O_NOFOLLOW and O_CREAT | O_EXCL leave a final symlink alone, unless a trailing slash follows it. + const bool NoFollow = (Flags & O_NOFOLLOW) || (Flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); + + char Resolved[PATH_MAX]; @@ -116,7 +112,6 @@ index 7172460..2c80dca 100644 + } + + if (Buffer.st_dev != *RootDev && IsOnProcFS(DirFD, Resolved)) { -+ // Only procfs has magic links. RESOLVE_IN_ROOT fails them with EXDEV and the callers then open without it. + return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode); + } + @@ -145,7 +140,6 @@ index 7172460..2c80dca 100644 + } + + if (Last) { -+ // openat reports on the final component, which O_CREAT may create. + ResolvedLen = CandidateLen; + if (TrailingSlash) { + Resolved[ResolvedLen++] = '/'; @@ -174,7 +168,7 @@ index 7172460..2c80dca 100644 bool FileManager::ReplaceEmuFd(int fd, int flags, uint32_t mode) { char Tmp[PATH_MAX + 1]; -@@ -678,6 +836,8 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) { +@@ -678,6 +830,8 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) { // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); @@ -183,7 +177,7 @@ index 7172460..2c80dca 100644 } } -@@ -931,6 +1091,8 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i +@@ -931,6 +1085,8 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); @@ -192,7 +186,7 @@ index 7172460..2c80dca 100644 } } -@@ -967,6 +1129,8 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho +@@ -967,6 +1123,8 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, how, usize); diff --git a/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch b/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch index 923d68789..2d9f0a172 100644 --- a/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch +++ b/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch @@ -26,11 +26,10 @@ index 60b0ef1..4a94009 100644 using FindHandler = uint64_t (MemAllocator32Bit::*)(uint64_t Start, size_t Pages) const; FindHandler FindPageRangePtr {}; }; -@@ -132,6 +135,37 @@ uint64_t MemAllocator32Bit::FindPageRange_TopDown(uint64_t Start, size_t Pages) +@@ -132,6 +135,36 @@ uint64_t MemAllocator32Bit::FindPageRange_TopDown(uint64_t Start, size_t Pages) return 0; } -+// Marks each run of host mappings that overlaps the range as used, in full. Returns false if none overlaps. +bool MemAllocator32Bit::SetHostMappedPages(uint64_t PageAddr, size_t PagesLength) { + const int MapsFD = ::open("/proc/self/maps", O_RDONLY | O_CLOEXEC); + if (MapsFD == -1) { @@ -64,7 +63,7 @@ index 60b0ef1..4a94009 100644 void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, int fd, off_t offset) { std::scoped_lock<std::mutex> lk {AllocMutex}; size_t PagesLength = FEXCore::AlignUp(length, FEXCore::Utils::FEX_PAGE_SIZE) >> FEXCore::Utils::FEX_PAGE_SHIFT; -@@ -175,11 +209,17 @@ void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, in +@@ -175,11 +208,16 @@ void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, in auto AllocateNoHint = [&]() -> void* { bool Wrapped = false; @@ -74,7 +73,6 @@ index 60b0ef1..4a94009 100644 // Linear range scan uint64_t LowerPage = (this->*FindPageRangePtr)(BottomPage, PagesLength); if (LowerPage == 0) { -+ // A second scan from the start found nothing either: the range is full, as the kernel would say. + if (Restarted) { + return reinterpret_cast<void*>(-ENOMEM); + } @@ -82,15 +80,12 @@ index 60b0ef1..4a94009 100644 // Try again but this time from the start BottomPage = Map32Bit ? LastKeyLocation32Bit : LastKeyLocation; LowerPage = (this->*FindPageRangePtr)(BottomPage, PagesLength); -@@ -206,7 +246,17 @@ restart: { +@@ -206,7 +244,14 @@ restart: { return (void*)(uintptr_t)-errno; } else { // Try again - if (SearchDown) { + if (Map32Bit) { -+ // MAP_32BIT from a 64-bit guest, whose other mappings bypass this allocator: once Counter-Strike 2 had reserved the -+ // low 2GB, stepping one page at a time scanned for ever. Record what the host holds there and rescan the range, or -+ // move past it if that mapping is gone. + const bool Marked = SetHostMappedPages(LowerPage, PagesLength); + if (SearchDown) { + BottomPage = Marked ? UpperPage - 1 : LowerPage - 1; 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 000000000..f8b2de587 --- /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 a34e97e35..32317c4fa 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -85,3 +85,127 @@ 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. + +The rate comes from the feedback of a frame gamescope presents, so with nothing moving +on screen no feedback arrived and the old rate stayed. With following on, gamescope +presents once when the host's `wl_output` mode changes (DroidDeck's compositor sends +the new mode) and keeps presenting while a new rate is pending (since p16). + +## 0121 Xwayland: skip the X tree walk for a repeated window override + +The WSI layer sends `override_window_content` on every present of an X11 swapchain. +gamescope first walked from that window to its top-level window with `XQueryTree`, one +blocking X round trip per level under the wlserver lock, and only then noticed that the +same swapchain already overrides that window. At thousands of frames per second that is +thousands of round trips to Xwayland every second. + +The override now remembers the window it was asked for. When the same swapchain and +surface ask for the same window again within 100 ms, the request returns at once; after +100 ms the walk runs again, so a window that moved to another top level is still found. + +## 0122 Wayland: wake steamcompmgr after reading host events + +Backport of upstream commit 2962992 by Matthew Schwartz (ValveSoftware/gamescope). +The nested Wayland backend's input thread reads the host display, but steamcompmgr +does not watch that file descriptor, so buffer releases and presentation feedback +queued by that read could wait up to one refresh for steamcompmgr's next poll. The +input thread now wakes steamcompmgr after each read. + +## 0123 commit: fence lifetime fixes from upstream + +Backport of upstream commits 0efe47c and 666c52b by Matthew Schwartz (ValveSoftware/gamescope). +Pending commits share ownership of their completion list with the Xwayland context, so a late +fence signal can no longer append to a list freed with the context; and a commit being destroyed +no longer hands the image waiter a new reference to itself. Both touch the code 0124 changes. + +## 0124 commit: mark a finished frame done at import + +Every game frame took two passes of steamcompmgr's loop: the import duplicated the buffer's +fence and handed the commit to the image waiter (epoll add), then the waiter thread saw the fence +signalled, removed and closed it and woke steamcompmgr again to handle the finished commit. +`update_wayland_res` now polls the fence without waiting first. A frame that is already finished +is marked done at once - no duplicate fence, no epoll add or delete, no waiter wake - and the main +loop handles it in the same pass, after the import (FIFO commits still wait for a vblank). The +`commit_ready_check` convar (default on, `gamescopectl commit_ready_check 0`) turns it off; the +`xwm` log counts fences ready at import and waited for, every 10 s. + +## 0125 steamcompmgr: share mangoapp's frame times with DroidDeck's HUD + +DroidDeck's in-app HUD shows the same frame rate and frame times as Steam's performance overlay. +DroidDeck's mangoapp (Valve's 20260902.1 build) reads the field at byte 16 of gamescope's messages as +its frame time; gamescope 3.16.29 puts `app_frametime_ns` there, the time between signalled commits of +the connector's windows (`mangoapp_nudge_app_frame`). With `DROIDDECK_HUD_FRAMES` set (droiddeck-session +sets `/run/droiddeck-hud/frames`), gamescope maps that file and writes the same commits of connector 0, +whether or not a mangoapp runs, plus the focused pid, output size, refresh, Steam focus and engine name. +The layout is in the comment above `droiddeck_hud_frames_map`; the app reads it in `hudframes.c`. diff --git a/tools/gamescope/build-in-arch.sh b/tools/gamescope/build-in-arch.sh index 2853e593a..dbf323136 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,10 @@ 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') +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/0116-release-cursor-shm-buffers.patch b/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch index 03b4d7fd0..a68ac9133 100644 --- a/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch +++ b/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch @@ -1,12 +1,9 @@ --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -203,6 +203,12 @@ +@@ -203,6 +203,9 @@ } void xwayland_surface_commit(struct wlr_surface *wlr_surface) { -+ // Cursor surfaces never acquire an X11/xdg window association. Keeping their -+ // commits in g_PendingCommits pins every old SHM buffer until the cursor -+ // surface is destroyed. X11 cursor images are handled by MouseCursor. + if ( wlr_surface->role && strcmp( wlr_surface->role->name, "wl_pointer-cursor" ) == 0 ) + return; + 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 000000000..9ee156d8a --- /dev/null +++ b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch @@ -0,0 +1,53 @@ +--- 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,32 @@ + // Cached for comparison. + std::optional<VkRect2D> cachedWindowRect; + ++ 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 +1625,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 000000000..d66ca56e0 --- /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 000000000..c55ae8643 --- /dev/null +++ b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch @@ -0,0 +1,54 @@ +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,10 @@ namespace GamescopeWSILayer { + return s_minImageCount; + } + ++ 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 +988,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->currentExtent = rect->extent; + } +- pSurfaceCapabilities->minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1027,7 +1031,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->surfaceCapabilities.currentExtent = rect->extent; + } +- pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1305,7 +1309,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 +1631,11 @@ namespace GamescopeWSILayer { + continue; + } + ++ 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 000000000..a2b846440 --- /dev/null +++ b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch @@ -0,0 +1,100 @@ +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,46 @@ namespace gamescope + } + } + ++ 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; ++ } ++ ++ 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 +1764,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 +1835,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 +2678,8 @@ namespace gamescope + } + void CWaylandBackend::Wayland_Output_Mode( wl_output *pOutput, uint32_t uFlags, int32_t nWidth, int32_t nHeight, int32_t nRefresh ) + { ++ 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,14 @@ 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; ++ ++ 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/patches/0121-override-content-skip-toplevel-walk.patch b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch new file mode 100644 index 000000000..a7624b402 --- /dev/null +++ b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch @@ -0,0 +1,53 @@ +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 9a027a2..e6d8e31 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -98,6 +98,8 @@ struct wlserver_content_override { + uint32_t x11_window; + struct wl_listener surface_destroy_listener; + struct wl_resource *gamescope_swapchain; ++ uint32_t requested_window; ++ uint64_t ulCheckedNs; + }; + + std::mutex g_wlserver_xdg_shell_windows_lock; +@@ -800,6 +802,18 @@ static void gamescope_swapchain_destroy_co( struct wl_resource *resource ); + + void gamescope_xwayland_server_t::handle_override_window_content( struct wl_client *client, struct wl_resource *gamescope_swapchain_resource, struct wlr_surface *surface, uint32_t x11_window ) + { ++ const uint64_t ulNow = get_time_in_nanos(); ++ if ( gamescope_swapchain_resource ) ++ { ++ for ( const auto &[ window, existing ] : content_overrides ) ++ { ++ if ( existing->gamescope_swapchain == gamescope_swapchain_resource && existing->surface == surface && ++ existing->requested_window == x11_window && ulNow - existing->ulCheckedNs < 100'000'000ul ) ++ return; ++ } ++ } ++ ++ const uint32_t requested_window = x11_window; + x11_window = x11_find_toplevel_for_xid( this->ctx->dpy, x11_window ); + + wlserver_x11_surface_info *x11_surface = lookup_x11_surface_info_from_xid( this, x11_window ); +@@ -813,7 +827,11 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie + + if ( content_overrides.count( x11_window ) ) { + if ( content_overrides[x11_window]->gamescope_swapchain == gamescope_swapchain_resource ) ++ { ++ content_overrides[x11_window]->requested_window = requested_window; ++ content_overrides[x11_window]->ulCheckedNs = ulNow; + return; ++ } + #ifdef GAMESCOPE_SWAPCHAIN_DEBUG + wl_log.infof( "handle_override_window_content: (2) DESTROYING x11_window: 0x%x old_swapchain: %p new_swapchain: %p", x11_window, content_overrides[x11_window]->gamescope_swapchain, gamescope_swapchain_resource ); + #endif +@@ -830,6 +848,8 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie + co->surface = surface; + co->x11_window = x11_window; + co->gamescope_swapchain = gamescope_swapchain_resource; ++ co->requested_window = requested_window; ++ co->ulCheckedNs = ulNow; + co->surface_destroy_listener.notify = content_override_handle_surface_destroy; + wl_signal_add( &surface->events.destroy, &co->surface_destroy_listener ); + content_overrides[ x11_window ] = co; diff --git a/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch new file mode 100644 index 000000000..b33cef1b6 --- /dev/null +++ b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch @@ -0,0 +1,13 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 1b85e63..370661d 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -2977,6 +2977,8 @@ namespace gamescope + LogDisplayError( "Failed to read events on input thread", m_pBackend->GetDisplay() ); + abort(); + } ++ ++ nudge_steamcompmgr(); + } + } + diff --git a/tools/gamescope/patches/0123-commit-fence-lifetime-upstream.patch b/tools/gamescope/patches/0123-commit-fence-lifetime-upstream.patch new file mode 100644 index 000000000..75e93b68a --- /dev/null +++ b/tools/gamescope/patches/0123-commit-fence-lifetime-upstream.patch @@ -0,0 +1,157 @@ +diff --git a/src/commit.cpp b/src/commit.cpp +index c9d0001..f2e0f0c 100644 +--- a/src/commit.cpp ++++ b/src/commit.cpp +@@ -105,14 +105,15 @@ bool commit_t::CloseFenceInternal() + if ( m_nCommitFence < 0 ) + return false; + +- // Will automatically remove from epoll! +- g_ImageWaiter.RemoveWaitable( this ); ++ // Do not recreate an Rc after deletion has started. ++ if ( HasLiveReferences() ) ++ g_ImageWaiter.RemoveWaitable( this ); + close( m_nCommitFence ); + m_nCommitFence = -1; + return true; + } + +-void commit_t::SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, CommitDoneList_t *pDoneCommits ) ++void commit_t::SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits ) + { + std::unique_lock lock( m_WaitableCommitStateMutex ); + CloseFenceInternal(); +diff --git a/src/commit.h b/src/commit.h +index 20f881d..8603a9a 100644 +--- a/src/commit.h ++++ b/src/commit.h +@@ -1,6 +1,7 @@ + #include "steamcompmgr_shared.hpp" + #include "Utils/NonCopyable.h" + ++#include <memory> + #include <optional> + #include "main.hpp" + #include "rendervulkan.hpp" +@@ -34,7 +35,7 @@ struct commit_t final : public gamescope::RcObject, public gamescope::IWaitable, + + // Returns true if we had a fence that was closed. + bool CloseFenceInternal(); +- void SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, CommitDoneList_t *pDoneCommits ); ++ void SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits ); + + bool ShouldPreemptivelyUpscale( GamescopeUpscaleFilter eFilter, GamescopeUpscaleScaler eScaler ); + +@@ -81,5 +82,5 @@ struct commit_t final : public gamescope::RcObject, public gamescope::IWaitable, + bool m_bMangoNudge = false; + // Typed mangoapp stream to nudge, 0 for none, never the legacy type. + uint32_t m_uMangoMsgType = 0; +- CommitDoneList_t *m_pDoneCommits = nullptr; // I hate this +-}; +\ No newline at end of file ++ std::shared_ptr<CommitDoneList_t> m_pDoneCommits; // I hate this ++}; +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 5fb9086..22aa907 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -932,7 +932,7 @@ constexpr const T& clamp( const T& x, const T& min, const T& max ) + + extern bool g_bForceRelativeMouse; + +-CommitDoneList_t g_steamcompmgr_xdg_done_commits; ++std::shared_ptr<CommitDoneList_t> g_steamcompmgr_xdg_done_commits = std::make_shared<CommitDoneList_t>(); + + + static std::mutex s_KeysToCloseMutex; +@@ -8073,7 +8073,7 @@ bool handle_done_commit( steamcompmgr_win_t *w, xwayland_ctx_t *ctx, uint64_t co + // TODO: Merge these two functions. + void handle_done_commits_xwayland( xwayland_ctx_t *ctx, bool vblank, uint64_t vblank_idx ) + { +- std::lock_guard<std::mutex> lock( ctx->doneCommits.listCommitsDoneLock ); ++ std::lock_guard<std::mutex> lock( ctx->doneCommits->listCommitsDoneLock ); + + uint64_t next_refresh_time = g_SteamCompMgrVBlankTime.schedule.ulTargetVBlank; + +@@ -8090,7 +8090,7 @@ void handle_done_commits_xwayland( xwayland_ctx_t *ctx, bool vblank, uint64_t vb + uint64_t now = get_time_in_nanos(); + + // very fast loop yes +- for ( auto& entry : ctx->doneCommits.listCommitsDone ) ++ for ( auto& entry : ctx->doneCommits->listCommitsDone ) + { + steamcompmgr_win_t *entry_win = nullptr; + for ( steamcompmgr_win_t *w = ctx->list; w; w = w->xwayland().next ) +@@ -8130,12 +8130,12 @@ void handle_done_commits_xwayland( xwayland_ctx_t *ctx, bool vblank, uint64_t vb + } + } + +- ctx->doneCommits.listCommitsDone.swap( commits_before_their_time ); ++ ctx->doneCommits->listCommitsDone.swap( commits_before_their_time ); + } + + void handle_done_commits_xdg( bool vblank, uint64_t vblank_idx ) + { +- std::lock_guard<std::mutex> lock( g_steamcompmgr_xdg_done_commits.listCommitsDoneLock ); ++ std::lock_guard<std::mutex> lock( g_steamcompmgr_xdg_done_commits->listCommitsDoneLock ); + + uint64_t next_refresh_time = g_SteamCompMgrVBlankTime.schedule.ulTargetVBlank; + +@@ -8152,7 +8152,7 @@ void handle_done_commits_xdg( bool vblank, uint64_t vblank_idx ) + uint64_t now = get_time_in_nanos(); + + // very fast loop yes +- for ( auto& entry : g_steamcompmgr_xdg_done_commits.listCommitsDone ) ++ for ( auto& entry : g_steamcompmgr_xdg_done_commits->listCommitsDone ) + { + steamcompmgr_win_t *entry_win = nullptr; + for (const auto& xdg_win : g_steamcompmgr_xdg_wins) +@@ -8192,7 +8192,7 @@ void handle_done_commits_xdg( bool vblank, uint64_t vblank_idx ) + } + } + +- g_steamcompmgr_xdg_done_commits.listCommitsDone.swap( commits_before_their_time ); ++ g_steamcompmgr_xdg_done_commits->listCommitsDone.swap( commits_before_their_time ); + } + + gamescope::ConVar<bool> cv_mangoapp_use_output_timing{ "mangoapp_use_output_timing", true }; +@@ -8359,7 +8359,7 @@ static TempUpscaleImage_t *GetTempUpscaleImage( global_focus_t *pFocus, uint32_t + + gamescope::ConVar<bool> cv_surface_update_force_only_current_surface( "surface_update_force_only_current_surface", false, "Force updates to apply only to the current surface, ignoring commits for other surfaces." ); + +-void update_wayland_res(CommitDoneList_t *doneCommits, steamcompmgr_win_t *w, ResListEntry_t& reslistentry) ++void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, steamcompmgr_win_t *w, ResListEntry_t& reslistentry) + { + struct wlr_buffer *buf = reslistentry.buf; + +@@ -8632,7 +8632,7 @@ void check_new_xwayland_res(xwayland_ctx_t *ctx) + for ( uint32_t i = 0; i < tmp_queue.size(); i++ ) + { + steamcompmgr_win_t *w = find_win( ctx, tmp_queue[ i ].surf ); +- update_wayland_res( &ctx->doneCommits, w, tmp_queue[ i ]); ++ update_wayland_res( ctx->doneCommits, w, tmp_queue[ i ]); + } + } + +@@ -8645,7 +8645,7 @@ void check_new_xdg_res() + { + if ( xdg_win->xdg().surface.main_surface == tmp_queue[ i ].surf ) + { +- update_wayland_res( &g_steamcompmgr_xdg_done_commits, xdg_win.get(), tmp_queue[ i ] ); ++ update_wayland_res( g_steamcompmgr_xdg_done_commits, xdg_win.get(), tmp_queue[ i ] ); + break; + } + } +diff --git a/src/xwayland_ctx.hpp b/src/xwayland_ctx.hpp +index 81910a1..3a75650 100644 +--- a/src/xwayland_ctx.hpp ++++ b/src/xwayland_ctx.hpp +@@ -92,7 +92,7 @@ struct xwayland_ctx_t final : public gamescope::IWaitable + + std::unique_ptr<MouseCursor> cursor; + +- CommitDoneList_t doneCommits; ++ std::shared_ptr<CommitDoneList_t> doneCommits = std::make_shared<CommitDoneList_t>(); + + double accum_x = 0.0; + double accum_y = 0.0; diff --git a/tools/gamescope/patches/0124-commit-done-at-import.patch b/tools/gamescope/patches/0124-commit-done-at-import.patch new file mode 100644 index 000000000..9adfdf911 --- /dev/null +++ b/tools/gamescope/patches/0124-commit-done-at-import.patch @@ -0,0 +1,100 @@ +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 22aa907..0aef598 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -8359,6 +8359,33 @@ static TempUpscaleImage_t *GetTempUpscaleImage( global_focus_t *pFocus, uint32_t + + gamescope::ConVar<bool> cv_surface_update_force_only_current_surface( "surface_update_force_only_current_surface", false, "Force updates to apply only to the current surface, ignoring commits for other surfaces." ); + ++gamescope::ConVar<bool> cv_commit_ready_check( "commit_ready_check", true, "Check a new commit's fence at import; a finished frame is marked done in the same pass instead of through the image waiter." ); ++ ++// Set when update_wayland_res marks a commit done itself, so the main loop handles it in the same pass. ++static bool s_bXwaylandCommitsDoneAtImport = false; ++static bool s_bXdgCommitsDoneAtImport = false; ++ ++static bool commit_fence_ready_now( int nFd ) ++{ ++ struct pollfd pfd = { .fd = nFd, .events = POLLIN, .revents = 0 }; ++ return poll( &pfd, 1, 0 ) == 1 && ( pfd.revents & POLLIN ); ++} ++ ++static void note_commit_fence( bool bReadyAtImport ) ++{ ++ static uint64_t s_ulReady = 0, s_ulWaited = 0, s_ulLastLog = 0; ++ ( bReadyAtImport ? s_ulReady : s_ulWaited )++; ++ uint64_t now = get_time_in_nanos(); ++ if ( !s_ulLastLog ) ++ s_ulLastLog = now; ++ if ( now - s_ulLastLog >= 10'000'000'000ul ) ++ { ++ xwm_log.infof( "commit fences, last 10 s: %lu ready at import, %lu waited for", s_ulReady, s_ulWaited ); ++ s_ulReady = s_ulWaited = 0; ++ s_ulLastLog = now; ++ } ++} ++ + void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, steamcompmgr_win_t *w, ResListEntry_t& reslistentry) + { + struct wlr_buffer *buf = reslistentry.buf; +@@ -8602,7 +8629,10 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st + struct wlr_dmabuf_attributes dmabuf = {0}; + if ( wlr_buffer_get_dmabuf( buf, &dmabuf ) ) + { +- fence = dup( dmabuf.fd[0] ); ++ if ( cv_commit_ready_check && commit_fence_ready_now( dmabuf.fd[0] ) ) ++ bKnownReady = true; ++ else ++ fence = dup( dmabuf.fd[0] ); + } + else + { +@@ -8610,11 +8640,22 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st + } + } + ++ if ( cv_commit_ready_check ) ++ { ++ if ( !bKnownReady && fence >= 0 && commit_fence_ready_now( fence ) ) ++ bKnownReady = true; ++ note_commit_fence( bKnownReady ); ++ } ++ + gpuvis_trace_printf( "pushing wait for commit %lu win %lx", newCommit->commitID, w->type == steamcompmgr_win_type_t::XWAYLAND ? w->xwayland().id : 0 ); + { + newCommit->SetFence( fence, mango_nudge, uMangoMsgType, doneCommits ); + if ( bKnownReady ) ++ { + newCommit->Signal(); ++ if ( cv_commit_ready_check ) ++ ( w->type == steamcompmgr_win_type_t::XWAYLAND ? s_bXwaylandCommitsDoneAtImport : s_bXdgCommitsDoneAtImport ) = true; ++ } + else + g_ImageWaiter.AddWaitable( newCommit.get() ); + } +@@ -9400,6 +9441,12 @@ void steamcompmgr_check_xdg(bool vblank, uint64_t vblank_idx) + } + + check_new_xdg_res(); ++ ++ if ( s_bXdgCommitsDoneAtImport ) ++ { ++ s_bXdgCommitsDoneAtImport = false; ++ handle_done_commits_xdg( false, vblank_idx ); ++ } + } + + void update_edid_prop() +@@ -10512,6 +10559,13 @@ steamcompmgr_main(int argc, char **argv) + gamescope_xwayland_server_t *server = NULL; + for (size_t i = 0; (server = wlserver_get_xwayland_server(i)); i++) + check_new_xwayland_res(server->ctx.get()); ++ ++ if ( s_bXwaylandCommitsDoneAtImport ) ++ { ++ s_bXwaylandCommitsDoneAtImport = false; ++ for (size_t i = 0; (server = wlserver_get_xwayland_server(i)); i++) ++ handle_done_commits_xwayland(server->ctx.get(), false, vblank_idx); ++ } + } + + diff --git a/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch b/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch new file mode 100644 index 000000000..2fec1e7d2 --- /dev/null +++ b/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch @@ -0,0 +1,217 @@ +diff --git a/src/commit.cpp b/src/commit.cpp +index f2e0f0c..fbfb550 100644 +--- a/src/commit.cpp ++++ b/src/commit.cpp +@@ -86,6 +86,8 @@ void commit_t::Signal() + mangoapp_nudge_app_frame( k_uMangoappLegacyMsgType, now ); + if ( m_uMangoMsgType != 0 ) + mangoapp_nudge_app_frame( m_uMangoMsgType, now ); ++ if ( m_bDroidDeckHudFrame ) ++ droiddeck_hud_app_frame( now ); + } + + void commit_t::OnPollHangUp() +@@ -113,7 +115,7 @@ bool commit_t::CloseFenceInternal() + return true; + } + +-void commit_t::SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits ) ++void commit_t::SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits, bool bDroidDeckHudFrame ) + { + std::unique_lock lock( m_WaitableCommitStateMutex ); + CloseFenceInternal(); +@@ -121,6 +123,7 @@ void commit_t::SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, c + m_nCommitFence = nFence; + m_bMangoNudge = bMangoNudge; + m_uMangoMsgType = uMangoMsgType; ++ m_bDroidDeckHudFrame = bDroidDeckHudFrame; + m_pDoneCommits = pDoneCommits; + } + +diff --git a/src/commit.h b/src/commit.h +index 8603a9a..ae767b6 100644 +--- a/src/commit.h ++++ b/src/commit.h +@@ -35,7 +35,7 @@ struct commit_t final : public gamescope::RcObject, public gamescope::IWaitable, + + // Returns true if we had a fence that was closed. + bool CloseFenceInternal(); +- void SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits ); ++ void SetFence( int nFence, bool bMangoNudge, uint32_t uMangoMsgType, const std::shared_ptr<CommitDoneList_t> &pDoneCommits, bool bDroidDeckHudFrame = false ); + + bool ShouldPreemptivelyUpscale( GamescopeUpscaleFilter eFilter, GamescopeUpscaleScaler eScaler ); + +@@ -82,5 +82,6 @@ struct commit_t final : public gamescope::RcObject, public gamescope::IWaitable, + bool m_bMangoNudge = false; + // Typed mangoapp stream to nudge, 0 for none, never the legacy type. + uint32_t m_uMangoMsgType = 0; ++ bool m_bDroidDeckHudFrame = false; + std::shared_ptr<CommitDoneList_t> m_pDoneCommits; // I hate this + }; +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 0aef598..1473148 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -57,6 +57,7 @@ + #include <stdio.h> + #include <string.h> + #include <fcntl.h> ++#include <sys/mman.h> + #include <sys/poll.h> + #include <sys/inotify.h> + #include <sys/time.h> +@@ -8359,6 +8360,8 @@ static TempUpscaleImage_t *GetTempUpscaleImage( global_focus_t *pFocus, uint32_t + + gamescope::ConVar<bool> cv_surface_update_force_only_current_surface( "surface_update_force_only_current_surface", false, "Force updates to apply only to the current surface, ignoring commits for other surfaces." ); + ++static bool droiddeck_hud_frames_wanted(); ++ + gamescope::ConVar<bool> cv_commit_ready_check( "commit_ready_check", true, "Check a new commit's fence at import; a finished frame is marked done in the same pass instead of through the image waiter." ); + + // Set when update_wayland_res marks a commit done itself, so the main loop handles it in the same pass. +@@ -8519,6 +8522,15 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st + uMangoMsgType = pMangoFocus->externalOverlayWindow->uMangoappMsgType; + } + ++ bool bDroidDeckHudFrame = false; ++ if ( pUpscaleFocus && !w->isSteamStreamingClient ) ++ bDroidDeckHudFrame = pUpscaleFocus->ulVirtualFocusKey == 0; ++ else if ( w->isSteamStreamingClientVideo ) ++ { ++ auto iter = g_VirtualConnectorFocuses.find( 0 ); ++ bDroidDeckHudFrame = iter != g_VirtualConnectorFocuses.end() && iter->second.focusWindow && iter->second.focusWindow->isSteamStreamingClient; ++ } ++ + bool bValidPreemptiveScale = reslistentry.pAcquirePoint && pUpscaleFocus && cv_upscale_preemptive; + bool bPreemptiveUpscale = bValidPreemptiveScale && newCommit->ShouldPreemptivelyUpscale( pUpscaleFocus->eUpscaleFilter, pUpscaleFocus->eUpscaleScaler ); + +@@ -8650,7 +8662,7 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st + + gpuvis_trace_printf( "pushing wait for commit %lu win %lx", newCommit->commitID, w->type == steamcompmgr_win_type_t::XWAYLAND ? w->xwayland().id : 0 ); + { +- newCommit->SetFence( fence, mango_nudge, uMangoMsgType, doneCommits ); ++ newCommit->SetFence( fence, mango_nudge, uMangoMsgType, doneCommits, bDroidDeckHudFrame && droiddeck_hud_frames_wanted() ); + if ( bKnownReady ) + { + newCommit->Signal(); +@@ -9865,6 +9877,100 @@ static void publish_mangoapp_connector_snapshots() + } + } + ++static constexpr uint32_t k_uDroidDeckHudFramesMagic = 0x46484444; ++static constexpr uint32_t k_uDroidDeckHudFramesVersion = 1; ++static constexpr uint32_t k_uDroidDeckHudFramesCapacity = 1024; ++static constexpr size_t k_zDroidDeckHudFramesHeader = 128; ++static constexpr size_t k_zDroidDeckHudFramesSize = k_zDroidDeckHudFramesHeader + k_uDroidDeckHudFramesCapacity * 16; ++static std::mutex s_DroidDeckHudFramesMutex; ++ ++static uint8_t *droiddeck_hud_frames_map() ++{ ++ static uint8_t *s_pMap = nullptr; ++ static bool s_bTried = false; ++ if ( s_bTried ) ++ return s_pMap; ++ s_bTried = true; ++ ++ const char *pszPath = getenv( "DROIDDECK_HUD_FRAMES" ); ++ if ( !pszPath || !*pszPath ) ++ return nullptr; ++ int fd = open( pszPath, O_RDWR | O_CREAT | O_CLOEXEC, 0644 ); ++ if ( fd < 0 ) ++ { ++ xwm_log.errorf_errno( "DroidDeck HUD frames: open %s", pszPath ); ++ return nullptr; ++ } ++ void *pMap = MAP_FAILED; ++ if ( ftruncate( fd, k_zDroidDeckHudFramesSize ) == 0 ) ++ pMap = mmap( nullptr, k_zDroidDeckHudFramesSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 ); ++ close( fd ); ++ if ( pMap == MAP_FAILED ) ++ { ++ xwm_log.errorf_errno( "DroidDeck HUD frames: map %s", pszPath ); ++ return nullptr; ++ } ++ uint8_t *pBytes = static_cast<uint8_t *>( pMap ); ++ __atomic_store_n( reinterpret_cast<uint32_t *>( pBytes ), 0u, __ATOMIC_RELEASE ); ++ memset( pBytes + 4, 0, k_zDroidDeckHudFramesSize - 4 ); ++ memcpy( pBytes + 4, &k_uDroidDeckHudFramesVersion, 4 ); ++ memcpy( pBytes + 8, &k_uDroidDeckHudFramesCapacity, 4 ); ++ __atomic_store_n( reinterpret_cast<uint32_t *>( pBytes ), k_uDroidDeckHudFramesMagic, __ATOMIC_RELEASE ); ++ xwm_log.infof( "DroidDeck HUD frames: %s", pszPath ); ++ s_pMap = pBytes; ++ return s_pMap; ++} ++ ++static bool droiddeck_hud_frames_wanted() ++{ ++ std::unique_lock lock( s_DroidDeckHudFramesMutex ); ++ return droiddeck_hud_frames_map() != nullptr; ++} ++ ++void droiddeck_hud_app_frame( uint64_t ulNow ) ++{ ++ std::unique_lock lock( s_DroidDeckHudFramesMutex ); ++ uint8_t *pMap = droiddeck_hud_frames_map(); ++ if ( !pMap ) ++ return; ++ static uint64_t s_ulLastFrame = 0; ++ uint64_t ulLast = s_ulLastFrame; ++ s_ulLastFrame = ulNow; ++ if ( !ulLast || ulNow <= ulLast ) ++ return; ++ uint64_t *pCount = reinterpret_cast<uint64_t *>( pMap + 16 ); ++ uint64_t ulCount = __atomic_load_n( pCount, __ATOMIC_RELAXED ); ++ uint64_t ulFrame[2] = { ulNow - ulLast, ulNow }; ++ memcpy( pMap + k_zDroidDeckHudFramesHeader + ( ulCount % k_uDroidDeckHudFramesCapacity ) * 16, ulFrame, sizeof( ulFrame ) ); ++ __atomic_store_n( pCount, ulCount + 1, __ATOMIC_RELEASE ); ++} ++ ++static void publish_droiddeck_hud_info() ++{ ++ std::unique_lock lock( s_DroidDeckHudFramesMutex ); ++ uint8_t *pMap = droiddeck_hud_frames_map(); ++ if ( !pMap ) ++ return; ++ auto focusIter = g_VirtualConnectorFocuses.find( 0 ); ++ global_focus_t *pFocus = focusIter != g_VirtualConnectorFocuses.end() ? &focusIter->second : GetCurrentFocus(); ++ if ( !pFocus ) ++ return; ++ ++ uint32_t *pSeq = reinterpret_cast<uint32_t *>( pMap + 24 ); ++ uint32_t uSeq = __atomic_load_n( pSeq, __ATOMIC_RELAXED ); ++ __atomic_store_n( pSeq, uSeq + 1, __ATOMIC_RELAXED ); ++ __atomic_thread_fence( __ATOMIC_RELEASE ); ++ uint32_t uPid = uint32_t( pFocus->nFocusWindowPid ); ++ uint32_t uOutput[4] = { g_nOutputWidth, g_nOutputHeight, uint32_t( g_nOutputRefresh ), window_is_steam( pFocus->inputFocusWindow ) ? 1u : 0u }; ++ char szEngine[40] = {}; ++ if ( pFocus->pFocusWindowEngine ) ++ pFocus->pFocusWindowEngine->copy( szEngine, sizeof( szEngine ) - 1 ); ++ memcpy( pMap + 12, &uPid, 4 ); ++ memcpy( pMap + 28, uOutput, sizeof( uOutput ) ); ++ memcpy( pMap + 44, szEngine, sizeof( szEngine ) ); ++ __atomic_store_n( pSeq, uSeq + 2, __ATOMIC_RELEASE ); ++} ++ + // mangohudctl posts one control message for every instance to act on. + static void relay_mangoapp_control() + { +@@ -10843,6 +10949,7 @@ steamcompmgr_main(int argc, char **argv) + + publish_mangoapp_snapshot(); + publish_mangoapp_connector_snapshots(); ++ publish_droiddeck_hud_info(); + relay_mangoapp_control(); + + if ( bIsVBlankFromTimer ) +diff --git a/src/steamcompmgr.hpp b/src/steamcompmgr.hpp +index bd62fd1..7a7119f 100644 +--- a/src/steamcompmgr.hpp ++++ b/src/steamcompmgr.hpp +@@ -173,6 +173,7 @@ static constexpr uint32_t MangoappControlMsgType( uint32_t uMsgType ) + static_assert( MangoappControlMsgType( k_uMangoappLegacyMsgType ) == k_uMangoappControlMsgType ); + + extern void mangoapp_update( uint64_t visible_frametime, uint64_t app_frametime_ns, uint64_t latency_ns, uint32_t uMsgType = k_uMangoappLegacyMsgType ); ++extern void droiddeck_hud_app_frame( uint64_t ulNow ); + extern void mangoapp_nudge_app_frame( uint32_t uMsgType, uint64_t ulNow ); + extern void mangoapp_set_connector_snapshots( std::unordered_map<uint32_t, MangoappSnapshot_t> snapshots ); + extern void mangoapp_drop_stream( uint32_t uMsgType ); diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 1e741f4aa..a73f1985b 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-p19 +GAMESCOPE_SHA256=e7333c6a2b95708b199c2c5bd0973e3f0e711e2dc746950cc648c2515ea2926b diff --git a/tools/gpuload/build.sh b/tools/gpuload/build.sh new file mode 100755 index 000000000..b2729de7f --- /dev/null +++ b/tools/gpuload/build.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +# Builds VK_LAYER_DROIDDECK_gpu_load for the arm64 guest: tools/gpuload/build.sh [--native] OUT +# OUT gets libVkLayer_droiddeck_gpuload.so and its implicit-layer manifest. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +repo=$(cd "$here/../.." && pwd) +. "$repo/tools/docker_platform.sh" + +native=0 +if [ "${1:-}" = --native ]; then native=1; shift; fi +out=${1:?usage: tools/gpuload/build.sh [--native] OUT} +case "$out" in /*) ;; *) out="$PWD/$out" ;; esac + +vkinc=${VK_INCLUDE:-} +if [ -z "$vkinc" ]; then + ndks=("${NDK:-}" "${ANDROID_NDK_HOME:-}" "${ANDROID_NDK_LATEST_HOME:-}") + sdk_ndks=("${ANDROID_HOME:-$HOME/Library/Android/sdk}"/ndk/*) + for ((i = ${#sdk_ndks[@]} - 1; i >= 0; i--)); do ndks+=("${sdk_ndks[i]}"); done + for ndk in "${ndks[@]}"; do + [ -n "$ndk" ] && [ -d "$ndk" ] || continue + for cand in "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include; do + if [ -f "$cand/vulkan/vk_layer.h" ]; then vkinc=$cand; break 2; fi + done + done +fi +[ -n "$vkinc" ] && [ -f "$vkinc/vulkan/vulkan_core.h" ] || { echo "tools/gpuload/build.sh: no Vulkan headers (set VK_INCLUDE)" >&2; exit 1; } + +work="$repo/build/gpuload" +rm -rf "$work" && mkdir -p "$work/include" "$work/out" +cp -R "$vkinc/vulkan" "$work/include/" +if [ -d "$vkinc/vk_video" ]; then cp -R "$vkinc/vk_video" "$work/include/"; fi + +cmd=(sh -c ' + set -e + cc -std=c11 -O2 -Wall -Wextra -Werror -Itools/gpuload/src -o build/gpuload/test_gpuload_busy tools/gpuload/tests/test_gpuload_busy.c + build/gpuload/test_gpuload_busy + cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -o build/gpuload/test_gpuload_ring tools/gpuload/tests/test_gpuload_ring.c + build/gpuload/test_gpuload_ring + aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ + -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ + -o build/gpuload/out/libVkLayer_droiddeck_gpuload.so tools/gpuload/src/vk_layer_droiddeck_gpuload.c + aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so') +if [ "$native" = 1 ]; then + (cd "$repo" && "${cmd[@]}") +else + docker run --rm --platform "${DROIDDECK_DOCKER_PLATFORM:-linux/amd64}" --user "$(id -u):$(id -g)" -v "$repo:/src" -w /src \ + "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" +fi + +cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/" +mkdir -p "$out" +cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$out/" +echo "built $out" diff --git a/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json b/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json new file mode 100644 index 000000000..9fa67bc63 --- /dev/null +++ b/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json @@ -0,0 +1,20 @@ +{ + "file_format_version": "1.2.0", + "layer": { + "name": "VK_LAYER_DROIDDECK_gpu_load", + "type": "GLOBAL", + "library_path": "/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", + "api_version": "1.3.0", + "implementation_version": "1", + "description": "Times this process's GPU work for DroidDeck's HUD where Android hides the GPU load; idle unless a HUD is shown", + "functions": { + "vkNegotiateLoaderLayerInterfaceVersion": "DroidDeckGpuLoad_NegotiateLoaderLayerInterfaceVersion" + }, + "enable_environment": { + "DROIDDECK_GPU_LOAD": "1" + }, + "disable_environment": { + "DROIDDECK_GPU_LOAD_DISABLE": "1" + } + } +} diff --git a/tools/gpuload/src/gpuload_busy.h b/tools/gpuload/src/gpuload_busy.h new file mode 100644 index 000000000..e5a47fb13 --- /dev/null +++ b/tools/gpuload/src/gpuload_busy.h @@ -0,0 +1,22 @@ +// Busy-time bookkeeping shared by VK_LAYER_DROIDDECK_gpu_load and DroidDeck's compositor, kept free of Vulkan so it +// can be tested on its own. +#ifndef DROIDDECK_GPULOAD_BUSY_H +#define DROIDDECK_GPULOAD_BUSY_H + +#include <stdint.h> + +// GPU ticks between the timestamp written before a batch and the one written after it. Batches on one queue run one +// after the other, so these add up without overlap. Ticks are never compared across batches: on Adreno the always-on +// counter behind the timestamps restarts when the GPU powers down between batches (seen on the Retroid Pocket Duo). +// Anything backwards or longer than max_ticks is a bogus pair and counts as nothing. +static inline uint64_t gpuload_interval(uint64_t start, uint64_t end, uint64_t max_ticks) { + return end > start && end - start <= max_ticks ? end - start : 0; +} + +// A timestamp query slot is reused once its end is available; until the GPU runs the slot's reset again the +// query still shows the previous end, so a result equal to the last one harvested is the old one. +static inline int gpuload_result_is_new(uint64_t start_avail, uint64_t end_avail, uint64_t end, uint64_t last_end) { + return start_avail && end_avail && end != last_end; +} + +#endif diff --git a/tools/gpuload/src/gpuload_ring.h b/tools/gpuload/src/gpuload_ring.h new file mode 100644 index 000000000..58f6abcb7 --- /dev/null +++ b/tools/gpuload/src/gpuload_ring.h @@ -0,0 +1,215 @@ +// Timestamp ring shared by VK_LAYER_DROIDDECK_gpu_load (guest) and DroidDeck's compositor (app): each submit batch +// that has command buffers gets one of the ring's command buffers in front (resets a query pair, writes a TOP_OF_PIPE +// timestamp) and one behind (BOTTOM_OF_PIPE timestamp). Finished pairs are read back without waiting. +// The start timestamp sits after the batch's semaphore waits only because Turnip and Qualcomm's driver on kgsl hold a +// whole batch until its waits signal; a driver that starts TOP_OF_PIPE work earlier would count the wait as busy. +// Callers serialize access to one ring (a queue's submits are externally synchronized anyway). +#ifndef DROIDDECK_GPULOAD_RING_H +#define DROIDDECK_GPULOAD_RING_H + +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <vulkan/vulkan.h> + +#include "gpuload_busy.h" + +#define GPULOAD_RING 64 + +typedef VkResult(VKAPI_PTR *gpuload_set_data_fn)(VkDevice device, void *object); + +struct gpuload_vk { + VkDevice device; + PFN_vkCreateCommandPool create_pool; + PFN_vkDestroyCommandPool destroy_pool; + PFN_vkAllocateCommandBuffers alloc_cmds; + PFN_vkBeginCommandBuffer begin; + PFN_vkEndCommandBuffer end; + PFN_vkCmdResetQueryPool cmd_reset; + PFN_vkCmdWriteTimestamp cmd_timestamp; + PFN_vkCreateQueryPool create_queries; + PFN_vkDestroyQueryPool destroy_queries; + PFN_vkGetQueryPoolResults results; + gpuload_set_data_fn set_data; // a layer must give the loader every command buffer it allocates; NULL elsewhere + double period_ns; + uint64_t max_ticks; +}; + +struct gpuload_slot { + VkCommandBuffer start, end; + uint64_t last_end; +}; + +struct gpuload_ring { + int state; // 0 not set up, 1 timing, -1 cannot time + VkCommandPool pool; + VkQueryPool queries; + uint64_t mask; + uint32_t next, oldest, inflight; + struct gpuload_slot slot[GPULOAD_RING]; +}; + +#define GPULOAD_LONGEST_BATCH_NS 2000000000.0 + +static inline void gpuload_vk_period(struct gpuload_vk *v, float timestamp_period) { + v->period_ns = timestamp_period; + v->max_ticks = timestamp_period > 0 ? (uint64_t)(GPULOAD_LONGEST_BATCH_NS / timestamp_period) : 0; +} + +static inline int gpuload_vk_complete(const struct gpuload_vk *v) { + return v->device && v->create_pool && v->destroy_pool && v->alloc_cmds && v->begin && v->end && v->cmd_reset && + v->cmd_timestamp && v->create_queries && v->destroy_queries && v->results && v->period_ns > 0; +} + +static inline void gpuload_ring_release(struct gpuload_ring *r, const struct gpuload_vk *v) { + if (r->queries) v->destroy_queries(v->device, r->queries, NULL); + if (r->pool) v->destroy_pool(v->device, r->pool, NULL); + r->queries = VK_NULL_HANDLE; + r->pool = VK_NULL_HANDLE; + r->next = r->oldest = r->inflight = 0; +} + +static inline int gpuload_ring_record(struct gpuload_ring *r, const struct gpuload_vk *v, uint32_t i) { + const VkCommandBufferBeginInfo begin = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO}; + struct gpuload_slot *s = &r->slot[i]; + if (v->begin(s->start, &begin) != VK_SUCCESS) return 0; + v->cmd_reset(s->start, r->queries, 2 * i, 2); + v->cmd_timestamp(s->start, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, r->queries, 2 * i); + if (v->end(s->start) != VK_SUCCESS) return 0; + if (v->begin(s->end, &begin) != VK_SUCCESS) return 0; + v->cmd_timestamp(s->end, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, r->queries, 2 * i + 1); + return v->end(s->end) == VK_SUCCESS; +} + +// Sets the ring up for a queue of this family; returns 1 when it can time it (r->state says the same afterwards). +static inline int gpuload_ring_setup(struct gpuload_ring *r, const struct gpuload_vk *v, uint32_t family, + uint32_t timestamp_bits) { + r->state = -1; + if (!timestamp_bits || !gpuload_vk_complete(v)) return 0; + r->mask = timestamp_bits >= 64 ? ~0ull : (1ull << timestamp_bits) - 1; + const VkCommandPoolCreateInfo pool = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .queueFamilyIndex = family}; + const VkQueryPoolCreateInfo queries = {.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO, + .queryType = VK_QUERY_TYPE_TIMESTAMP, .queryCount = 2 * GPULOAD_RING}; + VkCommandBuffer cmds[2 * GPULOAD_RING]; + if (v->create_pool(v->device, &pool, NULL, &r->pool) != VK_SUCCESS) { r->pool = VK_NULL_HANDLE; goto fail; } + if (v->create_queries(v->device, &queries, NULL, &r->queries) != VK_SUCCESS) { r->queries = VK_NULL_HANDLE; goto fail; } + const VkCommandBufferAllocateInfo alloc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, .commandPool = r->pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .commandBufferCount = 2 * GPULOAD_RING}; + if (v->alloc_cmds(v->device, &alloc, cmds) != VK_SUCCESS) goto fail; + for (uint32_t i = 0; i < 2 * GPULOAD_RING; i++) + if (v->set_data && v->set_data(v->device, cmds[i]) != VK_SUCCESS) goto fail; + for (uint32_t i = 0; i < GPULOAD_RING; i++) { + r->slot[i].start = cmds[2 * i]; + r->slot[i].end = cmds[2 * i + 1]; + r->slot[i].last_end = 0; + if (!gpuload_ring_record(r, v, i)) goto fail; + } + r->next = r->oldest = r->inflight = 0; + r->state = 1; + return 1; +fail: + gpuload_ring_release(r, v); + r->state = -1; + return 0; +} + +// Nanoseconds of GPU time in the batches that finished since the last call. Slots are taken in ring order and a +// queue runs its batches in order, so the oldest slot finishes first. +static inline uint64_t gpuload_ring_harvest(struct gpuload_ring *r, const struct gpuload_vk *v) { + uint64_t ticks = 0; + while (r->inflight) { + struct gpuload_slot *s = &r->slot[r->oldest]; + uint64_t q[4] = {0, 0, 0, 0}; + VkResult res = v->results(v->device, r->queries, 2 * r->oldest, 2, sizeof(q), q, 2 * sizeof(uint64_t), + VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WITH_AVAILABILITY_BIT); + if (res != VK_SUCCESS && res != VK_NOT_READY) break; + uint64_t start = q[0] & r->mask, end = q[2] & r->mask; + if (!gpuload_result_is_new(q[1], q[3], end, s->last_end)) break; + s->last_end = end; + r->oldest = (r->oldest + 1) % GPULOAD_RING; + r->inflight--; + ticks += gpuload_interval(start, end, v->max_ticks); + } + return (uint64_t)((double)ticks * v->period_ns); +} + +static inline int gpuload_plain_batch(const void *next) { + for (const VkBaseInStructure *s = (const VkBaseInStructure *)next; s; s = s->pNext) { + if (s->sType == VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO) return 0; + if (s->sType == VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO && ((const VkProtectedSubmitInfo *)s)->protectedSubmit) + return 0; + } + return 1; +} + +static inline struct gpuload_slot *gpuload_ring_take(struct gpuload_ring *r) { + if (r->inflight >= GPULOAD_RING) return NULL; + struct gpuload_slot *s = &r->slot[r->next]; + r->next = (r->next + 1) % GPULOAD_RING; + r->inflight++; + return s; +} + +// Gives back the slots of a submit that failed. +static inline void gpuload_ring_unwind(struct gpuload_ring *r, uint32_t used) { + r->next = (r->next + GPULOAD_RING - used) % GPULOAD_RING; + r->inflight -= used; +} + +// A copy of the batches with the ring's command buffers around each one that has command buffers (free() it after +// the submit), or NULL to submit the originals. *used counts the slots taken, for gpuload_ring_unwind. +static inline VkSubmitInfo *gpuload_ring_wrap(struct gpuload_ring *r, uint32_t count, const VkSubmitInfo *infos, + uint32_t *used) { + *used = 0; + size_t cmds = 0; + for (uint32_t i = 0; i < count; i++) cmds += infos[i].commandBufferCount + 2; + VkSubmitInfo *mine = (VkSubmitInfo *)malloc(count * sizeof(*mine) + cmds * sizeof(VkCommandBuffer)); + if (!mine) return NULL; + VkCommandBuffer *list = (VkCommandBuffer *)(mine + count); + for (uint32_t i = 0; i < count; i++) { + uint32_t n = infos[i].commandBufferCount; + mine[i] = infos[i]; + if (!n || !gpuload_plain_batch(infos[i].pNext)) continue; + struct gpuload_slot *s = gpuload_ring_take(r); + if (!s) continue; + list[0] = s->start; + memcpy(list + 1, infos[i].pCommandBuffers, n * sizeof(VkCommandBuffer)); + list[n + 1] = s->end; + mine[i].pCommandBuffers = list; + mine[i].commandBufferCount = n + 2; + list += n + 2; + (*used)++; + } + return mine; +} + +static inline VkSubmitInfo2 *gpuload_ring_wrap2(struct gpuload_ring *r, uint32_t count, const VkSubmitInfo2 *infos, + uint32_t *used) { + *used = 0; + size_t cmds = 0; + for (uint32_t i = 0; i < count; i++) cmds += infos[i].commandBufferInfoCount + 2; + VkSubmitInfo2 *mine = (VkSubmitInfo2 *)malloc(count * sizeof(*mine) + cmds * sizeof(VkCommandBufferSubmitInfo)); + if (!mine) return NULL; + VkCommandBufferSubmitInfo *list = (VkCommandBufferSubmitInfo *)(mine + count); + for (uint32_t i = 0; i < count; i++) { + uint32_t n = infos[i].commandBufferInfoCount; + mine[i] = infos[i]; + if (!n || (infos[i].flags & VK_SUBMIT_PROTECTED_BIT) || !gpuload_plain_batch(infos[i].pNext)) continue; + struct gpuload_slot *s = gpuload_ring_take(r); + if (!s) continue; + memset(&list[0], 0, sizeof(list[0])); + list[0].sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO; + list[0].commandBuffer = s->start; + memcpy(list + 1, infos[i].pCommandBufferInfos, n * sizeof(VkCommandBufferSubmitInfo)); + memset(&list[n + 1], 0, sizeof(list[n + 1])); + list[n + 1].sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO; + list[n + 1].commandBuffer = s->end; + mine[i].pCommandBufferInfos = list; + mine[i].commandBufferInfoCount = n + 2; + list += n + 2; + (*used)++; + } + return mine; +} + +#endif diff --git a/tools/gpuload/src/vk_layer_droiddeck_gpuload.c b/tools/gpuload/src/vk_layer_droiddeck_gpuload.c new file mode 100644 index 000000000..ef58bef6d --- /dev/null +++ b/tools/gpuload/src/vk_layer_droiddeck_gpuload.c @@ -0,0 +1,410 @@ +// VK_LAYER_DROIDDECK_gpu_load: this process's GPU busy time for the HUD where Android keeps the GPU load from apps +// (kgsl sysfs SELinux-blocked, perfcounter reads refused while /sys/class/kgsl/kgsl-3d0/perfcounter is 0). +// The process total in nanoseconds goes to $DROIDDECK_GPU_LOAD_DIR/<pid>; nothing is timed while +// $DROIDDECK_GPU_LOAD_DIR/on is missing (the app removes it while no HUD is shown). +#define _GNU_SOURCE +#include <vulkan/vulkan.h> +#include <vulkan/vk_layer.h> + +#include <errno.h> +#include <fcntl.h> +#include <pthread.h> +#include <stdatomic.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "gpuload_ring.h" + +#define EXPORT __attribute__((visibility("default"))) +#define MAX_FAMILIES 32 +#define WANTED_CHECK_NS 500000000ull +#define WRITE_EVERY_NS 100000000ull + +static const char *g_dir; + +static void say(const char *what) { + // FEX leaves program_invocation_short_name empty for x86 programs. + fprintf(stderr, "[droiddeck-gpu-load] %s (pid %d): %s\n", program_invocation_short_name, (int)getpid(), what); +} + +__attribute__((constructor)) static void init(void) { + const char *dir = getenv("DROIDDECK_GPU_LOAD_DIR"); + g_dir = dir && *dir ? dir : NULL; +} + +static uint64_t now_ns(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return (uint64_t)ts.tv_sec * 1000000000ull + (uint64_t)ts.tv_nsec; +} + +struct inst { + struct inst *next_in_list; + VkInstance handle; + PFN_vkGetInstanceProcAddr gipa; + PFN_vkDestroyInstance destroy; + PFN_vkGetPhysicalDeviceProperties props; + PFN_vkGetPhysicalDeviceQueueFamilyProperties families; +}; + +struct dev { + struct dev *next_in_list; + VkDevice handle; + PFN_vkGetDeviceProcAddr gdpa; + PFN_vkDestroyDevice destroy; + PFN_vkGetDeviceQueue get_queue; + PFN_vkGetDeviceQueue2 get_queue2; + PFN_vkQueueSubmit submit; + PFN_vkQueueSubmit2 submit2; + PFN_vkQueueSubmit2 submit2_khr; + struct gpuload_vk vk; + uint32_t family_count; + uint32_t timestamp_bits[MAX_FAMILIES]; +}; + +struct queue { + struct queue *next_in_list; + VkQueue handle; + struct dev *dev; + uint32_t family; + uint32_t epoch; + struct gpuload_ring ring; +}; + +static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; +static struct inst *g_insts; +static struct dev *g_devs; +static struct queue *g_queues; + +static void *key(const void *obj) { return *(void *const *)obj; } + +static struct inst *inst_for(const void *obj) { + struct inst *r; + pthread_mutex_lock(&g_lock); + for (r = g_insts; r && key(r->handle) != key(obj); r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static struct dev *dev_for(const void *obj) { + struct dev *r; + pthread_mutex_lock(&g_lock); + for (r = g_devs; r && key(r->handle) != key(obj); r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static struct queue *queue_for(VkQueue handle) { + struct queue *r; + pthread_mutex_lock(&g_lock); + for (r = g_queues; r && r->handle != handle; r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static void note_queue(struct dev *d, VkQueue handle, uint32_t family) { + if (!handle || queue_for(handle)) return; + struct queue *q = calloc(1, sizeof(*q)); + if (!q) return; + q->handle = handle; + q->dev = d; + q->family = family; + pthread_mutex_lock(&g_lock); + q->next_in_list = g_queues; + g_queues = q; + pthread_mutex_unlock(&g_lock); +} + +// ---- process total --------------------------------------------------------------------------------------------- + +static _Atomic uint64_t g_busy_ns; +static _Atomic uint64_t g_wanted_at; +static _Atomic int g_wanted; +static _Atomic uint32_t g_epoch = 1; // bumped each time the HUD comes back +static pthread_mutex_t g_write_lock = PTHREAD_MUTEX_INITIALIZER; +static uint64_t g_written_at; +static int g_fd = -1; +static pid_t g_fd_pid; +static int g_announced; + +static int wanted(uint64_t now) { + uint64_t at = atomic_load(&g_wanted_at); + if (at && now - at < WANTED_CHECK_NS) return atomic_load(&g_wanted); + atomic_store(&g_wanted_at, now); + char path[512]; + snprintf(path, sizeof(path), "%s/on", g_dir); + int on = access(path, F_OK) == 0; + if (on && !atomic_exchange(&g_wanted, on)) atomic_fetch_add(&g_epoch, 1); + if (!on) atomic_store(&g_wanted, 0); + return on; +} + +static void publish(uint64_t now) { + if (pthread_mutex_trylock(&g_write_lock)) return; + if (now - g_written_at >= WRITE_EVERY_NS) { + g_written_at = now; + pid_t pid = getpid(); + struct stat st; + // The app deletes files that stopped changing; a forked child needs its own. + if (g_fd >= 0 && (g_fd_pid != pid || fstat(g_fd, &st) || st.st_nlink == 0)) { close(g_fd); g_fd = -1; } + if (g_fd < 0) { + char path[512]; + snprintf(path, sizeof(path), "%s/%d", g_dir, (int)pid); + g_fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644); + g_fd_pid = pid; + } + if (g_fd >= 0) { + char line[80]; + int n = snprintf(line, sizeof(line), "%20llu %-32.32s\n", (unsigned long long)atomic_load(&g_busy_ns), + program_invocation_short_name); + if (pwrite(g_fd, line, (size_t)n, 0) != n) { close(g_fd); g_fd = -1; } + } + } + pthread_mutex_unlock(&g_write_lock); +} + +// The queue to time this submit on, or NULL to pass it through. +static struct queue *measuring(VkQueue handle) { + if (!g_dir) return NULL; + struct queue *q = queue_for(handle); + if (!q) return NULL; + uint64_t now = now_ns(); + if (!wanted(now)) return NULL; + struct dev *d = q->dev; + if (q->ring.state == 0) { + uint32_t bits = q->family < d->family_count ? d->timestamp_bits[q->family] : 0; + if (gpuload_ring_setup(&q->ring, &d->vk, q->family, bits)) { + if (!__atomic_exchange_n(&g_announced, 1, __ATOMIC_RELAXED)) say("timing this process's GPU work for the HUD"); + } else { + say(bits ? "cannot set up GPU timing on this queue" : "this queue family has no timestamps"); + } + q->epoch = atomic_load(&g_epoch); + } + if (q->ring.state != 1) return NULL; + uint64_t ns = gpuload_ring_harvest(&q->ring, &d->vk); + uint32_t epoch = atomic_load(&g_epoch); + if (q->epoch == epoch) atomic_fetch_add(&g_busy_ns, ns); + else q->epoch = epoch; // timed before the HUD went away + publish(now); + return q; +} + +static VkResult VKAPI_CALL QueueSubmit(VkQueue queue, uint32_t count, const VkSubmitInfo *infos, VkFence fence) { + struct dev *d = dev_for(queue); + if (!d) return VK_ERROR_DEVICE_LOST; + struct queue *q = count ? measuring(queue) : NULL; + uint32_t used = 0; + VkSubmitInfo *mine = q ? gpuload_ring_wrap(&q->ring, count, infos, &used) : NULL; + VkResult r = d->submit(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&q->ring, used); + free(mine); + return r; +} + +static VkResult submit2(PFN_vkQueueSubmit2 next, VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct queue *q = count ? measuring(queue) : NULL; + uint32_t used = 0; + VkSubmitInfo2 *mine = q ? gpuload_ring_wrap2(&q->ring, count, infos, &used) : NULL; + VkResult r = next(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&q->ring, used); + free(mine); + return r; +} + +static VkResult VKAPI_CALL QueueSubmit2(VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct dev *d = dev_for(queue); + return d ? submit2(d->submit2, queue, count, infos, fence) : VK_ERROR_DEVICE_LOST; +} + +static VkResult VKAPI_CALL QueueSubmit2KHR(VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct dev *d = dev_for(queue); + return d ? submit2(d->submit2_khr, queue, count, infos, fence) : VK_ERROR_DEVICE_LOST; +} + +static void VKAPI_CALL GetDeviceQueue(VkDevice device, uint32_t family, uint32_t index, VkQueue *out) { + struct dev *d = dev_for(device); + if (!d) return; + d->get_queue(device, family, index, out); + if (out && *out) note_queue(d, *out, family); +} + +static void VKAPI_CALL GetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *out) { + struct dev *d = dev_for(device); + if (!d) return; + d->get_queue2(device, info, out); + if (out && *out) note_queue(d, *out, info->queueFamilyIndex); +} + +// ---- instance and device --------------------------------------------------------------------------------------- + +static VkResult VKAPI_CALL CreateInstance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *alloc, VkInstance *out) { + VkLayerInstanceCreateInfo *link = (VkLayerInstanceCreateInfo *)ci->pNext; + while (link && !(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO && link->function == VK_LAYER_LINK_INFO)) + link = (VkLayerInstanceCreateInfo *)link->pNext; + if (!link) return VK_ERROR_INITIALIZATION_FAILED; + PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; + link->u.pLayerInfo = link->u.pLayerInfo->pNext; + PFN_vkCreateInstance create = (PFN_vkCreateInstance)next_gipa(VK_NULL_HANDLE, "vkCreateInstance"); + if (!create) return VK_ERROR_INITIALIZATION_FAILED; + struct inst *in = calloc(1, sizeof(*in)); + if (!in) return VK_ERROR_OUT_OF_HOST_MEMORY; + VkResult r = create(ci, alloc, out); + if (r != VK_SUCCESS) { free(in); return r; } + in->handle = *out; + in->gipa = next_gipa; + in->destroy = (PFN_vkDestroyInstance)next_gipa(*out, "vkDestroyInstance"); + in->props = (PFN_vkGetPhysicalDeviceProperties)next_gipa(*out, "vkGetPhysicalDeviceProperties"); + in->families = (PFN_vkGetPhysicalDeviceQueueFamilyProperties)next_gipa(*out, "vkGetPhysicalDeviceQueueFamilyProperties"); + pthread_mutex_lock(&g_lock); + in->next_in_list = g_insts; + g_insts = in; + pthread_mutex_unlock(&g_lock); + return VK_SUCCESS; +} + +static void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocationCallbacks *alloc) { + struct inst *in = inst_for(instance); + if (!in) return; + PFN_vkDestroyInstance destroy = in->destroy; + pthread_mutex_lock(&g_lock); + for (struct inst **p = &g_insts; *p; p = &(*p)->next_in_list) + if (*p == in) { *p = in->next_in_list; break; } + pthread_mutex_unlock(&g_lock); + free(in); + if (destroy) destroy(instance, alloc); +} + +static VkLayerDeviceCreateInfo *device_chain(const VkDeviceCreateInfo *ci, VkLayerFunction function) { + VkLayerDeviceCreateInfo *c = (VkLayerDeviceCreateInfo *)ci->pNext; + while (c && !(c->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && c->function == function)) + c = (VkLayerDeviceCreateInfo *)c->pNext; + return c; +} + +static VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, const VkAllocationCallbacks *alloc, + VkDevice *out) { + VkLayerDeviceCreateInfo *link = device_chain(ci, VK_LAYER_LINK_INFO); + if (!link) return VK_ERROR_INITIALIZATION_FAILED; + VkLayerDeviceCreateInfo *callback = device_chain(ci, VK_LOADER_DATA_CALLBACK); + PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; + PFN_vkGetDeviceProcAddr next_gdpa = link->u.pLayerInfo->pfnNextGetDeviceProcAddr; + link->u.pLayerInfo = link->u.pLayerInfo->pNext; + struct inst *in = inst_for(pd); + PFN_vkCreateDevice create = (PFN_vkCreateDevice)next_gipa(in ? in->handle : VK_NULL_HANDLE, "vkCreateDevice"); + if (!create) return VK_ERROR_INITIALIZATION_FAILED; + struct dev *d = calloc(1, sizeof(*d)); + if (!d) return VK_ERROR_OUT_OF_HOST_MEMORY; + VkResult r = create(pd, ci, alloc, out); + if (r != VK_SUCCESS) { free(d); return r; } + d->handle = *out; + d->gdpa = next_gdpa; +#define LOAD(field, type, name) d->field = (type)next_gdpa(*out, name) + LOAD(destroy, PFN_vkDestroyDevice, "vkDestroyDevice"); + LOAD(get_queue, PFN_vkGetDeviceQueue, "vkGetDeviceQueue"); + LOAD(get_queue2, PFN_vkGetDeviceQueue2, "vkGetDeviceQueue2"); + LOAD(submit, PFN_vkQueueSubmit, "vkQueueSubmit"); + LOAD(submit2, PFN_vkQueueSubmit2, "vkQueueSubmit2"); + LOAD(submit2_khr, PFN_vkQueueSubmit2, "vkQueueSubmit2KHR"); + LOAD(vk.create_pool, PFN_vkCreateCommandPool, "vkCreateCommandPool"); + LOAD(vk.destroy_pool, PFN_vkDestroyCommandPool, "vkDestroyCommandPool"); + LOAD(vk.alloc_cmds, PFN_vkAllocateCommandBuffers, "vkAllocateCommandBuffers"); + LOAD(vk.begin, PFN_vkBeginCommandBuffer, "vkBeginCommandBuffer"); + LOAD(vk.end, PFN_vkEndCommandBuffer, "vkEndCommandBuffer"); + LOAD(vk.cmd_reset, PFN_vkCmdResetQueryPool, "vkCmdResetQueryPool"); + LOAD(vk.cmd_timestamp, PFN_vkCmdWriteTimestamp, "vkCmdWriteTimestamp"); + LOAD(vk.create_queries, PFN_vkCreateQueryPool, "vkCreateQueryPool"); + LOAD(vk.destroy_queries, PFN_vkDestroyQueryPool, "vkDestroyQueryPool"); + LOAD(vk.results, PFN_vkGetQueryPoolResults, "vkGetQueryPoolResults"); +#undef LOAD + d->vk.device = *out; + d->vk.set_data = callback ? (gpuload_set_data_fn)callback->u.pfnSetDeviceLoaderData : NULL; + if (in && in->props && in->families) { + VkPhysicalDeviceProperties props; + in->props(pd, &props); + gpuload_vk_period(&d->vk, props.limits.timestampPeriod); + uint32_t n = 0; + in->families(pd, &n, NULL); + VkQueueFamilyProperties families[MAX_FAMILIES]; + if (n > MAX_FAMILIES) n = MAX_FAMILIES; + in->families(pd, &n, families); + d->family_count = n; + for (uint32_t i = 0; i < n; i++) d->timestamp_bits[i] = families[i].timestampValidBits; + } + // Without the loader callback our command buffers would lack the loader's dispatch pointer. + if (!d->vk.set_data) d->family_count = 0; + pthread_mutex_lock(&g_lock); + d->next_in_list = g_devs; + g_devs = d; + pthread_mutex_unlock(&g_lock); + return VK_SUCCESS; +} + +static void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCallbacks *alloc) { + struct dev *d = dev_for(device); + if (!d) return; + struct queue *mine = NULL; + pthread_mutex_lock(&g_lock); + for (struct queue **p = &g_queues; *p;) { + struct queue *q = *p; + if (q->dev == d) { *p = q->next_in_list; q->next_in_list = mine; mine = q; } else p = &q->next_in_list; + } + for (struct dev **p = &g_devs; *p; p = &(*p)->next_in_list) + if (*p == d) { *p = d->next_in_list; break; } + pthread_mutex_unlock(&g_lock); + while (mine) { + struct queue *q = mine; + mine = q->next_in_list; + gpuload_ring_release(&q->ring, &d->vk); + free(q); + } + PFN_vkDestroyDevice destroy = d->destroy; + free(d); + if (destroy) destroy(device, alloc); +} + +// ---- dispatch -------------------------------------------------------------------------------------------------- + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetDeviceProcAddr(VkDevice device, const char *name); + +static PFN_vkVoidFunction device_hook(struct dev *d, const char *name) { + if (!g_dir) return NULL; + if (!strcmp(name, "vkGetDeviceQueue") && d->get_queue) return (PFN_vkVoidFunction)GetDeviceQueue; + if (!strcmp(name, "vkGetDeviceQueue2") && d->get_queue2) return (PFN_vkVoidFunction)GetDeviceQueue2; + if (!strcmp(name, "vkQueueSubmit") && d->submit) return (PFN_vkVoidFunction)QueueSubmit; + if (!strcmp(name, "vkQueueSubmit2") && d->submit2) return (PFN_vkVoidFunction)QueueSubmit2; + if (!strcmp(name, "vkQueueSubmit2KHR") && d->submit2_khr) return (PFN_vkVoidFunction)QueueSubmit2KHR; + return NULL; +} + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetInstanceProcAddr(VkInstance instance, const char *name) { + if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)CreateInstance; + if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)DestroyInstance; + if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)CreateDevice; + if (!strcmp(name, "vkGetInstanceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetInstanceProcAddr; + if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetDeviceProcAddr; + if (!instance) return NULL; + struct inst *in = inst_for(instance); + return in ? in->gipa(instance, name) : NULL; +} + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetDeviceProcAddr(VkDevice device, const char *name) { + if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetDeviceProcAddr; + if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; + struct dev *d = dev_for(device); + if (!d) return NULL; + PFN_vkVoidFunction mine = device_hook(d, name); + return mine ? mine : d->gdpa(device, name); +} + +EXPORT VKAPI_ATTR VkResult VKAPI_CALL DroidDeckGpuLoad_NegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *v) { + if (v->loaderLayerInterfaceVersion > 2) v->loaderLayerInterfaceVersion = 2; + v->pfnGetInstanceProcAddr = DroidDeckGpuLoad_GetInstanceProcAddr; + v->pfnGetDeviceProcAddr = DroidDeckGpuLoad_GetDeviceProcAddr; + v->pfnGetPhysicalDeviceProcAddr = NULL; + return VK_SUCCESS; +} diff --git a/tools/gpuload/tests/test_gpuload_busy.c b/tools/gpuload/tests/test_gpuload_busy.c new file mode 100644 index 000000000..706580e90 --- /dev/null +++ b/tools/gpuload/tests/test_gpuload_busy.c @@ -0,0 +1,24 @@ +#include <assert.h> +#include <stdio.h> + +#include "gpuload_busy.h" + +int main(void) { + const uint64_t max = 1000; + assert(gpuload_interval(10, 20, max) == 10); + // Each batch counts on its own, even when the counter restarted in between (later batch has smaller ticks). + assert(gpuload_interval(900000, 900400, max) == 400); + assert(gpuload_interval(50, 350, max) == 300); + // Backwards, empty or too long: nothing. + assert(gpuload_interval(60, 50, max) == 0); + assert(gpuload_interval(70, 70, max) == 0); + assert(gpuload_interval(100, 100 + max + 1, max) == 0); + assert(gpuload_interval(100, 100 + max, max) == max); + // Query results: both halves available and an end that differs from the last harvested one. + assert(gpuload_result_is_new(1, 1, 500, 400)); + assert(!gpuload_result_is_new(1, 1, 400, 400)); + assert(!gpuload_result_is_new(1, 0, 500, 400)); + assert(!gpuload_result_is_new(0, 1, 500, 400)); + puts("test_gpuload_busy: ok"); + return 0; +} diff --git a/tools/gpuload/tests/test_gpuload_ring.c b/tools/gpuload/tests/test_gpuload_ring.c new file mode 100644 index 000000000..4c5bc1395 --- /dev/null +++ b/tools/gpuload/tests/test_gpuload_ring.c @@ -0,0 +1,96 @@ +#include <assert.h> +#include <stdint.h> +#include <stdio.h> + +#include "gpuload_ring.h" + +// A fake device: query results come from this table, [start, start available, end, end available] per slot. +static uint64_t g_result[GPULOAD_RING][4]; +static uintptr_t g_next_handle = 0x1000; + +static VkResult VKAPI_CALL create_pool(VkDevice d, const VkCommandPoolCreateInfo *ci, const VkAllocationCallbacks *a, VkCommandPool *out) { + (void)d; (void)ci; (void)a; *out = (VkCommandPool)(g_next_handle++); return VK_SUCCESS; +} +static void VKAPI_CALL destroy_pool(VkDevice d, VkCommandPool p, const VkAllocationCallbacks *a) { (void)d; (void)p; (void)a; } +static VkResult VKAPI_CALL alloc_cmds(VkDevice d, const VkCommandBufferAllocateInfo *ai, VkCommandBuffer *out) { + (void)d; + for (uint32_t i = 0; i < ai->commandBufferCount; i++) out[i] = (VkCommandBuffer)(g_next_handle++); + return VK_SUCCESS; +} +static VkResult VKAPI_CALL begin(VkCommandBuffer c, const VkCommandBufferBeginInfo *bi) { (void)c; (void)bi; return VK_SUCCESS; } +static VkResult VKAPI_CALL end(VkCommandBuffer c) { (void)c; return VK_SUCCESS; } +static void VKAPI_CALL cmd_reset(VkCommandBuffer c, VkQueryPool q, uint32_t first, uint32_t n) { (void)c; (void)q; (void)first; (void)n; } +static void VKAPI_CALL cmd_timestamp(VkCommandBuffer c, VkPipelineStageFlagBits s, VkQueryPool q, uint32_t i) { (void)c; (void)s; (void)q; (void)i; } +static VkResult VKAPI_CALL create_queries(VkDevice d, const VkQueryPoolCreateInfo *ci, const VkAllocationCallbacks *a, VkQueryPool *out) { + (void)d; (void)a; assert(ci->queryCount == 2 * GPULOAD_RING); *out = (VkQueryPool)(g_next_handle++); return VK_SUCCESS; +} +static void VKAPI_CALL destroy_queries(VkDevice d, VkQueryPool q, const VkAllocationCallbacks *a) { (void)d; (void)q; (void)a; } +static VkResult VKAPI_CALL results(VkDevice d, VkQueryPool q, uint32_t first, uint32_t n, size_t size, void *data, + VkDeviceSize stride, VkQueryResultFlags flags) { + (void)d; (void)q; (void)size; + assert(n == 2 && stride == 2 * sizeof(uint64_t) && (flags & VK_QUERY_RESULT_WITH_AVAILABILITY_BIT)); + uint64_t *out = data; + for (int k = 0; k < 4; k++) out[k] = g_result[first / 2][k]; + return out[1] && out[3] ? VK_SUCCESS : VK_NOT_READY; +} + +static void finish(uint32_t slot, uint64_t start, uint64_t end) { + g_result[slot][0] = start; g_result[slot][1] = 1; g_result[slot][2] = end; g_result[slot][3] = 1; +} + +int main(void) { + struct gpuload_vk v = { + .device = (VkDevice)(uintptr_t)1, .create_pool = create_pool, .destroy_pool = destroy_pool, .alloc_cmds = alloc_cmds, + .begin = begin, .end = end, .cmd_reset = cmd_reset, .cmd_timestamp = cmd_timestamp, + .create_queries = create_queries, .destroy_queries = destroy_queries, .results = results, + }; + struct gpuload_ring r = {0}; + assert(!gpuload_ring_setup(&r, &v, 0, 64) && r.state == -1); // no timestamp period yet + gpuload_vk_period(&v, 52.083f); + assert(!gpuload_ring_setup(&r, &v, 0, 0) && r.state == -1); // family without timestamps + assert(gpuload_ring_setup(&r, &v, 0, 64) && r.state == 1); + + VkCommandBuffer app[2] = {(VkCommandBuffer)(uintptr_t)0xa1, (VkCommandBuffer)(uintptr_t)0xa2}; + VkProtectedSubmitInfo prot = {.sType = VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO, .protectedSubmit = VK_TRUE}; + VkSubmitInfo batches[3] = { + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .commandBufferCount = 2, .pCommandBuffers = app}, + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO}, // semaphores only + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .pNext = &prot, .commandBufferCount = 1, .pCommandBuffers = app}, + }; + uint32_t used = 0; + VkSubmitInfo *mine = gpuload_ring_wrap(&r, 3, batches, &used); + assert(mine && used == 1 && r.inflight == 1); + assert(mine[0].commandBufferCount == 4 && mine[0].pCommandBuffers[0] == r.slot[0].start && + mine[0].pCommandBuffers[1] == app[0] && mine[0].pCommandBuffers[2] == app[1] && + mine[0].pCommandBuffers[3] == r.slot[0].end); + assert(mine[1].commandBufferCount == 0 && mine[2].commandBufferCount == 1 && mine[2].pCommandBuffers == app); + free(mine); + + assert(gpuload_ring_harvest(&r, &v) == 0 && r.inflight == 1); // not finished yet + finish(0, 1000, 1192); // 192 ticks = 10 us + assert(gpuload_ring_harvest(&r, &v) == 9999 && r.inflight == 0); + + // A failed submit gives its slot back. + mine = gpuload_ring_wrap(&r, 1, batches, &used); + assert(used == 1 && r.inflight == 1); + gpuload_ring_unwind(&r, used); + assert(r.inflight == 0 && r.next == 1); + free(mine); + + // Fill the ring: the 65th batch goes out untimed. + for (int i = 0; i < GPULOAD_RING; i++) { mine = gpuload_ring_wrap(&r, 1, batches, &used); assert(used == 1); free(mine); } + mine = gpuload_ring_wrap(&r, 1, batches, &used); + assert(used == 0 && mine[0].commandBufferCount == 2); + free(mine); + + // Slot 0 comes round again: until the GPU resets it, it still shows the old pair, which must not count twice. + // Slots 1..63 finish after a counter restart (smaller ticks than slot 0's old pair); each still counts. + for (uint32_t s = 1; s < GPULOAD_RING; s++) finish(s, 10 * s, 10 * s + 4); + assert(gpuload_ring_harvest(&r, &v) == (uint64_t)(63 * 4 * 52.083f) && r.inflight == 1 && r.oldest == 0); + finish(0, 5, 9); + assert(gpuload_ring_harvest(&r, &v) == (uint64_t)(4 * 52.083f) && r.inflight == 0); + + gpuload_ring_release(&r, &v); + puts("test_gpuload_ring: ok"); + return 0; +} diff --git a/tools/linuxfs/build-x86-preloads.sh b/tools/linuxfs/build-x86-preloads.sh index 61abcb321..0e0abffcd 100755 --- a/tools/linuxfs/build-x86-preloads.sh +++ b/tools/linuxfs/build-x86-preloads.sh @@ -45,7 +45,7 @@ lib=$out/x86_64/libwebkitinput.so gcc -m64 -shared -fPIC -O2 -Wall -Wextra -nostdlib -fno-stack-protector -fno-builtin -fvisibility=hidden \ -o "$lib" tools/linuxfs/fex/webkitinput.c strip --strip-unneeded "$lib" -if objdump -p "$lib" | grep -q NEEDED || [ "$(nm -D --undefined-only "$lib" | awk '{print $1 $2}' | LC_ALL=C sort | tr '\n' ' ')" != "wdlsym wg_object_get_data wg_object_set wg_object_set_data wg_type_check_instance_is_a wgtk_container_forall wgtk_container_get_type wgtk_key_snooper_install wgtk_widget_get_toplevel wwebkit_user_script_new wwebkit_user_script_unref wwebkit_web_view_get_type wwebkit_web_view_get_uri wwebkit_web_view_run_javascript " ]; then +if objdump -p "$lib" | grep -q NEEDED || [ "$(nm -D --undefined-only "$lib" | awk '{print $1 $2}' | LC_ALL=C sort | tr '\n' ' ')" != "wdlsym wg_getenv wg_object_get_data wg_object_set wg_object_set_data wg_type_check_instance_is_a wgtk_container_forall wgtk_container_get_type wgtk_key_snooper_install wgtk_widget_get_toplevel wwebkit_user_script_new wwebkit_user_script_unref wwebkit_web_view_get_type wwebkit_web_view_get_uri wwebkit_web_view_run_javascript " ]; then echo "$lib must need nothing but weak GLib, GTK and WebKit calls" >&2 exit 1 fi diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 71377fed6..f10cff247 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -11,7 +11,11 @@ export MOZ_DISABLE_CONTENT_SANDBOX=1 MOZ_DISABLE_GMP_SANDBOX=1 MOZ_DISABLE_RDD_S 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 +export KWIN_USE_OVERLAYS=0 [ -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 @@ -32,7 +36,7 @@ cat > /usr/share/applications/droiddeck-steam-x64.desktop <<'ENTRY' Type=Application Name=Steam x86-64 (FEX, experimental) Comment=Valve's x86-64 Linux client under FEX, in its own home with its own login -Exec=qterminal -e /usr/local/bin/droiddeck-steam-x64 +Exec=konsole -e /usr/local/bin/droiddeck-steam-x64 Icon=steam Categories=System; ENTRY @@ -40,6 +44,20 @@ python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /' ( while sleep 30; do python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /'; done ) & python3 /usr/local/bin/droiddeck-desktop-gpu 2>&1 | sed 's/^/[gpu] /' /usr/local/bin/droiddeck-desktop-window-rules 2>&1 | sed 's/^/[rules] /' +( python3 /usr/local/bin/droiddeck-library-perms 2>&1 | sed 's/^/[perms] /' ) & +mkdir -p /usr/local/share/applications +cat > /usr/local/share/applications/droiddeck-ime.desktop <<'ENTRY' +[Desktop Entry] +Type=Application +Name=Android keyboard +Exec=/usr/local/bin/droiddeck-ime +NoDisplay=true +X-KDE-Wayland-VirtualKeyboard=true +ENTRY +input_method=$(kreadconfig6 --file kwinrc --group Wayland --key InputMethod 2>/dev/null) +case $input_method in + ''|*/droiddeck-ime.desktop) kwriteconfig6 --file kwinrc --group Wayland --key InputMethod /usr/local/share/applications/droiddeck-ime.desktop ;; +esac python3 /usr/local/bin/droiddeck-open --install 2>&1 | sed 's/^/[open] /' export APPIMAGE_EXTRACT_AND_RUN=1 [ -e /etc/xdg/kiorc ] || printf '[Executable scripts]\nbehaviourOnLaunch=execute\n' >/etc/xdg/kiorc 2>/dev/null @@ -52,6 +70,19 @@ if [ ! -e "$HOME/.config/droiddeck-desktop-icons" ]; then touch "$HOME/.config/droiddeck-desktop-icons" fi [ -f "$desktop_dir/Return.desktop" ] && cp -f /usr/share/applications/droiddeck-return-gaming.desktop "$desktop_dir/Return.desktop" 2>/dev/null +if command -v flatpak >/dev/null 2>&1 && [ ! -d /var/lib/pacman ]; then + FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo >/dev/null 2>&1 & +fi +skel_done=$HOME/.local/share/droiddeck/skel-copied +if [ -d /etc/skel ] && [ ! -e "$skel_done" ]; then + cp -rn /etc/skel/. "$HOME/" 2>/dev/null + mkdir -p "${skel_done%/*}" && : > "$skel_done" +fi +if [ -x /usr/lib/snapd/snap-confine ] && [ ! -d /var/lib/pacman ]; then + /usr/local/bin/droiddeck-snapd >/dev/null 2>&1 & + export XDG_DATA_DIRS=/var/lib/snapd/desktop:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} + export PATH=$PATH:/snap/bin +fi update-mime-database /usr/share/mime >/dev/null 2>&1 & [ -f /usr/share/icons/hicolor/icon-theme.cache ] || gtk-update-icon-cache -q -t /usr/share/icons/hicolor 2>/dev/null & [ -f /usr/share/glib-2.0/schemas/gschemas.compiled ] || glib-compile-schemas /usr/share/glib-2.0/schemas 2>/dev/null @@ -79,12 +110,16 @@ if [ "$(cat /usr/share/droiddeck/kwin-compositor 2>/dev/null)" = opengl ]; then if [ -z "${KWIN_RENDER_NODES:-}" ] && [ -c /dev/dri/renderD0 ]; then export KWIN_RENDER_NODES=/dev/dri/renderD0 fi + mkdir -p /run/droiddeck/kwin + printf '#!/bin/sh\nGALLIUM_THREAD=0 exec /usr/bin/kwin_wayland "$@"\n' > /run/droiddeck/kwin/kwin_wayland + chmod 755 /run/droiddeck/kwin/kwin_wayland + export PATH=/run/droiddeck/kwin:$PATH fi echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY" dbus-run-session -- startplasma-wayland rc=$? echo "== droiddeck-desktop: Plasma ended ($rc)" -if [ "$rc" -eq 0 ]; then +if [ "$rc" -eq 0 ] && [ -z "${BL_BOTTOM_DESKTOP:-}" ]; then /usr/local/bin/droiddeck-steam-launch bigpicture sleep 30 fi diff --git a/tools/linuxfs/desktop/droiddeck-desktop-gpu b/tools/linuxfs/desktop/droiddeck-desktop-gpu index b1cabbff0..061d64620 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop-gpu +++ b/tools/linuxfs/desktop/droiddeck-desktop-gpu @@ -1,6 +1,7 @@ #!/usr/bin/python3 import os import re +import shutil HOME = os.environ.get("HOME", "/root") SYSTEM_DIR = "/usr/share/applications" @@ -9,6 +10,8 @@ FLATPAK_DIR = os.path.join(HOME, ".local/share/flatpak/exports/share/application USER_DIR = os.path.join(HOME, ".local/share/applications") MARK = "X-DroidDeck-GPU=1" SKIP = re.compile(r"^(steam|droiddeck-game-|droiddeck-steam|steamdeck-)", re.I) +CHROMIUM_ENV = "env -u WAYLAND_DISPLAY XDG_SESSION_TYPE=x11 ELECTRON_DISABLE_SANDBOX=1 " +CHROMIUM_FLAGS = " --no-sandbox --ozone-platform=x11" def enabled(): @@ -16,7 +19,6 @@ def enabled(): def main_group(text): - """The [Desktop Entry] group's lines, and everything after it.""" lines = text.splitlines() start = next((i for i, l in enumerate(lines) if l.strip() == "[Desktop Entry]"), None) if start is None: @@ -25,15 +27,40 @@ def main_group(text): return lines[:start + 1], lines[start + 1:end], lines[end:] +def split_program(exec_line): + if exec_line.startswith('"'): + end = exec_line.find('"', 1) + if end < 0: + return None, None + return exec_line[:end + 1], exec_line[end + 1:] + program, _, rest = exec_line.partition(" ") + return program, (" " + rest) if rest else "" + + +def chromium(exec_line): + program, _ = split_program(exec_line) + if not program: + return False + program = program.strip('"') + path = program if os.path.isabs(program) else shutil.which(program) + if not path: + return False + here = os.path.dirname(os.path.realpath(path)) + return any(os.path.exists(os.path.join(d, "chrome-sandbox")) for d in (here, os.path.dirname(here))) + + +def chromium_exec(exec_line): + program, rest = split_program(exec_line) + return CHROMIUM_ENV + program + CHROMIUM_FLAGS + rest + + def gpu_exec(exec_line): - """The Exec that runs a program on the GPU; a Flatpak app goes through its launcher, which - keeps it on gamescope's X server instead of the desktop's Wayland socket.""" if exec_line.startswith("/usr/bin/flatpak run ") or exec_line.startswith("flatpak run "): exec_line = "/usr/local/bin/droiddeck-flatpak-run " + exec_line.split(" run ", 1)[1] return "droiddeck-gpu " + exec_line -def wrap(text): +def wrap(text, gpu_on=True): head, group, rest = main_group(text) if group is None: return None @@ -42,14 +69,30 @@ def wrap(text): if "=" in l and not l.lstrip().startswith("#"): k, v = l.split("=", 1) keys.setdefault(k.strip(), v) - cats = set(filter(None, keys.get("Categories", "").split(";"))) - if not cats & {"Game", "Emulator"}: - return None if keys.get("Type", "Application") != "Application" or keys.get("NoDisplay", "").lower() == "true": return None exec_line = keys.get("Exec", "").strip() if not exec_line or exec_line.startswith("droiddeck-gpu "): return None + cats = set(filter(None, keys.get("Categories", "").split(";"))) + gpu = gpu_on and bool(cats & {"Game", "Emulator"}) + browser = chromium(exec_line) + if not gpu and not browser: + return None + if browser: + exec_line = chromium_exec(exec_line) + if not gpu: + def fix(lines): + return ["Exec=" + chromium_exec(l[5:].strip()) if l.startswith("Exec=") and chromium(l[5:].strip()) else l + for l in lines] + out_group = fix(group) + while out_group and not out_group[-1].strip(): + out_group.pop() + out_group.append(MARK) + out_rest = fix(rest) + if out_rest and out_rest[0].strip(): + out_rest.insert(0, "") + return "\n".join(head + out_group + out_rest) + "\n" out_group = [] actions = keys.get("Actions", "") for l in group: @@ -68,7 +111,8 @@ def wrap(text): wrapped_rest = [] for l in rest: if l.startswith("Exec=") and not l[5:].startswith("droiddeck-gpu "): - l = "Exec=" + gpu_exec(l[5:]) + action = l[5:].strip() + l = "Exec=" + gpu_exec(chromium_exec(action) if chromium(action) else action) wrapped_rest.append(l) if wrapped_rest and wrapped_rest[0].strip(): wrapped_rest.insert(0, "") @@ -87,7 +131,7 @@ def main(): on = enabled() os.makedirs(USER_DIR, exist_ok=True) written = set() - sources = [d for d in (SYSTEM_DIR, LOCAL_DIR, FLATPAK_DIR) if os.path.isdir(d)] if on else [] + sources = [d for d in (SYSTEM_DIR, LOCAL_DIR, FLATPAK_DIR) if os.path.isdir(d)] for source in sources: for name in sorted(os.listdir(source)): if not name.endswith(".desktop") or SKIP.match(name): @@ -97,7 +141,7 @@ def main(): continue try: with open(os.path.join(source, name), encoding="utf-8", errors="replace") as f: - text = wrap(f.read()) + text = wrap(f.read(), on) except OSError: continue if text is None: diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index 40a346085..f759d3ad0 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/fex/vulkanpin.c b/tools/linuxfs/fex/vulkanpin.c index 45aeb9edb..4ab28afe4 100644 --- a/tools/linuxfs/fex/vulkanpin.c +++ b/tools/linuxfs/fex/vulkanpin.c @@ -19,7 +19,6 @@ typedef struct { typedef VkResult (*Enumerate)(const char *, unsigned int *, VkExtensionProperties *); typedef Function (*ProcAddr)(void *, const char *); -/* The driver cannot enumerate devices for an instance with VK_KHR_display, and gamescope's WSI layer aborts on that. */ static const char *const hidden_extensions[] = { "VK_KHR_display", "VK_KHR_get_display_properties2", diff --git a/tools/linuxfs/fex/webkitinput.c b/tools/linuxfs/fex/webkitinput.c index fd39bd6ab..aaa0c96e9 100644 --- a/tools/linuxfs/fex/webkitinput.c +++ b/tools/linuxfs/fex/webkitinput.c @@ -22,6 +22,7 @@ extern void webkit_web_view_run_javascript(void *view, const char *script, void extern WebKitUserScript *webkit_user_script_new(const char *source, int frames, int time, const char *const *allow, const char *const *block) __attribute__((weak)); extern void webkit_user_script_unref(WebKitUserScript *script) __attribute__((weak)); +extern const char *g_getenv(const char *name) __attribute__((weak)); static const char NAV_SCRIPT[] = "(()=>{let open=-1e9,arrowAt=-1e9,ringed=null,ringOutline='',ringOffset='',settleTimer=0,settling=false,redirecting=false;" @@ -196,3 +197,45 @@ __attribute__((visibility("default"))) void webkit_user_content_manager_add_scri } next(manager, script); } + +static int starts(const char *text, const char *prefix) +{ + while (*prefix) + if (*text++ != *prefix++) + return 0; + return 1; +} + +static int fab_uri(const char *uri) +{ + if (!uri) + return 0; + if (starts(uri, "https://")) + uri += 8; + else if (starts(uri, "http://")) + uri += 7; + else + return 0; + if (starts(uri, "www.")) + uri += 4; + if (!starts(uri, "fab.com")) + return 0; + uri += 7; + return !*uri || *uri == '/' || *uri == '?' || *uri == '#' || *uri == ':'; +} + +static int hidden_launcher(void) +{ + const char *hidden = g_getenv ? g_getenv("DROIDDECK_EPIC_HIDDEN") : 0; + return hidden && hidden[0] == '1' && !hidden[1]; +} + +__attribute__((visibility("default"))) void webkit_web_view_load_uri(void *view, const char *uri) +{ + static void (*next)(void *, const char *); + if (!next && dlsym) + next = (void (*)(void *, const char *))dlsym((void *)-1l, "webkit_web_view_load_uri"); + if (!next) + return; + next(view, hidden_launcher() && fab_uri(uri) ? "about:blank" : uri); +} 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 000000000..f055affe6 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract @@ -0,0 +1,4 @@ +#!/bin/sh +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 000000000..ef18119f4 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 000000000..c7ea48d83 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 000000000..cb8712b8d 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 000000000..aceb212bd 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 000000000..bfa0bb6f7 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 000000000..a8ea17594 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 000000000..36b7cd93c --- /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 000000000..446f0c782 --- /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 8a0ba6a2c..234be2f00 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -1,22 +1,4 @@ #!/usr/bin/python3 -"""The guest side of the agent bridge (docs/agent-control.md). - -Started by droiddeck-session inside the session, so whatever it runs has the session's own -environment: DISPLAY, the games' Xwayland, XDG_RUNTIME_DIR, and the preloads every guest process -gets - which is what lets it reach the Steam client's DevTools port, open to guest processes only. - -The app talks to it through files under $BL_LAUNCH_DIR/agent (the session root, the same path on -both sides): - - req/<id>.json a request the app wrote (tmp + rename) - resp/<id>.json the answer, written the same way - hello.json this daemon is up: pid, version, what it can do - focus.json gamescope's focus and every server's top-level windows, rewritten on change - cdp-port the client's DevTools port, written by droiddeck-session - -Requests: ping, exec, focus, cdp, quit. Each answer is {"ok": true, ...} or -{"ok": false, "error": {"code", "message"}}. -""" import base64 import json @@ -72,7 +54,6 @@ class AgentError(Exception): class X: - """One connection to an Xwayland server. The rootfs has xprop but no python X library.""" def __init__(self, display): num = display.lstrip(":").split(".")[0] @@ -116,7 +97,6 @@ class X: return buf def request(self, data): - """Send one request and return its reply, or None for an X error (a window that went).""" self.s.sendall(data) while True: head = self._read(32) @@ -186,7 +166,6 @@ class X: def windows(x): - """Top-level windows that are mapped or carry an app id: what gamescope picks focus from.""" out = [] for win in x.children(x.root): attrs = x.attributes(win) @@ -230,9 +209,6 @@ def displays(): def focus_snapshot(): - """gamescope's focus as Steam sees it (root properties on the client's server) and every - server's windows. GAMESCOPE_FOCUSABLE_WINDOWS is the list the client orders the base layer - from: a game missing there stays behind the client however healthy its window looks.""" shown = displays() if not shown: raise AgentError("NO_DISPLAY", "This session has no X display") @@ -259,30 +235,96 @@ 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 def vr_scene_app(path=Path('/run/droiddeck/droiddeck-steamvr/scene-focus.json'), proc=Path('/proc')): - """Only a live SteamVR scene with its dashboard hidden may claim game focus.""" try: state = json.loads(path.read_text()) server, scene = int(state['serverPid']), int(state['scenePid']) @@ -318,8 +360,6 @@ class VrSceneFocus: class FocusWatcher(threading.Thread): - """Rewrites focus.json when gamescope's focus properties change, and every few seconds when - the windows do (a window can change without any root property moving).""" def __init__(self, path): super().__init__(daemon=True, name="focus") @@ -383,7 +423,6 @@ class FocusWatcher(threading.Thread): class WebSocket: - """A minimal RFC 6455 client: text frames out, text frames in. Enough for CDP.""" def __init__(self, url, timeout): target = urllib.parse.urlsplit(url) @@ -538,9 +577,56 @@ KEYBOARD_CHECK_SECONDS = 30 KEYBOARD_JS = r""" (() => { const self = window.__droiddeckKeyboard || (window.__droiddeckKeyboard = { watched: new WeakSet(), last: null }); + self.wrapped = self.wrapped || new WeakSet(); + self.route = self.route === true; + self.wrap = vkm => { + if (!vkm || self.wrapped.has(vkm) || typeof vkm.ShowVirtualKeyboard !== "function") return; + self.wrapped.add(vkm); + const show = vkm.ShowVirtualKeyboard; + vkm.ShowVirtualKeyboard = function (ref, props, modal) { + if (self.route && !modal && typeof this.SetActiveVirtualKeyboardTarget === "function" && + !this.BUseVRKeyboard?.() && !this.m_Instance?.IsDesktopOverlayWindow?.()) { + this.SetActiveVirtualKeyboardTarget(ref, props); + self.follow(this); + if (typeof window.__BINDING__ === "function") window.__BINDING__("request"); + return; + } + return show.call(this, ref, props, modal); + }; + }; + self.editing = vkm => { + let el = null; + try { el = vkm?.m_ownerWindow?.document?.activeElement || null; } catch (e) {} + if (!el) return null; + return el.tagName === "TEXTAREA" || el.isContentEditable === true || + (el.tagName === "INPUT" && !/^(button|checkbox|radio|range|submit|reset|file|image|color)$/i.test(el.type || "")); + }; + self.follow = vkm => { + self.active = vkm; + self.missed = 0; + self.seen = false; + self.follower = self.follower || setInterval(() => { + if (!self.active) return; + const ref = self.active.m_currentVirtualKeyboardRef; + const editing = self.editing(self.active); + const valid = !!ref && (editing !== null ? editing : + (typeof ref.BIsElementValidForInput !== "function" || ref.BIsElementValidForInput())); + if (valid) self.seen = true; + if (self.route && ref && (valid || !self.seen)) { + self.missed = 0; + return; + } + if (++self.missed < 2) return; + self.active = null; + clearInterval(self.follower); + self.follower = null; + if (typeof window.__BINDING__ === "function") window.__BINDING__("dismiss"); + }, 150); + }; self.check = () => { let showing = false; for (const win of Array.from(globalThis.SteamUIStore?.WindowStore?.SteamUIWindows || [])) { + self.wrap(win?.VirtualKeyboardManager); const value = win?.VirtualKeyboardManager?.IsShowingVirtualKeyboard; if (!value) continue; if (!self.watched.has(value) && typeof value.Subscribe === "function") { @@ -559,6 +645,29 @@ KEYBOARD_JS = r""" return self.check(); })() """.replace("__BINDING__", KEYBOARD_BINDING) +KEYBOARD_ROUTE_SECONDS = 0.5 +KEYBOARD_ROUTE_JS = r""" +(route => { + const self = window.__droiddeckKeyboard; + if (!self) return false; + self.route = route; + if (!route) return true; + for (const win of Array.from(globalThis.SteamUIStore?.WindowStore?.SteamUIWindows || [])) { + const vkm = win?.VirtualKeyboardManager; + if (vkm?.m_bIsInlineVirtualKeyboardOpen?.m_currentValue === true && vkm?.m_bIsVirtualKeyboardModal?.m_currentValue !== true && + typeof vkm.SetVirtualKeyboardHidden === "function") { + const ref = vkm.m_currentVirtualKeyboardRef, props = vkm.m_ActiveElementProps; + vkm.SetVirtualKeyboardHidden(); + if (ref && typeof vkm.SetActiveVirtualKeyboardTarget === "function") { + vkm.SetActiveVirtualKeyboardTarget(ref, props); + if (typeof self.follow === "function") self.follow(vkm); + } + if (typeof window.__BINDING__ === "function") window.__BINDING__("request"); + } + } + return true; +})(__ROUTE__) +""".replace("__BINDING__", KEYBOARD_BINDING) class KeyboardWatcher(threading.Thread): @@ -566,8 +675,14 @@ class KeyboardWatcher(threading.Thread): super().__init__(daemon=True, name="keyboard") self.agent_dir = agent_dir self.path = agent_dir / "keyboard.json" + self.request_path = agent_dir / "keyboard-request.json" + self.dismiss_path = agent_dir / "keyboard-dismiss.json" + self.dismissals = 0 + self.route_path = agent_dir / "keyboard-route" self.showing = None self.seq = 0 + self.requests = 0 + self.route = None self.next_id = 0 self.attached = False @@ -578,6 +693,30 @@ class KeyboardWatcher(threading.Thread): self.seq += 1 write_json(self.path, {"steamKeyboard": showing, "seq": self.seq}) + def request(self): + self.requests += 1 + write_json(self.request_path, {"seq": self.requests}) + + def dismiss(self): + self.dismissals += 1 + write_json(self.dismiss_path, {"seq": self.dismissals}) + + def wanted_route(self): + try: + return self.route_path.read_text().strip() == "bottom" + except OSError: + return False + + def apply_route(self, ws, force=False): + route = self.wanted_route() + if route == self.route and not force: + return + result = self.call(ws, "Runtime.evaluate", { + "expression": KEYBOARD_ROUTE_JS.replace("__ROUTE__", "true" if route else "false"), "returnByValue": True}) + if result.get("exceptionDetails"): + raise AgentError("JS_EXCEPTION", json.dumps(result["exceptionDetails"])[:500]) + self.route = route + def run(self): failures, last = 0, None while True: @@ -604,10 +743,18 @@ class KeyboardWatcher(threading.Thread): try: self.call(ws, "Runtime.addBinding", {"name": KEYBOARD_BINDING}) self.report(self.install(ws)) + self.apply_route(ws, force=True) self.attached = True + installed = time.monotonic() while True: - if not ws.buffer and not select.select([ws.s], [], [], KEYBOARD_CHECK_SECONDS)[0]: - self.report(self.install(ws)) + wait = min(KEYBOARD_ROUTE_SECONDS, KEYBOARD_CHECK_SECONDS) + if not ws.buffer and not select.select([ws.s], [], [], wait)[0]: + if time.monotonic() - installed >= KEYBOARD_CHECK_SECONDS: + self.report(self.install(ws)) + self.apply_route(ws, force=True) + installed = time.monotonic() + else: + self.apply_route(ws) continue self.event(json.loads(ws.recv())) finally: @@ -635,7 +782,12 @@ class KeyboardWatcher(threading.Thread): def event(self, message): params = message.get("params") or {} if message.get("method") == "Runtime.bindingCalled" and params.get("name") == KEYBOARD_BINDING: - self.report(params.get("payload") == "true") + if params.get("payload") == "request": + self.request() + elif params.get("payload") == "dismiss": + self.dismiss() + else: + self.report(params.get("payload") == "true") def steam_idle_inhibit(agent_dir, inhibit): @@ -707,11 +859,6 @@ def steam_selection(agent_dir, timeout=5): def steam_shortcut_app_id(game_id): - """Return the 32-bit app id in Steam's shortcut CGameID form, or None for other ids. - - DroidDeck's shortcut IDs are `(appid << 32) | 0x02000000`. The URL still needs that full - CGameID for RunGame; the app-details API separately needs the unsigned 32-bit app id. - """ if not isinstance(game_id, str) or not game_id.isascii() or not game_id.isdigit(): return None try: @@ -727,7 +874,6 @@ def steam_shortcut_app_id(game_id): def wait_for_steam_shortcut_overview(agent_dir, game_id, timeout=45): - """Wait until Steam can map a shortcut CGameID to its 32-bit app overview.""" app_id = steam_shortcut_app_id(game_id) if app_id is None: return {"supported": False, "ready": False} @@ -782,8 +928,6 @@ def steam_shortcut_state(agent_dir, game_id, timeout=6): def game_pids(app_id): - """Our processes started for this Steam app (Steam sets SteamAppId / SteamGameId in their - environment, and Proton's wine processes inherit it).""" wanted = [("SteamAppId=%s" % app_id).encode(), ("SteamGameId=%s" % app_id).encode()] me = os.getpid() pids = [] @@ -842,8 +986,6 @@ VR_ACTIONS = ("status", "install", "start", "stop") def steamvr(req): - """Cardboard mode's SteamVR: a fixed helper with four actions, unlike exec (no command line from - the request). install downloads 571 MB, so it runs detached and status reports it.""" action = req.get("action", "status") if action not in VR_ACTIONS: raise AgentError("INVALID_REQUEST", "vr action must be one of " + ", ".join(VR_ACTIONS)) @@ -1064,11 +1206,10 @@ def main(argv): if len(argv) != 2 or not argv[1].isascii() or not argv[1].isdecimal(): print("usage: droiddeck-agent --steam-supports-vr <appid>", file=sys.stderr) return 2 - # Optional-VR games (Thumper, VRChat) carry vr_supported without vr_only. expression = ("(o => o ? (o.vr_supported === true || o.vr_only === true) : null)" "(window.appStore?.GetAppOverviewByGameID?.(%s))" % json.dumps(argv[1])) value = None - deadline = time.monotonic() + 12 # Steam's UI is busiest while a game starts. + deadline = time.monotonic() + 12 while value is None and time.monotonic() < deadline: try: value = cdp_eval(Path(base) / "agent", expression, await_promise=False, timeout=8).get("value") 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 000000000..6bca14851 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -0,0 +1,1339 @@ +#!/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): + return reg_line(reg, key, name, '"%s"="%s"' % (name, value.replace("\\", "\\\\").replace('"', '\\"'))) + + +def reg_dword(reg, key, name, number): + return reg_line(reg, key, name, '"%s"=dword:%08x' % (name, number)) + + +def reg_line(reg, key, name, line): + 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 desktop_dpi(): + width, height = desktop_size() + return 96 * max(4, int(min(width / 1920.0, height / 1080.0) * 4)) // 4 + + +def dpi(root): + reg = os.path.join(prefix(root), "pfx", "user.reg") + return os.path.isfile(reg) and reg_dword(reg, DESKTOP_KEY, "LogPixels", desktop_dpi()) + + +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) + try: + dpi(root) + except OSError as error: + say("Battle.net's desktop scale 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-bottom-desktop b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop new file mode 100755 index 000000000..2c19c23be --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop @@ -0,0 +1,51 @@ +#!/bin/bash +# KDE Plasma on a dual-screen handheld's bottom screen, next to the session on the top one. +set -u +export HOME=${HOME:-/root} +if [ -n "${BL_DEBUG_DIR:-}" ]; then + mkdir -p "$BL_DEBUG_DIR" 2>/dev/null || true + exec >>"$BL_DEBUG_DIR/bottom-desktop.log" 2>&1 +fi +echo "== droiddeck-bottom-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${BL_WIDTH:-?}x${BL_HEIGHT:-?} beside a ${BL_TOP_SESSION:-?} session" +[ -x /usr/local/bin/droiddeck-desktop ] || { echo "== the desktop package is not installed"; exit 66; } + +# Launch requests would reach the top session's watcher and could replace it. +unset BL_LAUNCH_DIR BL_LOG +export BL_BOTTOM_DESKTOP=1 + +for _ in $(seq 1 100); do + wayland-info >/dev/null 2>&1 && break + sleep 0.1 +done + +if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1 \ + && ! pgrep -f 'dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf' >/dev/null 2>&1; then + mkdir -p /run/dbus /usr/local/share/droiddeck + cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <type>system</type> + <listen>unix:path=/run/dbus/system_bus_socket</listen> + <auth>EXTERNAL</auth> + <servicedir>/usr/share/droiddeck/system-services</servicedir> + <policy context="default"> + <allow user="*"/> + <allow own="*"/> + <allow send_destination="*"/> + <allow receive_sender="*"/> + </policy> +</busconfig> +BUSCONF + rm -f /run/dbus/system_bus_socket + dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & + for _ in $(seq 1 50); do + [ -S /run/dbus/system_bus_socket ] && break + sleep 0.1 + done + [ -S /run/dbus/system_bus_socket ] && droiddeck-login1 --with-netmanager & +fi + +# The game on the top screen keeps the CPU first. +renice -n 5 $$ >/dev/null 2>&1 || true +exec /usr/local/bin/droiddeck-desktop diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap index 2e84a695c..13dafc0ba 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap @@ -1,10 +1,12 @@ #!/usr/bin/python3 import base64 +import fcntl import json import os import signal import socket import struct +import subprocess import sys SOCKET_FILE = "/etc/droiddeck/bwrap-socket" @@ -22,6 +24,11 @@ def socket_name(): SOCKET = socket_name() +FEX_DIR = "/run/droiddeck-fex" +OWN_FEX = "/usr/local" +X86_MACHINES = (3, 62) +ARM_LIBS = "/usr/lib/aarch64-linux-gnu" +ARM_LOADER = "/usr/lib/ld-linux-aarch64.so.1" VERSION = "bubblewrap 0.11.0 (droiddeck)" NO_ARG = { @@ -61,7 +68,6 @@ def fd_path(fd): def expand(argv): - """argv with every --args FD replaced by the NUL-separated arguments read from FD.""" out = [] i = 0 while i < len(argv): @@ -87,8 +93,10 @@ class Spec: self.info_fds = [] self.json_fds = [] self.keep_fds = [] + self.lock_files = [] self.command = [] self.argv0 = None + self.env_tool = None def parse(argv): @@ -159,6 +167,8 @@ def parse(argv): read_fd(int(args[0])) elif a == "--sync-fd": s.keep_fds.append(int(args[0])) + elif a == "--lock-file": + s.lock_files.append(args[0]) elif a == "--info-fd": s.info_fds.append(int(args[0])) elif a == "--json-status-fd": @@ -177,7 +187,6 @@ def real(path): def remaps_nothing(s): - """True when every path in the sandbox is what it is out here already.""" for op in s.ops: t = op["t"] if t == "bind": @@ -203,6 +212,159 @@ def remaps_nothing(s): return True +def host_path(s, path): + for op in reversed(s.ops): + if op["t"] != "bind": + continue + dest = op["dest"].rstrip("/") + if path == dest or path.startswith(dest + "/"): + return op["src"].rstrip("/") + path[len(dest):] + return path + + +def sandbox_link(s, path): + for op in reversed(s.ops): + if op.get("dest", "").rstrip("/") != path: + continue + if op["t"] == "symlink": + return op["target"] + if op["t"] == "bind": + return None + break + here = sandbox_source(s, path) + return os.readlink(here) if os.path.islink(here) else None + + +def sandbox_source(s, path): + for op in reversed(s.ops): + if op["t"] != "bind": + continue + dest = op["dest"].rstrip("/") + if path == dest or path.startswith(dest + "/"): + return real(op["src"]).rstrip("/") + path[len(dest):] + return path + + +def sandbox_file(s, path): + parts = [p for p in path.split("/") if p] + done = "/" + hops = 0 + i = 0 + while i < len(parts): + step = os.path.join(done, parts[i]) + link = sandbox_link(s, step) + if link is None: + done = step + i += 1 + continue + hops += 1 + if hops > 40: + return None + base = "/" if link.startswith("/") else done + parts = [p for p in os.path.normpath(os.path.join(base, link)).split("/") if p] + parts[i + 1:] + done = "/" + i = 0 + here = sandbox_source(s, done) + return here if os.path.isfile(here) else None + + +def program_path(s, program): + if "/" in program: + return os.path.normpath(os.path.join(s.cwd or "/", program)) + for folder in s.env.get("PATH", "/usr/bin:/bin").split(":"): + if not folder: + continue + candidate = os.path.normpath(os.path.join(s.cwd or "/", folder, program)) + if sandbox_file(s, candidate): + return candidate + return None + + +def machine(s, path, depth=0): + here = sandbox_file(s, path) + if here is None: + return None + try: + with open(here, "rb") as f: + head = f.read(256) + except OSError: + return None + if head[:4] == b"\x7fELF" and len(head) >= 20: + return struct.unpack("<H" if head[5] == 1 else ">H", head[18:20])[0] + if head[:2] == b"#!" and depth < 4: + words = head[2:].split(b"\n")[0].split() + if words: + return machine(s, words[0].decode("utf-8", "replace"), depth + 1) + return None + + +def own_fex(): + return all(os.access(os.path.join(OWN_FEX, "bin", name), os.X_OK) for name in ("FEX", "FEXServer")) \ + and os.path.isfile(os.path.join(OWN_FEX, "lib", "libxxhash.so.0")) + + +def fex_ready(): + if own_fex(): + return True + try: + subprocess.call([os.path.join(OWN_FEX, "bin", "droiddeck-fex-update")], stdout=sys.stderr) + except OSError: + return False + return own_fex() + + +def start_fex_server(): + try: + subprocess.Popen([os.path.join(OWN_FEX, "bin", "FEXServer"), "-p", "30"], stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, start_new_session=True) + except OSError as e: + sys.stderr.write("bwrap: could not start FEXServer: %s\n" % e) + + +def through_fex(s): + program = program_path(s, s.command[0]) + if program is None or machine(s, program) not in X86_MACHINES: + return False + if not fex_ready(): + sys.stderr.write("bwrap: %s is an x86 program and FEX is not installed\n" % program) + return False + for src, dest in ((os.path.join(OWN_FEX, "bin", "FEX"), FEX_DIR + "/bin/FEX"), + (os.path.join(OWN_FEX, "bin", "FEXServer"), FEX_DIR + "/bin/FEXServer"), + (os.path.join(OWN_FEX, "lib", "libxxhash.so.0"), FEX_DIR + "/lib/libxxhash.so.0"), + ("/usr/bin/env", FEX_DIR + "/bin/env"), + (ARM_LIBS, ARM_LIBS), + (real(ARM_LOADER), ARM_LOADER)): + s.ops.append({"t": "bind", "src": src, "dest": dest, "try": False, "ro": True}) + data = s.env.get("XDG_CACHE_HOME") or "/tmp" + s.env["FEX_APP_CONFIG_LOCATION"] = FEX_DIR + "/config/" + s.env["FEX_APP_DATA_LOCATION"] = data + "/droiddeck-fex/" + s.env["FEX_APP_CACHE_LOCATION"] = data + "/droiddeck-fex/cache/" + for name in ("FEX_ROOTFS", "FEX_THUNKHOSTLIBS", "FEX_THUNKGUESTLIBS", "FEX_THUNKCONFIG", "FEX_PORTABLE", + "GLIBC_TUNABLES", "MESA_LOADER_DRIVER_OVERRIDE", "GALLIUM_DRIVER", "VK_ICD_FILENAMES", + "VK_DRIVER_FILES"): + s.env.pop(name, None) + s.command = [FEX_DIR + "/bin/FEX", program] + s.command[1:] + s.argv0 = None + s.env_tool = FEX_DIR + "/bin/env" + start_fex_server() + return True + + +def hold_locks(s): + for path in s.lock_files: + try: + fd = os.open(host_path(s, path), os.O_RDONLY) + except OSError as e: + sys.stderr.write("bwrap: Can't open lock file %s: %s\n" % (path, e.strerror)) + sys.exit(1) + try: + fcntl.lockf(fd, fcntl.LOCK_SH | fcntl.LOCK_NB) + except OSError as e: + sys.stderr.write("bwrap: Can't lock file %s: %s\n" % (path, e.strerror)) + sys.exit(1) + os.set_inheritable(fd, True) + + def report_pid(s, pid): for fd in s.info_fds: try: @@ -261,6 +423,8 @@ def run_by_app(s): if s.argv0: argv[0] = s.argv0 request = {"argv": argv, "env": s.env, "cwd": s.cwd or "/", "ops": ops} + if s.env_tool: + request["envTool"] = s.env_tool sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) try: sock.connect(SOCKET) @@ -282,7 +446,7 @@ def run_by_app(s): if payload is None: break if kind == b"P": - report_pid(s, int(payload)) + report_pid(s, os.getpid()) elif kind == b"O": out.write(payload) out.flush() @@ -301,10 +465,12 @@ def run_by_app(s): def main(): s = parse(expand(sys.argv[1:])) + hold_locks(s) if remaps_nothing(s): run_here(s) - else: - run_by_app(s) + return + through_fex(s) + run_by_app(s) if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks index 28bdd8ac5..5cbf57b4a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Expose available Steam libraries in Dolphin, retaining the old PCManFM bookmark.""" import hashlib import json import os @@ -13,6 +12,7 @@ import xml.etree.ElementTree as ET LIBRARY = Path("/mnt/droiddeck-sd") +ADDED = Path("/mnt/droiddeck-lib") URI = "file:///mnt/droiddeck-sd" KDE_OWNER = "http://www.kde.org" MARK = "DroidDeckSteamLibrary" @@ -43,7 +43,7 @@ def steam_libraries(home, data): if not isinstance(path, str): continue path = Path(re.sub(r'\\(["\\])', r'\1', path)) - managed = path == LIBRARY or path.is_relative_to(home / "Games") + managed = path == LIBRARY or path.is_relative_to(home / "Games") or path.is_relative_to(ADDED) if selected is not None and managed and path not in selected: continue if path == LIBRARY and selected is None and not os.environ.get("BL_LIBRARY_LABEL"): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games index d86d10b6c..f49a90dd7 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) @@ -54,7 +54,6 @@ def icon_for(appid): def client_entries(): - """App ids the client already wrote a menu entry for.""" found = set() if not os.path.isdir(APPS_DIR): return found diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads b/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads new file mode 100755 index 000000000..ce34e8591 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads @@ -0,0 +1,31 @@ +#!/bin/bash +free_name() { + local dir=$1 name=$2 base ext n=2 + [ -e "$dir/$name" ] || { echo "$name"; return; } + base=${name%.*} ext= + [ "$base" != "$name" ] && [ -n "$base" ] && ext=.${name##*.} || base=$name + while [ -e "$dir/$base ($n)$ext" ]; do n=$((n + 1)); done + echo "$base ($n)$ext" +} +share() { + local android=$HOME/Storage/$1 link=$HOME/$2 f + [ -d "$android" ] && [ -w "$android" ] || return 0 + [ "$(readlink "$link" 2>/dev/null)" = "$android" ] && return 0 + if [ -L "$link" ]; then + rm -f "$link" + elif [ -d "$link" ]; then + shopt -s dotglob nullglob + for f in "$link"/*; do + mv -n -- "$f" "$android/$(free_name "$android" "${f##*/}")" || return 1 + done + shopt -u dotglob nullglob + rmdir "$link" 2>/dev/null || mv "$link" "$link.old.$$" || return 1 + elif [ -e "$link" ]; then + mv "$link" "$link.old.$$" || return 1 + fi + ln -s "$android" "$link" +} +status=0 +share Download Downloads || status=1 +share Documents Documents || status=1 +exit $status diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators b/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators new file mode 100755 index 000000000..a937b4e8e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators @@ -0,0 +1,22 @@ +#!/bin/bash +set -u +export FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap +cores="libretro-core-info libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-vb libretro-beetle-wswan + libretro-bsnes-mercury-performance libretro-desmume libretro-gambatte libretro-genesisplusgx libretro-mgba + libretro-nestopia libretro-sameboy libretro-snes9x" +case "${1:-}" in +install) + echo "== STEP RetroArch" + droiddeck-root /usr/bin/apt-get update -q || { echo "== FAIL apt-get update"; exit 1; } + droiddeck-root /usr/bin/apt-get install -y -q retroarch retroarch-assets $cores || { echo "== FAIL apt-get install"; exit 1; } + echo "== STEP PPSSPP" + flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo || { echo "== FAIL flathub"; exit 1; } + flatpak install --user -y --noninteractive flathub org.ppsspp.PPSSPP || { echo "== FAIL org.ppsspp.PPSSPP"; exit 1; } + printf '#!/bin/sh\nexec /usr/local/bin/droiddeck-flatpak-run org.ppsspp.PPSSPP "$@"\n' > /usr/local/bin/PPSSPPSDL.new && + chmod 755 /usr/local/bin/PPSSPPSDL.new && mv -f /usr/local/bin/PPSSPPSDL.new /usr/local/bin/PPSSPPSDL || { echo "== FAIL PPSSPPSDL"; exit 1; } + ;; +*) + echo "usage: droiddeck-emulators install" >&2 + exit 2 + ;; +esac diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic index 652664145..6f95cabe4 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic @@ -100,6 +100,10 @@ CLIENT_ENV = { "JSC_useDFGJIT": "0", "JSC_useFTLJIT": "0", } +HIDDEN_ENV = { + "DROIDDECK_EPIC_HIDDEN": "1", + "EGL_DISABLE_STORE_PREWARM": "1", +} KEPT_ENV = ("HOME", "USER", "LOGNAME", "LANG", "LANGUAGE", "LC_ALL", "LC_MESSAGES", "TZ", "XDG_RUNTIME_DIR", "BL_LAUNCH_DIR") LAUNCH_VERBS = ("waitforexitandrun", "run", "runinprefix") EPIC_ARGS = ("-auth_", "-epic") @@ -725,7 +729,7 @@ def fex_environment(fex, files, env): return result -def client_environment(base, fex, files, display, bus, broker, a11y=None): +def client_environment(base, fex, files, display, bus, broker, a11y=None, hidden=False): env = {name: base[name] for name in KEPT_ENV if base.get(name)} env.setdefault("HOME", HOME) env.setdefault("LANG", "C.UTF-8") @@ -734,6 +738,8 @@ def client_environment(base, fex, files, display, bus, broker, a11y=None): env["DBUS_SESSION_BUS_ADDRESS"] = bus env[BROKER_ENV] = broker env.update(CLIENT_ENV) + if hidden: + env.update(HIDDEN_ENV) if a11y: for name in A11Y_OFF: env.pop(name, None) @@ -1248,7 +1254,7 @@ class Session: path = broker_path() self.broker = Broker(path, self.mode, base) write_json(instance_file(), {"pid": os.getpid(), "mode": self.mode, "bus": bus, "broker": path}) - env = client_environment(base, fex, files, display, bus, path, self.a11y) + env = client_environment(base, fex, files, display, bus, path, self.a11y, hidden=self.mode == "hidden") self.command = [fex["bin"], os.path.join(app_dir, "AppRun")] self.env = env say("starting the Epic Games Launcher %s (%s, display %s)" % (current.get("app"), self.mode, display)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 331dcfecc..bf18c79d3 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")] @@ -282,7 +329,6 @@ def mirror(source, provider, name, target): def build_rootfs(base, provider): - """The runtime with glibc and libstdc++ taken from a newer one, which FEX's GL and Vulkan thunks are built against.""" base_files, provider_files = os.path.join(base, "files"), os.path.join(provider, "files") rootfs = os.path.join(STATE, "rootfs") stamp = "%d\n%s\n%s%s\n%s" % (ROOTFS_LAYOUT, os.path.realpath(base), read_text(os.path.join(base_files, MARKER)) or "", @@ -384,8 +430,6 @@ def link_steam_sdk(): def link_guest_sdk(root): - # Proton's lsteamclient only looks in $HOME/.steam/sdk64; on ARM Steam that is the arm64 client, so - # the x86 runtime gets its own link, which FEX resolves before the host path. for sdk, candidates in (("sdk64", ("linux64", "ubuntu12_64")), ("sdk32", ("linux32", "ubuntu12_32"))): want = "x86_64" if sdk == "sdk64" else "i386" directory = next((os.path.join(STEAM_ROOT, candidate) for candidate in candidates @@ -445,6 +489,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) @@ -564,17 +609,13 @@ def guest_environment(fex, env): result["FEX_APP_CONFIG_LOCATION"] = CONFIG_DIR + "/" result["FEX_APP_DATA_LOCATION"] = data + "/" result["FEX_APP_CACHE_LOCATION"] = CACHE_DIR + "/" - # Valve's FEX-Emu binds its server socket under $STEAM_COMPAT_DATA_PATH/fex-emu whatever FEX_APP_DATA_LOCATION or - # FEX_SERVERSOCKETPATH say, and sun_path is 108 bytes: compatdata under the app's data folder is too long. if result.get("STEAM_COMPAT_DATA_PATH"): short = data if data != DATA_DIR else "/tmp/fex" os.makedirs(short, exist_ok=True) result["STEAM_COMPAT_DATA_PATH"] = short result.setdefault("FEX_SILENTLOG", "0") result.setdefault("FEX_OUTPUTLOG", "stderr") - # The session's tunables are for the host libc; an x86 ld.so copying them under FEX fails in sbrk. result.pop("GLIBC_TUNABLES", None) - # Mono's incremental Boehm collector corrupts its heap under FEX, so Unity games crash at their first collections. result.setdefault("GC_DISABLE_INCREMENTAL", "1") if fex["portable"]: result["FEX_PORTABLE"] = "1" @@ -589,7 +630,8 @@ def guest_environment(fex, env): result["FEX_THUNKHOSTLIBS"] = fex["host_thunks"] result["FEX_THUNKGUESTLIBS"] = fex["guest_thunks"] result["FEX_THUNKCONFIG"] = os.path.join(CONFIG_DIR, "ThunksConfig.json") - preload = [part for part in split_paths(result.get("LD_PRELOAD")) if os.path.exists(part) and not is_arm(part)] + preload = [part for part in split_paths(result.get("LD_PRELOAD")) + if "/" not in part or (os.path.exists(part) and not is_arm(part))] library_path = [part for part in (result.get("LD_LIBRARY_PATH") or "").split(":") if part and "arm64" not in part and "aarch64" not in part] for name, parts in (("LD_PRELOAD", preload), ("LD_LIBRARY_PATH", library_path)): @@ -664,22 +706,32 @@ def launch(command, env, mode, decide=None): folder = decide if decide and os.path.isdir(decide) else os.path.dirname(program) if thunks == "on" and x86_64 and os.path.isfile(os.path.join(PRELOADS, "x86_64", VULKAN_PIN)) \ and vulkan_thunk_loads(fex, folder): - # Any LD_AUDIT module makes Mono's garbage collector crash under FEX, so the Vulkan thunk is pinned by search path. guest["LD_LIBRARY_PATH"] = ":".join(["/usr/" + VULKAN_PIN_DIR] + split_paths(guest.get("LD_LIBRARY_PATH"))) thunks = "on, its own Vulkan loader too" say("running %s with %s (runtime %s, thunks %s)" % (program, fex["bin"], guest.get("FEX_ROOTFS", "none"), thunks)) return os.execve(fex["bin"], [fex["bin"], program] + command[1:], guest) -def game_environment(env): +def game_environment(env, command): try: game_env = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-game-env")) env = game_env["game_gpu"](env) app = game_env["game_id"](env) or env.get("SteamAppId") or env.get("SteamGameId") if not app: return env - with open(GAME_ENVIRONMENT, encoding="utf-8") as source: - return game_env["apply_config"](env, json.load(source), str(app)) + fixes = {} + game = game_env["Game"](resolve(command[0], env), command[1:]) + for check in game_env["FIXES"]: + found = check(game) + if found and found[0]: + fixes.update(found[0]) + say(found[2]) + try: + with open(GAME_ENVIRONMENT, encoding="utf-8") as source: + config = json.load(source) + except FileNotFoundError: + config = {"version": 1} + return game_env["apply_config"](env, config, str(app), fixes) except FileNotFoundError: return env except Exception as error: @@ -718,6 +770,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() @@ -810,7 +863,7 @@ def main(argv): return 0 if not command: return 2 - return launch(command, game_environment(dict(os.environ)), os.environ.get("DROIDDECK_FEX", "auto")) + return launch(command, game_environment(dict(os.environ), command), os.environ.get("DROIDDECK_FEX", "auto")) if action == "run": try: mode, decide, command = parse_run(args) 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 000000000..d88a4a97e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -0,0 +1,76 @@ +#!/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 + +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 +} + +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 +} + +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 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak index d91cae6ad..8c23140ef 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak @@ -1,7 +1,15 @@ #!/usr/bin/python3 import json import os +import re +import shutil +import signal +import socket +import subprocess import sys +import tempfile +import time +import urllib.parse os.environ.setdefault("FLATPAK_BWRAP", "/usr/local/bin/droiddeck-bwrap") @@ -11,13 +19,25 @@ gi.require_version("Flatpak", "1.0") from gi.repository import Flatpak, Gio, GLib REMOTE = "flathub" +SYSTEM_BUS = "/run/dbus/system_bus_socket" +BUS_COMMANDS = ("install", "install-bundle", "uninstall", "update", "prune") +BUS_CONFIG = """<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <type>system</type> + <listen>unix:path=%s</listen> + <auth>EXTERNAL</auth> + <policy context="default"> + <allow user="*"/> + <allow own="*"/> + <allow send_destination="*"/> + <allow receive_sender="*"/> + </policy> +</busconfig> +""" def prepare_rootfs(): - """Some runtimes (KDE 6.10) ship etc/resolv.conf as a link to /run/host/monitor/resolv.conf. - Deploying one, Flatpak removes that link only if GIO reports it existing, and GIO follows it: - dangling here, it was left in place and making Flatpak's own link failed ("File exists"). - With the target present in the rootfs the link resolves and the deploy goes through.""" target = "/run/host/monitor/resolv.conf" try: if not os.path.exists(target): @@ -33,6 +53,116 @@ def prepare_rootfs(): emit(e="warning", message="could not prepare %s: %s" % (target, err)) +def bus_reachable(path): + if isinstance(path, tuple): + try: + socket.create_connection(path, timeout=1).close() + return True + except (OSError, ValueError): + return False + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + try: + sock.connect(path) + return True + except OSError: + return False + finally: + sock.close() + + +def system_bus_paths(): + address = os.environ.get("DBUS_SYSTEM_BUS_ADDRESS", "") + if not address: + return [SYSTEM_BUS] + paths = [] + for entry in filter(None, address.split(";")): + found = None + kind, _, params = entry.partition(":") + values = dict(part.partition("=")[::2] for part in params.split(",")) + if kind == "unix": + if values.get("path"): + found = urllib.parse.unquote_to_bytes(values["path"]) + elif values.get("abstract"): + found = b"\0" + urllib.parse.unquote_to_bytes(values["abstract"]) + elif kind == "tcp": + port = urllib.parse.unquote(values.get("port", "")) + digits = port.lstrip("0") + if not re.fullmatch(r"[0-9]+", port, re.ASCII) or not 0 < len(digits) <= 5 or int(digits) > 65535: + continue + found = (urllib.parse.unquote(values.get("host", "localhost")), int(digits)) + if found is None: + return None + paths.append(found) + return paths + + +def system_bus_reachable(): + paths = system_bus_paths() + return paths is None or any(bus_reachable(path) for path in paths) + + +def stop_system_bus(bus): + if not bus: + return + proc, work, conf, path = bus + if proc.poll() is None: + proc.terminate() + try: + proc.wait(timeout=5) + except subprocess.TimeoutExpired: + proc.kill() + proc.wait() + remove_bus_files(work, conf, path) + + +def remove_bus_files(work, conf, path): + for name in (path, conf): + try: + os.unlink(name) + except OSError: + pass + try: + os.rmdir(work) + except OSError: + pass + + +def private_system_bus(): + if system_bus_reachable(): + return None + daemon = shutil.which("dbus-daemon") + if not daemon: + emit(e="warning", message="no system bus and no dbus-daemon to start one") + return None + try: + work = tempfile.mkdtemp(prefix="droiddeck-flatpak-bus-") + except OSError as err: + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + conf = os.path.join(work, "bus.conf") + path = os.path.join(work, "bus") + try: + with open(conf, "w") as f: + f.write(BUS_CONFIG % path) + proc = subprocess.Popen([daemon, "--config-file=" + conf, "--nofork", "--nopidfile"], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + except OSError as err: + remove_bus_files(work, conf, path) + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + bus = (proc, work, conf, path) + for _ in range(50): + if bus_reachable(path) or proc.poll() is not None: + break + time.sleep(0.1) + if not bus_reachable(path): + stop_system_bus(bus) + emit(e="warning", message="the private system bus did not start") + return None + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + return bus + + def emit(**kw): sys.stdout.write(json.dumps(kw) + "\n") sys.stdout.flush() @@ -43,7 +173,6 @@ def installation(): def app_ref(inst, app_id): - """The installed ref of an app, or None.""" for ref in inst.list_installed_refs_by_kind(Flatpak.RefKind.APP, None): if ref.get_name() == app_id: return ref @@ -109,21 +238,31 @@ def run(t, state, report_done=True): return 0 +def arches(): + native = Flatpak.get_default_arch() + return [native, "x86_64"] if native == "aarch64" else [native] + + def install(app_id): inst = installation() - arch = Flatpak.get_default_arch() if app_ref(inst, app_id) is not None: emit(e="done", note="already installed") return 0 - branch, last = None, None - for candidate in ("stable", "master"): - try: - branch = inst.fetch_remote_ref_sync(REMOTE, Flatpak.RefKind.APP, app_id, arch, candidate, None).get_branch() + arch, branch, last = None, None, None + for candidate_arch in arches(): + for candidate in ("stable", "master"): + try: + branch = inst.fetch_remote_ref_sync(REMOTE, Flatpak.RefKind.APP, app_id, candidate_arch, candidate, + None).get_branch() + arch = candidate_arch + break + except GLib.Error as err: + last = err + if branch is not None: break - except GLib.Error as err: - last = err if branch is None: - emit(e="error", message="%s is not on Flathub for %s (%s)" % (app_id, arch, last.message if last else "no branch")) + emit(e="error", message="%s is not on Flathub for %s (%s)" % (app_id, " or ".join(arches()), + last.message if last else "no branch")) return 1 t, state = transaction(inst) t.add_install(REMOTE, "app/%s/%s/%s" % (app_id, arch, branch), None) @@ -137,14 +276,18 @@ def install(app_id): def install_bundle(path): - """A single-file bundle (flatpak build-bundle), for apps Flathub does not carry.""" inst = installation() bundle = Gio.File.new_for_path(path) try: - app_id = Flatpak.BundleRef.new(bundle).get_name() + ref = Flatpak.BundleRef.new(bundle) + app_id = ref.get_name() except GLib.Error as err: emit(e="error", message="%s is not a Flatpak bundle (%s)" % (os.path.basename(path), err.message)) return 1 + if ref.get_arch() not in arches(): + emit(e="error", code="arch", id=app_id, arch=ref.get_arch(), + message="%s is built for %s, not %s" % (app_id, ref.get_arch(), " or ".join(arches()))) + return 1 if app_ref(inst, app_id) is not None: emit(e="done", id=app_id, note="already installed") return 0 @@ -242,6 +385,16 @@ def main(): cmd, args = sys.argv[1], sys.argv[2:] if cmd in ("install", "install-bundle", "update"): prepare_rootfs() + bus = private_system_bus() if cmd in BUS_COMMANDS else None + if bus: + signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(128 + signum)) + try: + return command(cmd, args) + finally: + stop_system_bus(bus) + + +def command(cmd, args): if cmd == "install" and args: return install(args[0]) if cmd == "install-bundle" and args: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index 24806fa2e..974bdc56b 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -3,7 +3,9 @@ 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" +if command -v pacman >/dev/null 2>&1; then PACKAGES="flatpak ostree appstream libxmlb libmalcontent libfyaml accountsservice composefs xdg-dbus-proxy" while read -r pkg probe; do [ -n "$pkg" ] || continue @@ -24,6 +26,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 +51,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) @@ -71,7 +78,13 @@ done mv -f "$WORK/installed.new" "$WORK/installed" find "$WORK/pkg" -type f -mtime +1 -delete 2>/dev/null -missing=$(for f in /usr/bin/flatpak /usr/lib/libflatpak.so.0 /usr/lib/libostree-1.so.1 /usr/bin/xdg-dbus-proxy; do +else + command -v flatpak >/dev/null 2>&1 || fail "Flatpak is missing from the runtime" + WORK=$(mktemp -d) + trap 'rm -rf "$WORK"' EXIT +fi +missing=$(for f in /usr/bin/flatpak /usr/lib/libflatpak.so.0 /usr/lib/libostree-1.so.1 /usr/lib/aarch64-linux-gnu/libflatpak.so.0 /usr/lib/aarch64-linux-gnu/libostree-1.so.1 /usr/bin/xdg-dbus-proxy; do + [ -e "$f" ] || continue ldd "$f" 2>&1 | grep -E 'not found|version .* not found' done | sort -u) [ -z "$missing" ] || { echo "$missing"; fail "Flatpak is missing libraries"; } @@ -91,7 +104,7 @@ Description=Central repository of Flatpak applications Icon=https://dl.flathub.org/repo/logo.svg GPGKey=mQINBFlD2sABEADsiUZUOYBg1UdDaWkEdJYkTSZD68214m8Q1fbrP5AptaUfCl8KYKFMNoAJRBXn9FbE6q6VBzghHXj/rSnA8WPnkbaEWR7xltOqzB1yHpCQ1l8xSfH5N02DMUBSRtD/rOYsBKbaJcOgW0K21sX+BecMY/AI2yADvCJEjhVKrjR9yfRX+NQEhDcbXUFRGt9ZT+TI5yT4xcwbvvTu7aFUR/dH7+wjrQ7lzoGlZGFFrQXSs2WI0WaYHWDeCwymtohXryF8lcWQkhH8UhfNJVBJFgCY8Q6UHkZG0FxMu8xnIDBMjBmSZKwKQn0nwzwM2afskZEnmNPYDI8nuNsSZBZSAw+ThhkdCZHZZRwzmjzyRuLLVFpOj3XryXwZcSefNMPDkZAuWWzPYjxS80cm2hG1WfqrG0Gl8+iX69cbQchb7gbEb0RtqNskTo9DDmO0bNKNnMbzmIJ3/rTbSahKSwtewklqSP/01o0WKZiy+n/RAkUKOFBprjJtWOZkc8SPXV/rnoS2dWsJWQZhuPPtv3tefdDiEyp7ePrfgfKxuHpZES0IZRiFI4J/nAUP5bix+srcIxOVqAam68CbAlPvWTivRUMRVbKjJiGXIOJ78wAMjqPg3QIC0GQ0EPAWwAOzzpdgbnG7TCQetaVV8rSYCuirlPYN+bJIwBtkOC9SWLoPMVZTwQARAQABtC5GbGF0aHViIFJlcG8gU2lnbmluZyBLZXkgPGZsYXRodWJAZmxhdGh1Yi5vcmc+iQJUBBMBCAA+FiEEblwF2XnHba+TwIE1QYTdTZB6fK4FAllD2sACGwMFCRLMAwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQQYTdTZB6fK5RJQ/+Ptd4sWxaiAW91FFk7+wmYOkEe1NY2UDNJjEEz34PNP/1RoxveHDt43kYJQ23OWaPJuZAbu+fWtjRYcMBzOsMCaFcRSHFiDIC9aTp4ux/mo+IEeyarYt/oyKb5t5lta6xaAqg7rwt65jW5/aQjnS4h7eFZ+dAKta7Y/fljNrOznUp81/SMcx4QA5G2Pw0hs4Xrxg59oONOTFGBgA6FF8WQghrpR7SnEe0FSEOVsAjwQ13Cfkfa7b70omXSWp7GWfUzgBKyoWxKTqzMN3RQHjjhPJcsQnrqH5enUu4Pcb2LcMFpzimHnUgb9ft72DP5wxfzHGAWOUiUXHbAekfq5iFks8cha/RST6wkxG3Rf44Zn09aOxh1btMcGL+5xb1G0BuCQnA0fP/kDYIPwh9z22EqwRQOspIcvGeLVkFeIfubxpcMdOfQqQnZtHMCabV5Q/Rk9K1ZGc8M2hlg8gHbXMFch2xJ0Wu72eXbA/UY5MskEeBgawTQnQOK/vNm7t0AJMpWK26Qg6178UmRghmeZDj9uNRc3EI1nSbgvmGlpDmCxaAGqaGL1zW4KPW5yN25/qeqXcgCvUjZLI9PNq3Kvizp1lUrbx7heRiSoazCucvHQ1VHUzcPVLUKKTkoTP8okThnRRRsBcZ1+jI4yMWIDLOCT7IW3FePr+3xyuy5eEo9a25Ag0EWUPa7AEQALT/CmSyZ8LWlRYQZKYw417p7Z2hxqd6TjwkwM3IQ1irumkWcTZBZIbBgrSOg6CcXD2oWydCQHWi9qaxhuhEl2bJL5LskmBcMxVdQeD0LLHd8QUnbnnIby8ocvWN1alPfvJFjCUTrmD22U1ycOzRw2lIe4kiQONbOZtdWrVImQQSndjFlisitbmlWHvHm2lOOYy8+GJB7YffVV193hmnBSJffCy4bvkuLxsI+n1DhOzc7MPV3z6HGk4HiEcF0yyt9tCYhpsxHFdBoq2h771HfAcS0s98EVAqYMFnf9em+4cnYpdI6mhIfS1FQiKl6DBAYA8tT3ggla00DurPo0JwX/zN+PaO5h/6O9aCZwV7G6rbkgMuqMergXaf8oP38gr0z+MqWnkfM63Bodq68GP4l4hd02BoFBbDf38TMuGQB14+twJMdfbAxo2MbgluvQgfwHfZ2ca6gyEY+9s/YD1gugLjV+S6CB51WkFNe1z4tAPgJZNxUcKCbeaHNbthl8Hks/pY9RCEseX/EdfzF18epbSjJMPh4DPQXbUoFwmyuYcoBOPmvZHNl9hK7B/1RP8w1ZrXk8qdupC0SNbafX7270B7lMMVImzZetGsM9ypXJ6llhp3FwW09iseNyGJGPsr/dvTMGDXqOPfU/9SAS1LSTY4K9PbRtdrBE318YX8mIk5ABEBAAGJBHIEGAEIACYWIQRuXAXZecdtr5PAgTVBhN1NkHp8rgUCWUPa7AIbAgUJEswDAAJACRBBhN1NkHp8rsF0IAQZAQgAHRYhBFSmzd2JGfsgQgDYrFYnAunj7X7oBQJZQ9rsAAoJEFYnAunj7X7oR6AP/0KYmiAFeqx14Z43/6s2gt3VhxlSd8bmcVV7oJFbMhdHBIeWBp2BvsUf00I0Zl14ZkwCKfLwbbORC2eIxvzJ+QWjGfPhDmS4XUSmhlXxWnYEveSek5Tde+fmu6lqKM8CHg5BNx4GWIX/vdLi1wWJZyhrUwwICAxkuhKxuP2Z1An48930eslTD2GGcjByc27+9cIZjHKa07I/aLffo04V+oMT9/tgzoquzgpVV4jwekADo2MJjhkkPveSNI420bgT+Q7Fi1l0X1aFUniBvQMsaBa27PngWm6xE2ZYvh7nWCdd5g0c0eLIHxWwzV1lZ4Ryx4ITO/VL25ItECcjhTRdYa64sA62MYSaB0x3eR+SihpgP3wSNPFu3MJo6FKTFdi4CBAEmpWHFW7FcRmd+cQXeFrHLN3iNVWryy0HK/CUEJmiZEmpNiXecl4vPIIuyF0zgSCztQtKoMr+injpmQGC/rF/ELBVZTUSLNB350S0Ztvw0FKWDAJSxFmoxt3xycqvvt47rxTrhi78nkk6jATKGyvP55sO+K7Q7Wh0DXA69hvPrYW2eu8jGCdVGxi6HX7L1qcfEd0378S71dZ3g9o6KKl1OsDWWQ6MJ6FGBZedl/ibRfs8p5+sbCX3lQSjEFy3rx6n0rUrXx8U2qb+RCLzJlmC5MNBOTDJwHPcX6gKsUcXZrEQALmRHoo3SrewO41RCr+5nUlqiqV3AohBMhnQbGzyHf2+drutIaoh7Rj80XRh2bkkuPLwlNPf+bTXwNVGse4bej7B3oV6Ae1N7lTNVF4Qh+1OowtGjmfJPWo0z1s6HFJVxoIof9z58Msvgao0zrKGqaMWaNQ6LUeC9g9Aj/9Uqjbo8X54aLiYs8Z1WNc06jKP+gv8AWLtv6CR+l2kLez1YMDucjm7v6iuCMVAmZdmxhg5I/X2+OM3vBsqPDdQpr2TPDLX3rCrSBiS0gOQ6DwN5N5QeTkxmY/7QO8bgLo/Wzu1iilH4vMKW6LBKCaRx5UEJxKpL4wkgITsYKneIt3NTHo5EOuaYk+y2+Dvt6EQFiuMsdbfUjs3seIHsghX/cbPJa4YUqZAL8C4OtVHaijwGo0ymt9MWvS9yNKMyT0JhN2/BdeOVWrHk7wXXJn/ZjpXilicXKPx4udCF76meE+6N2u/T+RYZ7fP1QMEtNZNmYDOfA6sViuPDfQSHLNbauJBo/n1sRYAsL5mcG22UDchJrlKvmK3EOADCQg+myrm8006LltubNB4wWNzHDJ0Ls2JGzQZCd/xGyVmUiidCBUrD537WdknOYE4FD7P0cHaM9brKJ/M8LkEH0zUlo73bY4XagbnCqve6PvQb5G2Z55qhWphd6f4B6DGed86zJEa/RhS REPO -if ! flatpak remote-list --user --columns=name 2>/dev/null | grep -qx flathub; then +if ! flatpak remote-list --columns=name 2>/dev/null | grep -qx flathub; then out=$(flatpak remote-add --user --if-not-exists flathub "$WORK/flathub.flatpakrepo" 2>&1) rc=$? echo "$out" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index a38d77d8c..6b5c4a8be 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -4,8 +4,10 @@ import json import os import re import runpy +import signal import subprocess import sys +import tempfile from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" @@ -33,12 +35,10 @@ DOTNET_FEX = { "FEX_MEMCPYSETTSOENABLED": "1", "FEX_HALFBARRIERTSOENABLED": "1", "FEX_X87REDUCEDPRECISION": "0", - "FEX_MULTIBLOCK": "0", } def game_files(exe): - """Lower-cased names of the files next to the game's executable and one directory below.""" names = set() folder = os.path.dirname(exe) try: @@ -57,7 +57,6 @@ def game_files(exe): class Game: - """What a fix gets to look at: the executable, its launch arguments and the files beside it.""" def __init__(self, exe, args): self.exe = exe @@ -84,7 +83,13 @@ def is_godot(game): @fix def dotnet_memory_ordering(game): if "coreclr.dll" in game.files: - return DOTNET_FEX, [], ".NET runtime: FEX with full TSO and without multiblock" + return DOTNET_FEX, [], ".NET runtime: FEX with full TSO" + + +@fix +def unity_memory_ordering(game): + if {"unityplayer.so", "gameassembly.so", "unityplayer.dll"} & game.files: + return {"FEX_TSOENABLED": "1"}, [], "Unity: FEX with TSO" @fix @@ -96,10 +101,16 @@ 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): + 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")): @@ -108,17 +119,56 @@ def deep_rock_gdk_raytracing(game): @fix def arkham_city_x87(game): - """Batman: Arkham City (BatmanAC.exe, also started through BmLauncher.exe beside it) leans on x87 - and stops with Unreal's "Fatal error!" right after start when FEX reduces its precision.""" if "batmanac.exe" in game.files: return {"FEX_X87REDUCEDPRECISION": "0"}, [], "Batman: Arkham City: FEX with full x87 precision" + +@fix +def teardown_vsync(game): + if game.stem == "teardown": + return {"vblank_mode": "2"}, [], "Teardown: OpenGL keeps the game's own vsync" + + +@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 little_nightmares_threads(game): + if game.stem == "littlenightmares": + return {"PROTONFIXES_DISABLE": "1"}, [], "Little Nightmares: umu-protonfixes off (its -onethread puts the game and renderer on one thread)" + + +@fix +def caravan_sandwitch_feature_level(game): + if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": + 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): + 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 - game runs. The game is started itself instead; the prelauncher's own --launcher-skip started it - twice.""" if len(command) > 2 and os.path.basename(command[2]).lower() == "redprelauncher.exe": game = os.path.join(os.path.dirname(command[2]), "bin", "x64", "Cyberpunk2077.exe") if os.path.isfile(game): @@ -127,8 +177,62 @@ 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 or command[1] != "waitforexitandrun" or not re.fullmatch(r"start_protected_game(?:_?x64|_?64)?\.exe", @@ -146,7 +250,6 @@ def offline_without_anticheat(command, env): game = os.path.join(folder, relative) if os.path.isabs(relative) or relative.startswith("..") or not os.path.isfile(game): return command - # Resolve symlinks before accepting an executable inside the game directory. root = os.path.realpath(folder) if os.path.commonpath((root, os.path.realpath(game))) != root: return command @@ -157,20 +260,21 @@ def offline_without_anticheat(command, env): def engine_fixes(exe, args): - """Environment and extra arguments a game needs because of what it is built with.""" game = Game(exe, args) env, extra, notes = {}, [], [] 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 def win_components(compat, app_id): - """The game's Windows components put into its prefix; returns their WINEDLLOVERRIDES entries.""" if not compat: return "" try: @@ -196,6 +300,141 @@ def game_gpu(env): return result +def vram_cap(env): + 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): + 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): + 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 core_speeds(cores, root="/sys/devices/system/cpu"): + for name in ("cpu_capacity", "cpufreq/cpuinfo_max_freq"): + speeds = {} + for core in cores: + try: + with open("%s/cpu%d/%s" % (root, core, name)) as f: + speeds[core] = int(f.read().strip()) + except (OSError, ValueError): + break + else: + return speeds + return None + + +def fastest_first(cores): + cores = sorted(cores) + speeds = core_speeds(cores) + return sorted(cores, key=lambda core: -speeds[core]) if speeds else cores + + +def proton_cpu_limit(command, env): + app_id = env.get("SteamGameId", "") + if not command or not app_id.isdigit(): + return None + try: + if os.path.getsize(command[0]) > 4 * 1024 * 1024: + return None + with open(command[0], encoding="utf-8", errors="replace") as f: + text = f.read() + except OSError: + return None + table = re.search(r"^default_cpu_limit = \{(.*?)^\}", text, re.M | re.S) + match = table and re.search(r'^\s*"%s"\s*:\s*"?(\w+)' % app_id, table.group(1), re.M) + if not match: + return None + value = match.group(1) + return int(value) if value.isdigit() else value + + +def cpu_topology(env, command=()): + 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 + picked = bool(env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()) + fastest = env.get("DROIDDECK_FASTEST_CORES", "").strip() != "0" and game_id(env) is not None + if not (picked or fastest): + return + try: + cores = sorted(os.sched_getaffinity(0)) + except OSError: + return + online = online_cores() + if not cores or cores[-1] >= len(online): + return + picked = picked and not set(cores) >= online + if fastest: + limit = None if picked else proton_cpu_limit(command, env) + if isinstance(limit, str): + return + cores = fastest_first(cores)[:limit or None] + elif set(cores) >= online: + return + if cores == sorted(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 gl_vsync(env): + if "vblank_mode" in env or game_id(env) is None: + return False + env["vblank_mode"] = "0" + return True + + +def game_images(env): + if game_id(env) is None: + return False + env.setdefault("GAMESCOPE_WSI_MIN_IMAGE_COUNT", "8") + env.setdefault("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT", "1") + return True + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -228,6 +467,55 @@ def apply_config(env, config, app_id, fixes=None): return result +GAME_DEBUG_CHANNELS = ( + "timestamp", "pid", "tid", "seh", "unwind", "threadname", "debugstr", "loaddll", "mscoree", +) +WINE_DEBUG_SELECTOR = re.compile(r"(?:(trace|warn|err|fixme))?([+-])([A-Za-z_][A-Za-z0-9_]*)") + + +def game_debug_channels(*values): + selectors = {} + for value in values: + if not isinstance(value, str) or "\0" in value or len(value) > 8192: + continue + for part in value.split(","): + part = part.strip() + match = WINE_DEBUG_SELECTOR.fullmatch(part) + if match is None: + continue + key = (match[1] or "", match[3]) + selectors.pop(key, None) + selectors[key] = part + for channel in GAME_DEBUG_CHANNELS: + key = ("", channel) + selectors.pop(key, None) + selectors[key] = "+" + channel + formatted = ",".join(selectors.values()) + if len(formatted) > 8192: + formatted = ",".join("+" + channel for channel in GAME_DEBUG_CHANNELS) + return formatted + + +def apply_game_debug_logs(env, config, debug_dir): + if not isinstance(config, dict) or config.get("version") != 1 or config.get("gameDebugLogs") is not True: + return env + if (not isinstance(debug_dir, str) or "\0" in debug_dir or len(debug_dir) > 8192 + or not os.path.isabs(debug_dir) or not os.path.isdir(debug_dir)): + print("droiddeck-game-env: game debug logs skipped; session log directory unavailable", file=sys.stderr) + return env + result = dict(env) + result.update({ + "PROTON_LOG": "1", + "PROTON_LOG_DIR": debug_dir, + "PROTON_CRASH_REPORT_DIR": debug_dir, + "DXVK_LOG_PATH": debug_dir, + "DXVK_LOG_LEVEL": "debug", + "VKD3D_DEBUG": "info", + "WINEDEBUG": game_debug_channels(env.get("WINEDEBUG"), env.get("PROTON_LOG")), + }) + return result + + def sync_config(config, app_id): games = config.get("games", {}) return { @@ -280,10 +568,6 @@ SSBS_LIB = "/usr/local/lib/libssbs.so" def force_ssbs(command, env): - """DROIDDECK_FORCE_SSBS=1 (a game's or the shared environment): preload libssbs.so into this - Proton's Wine, which then keeps PSTATE.SSBS set across signal returns - speculative store - bypass stays allowed, as force_ssbs.diff does inside a rebuilt ntdll. ARM64 Protons only: the - library is aarch64 and only arm64 Wine has the signal path it fixes.""" if env.get("DROIDDECK_FORCE_SSBS", "").lower() not in ("1", "on", "true", "yes"): return env proton = os.path.dirname(command[0]) if command else "" @@ -304,10 +588,6 @@ EVALUATOR_SCRIPT = re.compile(r"(?:^|[\\/])evaluatorscript_[0-9]+\.vdf$", re.IGN def mark_install_scripts(command, env): - """The client is about to run a game's install scripts (iscriptevaluator.exe): mark every process - in them but a Vulkan runtime installer as already run first, so no redistributable installer - starts - on first launch the shared ones may still be downloading, and on ARM64 Proton the VC++ - ones stop with an error.""" if not any(arg.lower().replace("\\", "/").endswith("iscriptevaluator.exe") for arg in command): return [] root = env.get("BL_X64_STEAM_ROOT") or env.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or str(Path.home() / ".local/share/Steam") @@ -414,7 +694,198 @@ def record_install_scripts(digest, env): print("droiddeck-game-env: install scripts not recorded (%s)" % error, file=sys.stderr) -def start(launch, launch_env, digest): +def directaudio_settings(env): + if "directaudio" not in env.get("WINE_AUDIO_DRIVER", "").split(","): + return env + for name, value in list(env.items()): + if name.startswith("AUDIO_DIRECT_"): + env["BANNER_" + name] = value + return env + + +DIRT_GAMES = {"dirt3_game": "dirt3", "showdown": "dirtshowdown", "showdown_avx": "dirtshowdown"} +DIRT_WS2 = "/usr/local/lib/droiddeck-dirt/ws2_32.dll" +DIRT_MARKER = b"droiddeck-dirt-ws2_32" +DIRT_FIXED = "showdown_avx.exe".encode("utf-16-le") +DIRT_SAVED = ".droiddeck-original" + + +def dirt_telemetry_on(prefix, game): + try: + folders = [f for f in (Path(prefix) / "pfx/drive_c/users/steamuser/Documents/My Games").iterdir() + if f.name.lower().replace(" ", "") == game] + except OSError: + return False + for folder in folders: + try: + text = (folder / "hardwaresettings/hardware_settings_config.xml").read_text(encoding="latin-1") + except OSError: + continue + for tag in ("udp", "motion"): + element = re.search(r"<%s\s[^>]*>" % tag, text) + if element: + attrs = dict(re.findall(r'\s(\w+)="([^"]*)"', element.group(0))) + return attrs.get("enabled") == "true" and attrs.get("ip", "").lower() not in ("", "dbox") + return False + + +def proton_ws2(proton): + return Path(proton).parent / "files/lib/wine/i386-windows/ws2_32.dll" + + +def proton_has_dirt_fix(proton): + try: + return DIRT_FIXED in proton_ws2(proton).read_bytes() + except OSError: + return False + + +WINE_DLL_DIRS = ("/lib/wine/i386-windows", "/lib/wine/x86_64-windows", "/lib/wine/aarch64-windows", "/lib/wine", + "/lib/wine/fakedlls", "/lib64/wine", "/lib64/wine/fakedlls", "/lib64/wine/x86_64-windows") + + +def is_wine_dll_link(path): + try: + return os.path.islink(path) and os.path.dirname(os.readlink(path)).endswith(WINE_DLL_DIRS) + except OSError: + return False + + +def prefix_ws2(prefix): + return Path(prefix) / "pfx/drive_c/windows/syswow64/ws2_32.dll" + + +def is_dirt_stand_in(path): + try: + return not path.is_symlink() and DIRT_MARKER in path.read_bytes() + except OSError: + return False + + +def dirt_ws2_wanted(command, env): + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if len(command) < 3 or not prefix or not os.path.isfile(DIRT_WS2): + return None + game = DIRT_GAMES.get(os.path.splitext(os.path.basename(command[2]))[0].lower()) + if not game or not dirt_telemetry_on(prefix, game) or proton_has_dirt_fix(command[0]): + return None + return prefix if os.path.lexists(prefix_ws2(prefix)) else None + + +def swap_dirt_ws2(prefix): + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + data = Path(DIRT_WS2).read_bytes() + if not is_dirt_stand_in(target): + if os.path.lexists(saved): + os.unlink(saved) + os.replace(target, saved) + staged = target.with_name(target.name + ".droiddeck-tmp") + staged.write_bytes(data) + os.replace(staged, target) + + +def restore_dirt_ws2(prefix, proton): + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + own = proton_ws2(proton) + had_saved = os.path.lexists(saved) + if had_saved: + if os.path.lexists(target) and not is_dirt_stand_in(target): + os.unlink(saved) + return False + if not own.is_file() or not is_wine_dll_link(saved) or os.path.realpath(saved) == os.path.realpath(own): + os.replace(saved, target) + return True + os.unlink(saved) + if own.is_file() and (is_dirt_stand_in(target) or (had_saved and not os.path.lexists(target))): + link = target.with_name(target.name + ".droiddeck-tmp") + if os.path.lexists(link): + os.unlink(link) + os.symlink(own, link) + os.replace(link, target) + return True + return False + + +EGO_RESTRICTIONS = "system/hardware_settings_restrictions.xml" +EGO_CORE_RULE = re.compile(r'[ \t]*<restrict_if name="cores" op="(int_[a-z]+)" value="(\d+)">.*?</restrict_if>[ \t]*\r?\n', re.S) +EGO_OPS = {"int_eq": int.__eq__, "int_ne": int.__ne__, "int_ge": int.__ge__, "int_gt": int.__gt__, + "int_le": int.__le__, "int_lt": int.__lt__} + + +def windows_core_count(env): + count = (env.get("WINE_CPU_TOPOLOGY") or "").split(":", 1)[0] + return int(count) if count.isascii() and count.isdigit() and int(count) > 0 else None + + +def ego_core_plan(command, env): + count = windows_core_count(env) + if not count or len(command) < 3: + return None + folder = Path(command[2]).parent + path = folder / EGO_RESTRICTIONS + try: + raw = path.read_bytes() + except OSError: + return None + text = raw.decode("latin-1") + start, end = text.find("<cpu>"), text.find("</cpu>") + if start < 0 or end < start: + return None + rules = list(EGO_CORE_RULE.finditer(text, start, end)) + if not rules or any(EGO_OPS.get(rule.group(1), lambda a, b: True)(count, int(rule.group(2))) for rule in rules): + return None + smaller = [rule for rule in rules if rule.group(1) == "int_eq" and int(rule.group(2)) < count] + if not smaller: + return None + source = max(smaller, key=lambda rule: int(rule.group(2))) + worker_map = re.search(r'workerMapFile="([^"]+)"', source.group(0)) + if worker_map and not (folder / worker_map.group(1)).is_file(): + return None + plan = source.group(0).replace('value="%s"' % source.group(2), 'value="%d"' % count, 1) + saved = path.with_name(path.name + DIRT_SAVED) + if not os.path.lexists(saved): + saved.write_bytes(raw) + handle, staged = tempfile.mkstemp(prefix=path.name + ".", suffix=".droiddeck-tmp", dir=str(path.parent)) + try: + with os.fdopen(handle, "wb") as out: + out.write((text[:source.end()] + plan + text[source.end():]).encode("latin-1")) + os.replace(staged, path) + except BaseException: + if os.path.lexists(staged): + os.unlink(staged) + raise + return "%s had no thread plan for %d cores; added a copy of its %s-core plan" % (EGO_RESTRICTIONS, count, source.group(2)) + + +def wait_forwarding_signals(process): + def forward(signum, frame): + try: + process.send_signal(signum) + except OSError: + pass + + previous = {signum: signal.signal(signum, forward) for signum in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + try: + code = process.wait() + finally: + for signum, handler in previous.items(): + signal.signal(signum, handler) + return 128 - code if code < 0 else code + + +def start(launch, launch_env, digest, after=None): + if after: + process = subprocess.Popen(launch, env=launch_env) + try: + return wait_forwarding_signals(process) + finally: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) if digest: code = subprocess.run(launch, env=launch_env, check=False).returncode if code == 0: @@ -429,6 +900,7 @@ def main(): return 2 env = game_gpu(os.environ.copy()) mic_enabled = env.get("BL_MIC_ENABLED") + debug_dir = env.get("BL_DEBUG_DIR", "") scripts = mark_install_scripts(command, env) if scripts and install_scripts_done(scripts, env): print("droiddeck-game-env: install scripts already run in this prefix; evaluator skipped", file=sys.stderr) @@ -438,12 +910,19 @@ def main(): except OSError: digest = None app_id = game_id(env) + dirt_prefix = None if app_id: + gl_default = gl_vsync(env) waiting = len(command) > 1 and command[1] == "waitforexitandrun" + if waiting: + game_images(env) 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 ({}, [], []) + if not gl_default: + fixes.pop("vblank_mode", None) for note in notes: print("droiddeck-game-env: " + note, file=sys.stderr) command += extra @@ -451,11 +930,18 @@ def main(): if components: own = fixes.get("WINEDLLOVERRIDES") fixes["WINEDLLOVERRIDES"] = components + ";" + own if own else components + dirt_prefix = dirt_ws2_wanted(command, env) + if dirt_prefix: + own = fixes.get("WINEDLLOVERRIDES") + fixes["WINEDLLOVERRIDES"] = own + ";ws2_32=n,b" if own else "ws2_32=n,b" path = Path.home() / ".config/droiddeck/game-environment.json" + config = {} try: with path.open(encoding="utf-8") as source: config = json.load(source) if waiting: + if "vblank_mode" in config.get("shared", {}): + fixes.pop("vblank_mode", None) env = apply_config(env, config, app_id, fixes) else: env = apply_config(env, sync_config(config, app_id), app_id) @@ -464,11 +950,29 @@ def main(): env = apply_config(env, {"version": 1}, app_id, fixes) except (OSError, ValueError, TypeError, AttributeError): print("droiddeck-game-env: invalid configuration; using inherited environment", file=sys.stderr) + if waiting: + before_debug = env + env = apply_game_debug_logs(env, config, debug_dir) + if env is not before_debug: + print("droiddeck-game-env: game debug logs enabled for this launch", file=sys.stderr) + if gl_default and env.get("vblank_mode") == "0": + print("droiddeck-game-env: OpenGL does not wait for the screen refresh (vblank_mode=0)", file=sys.stderr) if app_id and len(command) > 1 and command[1] == "waitforexitandrun": command = offline_without_anticheat(command, env) if mic_enabled == "0": - env["BANNER_AUDIO_DIRECT_MIC"] = "0" + env["AUDIO_DIRECT_MIC"] = "0" + env = directaudio_settings(env) + env = vram_cap(env) env = force_ssbs(command, env) + game_cores(env) + cpu_topology(env, command) + if app_id and len(command) > 2 and command[1] == "waitforexitandrun": + try: + note = ego_core_plan(command, env) + except OSError as error: + note = "no thread plan added for this core count (%s)" % error + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: @@ -481,16 +985,45 @@ def main(): return 1 if xbox_result is not None: return xbox_result + after = None + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if app_id and prefix and len(command) > 1 and command[1] == "waitforexitandrun": + try: + if dirt_prefix: + after = lambda: restore_dirt_ws2(dirt_prefix, command[0]) + swap_dirt_ws2(dirt_prefix) + print("droiddeck-game-env: DiRT telemetry fix: ws2_32 stand-in in the prefix until the game exits", + file=sys.stderr) + elif restore_dirt_ws2(prefix, command[0]): + print("droiddeck-game-env: DiRT telemetry fix: put the prefix's own ws2_32 back", file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix not applied (%s)" % error, file=sys.stderr) + if after: + after = None + try: + restore_dirt_ws2(dirt_prefix, command[0]) + except OSError as undo: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); Wine uses its own copy " + "and the next launch puts the file back" % undo, file=sys.stderr) sync = load_sync() launch, launch_env = select_sync(command, env, sync) if launch[0] != command[0]: try: - return start(launch, launch_env, digest) + return start(launch, launch_env, digest, after) except OSError as error: print("droiddeck-game-env: %s could not start (%s); stock launch" % (launch[0], error), file=sys.stderr) launch, launch_env = command, without_pack(launch_env, env) record_stock(sync, launch, launch_env) - return start(launch, launch_env, digest) + try: + return start(launch, launch_env, digest, after) + except OSError: + if after: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) + raise if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance new file mode 100644 index 000000000..1fc6e0f37 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance @@ -0,0 +1,342 @@ +#!/usr/bin/python3 +import fcntl +import errno +import json +import os +from pathlib import Path +import runpy +import subprocess +import sys +import tempfile +import time + +BIN = Path(__file__).resolve().parent +IDLE = {"wineserver", "services.exe", "winedevice.exe", "explorer.exe", "rpcss.exe", "plugplay.exe", + "conhost.exe", "lsass.exe", "svchost.exe", "steam.exe", "wineboot.exe", "winemenubuilder.exe"} + + +def control(folder): + folder = Path(folder).resolve(strict=True) + root = folder / ".droiddeck-gog" + if root.is_symlink(): + raise ValueError("GOG control directory is a symbolic link") + root.mkdir(exist_ok=True) + return root + + +def read(path): + if path.is_symlink(): + raise ValueError("GOG metadata is a symbolic link") + return json.loads(path.read_text(encoding="utf-8")) + + +def write(path, value): + if path.is_symlink(): + raise ValueError("GOG metadata is a symbolic link") + descriptor, name = tempfile.mkstemp(prefix=path.name + ".", suffix=".new", dir=path.parent) + temporary = Path(name) + try: + with os.fdopen(descriptor, "w") as stream: + json.dump(value, stream) + stream.flush() + os.fsync(stream.fileno()) + os.replace(temporary, path) + directory = os.open(path.parent, os.O_RDONLY | os.O_DIRECTORY) + try: + try: + os.fsync(directory) + except OSError as error: + if error.errno not in (errno.EINVAL, errno.ENOTSUP): + raise + finally: + os.close(directory) + finally: + temporary.unlink(missing_ok=True) + + +def lock_file(root): + return os.fdopen(os.open(root / "lease", os.O_RDWR | os.O_CREAT | os.O_NOFOLLOW, 0o600), "r+") + + +def generation(pid): + try: + return Path("/proc/%s/stat" % pid).read_text().rsplit(")", 1)[1].split()[19] + except (OSError, IndexError): + return None + + +def lease(folder, owner): + root = control(folder) + with lock_file(root) as stream: + fcntl.lockf(stream, fcntl.LOCK_SH | fcntl.LOCK_NB) + sidecar = read(Path(folder) / ".droiddeck-store.json") + if sidecar.get("state", "installed") != "installed": + raise ValueError("Resume or recover the GOG update before playing") + journal = root / "operation.json" + if journal.exists() and read(journal).get("phase") != "download": + raise ValueError("GOG maintenance is incomplete") + start = generation(owner) + if start is None: + raise ValueError("Game launcher has exited") + print("ready", flush=True) + sys.stdout.close() + while generation(owner) == start: + time.sleep(0.25) + return 0 + + +def desktop_environment(base, proc=Path("/proc")): + env = dict(base) + if env.get("DROIDDECK_GOG_DESKTOP") != "1": + return env + deadline = time.monotonic() + 45 + while True: + for entry in proc.iterdir(): + if not entry.name.isdigit(): + continue + try: + command = (entry / "cmdline").read_bytes().split(b"\0")[0] + if command != b"/usr/bin/plasmashell": + continue + values = dict(os.fsdecode(item).split("=", 1) for item in (entry / "environ").read_bytes().split(b"\0") if b"=" in item) + if values.get("BL_DESKTOP") != "1" or values.get("XDG_RUNTIME_DIR") != env.get("XDG_RUNTIME_DIR"): + continue + if not values.get("DISPLAY") or values.get("WAYLAND_DISPLAY") == env.get("WAYLAND_DISPLAY"): + continue + for key in ("DISPLAY", "WAYLAND_DISPLAY", "XAUTHORITY", "DBUS_SESSION_BUS_ADDRESS", "BL_DESKTOP"): + if key in values: + env[key] = values[key] + return env + except (OSError, ValueError): + continue + if time.monotonic() >= deadline: + raise ValueError("The desktop display is not ready; resume the Linux session and verify recovery before retrying") + time.sleep(0.25) + + +def target_for(folder, appid, game): + run = runpy.run_path(str(BIN / "droiddeck-proton-run"))["main"].__globals__ + root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or run["STEAM_ROOT"] + target = run["shortcut_target"](str(int(appid) & 0xffffffff), str(game), str(folder), root) + target.install = str(folder) + return run, root, target + + +def runner(folder, appid, game, graphical=False): + run, root, target = target_for(folder, appid, game) + available = run["tools"](root) + name, _ = run["choose_tool"](target.appid, run["mapping"](root), available) + if name is None: + raise ValueError("No Proton tool is installed for this game") + tool, command = available[name] + base = desktop_environment(os.environ) if graphical else dict(os.environ) + env = run["environment"](base, target, tool, root, window=base.get("BL_DESKTOP") == "1") + env["DROIDDECK_GOG_MAINTENANCE"] = "1" + env["FEX_X87REDUCEDPRECISION"] = "0" + env.pop("BL_STORE_EXIT", None) + return str(Path(tool) / command), env, target.compatdata + + +def active(prefix, proc=Path("/proc")): + result = [] + prefix = os.path.realpath(os.path.join(prefix, "pfx")) + for entry in proc.iterdir(): + if not entry.name.isdigit(): + continue + try: + env = dict(part.split(b"=", 1) for part in (entry / "environ").read_bytes().split(b"\0") if b"=" in part) + if os.path.realpath(os.fsdecode(env.get(b"WINEPREFIX", b""))) != prefix: + continue + args = (entry / "cmdline").read_bytes().split(b"\0") + name = os.fsdecode(args[0]).replace("\\", "/").rsplit("/", 1)[-1].lower() + if name not in IDLE: + result.append(int(entry.name)) + except (OSError, ValueError): + continue + return result + + +def idle(folder, appid, game): + _, _, target = target_for(folder, appid, game) + if active(target.compatdata): + raise ValueError("Close the GOG game before maintenance") + return 0 + + +def validate_installer(folder, installer): + root = control(folder) + path = Path(installer) + if path.is_symlink() or not path.resolve(strict=True).is_relative_to(root / "downloads") or path.suffix.lower() != ".exe": + raise ValueError("The patch executable is outside GOG download storage") + with path.open("rb") as stream: + if stream.read(2) != b"MZ": + raise ValueError("The GOG patch is not a Windows executable") + return path + + +def installer_arguments(path): + with path.open("rb") as stream: + data = stream.read(4 * 1024 * 1024) + return ["/NOGUI"] if b"Inno Setup Setup Data" in data else [] + + +def start(folder, appid, installer, game): + root = control(folder) + validate_installer(folder, installer) + with lock_file(root) as stream: + fcntl.lockf(stream, fcntl.LOCK_EX | fcntl.LOCK_NB) + journal = read(root / "operation.json") + if journal.get("phase") != "patch-ready": + raise ValueError("The patch must be selected again before it can run") + idle(folder, appid, game) + journal["phase"] = "patch-starting" + write(root / "operation.json", journal) + write(root / "patch-status.json", {"state": "starting", "startedAt": time.time()}) + with (root / "patch.log").open("ab") as log: + subprocess.Popen([sys.executable, str(Path(__file__).resolve()), "run", folder, appid, installer, game], + stdin=subprocess.DEVNULL, stdout=log, stderr=log, start_new_session=True, close_fds=True) + return 0 + + +def status(folder): + root = control(folder) + path = root / "patch-status.json" + result = read(path) + ended = result.get("state") == "running" and generation(result.get("pid")) != result.get("generation") + abandoned = result.get("state") == "starting" and time.time() - result.get("startedAt", 0) > 60 + if ended or abandoned: + result = {"state": "uncertain", "reason": "The patch helper ended without a confirmed result; verify recovery before retrying"} + write(path, result) + journal = read(root / "operation.json") + journal["phase"] = "patch-uncertain" + write(root / "operation.json", journal) + print(json.dumps(result), flush=True) + return 0 + + +def run_patch(folder, appid, installer, game): + root = control(folder) + try: + with lock_file(root) as stream: + fcntl.lockf(stream, fcntl.LOCK_EX) + path = validate_installer(folder, installer) + command, env, prefix = runner(folder, appid, game, True) + if active(prefix): + raise ValueError("Close the GOG game before applying the patch") + journal = read(root / "operation.json") + if journal.get("phase") != "patch-starting": + raise ValueError("The patch is already running or needs recovery") + journal["phase"] = "patch-applying" + write(root / "operation.json", journal) + sidecar_path = Path(folder) / ".droiddeck-store.json" + sidecar = read(sidecar_path) + sidecar["state"] = "updating" + write(sidecar_path, sidecar) + installed_path = root / "installed.json" + if installed_path.is_file(): + installed = read(installed_path) + installed.update(verified=False, manifest={}, files=[]) + write(installed_path, installed) + write(root / "patch-status.json", {"state": "running", "pid": os.getpid(), "generation": generation(os.getpid())}) + os.makedirs(prefix, exist_ok=True) + setup = runpy.run_path(str(BIN / "droiddeck-store-launch"))["main"].__globals__ + previous = dict(os.environ) + try: + os.environ.update(env) + pfx = Path(prefix) / "pfx" + if not (pfx / "system.reg").is_file() or not (pfx / "drive_c/windows/system32/reg.exe").is_file(): + subprocess.run([command, "run", "wineboot.exe", "-u"], env=env, timeout=90, check=True) + if not (pfx / "drive_c/windows/system32/reg.exe").is_file(): + raise ValueError("Proton did not initialize the game's registry tool") + result = setup["apply_gog_registry"](Path(folder), prefix, command, installation=journal.get("before")) + if not result.startswith(("ready", "written=")): + raise ValueError("GOG registry preparation failed; the patch was not applied") + prepare_setup(folder, command, env) + finally: + os.environ.clear(); os.environ.update(previous) + proc = subprocess.Popen([command, "run", str(path), *installer_arguments(path)], cwd=str(path.parent), env=env) + code = proc.wait() + quiet_at = time.monotonic() + while True: + if active(prefix): + quiet_at = time.monotonic() + elif time.monotonic() - quiet_at >= 2: + break + time.sleep(0.25) + journal["phase"] = "patch-uncertain" + write(root / "operation.json", journal) + if code: + raise ValueError("GOG patch installer exited with code %d; inspect patch.log" % code) + write(root / "patch-status.json", {"state": "done", "exitCode": code}) + return 0 + except Exception as error: + write(root / "patch-status.json", {"state": "failed", "reason": str(error)}) + return 1 + + +def prepare_setup(folder, command, env): + root = control(folder) + record_path = root / "installed.json" + if not record_path.is_file(): + return + journal = read(root / "operation.json") + record = journal.get("before") or read(record_path) + manifest = record.get("manifest", {}) + if not record.get("build"): + return + info_path = Path(folder) / ("goggame-%s.info" % record["id"]) + language = read(info_path).get("language", "") if info_path.is_file() else "" + legacy = manifest.get("product", {}) + products = manifest.get("products", []) if not legacy else [ + {"productId": str(item["gameID"]), "temp_executable": item["executable"].lstrip("/\\")} + for item in legacy.get("support_commands", []) + if "Neutral" in item.get("languages", []) or record.get("language") in item.get("languages", []) or language in item.get("languages", [])] + for product in products: + if str(product.get("productId")) not in record.get("products", []): + continue + program = None + if manifest.get("scriptInterpreter"): + if not (Path(folder) / ("goggame-%s.script" % product["productId"])).is_file(): + continue + program = Path(folder) / "support/__redist/ISI/scriptinterpreter.exe" + elif product.get("temp_executable"): + relative = product["temp_executable"].replace("\\", "/") + for candidate in (Path(folder) / "support" / str(product["productId"]) / relative, Path(folder) / relative): + if candidate.is_file(): + program = candidate + break + if program is None: + continue + if not program.resolve(strict=True).is_relative_to(Path(folder).resolve()): + raise ValueError("GOG setup executable leaves the installation") + windows = "Z:" + str(Path(folder).resolve()).replace("/", "\\") + args = ["/VERYSILENT", "/DIR=" + windows, "/ProductId=" + str(product["productId"]), + "/galaxyclient", "/buildId=" + str(legacy.get("timestamp", record["build"])), "/versionName=" + record.get("version", ""), + "/lang-code=" + record.get("language", "en-US"), "/supportDir=" + windows + "\\support", "/nodesktopshortcut"] + if language: + args += ["/Language=" + language, "/LANG=" + language.lower()] + result = subprocess.run([command, "run", str(program), *args], env=env, cwd=folder, timeout=120) + if result.returncode: + raise ValueError("GOG installation setup failed; the patch was not applied") + + +def main(argv): + if len(argv) == 3 and argv[0] == "lease": + return lease(argv[1], int(argv[2])) + if len(argv) == 4 and argv[0] == "idle": + return idle(*argv[1:]) + if len(argv) == 2 and argv[0] == "status": + return status(argv[1]) + if len(argv) == 5 and argv[0] == "start": + return start(*argv[1:]) + if len(argv) == 5 and argv[0] == "run": + return run_patch(*argv[1:]) + raise ValueError("Invalid GOG maintenance command") + + +if __name__ == "__main__": + try: + sys.exit(main(sys.argv[1:])) + except Exception as error: + print("GOG maintenance: " + str(error), file=sys.stderr) + sys.exit(1) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window index f5cb4007c..5fc4e20a0 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Let GTK draw close buttons inside gamescope, which supplies no window decorations.""" import ctypes as c import os import signal @@ -45,6 +44,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-ime b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime new file mode 100755 index 000000000..4f110cfbc --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime @@ -0,0 +1,140 @@ +#!/usr/bin/env python3 +import json +import os +import select +import socket +import struct +import sys +import time + +DISPLAY_ID = 1 +REGISTRY_ID = 2 +METHOD_ID = 3 +SETTLE = 0.15 + + +def wl_string(value): + data = value.encode() + b"\0" + return struct.pack("<I", len(data)) + data + b"\0" * (-len(data) % 4) + + +def read_string(payload, offset): + (length,) = struct.unpack_from("<I", payload, offset) + start = offset + 4 + text = payload[start:start + length - 1].decode(errors="replace") + return text, start + length + (-length % 4) + + +class Connection: + def __init__(self, sock): + self.sock = sock + self.buffer = b"" + + def send(self, obj, opcode, payload=b""): + self.sock.sendall(struct.pack("<II", obj, ((8 + len(payload)) << 16) | opcode) + payload) + + def messages(self, timeout): + ready, _, _ = select.select([self.sock], [], [], timeout) + if not ready: + return [] + data, _, _, _ = self.sock.recvmsg(65536, socket.CMSG_SPACE(16 * 4)) + if not data: + raise EOFError + self.buffer += data + out = [] + while len(self.buffer) >= 8: + obj, word = struct.unpack_from("<II", self.buffer) + size = word >> 16 + if size < 8 or len(self.buffer) < size: + break + out.append((obj, word & 0xFFFF, self.buffer[8:size])) + self.buffer = self.buffer[size:] + return out + + +class Report: + def __init__(self, directory): + self.directory = directory + self.seq = 0 + self.sent = None + + def write(self, field, hint=0, purpose=0): + state = (field, purpose) + if state == self.sent or not self.directory: + return + self.sent = state + self.seq += 1 + os.makedirs(self.directory, exist_ok=True) + target = os.path.join(self.directory, "ime.json") + temp = target + ".tmp" + fd = os.open(temp, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600) + with os.fdopen(fd, "w") as handle: + json.dump({"textField": field, "hint": hint, "purpose": purpose, "seq": self.seq}, handle) + os.replace(temp, target) + print(f"droiddeck-ime: text field {'focused' if field else 'left'}", file=sys.stderr, flush=True) + + +def connect(): + fd = os.environ.pop("WAYLAND_SOCKET", "") + if fd.isdigit(): + return socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, fileno=int(fd)) + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(os.path.join(os.environ["XDG_RUNTIME_DIR"], os.environ.get("WAYLAND_DISPLAY", "wayland-0"))) + return sock + + +def main(): + launch = os.environ.get("BL_LAUNCH_DIR", "") + report = Report(os.environ.get("BL_IME_DIR") or (os.path.join(launch, "agent") if launch else "")) + conn = Connection(connect()) + conn.send(DISPLAY_ID, 1, struct.pack("<I", REGISTRY_ID)) + contexts = {} + current = None + pending = None + while True: + timeout = None if pending is None else max(0.0, pending - time.monotonic()) + try: + batch = conn.messages(timeout) + except (EOFError, ConnectionError): + report.write(False) + return 0 + for obj, opcode, payload in batch: + if obj == DISPLAY_ID and opcode == 0: + _, code = struct.unpack_from("<II", payload) + message, _ = read_string(payload, 8) + print(f"droiddeck-ime: protocol error {code}: {message}", file=sys.stderr, flush=True) + report.write(False) + return 1 + if obj == REGISTRY_ID and opcode == 0: + (name,) = struct.unpack_from("<I", payload) + interface, offset = read_string(payload, 4) + (version,) = struct.unpack_from("<I", payload, offset) + if interface == "zwp_input_method_v1": + conn.send(REGISTRY_ID, 0, struct.pack("<I", name) + wl_string(interface) + + struct.pack("<II", min(version, 1), METHOD_ID)) + elif obj == METHOD_ID and opcode == 0: + (context,) = struct.unpack_from("<I", payload) + contexts[context] = [0, 0] + current = context + pending = None + report.write(True) + elif obj == METHOD_ID and opcode == 1: + (context,) = struct.unpack_from("<I", payload) + contexts.pop(context, None) + conn.send(context, 0) + if context == current: + current = None + pending = time.monotonic() + SETTLE + elif obj in contexts and opcode == 2: + hint, purpose = struct.unpack_from("<II", payload) + contexts[obj] = [hint, purpose] + if obj == current: + report.write(True, hint, purpose) + if pending is not None and time.monotonic() >= pending: + pending = None + if current is None: + report.write(False) + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores b/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores index 3ea0c5681..034a910b0 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores @@ -1,20 +1,4 @@ #!/usr/bin/python3 -"""Holds a game launcher's hidden web interface on one slow core while something else has focus. - -Rockstar's launcher keeps drawing its Chromium interface (SocialClubHelper.exe: a renderer, and a -GPU process compositing through DXVK) for as long as it runs, hidden behind the game too, and at a -higher priority than the game's (Wine passes Chromium's on: the GPU process ran at nice -10). With -Red Dead Redemption 2 in front on the RedMagic that was 1.3 to 2.5 cores under FEX, on a phone -already held back by its temperature, for a page nobody sees. Held, riding at the throttle limit -went from 46.5 to 48.7 fps, 1% lows from 27.5 to 32.6. So while the focused window belongs to -anything but the launcher, every helper thread runs on one core of the slowest cluster at nice 19; -when the launcher's own window has focus again (signing in, the game closed) each thread gets its -own mask and priority back. Stopping the helpers instead would not hold: proot, the tracer of every -guest process, resumes a stopped tracee. - -Focus comes from droiddeck-agent's focus.json (the path is the argument), which the agent rewrites -whenever gamescope's focus changes. droiddeck-session starts this for Steam sessions; -BL_LAUNCHER_CORES=0 leaves the launchers alone.""" import json import os import signal @@ -35,7 +19,6 @@ def log(message): def image(proc, pid): - """A process's program as Wine names it (argv[0]), lower case with backslashes, or None.""" try: with open(proc / str(pid) / "cmdline", "rb") as stream: first = stream.read(4096).split(b"\0", 1)[0] @@ -56,7 +39,6 @@ def tasks(proc, pid): class Cores: - """The kernel calls, apart so a test can stand in for them.""" def own(self): return os.sched_getaffinity(0) @@ -81,8 +63,6 @@ class Holder: self.core = None def slow_core(self): - """The last core of the slowest cluster the session has - not of the game's cores, which - the launcher inherits when BL_GAME_CPUS is set: the core the game misses least.""" def top(cpu): try: return int((self.cpufreq / f"cpu{cpu}/cpufreq/cpuinfo_max_freq").read_text()) @@ -98,8 +78,6 @@ class Holder: yield int(name) def hold(self): - """Every helper thread onto the slow core at NICE: new ones, and held ones the program has - moved since (Chromium sets its threads' priorities, and Wine passes that on).""" if self.core is None: self.core = self.slow_core() hold = ({self.core}, NICE) @@ -125,8 +103,6 @@ class Holder: return None def release(self): - """Every held thread back to its own mask and priority; one started during the hold gets - what its process had.""" for pid, before in self.held.items(): default = before.get(pid) or self.first() for tid in tasks(self.proc, pid): @@ -141,7 +117,6 @@ class Holder: def focused(snapshot): - """(app id, pid) of the window gamescope has focused, from droiddeck-agent's snapshot.""" window = snapshot.get("focusedWindow") for entry in snapshot.get("focusableWindows") or []: if entry.get("window") == window: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-library-perms b/tools/linuxfs/overlay/usr/local/bin/droiddeck-library-perms new file mode 100644 index 000000000..c76d5882e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-library-perms @@ -0,0 +1,93 @@ +#!/usr/bin/python3 +import os +import re +import stat +import sys + +HOME = os.environ.get("HOME", "/root") +STEAM = os.path.join(HOME, ".local/share/Steam") +STORES = os.environ.get("DROIDDECK_STORES_ROOT", "/mnt/droiddeck-stores") +TOOLS = re.compile(r"^(Proton |Proton$|SteamLinuxRuntime|Steamworks Shared$)") + + +def libraries(): + paths = [STEAM] + try: + with open(os.path.join(STEAM, "steamapps/libraryfolders.vdf"), encoding="utf-8", errors="replace") as f: + paths += [p.replace("\\\\", "\\") for p in re.findall(r'"path"\s+"([^"]+)"', f.read())] + except OSError: + pass + seen = [] + for path in paths: + real = os.path.realpath(path) + if real not in seen: + seen.append(real) + return seen + + +def roots(): + found = [] + for library in libraries(): + for name in ("common", "compatdata"): + found.append((os.path.join(library, "steamapps", name), name == "common")) + found.append((os.path.join(HOME, "Games"), False)) + try: + found += [(entry.path, False) for entry in os.scandir(STORES) if entry.is_dir(follow_symlinks=False)] + except OSError: + pass + return [(path, skip_tools) for path, skip_tools in found if os.path.isdir(path)] + + +def fix(path, st, wanted): + if st.st_uid != os.geteuid() or st.st_mode & wanted == wanted: + return 0 + try: + os.chmod(path, stat.S_IMODE(st.st_mode) | wanted) + return 1 + except OSError: + return 0 + + +def walk(top, skip_tools): + fixed = 0 + stack = [(top, True)] + while stack: + directory, first = stack.pop() + try: + entries = list(os.scandir(directory)) + except OSError: + continue + for entry in entries: + if first and skip_tools and TOOLS.match(entry.name): + continue + try: + st = entry.stat(follow_symlinks=False) + except OSError: + continue + if stat.S_ISDIR(st.st_mode): + fixed += fix(entry.path, st, stat.S_IRWXU) + stack.append((entry.path, False)) + elif stat.S_ISREG(st.st_mode): + fixed += fix(entry.path, st, stat.S_IRUSR | stat.S_IWUSR) + return fixed + + +def main(): + try: + os.nice(19) + except OSError: + pass + total = 0 + for top, skip_tools in roots(): + try: + fixed = fix(top, os.stat(top), stat.S_IRWXU) + walk(top, skip_tools) + except OSError: + continue + if fixed: + print(f"droiddeck-library-perms: {top}: {fixed} made writable") + total += fixed + print(f"droiddeck-library-perms: {total} files and folders made writable") + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 index 5c04842c0..3ac444d6e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 @@ -1,10 +1,4 @@ #!/usr/bin/python3 -"""Steam's login1 sleep notifications, backed by DroidDeck's session pause. - -Android owns device power. Suspend here pauses the guest through SessionService; -the app's Resume action thaws it and completes PrepareForSleep(false). Steam -must see this service before startup or it can stay black after its idle timer. -""" import importlib.machinery import importlib.util import os diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install index 87e741c46..681cf4031 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install @@ -1,32 +1,4 @@ #!/usr/bin/python3 -"""Installs a Windows Installer package (.msi) the way Wine's own msiexec would, without running it. - -droiddeck-msi-install <package.msi | installer.exe> <component dir> -droiddeck-msi-install --unpack <archive | installer.exe | cabinet> <dir> - -A .msi is a database: which files go to which folder, which registry values to write, which .NET -and side-by-side assemblies to register. This reads those tables (msiinfo), unpacks the package's -cabinets (cabextract, which knows every compression a cabinet can use) and lays the result out -for droiddeck-wincomponents, which puts it into a game's prefix at launch: - - <component dir>/drive_c/... the files, at the paths they get on 64-bit Windows - <component dir>/registry.json the registry values, in the view (32/64-bit) Windows uses - -An installer .exe is opened the same way when it is a wrapper around packages: a WiX bundle -(Visual C++ 2012 and later, the .NET Core and 5+ runtimes: the packages sit in a cabinet the -bundle's own header locates, named in its manifest), a self-extracting cabinet (Visual C++ 2005 -to 2010) or a self-extracting 7-Zip archive (.NET Framework 4.0 to 4.8). The packages inside are -laid out one after the other into the same component dir; the 32- and 64-bit ones both, an ARM64 -one never. An .exe that is its own setup program (NSIS, InnoSetup) holds no package: an error says so. - -What a package does by running its own code (custom actions such as DXSETUP, self-registering -DLLs) cannot be done this way; each is named in the notes, so nothing is left out silently. - ---unpack opens an archive or installer for the caller to take files out of (cabextract for a -cabinet or self-extracting cabinet, 7-Zip for the rest) and prints the files it found. - -Prints "progress <text>" lines while it works and ends with "result <json>": the counts and notes. -""" import json import os import re @@ -47,7 +19,6 @@ SKIP_PLATFORMS = ("arm64", "arm") def tool_env(): - """The environment the tools run in: their own libraries (libmsi, libgsf, libgcab) beside them.""" env = dict(os.environ) env["LD_LIBRARY_PATH"] = ":".join(p for p in (str(TOOLS), env.get("LD_LIBRARY_PATH", "")) if p) return env @@ -95,7 +66,6 @@ class MsiError(Exception): def progress(text, fraction=None): - """A progress line: "progress <text>", or "progress NN% <text>" when how far along is known.""" if fraction is None: print("progress " + text, flush=True) else: @@ -103,7 +73,6 @@ def progress(text, fraction=None): class Span: - """The slice of the whole job one package's progress maps into (a wrapper runs several).""" def __init__(self, lo=0.0, hi=1.0): self.lo, self.hi = lo, hi @@ -137,7 +106,6 @@ class Package: self.summary[name.strip().lower()] = value.strip() def table(self, name): - """The table's rows as dicts by column name; an absent table has none.""" if name in self._tables: return self._tables[name] rows = [] @@ -158,7 +126,6 @@ class Package: def long_name(value): - """A Directory/File name column: "short|long", the long one when there are two.""" return value.split("|")[-1] @@ -176,7 +143,6 @@ KEYWORDS = {"not", "and", "or", "xor", "eqv", "imp"} class Conditions: - """Windows Installer's condition language, enough of it for what packages ask at install time.""" def __init__(self, props, feature_state=None, component_state=None): self.props = props @@ -318,7 +284,6 @@ class Conditions: def win_to_rel(path): - """C:\\windows\\x\\ -> drive_c/windows/x; None for a path off drive C or a folder left out.""" if not path: return None match = re.match(r"^[Cc]:\\?(.*)$", path) @@ -341,7 +306,6 @@ def clean_version(version): def clr_version(path): - """The .NET runtime an assembly was built for ("v4.0.30319"), from its metadata header.""" try: data = Path(path).read_bytes() except OSError: @@ -389,7 +353,6 @@ class Installer: return 3 if name in self.included_components else -1 def directory(self, key): - """The folder a Directory key resolves to, as drive_c/..., or None when it is left out.""" if key in self._resolving: return None value = self.props.get(key) @@ -414,7 +377,6 @@ class Installer: return parent + "/" + default def format(self, text): - """Formatted text: [Property], [Folder], [#file], [$component], [%env], [\\x], [~].""" if not text: return text @@ -449,7 +411,6 @@ class Installer: def run_set_actions(self): - """The property/folder-setting custom actions, in sequence order; the rest go to the notes.""" actions = {row["Action"]: row for row in self.pkg.table("CustomAction")} sequence = {} for table in ("InstallUISequence", "InstallExecuteSequence"): @@ -506,7 +467,6 @@ class Installer: self.included_components.add(name) def assemblies(self): - """Component -> where its files go when it is a global assembly (the GAC or winsxs).""" names = {} for row in self.pkg.table("MsiAssemblyName"): names.setdefault(row["Component_"], {})[row["Name"].lower()] = row["Value"] @@ -535,7 +495,6 @@ class Installer: @staticmethod def sxs_names(ident): - """Wine's winsxs names for a side-by-side assembly: its folder and, for a policy, the policy folder.""" arch = ident.get("processorarchitecture", "x86").lower() or "x86" name = ident.get("name", "").lower() token = ident.get("publickeytoken", "").lower() @@ -548,7 +507,6 @@ class Installer: return "assembly", "%s_%s_%s_%s_none_deadbeef" % (arch, name, token, version), version def unpack(self, work): - """Every cabinet in the package, unpacked; returns File key -> unpacked file.""" found = {} media = [row for row in self.pkg.table("Media") if row.get("Cabinet", "")] for index, row in enumerate(media): @@ -656,7 +614,6 @@ class Installer: self.registry.append({"hive": hive, "key": key, "name": name, "type": kind, "data": data}) def registry_data(self, raw): - """A Registry table Value: (type, data) as droiddeck-wincomponents writes them.""" if raw is None or raw == "": return "sz", "" if raw.startswith("#x") or raw.startswith("#X"): @@ -773,7 +730,6 @@ class Installer: def sibling(path, name): - """A file next to [path] called [name], whatever its case; None when there is none.""" folder = path.parent candidate = folder / name if candidate.is_file(): @@ -786,7 +742,6 @@ def sibling(path, name): def kind_of(path): - """What a file is by its first bytes: msi, exe, cab or other.""" with open(path, "rb") as source: head = source.read(8) if head.startswith(MSI_MAGIC): @@ -806,9 +761,6 @@ def run_tool(args, timeout=1800): def burn_containers(data): - """A WiX bundle's containers as (offset, size) pairs: the .wixburn section of the stub names - their sizes; each is a cabinet laid out after the stub, found by its header since signing can - move them. None when the file is no bundle.""" try: pe = struct.unpack_from("<I", data, 0x3C)[0] if data[pe:pe + 4] != b"PE\0\0": @@ -845,8 +797,6 @@ def burn_containers(data): def unpack_burn(path, dest, containers): - """Unpacks a bundle's containers into [dest] and gives the payloads the names its manifest - lists (a9 -> packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi).""" data = path.read_bytes() names = {} for index, (start, size) in enumerate(containers): @@ -877,8 +827,6 @@ def unpack_burn(path, dest, containers): def unpack_installer(path, dest): - """Opens an installer or archive into [dest]: a bundle by its header, a cabinet (or - self-extracting one) with cabextract, anything else with 7-Zip.""" kind = kind_of(path) if kind == "exe": containers = burn_containers(path.read_bytes()) @@ -900,7 +848,6 @@ def unpack_installer(path, dest): def packages_in(root): - """The Windows Installer packages an unpacked installer holds, shallowest first, by name.""" found = [] for entry in sorted(root.rglob("*")): if entry.is_file() and kind_of(entry) == "msi": @@ -910,11 +857,6 @@ def packages_in(root): def choose_packages(found, root): - """Which packages make up the install: the ones at the top of the installer (a bundle keeps - each in its own folder, so there every level counts), for the x86 and x64 platforms. The .NET - Framework 4.5+ installers carry a complete product (netfx_Full_*) beside the 4.0 parts they - patch (netfx_Core_*, netfx_Extended_*) and per-Windows-version copies in NetFx* folders: the - complete product wins, the copies are left out.""" if not found: return [] depth = min(len(entry.relative_to(root).parts) for entry in found) @@ -933,7 +875,6 @@ def choose_packages(found, root): def install_wrapper(path, out): - """Lays out every package inside an installer wrapper; the result is the sum of them.""" total = {"product": "", "version": "", "counts": {"files": 0, "assemblies": 0, "registry": 0}, "notes": [], "packages": []} with tempfile.TemporaryDirectory(dir=str(out.parent), prefix=".unpack-") as work: dest = Path(work) / "x" @@ -968,9 +909,6 @@ NESTED_SUFFIXES = (".7z", ".zip", ".cab", ".exe", ".msi", ".rar", ".xz", ".gz", def open_nested(dest, depth=0): - """Archives inside an unpacked installer (QuickTime's cabinets, an NSIS pack's payloads) are - opened in place, one "<name>.nested" folder per archive, two levels deep: the same layout the - component recordings (winlator-contents tools/snapshot/record.py) map their file sources to.""" if depth > 1: return 0 opened = 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index 0809a228f..0edd30212 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -1,19 +1,4 @@ #!/usr/bin/python3 -"""Runs a program from the desktop: a Windows program through the Proton Steam has chosen, a Linux -program (x86 ones under FEX), an AppImage, or a script (under FEX beside x86 programs, as a game's -start script is). Shared storage is noexec: FEX runs x86 programs there where they lie (libblsession's -noexec.c), while a native one is copied - alone into the cache, or with its folder by the app once (as -Add an app does) when that holds native programs or libraries. A Steam library's games are Steam's. - - droiddeck-open [--window | --terminal] FILE [ARGS...] the file manager's Run entries - 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, -a pipe, a file) stays where it was started. -""" import fcntl import hashlib import os @@ -120,7 +105,6 @@ def for_x86(script): def runnable(path): - """The program itself, or a copy in the cache of a native one on noexec storage.""" if not noexec(path) or machine(head(path)) in EMULATED: return path st = os.stat(path) @@ -141,7 +125,6 @@ def runnable(path): def appimage(path): - """The image unpacked once into the cache, laid out as droiddeck-appimage-run expects.""" st = os.stat(path) real = os.path.realpath(path) key = hashlib.sha1(("%s\0%d\0%d" % (real, st.st_size, st.st_mtime_ns)).encode("utf-8")).hexdigest()[:16] @@ -150,7 +133,6 @@ def appimage(path): def once(key, make): - """[make]() for [key] one start at a time: a second start waits for the first, then finds it done.""" locks = os.path.join(CACHE, "locks") os.makedirs(locks, exist_ok=True) with open(os.path.join(locks, key), "w") as lock: @@ -203,8 +185,6 @@ def import_of(key, what): def imported(what, real, key, name): - """[real] added by the app instead, as Add an app adds it (to the menu too): an AppImage whose hard - links (sharun's) only the app's own proot can make, or a folder of native programs off noexec storage.""" launch = os.environ.get("BL_LAUNCH_DIR") if not launch or not os.path.isdir(launch): raise RuntimeError("%s cannot run from here; add it in DroidDeck with Add an app." % name) @@ -235,9 +215,6 @@ def imported(what, real, key, name): def game_folder(path): - """The folder of [path] when it runs only from a copy: on noexec storage, holding native programs or - libraries (besides [path]) that it starts or loads. Not the storage itself, one of Android's folders - or a Steam library.""" real = os.path.realpath(path) folder = os.path.dirname(real) if in_steam_library(real) or not noexec(folder): @@ -263,12 +240,10 @@ def game_folder(path): def in_steam_library(path): - """Whether [path] is in a Steam library: its games are Steam's to start, never copied in.""" return "steamapps" in os.path.realpath(path).lower().split(os.sep) def storage_root(folder): - """The top of the storage [folder] is on: the last folder above it on the same file system.""" top = folder try: dev = os.stat(folder).st_dev @@ -280,7 +255,6 @@ def storage_root(folder): def copied_in(path): - """The app's copy of [path]'s folder, added (once) for it.""" real = os.path.realpath(path) key = hashlib.sha1(("folder\0%s" % real).encode("utf-8")).hexdigest()[:16] name = os.path.basename(os.path.dirname(real)) @@ -288,7 +262,6 @@ def copied_in(path): def steam_title(path): - """The Steam game [path] is the program of: Steam starts it, with the client most games need.""" try: run = runpy.run_path(PROTON_RUN) root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or run["STEAM_ROOT"] @@ -299,7 +272,6 @@ def steam_title(path): def command(path, args, what, window=False, appid=None): - """(command, working directory) that runs [path] in place.""" folder = os.path.dirname(path) if what == "steam": return [STEAM_LAUNCH, "desktop", appid], folder @@ -321,7 +293,6 @@ def on_desktop(env): def unattended(env): - """Nobody reads the output: it goes to /dev/null or the desktop's log, as from Dolphin or the menu.""" try: out = os.fstat(1) except OSError: @@ -337,7 +308,6 @@ 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.""" 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-open-url b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url index 890833519..c83dcfbc8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url @@ -1,11 +1,4 @@ #!/usr/bin/python3 -"""A game's web links to Android: Wine's winebrowser starts this (named as the browser in the -prefix's HKCU\\Software\\Wine\\WineBrowser, and as xdg-open first on a game's PATH), and an -http(s) address goes to the app, which opens it in Android's browser - so an EOS sign-in step or a -store page can be finished on the phone. Anything else goes on to the system's own xdg-open. - -The session channel is $BL_LAUNCH_DIR/stores; Wine may not pass that variable on to what it -starts, so droiddeck-proton also leaves it in LAUNCH_DIR_FILE.""" import json import os @@ -25,7 +18,6 @@ def hand_over(url, launch_dir): def where(url): - """scheme://host only, for the log: no path, no query.""" from urllib.parse import urlsplit try: u = urlsplit(url) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults index 04966c4b2..7d28a5d28 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults @@ -89,7 +89,6 @@ def rpcs3_shader_mode(): def ini_section(lines, name): - """(start, end) line indices of [name]'s body, or None.""" start = None for i, l in enumerate(lines): t = l.strip() @@ -102,9 +101,6 @@ def ini_section(lines, name): def patch_ini_section(path, section, body, what, needle="SDL-", require=None, done="Player 1 on the controller"): - """Add body's lines to [section] of an ini the emulator wrote itself, unless the section - already binds a controller (needle). Missing file: nothing - the emulator writes its own - defaults on first run and this runs again.""" if not os.path.isfile(path): return with open(path, encoding="utf-8", errors="replace") as f: @@ -178,7 +174,6 @@ def ini_get(path, section, key): def ini_set(path, section, key, value): - """Sets one key (the first of that name) in [section], adding either as needed.""" with open(path, encoding="utf-8", errors="replace") as f: lines = f.read().splitlines() span = ini_section(lines, section) @@ -440,9 +435,6 @@ def armsx2(): def armsx2_bios(ini): - """PCSX2 boots the one BIOS file named in [Filenames] BIOS (inside [Folders] Bios); its first-time - setup is what names it. With that skipped, the first dump in the folder is named here - a US one - first - while none is named or the named one is gone. A choice made in ARMSX2 is kept.""" folder = ini_get(ini, "Folders", "Bios") or ps2_bios_folder() if not os.path.isabs(folder): folder = os.path.join(os.path.dirname(os.path.dirname(ini)), folder) @@ -518,12 +510,6 @@ DOLPHIN_DATA = "/usr/share/dolphin-emu" def dolphin_data(): - """The Dolphin build in the catalog finds its own data - the GameCube fonts, the per-game fixes - (GameSettings: GUT.ini puts Ultimate Spider-Man on the MMU), its icons and shaders - only at the - fixed /usr/share/dolphin-emu it was built for; there is no setting or variable to move it. Here it - runs from a copy unpacked under /tmp (no FUSE), so it found none of it: a GameCube game stopped - on "Windows-1252 fonts are not loaded", another on an invalid write the missing game fix would - have prevented. So the folder is unpacked from the AppImage to that path, once per AppImage.""" import shutil, subprocess, tempfile try: st = os.stat(DOLPHIN_APPIMAGE) @@ -716,7 +702,6 @@ def melonds_geometry(): def toml_get(lines, table, key): - """The raw value of key in [table], or None.""" inside = False for l in lines: t = l.strip() @@ -728,7 +713,6 @@ def toml_get(lines, table, key): def toml_set(lines, table, key, value): - """key = value in [table]; the table is added at the end when missing.""" start = None for i, l in enumerate(lines): t = l.strip() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire index 2677599bf..df776d664 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire @@ -1,5 +1,4 @@ #!/bin/sh -# Audio stays on the session's PulseAudio, so WirePlumber runs its upstream video-only profile. set -u bundle=/usr/local/lib/droiddeck-pipewire.tzst diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra index 241ac290d..b7b1c27b0 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra @@ -31,7 +31,6 @@ def fetch_json(url): def pick_asset(source): - """(release tag, asset url, sha512 url or None) for the newest full release with an ARM64 build.""" repo, pattern = SOURCES[source] for release in fetch_json(RELEASES % repo + "?per_page=15"): if release.get("draft") or release.get("prerelease"): @@ -58,8 +57,6 @@ def release_asset(source, tag): def download(url, path): - """Resumable, because this is hundreds of megabytes over a phone's connection. curl is used - rather than urllib so a retry continues rather than starting again.""" log("downloading %s" % os.path.basename(path)) rc = subprocess.call([ "curl", "-fL", "--retry", "5", "--retry-delay", "3", "--retry-connrefused", diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 5d59829bf..410f1654d 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -1,20 +1,4 @@ #!/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 --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 -sits in one's drive_c, or to a non-Steam shortcut that names it; any other program gets a prefix of -its own, under the id the client gives a new shortcut. That title's CompatToolMapping entry in -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. ---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). -""" import json import os import re @@ -30,7 +14,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 @@ -83,7 +70,6 @@ def mapping(root): def tools(root): - """Windows compatibility tools this runtime can start, by the name config.vdf uses.""" found = {} for base in [os.path.join(root, "compatibilitytools.d")] + list(SYSTEM_TOOLS): try: @@ -113,7 +99,6 @@ def state_default(): def choose_tool(appid, current, available): - """(tool name, why) from the client's mapping, else the session's own default.""" for key, why in ((appid, "Steam's choice for this title"), ("0", "Steam's default")): name = current.get(key) if name in available: @@ -136,7 +121,6 @@ class Target: def ancestors(path): - """(folder, the entry below it on the way to path) from the program's folder up to /.""" child, folder = path, os.path.dirname(path) while True: yield folder, os.path.basename(child) @@ -185,9 +169,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 @@ -203,7 +187,6 @@ def same_file(a, b): def shortcut_entries(root): - """(appid, exe, start dir) of the client's non-Steam shortcuts and the app's added games.""" entries = [] try: tool = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-steam-shortcuts")) @@ -230,16 +213,71 @@ def shortcut_entries(root): return entries +def prefix_folder(root, appid): + 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): + 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 def own_id(program): - """The id the client gives a new shortcut: the CRC of its quoted target and its name.""" name = os.path.splitext(os.path.basename(program))[0] return zlib.crc32(('"%s"%s' % (program, name)).encode("utf-8")) | SHORTCUT_BIT @@ -250,10 +288,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 "") @@ -262,8 +309,6 @@ def split_words(text): def split_options(text): - """A shortcut's launch options: NAME=value words before %command% go to the environment, the words - after it - or all of them, without %command% - are the program's arguments.""" words = split_words(text) if "%command%" not in words: return {}, words @@ -277,7 +322,6 @@ def split_options(text): def find_file(base, relative): - """base/relative, matching each part without regard to case as Windows does.""" path = base for part in [p for p in relative.replace("\\", "/").split("/") if p and p != "."]: exact = os.path.join(path, part) @@ -304,7 +348,6 @@ def steam_install(appid, root): def steam_launch(appid, root): - """(target, program, arguments) for a Steam game's default Windows launch option, or None.""" library, install = steam_install(appid, root) if not install or not os.path.isdir(install): return None @@ -325,19 +368,19 @@ 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) def steam_launches(target, program, root): - """Whether a launch option of the Steam game starts [program]: then Steam should start it.""" if target.kind != "steam": return False entry = compat()["appinfo_entries"](os.path.join(root, "appcache", "appinfo.vdf")).get(target.appid, {}) 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 +398,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 +461,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 +485,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 +496,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 +505,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-root b/tools/linuxfs/overlay/usr/local/bin/droiddeck-root new file mode 100755 index 000000000..95f5c6881 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-root @@ -0,0 +1,94 @@ +#!/usr/bin/python3 +import array +import json +import os +import signal +import socket +import struct +import sys + +SOCKET_FILE = "/etc/droiddeck/root-socket" + + +def socket_name(): + name = os.environ.get("DROIDDECK_ROOT_SOCKET", "") + if not name: + try: + with open(SOCKET_FILE, encoding="utf-8") as f: + name = f.read().strip() + except OSError: + pass + return "\0" + (name or "com.droiddeck.launcher.root") + + +def frame(sock, kind, payload): + sock.sendall(kind.encode() + struct.pack(">i", len(payload)) + payload) + + +def read_exact(sock, n): + data = b"" + while len(data) < n: + chunk = sock.recv(n - len(data)) + if not chunk: + return None + data += chunk + return data + + +def main(argv): + if len(argv) < 2 or argv[1] in ("-h", "--help"): + print("usage: droiddeck-root [--check] command [arg ...]", file=sys.stderr) + return 2 + try: + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(socket_name()) + except OSError as e: + print(f"droiddeck-root: DroidDeck's root service is not reachable: {e}", file=sys.stderr) + return 126 + if argv[1] == "--check": + return 0 + env = dict(os.environ) + for name in ("LD_PRELOAD", "PROOT_FASTPATH", "DROIDDECK_ROOT_SOCKET"): + env.pop(name, None) + for name in [k for k in env if k.startswith("PROOT_")]: + env.pop(name, None) + try: + cwd = os.getcwd() + except OSError: + cwd = "/root" + body = json.dumps({"argv": argv[1:], "env": env, "cwd": cwd}).encode() + fds = array.array("i", [0, 1, 2]) + sock.sendmsg([b"R" + struct.pack(">i", len(body))], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, fds)]) + sock.sendall(body) + + def forward(signum, _frame): + try: + frame(sock, "S", str(signum).encode()) + except OSError: + pass + + for signum in (signal.SIGINT, signal.SIGTERM, signal.SIGHUP, signal.SIGQUIT, signal.SIGUSR1, signal.SIGUSR2): + signal.signal(signum, forward) + signal.signal(signal.SIGTSTP, signal.SIG_IGN) + status = 1 + while True: + try: + head = read_exact(sock, 5) + except InterruptedError: + continue + except OSError: + break + if head is None: + break + kind = chr(head[0]) + payload = read_exact(sock, struct.unpack(">i", head[1:])[0]) or b"" + if kind == "E": + print("droiddeck-root: " + payload.decode(errors="replace"), file=sys.stderr) + elif kind == "X": + status = int(payload.decode() or "1") + break + return status + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 831a0e4ce..6bec47b94 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] @@ -144,8 +144,6 @@ unseed() { return 1 } -# The ledger lines whose values the registry still holds, in both views where we wrote both. A Proton -# update replaces its default_pfx system.reg but not our ledger beside it, and new prefixes copy both. present() { awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 @@ -192,10 +190,14 @@ present() { awk -F'\t' -v hive="$hive" ' regs=() for reg in "$steam_root"/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ /mnt/droiddeck-sd/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ + /mnt/droiddeck-lib/*/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ + /mnt/droiddeck-lib/*/x86-64/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ /root/Games/*/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ "$steam_root"/compatibilitytools.d/*/files/share/default_pfx*/system.reg \ "$steam_root"/steamapps/compatdata/*/pfx/system.reg \ /mnt/droiddeck-sd/steamapps/compatdata/*/pfx/system.reg \ + /mnt/droiddeck-lib/*/steamapps/compatdata/*/pfx/system.reg \ + /mnt/droiddeck-lib/*/x86-64/steamapps/compatdata/*/pfx/system.reg \ /root/Games/*/steamapps/compatdata/*/pfx/system.reg; do [ -f "$reg" ] && regs+=("$reg") done @@ -243,7 +245,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 d1e1e67a4..82e19c3db 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -14,22 +14,59 @@ if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then if [ "$(stat -c %s "$BL_LOG" 2>/dev/null || echo 0)" -gt 8388608 ]; then mv -f "$BL_LOG" "$BL_LOG.1" 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 + dd=$(command -v gnudd || echo dd) + 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 +sync_timezone() { + local zone=${TZ:-} + case "$zone" in ''|/*|*..*) return 0 ;; esac + [ -f "/usr/share/zoneinfo/$zone" ] || return 0 + if [ "$(readlink /etc/localtime 2>/dev/null)" != "/usr/share/zoneinfo/$zone" ]; then + ln -sfn "/usr/share/zoneinfo/$zone" /etc/localtime.droiddeck && mv -Tf /etc/localtime.droiddeck /etc/localtime || return 0 + fi + [ "$(cat /etc/timezone 2>/dev/null)" = "$zone" ] || printf '%s\n' "$zone" > /etc/timezone +} 2>/dev/null +sync_timezone + +write_system_bus_config() { + mkdir -p /run/dbus /usr/local/share/droiddeck + cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <type>system</type> + <listen>unix:path=/run/dbus/system_bus_socket</listen> + <auth>EXTERNAL</auth> + <servicedir>/usr/share/droiddeck/system-services</servicedir> + <policy context="default"> + <allow user="*"/> + <allow own="*"/> + <allow send_destination="*"/> + <allow receive_sender="*"/> + </policy> +</busconfig> +BUSCONF + rm -f /run/dbus/system_bus_socket +} + prepare_locale() { local dir=/usr/lib/locale stamp=/usr/lib/locale/.droiddeck-archive want have= pkg - pkg=(/var/lib/pacman/local/glibc-[0-9]*) - want=${pkg[0]##*/} + if [ -d /var/lib/pacman/local ]; then + pkg=(/var/lib/pacman/local/glibc-[0-9]*) + want=${pkg[0]##*/} + else + want=libc6-$(dpkg-query -W -f='${Version}' libc6 2>/dev/null) + fi [ -f "$stamp" ] && read -r have < "$stamp" [ "$have" = "$want" ] && [ -f "$dir/locale-archive" ] && [ ! "$dir/locale-archive" -nt "$stamp" ] && return 0 [ -d "$dir/C.utf8" ] && command -v localedef >/dev/null 2>&1 || return 0 DROIDDECK_LINK_RENAME=1 localedef --add-to-archive --replace "$dir/C.utf8" >/dev/null 2>&1 || return 0 - rm -f /usr/lib/gconv/gconv-modules.cache + rm -f /usr/lib/gconv/gconv-modules.cache /usr/lib/aarch64-linux-gnu/gconv/gconv-modules.cache command -v iconvconfig >/dev/null 2>&1 && iconvconfig >/dev/null 2>&1 printf '%s\n' "$want" > "$stamp" echo "== locale archive built for $want" @@ -62,10 +99,37 @@ clear_stale_tmp() { [ -z "${BL_INSIDE:-}" ] && clear_stale_tmp if [ -z "${BL_INSIDE:-}" ]; then if [ "${BL_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.bl-zram; else rm -f /tmp/.bl-zram; fi + rm -f /tmp/.bl-clock + head -c 8 /dev/zero > /tmp/.bl-clock fi +steam_devtools() { + _bl_cdp=() + if [ -f "$steam_root/.cef-enable-remote-debugging" ]; then + if timeout 5 python3 -c 'import socket, sys +s = socket.socket() +s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +s.bind(("127.0.0.1", int(sys.argv[1])))' "$1" 2>/dev/null; then + BL_CDP_PORT=$1 + return 0 + fi + echo "== steam: port $1 is held by another app; Decky cannot load this session and Steam's devtools use another port" + fi + BL_CDP_PORT=$((20000 + RANDOM % 30000)) + _bl_cdp=(-cef-enable-debugging -devtools-port "$BL_CDP_PORT") +} + steam_update_stuck() { - [ "$1" -lt 60 ] || steam_updates=0 + local stamp + stamp=$(stat -c '%n %Y %s' "${steam_root:-}"/package/*.installed 2>/dev/null) + if [ "$1" -ge 60 ]; then + steam_updates=0 + steam_installs=0 + elif [ "$stamp" != "${steam_update_stamp-$stamp}" ] && [ "${steam_installs:-0}" -lt 5 ]; then + steam_updates=0 + steam_installs=$((${steam_installs:-0} + 1)) + fi + steam_update_stamp=$stamp steam_updates=$((steam_updates + 1)) [ "$steam_updates" -ge 3 ] } @@ -74,7 +138,6 @@ run_gamescope() ( local status_file child_status compositor_status status_file=$(mktemp "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-steam-exit.XXXXXX") || exit 73 trap 'rm -f "$status_file"' EXIT - # Gamescope can return success when its primary child crashed. BL_STEAM_EXIT_FILE="$status_file" gamescope "$@" compositor_status=$? if read -r child_status < "$status_file" && [[ $child_status =~ ^[0-9]{1,3}$ ]] \ @@ -86,12 +149,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 +159,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 @@ -142,6 +198,7 @@ rm -f "${XDG_RUNTIME_DIR:-/run/droiddeck}/droiddeck-remote-play" /usr/local/bin/droiddeck-steamvr unregister >/dev/null 2>&1 || true if [ "$mode" = lxqt ] || [ "$mode" = desktop ]; then /usr/local/bin/droiddeck-desktop-bookmarks || true + /usr/local/bin/droiddeck-downloads || true fi export FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap export XDG_DATA_DIRS=$XDG_DATA_HOME/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} @@ -209,6 +266,20 @@ if [ -z "${BL_INSIDE:-}" ]; then step "starting the desktop" start_agent --no-focus [ -x /usr/local/bin/droiddeck-desktop ] || { echo "== the desktop package is not installed"; exit 66; } + if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1; then + write_system_bus_config + dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & + for _ in $(seq 1 50); do + [ -S /run/dbus/system_bus_socket ] && break + nap 0.1 + done + if [ -S /run/dbus/system_bus_socket ]; then + droiddeck-login1 --with-netmanager & + echo "== desktop: system bus up, network and power services running" + else + echo "== desktop: the system bus did not come up" + fi + fi cores=$(program_cores) if [ -n "$cores" ]; then echo "== desktop cores: $cores (the desktop and every program started from it)" @@ -219,24 +290,32 @@ 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 - if [ "$mode" = steam ]; 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") + 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 @@ -254,7 +333,11 @@ if [ -z "${BL_INSIDE:-}" ]; then args+=(--mangoapp) echo "== gamescope: mangoapp on ($(command -v mangoapp), config $MANGOHUD_CONFIGFILE)" fi + mkdir -p /run/droiddeck-hud && export DROIDDECK_HUD_FRAMES=/run/droiddeck-hud/frames export BL_INSIDE=1 + 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)" @@ -381,7 +464,6 @@ case $mode in steam_cef_gpu=1 if [ "$steam_x64" = 1 ]; then step "checking the Steam client's arm64 parts (first run downloads them, ~1-2 min)" - # droiddeck-steam-install removes the repair request: read it first so Repair Steam covers both clients. _bl_x64_repair=0 [ -e "$HOME/.bl-steam-repair" ] && _bl_x64_repair=1 droiddeck-steam-install || steam_setup_failed $? @@ -402,8 +484,14 @@ 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 + if droiddeck-steamrt-shim "$steam_root/steamrtarm64" "$_bl_srt_shim"; then + echo "== steam: Valve containerized the arm64 Steam client (it carries a Steam Runtime container); starting it through $_bl_srt_shim" + steam_client=(env STEAM_RUNTIME_STEAMRT="$_bl_srt_shim" PATH="$_bl_srt_shim/bin:$PATH" "${steam_client[@]}") + fi fi _bl_proton_root=$steam_root if [ "$steam_x64" = 1 ]; then @@ -446,49 +534,190 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" + [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" + _bl_ram_cap=0 + case ${BL_RAM_CAP_MB:-} in + ''|0) ;; + *[!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 _fex _lower _bnet=() _bnet_game=0 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=() + while IFS= read -r -d '' _c; do _args+=("$_c"); done 2>/dev/null < "$_d/cmdline" || true + [ "${#_args[@]}" -gt 0 ] || continue + _name=${_args[0]} _fex=0 + if [ "${#_args[@]}" -gt 1 ]; then + case ${_name##*/} in FEX|FEXInterpreter) _name=${_args[1]} _fex=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##*/}") ;; + *) + _lower=${_name,,} + if [ "$_fex" = 1 ] && grep -qz '^DROIDDECK_EPIC_HIDDEN=1$' "$_d/environ" 2>/dev/null; then + _bl_pids+=("${_d##*/}") + elif [[ $_lower == [a-z]:[\\/]'program files (x86)'[\\/]battle.net[\\/]* || + $_lower == [a-z]:[\\/]programdata[\\/]battle.net[\\/]* ]]; then + _bnet+=("${_d##*/}") + else + _bl_others+=("${_d##*/}") + if [[ $_lower == [a-z]:[\\/]* ]]; then + case ${_lower##*[\\/]} in + agent.exe|conhost.exe|explorer.exe|lsass.exe|plugplay.exe|rpcss.exe|services.exe|start.exe|\ + steam.exe|svchost.exe|tabtip.exe|winedevice.exe|rundll32.exe|wineboot.exe|winemenubuilder.exe) ;; + *) + for _a in "${_args[@]:1}"; do + [ "${_a,,}" = -uid ] && _bnet_game=1 + done + ;; + esac + fi + fi + ;; esac done + if [ "$_bnet_game" = 1 ]; then + _bl_pids+=("${_bnet[@]}") + else + _bl_others+=("${_bnet[@]}") + fi } bl_zram_usage() { local _p _k _v _u _rss=0 _swap=0 - 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" + } + 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 + } + 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 + 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 + 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 @@ -527,6 +756,11 @@ case $mode in fi droiddeck-seed-redists "$steam_root" || true fi + if [ -n "${BL_SHADER_PRECACHE:-}" ]; then + droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ + "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam" && + echo "$BL_SHADER_PRECACHE" > "$HOME/.bl-shader-precache-applied" || true + fi if [ "$steam_x64" = 0 ] && [ ! -f "$steam_root/steamapps/appmanifest_4427310.acf" ]; then step "asking the client to fetch the ARM64 Proton" set -- "$@" steam://install/4427310 @@ -631,14 +865,11 @@ case $mode in until [ "$(_bl_focused)" = 769 ] || [ "$SECONDS" -ge "$_bl_end" ]; do sleep 1 done - # Shortcut CGameIDs are 64-bit; Steam app ids fit in 32 bits and keep the old short delay. [ "${#game}" -gt 10 ] && shortcut=1 [ -n "$shortcut" ] || sleep 4 echo "== steam: interface up; launching the requested game $game" _bl_hand_off [ -n "$shortcut" ] || return 0 - # Steam can drop a shortcut launch it gets before the shortcut's overview exists (large libraries). - # A launch can be running before it creates its first window. while [ "$(_bl_focused)" = 769 ] && [ "$waited" -lt 20 ]; do sleep 1 waited=$((waited + 1)) @@ -699,23 +930,7 @@ case $mode in set -- "$@" "$_bl_url" fi if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1; then - mkdir -p /run/dbus /usr/local/share/droiddeck - cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <type>system</type> - <listen>unix:path=/run/dbus/system_bus_socket</listen> - <auth>EXTERNAL</auth> - <policy context="default"> - <allow user="*"/> - <allow own="*"/> - <allow send_destination="*"/> - <allow receive_sender="*"/> - </policy> -</busconfig> -BUSCONF - rm -f /run/dbus/system_bus_socket + write_system_bus_config dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & system_bus=$! for _ in $(seq 1 50); do @@ -746,11 +961,12 @@ BUSCONF exit 69 fi - # The UI bridge launches SteamVR, which needs the guest agent's library environment. - _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME) + _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME -u STEAM_STEAMRT_RECURSION_GUARD) [ "${LD_LIBRARY_PATH+x}" ] && _bl_compat_env+=("LD_LIBRARY_PATH=$LD_LIBRARY_PATH") [ "${STEAM_RUNTIME+x}" ] && _bl_compat_env+=("STEAM_RUNTIME=$STEAM_RUNTIME") + [ "${STEAM_STEAMRT_RECURSION_GUARD+x}" ] && _bl_compat_env+=("STEAM_STEAMRT_RECURSION_GUARD=$STEAM_STEAMRT_RECURSION_GUARD") export STEAM_RUNTIME=1 + export STEAM_STEAMRT_RECURSION_GUARD=1 export LD_LIBRARY_PATH=$steam_root/steamrtarm64:$steam_root/steamrtarm64/panorama${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export SDL_VIDEO_X11_DGAMOUSE=0 decky_loader=$HOME/homebrew/services/PluginLoader @@ -786,21 +1002,20 @@ BUSCONF echo "== Decky: installed loader architecture is unsupported by this guest; not starting" fi fi - _bl_cdp=() - if [ -f "$steam_root/.cef-enable-remote-debugging" ]; then - export BL_CDP_PORT=8080 - else - export BL_CDP_PORT=$((20000 + RANDOM % 30000)) - _bl_cdp=(-cef-enable-debugging -devtools-port "$BL_CDP_PORT") - fi - if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ "${decky_arch:-}" = x86_64 ]; then + steam_devtools 8080 + export BL_CDP_PORT + if [ -f "$HOME/.droiddeck-decky-enabled" ] && [ "${decky_arch:-}" = x86_64 ] && [ ${#_bl_cdp[@]} = 0 ]; then echo "== steam: devtools port $BL_CDP_PORT left open for the x86_64 Decky loader" else export BL_CDP_GUARD=$BL_CDP_PORT 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) @@ -830,6 +1045,9 @@ BUSCONF unset _stale _f fi steam_channel=steamdeck_publicbeta + if [ "$steam_x64" = 0 ]; then + steam_channel=$(droiddeck-steam-install --channel 2>/dev/null || echo steamdeck_publicbeta) + fi _bl_lang=() [ -n "${BL_STEAM_LANGUAGE:-}" ] && _bl_lang=(-language "$BL_STEAM_LANGUAGE") steam_beta=$steam_root/package/beta @@ -845,6 +1063,8 @@ BUSCONF fi echo "== steam args: ${_bl_ui[*]} ${_bl_cdp[*]} ${_bl_lang[*]} -clientbeta $steam_channel -no-cef-sandbox -cef-ozone-platform=x11 ${_bl_cef[*]} $*$([ "$steam_x64" = 1 ] && echo ' (x86-64 client under FEX)')" steam_updates=0 + steam_installs=0 + steam_update_stamp=$(stat -c '%n %Y %s' "$steam_root"/package/*.installed 2>/dev/null) rm -f "$HOME/.bl-stop-requested" "$STEAMOS_STEAM_SHUTDOWN_SENTINEL" "$STEAMOS_STEAM_REBOOT_SENTINEL" steam_other_game_running() { local line value n open @@ -998,13 +1218,12 @@ BUSCONF : > "$compat_restarted" compat_restarts=0 compat_settled() { - local app m flags r card=/mnt/droiddeck-sd - # The arm64 card library may hold that client's copy of the same title. - [ "$steam_x64" = 1 ] && card=/mnt/droiddeck-sd/x86-64 + local app m flags r card=/mnt/droiddeck-sd added=(/mnt/droiddeck-lib/*) + [ "$steam_x64" = 1 ] && { card=/mnt/droiddeck-sd/x86-64; added=(/mnt/droiddeck-lib/*/x86-64); } while read -r app; do [ -n "$app" ] || continue m= - for r in "$steam_root" "$card"; do + for r in "$steam_root" "$card" "${added[@]}"; do [ -f "$r/steamapps/appmanifest_$app.acf" ] && { m=$r/steamapps/appmanifest_$app.acf; break; } done [ -n "$m" ] || return 1 @@ -1073,7 +1292,7 @@ BUSCONF done fi if [ "$beat" -le 720 ] && [ "$((beat % 3))" -eq 0 ] && { [ -z "$library_job" ] || ! kill -0 "$library_job" 2>/dev/null; }; then - libraries=("$steam_root/steamapps" /mnt/droiddeck/steamapps /mnt/droiddeck-sd/steamapps /root/Games/*/steamapps) + libraries=("$steam_root/steamapps" /mnt/droiddeck/steamapps /mnt/droiddeck-sd/steamapps /mnt/droiddeck-lib/*/steamapps /mnt/droiddeck-lib/*/x86-64/steamapps /root/Games/*/steamapps) seed=; compat= seed_due && seed=1 compat_due && compat=1 @@ -1116,7 +1335,6 @@ BUSCONF lossless_left=0 elif ! pgrep -x wineserver >/dev/null 2>&1; then ( - # The probe reaches the x86-64 client through the arm64 client's steamclient.so, as the import watcher does. if [ "$steam_x64" = 1 ]; then export BL_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so; fi answer=$(droiddeck-steam-games probe "$steam_root" 993090 2>/dev/null) || exit 0 case $answer in @@ -1176,7 +1394,6 @@ BUSCONF BL_COMPAT_TOOL=$_bl_x64_tool droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi fi - # The x86-64 client rewrote config.vdf from memory on exit, over the live passes' mapping. if [ "$steam_x64" = 1 ]; then [ -z "${_bl_x64_tool:-}" ] || BL_COMPAT_TOOL=$_bl_x64_tool steam-compatibility "$steam_root" --x64 >/dev/null 2>&1 || true @@ -1222,6 +1439,12 @@ BUSCONF set -- continue fi + if [ "$steam_x64" = 1 ] && [ "$rc" -eq 132 ] && [ -z "${_bl_x64_sigill:-}" ]; then + _bl_x64_sigill=1 + echo "== steam: the x86-64 client stopped on an illegal instruction after it updated itself; starting it again once" + set -- + continue + fi [ "$rc" -eq 42 ] || break if steam_update_stuck "$steam_ran"; then echo "== steam: asked to restart for an update $steam_updates times and it is not installing; the session stops here rather than loop" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli new file mode 100755 index 000000000..a8defb454 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli @@ -0,0 +1,15 @@ +#!/bin/bash +[ "${1:-}" = run ] || exec /usr/bin/snap "$@" +shift +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -*) shift ;; + *) break ;; + esac +done +target=${1:?usage: snap run <snap>[.<app>] [args...]} +shift +name=${target%%.*} +app=${target#*.} +exec /usr/local/bin/droiddeck-snap-run "$name" "$app" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine new file mode 100755 index 000000000..133eeeeb6 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine @@ -0,0 +1,19 @@ +#!/bin/bash +while [ $# -gt 0 ]; do + case $1 in + --classic) shift ;; + --base) shift 2 ;; + --*) shift ;; + *) break ;; + esac +done +tag=${1:?security tag} +shift +[ "${1##*/}" = snap-exec ] && shift +app=${1:-} +shift +name=${tag#snap.} +name=${name%%.*} +app=${app#*.} +[ -n "$app" ] || app=$name +exec /usr/local/bin/droiddeck-snap-run "$name" "$app" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run new file mode 100755 index 000000000..6529005a2 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run @@ -0,0 +1,139 @@ +#!/usr/bin/python3 +import os +import re +import shlex +import sys + +import yaml + +SNAP_DIR = "/snap" +HOST_DIRS = ("/etc", "/home", "/root", "/tmp", "/run", "/var/snap", "/var/lib/snapd", "/var/tmp", "/var/log", + "/media", "/mnt", "/snap", "/usr/src", "/lib/modules") + + +def load(name): + with open(f"{SNAP_DIR}/{name}/current/meta/snap.yaml") as f: + return yaml.safe_load(f) or {} + + +def expand(value, env): + return re.sub(r"\$\{?([A-Za-z_][A-Za-z0-9_]*)\}?", lambda m: env.get(m.group(1), ""), str(value)) + + +def provider_path(path, provider, revision): + snap = f"{SNAP_DIR}/{provider}/{revision}" + for var, value in (("$SNAP_DATA", f"/var/snap/{provider}/{revision}"), + ("$SNAP_COMMON", f"/var/snap/{provider}/common"), ("$SNAP", snap)): + if path == var or path.startswith(var + "/"): + return os.path.normpath(value + path[len(var):]) + return os.path.normpath(f"{snap}/{path}") + + +def content_binds(name, meta, env): + out = [] + for plug_name, plug in (meta.get("plugs") or {}).items(): + if not isinstance(plug, dict) or plug.get("interface") != "content" or not plug.get("target"): + continue + provider = (plug.get("default-provider") or "").split(":")[0] + if not provider or not os.path.isdir(f"{SNAP_DIR}/{provider}/current"): + continue + try: + slots = load(provider).get("slots") or {} + except OSError: + continue + revision = os.path.basename(os.path.realpath(f"{SNAP_DIR}/{provider}/current")) + target = expand(plug["target"], env) + for slot_name, slot in slots.items(): + if not isinstance(slot, dict) or slot.get("interface") != "content": + continue + if slot.get("content", slot_name) != plug.get("content", plug_name): + continue + nested = "source" in slot + reads = (slot.get("source") or {}).get("read") if nested else slot.get("read") + for path in reads or []: + source = provider_path(str(path), provider, revision) + out.append((plug_name, source, os.path.join(target, os.path.basename(source)) if nested else target)) + if not nested: + break + break + return out + + +def main(argv): + if len(argv) < 3: + print("usage: droiddeck-snap-run SNAP APP [ARG...]", file=sys.stderr) + return 2 + name, app, args = argv[1], argv[2], argv[3:] + meta = load(name) + spec = (meta.get("apps") or {}).get(app) + if spec is None: + print(f"error: snap \"{name}\" has no app \"{app}\"", file=sys.stderr) + return 1 + revision = os.path.basename(os.path.realpath(f"{SNAP_DIR}/{name}/current")) + home = os.environ.get("HOME", "/root") + snap = f"{SNAP_DIR}/{name}/{revision}" + env = dict(os.environ) + for k in ("LD_PRELOAD", "LD_LIBRARY_PATH"): + env.pop(k, None) + env.update({ + "SNAP": snap, "SNAP_NAME": name, "SNAP_INSTANCE_NAME": name, "SNAP_INSTANCE_KEY": "", + "SNAP_REVISION": revision, "SNAP_VERSION": str(meta.get("version", "")), "SNAP_ARCH": "arm64", + "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void", + "SNAP_DATA": f"/var/snap/{name}/{revision}", "SNAP_COMMON": f"/var/snap/{name}/common", + "SNAP_USER_DATA": f"{home}/snap/{name}/{revision}", "SNAP_USER_COMMON": f"{home}/snap/{name}/common", + "SNAP_REAL_HOME": home, "SNAP_UID": str(os.getuid()), "SNAP_EUID": str(os.geteuid()), + "SNAP_COOKIE": "", "SNAP_CONTEXT": "", "SNAP_REEXEC": "0", + }) + for d in (env["SNAP_USER_DATA"], env["SNAP_USER_COMMON"], env["SNAP_DATA"], env["SNAP_COMMON"]): + os.makedirs(d, exist_ok=True) + current = f"{home}/snap/{name}/current" + if os.path.realpath(current) != env["SNAP_USER_DATA"]: + try: + os.unlink(current) + except OSError: + pass + os.symlink(revision, current) + confinement = meta.get("confinement", "strict") + if confinement != "classic": + env["HOME"] = env["SNAP_USER_DATA"] + env["PATH"] = ":".join([f"{snap}/usr/sbin", f"{snap}/usr/bin", f"{snap}/sbin", f"{snap}/bin", + "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/usr/games"]) + env["LD_LIBRARY_PATH"] = env["SNAP_LIBRARY_PATH"] + for scope in (meta.get("environment") or {}, spec.get("environment") or {}): + for k, v in scope.items(): + env[k] = expand(v, env) + command = shlex.split(expand(spec.get("command", ""), env)) + if command and not command[0].startswith("/"): + command[0] = f"{snap}/{command[0]}" + chain = [c if c.startswith("/") else f"{snap}/{c}" for c in (meta.get("command-chain") or []) + (spec.get("command-chain") or [])] + program = chain + command + args + if confinement == "classic": + os.execvpe(program[0], program, env) + base = meta.get("base") or "core" + root = f"{SNAP_DIR}/{base}/current" + if not os.path.isdir(root): + print(f"error: the base snap \"{base}\" is not installed; run: snap install {base}", file=sys.stderr) + return 1 + bwrap = ["/usr/local/bin/droiddeck-bwrap", "--bind", root, "/", "--dev-bind", "/dev", "/dev", "--proc", "/proc", + "--bind", "/sys", "/sys"] + for d in HOST_DIRS: + if os.path.isdir(d): + bwrap += ["--bind", d, d] + bwrap += ["--bind", "/", "/var/lib/snapd/hostfs"] + bwrap += ["--bind", "/dev/null", "/etc/ld.so.preload"] + binds = content_binds(name, meta, env) + for _, source, target in binds: + if os.path.isdir(source): + bwrap += ["--bind", source, target] + content = {k for k, v in (meta.get("plugs") or {}).items() if isinstance(v, dict) and v.get("interface") == "content"} + plugs = (set(meta.get("plugs") or {}) | set(spec.get("plugs") or [])) - content | {plug for plug, _, _ in binds} + env["DROIDDECK_SNAP_PLUGS"] = " ".join(sorted(plugs)) + bwrap += ["--bind", "/usr/local/bin/droiddeck-snapctl", "/usr/lib/snapd/snapctl"] + bwrap += ["--chdir", os.getcwd() if os.path.isdir(os.getcwd()) else env["HOME"], "--clearenv"] + for k, v in env.items(): + bwrap += ["--setenv", k, v] + os.execv(bwrap[0], bwrap + ["--"] + program) + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl new file mode 100755 index 000000000..4fffd789d --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl @@ -0,0 +1,12 @@ +#!/bin/sh +case $1 in + is-connected) + shift + while [ $# -gt 1 ]; do shift; done + case " $DROIDDECK_SNAP_PLUGS " in + *" ${1:-} "*) exit 0 ;; + esac + exit 1 + ;; +esac +exit 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd new file mode 100755 index 000000000..7d3ce5317 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd @@ -0,0 +1,542 @@ +#!/usr/bin/python3 +import datetime +import hashlib +import http.server +import json +import os +import re +import shutil +import socketserver +import subprocess +import sys +import threading +import urllib.parse +import urllib.request + +STORE = "https://api.snapcraft.io/v2" +ARCH = "arm64" +SNAP_DIR = "/snap" +BIN_DIR = "/snap/bin" +LIB = "/var/lib/snapd" +STATE = LIB + "/droiddeck-state.json" +DESKTOP_DIR = LIB + "/desktop/applications" +SOCKETS = ("/run/snapd.socket", "/run/snapd-snap.socket") +FIND_FIELDS = ("title,summary,description,version,revision,confinement,base,publisher,license,contact,website," + "media,categories,store-url,download,type,channel,common-ids,links") +INFO_FIELDS = ("title,summary,description,version,revision,confinement,base,publisher,license,contact,website," + "media,categories,snap-id,store-url,download,type,channel-map,common-ids,links,created-at") +HEADERS = {"Snap-Device-Series": "16", "Snap-Device-Architecture": ARCH, "User-Agent": "snapd/2.70 droiddeck"} + +lock = threading.RLock() +install_lock = threading.Lock() +changes = {} +change_seq = [0] + + +def now(): + return datetime.datetime.now(datetime.timezone.utc).isoformat() + + +def load_state(): + try: + with open(STATE) as f: + return json.load(f) + except (OSError, ValueError): + return {"snaps": {}} + + +def save_state(state): + tmp = STATE + ".tmp" + with open(tmp, "w") as f: + json.dump(state, f, indent=1) + os.replace(tmp, STATE) + + +def store_get(path, params=None): + url = STORE + path + ("?" + urllib.parse.urlencode(params) if params else "") + req = urllib.request.Request(url, headers=HEADERS) + with urllib.request.urlopen(req, timeout=60) as r: + return json.load(r) + + +def publisher(p): + p = p or {} + return {"id": p.get("id", ""), "username": p.get("username", ""), "display-name": p.get("display-name", ""), + "validation": p.get("validation", "unproven")} + + +def media_of(snap): + out = [] + for m in snap.get("media") or []: + if m.get("type") in ("icon", "screenshot", "banner") and m.get("url"): + item = {"type": m["type"], "url": m["url"]} + if m.get("width"): + item["width"] = m["width"] + item["height"] = m.get("height", 0) + out.append(item) + return out + + +def icon_of(media): + return next((m["url"] for m in media if m["type"] == "icon"), "") + + +def from_store(name, snap, revision=None, channel=None): + media = media_of(snap) + rev = revision or snap.get("revision") or {} + out = { + "id": snap.get("snap-id", ""), "name": name, "title": snap.get("title") or name, + "summary": snap.get("summary", ""), "description": snap.get("description", ""), + "type": rev.get("type") or snap.get("type") or "app", "version": rev.get("version", ""), + "revision": str(rev.get("revision", "")), "channel": channel or "stable", + "confinement": rev.get("confinement") or "strict", "base": rev.get("base") or "", + "publisher": publisher(snap.get("publisher")), "developer": (snap.get("publisher") or {}).get("username", ""), + "license": snap.get("license", ""), "contact": snap.get("contact", ""), "website": snap.get("website", ""), + "media": media, "icon": icon_of(media), "store-url": snap.get("store-url", ""), + "download-size": (rev.get("download") or {}).get("size", 0), "status": "available", + "categories": [{"name": c.get("name", ""), "featured": bool(c.get("featured"))} for c in snap.get("categories") or []], + "common-ids": rev.get("common-ids") or snap.get("common-ids") or [], + "private": False, "devmode": False, "jailmode": False, "trymode": False, "apps": [], + } + return out + + +def installed_snap(name, entry): + snap = dict(entry["info"]) + snap["status"] = "active" + snap["install-date"] = entry.get("installed", now()) + snap["installed-size"] = entry.get("size", 0) + snap["revision"] = str(entry["revision"]) + snap["version"] = entry.get("version", snap.get("version", "")) + snap["tracking-channel"] = entry.get("channel", "latest/stable") + snap["channel"] = entry.get("channel", "latest/stable") + snap["mounted-from"] = f"{LIB}/snaps/{name}_{entry['revision']}.snap" + snap["apps"] = [{"name": a, "snap": name, "desktop-file": f"{DESKTOP_DIR}/{name}_{a}.desktop"} for a in entry.get("apps", [])] + return snap + + +def find(query, section=None, name_exact=False): + if name_exact: + try: + info = store_get(f"/snaps/info/{query}", {"architecture": ARCH, "fields": INFO_FIELDS}) + except Exception: + return [] + rev = next((c for c in info.get("channel-map", []) if c["channel"]["architecture"] == ARCH + and c["channel"]["risk"] == "stable"), None) + if not rev: + return [] + return [from_store(info["name"], dict(info["snap"], **{"snap-id": info.get("snap-id", "")}), rev, "stable")] + params = {"architecture": ARCH, "fields": FIND_FIELDS} + if query: + params["q"] = query + if section: + params["category"] = section + if not query and not section: + params["featured"] = "true" + result = store_get("/snaps/find", params) + out = [] + state = load_state() + for r in result.get("results", []): + snap = from_store(r["name"], dict(r.get("snap", {}), **{"snap-id": r.get("snap-id", "")}), r.get("revision")) + if r["name"] in state["snaps"]: + snap["status"] = "active" + snap["installed-size"] = state["snaps"][r["name"]].get("size", 0) + out.append(snap) + return out + + +def new_change(kind, summary, snaps): + with lock: + change_seq[0] += 1 + cid = str(change_seq[0]) + changes[cid] = {"id": cid, "kind": kind, "summary": summary, "status": "Doing", "ready": False, + "spawn-time": now(), "tasks": [{"id": cid + "-1", "kind": kind, "summary": summary, "status": "Doing", + "progress": {"label": "", "done": 0, "total": 1}, + "spawn-time": now()}], + "data": {"snap-names": snaps}} + return cid + + +def progress(cid, label, done, total): + with lock: + task = changes[cid]["tasks"][0] + task["progress"] = {"label": label, "done": done, "total": max(total, 1)} + task["summary"] = changes[cid]["summary"] + + +def finish(cid, err=None): + with lock: + c = changes[cid] + c["status"] = "Error" if err else "Done" + c["ready"] = True + c["ready-time"] = now() + c["tasks"][0]["status"] = c["status"] + if err: + c["err"] = err + + +def root_run(argv): + if os.getuid() == 0: + return subprocess.run(argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) + return subprocess.run(["/usr/local/bin/droiddeck-root"] + argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, + text=True) + + +def snap_yaml(path): + try: + import yaml + with open(path) as f: + return yaml.safe_load(f) or {} + except Exception: + return {} + + +def download(cid, name, url, sha3, size, target): + tmp = target + ".partial" + h = hashlib.sha3_384() + req = urllib.request.Request(url, headers=HEADERS) + with urllib.request.urlopen(req, timeout=120) as r, open(tmp, "wb") as out: + done = 0 + while True: + chunk = r.read(1 << 20) + if not chunk: + break + out.write(chunk) + h.update(chunk) + done += len(chunk) + progress(cid, f"Download snap \"{name}\"", done, size) + if sha3 and h.hexdigest() != sha3: + os.unlink(tmp) + raise RuntimeError(f"{name}: downloaded snap does not match the store's sha3-384") + os.replace(tmp, target) + + +def write_desktop(name, rev, meta): + os.makedirs(DESKTOP_DIR, exist_ok=True) + gui = f"{SNAP_DIR}/{name}/{rev}/meta/gui" + apps = (meta.get("apps") or {}) + for app, spec in apps.items(): + source = os.path.join(gui, f"{app}.desktop") + if (spec or {}).get("daemon") or not os.path.isfile(source): + continue + command = name if app == name else f"{name}.{app}" + out = [] + with open(source, encoding="utf-8", errors="replace") as f: + for line in f: + if line.startswith("Exec="): + args = line[5:].strip().split(" ", 1) + rest = (" " + args[1]) if len(args) > 1 else "" + line = f"Exec={BIN_DIR}/{command}{rest}\n" + elif line.startswith("Icon="): + line = "Icon=" + line[5:].replace("${SNAP}", f"{SNAP_DIR}/{name}/current") + out.append(line) + out.append(f"X-SnapInstanceName={name}\n") + target = f"{DESKTOP_DIR}/{name}_{app}.desktop" + with open(target + ".tmp", "w", encoding="utf-8") as f: + f.writelines(out) + os.replace(target + ".tmp", target) + subprocess.run(["update-desktop-database", DESKTOP_DIR], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + + +def link_bins(name, meta): + os.makedirs(BIN_DIR, exist_ok=True) + apps = [] + for app, spec in (meta.get("apps") or {}).items(): + if (spec or {}).get("daemon"): + continue + command = name if app == name else f"{name}.{app}" + path = os.path.join(BIN_DIR, command) + with open(path + ".tmp", "w") as f: + f.write(f"#!/bin/sh\nexec /usr/local/bin/droiddeck-snap-run {name} {app} \"$@\"\n") + os.chmod(path + ".tmp", 0o755) + os.replace(path + ".tmp", path) + apps.append(app) + return apps + + +def remove_tree(top): + if os.path.isdir(top) and not os.path.islink(top): + os.chmod(top, 0o700) + for root, dirs, _ in os.walk(top): + for d in dirs: + path = os.path.join(root, d) + if not os.path.islink(path): + os.chmod(path, 0o700) + shutil.rmtree(top, ignore_errors=True) + + +def install_one(cid, name, channel, state, parents=()): + if name in state["snaps"] or name in parents: + return + info = store_get(f"/snaps/info/{name}", {"architecture": ARCH, "fields": INFO_FIELDS}) + risk = channel.split("/")[-1] if channel else "stable" + track = channel.split("/")[0] if channel and "/" in channel else "latest" + rev = next((c for c in info.get("channel-map", []) if c["channel"]["architecture"] == ARCH + and c["channel"]["risk"] == risk and c["channel"]["track"] == track), None) + if not rev: + raise RuntimeError(f"snap \"{name}\" has no {track}/{risk} release for {ARCH}") + number = rev["revision"] + os.makedirs(f"{LIB}/snaps", exist_ok=True) + blob = f"{LIB}/snaps/{name}_{number}.snap" + d = rev.get("download") or {} + with lock: + changes[cid]["summary"] = f"Install \"{name}\" snap" + download(cid, name, d["url"], d.get("sha3-384"), d.get("size", 0), blob) + progress(cid, f"Unpack snap \"{name}\"", 0, 1) + target = f"{SNAP_DIR}/{name}/{number}" + remove_tree(target) + os.makedirs(os.path.dirname(target), exist_ok=True) + r = root_run(["unsquashfs", "-q", "-n", "-no-xattrs", "-f", "-excludes", "-d", target, blob, "dev"]) + if r.returncode != 0: + raise RuntimeError(f"cannot unpack {name}: {r.stdout.strip()[-400:]}") + os.makedirs(f"{target}/dev", exist_ok=True) + current = f"{SNAP_DIR}/{name}/current" + if os.path.islink(current): + os.unlink(current) + os.symlink(str(number), current) + for sub in (f"/var/snap/{name}/{number}", f"/var/snap/{name}/common"): + os.makedirs(sub, exist_ok=True) + cur = f"/var/snap/{name}/current" + if os.path.islink(cur): + os.unlink(cur) + os.symlink(str(number), cur) + meta = snap_yaml(f"{target}/meta/snap.yaml") + entry = {"revision": number, "version": rev.get("version", ""), "channel": f"{track}/{risk}", + "installed": now(), "size": d.get("size", 0), "info": from_store(name, dict(info["snap"], **{"snap-id": info.get("snap-id", "")}), rev, f"{track}/{risk}"), + "base": meta.get("base") or ("core" if (meta.get("type") or "app") == "app" else ""), "apps": []} + base = meta.get("base") + if (meta.get("type") or "app") == "app": + install_one(cid, base or "core", "latest/stable", state, parents + (name,)) + for plug in (meta.get("plugs") or {}).values(): + if isinstance(plug, dict) and plug.get("interface") == "content" and plug.get("default-provider"): + provider = plug["default-provider"].split(":")[0] + install_one(cid, provider, "latest/stable", state, parents + (name,)) + entry["apps"] = link_bins(name, meta) + write_desktop(name, number, meta) + state["snaps"][name] = entry + save_state(state) + + +def remove_one(name, state): + entry = state["snaps"].pop(name, None) + if not entry: + raise RuntimeError(f"snap \"{name}\" is not installed") + for app in entry.get("apps", []): + command = name if app == name else f"{name}.{app}" + try: + os.unlink(os.path.join(BIN_DIR, command)) + except OSError: + pass + if os.path.isdir(DESKTOP_DIR): + for f in os.listdir(DESKTOP_DIR): + if f.startswith(name + "_") and f.endswith(".desktop"): + os.unlink(os.path.join(DESKTOP_DIR, f)) + subprocess.run(["update-desktop-database", DESKTOP_DIR], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + remove_tree(f"{SNAP_DIR}/{name}") + for f in os.listdir(f"{LIB}/snaps"): + if f.startswith(name + "_"): + os.unlink(os.path.join(f"{LIB}/snaps", f)) + save_state(state) + + +def run_change(cid, action, names, channel): + with install_lock: + apply_change(cid, action, names, channel) + + +def apply_change(cid, action, names, channel): + try: + state = load_state() + for name in names: + if action == "install": + install_one(cid, name, channel or "latest/stable", state) + elif action == "remove": + remove_one(name, state) + elif action == "refresh": + old = state["snaps"].get(name) + if old: + remove_one(name, state) + install_one(cid, name, old.get("channel", "latest/stable"), state) + else: + raise RuntimeError(f"unsupported action {action}") + finish(cid) + except Exception as e: + finish(cid, str(e)) + + +SECTIONS = ["featured", "art-and-design", "books-and-reference", "development", "devices-and-iot", "education", + "entertainment", "finance", "games", "health-and-fitness", "music-and-audio", "news-and-weather", + "personalisation", "photo-and-video", "productivity", "science", "security", "server-and-cloud", + "social", "utilities"] + + +class Handler(http.server.BaseHTTPRequestHandler): + protocol_version = "HTTP/1.1" + + def log_message(self, fmt, *args): + pass + + def address_string(self): + return "snapd" + + def reply(self, body, code=200, kind="sync"): + payload = {"type": kind, "status-code": code, "status": http.client.responses.get(code, "")} + payload.update(body) + data = json.dumps(payload).encode() + self.send_response(code) + self.send_header("Content-Type", "application/json") + self.send_header("Content-Length", str(len(data))) + self.end_headers() + self.wfile.write(data) + + def ok(self, result): + self.reply({"result": result}) + + def error(self, code, message, kind=""): + self.reply({"result": {"message": message, "kind": kind}}, code, "error") + + def body(self): + n = int(self.headers.get("Content-Length") or 0) + raw = self.rfile.read(n) if n else b"{}" + try: + return json.loads(raw or b"{}") + except ValueError: + return {} + + def do_GET(self): + url = urllib.parse.urlsplit(self.path) + q = urllib.parse.parse_qs(url.query) + path = url.path + try: + if path == "/v2/system-info": + return self.ok({"series": "16", "version": "2.70+droiddeck", "build-id": "droiddeck", "os-release": {"id": "ubuntu", "version-id": "26.04"}, + "on-classic": True, "managed": False, "kernel-version": os.uname().release, + "locations": {"snap-mount-dir": SNAP_DIR, "snap-bin-dir": BIN_DIR}, + "refresh": {"timer": "00:00~24:00/4"}, "confinement": "partial", + "sandbox-features": {}, "architecture": ARCH}) + if path == "/v2/snaps": + state = load_state() + wanted = (q.get("snaps", [""])[0] or "").split(",") + snaps = [installed_snap(n, e) for n, e in state["snaps"].items() if not wanted[0] or n in wanted] + return self.ok(snaps) + m = re.fullmatch(r"/v2/snaps/([^/]+)", path) + if m: + state = load_state() + if m.group(1) in state["snaps"]: + return self.ok(installed_snap(m.group(1), state["snaps"][m.group(1)])) + return self.error(404, f"snap not installed", "snap-not-found") + if path == "/v2/find": + name = q.get("name", [None])[0] + query = name or q.get("q", [""])[0] + section = q.get("section", [None])[0] or q.get("category", [None])[0] + if section == "featured": + section = None + select = q.get("select", [""])[0] + if select == "refresh": + return self.ok([]) + if select == "private": + return self.ok([]) + return self.ok(find(query, section, bool(name))) + if path in ("/v2/sections",): + return self.ok(SECTIONS) + if path == "/v2/categories": + return self.ok([{"name": s} for s in SECTIONS if s != "featured"]) + m = re.fullmatch(r"/v2/changes/([^/]+)", path) + if m: + with lock: + c = changes.get(m.group(1)) + c = json.loads(json.dumps(c)) if c else None + return self.ok(c) if c else self.error(404, "cannot find change", "") + if path == "/v2/changes": + with lock: + return self.ok([json.loads(json.dumps(c)) for c in changes.values()]) + m = re.fullmatch(r"/v2/icons/([^/]+)/icon", path) + if m: + return self.icon(m.group(1)) + if path == "/v2/apps": + state = load_state() + apps = [{"snap": n, "name": a, "desktop-file": f"{DESKTOP_DIR}/{n}_{a}.desktop"} + for n, e in state["snaps"].items() for a in e.get("apps", [])] + return self.ok(apps) + if path in ("/v2/connections", "/v2/interfaces"): + return self.ok({"established": [], "plugs": [], "slots": []}) + if path in ("/v2/aliases", "/v2/users", "/v2/notices", "/v2/assertions/model"): + return self.ok({} if path == "/v2/aliases" else []) + return self.error(404, f"not found: {path}") + except Exception as e: + return self.error(500, str(e)) + + def icon(self, name): + state = load_state() + entry = state["snaps"].get(name) + if not entry: + return self.error(404, "not installed", "snap-not-found") + for candidate in ("meta/gui/icon.png", "meta/gui/icon.svg"): + path = f"{SNAP_DIR}/{name}/current/{candidate}" + if os.path.isfile(path): + with open(path, "rb") as f: + data = f.read() + self.send_response(200) + self.send_header("Content-Type", "image/svg+xml" if path.endswith("svg") else "image/png") + self.send_header("Content-Length", str(len(data))) + self.end_headers() + self.wfile.write(data) + return + return self.error(404, "no icon", "") + + def do_POST(self): + path = urllib.parse.urlsplit(self.path).path + body = self.body() + m = re.fullmatch(r"/v2/snaps/([^/]+)", path) + if m or path == "/v2/snaps": + names = [m.group(1)] if m else body.get("snaps") or [] + action = body.get("action", "") + channel = body.get("channel") or "" + if channel and "/" not in channel: + channel = "latest/" + channel + if action not in ("install", "remove", "refresh"): + return self.error(400, f"unsupported action \"{action}\"") + cid = new_change(f"{action}-snap", f"{action.capitalize()} {', '.join(names)}", names) + threading.Thread(target=run_change, args=(cid, action, names, channel), daemon=True).start() + return self.reply({"change": cid}, 202, "async") + m = re.fullmatch(r"/v2/changes/([^/]+)", path) + if m: + return self.error(400, "changes cannot be aborted") + if path in ("/v2/login", "/v2/logout", "/v2/snapctl"): + return self.error(400, "not supported by DroidDeck's snap service") + return self.error(404, f"not found: {path}") + + def do_PUT(self): + return self.do_POST() + + +class Server(socketserver.ThreadingMixIn, socketserver.UnixStreamServer): + daemon_threads = True + + def get_request(self): + conn, _ = self.socket.accept() + return conn, ("snapd", 0) + + +def serve(path): + try: + os.unlink(path) + except OSError: + pass + server = Server(path, Handler) + os.chmod(path, 0o666) + server.serve_forever() + + +def main(): + for d in (LIB, SNAP_DIR, BIN_DIR, DESKTOP_DIR, LIB + "/snaps"): + os.makedirs(d, exist_ok=True) + threads = [threading.Thread(target=serve, args=(p,), daemon=True) for p in SOCKETS] + for t in threads: + t.start() + for t in threads: + t.join() + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 3972faa9b..48b77da7f 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,56 @@ 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, localAt: -Infinity }; + // A held stick steps Steam faster than Android's readback returns; those stale readbacks would snap the slider back. + const HOLD_MS = 750; + // Returns "held" while a readback is being ignored, so the caller retries it after the hold. + self.set = value => { + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return true; + if (performance.now() - self.localAt < HOLD_MS) return "held"; + if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return true; + self.expected = value; + self.updating = true; + const revision = ++self.revision; + setTimeout(() => { if (self.revision === revision) self.updating = false; }, 500); + display.SetBrightness(value); + return true; + }; + 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; + self.localAt = performance.now(); + 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"; @@ -182,10 +233,6 @@ SWITCH_JS = r""" })() """.replace("__BINDING__", SWITCH_BINDING) SESSION_SELECT = "/usr/bin/steamos-session-select" -# Steam opens its Steam Controller welcome tour at every start while the client setting -# controller_show_ibex_tour (CMsgClientSettings field 140014) is on, and only a finished tour turns it -# off; closing it leaves it on. The app's pad is an emulated controller, so the tour never applies. -# A pending firmware update still opens Steam's updater, which checks the update priority instead. TOUR_JS = r""" (() => { let key = 140014 * 8; @@ -196,6 +243,112 @@ TOUR_JS = r""" return "off"; })() """ +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""" @@ -262,7 +415,6 @@ VR_JS = r""" def launch_steamvr(): - """Keep downloads/startup off the Steam UI bridge's event loop.""" say("SteamVR library launch: using the DroidDeck ARM64 helper") state = os.path.join(os.environ.get("XDG_RUNTIME_DIR", "/tmp"), "droiddeck-steamvr") try: @@ -274,6 +426,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 +727,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 +739,106 @@ 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: + applied = self.page.evaluate("window.__droiddeckBrightness ? window.__droiddeckBrightness.set(%s) : false" % json.dumps(value)) + if applied is True: + self.controls_state = state + elif applied != "held": + self.controls_installed = False + self.controls_state = None + except (OSError, ValueError, TypeError): + pass + + def sync_frame_limit(self): + 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"] + 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,13 +848,22 @@ 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: - # The optional tour setting must not block the compat bridge. pass if not self.steamos: page.call("Runtime.addBinding", {"name": SWITCH_BINDING}) @@ -555,6 +873,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): @@ -577,15 +900,13 @@ class Helper: prior_auto = state.get("auto", {}) if not isinstance(prior_auto, dict): prior_auto = {} - # "native" from earlier builds also lists dual-platform games nobody chose to run natively. prior_native = state.get("native_choices", ()) native_choices = set(prior_native if isinstance(prior_native, (list, tuple, set)) else ()) picked = COMPAT["picked_apps"](state) runnable = {t["name"].lower() for t in live} apps = sorted(set(installed) | set(picks) | set(prior_auto) | native_choices, key=COMPAT["app_order"]) - overrides = COMPAT["requested_games"]( - COMPAT["game_requests"](), catalog, [t["name"] for t in live]) - apps = sorted(set(apps) | set(overrides), key=COMPAT["app_order"]) + asked = [app for app, request in COMPAT["game_requests"]().items() if COMPAT["valid_game_request"](app, request)] + apps = sorted(set(apps) | set(asked), key=COMPAT["app_order"]) current = dict(page.compat("many(%s)" % json.dumps(apps)) or {}) refused = set(apps) - set(current) refused_native = native_choices & refused @@ -597,7 +918,6 @@ class Helper: if isinstance(state.get("auto"), dict): state["auto"] = prior_auto native_choices -= refused - overrides = {app: tool for app, tool in overrides.items() if app not in refused} current["0"] = top["selected"] native = COMPAT["native_targets"](self.steam_root, apps) raw_mapping = COMPAT["read_config_mapping"]( @@ -611,7 +931,6 @@ class Helper: else: for app in set(native) | native_choices: if app in raw_mapping: - # The client shows an explicit native choice as the tool it inherits, and writes config.vdf late. if raw_mapping[app] == "" or current.get(app) not in self.known: current[app] = raw_mapping[app] elif app in prior_auto or app in native_choices or app in picked and ( @@ -619,6 +938,9 @@ class Helper: current[app] = "" elif not current.get(app): current.pop(app, None) + requests = COMPAT["settled_game_requests"](state, current, catalog) + overrides = COMPAT["requested_games"](requests or {}, catalog, [t["name"] for t in live]) + overrides = {app: tool for app, tool in overrides.items() if app not in refused} changes, auto = COMPAT["plan_mapping"]( current, installed, [t["name"] for t in live], default, COMPAT["followers"](state, current), native, picks, overrides, @@ -630,7 +952,8 @@ class Helper: state.update( auto={app: tool for app, tool in auto.items() if tool is not COMPAT["NATIVE_CHOICE"]}, native_choices=sorted(refused_native | {app for app, tool in auto.items() if tool is COMPAT["NATIVE_CHOICE"]}), - picked=COMPAT["picked_after"](current, changes), tools=catalog, live=True) + picked=COMPAT["picked_after"](current, changes), tools=catalog, live=True, + games_applied=COMPAT["applied_game_requests"](requests, overrides, state)) state.pop("native", None) if waiting: state["pending"] = wanted @@ -640,7 +963,6 @@ class Helper: COMPAT["write_json"](state_file, state) def ensure_tools(self): - """Proton, FEX and the runtimes FEX needs are fetched as soon as the client is up, never left pending.""" now = time.monotonic() if self.tools_checked is not None and now - self.tools_checked < TOOL_CHECK_SECONDS: return @@ -666,7 +988,6 @@ class Helper: return isinstance(request.get("seq"), int) and request["seq"] > int(state.get("applied", 0) or 0) def drain(self): - """The page's events; a switch to the desktop is acted on as it comes.""" events = self.page.drain() if any(called(e, SWITCH_BINDING) for e in events): switch_to_desktop() @@ -678,17 +999,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()) @@ -716,13 +1063,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")]) @@ -737,6 +1116,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() @@ -750,8 +1130,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-desktop-ui b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui index 68b0a2a3a..88d60dde6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Honor a desktop launch even when Steam remembers Big Picture from its last session.""" import os from pathlib import Path import runpy diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index c710ff0ac..18f2b3894 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Resolve added games against the signed-in Steam client's licenses.""" import ctypes as C import json import os @@ -14,11 +13,13 @@ import urllib.parse import urllib.request STATE = ".droiddeck-games.json" +TRIED = ".droiddeck-import-tried.json" WINNATIVE = ".winnative-steam/steamapps" LIBRARY = "/mnt/droiddeck-sd" LEGACY_LIBRARY = "/mnt/bannerlator-sd" PARKED = ".droiddeck-parked" BASE_ID = 76561197960265728 +SPACEWAR = 480 def read_json(path, default): @@ -64,8 +65,6 @@ def source_stamp(game): def store_game(game): - """Games a store client installed belong to that store: the Steam copy of the same title is - another license with its own files, and an import would let Steam update over the store's.""" return bool(game.get("store")) @@ -85,14 +84,14 @@ def identify(game): folder = Path(game["folder"]) steamapps = folder.parent.parent for library in ([steamapps] if folder.parent.name == "common" and steamapps.name == "steamapps" else []) + [folder.parent / WINNATIVE]: - matches = manifest_ids(library, folder.name) + matches = [appid for appid in manifest_ids(library, folder.name) if appid != SPACEWAR] if matches: return matches[0] if len(matches) == 1 else None ids = set() for parent in {folder, Path(game["exe"]).parent}: try: appid = int((parent / "steam_appid.txt").read_text().strip()) - if 0 < appid < 0x80000000: + if 0 < appid < 0x80000000 and appid != SPACEWAR: ids.add(appid) except (OSError, ValueError): pass @@ -106,7 +105,7 @@ def identify(game): ids = {int(item["id"]) for item in items if key(item.get("name", "")) == key(game["name"]) and key(game["name"])} if ids: - return next(iter(ids)) if len(ids) == 1 else None + return next(iter(ids)) if len(ids) == 1 and SPACEWAR not in ids else None return None except (OSError, ValueError, KeyError): return None @@ -148,7 +147,6 @@ def probe(steam_root, ids): def game_running(): - """Whether a Proton game is up: a wineserver is there for as long as any prefix is in use.""" try: pids = [p for p in os.listdir("/proc") if p.isdigit()] except OSError: @@ -171,18 +169,49 @@ def downloads_idle(steam_root): def request_restart(steam_root): - """The client reads manifests and shortcuts only at start, so an import needs one restart; - the session's loop runs the importer between the exit and the next start.""" Path(os.environ.get("HOME", "/root"), ".bl-restart-once").touch() command = shlex.split(os.environ.get("BL_STEAM_SHUTDOWN", "")) or [str(Path(steam_root) / "steamrtarm64/steam"), "-shutdown"] subprocess.run(command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=30) +def ask_restart(names, timeout=600, clock=None, sleep=None): + clock, sleep = clock or time.monotonic, sleep or time.sleep + folder = Path(os.environ.get("HOME", "/root"), ".cache/droiddeck") + ask, answer = folder / "steam-import.json", folder / "steam-import.answer" + token = str(time.time_ns()) + answer.unlink(missing_ok=True) + save_json(ask, {"token": token, "games": names}) + try: + deadline = clock() + timeout + while clock() < deadline: + reply = read_json(answer, None) + if isinstance(reply, dict) and reply.get("token") == token: + return reply.get("choice") == "now" + sleep(1) + return False + finally: + ask.unlink(missing_ok=True) + answer.unlink(missing_ok=True) + + def unimported(steam_root, snapshot, candidates): - routes = read_json(Path(steam_root) / "userdata" / snapshot["account"] / "config/.droiddeck-routes.json", {}) + config = Path(steam_root) / "userdata" / snapshot["account"] / "config" + routes = read_json(config / ".droiddeck-routes.json", {}) routed = set(routes.values()) if isinstance(routes, dict) else set() - return sorted({appid for appid in candidates.values() if snapshot["owned"].get(str(appid)) is True} - routed) + tried = read_json(config / TRIED, []) + tried = {appid for appid in tried if isinstance(appid, int)} if isinstance(tried, list) else set() + owned = {appid for appid in candidates.values() if snapshot["owned"].get(str(appid)) is True} + if tried - routed != tried: + save_json(config / TRIED, sorted(tried - routed)) + return sorted(owned - routed - tried) + + +def remember_tried(steam_root, account, appids): + config = Path(steam_root) / "userdata" / account / "config" + tried = read_json(config / TRIED, []) + tried = {appid for appid in tried if isinstance(appid, int)} if isinstance(tried, list) else set() + save_json(config / TRIED, sorted(tried | set(appids))) def watch(steam_root, listing): @@ -193,7 +222,7 @@ def watch(steam_root, listing): next_lookup = 0 last_status = None probed, next_probe, failures = None, 0, 0 - pending, requested = [], [] + pending, requested, account = [], [], None while True: now = time.monotonic() for game in games: @@ -233,6 +262,7 @@ def watch(steam_root, listing): snapshot["sources"] = sources save_json(Path(steam_root) / "userdata" / snapshot["account"] / "config" / STATE, snapshot) pending = unimported(steam_root, snapshot, candidates) + account = snapshot["account"] status = "matched %d/%d games; %d owned" % (len(candidates), len(games), sum(snapshot["owned"].values())) except (OSError, ValueError, KeyError, StopIteration, subprocess.TimeoutExpired) as error: status = "ownership check unavailable: " + str(error) @@ -242,9 +272,14 @@ def watch(steam_root, listing): status = last_status if pending and pending != requested and not game_running() and downloads_idle(steam_root): requested = pending - print("droiddeck-steam-games: restarting the client once to import %s" % pending, flush=True) + names = sorted({game["name"] for game in games if candidates.get(game["folder"]) in pending}) try: - request_restart(steam_root) + remember_tried(steam_root, account, pending) + if ask_restart(names) and not game_running() and downloads_idle(steam_root): + print("droiddeck-steam-games: restarting the client once to import %s" % pending, flush=True) + request_restart(steam_root) + else: + print("droiddeck-steam-games: %s will be imported the next time the client starts" % pending, flush=True) except (OSError, subprocess.TimeoutExpired) as error: print("droiddeck-steam-games: restart unavailable: %s" % error, flush=True) if status != last_status: @@ -254,8 +289,6 @@ def watch(steam_root, listing): def installed_build(folder, appid, installdir): - """The build another Steam client recorded for these files, so Steam updates from it - instead of verifying every file.""" try: text = (folder.parent / WINNATIVE / f"appmanifest_{appid}.acf").read_text() install = re.search(r'("installdir"\s*")([^"\\]*)(")', text, re.I) @@ -382,20 +415,18 @@ def seed_install(steam_root, game, appid): return True -def release(steam_root, game): - """Undoes an import made before store games were skipped. Only our symlink and manifest go; - the store's folder stays where it is.""" +def release(steam_root, game, stale, reason): steamapps = Path(steam_root) / "steamapps" sources = {game.get("folder", ""), legacy_path(game.get("folder", ""))} for target in sorted((steamapps / "common").glob("DroidDeck-*")): appid = target.name.removeprefix("DroidDeck-") - if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources): + if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources and stale(int(appid))): continue for manifest in (steamapps / f"appmanifest_{appid}.acf", steamapps / PARKED / f"appmanifest_{appid}.acf"): if manifest.is_file() and ours(manifest, appid): manifest.unlink() target.unlink() - print(f"droiddeck-steam-games: {game.get('name', appid)} came from {game['store']}; it is a shortcut again, not Steam app {appid}") + print(f"droiddeck-steam-games: {game.get('name', appid)} {reason}; it is no longer Steam app {appid}") def route(steam_root, acct, games): @@ -416,7 +447,7 @@ def route(steam_root, acct, games): for game in games: if store_game(game): try: - release(steam_root, game) + release(steam_root, game, lambda old: True, f"came from {game['store']}") except OSError as error: print(f"droiddeck-steam-games: store import not undone ({error})") shortcuts.append(game) @@ -428,17 +459,23 @@ def route(steam_root, acct, games): appid = candidates.get(folder, candidates.get(legacy_path(folder))) stamp = source_stamp(game) recorded = sources.get(folder, sources.get(legacy_path(folder))) - confirmed = (isinstance(appid, int) and 0 < appid < 0x80000000 - and owned.get(str(appid)) is True and stamp is not None - and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:])) + current = stamp is not None and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:]) + named = isinstance(appid, int) and 0 < appid < 0x80000000 and appid != SPACEWAR + try: + release(steam_root, game, lambda old: old == SPACEWAR or (current and named and old != appid), + "names another Steam app now") + except OSError as error: + print(f"droiddeck-steam-games: earlier import not undone ({error})") + confirmed = named and current and owned.get(str(appid)) is True if confirmed: try: if seed_install(steam_root, game, appid): routes[str(game["appid"])] = appid continue + print(f"droiddeck-steam-games: {game.get('name', appid)} stays a shortcut this session: it could not be linked as Steam app {appid}") except OSError as error: print(f"droiddeck-steam-games: import unavailable ({error})") - elif isinstance(appid, int) and 0 < appid < 0x80000000 and seeded(steamapps, game, appid): + elif named and seeded(steamapps, game, appid): routes[str(game["appid"])] = appid continue shortcuts.append(game) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 3ce263c0d..f3098fd3e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -1,25 +1,57 @@ #!/bin/bash set -eu cdn_list="https://client-update.steamstatic.com https://client-update.akamai.steamstatic.com https://client-update.fastly.steamstatic.com" -steam_channel=steamdeck_publicbeta -manifest=steam_client_${steam_channel}_linuxarm64 +beta_channel=steamdeck_publicbeta +stable_channel=steamdeck_stable steam_root=${XDG_DATA_HOME:-$HOME/.local/share}/Steam +channel_state=$steam_root/package/droiddeck-channel +pinned=1 +wanted=${BL_STEAM_CHANNEL:-$(cat "$HOME/.config/droiddeck/steam-channel" 2>/dev/null || true)} +case $wanted in + stable|"$stable_channel") steam_channel=$stable_channel ;; + beta|"$beta_channel") steam_channel=$beta_channel ;; + *) + pinned= + steam_channel=$beta_channel + [ "$(cat "$channel_state" 2>/dev/null)" = "$stable_channel" ] && steam_channel=$stable_channel + ;; +esac +if [ "${1:-}" = --channel ]; then + echo "$steam_channel" + exit 0 +fi +manifest=steam_client_${steam_channel}_linuxarm64 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 repair="" +fallback="" +starts=0 +[ -f "$unconfirmed" ] && starts=$(grep -cx start "$unconfirmed" || true) if [ -e "$repair_request" ]; then repair="requested" -elif [ -f "$unconfirmed" ] && ! grep -qx repaired "$unconfirmed" \ - && [ "$(grep -cx start "$unconfirmed")" -ge 2 ]; then - repair="the client was started $(grep -cx start "$unconfirmed") times without showing anything" +elif [ "$starts" -ge 2 ] && ! grep -qx repaired "$unconfirmed"; then + repair="the client was started $starts times without showing anything" +elif [ "$starts" -ge 2 ] && [ -z "$pinned" ] && [ "$steam_channel" = "$beta_channel" ] && [ "${1:-}" != --sync ]; then + repair="the repaired $beta_channel client was started $starts more times without showing anything" + fallback=1 +fi +if [ -n "$fallback" ]; then + echo "== STEP $(date -u +%H:%M:%S) falling back to Valve's $stable_channel Steam client: $repair" + steam_channel=$stable_channel + manifest=steam_client_${steam_channel}_linuxarm64 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 @@ -42,20 +74,99 @@ fi work=$(mktemp -d) trap 'rm -rf "$work"' EXIT -cdn="" -for candidate in $cdn_list; do - if curl -fsSL --connect-timeout 10 --max-time 30 --retry 2 --retry-connrefused --retry-delay 3 \ - "$candidate/$manifest" -o "$work/manifest"; then - cdn=$candidate - break + +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 + if curl -fsSL --connect-timeout 10 --max-time 30 --retry 2 --retry-connrefused --retry-delay 3 \ + "$candidate/$manifest" -o "$work/manifest"; then + cdn=$candidate + break + fi + done + [ -n "$cdn" ] || { echo "droiddeck-steam-install: no Steam client CDN answered for $manifest" >&2; exit 1; } + cdn_order=("$cdn") + for candidate in $cdn_list; do + [ "$candidate" = "$cdn" ] || cdn_order+=("$candidate") + done + version=$(awk -F'"' '$2 == "version" { print $4; exit }' "$work/manifest") + awk -F'"' ' + /^\t"/ && NF >= 3 && $4 == "" { block = $2 } + $2 == "file" { file[block] = $4 } + $2 == "sha2" { sha[block] = $4 } + $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:" \ + "$(awk -F'"' '/^\t"/ && NF >= 3 && $4 == "" { printf "%s ", $2 }' "$work/manifest")" >&2 + return 1 +} +if ! fetch_manifest; then + if [ -n "$sync" ] || [ -n "$pinned" ] || [ "$steam_channel" = "$stable_channel" ]; then + exit 1 fi -done -[ -n "$cdn" ] || { echo "droiddeck-steam-install: no Steam client CDN answered for $manifest" >&2; exit 1; } -cdn_order=("$cdn") -for candidate in $cdn_list; do - [ "$candidate" = "$cdn" ] || cdn_order+=("$candidate") -done -version=$(awk -F'"' '$2 == "version" { print $4; exit }' "$work/manifest") + echo "== STEP $(date -u +%H:%M:%S) falling back to Valve's $stable_channel Steam client: $manifest has no arm64 client" + steam_channel=$stable_channel + manifest=steam_client_${steam_channel}_linuxarm64 + fallback=1 + fetch_manifest || exit 1 +fi if [ -n "$sync" ]; then installed=$(awk -F'"' '$2 == "version" { print $4; exit }' "$steam_root/package/$manifest.manifest" 2>/dev/null || true) if [ -x "$steam_root/steamrtarm64/steam" ] && [ "$installed" = "$version" ]; then @@ -64,31 +175,36 @@ if [ -n "$sync" ]; then fi echo "== STEP $(date -u +%H:%M:%S) updating the arm64 Steam client to $version (was ${installed:-none}) for the x86-64 client" fi -awk -F'"' ' - /^\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] } -' "$work/manifest" | sort > "$work/parts" -[ -s "$work/parts" ] || { echo "droiddeck-steam-install: no client components in $manifest" >&2; exit 1; } 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//\\//} @@ -111,12 +227,16 @@ mkdir -p "$HOME/.steam" ln -sfn "$steam_root" "$HOME/.steam/root" ln -sfn "$steam_root" "$HOME/.steam/steam" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/bin64" -# sdk64 is where x86_64 Steamworks looks for steamclient.so; arm64 builds look in sdkarm64. ln -sfn "$steam_root/linux64" "$HOME/.steam/sdk64" 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)" +fi if [ -n "$repair" ]; then echo repaired > "$unconfirmed" rm -f "$repair_request" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language index f892e8e22..f29c91d29 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language @@ -1,18 +1,4 @@ #!/usr/bin/python3 -"""Sets the Steam client's interface language to the app's, before the client starts. - - droiddeck-steam-language <home> <language> - -<language> is one of the client's language names (english, spanish, latam, japanese, koreana, -schinese, tchinese, ...). The client reads it from <home>/.steam/registry.vdf, under -HKCU/Software/Valve/Steam and again under .../Steamsteamglobal: that second key is copied over the -first at every start, so setting only the first is undone by the old value. Its update window -reads the first key alone, and nothing reads LANG. exportedsettings.json is what the client writes -beside them when its own setting changes. The session also passes -language, which the interface -honours over the file; the file is still what the update window shows itself in. - -Run only while the client is stopped: it keeps the registry in memory and writes it back on exit. -""" import json import os import re @@ -63,7 +49,6 @@ def serialize(tokens): def block_end(tokens, start): - """Index of the '}' closing the block whose '{' is at start.""" depth = 0 for i in range(start, len(tokens)): if tokens[i] == "{": @@ -76,8 +61,6 @@ def block_end(tokens, start): def child(tokens, start, end, name): - """Index of the '{' of the block called name directly inside tokens[start:end], or None. - Keys are matched without case, as the client does.""" i = start while i < end: if tokens[i] in ("{", "}"): @@ -93,7 +76,6 @@ def child(tokens, start, end, name): def ensure_block(tokens, path): - """The '{' of the block at path, creating it and any missing parent at the end of its parent.""" start, end = 0, len(tokens) for depth, name in enumerate(path): found = child(tokens, start, end, name) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index ec5453f5b..346b32d7f 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) @@ -21,6 +25,14 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then client_home=$HOME client=("$steam_root/steamrtarm64/steam") fi + if [ "${BL_BOTTOM_DESKTOP:-}" = 1 ]; then + pid=$(cat "$client_home/.steam/steam.pid" 2>/dev/null || true) + if [ -p "$client_home/.steam/steam.pipe" ] && [[ "$pid" =~ ^[0-9]+$ ]] && kill -0 "$pid" 2>/dev/null; then + # The top screen's client takes the request, so games open there. + exec "${client[@]}" -nobigpicture -no-cef-sandbox \ + -cef-ozone-platform=x11 -cef-disable-gpu "${url:-steam://open/library}" + fi + fi mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/droiddeck" exec 9>"${XDG_CACHE_HOME:-$HOME/.cache}/droiddeck/steam-desktop.lock" if ! flock -n 9; then @@ -35,6 +47,7 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then echo "droiddeck-steam-launch: the desktop client did not become ready" >&2 exit 69 fi + [ "$url" = steam://exit ] && exit 0 export BL_INSIDE=1 BL_STEAM_UI=desktop exec /usr/local/bin/droiddeck-session steam "${url:-steam://open/library}" fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library index 171400b31..5577e1aad 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library @@ -9,9 +9,6 @@ MAIN_LABEL = "Internal Storage" def register(steam_root, library, label): - """Adds one library folder to the client's list; the client then offers it as an install - location as well as reading the games already in it. Registered even when empty: a new user - should be able to install straight into it.""" steamapps = os.path.join(library, "steamapps") if not os.path.isdir(steamapps): return 0 @@ -58,8 +55,6 @@ RENAMED = (("/mnt/bannerlator-sd", "/mnt/droiddeck-sd"),) def rename(steam_root, old, new): - """Moves a library registered under an earlier mount point to the current one, keeping its - entry (content id, app sizes) rather than registering it anew.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -77,8 +72,6 @@ def rename(steam_root, old, new): def forget(steam_root, library): - """Removes a library folder earlier builds registered and this one no longer binds, so the - client does not keep offering a location that is not there.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -107,10 +100,6 @@ def forget(steam_root, library): def relabel(steam_root, target, label): - """Names a library for what it is. The client writes its own entry with an empty label and - falls back to showing the mount point - "Local Drive (/)" - so the install dialog gives no - clue which of the two places is the phone and which is the card. A library registered on an - earlier run keeps whatever label it was given then, so both are named here every time.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -153,6 +142,7 @@ def relabel(steam_root, target, label): GAMES_DIR = "/root/Games/" +ADDED_DIR = "/mnt/droiddeck-lib/" def wanted(): @@ -193,7 +183,7 @@ def main(): if managed: keep = {library for library, _ in libraries} for library in registered(steam_root): - if library not in keep and (library == LIBRARIES[0][0] or library.startswith(GAMES_DIR)): + if library not in keep and (library == LIBRARIES[0][0] or library.startswith((GAMES_DIR, ADDED_DIR))): forget(steam_root, library) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders new file mode 100755 index 000000000..ccb8d1dc8 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders @@ -0,0 +1,53 @@ +#!/usr/bin/python3 +from pathlib import Path +import runpy +import sys + + +VDF = runpy.run_path(str(Path(__file__).with_name("droiddeck-steam-ui-scale"))) +PATH = ("Software", "Valve", "Steam", "ShaderCacheManager", "DisableShaderCache") + + +def set_text(text, enabled): + value = "0" if enabled else "1" + updated, changed = VDF["seed_value"](text, PATH, value) + if changed: + return updated, True + block = VDF["parse"](text).get("InstallConfigStore") + for section in PATH[:-1]: + block = block.get(section) + current = block.get(PATH[-1]) + if isinstance(current, VDF["Block"]): + raise ValueError("invalid DisableShaderCache setting") + if current == value: + return text, False + at = block.offset(PATH[-1]) + end = VDF["TOKEN"].match(text, at).end() + return text[:at] + f'"{value}"' + text[end:], True + + +def apply(steam_root, enabled): + config = Path(steam_root) / "config/config.vdf" + text = config.read_text() if config.exists() else '"InstallConfigStore"\n{\n}\n' + updated, changed = set_text(text, enabled) + if changed: + VDF["atomic_write"](config, updated) + return changed + + +if __name__ == "__main__": + if len(sys.argv) < 3 or sys.argv[1] not in ("0", "1"): + print("usage: droiddeck-steam-shaders <0|1> <steam root>...", file=sys.stderr) + sys.exit(2) + enabled = sys.argv[1] == "1" + status = 0 + for root in sys.argv[2:]: + if not Path(root).is_dir(): + continue + try: + if apply(root, enabled): + print(f"== steam: shader pre-caching {'on' if enabled else 'off'} in {root}") + except (OSError, ValueError, RecursionError) as error: + print(f"== steam: left shader pre-caching unchanged in {root}: {error}", file=sys.stderr) + status = 1 + sys.exit(status) 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 000000000..9ab21e781 --- /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-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim index 3e319a460..6ba870b14 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim @@ -6,6 +6,7 @@ if [ "${BL_DESKTOP:-}" = 1 ]; then for arg in "$@"; do case $arg in steam://*) url=$arg ;; + -shutdown) url=steam://exit ;; -gamepadui|-bigpicture) ui=bigpicture ;; esac done diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 3764e4a92..9ad14d838 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -16,15 +16,18 @@ 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") @@ -239,9 +242,6 @@ ART_SLOTS = (("p", "p"), ("header", ""), ("hero", "_hero"), ("logo", "_logo")) def install_art(acct, games): - """Copies each game's art into the client's grid folder under the names it looks for. A file - the client already has that this script did not write (art the user set in the client) is - left alone; ours are replaced when the source changed and removed when the game lost its art.""" grid = os.path.join(acct, "config", "grid") os.makedirs(grid, exist_ok=True) manifest_path = os.path.join(grid, ART_MANIFEST) @@ -350,7 +350,6 @@ def main(): if x64_tool: protect = {compat.first_key(os.path.join(tools, e, "compatibilitytool.vdf"), ["compatibilitytools", "compat_tools"]) or e: e for e in (os.listdir(tools) if os.path.isdir(tools) else [])} - # Its own state: the arm64 client's state.json lists which of that client's titles follow its default. own = {"default": x64_tool, "directory": os.path.join(os.path.dirname(os.path.abspath(steam_root)), "droiddeck-compat"), "linux_tool": "droiddeck-direct"} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale index 4a5997684..c1c2cc6eb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale @@ -1,16 +1,4 @@ #!/usr/bin/python3 -"""Initialize Steam's own display settings once; subsequent choices belong to Steam. - -The UI scale, and native resolution: the client treats our gamescope as an external display and, -unless "Enable Native Resolution on External Displays" is on, draws itself at 1920x1080 on any -larger output - a 2340x1080 session came up as 16:9 with bars. The session's size is already the -user's Resolution choice, so the client should use all of it. - -And the screensaver over a running game. The client's defaults (steamui.so's settings descriptor) -show screensavers while a game runs, after 300 s on AC power with no button pressed - and a stick or -trigger held is no press. Red Dead Redemption 2's cutscenes run longer than that: the slideshow -covered the game, and the button that woke it reached the game as well (B asked to quit to the -desktop). Customization > Screensaver > "Show screensavers when playing a game" still turns it on.""" import math import os from pathlib import Path @@ -26,9 +14,10 @@ TOKEN = re.compile(r'\s+|//[^\n]*|"(?:\\.|[^"\\])*"|[{}]') class Block: - def __init__(self, pairs, end): + def __init__(self, pairs, end, offsets=()): self.pairs = pairs self.end = end + self.offsets = offsets def get(self, name): matches = [value for key, value in self.pairs if key.lower() == name.lower()] @@ -36,6 +25,9 @@ class Block: raise ValueError("duplicate UI setting") return matches[0] if matches else None + def offset(self, name): + return next(at for (key, _), at in zip(self.pairs, self.offsets) if key.lower() == name.lower()) + def parse(text): tokens = [] @@ -51,17 +43,17 @@ def parse(text): raise ValueError("invalid config.vdf") def block(index, nested=False): - pairs = [] + pairs, offsets = [], [] while index < len(tokens): token, offset = tokens[index] if token == '}': if not nested: raise ValueError("unexpected closing brace") - return Block(pairs, offset), index + 1 + return Block(pairs, offset, offsets), index + 1 if not token.startswith('"') or index + 1 == len(tokens): raise ValueError("missing config value") key = token[1:-1] - value = tokens[index + 1][0] + value, at = tokens[index + 1] index += 2 if value == '{': value, index = block(index, True) @@ -70,9 +62,10 @@ def parse(text): else: raise ValueError("invalid config value") pairs.append((key, value)) + offsets.append(at) if nested: raise ValueError("unclosed config block") - return Block(pairs, len(text)), index + return Block(pairs, len(text), offsets), index return block(0)[0] @@ -111,8 +104,6 @@ def seed_text(text, scale): def seed_value(text, path, value): - """InstallConfigStore/<path> = value, unless the client already has a value there (the - user's), adding only the blocks that are missing.""" root = parse(text).get('InstallConfigStore') if not isinstance(root, Block): raise ValueError("missing InstallConfigStore") @@ -165,9 +156,6 @@ def initialize(steam_root, width, height): def seed_once(steam_root, marker_name, seed, message): - """Applies seed to config.vdf the first time only: the marker keeps a later choice - including - a return to the client's own default, which the client may store by dropping the key - the - user's.""" config = Path(steam_root) / 'config/config.vdf' marker = config.with_name(marker_name) if marker.exists(): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index e52a4e985..2a97bcb81 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -1,12 +1,8 @@ #!/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 -# Must match the -clientbeta droiddeck-session starts this client with (steam_channel). X64_CHANNEL=steamdeck_publicbeta MANIFEST=steam_client_${X64_CHANNEL}_steamrt64 @@ -18,6 +14,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 @@ -80,14 +77,17 @@ x64_sync_client() { rm -rf "$work" } -# The client rewrites config.vdf from memory as it exits: the mapping is written only while no x86 client runs. x64_map_direct() { local mode=write [ "${1:-}" = --live ] && mode=live [ -f "$STEAM_X64/config/config.vdf" ] || return 0 if [ "$mode" = write ] && pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then return 0; fi + local libraries="$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps:$X64_HOME/shared/arm64/steamapps" library + for library in /mnt/droiddeck-lib/*/x86-64/steamapps; do + [ -d "$library" ] && libraries="$libraries:$library" + done 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" "$libraries" "$(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,77 +319,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 total=$(curl -fsSIL "$url" 2>/dev/null | tr -d '\r' | awk 'tolower($1) == "content-length:" { v = $2 } END { print v + 0 }') @@ -406,13 +335,11 @@ 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" if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then - # Resumes a part-done download; a finished one answers 416, which is not a failure here. x64_fetch "$ROOTFS_URL" "$X64_HOME/rootfs.sqsh" "downloading FEX's Ubuntu 24.04 x86 rootfs" || { rc=$? [ "$rc" = 22 ] && [ -s "$X64_HOME/rootfs.sqsh" ] || { step "rootfs download failed (curl $rc)"; exit 1; } @@ -428,13 +355,9 @@ if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then touch "$ROOTFS/.droiddeck-complete" fi echo "== x86-64 rootfs: $(sed -n 's|.*/download/\([^/]*\)/.*|\1|p' <<<"$ROOTFS_URL") (sha256 ${ROOTFS_SHA256:0:12})" >&2 -# FEX falls back to the guest's own /etc/ld.so.preload (arm64 libraries) when the rootfs has none. The x86 -# session shim provides System V IPC, which Android kernels lack and the client's tier0 needs to start. : > "$ROOTFS/etc/ld.so.preload" for lib in libblsession libfakeinput; do have=0 - # 32-bit libfakeinput crashes SDL2 games (a NULL udev attribute reaches strdup), so only the x86_64 copy - # is preloaded, by full path: with $LIB, FEX falls through to the session's own i386 copy. arches="x86_64 i386"; [ "$lib" = libfakeinput ] && arches=x86_64 rm -f "$ROOTFS/usr/local/lib/i386-linux-gnu/libfakeinput.so" for arch in $arches; do @@ -511,7 +434,6 @@ if [ -f "$scout/steam-runtime.tar.xz" ] && fi [ -L "$STEAM_X64/steamapps" ] && rm -f "$STEAM_X64/steamapps" mkdir -p "$STEAM_X64/steamapps" -# FEX looks in the rootfs first: an empty dev/dri there hides the session's KGSL node, which x86 programs spin on. mkdir -p "$ROOTFS/dev/dri" mkdir -p "$X64_HOME/.steam" ln -sfn "$STEAM_X64" "$X64_HOME/.steam/root" @@ -520,40 +442,7 @@ ln -sfn "$STEAM_X64/ubuntu12_32" "$X64_HOME/.steam/bin32" ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" -# The client's bwrap probe (steam-runtime-check-requirements) needs user namespaces, which no Android app has. -srt_real=$STEAM_X64/steamrt64/pv-runtime/steam-runtime-steamrt -srt_shim=$X64_HOME/steamrt-shim -if [ -d "$srt_real" ]; then - rm -rf "$srt_shim" - mkdir -p "$srt_shim/bin" - for e in "$srt_real"/* "$srt_real"/.[!.]*; do - [ -e "$e" ] || continue - [ "$(basename "$e")" = bin ] || ln -s "$e" "$srt_shim/$(basename "$e")" - done - for e in "$srt_real"/bin/*; do ln -s "$e" "$srt_shim/bin/$(basename "$e")"; done - rm -f "$srt_shim/bin/steam-runtime-check-requirements" - printf '#!/bin/sh -exit 0 -' > "$srt_shim/bin/steam-runtime-check-requirements" - chmod 755 "$srt_shim/bin/steam-runtime-check-requirements" - rm -f "$srt_shim/bin/steam-runtime-launch-client" - cat > "$srt_shim/bin/steam-runtime-launch-client" <<'LAUNCH' -#!/bin/sh -while [ $# -gt 0 ]; do - case $1 in - --) shift; break ;; - --directory=*) cd "${1#--directory=}" || exit 127 ;; - --env=*) export "${1#--env=}" ;; - --unset-env=*) unset "${1#--unset-env=}" ;; - esac - shift -done -[ $# -gt 0 ] || exit 0 -exec "$@" -LAUNCH - chmod 755 "$srt_shim/bin/steam-runtime-launch-client" -fi -# Valve's platform libraries ship without soname links (pressure-vessel makes them); ldconfig adds them here. +droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim" srt_libs=$X64_HOME/steamrt-libs rm -rf "$srt_libs" mkdir -p "$srt_libs" @@ -563,13 +452,11 @@ for d in "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platf for f in "$d"/*.so*; do [ -e "$srt_libs/$(basename "$f")" ] || ln -s "$f" "$srt_libs/"; done done FEX_ROOTFS=$ROOTFS /usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" -# The rootfs's HarfBuzz needs a newer FreeType than some games bundle (Counter-Strike 2): use Valve's runtime one. sniper_compat=$X64_HOME/sniper-compat rm -rf "$sniper_compat" mkdir -p "$sniper_compat" hb=$(ls "$srt_libs"/libharfbuzz.so.0.* 2>/dev/null | head -n 1) if [ -n "$hb" ]; then ln -s "$hb" "$sniper_compat/libharfbuzz.so.0"; else step "warning: no HarfBuzz in Valve's runtime for the newer-runtime titles"; fi -# LD_LIBRARY_PATH beats the system folders whatever its order: Valve's older glibc must not shadow the rootfs's. for f in "$srt_libs"/*; do n=$(basename "$f") if [ -e "$ROOTFS/usr/lib/x86_64-linux-gnu/$n" ] || [ -e "$ROOTFS/lib/x86_64-linux-gnu/$n" ]; then rm -f "$f"; fi @@ -641,8 +528,8 @@ 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 mkdir -p "$X64_HOME/arm64" cp -f /usr/bin/env "$X64_HOME/arm64/env" @@ -654,7 +541,6 @@ RUN for src in "$arm_tools"/*/; do src=${src%/}; name=${src##*/} [ -f "$src/compatibilitytool.vdf" ] && [ -f "$src/toolmanifest.vdf" ] || continue - # A droiddeck-fex wrapper made the arm64 client install Valve's FEX when this client probed its tools after logon. case $name in droiddeck-direct|droiddeck-fex) continue ;; esac dst=$STEAM_X64/compatibilitytools.d/$name mkdir -p "$dst" @@ -687,12 +573,11 @@ VDF chmod 755 "$dst/run" done x64_sync_login - # 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) @@ -736,7 +621,6 @@ PY step "could not add the card to the x86-64 client's library folders" fi fi - # default-tool is the default this script set: titles still on it move along; a user's choice is kept. default=$(x64_default_dir) if [ -f "$default/compatibilitytool.vdf" ] && [ -f "$STEAM_X64/config/config.vdf" ] && ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then @@ -811,7 +695,6 @@ s = s[:steam.end()] + movie.group(0) + s[steam.end():] open(path, "w", encoding="utf-8", errors="surrogateescape").write(s) PY fi - # FEX takes its rootfs from FEXServer, and one started without FEX_ROOTFS serves none: stop it while no x86 client runs. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then FEX_ROOTFS=$ROOTFS /usr/local/bin/FEXServer -k >/dev/null 2>&1 || true fi @@ -826,7 +709,6 @@ x64_webhelper_gpu() { } x64_env() { -# droiddeck-x64-arm-proton restores this arm64 environment before Proton runs. export -p | grep -v -E '^declare -x (PWD|OLDPWD|SHLVL|_)=' > "$X64_HOME/arm-session.env.new" || true mv -f "$X64_HOME/arm-session.env.new" "$X64_HOME/arm-session.env" unset LD_LIBRARY_PATH LD_PRELOAD STEAM_RUNTIME STEAM_RUNTIME_PREFER_HOST_LIBRARIES @@ -848,7 +730,6 @@ if x64_gpu && [ "${BL_X64_CLIENT_SOFTWARE:-0}" != 1 ]; then else unset FEX_THUNKCONFIG $gpu_vars export LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe -# Over DRI3 the X server hands out the GPU node, and Mesa's software path loops on KMS dumb buffers on it. export LIBGL_DRI3_DISABLE=1 fi [ "${BL_X64_FP_OFF:-0}" = 1 ] && export PROOT_FP_OFF=1 @@ -861,12 +742,9 @@ export FEX_ROOTFS=$ROOTFS export STEAM_EXTRA_COMPAT_TOOLS_PATHS= export STEAM_RUNTIME=1 [ -d "$X64_HOME/steamrt-shim" ] && export STEAM_RUNTIME_STEAMRT=$X64_HOME/steamrt-shim -# The client starts commands via steam-runtime-launch-client; Valve's needs a session-bus service, the shim's runs them. [ -d "$X64_HOME/steamrt-shim/bin" ] && export PATH=$X64_HOME/steamrt-shim/bin:$PATH export LD_LIBRARY_PATH=$STEAM_X64/steamrt64:$STEAM_X64/steamrt64/panorama:$X64_HOME/steamrt-libs -# After an update the client re-executes itself through pressure-vessel-wrap (bwrap) unless this guard is set. export STEAM_STEAMRT_RECURSION_GUARD=1 -# proot is a tracer: tier0 takes it for a debugger and breaks into it with int3 on its first failed assertion. export BL_WEBHELPER_HIDE_TRACER=1 } @@ -876,7 +754,6 @@ x64_manifest_version() { awk -F'"' '$2 == "version" { print $4; exit }' "$STEAM_X64/package/steam_client_${chan}_$1.manifest" 2>/dev/null || echo "?" } -# What x86 GL and Vulkan look like through FEX's thunks, for a session whose menus failed on the GPU. x64_gpu_probe() { local fex=${BL_FEX:-/usr/local/bin/FEX} echo "== x86-64 GPU probe (x86 glxinfo and vulkaninfo through FEX):" @@ -888,8 +765,6 @@ x64_gpu_probe() { ) | sed 's/^/ /' } -# Steam's menus come from the web helper; when its GPU process keeps exiting, Chromium gives up on the GPU and -# the menus never appear. Says so once in the session log, with the probe above. x64_gpu_watch() { local log=$STEAM_X64/logs/console-linux.txt from n codes from=$(( $(wc -l 2>/dev/null < "$log" || echo 0) + 1 )) @@ -901,13 +776,22 @@ x64_gpu_watch() { x64_gpu_probe } +x64_arm_webhelper_cpu_supported() { + local status=0 + awk -F: ' + $1 ~ /^[[:space:]]*Features[[:space:]]*$/ { + if ($2 !~ /(^|[[:space:]])atomics([[:space:]]|$)/) unsupported = 1 + } + END { exit unsupported ? 1 : 0 } + ' /proc/cpuinfo 2>/dev/null || status=$? + [ "$status" != 1 ] +} + x64_exec() { x64_env cd "$STEAM_X64" - # The client checksums its files at start and reinstalls over edited ones, so the session shim (preload/net.c) - # swaps the web helper at exec. The arm64 helper only comes up against a client of the same build. if [ "${BL_X64_X86_WEBHELPER:-0}" != 1 ] && [ -x /usr/local/bin/droiddeck-x64-arm-webhelper ] && - [ -x "$ARM_STEAM/steamrtarm64/steamwebhelper" ]; then + [ -x "$ARM_STEAM/steamrtarm64/steamwebhelper" ] && x64_arm_webhelper_cpu_supported; then local chan x86_build arm_build chan=$(cat "$STEAM_X64/package/beta" 2>/dev/null || echo "$X64_CHANNEL") x86_build=$(awk -F'"' '$2 == "version" { print $4; exit }' "$STEAM_X64/package/steam_client_${chan}_steamrt64.manifest" 2>/dev/null || true) @@ -919,7 +803,6 @@ x64_exec() { fi fi if [ -z "${BL_X64_ARM_WEBHELPER:-}" ] && x64_webhelper_gpu; then - # Not --in-process-gpu (the preload's default): a GPU crash there takes the whole helper down. export BL_WEBHELPER_ARGS="--ignore-gpu-blocklist --use-gl=angle --use-angle=gl --ozone-platform=x11" [ -x /usr/local/bin/droiddeck-x64-webhelper ] && export BL_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-webhelper elif [ -z "${BL_X64_ARM_WEBHELPER:-}" ]; then @@ -942,7 +825,14 @@ x64_exec() { exec "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" } -# Steam renews its token every few days and refuses old copies: copy the newest every start, never while a client runs. +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" +} + x64_sync_login() { pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 && return 0 @@ -1058,6 +948,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 $? ;; @@ -1077,7 +968,6 @@ if [ -n "${BL_FEXSERVER_LOG:-}" ]; then FEX_ROOTFS=$ROOTFS "$(dirname "${BL_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$BL_FEXSERVER_LOG" 2>&1 & sleep 1 fi -# The client's connection status comes from NetworkManager on the system bus; a desktop has no system bus. x64_bus= x64_nm= x64_pin= x64_cleanup() { [ -n "$x64_pin" ] && kill "$x64_pin" 2>/dev/null @@ -1116,7 +1006,6 @@ BUSCONF step "network: the system bus did not come up; the client will show no connection" fi fi -# Left by a killed client: .crash opens the update UI on its spinner; stale Singleton* locks can blank the UI. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then for f in "$STEAM_X64/.crash" "$STEAM_X64/steam.pid" "$STEAM_X64/config/htmlcache/SingletonLock" \ "$STEAM_X64/config/htmlcache/SingletonCookie" "$STEAM_X64/config/htmlcache/SingletonSocket"; do @@ -1134,7 +1023,6 @@ if [ -n "${BL_CLIENT_CPUS:-}" ] && command -v taskset >/dev/null 2>&1; then x64_pin=$! fi for attempt in 1 2 3 4 5; do - # The branch on disk must match -clientbeta before every start, or the client loops on rc=42. echo "$X64_CHANNEL" > "$STEAM_X64/package/beta" step "starting the x86-64 SteamRT3 client under FEX (attempt $attempt): $*" rc=0 @@ -1142,4 +1030,4 @@ for attempt in 1 2 3 4 5; do ( x64_exec -clientbeta "$X64_CHANNEL" -no-cef-sandbox "${cef[@]}" "$@" ) >>"$LOG" 2>&1 || rc=$? step "client exited rc=$rc" [ "$rc" = 42 ] || break -done \ No newline at end of file +done diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim new file mode 100755 index 000000000..725db479d --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim @@ -0,0 +1,53 @@ +#!/bin/bash +set -eu +client=$1 +shim=$2 +srt_real=$client/pv-runtime/steam-runtime-steamrt +if [ ! -d "$srt_real" ]; then + probe=$(find "$client" -maxdepth 4 -name steam-runtime-check-requirements -path '*/bin/*' -print -quit 2>/dev/null || true) + srt_real=${probe:+${probe%/bin/*}} +fi +if [ -z "$srt_real" ] || [ ! -d "$srt_real" ]; then + rm -rf "$shim" + exit 1 +fi +rm -rf "$shim" +trap 'rm -rf "$shim"' ERR +mkdir -p "$shim/bin" +for e in "$srt_real"/* "$srt_real"/.[!.]*; do + [ -e "$e" ] || continue + [ "$(basename "$e")" = bin ] || ln -s "$e" "$shim/$(basename "$e")" +done +for e in "$srt_real"/bin/*; do + [ -e "$e" ] || continue + ln -s "$e" "$shim/bin/$(basename "$e")" +done +rm -f "$shim/bin/steam-runtime-check-requirements" +printf '#!/bin/sh +exit 0 +' > "$shim/bin/steam-runtime-check-requirements" +chmod 755 "$shim/bin/steam-runtime-check-requirements" +rm -f "$shim/bin/steam-runtime-launch-client" +cat > "$shim/bin/steam-runtime-launch-client" <<'LAUNCH' +#!/bin/sh +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + --directory=*) cd "${1#--directory=}" || exit 127 ;; + --env=*) export "${1#--env=}" ;; + --unset-env=*) unset "${1#--unset-env=}" ;; + --directory|--env|--unset-env) + [ $# -ge 2 ] || exit 127 + case $1 in + --directory) cd "$2" || exit 127 ;; + --env) export "$2" ;; + --unset-env) unset "$2" ;; + esac + shift ;; + esac + shift +done +[ $# -gt 0 ] || exit 0 +exec "$@" +LAUNCH +chmod 755 "$shim/bin/steam-runtime-launch-client" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr index 1de7cb89e..176f92aad 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr @@ -26,7 +26,6 @@ quest_settings() { configure_graphics() { case "$(cat /sys/class/kgsl/kgsl-3d0/gpu_model 2>/dev/null)" in Adreno840*) - # The session's forced sysmem mode loses the Vulkan device in SteamVR. export TU_DEBUG="$( IFS=', ' set -f @@ -41,8 +40,6 @@ configure_graphics() { esac } -# Any OpenXR probe (Steam runs one through Proton at every client start) starts vrserver -# while a runtime is registered, so SteamVR is registered only during a DroidDeck VR session. unregister() { if grep -qF "\"$steamvr\"" "$HOME/.config/openvr/openvrpaths.vrpath" 2>/dev/null; then rm -f "$HOME/.config/openvr/openvrpaths.vrpath" @@ -78,7 +75,6 @@ stop() { case "${1:-status}" in launch) - # Library/URL entry point: use the same installer and start path as the app. exec 8>"$state/launch.lock" flock -n 8 || exit 0 if ! installed; then @@ -221,7 +217,6 @@ JSON quest_settings apply || exit 1 startup_handed_off=0 trap '[ "$startup_handed_off" = 1 ] || quest_settings restore' EXIT - # The pinned Frame package's CVP constructor exits on Quest's unsupported SoC. cvp=$steamvr/drivers/cv/bin/linuxarm64/libArcturusPerception.so if [ -f "$cvp" ]; then disabled=$cvp.droiddeck-disabled diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat index a07462d07..ee061811a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat @@ -1,10 +1,6 @@ #!/bin/sh -# Exit 0 when this game run should open as a SteamVR panel: SteamVR is running and Steam -# lists no VR support for the app, optional or required. Under SteamVR, Steam stacks a flat game's window behind -# its own, so without the panel the game plays unseen. [ "${1:-}" = waitforexitandrun ] || exit 1 [ -z "${DROIDDECK_STEAMVR_PANEL:-}" ] || exit 1 -# Non-Steam shortcuts run with SteamAppId=0 and their CGameID in SteamGameId. app=${SteamAppId:-} [ "$app" = 0 ] && app=${SteamGameId:-} case $app in '' | 0 | *[!0-9]*) exit 1 ;; esac diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game index 0b7d40538..6d2ca116b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game @@ -6,13 +6,11 @@ pgrep -x vrserver >/dev/null 2>&1 || { echo 'Start SteamVR before launching a game with droiddeck-steamvr-game.' >&2 exit 1 } -# droiddeck-steamvr-flat skips a run that a launch option already wrapped. export DROIDDECK_STEAMVR_PANEL=1 vrdir=${DROIDDECK_VR_DIR:-/usr/local/lib/droiddeck-vr} export VK_LAYER_PATH="$vrdir/layer${VK_LAYER_PATH:+:$VK_LAYER_PATH}" export VK_INSTANCE_LAYERS="VK_LAYER_DROIDDECK_vr${VK_INSTANCE_LAYERS:+:$VK_INSTANCE_LAYERS}" export VK_LOADER_LAYERS_DISABLE="${VK_LOADER_LAYERS_DISABLE:-~implicit~}" -# Quest's guest GPU images use Vulkan sharing rather than DMA-BUF modifiers. if [ -S "/run/droiddeck/droiddeck-xr-frames" ]; then export gamescope_vr_use_modifiers=${gamescope_vr_use_modifiers:-false} fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings index 28f93cf97..723a2b6d5 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Preserve SteamVR preferences across Quest's required compositor overrides.""" import json import os from pathlib import Path diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index f59c56052..0ac9d47e5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -1,32 +1,4 @@ #!/usr/bin/python3 -r"""Before Proton starts a store game, asks the app for what that store needs at launch. - -Run by droiddeck-proton / droiddeck-proton-wrap (steam-compatibility) for every real game launch, -whoever started it: the Games tab, a pinned shortcut, or the Steam client's own Play button. It -looks for the store launcher DroidDeck wrote (.droiddeck-launch.bat) among the arguments; beside it -.droiddeck-store.json says which store and game it is. - -For an Epic game, once the Epic Games Launcher is installed (droiddeck-epic), the game is started -through it: the hidden launcher signs the game in and hands its arguments back in -.droiddeck-epic-args. Without the launcher, or when it cannot, the game needs a fresh exchange code -to sign in, which only the app can mint. The request goes through files under $BL_LAUNCH_DIR/stores (the session root, the same path on both -sides): - - req/<id>.json {"op": "epic-code", "store": "epic", "id": "<app name>"} (tmp + rename) - resp/<id>.json {"ok": true, "code": true|false, "reason": "..."} - -The app writes .droiddeck-epic-code into the game's folder itself - the code never passes through -here - and the launcher .bat reads and deletes it. No answer within TIMEOUT seconds: the game starts -with its offline identity. A code file older than STALE_SECONDS is removed first, so a code left by -an earlier launch is never used. - -The game's prefix gets Wine's browser set to droiddeck-open-url, which hands web addresses to -Android: an EOS sign-in step that falls back to a browser (a consent Epic asks for once per product) -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. - - droiddeck-store-launch <the arguments Steam gave the compat tool> -""" import base64 import binascii @@ -38,6 +10,7 @@ import time import subprocess import tempfile import hashlib +import threading from pathlib import Path LAUNCHER = ".droiddeck-launch.bat" @@ -74,12 +47,6 @@ def sidecar_at(folder): def find_store_game(argv): - """ - The (folder, sidecar) of a store game among [argv], or None when this is not one. Steam passes - the shortcut's target: the launcher .bat when the game has one (Epic, Amazon, a GOG game with - arguments), else the game's exe itself (most GOG games), which may sit in a subfolder - so the - folders above it are looked through too, up to MAX_DEPTH, for the sidecar. - """ for raw in argv: arg = raw.strip().strip('"').strip("'").replace("\\", "/") low = arg.lower() @@ -97,7 +64,6 @@ def find_store_game(argv): def drop_stale(folder, now=None): - """Removes a code file older than STALE_SECONDS; True when one was removed.""" code = folder / EPIC_CODE try: if (now if now is not None else time.time()) - code.stat().st_mtime > STALE_SECONDS: @@ -133,7 +99,6 @@ def through_client(folder, sidecar, timeout=CLIENT_TIMEOUT): def ask(channel, request, timeout=TIMEOUT): - """Writes [request] under channel/req and waits for channel/resp; the answer, or None on timeout.""" req_dir, resp_dir = channel / "req", channel / "resp" req_dir.mkdir(parents=True, exist_ok=True) resp_dir.mkdir(parents=True, exist_ok=True) @@ -158,7 +123,6 @@ def ask(channel, request, timeout=TIMEOUT): def windows_path(unix): - """A guest path as Wine names it through Z: (the whole filesystem).""" return "Z:" + unix.replace("/", "\\") @@ -167,12 +131,6 @@ def reg_escape(value): def set_value(reg, key, name, value, now=None): - """ - Appends `key` with `"name"="value"` to a prefix's user.reg unless the last word on it already - says so. Appended rather than edited in place, as DirectAudio's key is: Wine reads later sections - over earlier ones, and nothing of the file is rewritten under a wineserver that might hold it. - False when there is no user.reg yet (Proton creates the prefix after this; the next launch has it). - """ if not reg.is_file(): return False line = '"%s"="%s"' % (name, reg_escape(value)) @@ -190,7 +148,6 @@ def set_value(reg, key, name, value, now=None): def remove_value(reg, key, name): - """Drops every `"name"=` line under `key` in user.reg; True when one was there.""" if not reg.is_file(): return False rows, inside, dropped = [], False, False @@ -209,13 +166,11 @@ def remove_value(reg, key, name): def options(sidecar): - """An Epic game's launch choices from its sidecar, as the Games tab's Epic card sets them.""" e = sidecar.get("epic") if isinstance(sidecar.get("epic"), dict) else {} return {"eos": e.get("eos", True) is not False, "offline": e.get("offline", False) is True} def server_socket(pfx): - """The wineserver socket for prefix [pfx], as Wine names it (server-<dev>-<inode> under /tmp/.wine-<uid>).""" try: st = os.stat(pfx) except OSError: @@ -225,11 +180,6 @@ def server_socket(pfx): def wait_for_server(pfx, timeout=SERVER_WAIT): - """ - Waits for a wineserver still holding this prefix (an earlier verb's, or the last launch's) to - exit: it rewrites user.reg from its own memory when it does, which drops a line appended - meanwhile. True when none is left. - """ sock = server_socket(pfx) if sock is None: return True @@ -240,7 +190,6 @@ def wait_for_server(pfx, timeout=SERVER_WAIT): def has_value(reg, key, name, value=None): - """Whether the last word on `key` in user.reg sets "name" (to [value], when given).""" if not reg.is_file(): return False inside, last = False, None @@ -255,7 +204,6 @@ def has_value(reg, key, name, value=None): def provision_prefix(compat_data, wait=SERVER_WAIT): - """Wine's browser set to the hand-off, and an earlier build's EOS overlay pointer removed.""" if not compat_data: return "no-prefix" pfx = Path(compat_data) / "pfx" @@ -291,15 +239,34 @@ 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): - """Cloud saves for this game (the game card's switch; on unless turned off).""" return str(sidecar.get("store")) in CLOUD_STORES and sidecar.get("cloud", True) is not False def exited(argv, code=0): - """After the game: ask the app to upload what changed, without waiting for it.""" found = find_store_game(argv) launch_dir = os.environ.get("BL_LAUNCH_DIR", "") if found is not None and str(found[1].get("store")) == "epic" and os.environ.get(EPIC_HANDLED) != "1" \ @@ -320,7 +287,6 @@ COMET_DIR = Path("/usr/local/lib/droiddeck-comet") def provision_galaxy(compat_data, proton, timeout=90): - """Proton creates the prefix and registers Galaxy before the first game runs.""" if not compat_data or not proton or not Path(proton).is_file(): return "no-proton" data = Path(compat_data) @@ -471,8 +437,27 @@ def gog_registry(folder): return entries, skipped -def apply_gog_registry(folder, compat_data, proton, timeout=90): +def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=None): entries, skipped = gog_registry(folder) + if installation: + product = str(installation["id"]) + if not product.isdigit(): + raise ValueError("Invalid GOG product identifier") + values = {"PATH": windows_path(str(folder))} + identity = Path(folder) / ("goggame-%s.id" % product) + if identity.is_file(): + actual = json.loads(identity.read_text(encoding="utf-8-sig")).get("buildId") + if actual and installation.get("build") and str(actual) != str(installation["build"]): + raise ValueError("GOG build metadata changed before patch setup") + if installation.get("build"): + values["BUILDID"] = installation["build"] + if installation.get("version"): + values["VER"] = installation["version"] + for key, value in values.items(): + entry = gog_entry({"root": "HKLM", "subkey": "Software\\GOG.com\\Games\\" + product, + "valueName": key, "valueData": value, "valueType": "string"}, {}) + if entry: + entries.append(entry) note = " skipped=%d" % skipped if skipped else "" if not entries: return "none" + note @@ -489,7 +474,8 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90): with tempfile.TemporaryDirectory(prefix="droiddeck-gog-") as tmp: source = Path(tmp) / "registry.reg" source.write_bytes(b"\xff\xfe" + text.encode("utf-16-le")) - run = subprocess.run([proton, "run", "reg.exe", "import", windows_path(str(source)), "/reg:32"], + executable = pfx / "drive_c/windows/system32/reg.exe" + run = subprocess.run([proton, "run", str(executable) if executable.is_file() else "reg.exe", "import", windows_path(str(source)), "/reg:32"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) if run.returncode or not (pfx / "system.reg").is_file(): return "import-failed" + note @@ -502,6 +488,8 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90): def main(argv): + if os.environ.get("DROIDDECK_GOG_MAINTENANCE") == "1": + return 0 if argv and argv[0] == "--exited": rest, code = argv[1:], 0 if rest[:1] == ["--code"] and len(rest) > 1: @@ -511,11 +499,27 @@ 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 folder, sidecar = found store, game = str(sidecar.get("store")), str(sidecar.get("id")) + if store == "gog": + helper = Path(__file__).resolve().with_name("droiddeck-gog-maintenance") + if helper.is_file(): + child = subprocess.Popen([sys.executable, str(helper), "lease", str(folder), str(os.getppid())], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, + start_new_session=True) + ready = child.stdout.readline().decode().strip() + child.stdout.close() + threading.Thread(target=child.wait, daemon=True).start() + if ready != "ready": + log("gog: close or recover the maintenance operation before playing") + return RAN_FAILED compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") prefix_id = os.path.basename(compat_data) if compat_data else "" launch_dir = os.environ.get("BL_LAUNCH_DIR", "") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run new file mode 100755 index 000000000..3fa4e2fd4 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run @@ -0,0 +1,57 @@ +#!/usr/bin/python3 +import os +import sys + +REAL = "/usr/bin/systemd-run" +VALUED = {"-u", "--unit", "-p", "--property", "--description", "--slice", "-E", "--setenv", + "--working-directory", "--uid", "--gid", "--nice", "-H", "--host", "-M", "--machine", + "--on-active", "--on-boot", "--on-startup", "--on-unit-active", "--on-unit-inactive", + "--on-calendar", "--path-property", "--socket-property", "--timer-property", "--service-type", + "--shell", "--slice-inherit"} + + +def main(argv): + args = argv[1:] + if "--user" not in args: + os.execv(REAL, [REAL] + args) + env = dict(os.environ) + cwd = None + foreground = False + i = 0 + while i < len(args): + a = args[i] + if a == "--": + i += 1 + break + if not a.startswith("-"): + break + name, _, inline = a.partition("=") + value = inline if inline else (args[i + 1] if name in VALUED and i + 1 < len(args) else "") + if name in ("-E", "--setenv") and "=" in value: + k, _, v = value.partition("=") + env[k] = v + elif name == "--working-directory": + cwd = value + elif name in ("--scope", "--wait", "-W", "--pipe", "-P", "-t", "--pty"): + foreground = True + i += 1 if inline or name not in VALUED else 2 + command = args[i:] + if not command: + os.execv(REAL, [REAL] + args) + if cwd: + os.chdir(cwd) + if foreground: + os.execvpe(command[0], command, env) + if os.fork() == 0: + os.setsid() + null = os.open(os.devnull, os.O_RDWR) + os.dup2(null, 0) + try: + os.execvpe(command[0], command, env) + except OSError: + os._exit(127) + return 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-text b/tools/linuxfs/overlay/usr/local/bin/droiddeck-text new file mode 100755 index 000000000..9bbf0305e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-text @@ -0,0 +1,7 @@ +#!/bin/bash +key=$1 +shift +line=$(grep -m1 "^$key=" /etc/droiddeck/strings 2>/dev/null) +text=${line#*=} +[ -n "$line" ] || text=$key +printf "$text\n" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents index 7349e6784..d7c3f61af 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents @@ -1,27 +1,4 @@ #!/usr/bin/python3 -"""Windows components (OpenAL, d3dx, XAudio, ...) for a game's Proton prefix. - -The app installs each component under STORE/<id>: its files in system32/ (64-bit) and syswow64/ -(32-bit) as Windows lays them out, and component.json naming the overrides that make Wine load -them instead of its own ("name" for native-then-builtin, or "name=n" with Wine's own letters) and -the components it bundles ("requires"). The ids are Bannerlator's catalog names (xaudio2.7, -oalinst_dll...). The user picks components per game; the picks are in SELECTION as -{"version": 1, "games": {"<appid>": ["oalinst_dll", ...]}}. - -A component installed from a Windows Installer package (droiddeck-msi-install) also has drive_c/, -its files at their Windows paths (Program Files, the .NET GAC, winsxs...), and registry.json, the -values its package writes. - -droiddeck-game-env calls apply() before every game launch. It copies what is missing or changed -into compatdata/<appid>/pfx, writes the components' registry values into the prefix's registry -files (system.reg, user.reg) and returns the overrides for WINEDLLOVERRIDES, so Wine never has to -be running. A prefix Proton has not made yet gets the registry values on the launch after. - -Proton leaves the files alone afterwards: its builtin refresh (update_builtin_libs) replaces only -files that are its own builtins, and a new prefix is built around files already there (copy_pfx -skips them). The one case that removes them is a launch on an older Proton than the prefix's, -which deletes every file Proton once placed - and the next launch's apply() puts ours back. -""" import json import os import re @@ -62,7 +39,6 @@ def wanted(app_id, selection=SELECTION): def component(store, cid): - """The component's overrides, its files as (relative path, source) and the ids it bundles, or None if not installed.""" root = Path(store) / cid try: with open(root / "component.json", encoding="utf-8") as source: @@ -87,7 +63,6 @@ def component(store, cid): def registry_values(root): - """The component's registry values (registry.json), the ones that are well formed.""" try: with open(Path(root) / "registry.json", encoding="utf-8") as source: values = json.load(source).get("values", []) @@ -101,16 +76,17 @@ def registry_values(root): return good -def expand(store, ids): - """The picks with everything they bundle, each once, a bundle's parts before it.""" +def expand(store, ids, saved=None): out, seen = [], set() + saved = saved if isinstance(saved, dict) else {} def visit(cid, depth): if cid in seen or depth > 8: return seen.add(cid) found = component(store, cid) - for dep in (found[2] if found else []): + parts = found[2] if found else [d for d in saved.get(cid, []) if valid_id(d)] + for dep in parts: visit(dep, depth + 1) out.append(cid) @@ -120,7 +96,6 @@ def expand(store, ids): def spelled(path): - """path with each folder that exists spelled as the prefix spells it (Windows names ignore case).""" parts = path.parts current = Path(parts[0]) for part in parts[1:]: @@ -139,7 +114,6 @@ def spelled(path): def existing(path): - """The file at path as the prefix spells it: Windows names ignore case, the filesystem may not.""" folder = spelled(path.parent) path = folder / path.name try: @@ -163,7 +137,6 @@ def same(src, dst): def builtin(path): - """Proton's own: a symlink into its files, or a Wine DLL that says so in its DOS stub.""" if path.is_symlink(): return True try: @@ -175,7 +148,6 @@ def builtin(path): def place(src, target, backup=None): - """Copies src over target unless it is already there; a file of someone else's goes to backup first.""" target = spelled(target.parent) / target.name target.parent.mkdir(parents=True, exist_ok=True) found = existing(target) @@ -193,7 +165,6 @@ def place(src, target, backup=None): def reg_escape(text, extra=""): - """A string as Wine's registry files write it.""" out = [] for ch in text: if ch == "\\" or ch == '"' or ch in extra: @@ -238,7 +209,6 @@ def reg_key_line(key): def reg_value_line(name, kind, data): - """name=data as one registry file line; None for a kind that has no line of its own.""" head = "@" if name == "" else '"%s"' % reg_escape(name) if kind == "sz": return '%s="%s"' % (head, reg_escape(str(data))) @@ -256,13 +226,11 @@ def reg_value_line(name, kind, data): def reg_string(line): - """The text of a string value line (plain or str(2)), or None for any other kind.""" match = re.match(r'^(?:@|"(?:[^"\\]|\\.)*")=(?:str\(2\):)?"((?:[^"\\]|\\.)*)"\s*$', line) return reg_unescape(match.group(1)) if match else None class RegistryFile: - """One of a prefix's registry files, as Wine keeps them: [key] sections of name=value lines.""" def __init__(self, path): self.path = Path(path) @@ -289,7 +257,6 @@ class RegistryFile: self.links[current.lower()] = target def link_target(self, number, root): - """Where the link key whose "#link" line is at number leads, relative to this file's root.""" for at in range(number + 1, min(number + 8, len(self.lines))): line = self.lines[at] if line.startswith("["): @@ -310,7 +277,6 @@ class RegistryFile: return None def resolve(self, key): - """The key Wine really keeps key in: a path through a link key leads to the link's target.""" key = key.strip("\\") for _ in range(8): lower = key.lower() @@ -336,7 +302,6 @@ class RegistryFile: return None if end is None else reg_unescape(line[1:end]) def section(self, key): - """(start, end) line numbers of the key's values, or None.""" start = self.index.get(self.resolve(key).lower()) if start is None: return None @@ -353,7 +318,6 @@ class RegistryFile: return reg_unescape(match.group(1)).lower() if match else None def find(self, key, name): - """(first, last + 1) of the value's lines, or None.""" span = self.section(key) if span is None: return None @@ -387,7 +351,6 @@ class RegistryFile: self.changed = True def put(self, key, name, raw): - """Sets the value's line(s) to raw, or removes the value when raw is None; True if that changed it.""" found = self.find(key, name) if raw is None: if found is None: @@ -430,8 +393,6 @@ class RegistryFile: def list_line(name, current, item, separator, add, at_end=True): - """current (a string value line) with item added to or taken out of its list, None if it had - nothing else; a value that is not a string is left as it is.""" text = reg_string(current) if current is not None else "" if text is None: return current @@ -444,10 +405,7 @@ def list_line(name, current, item, separator, add, at_end=True): return reg_value_line(name, "expand_sz" if expand else "sz", separator.join(items)) -def apply_registry(pfx, values, state): - """Writes the picked components' registry values into the prefix and takes out the ones of - components turned off: a value goes back to what it was before, an entry added to a list such - as PATH just leaves the list. Returns (values written, notes).""" +def apply_registry(pfx, values, state, held=()): files = {} for hive, name in HIVES.items(): if (pfx / name).is_file(): @@ -478,6 +436,9 @@ def apply_registry(pfx, values, state): for ident, record in old.items(): if ident in keep or not isinstance(record, dict) or not isinstance(record.get("key"), str): continue + if record.get("cid") in held: + keep[ident] = record + continue reg = files.get(record.get("hive")) if reg is None: keep[ident] = record @@ -513,7 +474,6 @@ def save_state(compat, state): def pending_for(app_id, pending=PENDING): - """The component ids the app is still getting ready for app_id; empty when none (or no file).""" try: with open(pending, encoding="utf-8") as source: ids = json.load(source).get("games", {}).get(str(app_id), []) @@ -523,9 +483,6 @@ def pending_for(app_id, pending=PENDING): def wait_for_pending(app_id, pending=PENDING, store=STORE, timeout=PENDING_WAIT, sleep=time.sleep, clock=time.monotonic): - """Waits (at most timeout seconds) for the components still being got ready for app_id to be in - the store or dropped from the pending list. No wait at all when nothing is pending. Returns a - note for the log, or None.""" def missing(): return [cid for cid in pending_for(app_id, pending) if component(store, cid) is None] left = missing() @@ -543,7 +500,6 @@ def wait_for_pending(app_id, pending=PENDING, store=STORE, timeout=PENDING_WAIT, def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING, wait=wait_for_pending): - """Brings the prefix in line with the game's picks. Returns (overrides, notes).""" compat = Path(compat_path) pfx = compat / "pfx" waited = wait(app_id, pending, store) if wait else None @@ -555,14 +511,44 @@ def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING copied = 0 installed = [] values = [] - for cid in expand(store, ids): + held = set() + saved_overrides = state.get("overrides") if isinstance(state.get("overrides"), dict) else {} + saved_requires = state.get("requires") if isinstance(state.get("requires"), dict) else {} + recorded = [c for c in state.get("components", []) if isinstance(c, str) and valid_id(c)] + owners = set(state["files"].values()) + registry_owners = {r.get("cid") for r in (state.get("registry") or {}).values() if isinstance(r, dict)} + inferred = set() + guessed = set(state.get("guessed") or []) if "requires" in state else set(ids) + loose = [c for c in recorded if c not in ids and (c in owners or c in registry_owners)] + for cid in ids: + if cid in guessed and component(store, cid) is None and cid in recorded: + saved_requires = dict(saved_requires, **{cid: loose}) + inferred.add(cid) + kept_overrides, kept_requires = {}, {} + for cid in expand(store, ids, saved_requires): found = component(store, cid) if found is None: - notes.append("%s is not installed; skipped" % cid) + if cid in saved_requires or cid in recorded or cid in owners or cid in registry_owners: + held.add(cid) + if cid in saved_overrides: + names = [n for n in saved_overrides.get(cid, []) if isinstance(n, str)] + else: + names = sorted({Path(rel).stem.lower() for rel, owner in state["files"].items() + if owner == cid and rel.lower().endswith(".dll")}) + overrides += names + kept_overrides[cid] = names + if isinstance(saved_requires.get(cid), list) and cid not in inferred: + kept_requires[cid] = saved_requires[cid] + notes.append("%s is not in the store; kept the files it placed until it is installed again" % cid) + else: + notes.append("%s is not installed; skipped" % cid) continue installed.append(cid) - names, files, _, registry = found + names, files, requires, registry = found overrides += names + kept_overrides[cid] = list(names) + if requires: + kept_requires[cid] = list(requires) values += [(cid, value) for value in registry] for rel, src in files: if place(src, pfx / rel, None if rel in state["files"] else compat / BACKUP / rel): @@ -572,6 +558,9 @@ def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING for rel, cid in state["files"].items(): if rel in keep: continue + if cid in held: + keep[rel] = cid + continue path = existing(pfx / rel) saved = compat / BACKUP / rel if saved.is_file(): @@ -587,10 +576,13 @@ def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING except FileNotFoundError: pass compat.mkdir(parents=True, exist_ok=True) - new_state = {"files": keep, "components": installed, "registry": state.get("registry", {})} + new_state = {"files": keep, "components": installed + sorted(held), "overrides": kept_overrides, + "requires": kept_requires, "registry": state.get("registry", {})} + if inferred: + new_state["guessed"] = sorted(inferred) written = 0 if values or new_state["registry"]: - written, registry_notes = apply_registry(pfx, values, new_state) + written, registry_notes = apply_registry(pfx, values, new_state, held) notes += registry_notes save_state(compat, new_state) if copied or removed or restored or written: @@ -601,7 +593,6 @@ def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING def overrides_value(names): - """WINEDLLOVERRIDES entries: native-then-builtin unless the component says otherwise; the last word on a DLL wins.""" modes = {} for entry in names: name, _, mode = entry.partition("=") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton index 4a074be13..1f82a0691 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton @@ -1,9 +1,7 @@ #!/bin/bash -# Runs natively: droiddeck-steam-x64's x86 wrappers start it through an arm64 binary, which FEX hands to the CPU. tool=$1; shift x64_home=$HOME -# The game overlay tags the game's windows with the Steam app ID; without it gamescope never shows them. overlay=0 case ${LD_PRELOAD:-} in *gameoverlayrenderer.so*) overlay=1 ;; esac @@ -20,7 +18,6 @@ else export HOME=/root fi [ -z "$game_display" ] || export DISPLAY=$game_display -# Proton takes its Steam client parts from the client's install folder; the x86-64 client's are x86. export BL_X64_STEAM_ROOT=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-} export STEAM_COMPAT_CLIENT_INSTALL_PATH=$HOME/.local/share/Steam arm_overlay=$STEAM_COMPAT_CLIENT_INSTALL_PATH/steamrtarm64/gameoverlayrenderer.so diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper index 646dbd01b..bd89a4ddb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper @@ -1,5 +1,4 @@ #!/bin/bash -# The arm64 client's web helper for the x86-64 client, run natively: FEX hands this arm64 program to the CPU. x64_home=$HOME arm=/root/.local/share/Steam/steamrtarm64 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper index 10abdf2a4..8c830ab9b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper @@ -1,8 +1,5 @@ #!/bin/bash -# Steam's compositor draws each browser window from its X pixmap: frames must reach X, not gamescope's WSI layer. -# gamescope sets vk_xwayland_wait_ready=false for its children; kopper swapchains flashed black even with the wait. unset BL_X64_ARM_WEBHELPER -# The shim already added the GPU flags (preload/webhelper.c) to these arguments. export BL_WEBHELPER_ARGS=stock DISABLE_GAMESCOPE_WSI=1 vk_xwayland_wait_ready=true LIBGL_KOPPER_DISABLE=true if [ -x ./steamwebhelper ]; then exec ./steamwebhelper "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index c07a6d833..304e12655 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Licensed Xbox launches through Xodus and the game's selected ARM64 Proton.""" import hmac import json import os @@ -15,7 +14,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 +113,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.parent) + os.replace(staged, link) + except OSError: + if os.path.lexists(staged): + staged.unlink() + continue + return letter.upper() + ':\\' + str(path.relative_to(view.parent)).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 +167,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 +183,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 +239,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 41a37a9aa..6e876a506 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 @@ -217,8 +248,6 @@ bl_idtech3() { } """ -# Source games report VAC-secure or insecure only in their console, written to console.log only with -condebug. -# The app keeps the switch and the records in /root: the x86-64 client runs games with its own HOME. BL_VACDIAG_SETUP = """ bl_vacdiag() { [ -f /root/.droiddeck-vac-diagnostics ] || return 0 @@ -245,6 +274,14 @@ bl_vacdiag() { } """ +BL_DRIVER_QUERY_SKIP = """ +case "$verb:${1##*/}:${STEAM_COMPAT_DATA_PATH%/}" in + run:d3ddriverquery64.exe:*/compatdata/0 | run:d3ddriverquery.exe:*/compatdata/0) + echo "droiddeck-proton: Steam's D3D driver query is not run (it fails here and would start Wine in compatdata/0)" >&2 + exit 1 ;; +esac +""" + BL_DIRECTAUDIO_SETUP = """ bl_is_steam_installscript_target() { local target=${1:-} @@ -292,6 +329,11 @@ bl_directaudio() { fi WINEDLLPATH="$da/lib/wine${WINEDLLPATH:+:$WINEDLLPATH}" export WINEDLLPATH + for name in $(compgen -e); do + case $name in + AUDIO_DIRECT_*) export "BANNER_$name=${!name}" ;; + esac + done WINE_AUDIO_DRIVER="directaudio,pulse" export WINE_AUDIO_DRIVER pfx="${STEAM_COMPAT_DATA_PATH:-}/pfx" @@ -377,7 +419,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_DRIVER_QUERY_SKIP + 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) @@ -424,6 +466,15 @@ bl_store_launch "$@" BL_STORE_ARGS=("$@") bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env "$BL_STORE_PROTON" "$verb" "$@" "${BL_EXTRA_ARGS[@]}" """ + + +def extra_wrapper_sh(entry_point): + return (EXTRA_WRAPPER_SH % entry_point).replace( + 'here=$(dirname "$0")', + 'here=$(dirname "$0")\n' + BL_DRIVER_QUERY_SKIP + 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) + + EXTRA_COMPAT_TOOL_VDF = """"compatibilitytools" { "compat_tools" @@ -466,7 +517,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" "$@" @@ -494,7 +545,6 @@ def tokenize(text): def find_block(tokens, path): - """Index of the '{' opening the block at path, or None.""" depth, want, i = 0, 0, 0 while i < len(tokens): t = tokens[i] @@ -545,10 +595,6 @@ def serialize(tokens): def write_changed(path, text, mode=None): - """Writes `text` to `path` only when it differs, through a rename so a reader never sees half a - file. The session runs this script every 15 s for as long as the client does; rewriting files - that have not changed cost a python start's worth of writes each time, and config.vdf is the - client's own, which it may be writing at that moment. Returns whether anything was written.""" try: with open(path, encoding="utf-8", errors="replace") as f: same = f.read() == text @@ -576,8 +622,6 @@ def display_name(base): def first_key(path, section): - """The single key naming a block inside `section`, or None. Used to keep a third-party tool's - own internal name, so a mapping the user already made against it keeps working.""" try: with open(path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -595,7 +639,6 @@ def first_key(path, section): def manifest_entry_point(path): - """The script a toolmanifest's commandline runs, relative to the tool directory.""" try: with open(path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -610,9 +653,6 @@ def manifest_entry_point(path): def adopt_extras(tools): - """Makes every other Proton in compatibilitytools.d launchable here, and returns the tool names - to leave alone in CompatToolMapping - the whole point of installing one is to pick it per game, - so register_default must not repoint it back at ours.""" adopted = {} try: entries = sorted(os.listdir(tools)) @@ -647,11 +687,7 @@ def adopt_extras(tools): name = first_key(compat_vdf, ["compatibilitytools", "compat_tools"]) or entry wrapper = os.path.join(tool_dir, EXTRA_WRAPPER) 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 - + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) - write_changed(wrapper, body, 0o755) + write_changed(wrapper, extra_wrapper_sh(entry_point), 0o755) write_changed(manifest, EXTRA_MANIFEST_VDF) write_changed(compat_vdf, EXTRA_COMPAT_TOOL_VDF % (name, display_name(entry))) legacy_wrapper = os.path.join(tool_dir, LEGACY_EXTRA_WRAPPER) @@ -690,7 +726,6 @@ def libraries(steam_root): def installed_apps(steam_root): - """App ids of the titles the client has installed, tools and runtimes excluded.""" apps = set() for library in libraries(steam_root): steamapps = os.path.join(library, "steamapps") @@ -710,7 +745,6 @@ STEAM_PLAY_MANIFESTS = 891390 def launch_programs(config): - """The Windows and Linux programs an app's launch options start, relative to its folder (lowercase, "/").""" launch = config.get("launch") if isinstance(config, dict) else None found = [] for option in launch.values() if isinstance(launch, dict) else (): @@ -725,7 +759,6 @@ def launch_programs(config): def launch_options(config): - """An app's launch options as Steam lists them: executable, arguments, working folder, type and oslist.""" launch = config.get("launch") if isinstance(config, dict) else None found = [] for key, option in launch.items() if isinstance(launch, dict) else (): @@ -903,7 +936,6 @@ def manifest_flags(tokens): def tool_downloads(steam_root): - """(app, "install" or "update") for each tool the client has yet to install or bring up to date.""" wanted = [] for app in REQUIRED_TOOLS: tokens = app_manifest(steam_root, app) @@ -1113,14 +1145,92 @@ def requested_tool(request, catalog): def game_requests(directory=None): - value = read_json(state_path("games.json", directory)) - if value.get("version") != 1 or not isinstance(value.get("games"), dict): - return {} - return value["games"] + return read_game_requests(directory)[0] + + +def read_game_requests(directory=None): + try: + with open(state_path("games.json", directory), encoding="utf-8") as f: + text = f.read() + value = json.loads(text) + except (OSError, ValueError): + return {}, None + if not isinstance(value, dict) or value.get("version") != 1 or not isinstance(value.get("games"), dict): + return {}, text + return value["games"], text + + +def write_game_requests(requests, original, directory=None): + path = state_path("games.json", directory) + try: + with open(path, encoding="utf-8") as f: + if f.read() != original: + return False + except OSError: + if original is not None: + return False + return write_json(path, {"version": 1, "games": requests}) + + +def valid_game_request(app, request): + return (isinstance(app, str) and re.fullmatch(r"[1-9][0-9]*", app) is not None and int(app) <= 0xFFFFFFFF and + (request is None or isinstance(request, dict) and isinstance(request.get("dir"), str) and + request["dir"] != "" and isinstance(request.get("valve"), bool))) + + +def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): + recorded = state.get("games_applied") + if isinstance(recorded, dict): + applied = dict(recorded) + else: + applied = dict(requests) if "tools" in state else {} + by_name = {t["name"]: t for t in catalog} + out = dict(requests) + for app, request in requests.items(): + if not valid_game_request(app, request) or app not in applied or applied[app] != request: + continue + if request is None: + del out[app] + continue + wanted = requested_tool(request, catalog) + if wanted is None: + continue + if app in current: + picked = current[app] + elif missing_is_cleared: + picked = "" + else: + continue + if picked == wanted: + continue + tool = by_name.get(picked) + if tool and tool["dir"]: + out[app] = {"valve": tool["valve"], "dir": tool["dir"]} + else: + del out[app] + return out, out != requests + + +def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): + for _ in range(2): + requests, text = read_game_requests(directory) + settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) + if not moved or write_game_requests(settled, text, directory): + return settled + return None + + +def applied_game_requests(requests, overrides, state): + recorded = state.get("games_applied") + before = recorded if isinstance(recorded, dict) else {} + if requests is None: + return dict(before) + return {app: request if app in overrides and overrides[app] is not DEFERRED_GAME_TOOL else before[app] + for app, request in requests.items() + if app in overrides and overrides[app] is not DEFERRED_GAME_TOOL or app in before} def requested_games(requests, catalog, runnable=None): - """App id -> requested tool, None for inherit, or DEFERRED_GAME_TOOL while unavailable.""" runnable = None if runnable is None else set(runnable) resolved = {} for app, request in requests.items(): @@ -1140,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) @@ -1198,7 +1334,6 @@ def read_mapping(tokens, mapping): def read_config_mapping(config_path): - """Read per-app choices without creating or rewriting the client's mapping block.""" try: with open(config_path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -1284,9 +1419,6 @@ def live_helper_running(directory=None): def register_default(config_path, apps=(), protect=(), default=None, catalog=None, directory=None, settle=False, picks=(), linux_tool=FEX_TOOL): - """Writes the mapping: the "0" default and every title that follows it (see plan_mapping). - With settle, the default itself is decided first (see choose_default): before the client - starts, config.vdf holds what the client last kept, menu changes included.""" with locked(directory): state = read_json(state_path("state.json", directory)) with open(config_path, encoding="utf-8", errors="replace") as f: @@ -1300,13 +1432,29 @@ 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))) - overrides = requested_games(game_requests(directory), catalog) + requests = settled_game_requests(state, current, catalog, not steam_running(), directory) + overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) native = native_targets(steam_root, set(apps) | set(picks) | set(managed) | set(native_choices)) @@ -1325,6 +1473,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non state["auto"] = {app: tool for app, tool in auto.items() if tool is not NATIVE_CHOICE} state["native_choices"] = sorted(app for app, tool in auto.items() if tool is NATIVE_CHOICE) state["picked"] = picked_after(current, changes) + state["games_applied"] = applied_game_requests(requests, overrides, state) state.pop("native", None) state["tools"] = catalog state.setdefault("default", default) @@ -1333,7 +1482,6 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non def depot_build(depot): - """The build number a depot's version file starts with; 0 when there is none.""" try: with open(os.path.join(depot, "version"), encoding="utf-8", errors="replace") as f: first = f.read().split(None, 1) @@ -1343,7 +1491,6 @@ def depot_build(depot): def find_source(steam_root, sources=SOURCES): - """The first of `sources` the client has downloaded, newest across the libraries holding it.""" for name in sources: found = [os.path.join(root, "steamapps", "common", name) for root in libraries(steam_root) if os.path.isdir(os.path.join(root, "steamapps", "common", name, "files", "bin-arm64"))] @@ -1353,7 +1500,6 @@ def find_source(steam_root, sources=SOURCES): def build_tool(tool_dir, depot, sources=SOURCES, name=TOOL): - """Our own manifests and the launcher, named after `depot`. The depot is run at launch time.""" if os.path.islink(tool_dir): os.unlink(tool_dir) elif os.path.isdir(tool_dir) and set(os.listdir(tool_dir)) - set(OWN_FILES): @@ -1382,7 +1528,6 @@ def remove_tool(tool_dir): def local_tools(steam_root): - """The names of the compatibility tools installed in steam_root/compatibilitytools.d.""" names = set() tools = os.path.join(steam_root, "compatibilitytools.d") try: @@ -1401,11 +1546,6 @@ def local_tools(steam_root): def x64_repoint(steam_root, tool, live=False): - """The x86-64 client (droiddeck-steam-x64): its tools are arm64 wrappers that script makes and - its Linux titles run as Linux builds (FEX), so only the entries the client aimed at a Proton it - cannot start are repointed, to `tool`. Tools in its own compatibilitytools.d are kept: the - wrappers include proton-cachyos-*-a64, which starts with "proton" like Valve's own. - Returns the app ids repointed.""" config = os.path.join(steam_root, "config", "config.vdf") if not tool or not os.path.isfile(config): return [] @@ -1422,7 +1562,6 @@ def x64_repoint(steam_root, tool, live=False): set_mapping(tokens, mapping, "0", tool) for app, name in current.items(): named = name.lower() - # A tool named arm64 is never this client's (its wrappers are -a64), so this legacy name is always repointed. legacy = named == "droiddeck-proton-arm64" if (named.startswith("proton") or legacy) and named != tool.lower() \ and (legacy or named not in keep): @@ -1433,7 +1572,6 @@ def x64_repoint(steam_root, tool, live=False): if text != serialize(tokenize(original)): write_changed(config, text) print("steam-compatibility: x86-64 client's Proton entries point at %s" % tool) - # Steam reads a mapping changed while it runs only at its next start; the session restarts it (.bl-compat-pending). if moved and live: with open(os.path.join(os.path.expanduser("~"), ".bl-compat-pending"), "a") as f: f.write("".join("%s\n" % a for a in moved)) diff --git a/tools/linuxfs/preload/clockpause.c b/tools/linuxfs/preload/clockpause.c new file mode 100644 index 000000000..19a1d728a --- /dev/null +++ b/tools/linuxfs/preload/clockpause.c @@ -0,0 +1,314 @@ +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/futex.h> +#include <pthread.h> +#include <semaphore.h> +#include <stdint.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/timerfd.h> +#include <time.h> +#include <unistd.h> + +#if defined(__aarch64__) || defined(BL_CLOCK_ANY_ARCH) + +#ifndef CP_CTL +#define CP_CTL "/tmp/.bl-clock" +#endif +#ifndef FUTEX_LOCK_PI2 +#define FUTEX_LOCK_PI2 13 +#endif +#define CP_FDS 65536 + +static const int64_t *cp_shift; +static int cp_state; +static size_t cp_cond_byte; +static unsigned char cp_cond_mask; +static unsigned char cp_fds[CP_FDS / 8]; + +static int (*cp_gettime)(clockid_t, struct timespec *); +static int (*cp_nanosleep)(clockid_t, int, const struct timespec *, struct timespec *); +static int (*cp_cond_timedwait)(pthread_cond_t *, pthread_mutex_t *, const struct timespec *); +static int (*cp_cond_clockwait)(pthread_cond_t *, pthread_mutex_t *, clockid_t, const struct timespec *); +static int (*cp_sem_clockwait)(sem_t *, clockid_t, const struct timespec *); +static int (*cp_mutex_clocklock)(pthread_mutex_t *, clockid_t, const struct timespec *); +static int (*cp_rdlock)(pthread_rwlock_t *, clockid_t, const struct timespec *); +static int (*cp_wrlock)(pthread_rwlock_t *, clockid_t, const struct timespec *); +static int (*cp_join)(pthread_t, void **, clockid_t, const struct timespec *); +static int (*cp_tfd_create)(int, int); +static int (*cp_tfd_settime)(int, int, const struct itimerspec *, struct itimerspec *); + +static void *cp_real(const char *name) { + return dlsym(RTLD_NEXT, name); +} + +#define CP_REAL(var, name) (var ? var : (var = cp_real(name))) + +static int cp_find_cond_bit(void) { + pthread_condattr_t attr; + pthread_cond_t mono, real; + const unsigned char *a = (const unsigned char *)&mono, *b = (const unsigned char *)ℜ + int found = 0; + memset(&mono, 0, sizeof(mono)); + memset(&real, 0, sizeof(real)); + if (pthread_condattr_init(&attr) != 0) return 0; + if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) == 0 && pthread_cond_init(&mono, &attr) == 0) { + if (pthread_cond_init(&real, NULL) == 0) { + for (size_t i = 0; i < sizeof(pthread_cond_t); i++) { + unsigned char diff = a[i] ^ b[i]; + if (!diff) continue; + if (found || (diff & (diff - 1))) { + found = -1; + break; + } + cp_cond_byte = i; + cp_cond_mask = diff; + found = 1; + } + pthread_cond_destroy(&real); + } + pthread_cond_destroy(&mono); + } + pthread_condattr_destroy(&attr); + return found == 1; +} + +static void cp_init(void) { + struct stat st; + void *map; + int fd; + if (strcmp(program_invocation_short_name, "plasmashell") != 0) return; + if (!cp_find_cond_bit()) return; + fd = open(CP_CTL, O_RDONLY | O_CLOEXEC); + if (fd < 0) return; + if (fstat(fd, &st) != 0 || st.st_size < (off_t)sizeof(int64_t)) { + close(fd); + return; + } + map = mmap(NULL, sizeof(int64_t), PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (map != MAP_FAILED) __atomic_store_n(&cp_shift, (const int64_t *)map, __ATOMIC_RELEASE); +} + +static int64_t cp_offset(void) { + const int64_t *shift; + int state = __atomic_load_n(&cp_state, __ATOMIC_ACQUIRE); + if (state == 0) { + int expected = 0; + if (__atomic_compare_exchange_n(&cp_state, &expected, 1, 0, __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE)) { + cp_init(); + __atomic_store_n(&cp_state, 2, __ATOMIC_RELEASE); + } + return 0; + } + if (state != 2) return 0; + shift = __atomic_load_n(&cp_shift, __ATOMIC_ACQUIRE); + if (!shift) return 0; + int64_t value = __atomic_load_n(shift, __ATOMIC_RELAXED); + return value > 0 ? value : 0; +} + +__attribute__((constructor)) static void cp_start(void) { + cp_offset(); +} + +static int cp_mono(clockid_t clock) { + return clock == CLOCK_MONOTONIC || clock == CLOCK_MONOTONIC_RAW || clock == CLOCK_MONOTONIC_COARSE; +} + +static void cp_move(struct timespec *ts, int64_t ns) { + int64_t total = (int64_t)ts->tv_nsec + ns % 1000000000LL; + ts->tv_sec += (time_t)(ns / 1000000000LL); + while (total < 0) { + total += 1000000000LL; + ts->tv_sec--; + } + while (total >= 1000000000LL) { + total -= 1000000000LL; + ts->tv_sec++; + } + ts->tv_nsec = (long)total; +} + +static const struct timespec *cp_later(const struct timespec *ts, struct timespec *out, int64_t shift) { + if (!ts || !shift) return ts; + *out = *ts; + cp_move(out, shift); + return out; +} + +static void cp_mark(int fd, int mono) { + if (fd < 0 || fd >= CP_FDS) return; + if (mono) __atomic_or_fetch(&cp_fds[fd / 8], (unsigned char)(1u << (fd % 8)), __ATOMIC_RELAXED); + else __atomic_and_fetch(&cp_fds[fd / 8], (unsigned char)~(1u << (fd % 8)), __ATOMIC_RELAXED); +} + +static int cp_marked(int fd) { + return fd >= 0 && fd < CP_FDS && (__atomic_load_n(&cp_fds[fd / 8], __ATOMIC_RELAXED) & (1u << (fd % 8))); +} + +static int cp_cond_mono(const pthread_cond_t *cond) { + return (((const volatile unsigned char *)cond)[cp_cond_byte] & cp_cond_mask) != 0; +} + +int clock_gettime(clockid_t clock, struct timespec *ts) { + if (!CP_REAL(cp_gettime, "clock_gettime")) { + errno = ENOSYS; + return -1; + } + int rc = cp_gettime(clock, ts); + if (rc == 0 && cp_mono(clock)) { + int64_t shift = cp_offset(); + if (shift) cp_move(ts, -shift); + } + return rc; +} + +int clock_nanosleep(clockid_t clock, int flags, const struct timespec *req, struct timespec *rem) { + struct timespec moved; + if (!CP_REAL(cp_nanosleep, "clock_nanosleep")) return ENOSYS; + if ((flags & TIMER_ABSTIME) && cp_mono(clock)) req = cp_later(req, &moved, cp_offset()); + return cp_nanosleep(clock, flags, req, rem); +} + +int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_cond_timedwait, "pthread_cond_timedwait")) return ENOSYS; + int64_t shift = cp_offset(); + if (shift && cp_cond_mono(cond)) abstime = cp_later(abstime, &moved, shift); + return cp_cond_timedwait(cond, mutex, abstime); +} + +int pthread_cond_clockwait(pthread_cond_t *cond, pthread_mutex_t *mutex, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_cond_clockwait, "pthread_cond_clockwait")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_cond_clockwait(cond, mutex, clock, abstime); +} + +int sem_clockwait(sem_t *sem, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_sem_clockwait, "sem_clockwait")) { + errno = ENOSYS; + return -1; + } + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_sem_clockwait(sem, clock, abstime); +} + +int pthread_mutex_clocklock(pthread_mutex_t *mutex, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_mutex_clocklock, "pthread_mutex_clocklock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_mutex_clocklock(mutex, clock, abstime); +} + +int pthread_rwlock_clockrdlock(pthread_rwlock_t *lock, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_rdlock, "pthread_rwlock_clockrdlock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_rdlock(lock, clock, abstime); +} + +int pthread_rwlock_clockwrlock(pthread_rwlock_t *lock, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_wrlock, "pthread_rwlock_clockwrlock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_wrlock(lock, clock, abstime); +} + +int pthread_clockjoin_np(pthread_t thread, void **result, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_join, "pthread_clockjoin_np")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_join(thread, result, clock, abstime); +} + +int timerfd_create(int clock, int flags) { + if (!CP_REAL(cp_tfd_create, "timerfd_create")) { + errno = ENOSYS; + return -1; + } + int fd = cp_tfd_create(clock, flags); + cp_mark(fd, cp_mono(clock)); + return fd; +} + +static const struct itimerspec *cp_timer(int fd, int flags, const struct itimerspec *value, struct itimerspec *out) { + int64_t shift; + if (!value || !(flags & TFD_TIMER_ABSTIME) || !cp_marked(fd)) return value; + if ((value->it_value.tv_sec == 0 && value->it_value.tv_nsec == 0) || !(shift = cp_offset())) return value; + *out = *value; + cp_move(&out->it_value, shift); + return out; +} + +int timerfd_settime(int fd, int flags, const struct itimerspec *value, struct itimerspec *old) { + struct itimerspec moved; + if (!CP_REAL(cp_tfd_settime, "timerfd_settime")) { + errno = ENOSYS; + return -1; + } + return cp_tfd_settime(fd, flags, cp_timer(fd, flags, value, &moved), old); +} + +__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { + struct timespec moved; + struct itimerspec timer; + int64_t shift; + if (number == SYS_clock_gettime) { + *ret = real(number, args[0], args[1]); + if (*ret == 0 && args[1] && cp_mono((clockid_t)args[0]) && (shift = cp_offset())) + cp_move((struct timespec *)args[1], -shift); + return 1; + } + if (number == SYS_timerfd_create) { + *ret = real(number, args[0], args[1]); + cp_mark((int)*ret, cp_mono((clockid_t)args[0])); + return 1; + } + if (number == SYS_timerfd_settime) { + const struct itimerspec *value = cp_timer((int)args[0], (int)args[1], (const struct itimerspec *)args[2], &timer); + if (value == (const struct itimerspec *)args[2]) return 0; + *ret = real(number, args[0], args[1], (long)value, args[3]); + return 1; + } + if (number == SYS_clock_nanosleep) { + if (!((int)args[1] & TIMER_ABSTIME) || !cp_mono((clockid_t)args[0]) || !args[2] || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], (long)cp_later((const struct timespec *)args[2], &moved, shift), args[3]); + return 1; + } + if (number == SYS_futex) { + int op = (int)args[1]; + int cmd = op & FUTEX_CMD_MASK; + if (op & FUTEX_CLOCK_REALTIME) return 0; + if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && cmd != FUTEX_LOCK_PI2) return 0; + if (!args[3] || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], args[2], (long)cp_later((const struct timespec *)args[3], &moved, shift), args[4], args[5]); + return 1; + } +#ifdef SYS_futex_waitv + if (number == SYS_futex_waitv) { + if (!args[3] || (clockid_t)args[4] != CLOCK_MONOTONIC || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], args[2], (long)cp_later((const struct timespec *)args[3], &moved, shift), args[4]); + return 1; + } +#endif + return 0; +} + +#else + +__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { + (void)number; + (void)args; + (void)real; + (void)ret; + return 0; +} + +#endif diff --git a/tools/linuxfs/preload/inputudev.c b/tools/linuxfs/preload/inputudev.c index 4960c382d..eb78ce1ef 100644 --- a/tools/linuxfs/preload/inputudev.c +++ b/tools/linuxfs/preload/inputudev.c @@ -178,10 +178,6 @@ static int caller_is_winebus(void *caller) { return strstr(info.dli_fname, "winebus.so") != NULL; } -/* Wine's HID haptics give every XInput rumble a 1000 ms cutoff and xinput only writes on a change, - * but XInput motors hold their speed until the next XInputSetState; evdev's length 0 holds until - * stopped. Only this library, preloaded first, sees winebus as the caller. The length is put back - * because winebus compares its copy with the next state to decide whether to upload again. */ __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) { diff --git a/tools/linuxfs/preload/netif.c b/tools/linuxfs/preload/netif.c index 1782d0f0d..872a877e1 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/noexec.c b/tools/linuxfs/preload/noexec.c index ef7c64b8b..5f8ab74f3 100644 --- a/tools/linuxfs/preload/noexec.c +++ b/tools/linuxfs/preload/noexec.c @@ -43,7 +43,7 @@ __attribute__((constructor)) static void noexec_init(void) { real_mprotect = (int (*)(void *, size_t, int))dlsym(RTLD_NEXT, "mprotect"); } -static int private_file_mapping(uintptr_t start, uintptr_t end) { +static int private_file_mapping(uintptr_t start, uintptr_t end, int *original_prot) { int fd = (int)syscall(SYS_openat, AT_FDCWD, "/proc/self/maps", O_RDONLY | O_CLOEXEC); if (fd < 0) return 0; char buf[4096], line[1024]; @@ -67,6 +67,9 @@ static int private_file_mapping(uintptr_t start, uintptr_t end) { char *path = strchr(perms, '/'); struct statvfs vfs; found = path && !(statvfs(path, &vfs) == 0 && (vfs.f_flag & ST_NOEXEC)); + if (found) *original_prot = (perms[0] == 'r' ? PROT_READ : 0) | + (perms[1] == 'w' ? PROT_WRITE : 0) | + (perms[2] == 'x' ? PROT_EXEC : 0); } } syscall(SYS_close, fd); @@ -119,12 +122,11 @@ static int write_all(int fd, const unsigned char *p, size_t len) { static int rebake_shared(void *addr, size_t len, int prot) { const char *directory = rx_directory(); size_t directory_len = strlen(directory); - if (!directory_len || directory_len + 40 >= PATH_MAX) return -1; + if (!directory_len || directory_len + 52 >= PATH_MAX) return -1; char path[PATH_MAX], staged[PATH_MAX]; char *end = path + directory_len; memcpy(path, directory, directory_len); if (end[-1] != '/') *end++ = '/'; - *end++ = '/'; end = put_hex(end, fnv1a(addr, len)); *end++ = '-'; end = put_hex(end, len); @@ -155,16 +157,20 @@ static int rebake_shared(void *addr, size_t len, int prot) { return mapped == (long)addr ? 0 : -1; } -static int rebake(void *addr, size_t len, int prot) { +static int rebake(void *addr, size_t len, int prot, int original_prot) { size_t page = getauxval(AT_PAGESZ); if (page) len = (len + page - 1) & ~(page - 1); if (real_mprotect(addr, len, PROT_READ)) return -1; if (!rebake_shared(addr, len, prot)) return 0; void *copy = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (copy == MAP_FAILED) return -1; + if (copy == MAP_FAILED) { + real_mprotect(addr, len, original_prot); + return -1; + } memcpy(copy, addr, len); if (mmap(addr, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) == MAP_FAILED) { munmap(copy, len); + real_mprotect(addr, len, original_prot); return -1; } memcpy(addr, copy, len); @@ -179,8 +185,12 @@ int mprotect(void *addr, size_t len, int prot) { if (result && errno == EACCES && (prot & PROT_EXEC)) { if (in_fex()) { result = real_mprotect(addr, len, prot & ~PROT_EXEC); - } else if (len && private_file_mapping((uintptr_t)addr, (uintptr_t)addr + len)) { - result = rebake(addr, len, prot); + } else { + int original_prot; + if (len && (uintptr_t)addr <= UINTPTR_MAX - len && + private_file_mapping((uintptr_t)addr, (uintptr_t)addr + len, &original_prot)) { + result = rebake(addr, len, prot, original_prot); + } } if (result) errno = EACCES; } diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index b920b49f9..7454ce15d 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -17,6 +17,7 @@ #include <sys/syscall.h> #include <sys/timerfd.h> #include <time.h> +#include <ucontext.h> #include <unistd.h> struct ns_sem_args { @@ -68,12 +69,13 @@ struct ns_wait_args { #define NS_PROCS 256u #define NS_FDS 65536 #define NS_DEVS 8 -#define NS_VERSION 1u +#define NS_VERSION 2u #define NS_HEAD_MAGIC 0x31434e5953544e44ull #define NS_DEV_MAGIC 0x4e54445600000000ull #define NS_OBJ_MAGIC 0x27ull #define NS_WAITERS 0x80000000u #define NS_SWEEP_NS 2000000000ull +#define NS_SPIN_NS 4000ull #define NS_DEAD 0xffffffffu #ifndef CLOSE_RANGE_CLOEXEC @@ -144,6 +146,7 @@ struct ns_q { uint32_t waiting; uint32_t inuse; uint32_t next_free; + uint32_t sleeping; struct ns_ent ent[NS_ENTS]; }; @@ -168,6 +171,7 @@ struct ns_tls { struct ns_dev *d; uint32_t q; int waiting; + int sleep; }; static struct ns_dev ns_devs[NS_DEVS]; @@ -255,19 +259,148 @@ static void ns_unlock(uint32_t *w) { } } -static void ns_block(sigset_t *old) { - sigset_t s; - sigfillset(&s); - sigdelset(&s, SIGSEGV); - sigdelset(&s, SIGBUS); - sigdelset(&s, SIGILL); - sigdelset(&s, SIGFPE); - sigdelset(&s, SIGTRAP); - pthread_sigmask(SIG_BLOCK, &s, old); +#define NS_DEFER 4 +#define NS_LEVELS 8 + +struct ns_cs { + int depth; + int count; + int level; + unsigned held_levels; + int sigs[NS_DEFER]; + siginfo_t info[NS_DEFER]; + sigset_t held[NS_LEVELS]; +}; + +static __thread struct ns_cs ns_cs; +static uintptr_t ns_handlers[_NSIG]; +static uint8_t ns_siginfo[_NSIG]; + +int bl_from_ntdll(const void *caller) __attribute__((visibility("hidden"))); + +static int ns_deferrable(int sig) { + return sig > 0 && sig < _NSIG && sig != SIGKILL && sig != SIGSTOP && sig != SIGSEGV && sig != SIGBUS && sig != SIGILL + && sig != SIGFPE && sig != SIGTRAP && sig != SIGSYS; } -static void ns_restore(const sigset_t *old) { - pthread_sigmask(SIG_SETMASK, old, NULL); +static int ns_defer(int sig, const siginfo_t *si) { + struct ns_cs *cs = &ns_cs; + if (sig < SIGRTMIN) + for (int i = 0; i < NS_DEFER; i++) + if (__atomic_load_n(&cs->sigs[i], __ATOMIC_RELAXED) == sig) return 1; + int i = __atomic_fetch_add(&cs->count, 1, __ATOMIC_RELAXED); + if (i >= NS_DEFER) { + __atomic_fetch_sub(&cs->count, 1, __ATOMIC_RELAXED); + return 0; + } + if (si) memcpy(&cs->info[i], si, sizeof(*si)); + else memset(&cs->info[i], 0, sizeof(*si)); + __atomic_signal_fence(__ATOMIC_SEQ_CST); + __atomic_store_n(&cs->sigs[i], sig, __ATOMIC_RELAXED); + return 1; +} + +static int ns_park(int sig, const siginfo_t *si, ucontext_t *uc) { + int level = ns_cs.level; + if (level < 0 || level >= NS_LEVELS) return 0; + sigset_t one; + sigemptyset(&one); + sigaddset(&one, sig); + int saved = errno; + pthread_sigmask(SIG_BLOCK, &one, NULL); + pid_t pid = getpid(), tid = (pid_t)ns_self(); + int ok = (si && syscall(SYS_rt_tgsigqueueinfo, pid, tid, sig, si) == 0) || syscall(SYS_tgkill, pid, tid, sig) == 0; + if (!ok) pthread_sigmask(SIG_UNBLOCK, &one, NULL); + errno = saved; + if (!ok) return 0; + sigaddset(&uc->uc_sigmask, sig); + unsigned long *words = (unsigned long *)&ns_cs.held[level]; + unsigned bits = 8 * sizeof(unsigned long); + __atomic_fetch_or(&words[(unsigned)(sig - 1) / bits], 1ul << ((unsigned)(sig - 1) % bits), __ATOMIC_RELAXED); + __atomic_fetch_or(&ns_cs.held_levels, 1u << level, __ATOMIC_RELAXED); + return 1; +} + +static void ns_trampoline(int sig, siginfo_t *si, void *uc) { + if (__atomic_load_n(&ns_cs.depth, __ATOMIC_RELAXED) > 0 && (ns_defer(sig, si) || (uc && ns_park(sig, si, uc)))) return; + uintptr_t h = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); + if (!h) return; + ns_cs.level++; + __atomic_signal_fence(__ATOMIC_SEQ_CST); + if (__atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED)) ((void (*)(int, siginfo_t *, void *))h)(sig, si, uc); + else ((void (*)(int))h)(sig); + __atomic_signal_fence(__ATOMIC_SEQ_CST); + ns_cs.level--; +} + +static void ns_flush(void) { + struct ns_cs *cs = &ns_cs; + sigset_t all, mask; + sigfillset(&all); + int saved = errno; + pthread_sigmask(SIG_BLOCK, &all, &mask); + int n = cs->count < NS_DEFER ? cs->count : NS_DEFER; + pid_t pid = getpid(), tid = (pid_t)ns_self(); + for (int i = 0; i < n; i++) + if (cs->sigs[i] > 0 && syscall(SYS_rt_tgsigqueueinfo, pid, tid, cs->sigs[i], &cs->info[i]) != 0) syscall(SYS_tgkill, pid, tid, cs->sigs[i]); + memset(cs->sigs, 0, sizeof(cs->sigs)); + cs->count = 0; + int level = cs->level; + if (level >= 0 && level < NS_LEVELS && (cs->held_levels & (1u << level))) { + for (int sig = 1; sig < _NSIG; sig++) + if (sigismember(&cs->held[level], sig) == 1) sigdelset(&mask, sig); + sigemptyset(&cs->held[level]); + cs->held_levels &= ~(1u << level); + } + pthread_sigmask(SIG_SETMASK, &mask, NULL); + errno = saved; +} + +static void ns_block(void) { + ns_cs.depth++; + __atomic_signal_fence(__ATOMIC_SEQ_CST); +} + +static void ns_restore(void) { + __atomic_signal_fence(__ATOMIC_SEQ_CST); + if (--ns_cs.depth == 0) { + __atomic_signal_fence(__ATOMIC_SEQ_CST); + if (ns_cs.count || (ns_cs.held_levels && ns_cs.level >= 0 && ns_cs.level < NS_LEVELS && (ns_cs.held_levels & (1u << ns_cs.level)))) + ns_flush(); + } +} + +int sigaction(int sig, const struct sigaction *act, struct sigaction *old) { + static int (*real)(int, const struct sigaction *, struct sigaction *); + if (!real) real = (int (*)(int, const struct sigaction *, struct sigaction *))dlsym(RTLD_NEXT, "sigaction"); + if (!real) { + errno = ENOSYS; + return -1; + } + if (!ns_deferrable(sig) || !ns_on()) return real(sig, act, old); + uintptr_t prev = __atomic_load_n(&ns_handlers[sig], __ATOMIC_ACQUIRE); + uint8_t prev_info = __atomic_load_n(&ns_siginfo[sig], __ATOMIC_RELAXED); + struct sigaction mine; + const struct sigaction *use = act; + if (act && act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN && !(act->sa_flags & SA_RESETHAND) && + bl_from_ntdll(__builtin_return_address(0))) { + mine = *act; + mine.sa_sigaction = ns_trampoline; + mine.sa_flags |= SA_SIGINFO; + __atomic_store_n(&ns_siginfo[sig], (act->sa_flags & SA_SIGINFO) ? 1 : 0, __ATOMIC_RELAXED); + __atomic_store_n(&ns_handlers[sig], (uintptr_t)act->sa_sigaction, __ATOMIC_RELEASE); + use = &mine; + } + int r = real(sig, use, old); + if (r != 0 && use == &mine) { + __atomic_store_n(&ns_siginfo[sig], prev_info, __ATOMIC_RELAXED); + __atomic_store_n(&ns_handlers[sig], prev, __ATOMIC_RELEASE); + } + if (r == 0 && old && old->sa_sigaction == ns_trampoline) { + old->sa_sigaction = (void (*)(int, siginfo_t *, void *))prev; + if (!prev_info) old->sa_flags &= ~SA_SIGINFO; + } + return r; } static inline struct ns_obj *ns_obj(struct ns_head *h, uint32_t s) { @@ -378,10 +511,11 @@ static int ns_claim(struct ns_q *q, int32_t index) { if (dead) return 0; } int32_t want = -1; - return __atomic_compare_exchange_n(&q->signaled, &want, index, 0, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); + return __atomic_compare_exchange_n(&q->signaled, &want, index, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED); } static void ns_wake(struct ns_q *q) { + if (!__atomic_load_n(&q->sleeping, __ATOMIC_SEQ_CST)) return; int saved = errno; ns_futex(&q->signaled, FUTEX_WAKE, 1, NULL, 0); errno = saved; @@ -618,14 +752,13 @@ static void ns_dev_put_locked(struct ns_dev *d) { static void ns_dev_put(struct ns_dev *d) { if (__atomic_sub_fetch(&d->refs, 1, __ATOMIC_ACQ_REL)) return; - sigset_t old; int saved = errno; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); uint32_t zero = 0; if (d->h && __atomic_compare_exchange_n(&d->refs, &zero, NS_DEAD, 0, __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE)) ns_release(d); pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); errno = saved; } @@ -682,20 +815,18 @@ static void ns_forget_locked(int fd) { } static void ns_forget(int fd) { - sigset_t old; int saved = errno; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); ns_forget_locked(fd); pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); errno = saved; } static uint64_t ns_adopt(struct ns_dev *d, uint32_t tag, int fd, uint32_t gen, uint32_t s) { uint64_t e = 0; - sigset_t old; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); if (!d->h || d->tag != tag || !ns_table() || ns_attach(d) < 0 || s >= NS_SLOTS) goto out; if ((e = __atomic_load_n(&ns_fdt[fd], __ATOMIC_ACQUIRE))) goto out; @@ -710,7 +841,7 @@ static uint64_t ns_adopt(struct ns_dev *d, uint32_t tag, int fd, uint32_t gen, u ns_unlock(&o->lock); out: pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); return e; } @@ -719,8 +850,7 @@ static uint64_t ns_note_device(int fd) { uint64_t e = 0; if (syscall(SYS_fstat, fd, &st) != 0 || !S_ISREG(st.st_mode)) return 0; if (((uint64_t)st.st_size & ~0xffffull) != NS_DEV_MAGIC) return 0; - sigset_t old; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); struct ns_dev *d = ns_table() ? ns_map(fd, (uint32_t)st.st_size & 0xffff, (uint64_t)st.st_ino) : NULL; if (d) { @@ -732,7 +862,7 @@ static uint64_t ns_note_device(int fd) { } } pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); return e; } @@ -773,15 +903,14 @@ static int ns_ready(struct ns_dev *d) { static void ns_thread_gone(void *p) { struct ns_tls *t = p; - if (!t || !t->d || !t->q) return; - sigset_t old; + if (!t || !t->d) return; struct ns_dev *d = t->d; - ns_block(&old); - ns_free_q(d->h, t->q - 1); + ns_block(); + if (t->q) ns_free_q(d->h, t->q - 1); t->q = 0; t->waiting = 0; t->d = NULL; - ns_restore(&old); + ns_restore(); ns_dev_put(d); } @@ -789,24 +918,28 @@ static void ns_key_init(void) { pthread_key_create(&ns_key, ns_thread_gone); } -static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { - struct ns_head *h = d->h; - if (ns_tq.d && ns_tq.q && ns_tq.waiting) { - ns_drop_q(ns_tq.d->h, ns_tq.q - 1); - ns_tq.waiting = 0; - } - if (ns_tq.d == d && ns_tq.q) { - *qi = ns_tq.q - 1; - return ns_q(h, *qi); - } - if (ns_tq.d && ns_tq.q) { - struct ns_dev *old = ns_tq.d; - ns_free_q(old->h, ns_tq.q - 1); +static int ns_hold(struct ns_dev *d) { + if (ns_tq.d == d) return 1; + if (!ns_dev_get(d)) return 0; + if (ns_tq.sleep) return 2; + struct ns_dev *old = ns_tq.d; + if (old) { + ns_block(); + if (ns_tq.q) ns_free_q(old->h, ns_tq.q - 1); ns_tq.q = 0; + ns_tq.waiting = 0; ns_tq.d = NULL; + ns_restore(); ns_dev_put(old); } pthread_once(&ns_once, ns_key_init); + ns_tq.d = d; + pthread_setspecific(ns_key, &ns_tq); + return 1; +} + +static struct ns_q *ns_new_q(struct ns_dev *d, uint32_t *qi) { + struct ns_head *h = d->h; uint32_t i; if (!ns_pop(h, &h->q_free, 0, &i) && !ns_grow(&h->q_hwm, NS_QS, &i)) { ns_sweep_dead(h); @@ -815,22 +948,35 @@ static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { struct ns_q *q = ns_q(h, i); q->proc = (uint32_t)d->proc; q->waiting = 0; + q->sleeping = 0; q->inuse = 1; - __atomic_add_fetch(&d->refs, 1, __ATOMIC_ACQ_REL); - ns_tq.d = d; - ns_tq.q = i + 1; - ns_tq.waiting = 0; - pthread_setspecific(ns_key, &ns_tq); *qi = i; return q; } +static struct ns_q *ns_thread_q(struct ns_dev *d, uint32_t *qi) { + struct ns_head *h = d->h; + if (ns_tq.d != d) return NULL; + if (ns_tq.q && ns_tq.waiting) { + ns_drop_q(h, ns_tq.q - 1); + ns_tq.waiting = 0; + } + if (ns_tq.q) { + *qi = ns_tq.q - 1; + return ns_q(h, *qi); + } + struct ns_q *q = ns_new_q(d, qi); + if (!q) return NULL; + ns_tq.q = *qi + 1; + ns_tq.waiting = 0; + return q; +} + static int ns_create(struct ns_dev *d, int type, uint32_t a, uint32_t b) { struct ns_head *h = d->h; - sigset_t old; int fd = -1, err = 0; uint32_t s = 0; - ns_block(&old); + ns_block(); pthread_mutex_lock(&ns_mx); if (!ns_table() || ns_attach(d) < 0) { err = ENOMEM; @@ -879,7 +1025,7 @@ static int ns_create(struct ns_dev *d, int type, uint32_t a, uint32_t b) { ns_unlock(&o->lock); out: pthread_mutex_unlock(&ns_mx); - ns_restore(&old); + ns_restore(); if (fd < 0) errno = err; return fd; } @@ -890,6 +1036,20 @@ static int ns_expired(const struct ns_wait_args *args) { return (uint64_t)now.tv_sec * 1000000000ull + (uint64_t)now.tv_nsec >= args->timeout; } +static uint64_t ns_now(void) { + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000000000ull + (uint64_t)now.tv_nsec; +} + +static void ns_spin(struct ns_q *q) { + uint64_t end = ns_now() + NS_SPIN_NS; + for (unsigned i = 1; __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1; i++) { + ns_relax(); + if (!(i & 63) && ns_now() >= end) return; + } +} + static int ns_sleep(struct ns_q *q, const struct ns_wait_args *args) { struct timespec ts, *tsp = NULL; int op = FUTEX_WAIT_BITSET | ((args->flags & NS_WAIT_REALTIME) ? FUTEX_CLOCK_REALTIME : 0); @@ -898,14 +1058,45 @@ static int ns_sleep(struct ns_q *q, const struct ns_wait_args *args) { ts.tv_nsec = (long)(args->timeout % 1000000000ull); tsp = &ts; } - while (__atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1) { - if (tsp && ns_expired(args)) return ETIMEDOUT; - if (ns_futex(&q->signaled, op, (uint32_t)-1, tsp, FUTEX_BITSET_MATCH_ANY) == -1) { - if (errno == ETIMEDOUT) return ETIMEDOUT; - if (errno == EINTR) return EINTR; - } + ns_spin(q); + int ret = 0; + __atomic_store_n(&q->sleeping, 1, __ATOMIC_SEQ_CST); + while (!ret && __atomic_load_n(&q->signaled, __ATOMIC_SEQ_CST) == -1) { + if (tsp && ns_expired(args)) ret = ETIMEDOUT; + else if (ns_futex(&q->signaled, op, (uint32_t)-1, tsp, FUTEX_BITSET_MATCH_ANY) == -1 && (errno == ETIMEDOUT || errno == EINTR)) + ret = errno; } - return 0; + __atomic_store_n(&q->sleeping, 0, __ATOMIC_RELAXED); + return ret; +} + +static int ns_try_any(struct ns_head *h, const uint32_t *slots, const uint32_t *gens, uint32_t total, uint32_t owner, int *dead) { + for (uint32_t i = 0; i < total; i++) { + struct ns_obj *o = ns_obj(h, slots[i]); + ns_lock(&o->lock); + int busy = o->type == NS_FREE || o->gen != gens[i] || o->any_head || o->all_hint; + if (!busy && ns_signaled(o, owner)) { + switch (o->type) { + case NS_SEM: + o->a--; + break; + case NS_MUTEX: + *dead = (int)o->ownerdead; + o->ownerdead = 0; + o->a++; + o->b = owner; + break; + case NS_EVENT: + if (!o->a) o->b = 0; + break; + } + ns_unlock(&o->lock); + return (int)i; + } + ns_unlock(&o->lock); + if (busy) return -1; + } + return -2; } static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { @@ -927,12 +1118,24 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { for (uint32_t j = 0; j < i; j++) if (slots[j] == slots[i]) return EINVAL; } - sigset_t old; - ns_block(&old); + int nested = ns_tq.sleep > 0; + ns_block(); + if (!all && (nested || !ns_tq.waiting)) { + int dead = 0, got = ns_try_any(h, slots, gens, total, args.owner, &dead); + if (got >= 0) { + ns_restore(); + ua->index = (uint32_t)got; + return dead ? EOWNERDEAD : 0; + } + if (got == -2 && args.timeout != UINT64_MAX && ns_expired(&args)) { + ns_restore(); + return ETIMEDOUT; + } + } uint32_t qi; - struct ns_q *q = ns_ready(d) ? ns_thread_q(d, &qi) : NULL; + struct ns_q *q = !ns_ready(d) ? NULL : nested ? ns_new_q(d, &qi) : ns_thread_q(d, &qi); if (!q) { - ns_restore(&old); + ns_restore(); return ENOMEM; } ns_maybe_sweep(h); @@ -952,7 +1155,7 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } q->total = total; q->waiting = 1; - ns_tq.waiting = 1; + if (!nested) ns_tq.waiting = 1; int bad = 0; if (!all) { for (uint32_t i = 0; i < total && !bad; i++) { @@ -1004,16 +1207,18 @@ static int ns_wait(struct ns_dev *d, struct ns_wait_args *ua, int all) { } int ret = 0; if (!bad && __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE) == -1) { - sigset_t held; - ns_restore(&old); + ns_tq.sleep++; + ns_restore(); ret = ns_sleep(q, &args); - ns_block(&held); + ns_block(); + ns_tq.sleep--; } ns_drop_q(h, qi); - ns_tq.waiting = 0; + if (!nested) ns_tq.waiting = 0; int32_t got = __atomic_load_n(&q->signaled, __ATOMIC_ACQUIRE); int dead = (int)q->ownerdead; - ns_restore(&old); + if (nested) ns_free_q(h, qi); + ns_restore(); if (bad) return EINVAL; if (got != -1) { ua->index = (uint32_t)got; @@ -1061,12 +1266,11 @@ static int ns_obj_ioctl(struct ns_dev *d, uint64_t e, unsigned long req, void *a return ENOTTY; } if (type != (uint32_t)want) return EINVAL; - sigset_t old; - ns_block(&old); + ns_block(); int all = ns_lock_obj(h, o); if (o->type != (uint32_t)want || o->gen != gen) { ns_unlock_obj(h, o, all); - ns_restore(&old); + ns_restore(); return EINVAL; } switch (req) { @@ -1133,7 +1337,7 @@ static int ns_obj_ioctl(struct ns_dev *d, uint64_t e, unsigned long req, void *a } } ns_unlock_obj(h, o, all); - ns_restore(&old); + ns_restore(); if (ret) return ret; if (req == NS_SEM_RELEASE || req == NS_EVENT_SET || req == NS_EVENT_RESET || req == NS_EVENT_PULSE) memcpy(arg, &prev, sizeof(prev)); @@ -1176,9 +1380,10 @@ int bl_ntsync_ioctl(int fd, unsigned long req, void *arg, int *rc) { uint64_t e = ns_lookup(fd); if (!e) return 0; struct ns_dev *d = &ns_devs[(e >> 56) & 7]; - if (!ns_dev_get(d)) return 0; + int held = ns_hold(d); + if (!held) return 0; int out = 0, err = (e & NS_E_DEVICE) ? ns_dev_ioctl(d, req, arg, &out) : ns_obj_ioctl(d, e, req, arg); - ns_dev_put(d); + if (held == 2) ns_dev_put(d); if (err) { errno = err; *rc = -1; @@ -1254,13 +1459,22 @@ 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); + int saved = errno; + int mode = fd >= 0 ? fcntl(fd, F_GETFL) : -1; + int r = ns_close_fd(fd); + if (r < 0 && errno == EIO && mode >= 0 && (mode & O_ACCMODE) == O_RDONLY) { + errno = saved; + return 0; + } + return r; } int dup2(int oldfd, int newfd) { diff --git a/tools/linuxfs/preload/opens.c b/tools/linuxfs/preload/opens.c index 269f01391..332f9d89a 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/owner.c b/tools/linuxfs/preload/owner.c new file mode 100644 index 000000000..d4e42964c --- /dev/null +++ b/tools/linuxfs/preload/owner.c @@ -0,0 +1,41 @@ +#define _GNU_SOURCE +#include <errno.h> +#include <limits.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/statfs.h> +#include <unistd.h> + +#define FUSE_MAGIC 0x65735546 +#define SDCARDFS_MAGIC 0x5dca2df5 + +static int is_wineserver(void) { + static int cached = -1; + char exe[PATH_MAX]; + const char *base; + ssize_t n; + + if (cached >= 0) return cached; + n = readlink("/proc/self/exe", exe, sizeof(exe) - 1); + if (n <= 0) { + cached = 0; + return cached; + } + exe[n] = '\0'; + base = strrchr(exe, '/'); + cached = strcmp(base ? base + 1 : exe, "wineserver") == 0; + return cached; +} + +__attribute__((visibility("hidden"))) +void bl_storage_owner(int fd, struct stat *st) { + struct statfs fs; + int saved = errno; + uid_t uid; + + if (st != NULL && is_wineserver()) { + uid = getuid(); + if (st->st_uid != uid && fstatfs(fd, &fs) == 0 && (fs.f_type == FUSE_MAGIC || fs.f_type == SDCARDFS_MAGIC)) st->st_uid = uid; + } + errno = saved; +} diff --git a/tools/linuxfs/preload/pathcache.c b/tools/linuxfs/preload/pathcache.c index 7fd4c630a..928fd7d24 100644 --- a/tools/linuxfs/preload/pathcache.c +++ b/tools/linuxfs/preload/pathcache.c @@ -139,17 +139,31 @@ static int (*next_faccessat(void))(int, const char *, int, int) { } __attribute__((visibility("hidden"))) int bl_binfmt_runnable(const char *path, int mode); +__attribute__((visibility("hidden"))) int bl_writable_access(int dirfd, const char *path, int mode, int flags); + +static int writable_as_owner(int (*real)(int, const char *, int, int), int dirfd, const char *path, int mode, int flags) { + if (!bl_writable_access(dirfd, path, mode, flags)) return -1; + if ((mode & ~W_OK) == 0 || real(dirfd, path, mode & ~W_OK, flags) == 0) return 0; + return -1; +} static int check_cwd(const char *path, int mode, int flags) { int (*real)(int, const char *, int, int) = next_faccessat(); int result; + int err; if (real == NULL) { errno = ENOSYS; return -1; } result = real(AT_FDCWD, path, mode, flags); - return result != 0 && errno == EACCES && bl_binfmt_runnable(path, mode) ? 0 : result; + if (result == 0) return 0; + err = errno; + if (err == EACCES && bl_binfmt_runnable(path, mode)) return 0; + errno = err; + if (writable_as_owner(real, AT_FDCWD, path, mode, flags) == 0) return 0; + errno = err; + return result; } int access(const char *path, int mode) { @@ -166,6 +180,7 @@ int eaccess(const char *path, int mode) { int faccessat(int dirfd, const char *path, int mode, int flags) { int (*real)(int, const char *, int, int); + int err; if (dirfd == AT_FDCWD) { return cached_access(path, mode, flags, check_cwd); @@ -175,5 +190,9 @@ int faccessat(int dirfd, const char *path, int mode, int flags) { errno = ENOSYS; return -1; } - return real(dirfd, path, mode, flags); + if (real(dirfd, path, mode, flags) == 0) return 0; + err = errno; + if (writable_as_owner(real, dirfd, path, mode, flags) == 0) return 0; + errno = err; + return -1; } diff --git a/tools/linuxfs/preload/perms.c b/tools/linuxfs/preload/perms.c index 685f15384..e90bad6fe 100644 --- a/tools/linuxfs/preload/perms.c +++ b/tools/linuxfs/preload/perms.c @@ -3,6 +3,7 @@ #include <fcntl.h> #include <limits.h> #include <string.h> +#include <strings.h> #include <sys/stat.h> #include <unistd.h> @@ -23,6 +24,34 @@ static int is_steam_client(void) { return cached; } +static int wine_name(const char *path) { + const char *base; + size_t n; + + if (path == NULL) return 0; + base = strrchr(path, '/'); + base = base ? base + 1 : path; + n = strlen(path); + return strncmp(base, "wine", 4) == 0 || strstr(path, "/lib/wine/") != NULL + || (n > 4 && strcasecmp(path + n - 4, ".exe") == 0); +} + +static int is_wine(void) { + static int cached = -1; + char exe[PATH_MAX]; + ssize_t n; + + if (cached >= 0) return cached; + n = readlink("/proc/self/exe", exe, sizeof(exe) - 1); + if (n > 0) exe[n] = '\0'; + cached = (n > 0 && wine_name(exe)) || wine_name(program_invocation_name); + return cached; +} + +static int acts_as_root(void) { + return is_steam_client() || !is_wine(); +} + static int grant_owner_write(int dirfd, const char *path) { struct stat st; @@ -37,7 +66,7 @@ int bl_writable_retry(int dirfd, const char *path, int flags) { char parent[PATH_MAX]; const char *slash; - if (saved != EACCES || path == NULL || (flags & O_ACCMODE) == O_RDONLY || !is_steam_client()) return 0; + if (saved != EACCES || path == NULL || (flags & O_ACCMODE) == O_RDONLY || !acts_as_root()) return 0; if (faccessat(dirfd, path, F_OK, 0) == 0) { granted = grant_owner_write(dirfd, path); } else if (flags & O_CREAT) { @@ -53,3 +82,15 @@ int bl_writable_retry(int dirfd, const char *path, int flags) { errno = saved; return granted; } + +__attribute__((visibility("hidden"))) +int bl_writable_access(int dirfd, const char *path, int mode, int flags) { + int saved = errno; + struct stat st; + int owned; + + if (saved != EACCES || path == NULL || !(mode & W_OK) || !acts_as_root()) return 0; + owned = fstatat(dirfd, path, &st, flags & AT_SYMLINK_NOFOLLOW) == 0 && st.st_uid == geteuid(); + errno = saved; + return owned; +} diff --git a/tools/linuxfs/preload/pulseguard.c b/tools/linuxfs/preload/pulseguard.c index c3011df67..d9b4e7ef0 100644 --- a/tools/linuxfs/preload/pulseguard.c +++ b/tools/linuxfs/preload/pulseguard.c @@ -1,5 +1,3 @@ -/* In Deck mode (-steamos3) the x86-64 client's SteamOS audio manager passes libpulse the NULL operation of a - * failed request, and libpulse aborts on it ("Assertion 'o' failed ... pa_operation_get_state()"). */ #if defined(__x86_64__) || defined(__i386__) #define _GNU_SOURCE #include <dlfcn.h> @@ -9,7 +7,6 @@ typedef struct pa_operation pa_operation; #define PA_OPERATION_CANCELLED 2 -/* A libpulse loaded with RTLD_LOCAL (Wine's winepulse.so) is not in RTLD_NEXT's scope. */ static void *libpulse(const char *name) { void *fn = dlsym(RTLD_NEXT, name); if (!fn) { diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index e156e82c5..377b89567 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -23,7 +23,6 @@ #define BL_RESOLVE_BENEATH 0x08 #define BL_RESOLVE_IN_ROOT 0x10 -// The kernel's MAXSYMLINKS. #define BL_MAX_SYMLINKS 40 #define BL_PROC_ROOT_INO 1 @@ -49,6 +48,7 @@ static int openat2_missing; static int (*next_fstatat)(int, const char *, bl_stat *, int); static int (*next_openat)(int, const char *, int, ...); static ssize_t (*next_readlinkat)(int, const char *, char *, size_t); +static int (*next_statx)(int, const char *, int, unsigned int, struct statx *); static int find_fastpath(struct dl_phdr_info *info, size_t size, void *name) { (void)size; @@ -68,6 +68,7 @@ __attribute__((constructor)) static void find_fastpath_calls(void) { next_fstatat = (int (*)(int, const char *, bl_stat *, int))dlsym(fastpath, BL_FSTATAT_NAME); next_openat = (int (*)(int, const char *, int, ...))dlsym(fastpath, "openat"); next_readlinkat = (ssize_t (*)(int, const char *, char *, size_t))dlsym(fastpath, "readlinkat"); + next_statx = (int (*)(int, const char *, int, unsigned int, struct statx *))dlsym(fastpath, "statx"); } } @@ -92,13 +93,19 @@ static long path_readlink(int dirfd, const char *path, char *buf, size_t size) { return next_readlinkat(dirfd, path, buf, size); } +static long path_statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *out) { + if (!next_statx) { + return real_syscall(SYS_statx, (long)dirfd, (long)path, (long)flags, (long)mask, (long)out); + } + return next_statx(dirfd, path, flags, mask, out); +} + void *dlopen(const char *filename, int flags) { if (!real_dlopen) { real_dlopen = (void *(*)(const char *, int))dlsym(RTLD_NEXT, "dlopen"); } const char *basename = filename ? strrchr(filename, '/') : NULL; basename = basename ? basename + 1 : filename; - // Steam's deep binding bypasses the robust-list shim under PRoot. if (basename && strcmp(basename, "vrclient.so") == 0) { flags &= ~RTLD_DEEPBIND; } @@ -139,7 +146,6 @@ static struct robust_list_head *thread_robust_head(void) { return head; } -// Magic links are procfs links below a process's directory; procfs's root holds only plain ones (self, thread-self, mounts). static int is_magic_link(int dirfd, char *link, size_t parent_len) { int fd = (int)path_open(dirfd, link, O_PATH | O_NOFOLLOW | O_CLOEXEC, 0L); if (fd < 0) { @@ -159,7 +165,6 @@ static int is_magic_link(int dirfd, char *link, size_t parent_len) { return result != 0 || parent.st_ino != BL_PROC_ROOT_INO; } -// RESOLVE_IN_ROOT walked one component at a time: absolute symlinks restart at dirfd and ".." stops there. static long openat_in_root(int dirfd, const char *path, int flags, long mode) { char resolved[PATH_MAX]; char pending[PATH_MAX]; @@ -168,7 +173,6 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { int have_root = 0; int root_on_procfs = 0; dev_t root_dev = 0; - // O_NOFOLLOW and O_CREAT | O_EXCL leave a final symlink alone, unless a trailing slash follows it. int nofollow = (flags & O_NOFOLLOW) || (flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); const char *rest = path; for (;;) { @@ -232,7 +236,6 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { have_root = 1; } if ((st.st_dev != root_dev || root_on_procfs) && is_magic_link(dirfd, resolved, resolved_len)) { - // RESOLVE_IN_ROOT refuses magic links. errno = EXDEV; return -1; } @@ -329,7 +332,28 @@ static int execveat_is_execve(const long *args) { return path[0] == '/' || (int)args[0] == AT_FDCWD; } +static long openat2_call(const long *args) { + if (!real_syscall) { + real_syscall = (long (*)(long, ...)) dlsym(RTLD_NEXT, "syscall"); + } + if (!__atomic_load_n(&openat2_missing, __ATOMIC_RELAXED)) { + long fd = real_syscall(SYS_openat2, args[0], args[1], args[2], args[3]); + if (fd != -1 || errno != ENOSYS) { + return fd; + } + __atomic_store_n(&openat2_missing, 1, __ATOMIC_RELAXED); + } + return openat2_via_openat(args); +} + +int bl_openat2(int dirfd, const char *path, void *how, size_t size) __asm__("openat2"); +int bl_openat2(int dirfd, const char *path, void *how, size_t size) { + long args[6] = {dirfd, (long)path, (long)how, (long)size, 0, 0}; + return (int)openat2_call(args); +} + int bl_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) __attribute__((visibility("hidden"))); +int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) __attribute__((visibility("hidden"))); long syscall(long number, ...) { va_list ap; @@ -356,22 +380,27 @@ long syscall(long number, ...) { if (!real_syscall) { real_syscall = (long (*)(long, ...)) dlsym(RTLD_NEXT, "syscall"); } + if (bl_clock_syscall(number, args, real_syscall, &handled)) { + return handled; + } if (bl_writewatch_syscall(number, args, real_syscall, &handled)) { return handled; } if (number == SYS_openat2) { - if (!__atomic_load_n(&openat2_missing, __ATOMIC_RELAXED)) { - long fd = real_syscall(number, args[0], args[1], args[2], args[3]); - if (fd != -1 || errno != ENOSYS) { - return fd; - } - __atomic_store_n(&openat2_missing, 1, __ATOMIC_RELAXED); - } - return openat2_via_openat(args); + return openat2_call(args); } if (number == SYS_openat) { return path_open((int)args[0], (const char *)args[1], (int)args[2], args[3]); } + if (number == BL_SYS_FSTATAT) { + return path_stat((int)args[0], (const char *)args[1], (bl_stat *)args[2], (int)args[3]); + } + if (number == SYS_readlinkat) { + return path_readlink((int)args[0], (const char *)args[1], (char *)args[2], (size_t)args[3]); + } + if (number == SYS_statx) { + return path_statx((int)args[0], (const char *)args[1], (int)args[2], (unsigned int)args[3], (struct statx *)args[4]); + } if (number == SYS_execveat && execveat_is_execve(args)) { return real_syscall(SYS_execve, args[1], args[2], args[3]); } diff --git a/tools/linuxfs/preload/rptouch.c b/tools/linuxfs/preload/rptouch.c index 3d6f584ed..b8eb5ea90 100644 --- a/tools/linuxfs/preload/rptouch.c +++ b/tools/linuxfs/preload/rptouch.c @@ -1,6 +1,3 @@ -/* Steam's Linux Remote Play host has no touch injection: client touches arrive as an XTest mouse (absolute - * motion plus button 1). While a stream holds the encoder, those become touches into gamescope's own touch - * input, as a finger on the device screen would. */ #define _GNU_SOURCE #include <dlfcn.h> #include <pthread.h> @@ -51,9 +48,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 +73,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/storage.c b/tools/linuxfs/preload/storage.c index 1e454b864..97fdaabeb 100644 --- a/tools/linuxfs/preload/storage.c +++ b/tools/linuxfs/preload/storage.c @@ -13,6 +13,7 @@ #include <unistd.h> static int (*next_fstat)(int, struct stat *); +void bl_storage_owner(int fd, struct stat *st) __attribute__((visibility("hidden"))); static int (*next_fallocate)(int, int, off_t, off_t); static int (*next_posix_fallocate)(int, off_t, off_t); static ssize_t (*next_pwrite)(int, const void *, size_t, off_t); @@ -285,12 +286,17 @@ int fstat(int fd, struct stat *out) { if (next_fstat == NULL) { errno = ENOSYS; return -1; } initialize(); errno = entry_errno; - if (!enabled) return next_fstat(fd, out); + if (!enabled) { + int result = next_fstat(fd, out); + if (result == 0) bl_storage_owner(fd, out); + return result; + } uint64_t start = now_ns(); errno = entry_errno; int result = next_fstat(fd, out); int call_errno = errno; uint64_t elapsed = now_ns() - start; + if (result == 0) bl_storage_owner(fd, out); if (result == 0 && on_selected_device(fd, out)) { add(&stats.fstat_calls, 1); add(&stats.fstat_elapsed_ns, elapsed); diff --git a/tools/linuxfs/preload/udevmon.c b/tools/linuxfs/preload/udevmon.c index 33baf2bda..f0e171a86 100644 --- a/tools/linuxfs/preload/udevmon.c +++ b/tools/linuxfs/preload/udevmon.c @@ -195,8 +195,8 @@ static unsigned murmur_hash2(const char *key, size_t len) { len -= 4; } switch (len) { - case 3: h ^= data[2] << 16; /* fallthrough */ - case 2: h ^= data[1] << 8; /* fallthrough */ + case 3: h ^= data[2] << 16; __attribute__((fallthrough)); + case 2: h ^= data[1] << 8; __attribute__((fallthrough)); case 1: h ^= data[0]; h *= m; } h ^= h >> 13; diff --git a/tools/linuxfs/preload/vdec.c b/tools/linuxfs/preload/vdec.c new file mode 100644 index 000000000..9a0abbe50 --- /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 ca610e85c..92c60c3bf 100644 --- a/tools/linuxfs/preload/venc.c +++ b/tools/linuxfs/preload/venc.c @@ -1,4 +1,3 @@ -/* /dev/video-enc0 for Steam's Remote Play V4L2 encoder stage, backed by the app's MediaCodec encoder. */ #define _GNU_SOURCE #include <dlfcn.h> #include <errno.h> @@ -587,7 +586,6 @@ __attribute__((visibility("hidden"))) void bl_venc_closed(int fd) { vn_free_queue(&v->raw); vn_free_queue(&v->coded); v->used = 0; - /* A forked child closing its inherited copy must not end the stream for the parent. */ if (__atomic_sub_fetch(&vn_open_count, 1, __ATOMIC_RELEASE) == 0 && v->owner == getpid()) vn_marker(0); pthread_mutex_unlock(&vn_lock); } @@ -625,9 +623,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/linuxfs/preload/webhelper.c b/tools/linuxfs/preload/webhelper.c index af478c99a..949487279 100644 --- a/tools/linuxfs/preload/webhelper.c +++ b/tools/linuxfs/preload/webhelper.c @@ -1,6 +1,7 @@ #define _GNU_SOURCE #include <stdlib.h> #include <string.h> +#include <unistd.h> #ifndef WEBHELPER_DEFAULT #define WEBHELPER_DEFAULT "--no-zygote --in-process-gpu -AudioServiceOutOfProcess" @@ -25,8 +26,30 @@ static char *join_features(const char *have, const char *add) { return strcat(out, add); } +static char *const *chromium_argv(const char *path, char *const argv[]) { + const char *slash = path ? strrchr(path, '/') : NULL; + if (!slash || !argv || !argv[0]) return argv; + int argc = 0; + for (; argv[argc]; argc++) + if (argc && (!strncmp(argv[argc], "--type=", 7) || !strcmp(argv[argc], "--no-sandbox"))) return argv; + size_t dir = (size_t)(slash - path) + 1; + char *sandbox = malloc(dir + sizeof "chrome-sandbox"); + if (!sandbox) return argv; + memcpy(sandbox, path, dir); + strcpy(sandbox + dir, "chrome-sandbox"); + int chromium = access(sandbox, F_OK) == 0; + free(sandbox); + if (!chromium) return argv; + char **out = calloc((size_t)argc + 2, sizeof *out); + if (!out) return argv; + out[0] = argv[0]; + out[1] = (char *)"--no-sandbox"; + for (int i = 1; i < argc; i++) out[i + 1] = argv[i]; + return out; +} + __attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]) { - if (!is_webhelper_browser(path, argv)) return argv; + if (!is_webhelper_browser(path, argv)) return chromium_argv(path, argv); const char *spec = getenv("BL_WEBHELPER_ARGS"); if (!spec || !*spec) spec = WEBHELPER_DEFAULT; if (!strcmp(spec, "stock")) return argv; diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index 8f31d19eb..af62c2941 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -126,8 +126,6 @@ static void zr_walk(int compress) { zr_sys(SYS_close, maps); } -// Before it stops a session for suspend, the app waits for <ZR_CTL>.ack.<pid> to appear (the handler -// runs here, not one a program installed over it) and then to hold a byte (the page-out finished). static void zr_ack(int done) { static const char suffix[] = ".ack."; char path[sizeof(ZR_CTL) + sizeof(suffix) + 20]; diff --git a/tools/local-cross.Dockerfile b/tools/local-cross.Dockerfile index 8d143e7ca..653ad2b2c 100644 --- a/tools/local-cross.Dockerfile +++ b/tools/local-cross.Dockerfile @@ -3,16 +3,12 @@ FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ - && apt-get install -y \ - binutils \ - binutils-aarch64-linux-gnu \ - gcc \ - g++ \ - gcc-aarch64-linux-gnu \ - g++-aarch64-linux-gnu \ - python3 \ - zstd \ - unzip \ + && apt-get install -y binutils gcc g++ python3 zstd unzip \ + && if [ "$(uname -m)" = aarch64 ]; then \ + for tool in gcc g++ strip readelf objdump ar; do ln -s "$(command -v $tool)" /usr/local/bin/aarch64-linux-gnu-$tool; done; \ + else \ + apt-get install -y binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu; \ + fi \ && mkdir -p /src WORKDIR /src diff --git a/tools/packs/build.sh b/tools/packs/build.sh index d06a4c8fb..41dc7e03c 100755 --- a/tools/packs/build.sh +++ b/tools/packs/build.sh @@ -1,13 +1,4 @@ #!/usr/bin/env bash -# Builds the add-on packs the app downloads on first use instead of shipping in the APK: -# proot.tar.zst the patched proot and its loader (built by tools/proot) -# directaudio.tar.zst the Wine DirectAudio drivers (fetched by tools/directaudio/fetch.sh) -# tracking.tar.zst hand-tracking models and the OpenCV/MediaPipe native libraries -# xbox.tar.zst the Xbox backend (built by tools/xbox) for /usr/local/lib/droiddeck-xbox -# comet.tar.zst the GOG Galaxy companion (built by tools/comet) for /usr/local/lib/droiddeck-comet -# Only CI publishes these (.github/workflows/publish-packs.yml); the APK built from the same -# directory pins each pack's SHA-256. -# Usage: tools/packs/build.sh <out-dir> set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) @@ -18,6 +9,8 @@ out=$(cd "$out" && pwd) linuxfs="$repo/app/src/main/assets/linuxfs/usr/local/lib" # shellcheck source=tracking/release.env source "$here/tracking/release.env" +# shellcheck source=butler/release.env +source "$here/butler/release.env" work=$(mktemp -d) trap 'rm -rf "$work"' EXIT @@ -25,14 +18,7 @@ trap 'rm -rf "$work"' EXIT sha256() { if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi; } fetch() { - local url=$1 expected=$2 dest=$3 - curl -fsSL --retry 4 -o "$dest" "$url" - local actual - actual=$(sha256 "$dest") - if [ "$actual" != "$expected" ]; then - echo "checksum mismatch for $url: $actual" >&2 - exit 1 - fi + bash "$here/fetch-verified.sh" "$@" } pack() { @@ -90,3 +76,10 @@ pack tracking "$work/tracking" hand_landmarker.task hand_landmarker_lite.task po libopencv_java4.so libmediapipe_tasks_jni.so pack xbox "$linuxfs/droiddeck-xbox" version xodus-cli xodus-service pack comet "$linuxfs/droiddeck-comet" version comet + +mkdir "$work/butler" +fetch "https://broth.itch.zone/butler/linux-arm64/${BUTLER_VERSION}/archive/default" \ + "$BUTLER_ZIP_SHA256" "$work/butler.zip" +unzip -q -j "$work/butler.zip" butler 7z.so libc7zip.so -d "$work/butler" +printf '%s\n' "$BUTLER_VERSION" > "$work/butler/version" +pack butler "$work/butler" version butler 7z.so libc7zip.so diff --git a/tools/packs/butler/release.env b/tools/packs/butler/release.env new file mode 100644 index 000000000..2fa360000 --- /dev/null +++ b/tools/packs/butler/release.env @@ -0,0 +1,2 @@ +BUTLER_VERSION=15.32.0 +BUTLER_ZIP_SHA256=4f2da37785fd9cbc15052427490e4e4f5cd735a019f21554d6273fa9a3490152 diff --git a/tools/packs/fetch-verified.sh b/tools/packs/fetch-verified.sh new file mode 100644 index 000000000..41bba2819 --- /dev/null +++ b/tools/packs/fetch-verified.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -euo pipefail +url=${1:?URL required} +expected=${2:?SHA-256 required} +destination=${3:?destination required} +[[ "$expected" =~ ^[a-f0-9]{64}$ ]] || { echo 'Invalid download SHA-256' >&2; exit 1; } +cache=${DROIDDECK_PACK_CACHE:-"$HOME/.cache/droiddeck-pack-inputs"} +mkdir -p "$cache" "$(dirname "$destination")" +kept="$cache/$expected" +verify() { + if command -v sha256sum >/dev/null; then + echo "$expected $1" | sha256sum -c - >/dev/null 2>&1 + else + echo "$expected $1" | shasum -a 256 -c - >/dev/null 2>&1 + fi +} +if [ -f "$kept" ] && verify "$kept"; then + echo "Verified pack input cache hit: $expected" +else + part=$(mktemp "$cache/$expected.part.XXXXXX") + trap 'rm -f "$part"' EXIT + curl -fsSL --retry 4 --retry-all-errors --connect-timeout 15 --max-time 180 --retry-max-time 240 \ + -o "$part" "$url" + verify "$part" || { echo "Checksum mismatch for $url" >&2; exit 1; } + if [ -d "$kept" ]; then + rm -rf -- "$kept" + fi + mv -f "$part" "$kept" + echo "Downloaded and verified pack input: $expected" +fi +cp "$kept" "$destination" +verify "$destination" || { echo 'Copied pack input checksum mismatch' >&2; exit 1; } diff --git a/tools/packs/proot/release.env b/tools/packs/proot/release.env new file mode 100644 index 000000000..6d88f886a --- /dev/null +++ b/tools/packs/proot/release.env @@ -0,0 +1,2 @@ +PROOT_PACK_SHA256=5a2b7284e6357f88a14a790abd54e61effbe5f202c63b6aaba9b974c559649c3 +PROOT_PACK_SIZE=96643 diff --git a/tools/pipewire/assemble.sh b/tools/pipewire/assemble.sh index a9adb6c26..224b75c39 100755 --- a/tools/pipewire/assemble.sh +++ b/tools/pipewire/assemble.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# assemble.sh <extracted packages root> <out.tzst> -# Packs the video side of SteamOS's PipeWire and WirePlumber: no audio plugins, no JACK. set -euo pipefail src=$1 out=$2 diff --git a/tools/prepare_windows_runtime.py b/tools/prepare_windows_runtime.py index 831fc7d7d..886deb2a0 100644 --- a/tools/prepare_windows_runtime.py +++ b/tools/prepare_windows_runtime.py @@ -37,8 +37,6 @@ DONOR_CERT_SHA256 = 'b241ea7d77822d39b89d3227e06f3ecf62adec6cbfd38ad06196787991b DONOR_URL = 'https://github.com/Droid-Deck/DroidDeck-CI/releases/download/pr-732/DroidDeck-PR.732-bdf876d.apk' AUDITED_SOURCE = '1dc66bf9be64a404c80400049c0803614814461b' LOCAL_BUILD_PLUMBING = {'app/build.gradle', 'tools/release/runtime_inputs.py'} -# These Android-only inputs are compiled by Gradle, never taken from the donor. -# Keep this list explicit so unrelated native or Linux runtime edits still fail. LOCAL_ANDROID_SOURCES = {'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/viture/sdk_bridge.cpp', 'app/src/main/cpp/viture/display_modes.h', @@ -51,8 +49,6 @@ LOCAL_ANDROID_SOURCES = {'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c', 'app/src/main/cpp/waylandcomp/src/spatialpose.c', 'app/src/main/cpp/waylandcomp/CMakeLists.txt'} -# These audited helper updates are copied from this checkout by runtime.record(). -# Permit them only while source_assets() still guarantees that staging path. LOCAL_SESSION_HELPERS = {'tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat', 'tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr'} VR_PREFIX = 'assets/linuxfs/usr/local/lib/droiddeck-vr/' @@ -83,7 +79,6 @@ def changed(base, target=None): def check_sources(): - # A branch label alone is insufficient: CI merged this main commit into it. if git('merge-tree', '--write-tree', DONOR_PR_SOURCE, DONOR_MAIN_SOURCE).decode().splitlines()[0] != DONOR_TREE: raise ValueError('The donor CI merge does not match the audited source tree') helper_sources = {path.relative_to(ROOT).as_posix() for path in source_assets()} @@ -187,8 +182,6 @@ def validate_tracked_assets(package, llvm_strip): if prefix != 'app/src/main/jniLibs/': raise ValueError('Tracked bytes differ from the donor: ' + name + ' (text inputs must be checked out with LF)') - # AGP strips prebuilt JNI libraries during packaging. Verify that - # deterministic transformation on a temporary copy, never the source. with tempfile.TemporaryDirectory(prefix='droiddeck-strip-check-') as temp: stripped = Path(temp) / 'library.so' subprocess.run([str(llvm_strip), '--strip-unneeded', '-o', str(stripped), @@ -264,7 +257,6 @@ def prepare(apk, rebuilt_dir, gamescope, llvm_strip=None, rebuilt_vr=None, vk_in checked_output(target) plan[target] = data origins[target] = 'VR rebuilt from current source; source and output checksums verified' - # Do not silently retain unrelated files from a prior preparation. expected = set(plan) | {'app/src/main/' + name for name in helper_assets} for tree in ('linuxfs', 'directaudio', 'droiddeck-esync'): base = ROOT / 'app/src/main/assets' / tree diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index f379b4d7d..dbf1b959b 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -39,8 +39,8 @@ Ported from WinNative (`main`, 53836ca9, "Fix/performance and vac"): - `0007-proc-self-thread-group.patch` - tracees track their thread group, `/proc/self` names it instead of the calling thread, and `/proc/thread-self` resolves to `/proc/<tgid>/task/<tid>`. - `0008-fchmodat2-openat2.patch` - `fchmodat2` paths are translated (honouring - `AT_SYMLINK_NOFOLLOW`), `openat2` answers `ENOSYS` so callers fall back to the translated - `openat`, and syscall numbers past the end of a table are rejected instead of read. + `AT_SYMLINK_NOFOLLOW`), and syscall numbers past the end of a table are rejected instead of read. + Its `openat2` answer is replaced by `0019`. - `0009-tracee-relatives-sweep.patch` - tracees count their children, so a terminating thread with no children or ptracees no longer walks every tracee; the per-stop memory collector is emptied instead of freed and reallocated. @@ -114,6 +114,25 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per SM8850 (adb shell): `stat` 25.3 -> 0.6 us, `open+close` 25.3 -> 0.9 us, ENOENT 22.9 -> 1.6 us, 8 threads `stat`ing 89k -> 3.6M/s; equivalence suite (`bench/equiv.py`) byte-identical to proot. +- `0019-openat2-emulation.patch` - `openat2` without `resolve` flags runs as a translated `openat` + with the same flag and mode checks as the kernel. Any `resolve` flag still answers `ENOSYS`, + because PRoot cannot confine symlinks or mounts, so callers keep their own confined fallback. +- `0022-fake-root-statx-owners.patch` - with `0013` dropping the `statx` exit stop, fake root never + rewrote the owner `statx` returns, so files read as owned by the app's uid while the process was + root. Rust's `metadata` and GNU `stat` use `statx`, so uutils' `test -w` (Ubuntu's `/usr/bin/test`) + said root could not write to its own directories and apt's AppStream hook never built Discover's + catalog. fake_id0 keeps that exit stop when it fakes ids; identity-only mode is unchanged. +- `0023-reused-pid-new-child.patch` - when a thread that is not its process's leader calls `execve`, + the kernel retires that thread's ID without reporting an exit, so PRoot keeps its entry. Once the + IDs wrap (32768 on many Android kernels) a new child can get that ID, and PRoot aborted on the + assertion that a new child has no state, ending the whole session. Chromium-based programs such as + Steam's client do this. PRoot now retires the stale entry and sets the new child up from scratch. +- `0024-execveat-absolute-path.patch` - `execveat` with an absolute path and neither `AT_EMPTY_PATH` + nor `AT_SYMLINK_NOFOLLOW` runs as `execve`. The kernel ignores the directory descriptor for such a + path, and PRoot refused the call unless the descriptor was `AT_FDCWD`. FEX starts every child of an + emulated program with `execveat(fd, "/proc/self/exe")`, so x86 programs in a Flatpak sandbox, which + does not carry the session's preloads, could not start other programs. + Old kernel fixes: - `0015-lost-fork-events.patch` - works around a problem reported on Xiaomi's msm 4.14 kernel: @@ -124,3 +143,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/bench/checks.h b/tools/proot/bench/checks.h new file mode 100644 index 000000000..be60c7cb7 --- /dev/null +++ b/tools/proot/bench/checks.h @@ -0,0 +1,9 @@ +#ifndef DROIDDECK_BENCH_CHECKS_H +#define DROIDDECK_BENCH_CHECKS_H + +#ifdef NDEBUG +#undef NDEBUG +#endif +#include <assert.h> + +#endif diff --git a/tools/proot/bench/equiv2.py b/tools/proot/bench/equiv2.py index b267ad121..d8eb956a5 100644 --- a/tools/proot/bench/equiv2.py +++ b/tools/proot/bench/equiv2.py @@ -1,9 +1,3 @@ -"""Fast path equivalence, part two: symlinked directories (Wine's dosdevices), "..", trailing -slashes, realpath/getcwd, the write family, Unix sockets, xattrs, statfs, inotify and fstat. - -Run under proot with and without the fast path (run-device.sh fpoff / fastpath) and diff the -output: every line must match. Builds its own tree under /root/fx and /mnt/droiddeck-sd/fx. -""" import ctypes import errno import os diff --git a/tools/proot/bench/equiv3.py b/tools/proot/bench/equiv3.py index b40febf8e..d8a22f32b 100644 --- a/tools/proot/bench/equiv3.py +++ b/tools/proot/bench/equiv3.py @@ -1,13 +1,3 @@ -"""Fast path equivalence, part three: /proc (self, fd and exe links, readlink as proot answers it, -realpath through it, opening through fd links), link text naming host paths, creating in -directories whose host path is long, glue above a binding proot cannot look into, files the -caller may not stat, trailing slashes, shm_open, accept, passwd lookups and the _FORTIFY_SOURCE -entry points. - -Run under proot with and without the fast path (run-device.sh fpoff / fastpath) and diff the -output: every line must match. The rig's rootfs is ROOT; run-device.sh binds /cache/fp/perf and -SHARED at /opt/fpx. -""" import ctypes import errno import os diff --git a/tools/proot/bench/svc-check.c b/tools/proot/bench/svc-check.c new file mode 100644 index 000000000..bb40bdece --- /dev/null +++ b/tools/proot/bench/svc-check.c @@ -0,0 +1,453 @@ +#if defined(__aarch64__) +static void interruption_hook(const long *); +#define FP_SVC_TEST_HOOK interruption_hook +#endif +#include "../fastpath/fastpath.c" +#include "checks.h" +#include <sys/wait.h> +#include <linux/futex.h> +#include <signal.h> +#include <setjmp.h> + +#if defined(__aarch64__) +static void (*interrupt_path)(void); +static void interruption_hook(const long *r) { + (void)r; + if (interrupt_path) { + void (*hook)(void) = interrupt_path; + interrupt_path = NULL; + hook(); + } +} + +struct snapshot { long x[32]; unsigned char q[32][16]; unsigned long nzcv, fpcr, fpsr; }; +extern uint32_t svc_check_site; +extern void svc_register_probe(struct snapshot *, const long *); + +__asm__( + ".text\n.p2align 4\n.type svc_register_probe,%function\nsvc_register_probe:\n" + "sub sp, sp, #1072\n" + "stp x19, x20, [sp]\nstp x21, x22, [sp, #16]\nstp x23, x24, [sp, #32]\n" + "stp x25, x26, [sp, #48]\nstp x27, x28, [sp, #64]\nstp x29, x30, [sp, #80]\n" + "stp q8, q9, [sp, #96]\nstp q10, q11, [sp, #128]\n" + "stp q12, q13, [sp, #160]\nstp q14, q15, [sp, #192]\n" + "stp x0, x1, [sp, #224]\n" + ".irp n,1,2,3,4,5,6,7,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" + "mov x\\n, #\\n\n.endr\n" + ".irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31\n" + "movi v\\n\\().16b, #0x5a\n.endr\n" + "mov x0, #0xa0000000\nmsr nzcv, x0\n" + "ldr x0, [sp, #232]\nldr x8, [x0, #48]\n" + "ldp x4, x5, [x0, #32]\nldp x2, x3, [x0, #16]\nldp x0, x1, [x0]\n" + ".global svc_check_site\nsvc_check_site:\nsvc #0\n" + ".irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" + "str x\\n, [sp, #(256 + \\n * 8)]\n.endr\n" + ".irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31\n" + "str q\\n, [sp, #(512 + \\n * 16)]\n.endr\n" + "mrs x0, nzcv\nstr x0, [sp, #1024]\nmrs x0, fpcr\nstr x0, [sp, #1032]\n" + "mrs x0, fpsr\nstr x0, [sp, #1040]\n" + "ldr x0, [sp, #224]\nadd x1, sp, #256\nmov x2, #792\nbl memcpy\n" + "ldp q8, q9, [sp, #96]\nldp q10, q11, [sp, #128]\n" + "ldp q12, q13, [sp, #160]\nldp q14, q15, [sp, #192]\n" + "ldp x19, x20, [sp]\nldp x21, x22, [sp, #16]\nldp x23, x24, [sp, #32]\n" + "ldp x25, x26, [sp, #48]\nldp x27, x28, [sp, #64]\nldp x29, x30, [sp, #80]\n" + "add sp, sp, #1072\nret\n.size svc_register_probe, .-svc_register_probe\n" +); + +static long probe(const long *args) { + struct snapshot out = {0}; + unsigned long saved_fpcr, saved_fpsr; + __asm__ volatile("mrs %0, fpcr\nmrs %1, fpsr" : "=r"(saved_fpcr), "=r"(saved_fpsr)); + unsigned long fpcr = saved_fpcr ^ (1UL << 22), fpsr = saved_fpsr | (1UL << 27); + __asm__ volatile("msr fpcr, %0\nmsr fpsr, %1" : : "r"(fpcr), "r"(fpsr)); + errno = 123; + svc_register_probe(&out, args); + assert(errno == 123); + for (int i = 1; i <= 30; i++) { + long expected = i <= 5 ? args[i] : i == 8 ? args[6] : i; + if (out.x[i] != expected) { fprintf(stderr, "x%d: %lx != %lx\n", i, out.x[i], expected); abort(); } + } + for (int i = 0; i < 32; i++) + for (int j = 0; j < 16; j++) assert(out.q[i][j] == 0x5a); + assert(out.nzcv == 0xa0000000UL); + assert(out.fpcr == fpcr && out.fpsr == fpsr); + __asm__ volatile("msr fpcr, %0\nmsr fpsr, %1" : : "r"(saved_fpcr), "r"(saved_fpsr)); + return out.x[0]; +} + +static void check(const long *args, long want) { + long got = probe(args); + if (got != want) { fprintf(stderr, "syscall %ld: got %ld, expected %ld\n", args[6], got, want); abort(); } +} + +static long raw(long nr, long a, long b, long c, long d, long e, long f) { + long args[] = {a, b, c, d, e, f, nr}; + return probe(args); +} + +static void fault(long nr, long a, long b, long c, long d, long e, long f) { + long args[] = {a, b, c, d, e, f, 0, 0, nr}; + long want = svc_original(args); + long call[] = {a, b, c, d, e, f, nr}; + check(call, want); +} + +static void readlink_boundaries(const char *path) { + char expected[PATH_MAX + 8], actual[PATH_MAX + 8]; + long args[] = {AT_FDCWD, (long)path, (long)expected, PATH_MAX, 0, 0, 0, 0, SYS_readlinkat}; + long length = svc_original(args); + assert(length > 0 && length < PATH_MAX - 2); + for (long size = length - 1; size <= length + 2; size++) { + memset(expected, 0x5a, sizeof expected); memset(actual, 0x5a, sizeof actual); + args[3] = size; + long want = svc_original(args); + long got = raw(SYS_readlinkat, AT_FDCWD, (long)path, (long)actual, size, 0, 0); + if (got != want || (want > 0 && memcmp(expected, actual, (size_t)want))) + fprintf(stderr, "readlink %s size %ld: relay %ld, proot %ld\n", path, size, got, want); + assert(got == want && (want <= 0 || !memcmp(expected, actual, (size_t)want))); + for (size_t i = (size_t)size; i < sizeof actual; i++) assert(actual[i] == 0x5a); + } +} + +static void path_checks(void) { + char work[] = "/tmp/proot-expanded-check-XXXXXX"; + assert(mkdtemp(work)); + int cwd = open(".", O_RDONLY | O_DIRECTORY); + assert(cwd >= 0 && chdir(work) == 0); + assert(raw(SYS_mkdirat, AT_FDCWD, (long)"dir", 0700, 0, 0, 0) == 0); + long fd = raw(SYS_openat, AT_FDCWD, (long)"dir/file", O_CREAT | O_RDWR | O_EXCL, 0600, 0, 0); + assert(fd >= 0 && write((int)fd, "hello", 5) == 5); + struct stat st; + struct statx sx; + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"dir/file", (long)&st, 0, 0, 0) == 0 && st.st_size == 5); + assert(raw(SYS_statx, AT_FDCWD, (long)"dir/file", 0, STATX_BASIC_STATS, (long)&sx, 0) == 0 && sx.stx_size == 5); + assert(raw(SYS_faccessat, AT_FDCWD, (long)"dir/file", R_OK, 0, 0, 0) == 0); + assert(raw(SYS_symlinkat, (long)"file", AT_FDCWD, (long)"dir/link", 0, 0, 0) == 0); + readlink_boundaries("dir/link"); + readlink_boundaries("/proc/self/exe"); + char text[PATH_MAX]; + memset(text, '#', sizeof text); + assert(raw(SYS_readlinkat, AT_FDCWD, (long)"dir/link", (long)text, sizeof text, 0, 0) == 4); + assert(!memcmp(text, "file#", 5)); + assert(raw(SYS_fchmodat, AT_FDCWD, (long)"dir/file", 0640, 0, 0, 0) == 0); + struct timespec times[] = {{1000, 0}, {2000, 0}}; + assert(raw(SYS_truncate, (long)"dir/file", 11, 0, 0, 0, 0) == 0); + assert(raw(SYS_utimensat, AT_FDCWD, (long)"dir/file", (long)times, 0, 0, 0) == 0); + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"dir/file", (long)&st, 0, 0, 0) == 0); + assert(st.st_size == 11 && (st.st_mode & 0777) == 0640 && st.st_mtime == 2000); + assert(raw(SYS_renameat, AT_FDCWD, (long)"dir/file", AT_FDCWD, (long)"dir/moved", 0, 0) == 0); + assert(raw(SYS_renameat2, AT_FDCWD, (long)"dir/moved", AT_FDCWD, (long)"dir/file", RENAME_NOREPLACE, 0) == 0); + struct statfs fs; + assert(raw(SYS_statfs, (long)"dir/file", (long)&fs, 0, 0, 0, 0) == 0); + long x = raw(SYS_getxattr, (long)"dir/file", (long)"user.proot-missing", (long)text, sizeof text, 0, 0); + assert(x == -ENODATA || x == -EOPNOTSUPP); + x = raw(SYS_lgetxattr, (long)"dir/link", (long)"user.proot-missing", (long)text, sizeof text, 0, 0); + assert(x == -ENODATA || x == -EOPNOTSUPP); + assert(raw(SYS_listxattr, (long)"dir/file", (long)text, sizeof text, 0, 0, 0) >= 0); + assert(raw(SYS_llistxattr, (long)"dir/link", (long)text, sizeof text, 0, 0, 0) >= 0); + int in = inotify_init1(IN_CLOEXEC); + assert(in >= 0 && raw(SYS_inotify_add_watch, in, (long)"dir", IN_CREATE, 0, 0, 0) >= 0); + close(in); + long n = raw(SYS_getcwd, (long)text, sizeof text, 0, 0, 0, 0); + assert(n == (long)strlen(work) + 1 && !strcmp(text, work)); + size_t page = sysconf(_SC_PAGESIZE); + char *guard = mmap(NULL, page * 2, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + assert(guard != MAP_FAILED && mprotect(guard + page, page, PROT_NONE) == 0); + strcpy(guard + page - 2, "."); + assert(raw(SYS_newfstatat, AT_FDCWD, (long)(guard + page - 2), (long)&st, 0, 0, 0) == 0); + long bad = (long)(guard + page); + fault(SYS_openat, AT_FDCWD, bad, O_RDONLY, 0, 0, 0); + fault(SYS_newfstatat, AT_FDCWD, (long)"dir/file", bad, 0, 0, 0); + fault(SYS_statx, AT_FDCWD, (long)"dir/file", 0, STATX_BASIC_STATS, bad, 0); + fault(SYS_readlinkat, AT_FDCWD, (long)"dir/link", bad, 16, 0, 0); + fault(SYS_getcwd, bad, PATH_MAX, 0, 0, 0, 0); + fault(SYS_utimensat, AT_FDCWD, (long)"missing", bad, 0, 0, 0); + fault(SYS_inotify_add_watch, -1, (long)"missing", IN_CREATE, 0, 0, 0); + fault(SYS_renameat2, AT_FDCWD, (long)"dir/file", AT_FDCWD, (long)"dir/nope", 0x80000000, 0); + assert(munmap(guard, page * 2) == 0); + close((int)fd); + assert(raw(SYS_unlinkat, AT_FDCWD, (long)"dir/link", 0, 0, 0, 0) == 0); + assert(raw(SYS_unlinkat, AT_FDCWD, (long)"dir/file", 0, 0, 0, 0) == 0); + assert(raw(SYS_unlinkat, AT_FDCWD, (long)"dir", AT_REMOVEDIR, 0, 0, 0) == 0); + assert(fchdir(cwd) == 0 && close(cwd) == 0 && rmdir(work) == 0); + puts("PASS: path families, dirfds, flags, symlinks, protected pointers, page boundary"); +} + +static void robust_checks(void) { + if (!svc_android_api) return; + long original = 0; + size_t size = 0; + assert(raw(SYS_get_robust_list, 0, (long)&original, (long)&size, 0, 0, 0) == 0); + struct robust_list_head head = {0}; + long set_result = raw(SYS_set_robust_list, (long)&head, sizeof head, 0, 0, 0, 0); + assert(set_result == 0 || set_result == -ENOSYS); + long raw_head = 0; + long direct[] = {0, (long)&raw_head, (long)&size, 0, 0, 0, 0, 0, SYS_get_robust_list}; + assert(svc_original(direct) == 0 && raw_head == (long)&head); + long got = 0; + assert(raw(SYS_get_robust_list, gettid(), (long)&got, (long)&size, 0, 0, 0) == 0); + assert(got == (long)&head && size == sizeof head); + assert(raw(SYS_get_robust_list, 0, 1, (long)&size, 0, 0, 0) == -EFAULT); + assert(raw(SYS_set_robust_list, 0, sizeof head, 0, 0, 0, 0) == set_result); + long cleared = raw(SYS_get_robust_list, 0, (long)&got, (long)&size, 0, 0, 0); + assert(cleared == -ENOSYS || (cleared == 0 && got == 0)); + direct[0] = original; direct[1] = sizeof head; direct[8] = SYS_set_robust_list; + assert(svc_original(direct) == set_result); + assert(raw(SYS_get_robust_list, 0, (long)&got, (long)&size, 0, 0, 0) == 0 && original == got); + assert(raw(SYS_faccessat2, AT_FDCWD, (long)"/usr/lib/libc.so.6", R_OK, 0, 0, 0) == -ENOSYS); + if (svc_android_api < 35) assert(raw(SYS_clone3, 0, 0, 0, 0, 0, 0) == -ENOSYS); + int api = svc_android_api; + svc_android_api = 35; + assert(!svc_supported(SYS_clone3)); + svc_android_api = 0; + assert(!svc_supported(SYS_clone3) && !svc_supported(SYS_set_robust_list)); + svc_android_api = api; + assert(!svc_supported(SYS_set_robust_list) && !svc_supported(SYS_get_robust_list)); + puts("PASS: mixed relay/raw robust-list callers, errors, faccessat2, clone3 platform guard"); +} + +static void *thread_check(void *unused) { + (void)unused; + struct stat st; + if (svc_android_api) { + long head; + size_t size; + assert(raw(SYS_get_robust_list, 0, (long)&head, (long)&size, 0, 0, 0) == 0 && head && size == 3 * sizeof(long)); + struct robust_list_head private = {0}; + long result = raw(SYS_set_robust_list, (long)&private, sizeof private, 0, 0, 0, 0); + assert(result == 0 || result == -ENOSYS); + for (int i = 0; i < 10; i++) { + long got; + sched_yield(); + assert(raw(SYS_get_robust_list, 0, (long)&got, (long)&size, 0, 0, 0) == 0 && got == (long)&private); + } + assert(raw(SYS_set_robust_list, head, sizeof private, 0, 0, 0, 0) == result); + } + const long args[] = {AT_FDCWD, (long)"/usr/lib/libc.so.6", (long)&st, 0, 0, 0, SYS_newfstatat}; + for (int i = 0; i < 100; i++) check(args, 0); + return NULL; +} + +static pthread_barrier_t barrier; +static void *thread_probe(void *unused) { + pthread_barrier_wait(&barrier); + thread_check(unused); + pthread_barrier_wait(&barrier); + return NULL; +} + +static volatile sig_atomic_t signals_seen; +static void on_signal(int signal) { + (void)signal; + int saved = errno; + struct stat st; + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"/usr/lib/libc.so.6", (long)&st, 0, 0, 0) == 0); + signals_seen++; + errno = saved; +} + +static sigjmp_buf interrupted; +static void jump_signal(int signal) { (void)signal; siglongjmp(interrupted, 1); } +static void jump_path(void) { assert(raise(SIGUSR2) == 0); abort(); } +static void exit_path(void) { pthread_exit(PTHREAD_CANCELED); } +static void mark_cleanup(void *arg) { *(int *)arg = 1; } +struct unwind_check { int cleaned; int (*stat)(int, const char *, struct stat *, int); }; +static void *unwind_worker(void *arg) { + struct unwind_check *test = arg; + struct stat st; + pthread_cleanup_push(mark_cleanup, &test->cleaned); + interrupt_path = exit_path; + test->stat(AT_FDCWD, "/usr/lib/libc.so.6", &st, 0); + pthread_cleanup_pop(1); + abort(); +} + +static void interruption_checks(void) { + void *libc = dlopen("libc.so.6", RTLD_NOW); + struct unwind_check test = {.stat = dlsym(libc, "fstatat")}; + assert(test.stat); + struct sigaction old, action = {.sa_handler = jump_signal}; + sigemptyset(&action.sa_mask); + assert(sigaction(SIGUSR2, &action, &old) == 0); + sigset_t deliver, old_mask; + sigemptyset(&deliver); sigaddset(&deliver, SIGUSR2); + assert(pthread_sigmask(SIG_UNBLOCK, &deliver, &old_mask) == 0); + if (!sigsetjmp(interrupted, 1)) { + struct stat st; + interrupt_path = jump_path; + test.stat(AT_FDCWD, "/usr/lib/libc.so.6", &st, 0); + abort(); + } + assert(svc_busy); + struct stat st; + unsigned long before = svc_fast; + assert(test.stat(AT_FDCWD, "/usr/lib/libc.so.6", &st, 0) == 0); + assert(!svc_busy && svc_fast > before); + assert(sigaction(SIGUSR2, &old, NULL) == 0 && pthread_sigmask(SIG_SETMASK, &old_mask, NULL) == 0); + pthread_t thread; + void *result; + assert(pthread_create(&thread, NULL, unwind_worker, &test) == 0); + assert(pthread_join(thread, &result) == 0 && result == PTHREAD_CANCELED && test.cleaned); + assert(dlclose(libc) == 0); + puts("PASS: signal siglongjmp recovery, forced unwind through patched libc with caller cleanup"); +} + +static void *small_stack_worker(void *unused) { + size_t consume = (size_t)(uintptr_t)unused - 48 * 1024; + volatile char *padding = __builtin_alloca(consume); + padding[0] = padding[consume - 1] = 1; + struct stat st; + unsigned long before = svc_fast; + for (int i = 0; i < 20; i++) + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"/usr/lib/libc.so.6", (long)&st, 0, 0, 0) == 0); + assert(svc_fast == before && !svc_busy); + return NULL; +} + +static void small_stack_checks(void) { + pthread_attr_t attr; + pthread_t thread; + size_t size = PTHREAD_STACK_MIN; + if (size < 128 * 1024) size = 128 * 1024; + assert(pthread_attr_init(&attr) == 0 && pthread_attr_setstacksize(&attr, size) == 0); + assert(pthread_create(&thread, &attr, small_stack_worker, (void *)(uintptr_t)size) == 0); + assert(pthread_join(thread, NULL) == 0 && pthread_attr_destroy(&attr) == 0); + puts("PASS: limited remaining thread stack delegates path calls to PRoot"); +} + +struct signal_sender { pthread_t target; int done; }; +static void *send_signals(void *arg) { + struct signal_sender *sender = arg; + const struct timespec delay = {0, 100000}; + for (int i = 0; i < 100; i++) { + assert(pthread_kill(sender->target, SIGUSR1) == 0); + nanosleep(&delay, NULL); + } + __atomic_store_n(&sender->done, 1, __ATOMIC_RELEASE); + return NULL; +} + +static void *cancel_worker(void *unused) { + (void)unused; + struct stat st; + for (;;) { + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"/usr/lib/libc.so.6", (long)&st, 0, 0, 0) == 0); + pthread_testcancel(); + } +} + +struct cancel_open { const char *path; int (*open)(const char *, int, ...); int ready, cleaned; }; +static void cancel_cleanup(void *arg) { ((struct cancel_open *)arg)->cleaned = 1; } +static void *cancel_fifo(void *arg) { + struct cancel_open *test = arg; + pthread_cleanup_push(cancel_cleanup, test); + __atomic_store_n(&test->ready, 1, __ATOMIC_RELEASE); + int fd = test->open(test->path, O_RDONLY); + if (fd >= 0) close(fd); + pthread_cleanup_pop(1); + return NULL; +} + +static void signal_checks(void) { + stack_t old_stack, stack = {.ss_sp = malloc(SIGSTKSZ), .ss_size = SIGSTKSZ}; + assert(stack.ss_sp && sigaltstack(&stack, &old_stack) == 0); + struct sigaction old, action = {.sa_handler = on_signal, .sa_flags = SA_ONSTACK}; + sigemptyset(&action.sa_mask); + assert(sigaction(SIGUSR1, &action, &old) == 0); + sigset_t deliver, old_mask; + sigemptyset(&deliver); + sigaddset(&deliver, SIGUSR1); + assert(pthread_sigmask(SIG_UNBLOCK, &deliver, &old_mask) == 0); + struct signal_sender sender = {.target = pthread_self()}; + pthread_t thread; + assert(pthread_create(&thread, NULL, send_signals, &sender) == 0); + struct stat st; + for (int i = 0; i < 2000 || !__atomic_load_n(&sender.done, __ATOMIC_ACQUIRE); i++) + assert(raw(SYS_newfstatat, AT_FDCWD, (long)"/usr/lib/libc.so.6", (long)&st, 0, 0, 0) == 0); + assert(pthread_join(thread, NULL) == 0 && signals_seen > 0); + assert(sigaction(SIGUSR1, &old, NULL) == 0 && sigaltstack(&old_stack, NULL) == 0); + assert(pthread_sigmask(SIG_SETMASK, &old_mask, NULL) == 0); + free(stack.ss_sp); + void *result; + assert(pthread_create(&thread, NULL, cancel_worker, NULL) == 0); + assert(pthread_cancel(thread) == 0 && pthread_join(thread, &result) == 0 && result == PTHREAD_CANCELED); + char fifo[] = "/tmp/proot-expanded-fifo-XXXXXX"; + int fd = mkstemp(fifo); + assert(fd >= 0 && close(fd) == 0 && unlink(fifo) == 0 && mkfifo(fifo, 0600) == 0); + void *libc = dlopen("libc.so.6", RTLD_NOW); + struct cancel_open test = {.path = fifo, .open = dlsym(libc, "open")}; + assert(test.open && pthread_create(&thread, NULL, cancel_fifo, &test) == 0); + while (!__atomic_load_n(&test.ready, __ATOMIC_ACQUIRE)) sched_yield(); + struct timespec deadline = {0, 20000000}; + nanosleep(&deadline, NULL); + assert(pthread_cancel(thread) == 0 && clock_gettime(CLOCK_REALTIME, &deadline) == 0); + deadline.tv_sec += 2; + assert(pthread_timedjoin_np(thread, &result, &deadline) == 0 && result == PTHREAD_CANCELED && test.cleaned); + assert(unlink(fifo) == 0 && dlclose(libc) == 0); + for (int i = 0; i < 32; i++) { + assert(pthread_create(&thread, NULL, thread_check, NULL) == 0); + assert(pthread_join(thread, NULL) == 0); + } + puts("PASS: signal reentry on alternate stack, deferred/FIFO cancellation with cleanup, thread churn"); +} + +int main(void) { + assert(fp_ready()); + const char *mode = getenv("PROOT_FP_PATCH_SVC"); + if (!svc_sites && mode && !strcmp(mode, "0")) { + assert(setenv("PROOT_FP_PATCH_SVC", "1", 1) == 0); + svc_patch_init(); + } + printf("platform: android %d, patched %u sites\n", svc_android_api, svc_sites); + assert(svc_sites > 0); + assert(svc_single_thread()); + size_t page = sysconf(_SC_PAGESIZE); + uint32_t *relay = svc_relay_page((uintptr_t)&svc_check_site, page), branch; + assert(relay && svc_emit(relay, &svc_check_site, &branch)); + __builtin___clear_cache((char *)relay, (char *)relay + 40); + assert(mprotect(relay, page, PROT_READ | PROT_EXEC) == 0); + int mem = open("/proc/self/mem", O_RDWR | O_CLOEXEC); + assert(mem >= 0 && pwrite(mem, &branch, 4, (off_t)(uintptr_t)&svc_check_site) == 4); + close(mem); + __builtin___clear_cache((char *)&svc_check_site, (char *)(&svc_check_site + 1)); + long args[] = {0, 1, 2, 3, 4, 5, SYS_getpid}; + check(args, getpid()); + struct stat st; + args[0] = AT_FDCWD; args[1] = (long)"/usr/lib/libc.so.6"; args[2] = (long)&st; + args[3] = 0; args[6] = SYS_newfstatat; + check(args, 0); + assert(st.st_size > 0); + args[1] = (long)"/usr/lib/proot-svc-check-does-not-exist"; + check(args, -ENOENT); + args[1] = 0; + check(args, -EFAULT); + args[1] = (long)"/usr/lib/libc.so.6"; args[2] = 0; + check(args, -EFAULT); + args[1] = (long)"/proc/self/exe"; args[2] = (long)&st; + check(args, 0); + args[3] = 0x40000000; + check(args, -EINVAL); + path_checks(); + robust_checks(); + pthread_t threads[4]; + assert(pthread_barrier_init(&barrier, NULL, 5) == 0); + for (int i = 0; i < 4; i++) assert(pthread_create(&threads[i], NULL, thread_probe, NULL) == 0); + pthread_barrier_wait(&barrier); + assert(!svc_single_thread()); + pthread_barrier_wait(&barrier); + for (int i = 0; i < 4; i++) assert(pthread_join(threads[i], NULL) == 0); + assert(pthread_barrier_destroy(&barrier) == 0); + pid_t pid = fork(); + assert(pid >= 0); + if (!pid) { thread_check(NULL); _exit(0); } + int status; + assert(waitpid(pid, &status, 0) == pid && WIFEXITED(status) && WEXITSTATUS(status) == 0); + signal_checks(); + interruption_checks(); + small_stack_checks(); + puts("PASS: raw results, errno, x1-x30, q0-q31, NZCV, FPCR/FPSR, 4 threads, fork"); + return 0; +} +#else +int main(void) { return 77; } +#endif diff --git a/tools/proot/bench/svc-fail.c b/tools/proot/bench/svc-fail.c new file mode 100644 index 000000000..c53bf8e18 --- /dev/null +++ b/tools/proot/bench/svc-fail.c @@ -0,0 +1,39 @@ +#include "../fastpath/fastpath.c" +#include "checks.h" +#include <linux/filter.h> +#include <linux/seccomp.h> +#include <sys/prctl.h> + +int main(int argc, char **argv) { +#if defined(__aarch64__) + assert(argc == 2 && fp_ready() && !svc_sites && svc_single_thread()); + int nr = !strcmp(argv[1], "mem") ? SYS_openat : !strcmp(argv[1], "write") ? SYS_pwrite64 : + !strcmp(argv[1], "rx") ? SYS_mprotect : SYS_mmap; + unsigned offset = nr == SYS_mprotect || nr == SYS_openat ? offsetof(struct seccomp_data, args[2]) : offsetof(struct seccomp_data, args[3]); + unsigned mask = nr == SYS_mprotect ? PROT_EXEC : nr == SYS_mmap ? MAP_FIXED_NOREPLACE : nr == SYS_openat ? O_RDWR : ~0U; + struct sock_filter code[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, nr, 0, 3), + BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offset), + BPF_JUMP(BPF_JMP | BPF_JSET | BPF_K, mask, 0, 1), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ERRNO | EACCES), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW), + }; + if (nr == SYS_pwrite64) code[2] = (struct sock_filter)BPF_STMT(BPF_LD | BPF_IMM, 1); + struct sock_fprog filter = {.len = sizeof code / sizeof *code, .filter = code}; + assert(setenv("PROOT_FP_PATCH_SVC", "1", 1) == 0); + if (sc(SYS_prctl, PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || + sc(SYS_prctl, PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (long)&filter, 0, 0)) return 77; + assert(svc_single_thread()); + svc_patch_init(); + assert(svc_sites == 0 && svc_pages == 0); + struct stat st; + long args[] = {AT_FDCWD, (long)"/etc/os-release", (long)&st, 0, 0, 0, 0, 0, SYS_newfstatat}; + assert(svc_original(args) == 0 && S_ISREG(st.st_mode)); + puts("PASS: denied patch installation leaves the original libc syscall usable"); + return 0; +#else + (void)argc; (void)argv; + return 77; +#endif +} diff --git a/tools/proot/bench/svc-probe.c b/tools/proot/bench/svc-probe.c new file mode 100644 index 000000000..43e123b42 --- /dev/null +++ b/tools/proot/bench/svc-probe.c @@ -0,0 +1,93 @@ +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <link.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <sys/mman.h> +#include <unistd.h> + +static int mov_sysnum(uint32_t insn) { + if ((insn & 0xffe0001fU) == 0xd2800008U || + (insn & 0xffe0001fU) == 0x52800008U) + return (insn >> 5) & 0xffff; + return -1; +} + +static int scan(struct dl_phdr_info *info, size_t size, void *unused) { + (void)size; + (void)unused; + const char *name = strrchr(info->dlpi_name, '/'); + name = name ? name + 1 : info->dlpi_name; + if (strcmp(name, "libc.so.6") && strcmp(name, "ld-linux-aarch64.so.1")) return 0; + unsigned total = 0, adjacent = 0, nearby = 0, counts[512] = {0}; + for (int i = 0; i < info->dlpi_phnum; i++) { + const ElfW(Phdr) *ph = &info->dlpi_phdr[i]; + if (ph->p_type != PT_LOAD || !(ph->p_flags & PF_X)) continue; + const uint32_t *text = (const uint32_t *)(info->dlpi_addr + ph->p_vaddr); + for (size_t j = 0; j < ph->p_memsz / 4; j++) { + if (text[j] != 0xd4000001U) continue; + total++; + int nr = j ? mov_sysnum(text[j - 1]) : -1; + if (nr >= 0) { + adjacent++; + if (nr < 512) counts[nr]++; + } else { + for (size_t k = 2; k <= 8 && k <= j; k++) + if (mov_sysnum(text[j - k]) >= 0) { nearby++; break; } + } + } + } + printf("{\"object\":\"%s\",\"svc\":%u,\"adjacent_mov_x8\":%u,\"nearby_only\":%u,\"adjacent_syscalls\":{", + name, total, adjacent, nearby); + int comma = 0; + for (unsigned nr = 0; nr < 512; nr++) + if (counts[nr]) { printf("%s\"%u\":%u", comma ? "," : "", nr, counts[nr]); comma = 1; } + puts("}}"); + return 0; +} + +int main(void) { + long page = sysconf(_SC_PAGESIZE); + int fd = open("/usr/lib/libc.so.6", O_RDONLY | O_CLOEXEC); + if (fd < 0) { perror("libc"); return 1; } + unsigned char *p = mmap(NULL, page, PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0); + if (p == MAP_FAILED) { perror("file mmap RX"); close(fd); return 1; } + unsigned char before = p[0], changed = before ^ 1; + errno = 0; + int rwx = mprotect(p, page, PROT_READ | PROT_WRITE | PROT_EXEC), rwx_errno = errno; + if (rwx == 0) { + p[0] = changed; + p[0] = before; + if (mprotect(p, page, PROT_READ | PROT_EXEC)) { perror("restore RX"); return 1; } + } + int mem = open("/proc/self/mem", O_RDWR | O_CLOEXEC), mem_errno = mem < 0 ? errno : 0; + ssize_t written = -1; + int write_errno = 0, verified = 0, restored = 0; + if (mem >= 0) { + errno = 0; + written = pwrite(mem, &changed, 1, (off_t)(uintptr_t)p); + write_errno = errno; + verified = written == 1 && *(volatile unsigned char *)p == changed; + restored = pwrite(mem, &before, 1, (off_t)(uintptr_t)p) == 1 && + *(volatile unsigned char *)p == before; + close(mem); + } + unsigned char disk = 0; + int file_unchanged = pread(fd, &disk, 1, 0) == 1 && disk == before; + munmap(p, page); + close(fd); + void *anon = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + errno = 0; + int execmem = anon == MAP_FAILED ? -1 : mprotect(anon, page, PROT_READ | PROT_EXEC); + int execmem_errno = errno; + if (anon != MAP_FAILED) munmap(anon, page); + printf("{\"page_size\":%ld,\"rwx\":%d,\"rwx_errno\":%d,\"mem_open_errno\":%d," + "\"mem_written\":%ld,\"mem_write_errno\":%d,\"mem_verified\":%d,\"mem_restored\":%d," + "\"file_unchanged\":%d,\"execmem\":%d,\"execmem_errno\":%d}\n", + page, rwx, rwx_errno, mem_errno, (long)written, write_errno, verified, restored, + file_unchanged, execmem, execmem_errno); + dl_iterate_phdr(scan, NULL); + return 0; +} diff --git a/tools/proot/bench/svc-race.c b/tools/proot/bench/svc-race.c new file mode 100644 index 000000000..efd6a22fb --- /dev/null +++ b/tools/proot/bench/svc-race.c @@ -0,0 +1,49 @@ +#define _GNU_SOURCE +#include "checks.h" +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/wait.h> +#include <unistd.h> + +int main(void) { + char work[] = "/tmp/proot-svc-race-XXXXXX"; + assert(mkdtemp(work)); + int cwd = open(".", O_RDONLY | O_DIRECTORY); + assert(cwd >= 0 && chdir(work) == 0); + for (int i = 0; i < 2; i++) { + int fd = open(i ? "b" : "a", O_CREAT | O_EXCL | O_WRONLY, 0600); + assert(fd >= 0 && ftruncate(fd, i + 1) == 0 && close(fd) == 0); + } + assert(symlink("a", "live") == 0); + void *libc = dlopen("libc.so.6", RTLD_NOW); + int (*stat)(int, const char *, struct stat *, int) = dlsym(libc, "fstatat"); + ssize_t (*link)(int, const char *, char *, size_t) = dlsym(libc, "readlinkat"); + assert(stat && link); + pid_t writer = fork(); + assert(writer >= 0); + if (!writer) { + for (int i = 0; i < 3000; i++) { + assert(symlink(i & 1 ? "b" : "a", "next") == 0); + assert(rename("next", "live") == 0); + } + _exit(0); + } + for (int i = 0; i < 3000; i++) { + struct stat st; + assert(stat(AT_FDCWD, "live", &st, 0) == 0 && S_ISREG(st.st_mode) && (st.st_size == 1 || st.st_size == 2)); + char text[8]; + assert(link(AT_FDCWD, "live", text, sizeof text) == 1 && (text[0] == 'a' || text[0] == 'b')); + } + int status; + assert(waitpid(writer, &status, 0) == writer && WIFEXITED(status) && WEXITSTATUS(status) == 0); + assert(unlink("live") == 0 && unlink("a") == 0 && unlink("b") == 0); + assert(dlclose(libc) == 0 && fchdir(cwd) == 0 && close(cwd) == 0 && rmdir(work) == 0); + puts("PASS: concurrent atomic symlink replacement, internal stat/readlink legal results"); + return 0; +} diff --git a/tools/proot/bench/svc-storage.c b/tools/proot/bench/svc-storage.c new file mode 100644 index 000000000..ff829ecb9 --- /dev/null +++ b/tools/proot/bench/svc-storage.c @@ -0,0 +1,74 @@ +#define _GNU_SOURCE +#include "checks.h" +#include <dlfcn.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/resource.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +static double now(void) { + struct timespec t; + assert(clock_gettime(CLOCK_MONOTONIC, &t) == 0); + return t.tv_sec + t.tv_nsec / 1e9; +} + +int main(int argc, char **argv) { + assert(argc == 2 && mkdir(argv[1], 0700) == 0); + void *libc = dlopen("libc.so.6", RTLD_NOW); + assert(libc); + int (*internal_open)(const char *, int, ...) = dlsym(libc, "__open64_nocancel"); + int (*internal_stat)(int, const char *, struct stat *, int) = dlsym(libc, "fstatat"); + assert(internal_open && internal_stat); + struct rusage before, after; + assert(getrusage(RUSAGE_SELF, &before) == 0); + char paths[64][4096], stream[4096]; + double creation = 0, extension = 0, closing = 0, total = now(); + for (int i = 0; i < 64; i++) { + snprintf(paths[i], sizeof paths[i], "%s/asset-with-a-longish-steam-depot-filename-%03d.dat", argv[1], i); + double start = now(); + int fd = internal_open(paths[i], O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, 0600); + assert(fd >= 0); + creation += now() - start; + start = now(); + assert(ftruncate(fd, 262144) == 0); + extension += now() - start; + start = now(); + assert(close(fd) == 0); + closing += now() - start; + } + double allocation = now() - total; + struct stat st; + double start = now(); + for (int i = 0; i < 1000; i++) assert(internal_stat(AT_FDCWD, paths[i % 64], &st, 0) == 0); + double metadata = now() - start; + snprintf(stream, sizeof stream, "%s/stream.bin", argv[1]); + start = now(); + int fd = internal_open(stream, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, 0600); + assert(fd >= 0); + double stream_create = now() - start; + static unsigned char block[1024 * 1024]; + memset(block, 0x5a, sizeof block); + start = now(); + for (int i = 0; i < 64; i++) assert(write(fd, block, sizeof block) == sizeof block); + double writing = now() - start; + start = now(); + assert(fdatasync(fd) == 0); + double syncing = now() - start; + assert(close(fd) == 0); + assert(getrusage(RUSAGE_SELF, &after) == 0); + printf("{\"files\":64,\"bytes_per_file\":262144,\"create_s\":%.6f,\"extend_s\":%.6f," + "\"close_s\":%.6f,\"allocation_s\":%.6f,\"stat1000_s\":%.6f," + "\"stream_bytes\":67108864,\"stream_create_s\":%.6f,\"write_s\":%.6f," + "\"fdatasync_s\":%.6f,\"voluntary_switches\":%ld}\n", + creation, extension, closing, allocation, metadata, stream_create, writing, + syncing, after.ru_nvcsw - before.ru_nvcsw); + fflush(stdout); + for (int i = 0; i < 64; i++) assert(unlink(paths[i]) == 0); + assert(unlink(stream) == 0 && rmdir(argv[1]) == 0); + assert(dlclose(libc) == 0); + return 0; +} diff --git a/tools/proot/bench/svc-threads.c b/tools/proot/bench/svc-threads.c new file mode 100644 index 000000000..6eae555a8 --- /dev/null +++ b/tools/proot/bench/svc-threads.c @@ -0,0 +1,47 @@ +#define _GNU_SOURCE +#include "checks.h" +#include <dlfcn.h> +#include <fcntl.h> +#include <pthread.h> +#include <stdio.h> +#include <sys/resource.h> +#include <time.h> +#include <unistd.h> + +static double now(void) { + struct timespec t; + assert(clock_gettime(CLOCK_MONOTONIC, &t) == 0); + return t.tv_sec * 1e9 + t.tv_nsec; +} + +static void *thread(void *arg) { return arg; } + +int main(void) { + void *libc = dlopen("libc.so.6", RTLD_NOW); + assert(libc); + int (*access)(int, const char *, int, int) = dlsym(libc, "faccessat"); + char *(*cwd)(char *, size_t) = dlsym(libc, "getcwd"); + assert(access && cwd); + struct rusage before, after; + assert(getrusage(RUSAGE_SELF, &before) == 0); + const int threads = 128, calls = 2000; + double start = now(); + for (int i = 0; i < threads; i++) { + pthread_t id; + void *value; + assert(pthread_create(&id, NULL, thread, (void *)1) == 0); + assert(pthread_join(id, &value) == 0 && value == (void *)1); + } + double thread_us = (now() - start) / threads / 1000; + start = now(); + for (int i = 0; i < calls; i++) assert(access(AT_FDCWD, "/etc/os-release", R_OK, 0) == 0); + double access_ns = (now() - start) / calls; + char path[4096]; + start = now(); + for (int i = 0; i < calls; i++) assert(cwd(path, sizeof path)); + double cwd_ns = (now() - start) / calls; + assert(getrusage(RUSAGE_SELF, &after) == 0 && dlclose(libc) == 0); + printf("{\"thread_us\":%.0f,\"access_ns\":%.0f,\"cwd_ns\":%.0f,\"switches\":%ld}\n", + thread_us, access_ns, cwd_ns, after.ru_nvcsw - before.ru_nvcsw); + return 0; +} diff --git a/tools/proot/bench/svc-workload.c b/tools/proot/bench/svc-workload.c new file mode 100644 index 000000000..89f0dc590 --- /dev/null +++ b/tools/proot/bench/svc-workload.c @@ -0,0 +1,92 @@ +#define _GNU_SOURCE +#include "checks.h" +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <fts.h> +#include <pwd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/resource.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +static double now(void) { + struct timespec t; + assert(clock_gettime(CLOCK_MONOTONIC, &t) == 0); + return t.tv_sec * 1e9 + t.tv_nsec; +} + +int main(int argc, char **argv) { + assert(argc >= 2); + void *libc = dlopen("libc.so.6", RTLD_NOW); + assert(libc); + int (*internal_stat)(int, const char *, struct stat *, int) = dlsym(libc, "fstatat"); + int (*internal_open)(const char *, int, ...) = dlsym(libc, "__open64_nocancel"); + assert(internal_stat && internal_open); + char path[4096], link[4096], missing[4096]; + snprintf(path, sizeof path, "%s/file", argv[1]); + snprintf(link, sizeof link, "%s/link", argv[1]); + snprintf(missing, sizeof missing, "%s/missing", argv[1]); + const char *paths[] = {path, link, missing, "/etc/os-release", "/lib/libc.so.6", "/proc/self/exe", "/dev/null", "", NULL}; + struct stat st; + for (size_t i = 0; i < sizeof paths / sizeof *paths; i++) { + errno = 0; + int r = internal_stat(AT_FDCWD, paths[i], &st, 0); + printf("stat %zu: %d %d", i, r, r ? errno : 0); + if (!r) printf(" %o %ld", st.st_mode & S_IFMT, S_ISREG(st.st_mode) && i != 5 ? st.st_size : 0L); + putchar('\n'); + errno = 0; + int fd = internal_open(paths[i], O_RDONLY | O_CLOEXEC); + int err = fd < 0 ? errno : 0; + printf("open %zu: %d %d\n", i, fd < 0 ? -1 : 0, err); + if (fd >= 0) close(fd); + } + errno = 0; + int r = internal_stat(AT_FDCWD, path, &st, 0x40000000); + printf("flags: %d %d\n", r, r ? errno : 0); + char *tree[] = {argv[1], NULL}; + FTS *fts = fts_open(tree, FTS_PHYSICAL | FTS_NOCHDIR, NULL); + assert(fts); + unsigned files = 0, dirs = 0, links = 0; + FTSENT *ent; + while ((ent = fts_read(fts))) { + if (ent->fts_info == FTS_F) files++; + if (ent->fts_info == FTS_D) dirs++; + if (ent->fts_info == FTS_SL) links++; + } + assert(fts_close(fts) == 0); + printf("fts: %u files %u dirs %u links\n", files, dirs, links); + char resolved[4096], canonical[4096]; + assert(realpath(path, canonical)); + assert(realpath(link, resolved) && !strcmp(resolved, canonical)); + struct passwd pw, *found; + char buf[16384]; + r = getpwnam_r("root", &pw, buf, sizeof buf, &found); + printf("nss: %d %d\n", r, found != NULL); + void *libm = dlopen("libm.so.6", RTLD_NOW | RTLD_LOCAL); + assert(libm && dlsym(libm, "cos")); + assert(dlclose(libm) == 0); + puts("realpath/dlopen: PASS"); + if (argc > 2) { + const int loops = 5000; + struct rusage before, after; + assert(getrusage(RUSAGE_SELF, &before) == 0); + double start = now(); + for (int i = 0; i < loops; i++) assert(internal_stat(AT_FDCWD, path, &st, 0) == 0); + double stat_ns = (now() - start) / loops; + start = now(); + for (int i = 0; i < loops; i++) { + int fd = internal_open(path, O_RDONLY | O_CLOEXEC); + assert(fd >= 0 && close(fd) == 0); + } + double open_ns = (now() - start) / loops; + assert(getrusage(RUSAGE_SELF, &after) == 0); + printf("bench: stat %.0f ns, open+close %.0f ns, voluntary switches %ld\n", + stat_ns, open_ns, after.ru_nvcsw - before.ru_nvcsw); + } + assert(dlclose(libc) == 0); + return 0; +} diff --git a/tools/proot/build.sh b/tools/proot/build.sh index 718190552..64a51a660 100755 --- a/tools/proot/build.sh +++ b/tools/proot/build.sh @@ -23,14 +23,24 @@ fi WORK=$(mktemp -d) trap 'rm -rf "$WORK"' EXIT fetch() { - curl -fsSL --retry 3 -o "$WORK/$1" "$2" - echo "$3 $WORK/$1" | shasum -a 256 -c - - mkdir -p "$WORK/${1%%.*}" - tar -xzf "$WORK/$1" -C "$WORK/${1%%.*}" --strip-components=1 + local name=$1 primary=$2 sha=$3 url fetched=0 + shift 3 + for url in "$primary" "$@"; do + if curl -fsSL --connect-timeout 15 --max-time 90 --retry 3 --retry-all-errors --retry-max-time 120 -o "$WORK/$name" "$url" && + printf '%s %s\n' "$sha" "$WORK/$name" | shasum -a 256 -c -; then + fetched=1 + break + fi + done + [[ $fetched == 1 ]] || return 1 + mkdir -p "$WORK/${name%%.*}" + tar -xzf "$WORK/$name" -C "$WORK/${name%%.*}" --strip-components=1 } 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" +fetch talloc.tar.gz "https://www.samba.org/ftp/talloc/talloc-${TALLOC_VERSION}.tar.gz" "$TALLOC_SHA256" \ + "https://distfiles.macports.org/talloc/talloc-${TALLOC_VERSION}.tar.gz" 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 811b0057c..0a9d3f22b 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -141,12 +141,14 @@ static int traced_by_match(const char *key) { return found; } -static long init_sys(long nr, long a, long b, long c) { +static long init_sys4(long nr, long a, long b, long c, long d) { static long (*real_syscall)(long, ...); if (!real_syscall) real_syscall = (long (*)(long, ...))dlsym(RTLD_NEXT, "syscall"); - return real_syscall(nr, a, b, c); + return real_syscall(nr, a, b, c, d); } +static long init_sys(long nr, long a, long b, long c) { return init_sys4(nr, a, b, c, 0); } + static int program_32bit(const char *prog, int scripts) { char head[256]; long fd = init_sys(SYS_openat, AT_FDCWD, (long)prog, O_RDONLY | O_CLOEXEC); @@ -504,7 +506,7 @@ static long own_exe(char *g) { memcpy(g, exe_text, n + 1); return n; } - long t = syscall(SYS_readlinkat, AT_FDCWD, "/proc/self/exe", g, PATH_MAX - 1); + long t = init_sys4(SYS_readlinkat, AT_FDCWD, (long)"/proc/self/exe", (long)g, PATH_MAX - 1); if (t <= 0 || t >= PATH_MAX - 1) return FP_SLOW; g[t] = 0; static pthread_mutex_t exe_lock = PTHREAD_MUTEX_INITIALIZER; @@ -875,20 +877,81 @@ 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); } -int statx(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { - REAL(statx, int (*)(int, const char *, int, unsigned, struct statx *)); +#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); +} + +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; +} + +static long fp_statx(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { struct res r; long rs; - if ((flags & AT_EMPTY_PATH) && !path[0] && fp_ready()) { - hits++; - return ret(sc(SYS_statx, dirfd, (long)"", flags, mask, (long)out)); - } + if (mask & STATX__RESERVED) return -EINVAL; + if (!out) return -EFAULT; + if (!path) return flags & AT_EMPTY_PATH ? FP_SLOW : -EFAULT; + if ((flags & AT_EMPTY_PATH) && !path[0] && fp_ready()) + return 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); - ANSWER(rs, dirfd, path, real_statx(dirfd, path, flags, mask, out)); + rs = statx_call(AT_FDCWD, r.host, flags | (rs == 0 && !r.magic ? AT_SYMLINK_NOFOLLOW : 0), mask, out); + return rs; +} + +int statx(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { + REAL(statx, int (*)(int, const char *, int, unsigned, struct statx *)); + ANSWER(fp_statx(dirfd, path, flags, mask, out), dirfd, path, + real_statx ? real_statx(dirfd, path, flags, mask, out) : ret(sc(SYS_statx, dirfd, (long)path, flags, mask, (long)out))); } @@ -896,8 +959,7 @@ static int effective_is_real(void) { return !getauxval(AT_SECURE) && getuid() == geteuid() && getgid() == getegid(); } -static int access_common(int dirfd, const char *path, int mode, int flags) { - REAL(faccessat, int (*)(int, const char *, int, int)); +static long fp_access(int dirfd, const char *path, int mode, int flags) { struct res r; if ((flags & AT_EACCESS) && effective_is_real()) flags &= ~AT_EACCESS; long rs = (flags & ~AT_SYMLINK_NOFOLLOW) == 0 @@ -905,6 +967,12 @@ static int access_common(int dirfd, const char *path, int mode, int flags) { if (rs == 1) rs = -ENOENT; if (rs == 0 && S_ISLNK(r.st.st_mode)) rs = FP_SLOW; if (rs == 0 || rs == UNSEEN) rs = sc(SYS_faccessat, AT_FDCWD, (long)r.host, mode, 0, 0); + return rs; +} + +static int access_common(int dirfd, const char *path, int mode, int flags) { + REAL(faccessat, int (*)(int, const char *, int, int)); + long rs = fp_access(dirfd, path, mode, flags); if (rs != FP_SLOW) { hits++; return ret(rs); } missed(__func__, dirfd, path); if (flags == 0) return (int)syscall(SYS_faccessat, dirfd, path, mode); @@ -932,34 +1000,36 @@ static long link_text(const struct res *r, char *text, size_t size, int *changed return (long)strlen(text); } -static ssize_t readlink_common(int dirfd, const char *path, char *buf, size_t size) { - REAL(readlinkat, ssize_t (*)(int, const char *, char *, size_t)); +static long fp_readlink(int dirfd, const char *path, char *buf, size_t size, size_t *written) { struct res r; char text[PATH_MAX]; int changed; long rs = size ? resolve(dirfd, path, 0, &r) : FP_SLOW; if (rs == 1) rs = -ENOENT; if (rs == 0) rs = link_text(&r, text, size, &changed); - if (rs == FP_SLOW) { - missed(__func__, dirfd, path); - return real_readlinkat(dirfd, path, buf, size); - } - hits++; - if (rs < 0) return ret(rs); + if (rs < 0) return rs; size_t n = rs; if (!changed) { n = n < size ? n : size; memcpy(buf, text, n); + if (written) *written = n; return n; } size_t max = size < PATH_MAX ? size : PATH_MAX; if (n + 1 < max) { memcpy(buf, text, n + 1); + if (written) *written = n + 1; return n; } memcpy(buf, text, max); + if (written) *written = max; return max; } + +static ssize_t readlink_common(int dirfd, const char *path, char *buf, size_t size) { + REAL(readlinkat, ssize_t (*)(int, const char *, char *, size_t)); + ANSWER(fp_readlink(dirfd, path, buf, size, NULL), dirfd, path, real_readlinkat(dirfd, path, buf, size)); +} ssize_t readlinkat(int dirfd, const char *path, char *buf, size_t size) { return readlink_common(dirfd, path, buf, size); } ssize_t readlink(const char *path, char *buf, size_t size) { return readlink_common(AT_FDCWD, path, buf, size); } @@ -1021,12 +1091,15 @@ char *__getcwd_chk(char *buf, size_t size, size_t room) { } -int mkdirat(int dirfd, const char *path, mode_t mode) { - REAL(mkdirat, int (*)(int, const char *, mode_t)); +static long fp_mkdir(int dirfd, const char *path, mode_t mode) { struct res r; long rs = resolve(dirfd, path, MAY_BE_UNSEEN, &r); if (rs == 0 || rs == 1 || rs == UNSEEN) rs = sc(SYS_mkdirat, AT_FDCWD, (long)r.host, mode, 0, 0); - ANSWER(rs, dirfd, path, real_mkdirat(dirfd, path, mode)); + return rs; +} +int mkdirat(int dirfd, const char *path, mode_t mode) { + REAL(mkdirat, int (*)(int, const char *, mode_t)); + ANSWER(fp_mkdir(dirfd, path, mode), dirfd, path, real_mkdirat(dirfd, path, mode)); } int mkdir(const char *path, mode_t mode) { return mkdirat(AT_FDCWD, path, mode); } @@ -1072,8 +1145,7 @@ int unlinkat(int dirfd, const char *path, int flags) { return unlink_common(dirf int unlink(const char *path) { return unlink_common(AT_FDCWD, path, 0); } int rmdir(const char *path) { return unlink_common(AT_FDCWD, path, AT_REMOVEDIR); } -static int rename_common(int olddirfd, const char *old, int newdirfd, const char *new, unsigned flags) { - REAL(renameat2, int (*)(int, const char *, int, const char *, unsigned)); +static long fp_rename(int olddirfd, const char *old, int newdirfd, const char *new, unsigned flags) { struct res from, to; long rs = flags & ~RENAME_NOREPLACE || trailing_slash(old) || trailing_slash(new) ? FP_SLOW : resolve(olddirfd, old, 0, &from); if (rs == 1) rs = -ENOENT; @@ -1088,6 +1160,11 @@ static int rename_common(int olddirfd, const char *old, int newdirfd, const char if (rs == 0) forget(); } } + return rs; +} +static int rename_common(int olddirfd, const char *old, int newdirfd, const char *new, unsigned flags) { + REAL(renameat2, int (*)(int, const char *, int, const char *, unsigned)); + long rs = fp_rename(olddirfd, old, newdirfd, new, flags); if (rs != FP_SLOW) { hits++; return ret(rs); } missed(__func__, olddirfd, old); if (!flags) return (int)syscall(SYS_renameat, olddirfd, old, newdirfd, new); @@ -1099,30 +1176,35 @@ int renameat2(int olddirfd, const char *old, int newdirfd, const char *new, unsi int renameat(int olddirfd, const char *old, int newdirfd, const char *new) { return rename_common(olddirfd, old, newdirfd, new, 0); } int rename(const char *old, const char *new) { return rename_common(AT_FDCWD, old, AT_FDCWD, new, 0); } -int symlinkat(const char *target, int dirfd, const char *path) { - REAL(symlinkat, int (*)(const char *, int, const char *)); +static long fp_symlink(const char *target, int dirfd, const char *path) { struct res r; long rs = trailing_slash(path) ? FP_SLOW : resolve(dirfd, path, MAY_BE_UNSEEN, &r); if (rs == 0 || rs == 1 || rs == UNSEEN) { rs = sc(SYS_symlinkat, (long)target, AT_FDCWD, (long)r.host, 0, 0); if (rs == 0) forget(); } - ANSWER(rs, dirfd, path, real_symlinkat(target, dirfd, path)); + return rs; +} +int symlinkat(const char *target, int dirfd, const char *path) { + REAL(symlinkat, int (*)(const char *, int, const char *)); + ANSWER(fp_symlink(target, dirfd, path), dirfd, path, real_symlinkat(target, dirfd, path)); } int symlink(const char *target, const char *path) { return symlinkat(target, AT_FDCWD, path); } -int fchmodat(int dirfd, const char *path, mode_t mode, int flags) { - REAL(fchmodat, int (*)(int, const char *, mode_t, int)); +static long fp_chmod(int dirfd, const char *path, mode_t mode, int flags) { struct res r; long rs = flags ? FP_SLOW : resolve(dirfd, path, 1 | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) rs = sc(SYS_fchmodat, AT_FDCWD, (long)r.host, mode, 0, 0); - ANSWER(rs, dirfd, path, real_fchmodat(dirfd, path, mode, flags)); + return rs; +} +int fchmodat(int dirfd, const char *path, mode_t mode, int flags) { + REAL(fchmodat, int (*)(int, const char *, mode_t, int)); + ANSWER(fp_chmod(dirfd, path, mode, flags), dirfd, path, real_fchmodat(dirfd, path, mode, flags)); } int chmod(const char *path, mode_t mode) { return fchmodat(AT_FDCWD, path, mode, 0); } -static int utimens_common(int dirfd, const char *path, const struct timespec times[2], int flags) { - REAL(utimensat, int (*)(int, const char *, const struct timespec[2], int)); +static long fp_utimens(int dirfd, const char *path, const struct timespec times[2], int flags) { struct res r; long rs; if (!path && fp_ready()) { @@ -1132,7 +1214,11 @@ static int utimens_common(int dirfd, const char *path, const struct timespec tim if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) rs = sc(SYS_utimensat, AT_FDCWD, (long)r.host, (long)times, flags, 0); } - ANSWER(rs, dirfd, path, real_utimensat(dirfd, path, times, flags)); + return rs; +} +static int utimens_common(int dirfd, const char *path, const struct timespec times[2], int flags) { + REAL(utimensat, int (*)(int, const char *, const struct timespec[2], int)); + ANSWER(fp_utimens(dirfd, path, times, flags), dirfd, path, real_utimensat(dirfd, path, times, flags)); } int utimensat(int dirfd, const char *path, const struct timespec times[2], int flags) { return utimens_common(dirfd, path, times, flags); @@ -1159,23 +1245,29 @@ int utime(const char *path, const struct utimbuf *times) { return utimens_common(AT_FDCWD, path, ts, 0); } -int truncate(const char *path, off_t length) { - REAL(truncate, int (*)(const char *, off_t)); +static long fp_truncate(const char *path, off_t length) { struct res r; long rs = resolve(AT_FDCWD, path, 1 | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) rs = sc(SYS_truncate, (long)r.host, length, 0, 0, 0); - ANSWER(rs, AT_FDCWD, path, real_truncate(path, length)); + return rs; +} +int truncate(const char *path, off_t length) { + REAL(truncate, int (*)(const char *, off_t)); + ANSWER(fp_truncate(path, length), AT_FDCWD, path, real_truncate(path, length)); } int truncate64(const char *path, off_t length) __attribute__((alias("truncate"))); -static int statfs_common(const char *path, struct statfs *buf, int (*real)(const char *, struct statfs *)) { +static long fp_statfs(const char *path, struct statfs *buf) { struct res r; long rs = resolve(AT_FDCWD, path, 1, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 && under(r.guest, "/dev/shm", 8)) rs = FP_SLOW; if (rs == 0) rs = sc(SYS_statfs, (long)r.host, (long)buf, 0, 0, 0); - ANSWER(rs, AT_FDCWD, path, real(path, buf)); + return rs; +} +static int statfs_common(const char *path, struct statfs *buf, int (*real)(const char *, struct statfs *)) { + ANSWER(fp_statfs(path, buf), AT_FDCWD, path, real(path, buf)); } int statfs(const char *path, struct statfs *buf) { REAL(statfs, int (*)(const char *, struct statfs *)); @@ -1223,12 +1315,16 @@ int statvfs64(const char *path, struct statvfs64 *buf) { return statvfs_common(path, (struct statvfs *)buf, real_statvfs64); } -static ssize_t getxattr_common(const char *path, const char *name, void *value, size_t size, int follow, - ssize_t (*real)(const char *, const char *, void *, size_t)) { +static long fp_getxattr(const char *path, const char *name, void *value, size_t size, int follow) { struct res r; long rs = resolve(AT_FDCWD, path, follow | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) rs = sc(follow ? SYS_getxattr : SYS_lgetxattr, (long)r.host, (long)name, (long)value, size, 0); + return rs; +} +static ssize_t getxattr_common(const char *path, const char *name, void *value, size_t size, int follow, + ssize_t (*real)(const char *, const char *, void *, size_t)) { + long rs = fp_getxattr(path, name, value, size, follow); if (rs != FP_SLOW) { hits++; return rs < 0 ? ret(rs) : rs; } missed(__func__, AT_FDCWD, path); return real(path, name, value, size); @@ -1242,12 +1338,16 @@ ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) return getxattr_common(path, name, value, size, 0, real_lgetxattr); } -static ssize_t listxattr_common(const char *path, char *list, size_t size, int follow, - ssize_t (*real)(const char *, char *, size_t)) { +static long fp_listxattr(const char *path, char *list, size_t size, int follow) { struct res r; long rs = resolve(AT_FDCWD, path, follow | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) rs = sc(follow ? SYS_listxattr : SYS_llistxattr, (long)r.host, (long)list, size, 0, 0); + return rs; +} +static ssize_t listxattr_common(const char *path, char *list, size_t size, int follow, + ssize_t (*real)(const char *, char *, size_t)) { + long rs = fp_listxattr(path, list, size, follow); if (rs != FP_SLOW) { hits++; return rs < 0 ? ret(rs) : rs; } missed(__func__, AT_FDCWD, path); return real(path, list, size); @@ -1261,17 +1361,18 @@ ssize_t llistxattr(const char *path, char *list, size_t size) { return listxattr_common(path, list, size, 0, real_llistxattr); } -int inotify_add_watch(int fd, const char *path, uint32_t mask) { - REAL(inotify_add_watch, int (*)(int, const char *, uint32_t)); +static long fp_inotify(int fd, const char *path, uint32_t mask) { struct res r; long rs = resolve(AT_FDCWD, path, (mask & IN_DONT_FOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); - if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_inotify_add_watch, fd, (long)r.host, mask, 0, 0); - ANSWER(rs, AT_FDCWD, path, real_inotify_add_watch(fd, path, mask)); + if (rs == 0 || rs == 1 || rs == UNSEEN) rs = sc(SYS_inotify_add_watch, fd, (long)r.host, mask, 0, 0); + return rs; +} +int inotify_add_watch(int fd, const char *path, uint32_t mask) { + REAL(inotify_add_watch, int (*)(int, const char *, uint32_t)); + ANSWER(fp_inotify(fd, path, mask), AT_FDCWD, path, real_inotify_add_watch(fd, path, mask)); } -/* The kernel reports a socket named through /proc/self/fd/N/<name> under that name: map it back, per socket. */ enum { LONG_SELF, LONG_PEER }; static struct { unsigned long ino; int kind; char name[sizeof ((struct sockaddr_un *)0)->sun_path]; char guest[sizeof ((struct sockaddr_un *)0)->sun_path]; } long_names[64]; static unsigned long_next; @@ -1350,7 +1451,6 @@ static long socket_address(const struct sockaddr *addr, socklen_t len, int follo memset(out, 0, sizeof *out); out->sun_family = AF_UNIX; if (hlen >= room) { - /* proot would bind it to a temporary name the fast path cannot see: name it through its directory. */ char *slash = strrchr(r.host, '/'); if (!slash || slash == r.host) return FP_SLOW; *slash = 0; @@ -1763,3 +1863,5 @@ struct passwd *getpwuid(uid_t uid) { missed(__func__, AT_FDCWD, "(passwd)"); return real_getpwuid(uid); } + +#include "svc-patch.h" diff --git a/tools/proot/fastpath/svc-cache.h b/tools/proot/fastpath/svc-cache.h new file mode 100644 index 000000000..57c1be4ba --- /dev/null +++ b/tools/proot/fastpath/svc-cache.h @@ -0,0 +1,90 @@ +struct svc_cached_sites { + uint64_t magic; + uint32_t api, count; + uint64_t offset[256]; +}; +static unsigned svc_cache_hits, svc_cache_misses; + +static int svc_segment(const struct dl_phdr_info *info, uint64_t at, size_t length, unsigned flags) { + for (int i = 0; i < info->dlpi_phnum; i++) { + const ElfW(Phdr) *p = &info->dlpi_phdr[i]; + if (p->p_type == PT_LOAD && (p->p_flags & flags) == flags && + at >= p->p_vaddr && at - p->p_vaddr <= p->p_memsz && + length <= p->p_memsz - (at - p->p_vaddr)) return i + 1; + } + return 0; +} + +static int svc_cache_name(const struct dl_phdr_info *info, char *path, size_t size) { + const char *enabled = getenv("PROOT_FP_SVC_CACHE"); + if (enabled && strcmp(enabled, "1")) return 0; + for (int i = 0; i < info->dlpi_phnum; i++) { + const ElfW(Phdr) *p = &info->dlpi_phdr[i]; + if (p->p_type != PT_NOTE || !svc_segment(info, p->p_vaddr, p->p_memsz, PF_R)) continue; + const unsigned char *note = (const unsigned char *)(info->dlpi_addr + p->p_vaddr); + for (size_t at = 0; p->p_memsz - at >= sizeof(ElfW(Nhdr));) { + ElfW(Nhdr) h; + memcpy(&h, note + at, sizeof h); + at += sizeof h; + size_t name = ((size_t)h.n_namesz + 3) & ~(size_t)3; + size_t desc = ((size_t)h.n_descsz + 3) & ~(size_t)3; + if (name > p->p_memsz - at || desc > p->p_memsz - at - name) break; + if (h.n_type == NT_GNU_BUILD_ID && h.n_namesz == 4 && !memcmp(note + at, "GNU", 4) && + h.n_descsz && h.n_descsz <= 64) { + char id[129]; + static const char hex[] = "0123456789abcdef"; + for (size_t j = 0; j < h.n_descsz; j++) { + unsigned char b = note[at + name + j]; + id[2 * j] = hex[b >> 4]; + id[2 * j + 1] = hex[b & 15]; + } + id[2 * h.n_descsz] = 0; + int n = snprintf(path, size, "/tmp/.droiddeck-svc-v2-%d-%s", svc_android_api, id); + return n > 0 && (size_t)n < size; + } + at += name + desc; + } + } + return 0; +} + +static int svc_cache_read(const struct dl_phdr_info *info, const char *path) { + long fd = fp_open(AT_FDCWD, path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC | O_NONBLOCK, 0); + if (fd < 0) return 0; + struct stat st; + struct svc_cached_sites table; + int valid = sc(SYS_fstat, fd, (long)&st, 0, 0, 0) == 0 && S_ISREG(st.st_mode) && + st.st_uid == (uid_t)sc(SYS_getuid, 0, 0, 0, 0, 0) && !(st.st_mode & 0077) && + st.st_size == sizeof table && sc(SYS_read, fd, (long)&table, sizeof table, 0, 0) == sizeof table; + sc(SYS_close, fd, 0, 0, 0, 0); + if (!valid || table.magic != 0x324356534444ULL || table.api != (unsigned)svc_android_api || + !table.count || table.count > 256 || table.count > 256 - svc_planned) return 0; + for (unsigned i = 0; i < table.count; i++) { + uint64_t offset = table.offset[i]; + int segment = svc_segment(info, offset, 4, PF_R | PF_X); + if ((offset & 3) || (i && offset <= table.offset[i - 1]) || !segment) return 0; + const ElfW(Phdr) *p = &info->dlpi_phdr[segment - 1]; + const uint32_t *text = (const uint32_t *)(info->dlpi_addr + p->p_vaddr); + size_t at = (offset - p->p_vaddr) / 4; + if (text[at] != 0xd4000001U || !svc_supported(svc_site_number(text, at))) return 0; + } + for (unsigned i = 0; i < table.count; i++) + svc_plan[svc_planned++].site = (uint32_t *)(info->dlpi_addr + table.offset[i]); + return 1; +} + +static void svc_cache_write(const struct dl_phdr_info *info, const char *path, size_t first) { + if (svc_planned == first || svc_planned == 256) return; + struct svc_cached_sites table = {.magic = 0x324356534444ULL, .api = svc_android_api, .count = svc_planned - first}; + for (unsigned i = 0; i < table.count; i++) + table.offset[i] = (uintptr_t)svc_plan[first + i].site - info->dlpi_addr; + char temporary[256]; + int n = snprintf(temporary, sizeof temporary, "%s.part-%d", path, getpid()); + if (n <= 0 || n >= (int)sizeof temporary) return; + long fd = fp_open(AT_FDCWD, temporary, O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC, 0600); + if (fd < 0) return; + long written = sc(SYS_write, fd, (long)&table, sizeof table, 0, 0); + sc(SYS_close, fd, 0, 0, 0, 0); + if (written == sizeof table) fp_rename(AT_FDCWD, temporary, AT_FDCWD, path, 0); + fp_unlink(AT_FDCWD, temporary, 0); +} diff --git a/tools/proot/fastpath/svc-dispatch.h b/tools/proot/fastpath/svc-dispatch.h new file mode 100644 index 000000000..b8e87475f --- /dev/null +++ b/tools/proot/fastpath/svc-dispatch.h @@ -0,0 +1,128 @@ +static int svc_android_api; + +static int svc_host_android_api(void) { + const char *value = getenv("PROOT_FP_ANDROID_API"); + if (!value || !*value) return 0; + char *end; + long api = strtol(value, &end, 10); + return !*end && api > 0 && api < 1000 ? (int)api : 0; +} + +static long svc_memory(void *local, long remote, size_t size, int write) { + if (!size) return 0; + struct iovec here = {local, size}, there = {(void *)remote, size}; + return sc(write ? SYS_process_vm_writev : SYS_process_vm_readv, getpid(), + (long)&here, 1, (long)&there, 1); +} + +static int svc_path(long pointer, char *path) { + long n = svc_memory(path, pointer, PATH_MAX, 0); + return n > 0 && memchr(path, 0, (size_t)n) != NULL; +} + +static long svc_output(long result, void *value, long out, size_t size) { + if (result < 0) return result; + return svc_memory(value, out, size, 1) == (long)size ? result : FP_SLOW; +} + +static int svc_supported(int nr) { + switch (nr) { + case SYS_openat: case SYS_newfstatat: case SYS_statx: case SYS_readlinkat: + case SYS_faccessat: case SYS_mkdirat: case SYS_unlinkat: case SYS_renameat: + case SYS_renameat2: case SYS_symlinkat: case SYS_fchmodat: case SYS_utimensat: + case SYS_truncate: case SYS_statfs: case SYS_getxattr: case SYS_lgetxattr: + case SYS_listxattr: case SYS_llistxattr: case SYS_inotify_add_watch: case SYS_getcwd: + return 1; + case SYS_faccessat2: + return svc_android_api > 0; + case SYS_clone3: + return svc_android_api > 0 && svc_android_api < 35; + default: return 0; + } +} + +static long svc_blocked(const long *r) { + if (!svc_android_api) return FP_SLOW; + if (r[8] == SYS_faccessat2 || (r[8] == SYS_clone3 && svc_android_api < 35)) return -ENOSYS; + return FP_SLOW; +} + +static long svc_path_call(const long *r) { +#ifdef FP_SVC_TEST_HOOK + FP_SVC_TEST_HOOK(r); +#endif + char path[PATH_MAX], other[PATH_MAX]; + struct timespec times[2]; + const struct timespec *when = (const struct timespec *)r[2]; + int first = 1, second = -1; + switch (r[8]) { + case SYS_getcwd: { + if (own_cwd(path) == FP_SLOW) return FP_SLOW; + size_t n = strlen(path) + 1; + if ((unsigned long)r[1] < n) return -ERANGE; + return svc_output(n, path, r[0], n); + } + case SYS_truncate: case SYS_statfs: case SYS_getxattr: case SYS_lgetxattr: + case SYS_listxattr: case SYS_llistxattr: first = 0; break; + case SYS_renameat: case SYS_renameat2: second = 3; break; + case SYS_symlinkat: first = 0; second = 2; break; + case SYS_utimensat: + if (when) { + if (svc_memory(times, r[2], sizeof times, 0) != sizeof times) return FP_SLOW; + for (int i = 0; i < 2; i++) + if (times[i].tv_nsec != UTIME_NOW && times[i].tv_nsec != UTIME_OMIT && + (times[i].tv_nsec < 0 || times[i].tv_nsec >= 1000000000L)) return FP_SLOW; + when = times; + } + if (!r[1]) return fp_utimens((int)r[0], NULL, when, (int)r[3]); + break; + case SYS_inotify_add_watch: { + char link[64], target[64]; + snprintf(link, sizeof link, "/proc/self/fd/%d", (int)r[0]); + long n = sc(SYS_readlinkat, AT_FDCWD, (long)link, (long)target, sizeof target - 1, 0); + if (n <= 0) return FP_SLOW; + target[n] = 0; + if (strcmp(target, "anon_inode:inotify")) return FP_SLOW; + break; + } + default: + if (!svc_supported((int)r[8])) return FP_SLOW; + } + if (!svc_path(r[first], path) || (second >= 0 && !svc_path(r[second], other))) return FP_SLOW; + switch (r[8]) { + case SYS_openat: return fp_open((int)r[0], path, (int)r[2], (mode_t)r[3]); + case SYS_newfstatat: { + struct stat st; + return svc_output(fp_stat((int)r[0], path, (int)r[3], &st), &st, r[2], sizeof st); + } + case SYS_statx: { + struct statx st; + return svc_output(fp_statx((int)r[0], path, (int)r[2], (unsigned)r[3], &st), &st, r[4], sizeof st); + } + case SYS_readlinkat: { + char text[PATH_MAX]; + size_t written = 0; + long result = fp_readlink((int)r[0], path, text, (size_t)r[3], &written); + return svc_output(result, text, r[2], written); + } + case SYS_faccessat: return fp_access((int)r[0], path, (int)r[2], 0); + case SYS_mkdirat: return fp_mkdir((int)r[0], path, (mode_t)r[2]); + case SYS_unlinkat: return fp_unlink((int)r[0], path, (int)r[2]); + case SYS_renameat: case SYS_renameat2: + return fp_rename((int)r[0], path, (int)r[2], other, r[8] == SYS_renameat2 ? (unsigned)r[4] : 0); + case SYS_symlinkat: return fp_symlink(path, (int)r[1], other); + case SYS_fchmodat: return fp_chmod((int)r[0], path, (mode_t)r[2], 0); + case SYS_utimensat: return fp_utimens((int)r[0], path, when, (int)r[3]); + case SYS_truncate: return fp_truncate(path, (off_t)r[1]); + case SYS_statfs: { + struct statfs st; + return svc_output(fp_statfs(path, &st), &st, r[1], sizeof st); + } + case SYS_getxattr: case SYS_lgetxattr: + return fp_getxattr(path, (const char *)r[1], (void *)r[2], (size_t)r[3], r[8] == SYS_getxattr); + case SYS_listxattr: case SYS_llistxattr: + return fp_listxattr(path, (char *)r[1], (size_t)r[2], r[8] == SYS_listxattr); + case SYS_inotify_add_watch: return fp_inotify((int)r[0], path, (uint32_t)r[2]); + default: return FP_SLOW; + } +} diff --git a/tools/proot/fastpath/svc-patch.h b/tools/proot/fastpath/svc-patch.h new file mode 100644 index 000000000..6d19da315 --- /dev/null +++ b/tools/proot/fastpath/svc-patch.h @@ -0,0 +1,268 @@ +static inline int svc_number(uint32_t insn) { + if ((insn & 0xffe0001fU) == 0xd2800008U || + (insn & 0xffe0001fU) == 0x52800008U) + return (insn >> 5) & 0xffff; + return -1; +} + +static inline int svc_argument_instruction(uint32_t insn) { + if (insn == 0xd503201fU) return 1; + if ((insn & 0xffc00000U) == 0x29000000U || + (insn & 0xffc00000U) == 0xa9000000U || + (insn & 0xffc00000U) == 0xb9000000U || + (insn & 0xffc00000U) == 0xf9000000U) return 1; + if ((insn & 31) == 8) return 0; + return (insn & 0xffe0ffe0U) == 0xaa0003e0U || + (insn & 0xffe0ffe0U) == 0x2a0003e0U || + (insn & 0xfffffc00U) == 0x93407c00U || + (insn & 0x7f800000U) == 0x52800000U || + (insn & 0x7f800000U) == 0x12800000U || + (insn & 0xffc00000U) == 0xb9400000U || + (insn & 0xffc00000U) == 0xf9400000U || + (insn & 0xffc00000U) == 0xb9800000U || + (insn & 0xff000000U) == 0x91000000U || + (insn & 0xff000000U) == 0xd1000000U || + (insn & 0xff000000U) == 0x11000000U || + (insn & 0xff000000U) == 0x51000000U; +} + +static inline int svc_site_number(const uint32_t *text, size_t at) { + for (size_t back = 1; back <= 8 && back <= at; back++) { + uint32_t insn = text[at - back]; + int nr = svc_number(insn); + if (nr >= 0) return nr; + if (!svc_argument_instruction(insn)) break; + } + return -1; +} + +static inline int svc_branch(uintptr_t from, uintptr_t to, uint32_t *out) { + int64_t delta = (int64_t)to - (int64_t)from; + if ((delta & 3) || delta < -0x8000000LL || delta >= 0x8000000LL) return 0; + *out = 0x14000000U | ((uint32_t)(delta / 4) & 0x03ffffffU); + return 1; +} + +#if defined(__aarch64__) && !defined(FP_SVC_ENCODINGS_ONLY) +#include <asm/hwcap.h> +#include <link.h> +#include <sys/uio.h> +#include <signal.h> + +static __thread uintptr_t svc_busy __attribute__((tls_model("initial-exec"))); +static unsigned svc_sites, svc_pages; +static unsigned long svc_fast, svc_slow; +static unsigned long long svc_scan_ns, svc_patch_ns; + +#include "svc-dispatch.h" +#include "svc-stack.h" + +static long svc_original(const long *r) { + register long x0 __asm__("x0") = r[0]; + register long x1 __asm__("x1") = r[1]; + register long x2 __asm__("x2") = r[2]; + register long x3 __asm__("x3") = r[3]; + register long x4 __asm__("x4") = r[4]; + register long x5 __asm__("x5") = r[5]; + register long x8 __asm__("x8") = r[8]; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5), "r"(x8) : "memory", "cc"); + return x0; +} + +__attribute__((used, visibility("hidden"))) +long fp_svc_dispatch(const long *r) { + int saved_errno = errno; + long result = svc_blocked(r); + uintptr_t frame = (uintptr_t)r; + if (result == FP_SLOW && (!svc_busy || frame >= svc_busy)) { + uintptr_t previous = svc_busy; + svc_busy = frame; + if (svc_stack_room(frame)) { result = svc_path_call(r); svc_busy = 0; } + else svc_busy = previous; + } + if (result == FP_SLOW) { + __atomic_fetch_add(&svc_slow, 1, __ATOMIC_RELAXED); + result = svc_original(r); + } else __atomic_fetch_add(&svc_fast, 1, __ATOMIC_RELAXED); + errno = saved_errno; + return result; +} + +void fp_svc_entry(void) __attribute__((visibility("hidden"))); +__asm__( + ".text\n.p2align 4\n.hidden fp_svc_entry\n.type fp_svc_entry,%function\nfp_svc_entry:\n" + ".cfi_startproc\n.cfi_def_cfa sp, 16\n.cfi_return_column 16\n" + "bti j\nsub sp, sp, #800\n.cfi_def_cfa_offset 816\n" + "stp x0, x1, [sp, #0]\nstp x2, x3, [sp, #16]\n" + "stp x4, x5, [sp, #32]\nstp x6, x7, [sp, #48]\n" + "stp x8, x9, [sp, #64]\nstp x10, x11, [sp, #80]\n" + "stp x12, x13, [sp, #96]\nstp x14, x15, [sp, #112]\n" + "stp x18, x19, [sp, #128]\nstp x20, x21, [sp, #144]\n" + "stp x22, x23, [sp, #160]\nstp x24, x25, [sp, #176]\n" + "stp x26, x27, [sp, #192]\nstp x28, x29, [sp, #208]\n" + "stp x30, x17, [sp, #224]\nmrs x0, nzcv\nstr x0, [sp, #240]\n" + "ldr x0, [x17, #8]\nstr x0, [sp, #784]\n" + ".cfi_offset 16, -32\n.cfi_offset 19, -680\n.cfi_offset 20, -672\n" + ".cfi_offset 21, -664\n.cfi_offset 22, -656\n.cfi_offset 23, -648\n" + ".cfi_offset 24, -640\n.cfi_offset 25, -632\n.cfi_offset 26, -624\n" + ".cfi_offset 27, -616\n.cfi_offset 28, -608\n.cfi_offset 29, -600\n.cfi_offset 30, -592\n" + ".cfi_offset 72, -432\n.cfi_offset 73, -416\n.cfi_offset 74, -400\n.cfi_offset 75, -384\n" + ".cfi_offset 76, -368\n.cfi_offset 77, -352\n.cfi_offset 78, -336\n.cfi_offset 79, -320\n" + "mrs x0, fpcr\nstr x0, [sp, #768]\nmrs x0, fpsr\nstr x0, [sp, #776]\n" + "stp q0, q1, [sp, #256]\nstp q2, q3, [sp, #288]\n" + "stp q4, q5, [sp, #320]\nstp q6, q7, [sp, #352]\n" + "stp q8, q9, [sp, #384]\nstp q10, q11, [sp, #416]\n" + "stp q12, q13, [sp, #448]\nstp q14, q15, [sp, #480]\n" + "stp q16, q17, [sp, #512]\nstp q18, q19, [sp, #544]\n" + "stp q20, q21, [sp, #576]\nstp q22, q23, [sp, #608]\n" + "stp q24, q25, [sp, #640]\nstp q26, q27, [sp, #672]\n" + "stp q28, q29, [sp, #704]\nstp q30, q31, [sp, #736]\n" + "mov x0, sp\nbl fp_svc_dispatch\nstr x0, [sp]\n" + "ldp q0, q1, [sp, #256]\nldp q2, q3, [sp, #288]\n" + "ldp q4, q5, [sp, #320]\nldp q6, q7, [sp, #352]\n" + "ldp q8, q9, [sp, #384]\nldp q10, q11, [sp, #416]\n" + "ldp q12, q13, [sp, #448]\nldp q14, q15, [sp, #480]\n" + "ldp q16, q17, [sp, #512]\nldp q18, q19, [sp, #544]\n" + "ldp q20, q21, [sp, #576]\nldp q22, q23, [sp, #608]\n" + "ldp q24, q25, [sp, #640]\nldp q26, q27, [sp, #672]\n" + "ldp q28, q29, [sp, #704]\nldp q30, q31, [sp, #736]\n" + "ldr x0, [sp, #768]\nmsr fpcr, x0\nldr x0, [sp, #776]\nmsr fpsr, x0\n" + "ldr x0, [sp, #240]\nmsr nzcv, x0\n" + "ldp x0, x1, [sp, #0]\nldp x2, x3, [sp, #16]\n" + "ldp x4, x5, [sp, #32]\nldp x6, x7, [sp, #48]\n" + "ldp x8, x9, [sp, #64]\nldp x10, x11, [sp, #80]\n" + "ldp x12, x13, [sp, #96]\nldp x14, x15, [sp, #112]\n" + "ldp x18, x19, [sp, #128]\nldp x20, x21, [sp, #144]\n" + "ldp x22, x23, [sp, #160]\nldp x24, x25, [sp, #176]\n" + "ldp x26, x27, [sp, #192]\nldp x28, x29, [sp, #208]\n" + "ldr x30, [sp, #224]\nldr x16, [sp, #232]\n" + "add sp, sp, #800\n.cfi_def_cfa_offset 16\nbr x16\n.cfi_endproc\n.size fp_svc_entry, .-fp_svc_entry\n" +); + +static int svc_emit(uint32_t *code, uint32_t *site, uint32_t *branch) { + uint32_t back; + if (!svc_branch((uintptr_t)site, (uintptr_t)code, branch) || + !svc_branch((uintptr_t)(code + 5), (uintptr_t)(site + 1), &back)) return 0; + code[0] = 0xa9bf47f0U; + code[1] = 0x580000f0U; + code[2] = 0x10000051U; + code[3] = 0xd61f0200U; + code[4] = 0xa8c147f0U; + code[5] = back; + uintptr_t entry = (uintptr_t)fp_svc_entry; + uintptr_t resume = (uintptr_t)(site + 1); + memcpy(code + 6, &resume, sizeof resume); + memcpy(code + 8, &entry, sizeof entry); + return 1; +} + +struct svc_site { uint32_t *site; uint32_t branch; }; +static struct svc_site svc_plan[256]; +static size_t svc_planned; + +#include "svc-cache.h" + +static int svc_object(struct dl_phdr_info *info, size_t size, void *unused) { + (void)size; + (void)unused; + const char *name = strrchr(info->dlpi_name, '/'); + name = name ? name + 1 : info->dlpi_name; + if (strcmp(name, "libc.so.6") && strcmp(name, "ld-linux-aarch64.so.1")) return 0; + char cache[224]; + int cached = svc_cache_name(info, cache, sizeof cache); + if (cached && svc_cache_read(info, cache)) { svc_cache_hits++; return 0; } + if (cached) svc_cache_misses++; + size_t first = svc_planned; + for (int i = 0; i < info->dlpi_phnum; i++) { + const ElfW(Phdr) *ph = &info->dlpi_phdr[i]; + if (ph->p_type != PT_LOAD || !(ph->p_flags & PF_X)) continue; + uint32_t *text = (uint32_t *)(info->dlpi_addr + ph->p_vaddr); + for (size_t j = 1; j < ph->p_memsz / 4 && svc_planned < 256; j++) { + if (text[j] != 0xd4000001U) continue; + int nr = svc_site_number(text, j); + if (!svc_supported(nr)) continue; + svc_plan[svc_planned++].site = &text[j]; + } + } + if (cached) svc_cache_write(info, cache, first); + return 0; +} + +static uint32_t *svc_relay_page(uintptr_t site, size_t page) { + uintptr_t base = site & ~(uintptr_t)(page - 1); + for (uintptr_t delta = page; delta < 0x7ff0000UL; delta += 0x10000UL) { + for (int direction = -1; direction <= 1; direction += 2) { + uintptr_t at = direction < 0 ? base - delta : base + delta; + if (at < page) continue; + void *p = mmap((void *)at, page, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED_NOREPLACE, -1, 0); + if (p == (void *)at) return p; + if (p != MAP_FAILED) munmap(p, page); + } + } + return NULL; +} + +#include "svc-publish.h" + +static int svc_single_thread(void) { + struct entry { uint64_t ino; int64_t off; unsigned short len; unsigned char type; char name[]; }; + char buf[4096] __attribute__((aligned(8))); + long fd = sc(SYS_openat, AT_FDCWD, (long)"/proc/self/task", O_RDONLY | O_DIRECTORY | O_CLOEXEC, 0, 0); + if (fd < 0) return 0; + int count = 0; + long n; + while ((n = sc(SYS_getdents64, fd, (long)buf, sizeof buf, 0, 0)) > 0) { + for (long at = 0; at < n;) { + const struct entry *e = (const struct entry *)(buf + at); + if (n - at < (long)offsetof(struct entry, name) + 1 || + e->len < offsetof(struct entry, name) + 1 || e->len > n - at) { count = -1; goto done; } + if (e->name[0] >= '0' && e->name[0] <= '9' && ++count > 1) goto done; + at += e->len; + } + } + if (n < 0) count = -1; +done: + sc(SYS_close, fd, 0, 0, 0, 0); + return count == 1; +} + +static void svc_stats(void) { + char line[256]; + int n = snprintf(line, sizeof line, "fastpath-svc[%d]: %u sites, %u relay pages, %lu fast, %lu to proot; scan %llu us, patch %llu us, android %d, cache %u hit %u miss\n", + getpid(), svc_sites, svc_pages, svc_fast, svc_slow, svc_scan_ns / 1000, svc_patch_ns / 1000, svc_android_api, svc_cache_hits, svc_cache_misses); + if (n > 0 && write(2, line, n < (int)sizeof line ? n : (int)sizeof line - 1) < 0) {} +} + +static unsigned long long svc_clock(void) { + struct timespec t; + if (sc(SYS_clock_gettime, CLOCK_MONOTONIC, (long)&t, 0, 0, 0) < 0) return 0; + return (unsigned long long)t.tv_sec * 1000000000ULL + t.tv_nsec; +} + +static void svc_child(void) { svc_busy = 0; } + +__attribute__((constructor)) static void svc_patch_init(void) { + const char *enabled = getenv("PROOT_FP_PATCH_SVC"); + if ((enabled && strcmp(enabled, "1")) || !fp_ready()) return; + if (getauxval(AT_HWCAP) & HWCAP_SVE) return; +#ifdef HWCAP2_SME + if (getauxval(AT_HWCAP2) & HWCAP2_SME) return; +#endif + if (!svc_single_thread()) return; + if (pthread_atfork(NULL, NULL, svc_child)) return; + svc_android_api = svc_host_android_api(); + size_t page = (size_t)sysconf(_SC_PAGESIZE); + if (page < 4096 || (page & (page - 1))) return; + int mem = (int)sc(SYS_openat, AT_FDCWD, (long)"/proc/self/mem", O_RDWR | O_CLOEXEC, 0, 0); + if (mem < 0) return; + unsigned long long start = svc_clock(); + dl_iterate_phdr(svc_object, NULL); + svc_scan_ns = svc_clock() - start; + start = svc_clock(); + svc_publish(mem, page); + sc(SYS_close, mem, 0, 0, 0, 0); + svc_patch_ns = svc_clock() - start; + if (getenv("PROOT_FP_STATS")) atexit(svc_stats); +} +#endif diff --git a/tools/proot/fastpath/svc-publish.h b/tools/proot/fastpath/svc-publish.h new file mode 100644 index 000000000..002e06c51 --- /dev/null +++ b/tools/proot/fastpath/svc-publish.h @@ -0,0 +1,28 @@ +static void svc_publish(int mem, size_t page) { + for (size_t first = 0; first < svc_planned;) { + uint32_t *relay = svc_relay_page((uintptr_t)svc_plan[first].site, page); + if (!relay) { first++; continue; } + size_t end = first; + for (; end < svc_planned && (end - first + 1) * 40 <= page; end++) { + uint32_t *code = relay + (end - first) * 10; + if (!svc_emit(code, svc_plan[end].site, &svc_plan[end].branch)) break; + } + __builtin___clear_cache((char *)relay, (char *)relay + page); + if (end == first || mprotect(relay, page, PROT_READ | PROT_EXEC)) { + munmap(relay, page); + first++; + continue; + } + unsigned patched = 0; + for (size_t i = first; i < end; i++) { + struct svc_site *s = &svc_plan[i]; + long written = sc(SYS_pwrite64, mem, (long)&s->branch, sizeof s->branch, (long)s->site, 0); + if (written != sizeof s->branch) continue; + __builtin___clear_cache((char *)s->site, (char *)(s->site + 1)); + patched++; + } + if (patched) { svc_sites += patched; svc_pages++; } + else munmap(relay, page); + first = end; + } +} diff --git a/tools/proot/fastpath/svc-stack.h b/tools/proot/fastpath/svc-stack.h new file mode 100644 index 000000000..0739bebc6 --- /dev/null +++ b/tools/proot/fastpath/svc-stack.h @@ -0,0 +1,82 @@ +#include <sys/resource.h> +#include <string.h> + +static __thread uintptr_t svc_stack_low __attribute__((tls_model("initial-exec"))); +static __thread uintptr_t svc_stack_high __attribute__((tls_model("initial-exec"))); +static __thread uintptr_t svc_stack_gap __attribute__((tls_model("initial-exec"))); +static __thread int svc_stack_main __attribute__((tls_model("initial-exec"))); + +static int svc_hex(const char **text, uintptr_t *value) { + const char *p = *text; + uintptr_t n = 0; + int digits = 0; + for (;; p++) { + unsigned c = (unsigned char)*p; + unsigned d = c >= '0' && c <= '9' ? c - '0' : c >= 'a' && c <= 'f' ? c - 'a' + 10 : 16; + if (d == 16) break; + if (++digits > (int)(2 * sizeof n)) return 0; + n = (n << 4) | d; + } + *text = p; + *value = n; + return digits > 0; +} + +static int svc_stack_line(const char *line, uintptr_t sp, uintptr_t *low, uintptr_t *high) { + uintptr_t a, b; + if (!svc_hex(&line, &a) || *line++ != '-' || !svc_hex(&line, &b) || + *line++ != ' ' || line[0] != 'r' || line[1] != 'w' || a >= b || sp < a || sp >= b) return 0; + *low = a; + *high = b; + return 1; +} + +static __attribute__((noinline)) int svc_stack_find(uintptr_t sp) { + char chunk[512], line[96]; + size_t at = 0; + long fd = sc(SYS_openat, AT_FDCWD, (long)"/proc/self/maps", O_RDONLY | O_CLOEXEC, 0, 0); + if (fd < 0) return 0; + long n; + uintptr_t low = 0, high = 0, previous = 0; + int found = 0; + while (!found && (n = sc(SYS_read, fd, (long)chunk, sizeof chunk, 0, 0)) > 0) { + for (long i = 0; i < n; i++) { + if (chunk[i] == '\n') { + line[at] = 0; + found = svc_stack_line(line, sp, &low, &high); + if (!found) { + const char *p = line; + uintptr_t a, b; + if (svc_hex(&p, &a) && *p++ == '-' && svc_hex(&p, &b) && b <= sp) previous = b; + } + at = 0; + if (found) break; + } else if (at < sizeof line - 1) line[at++] = chunk[i]; + } + } + sc(SYS_close, fd, 0, 0, 0, 0); + if (found) { + svc_stack_low = 0; + svc_stack_high = high; + svc_stack_main = strstr(line, "[stack]") != NULL; + svc_stack_gap = previous < low && low - previous > 16 * 1024 * 1024 ? previous + 16 * 1024 * 1024 : low; + svc_stack_low = low; + } + return found; +} + +static int svc_stack_room(uintptr_t sp) { + stack_t alt; + if (sc(SYS_sigaltstack, 0, (long)&alt, 0, 0, 0) < 0 || (alt.ss_flags & SS_ONSTACK)) return 0; + if (!svc_stack_low || sp < svc_stack_low || sp >= svc_stack_high) + if (!svc_stack_find(sp)) return 0; + uintptr_t low = svc_stack_low; + if (svc_stack_main) { + struct rlimit limit; + if (sc(SYS_prlimit64, 0, RLIMIT_STACK, 0, (long)&limit, 0) < 0) return 0; + uintptr_t grow = limit.rlim_cur >= svc_stack_high ? 0 : svc_stack_high - limit.rlim_cur; + if (grow < svc_stack_gap) grow = svc_stack_gap; + if (grow < low) low = grow; + } + return sp - low >= 96 * 1024; +} diff --git a/tools/proot/patches/0015-lost-fork-events.patch b/tools/proot/patches/0015-lost-fork-events.patch index d3912abf4..dc1a4a2db 100644 --- a/tools/proot/patches/0015-lost-fork-events.patch +++ b/tools/proot/patches/0015-lost-fork-events.patch @@ -15,19 +15,17 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c #include <sys/ptrace.h> /* ptrace(2), PTRACE_*, */ #include <errno.h> /* E*, */ #include <inttypes.h> /* PRI*, */ -+#include <unistd.h> /* getpid(2), */ -+#include <stdio.h> /* fopen(3), fgets(3), snprintf(3), */ -+#include <dirent.h> /* opendir(3), readdir(3), closedir(3), */ -+#include <limits.h> /* INT_MAX, */ ++#include <unistd.h> ++#include <stdio.h> ++#include <dirent.h> ++#include <limits.h> #include "tracee/tracee.h" #include "tracee/reg.h" -@@ -402,16 +406,128 @@ +@@ -402,16 +406,119 @@ } } -+/* Read host process IDs, not PRoot's guest /proc view. /proc/<tid>/status -+ * works for non-leader threads too, even though /proc lists only leaders. */ +static int read_task_ids(pid_t pid, long *tgid, long *ppid, long *tracer) +{ + char path[64], line[256]; @@ -54,13 +52,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + return status; +} + -+/* Recover only a delivered creation event whose GETEVENTMSG succeeded but -+ * returned zero. The creator is still stopped at that event, and its real -+ * clone flags have already been read. Require exactly one uninitialized, -+ * PRoot-traced candidate of the right kind and relationship. Never infer -+ * clone flags from PPid, substitute a process for a thread, or choose by PID -+ * order. Include tracees whose initial SIGSTOP was handled before this event. -+ * Missing events and ambiguous candidates need separate recovery logic. */ +static int find_event_child(Tracee *parent, word_t clone_flags, unsigned long *result) +{ + char path[64]; @@ -153,7 +144,7 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c int status; /* If the tracee calls clone(2) with the CLONE_VFORK flag, -@@ -425,24 +541,62 @@ +@@ -425,24 +532,60 @@ * order to get the right flags. */ status = fetch_regs(parent); @@ -185,8 +176,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + static bool warned; + + status = flags_known ? find_event_child(parent, clone_flags, &pid) : -EIO; -+ /* A thread creator can reach clone's exit while its child is held. -+ * vfork cannot: its creator waits for the child, so do not defer it. */ + if (status == -EAGAIN && (clone_flags & CLONE_THREAD) != 0 && + (clone_flags & CLONE_VFORK) == 0) { + parent->pending_clone_flags = clone_flags; @@ -218,14 +207,10 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c child = get_tracee(parent, (pid_t) pid, true); if (child == NULL) { -@@ -628,6 +782,52 @@ +@@ -628,6 +771,46 @@ return 0; } -+/* A clone event occurs before the creating thread returns from clone. For an -+ * ambiguous thread lookup, obtain the exact TID at that syscall's exit instead -+ * of guessing from the order of /proc entries. Called before normal syscall -+ * exit handling so the registers and inherited tracee state are still intact. */ +void finish_pending_child(Tracee *parent) +{ + word_t flags = parent->pending_clone_flags; @@ -243,8 +228,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + status = -ESRCH; + goto failed; + } -+ /* Validate the host TID before setup. This also rejects an unmappable -+ * PID from a different PID namespace instead of adopting an unrelated task. */ + status = read_task_ids(parent->pid, &ptgid, &ppid, &tracer); + if (status < 0) + goto failed; @@ -295,17 +278,16 @@ diff --git a/src/tracee/event.c b/src/tracee/event.c diff --git a/src/tracee/tracee.h b/src/tracee/tracee.h --- a/src/tracee/tracee.h +++ b/src/tracee/tracee.h -@@ -172,6 +172,9 @@ +@@ -172,6 +172,8 @@ SIGSTOP_ALLOWED, /* Allow SIGSTOP (once the parent is known). */ SIGSTOP_PENDING, /* Block SIGSTOP until the parent is unknown. */ } sigstop; + -+ /* Nonzero only while resolving an ambiguous thread clone at its exit. */ + word_t pending_clone_flags; /* True if next SIGSYS caused by seccomp should be silently dropped * without affecting state of any registers. */ -@@ -310,6 +313,7 @@ +@@ -310,6 +312,7 @@ bool only_with_pevent, word_t wait_options); extern bool has_ptracees(const Tracee *ptracer, pid_t pid, word_t wait_options); extern int new_child(Tracee *parent, word_t clone_flags); 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 000000000..20d4859c5 --- /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/patches/0019-openat2-emulation.patch b/tools/proot/patches/0019-openat2-emulation.patch new file mode 100644 index 000000000..1a1f7b015 --- /dev/null +++ b/tools/proot/patches/0019-openat2-emulation.patch @@ -0,0 +1,72 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 14:12:04 -0400 +Subject: [PATCH] syscall: emulate openat2 through a translated openat + +--- + src/syscall/enter.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 49 insertions(+), 2 deletions(-) + +diff --git a/src/syscall/enter.c b/src/syscall/enter.c +index 121c742..66b9e6b 100644 +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -491,9 +491,56 @@ int translate_syscall_enter(Tracee *tracee) + status = translate_path2(tracee, dirfd, path, SYSARG_2, REGULAR); + break; + +- case PR_openat2: +- status = -ENOSYS; ++ case PR_openat2: { ++ struct { uint64_t flags; uint64_t mode; uint64_t resolve; } how; ++ word_t size = peek_reg(tracee, CURRENT, SYSARG_4); ++ ++ if (size < sizeof(how) || size > 4096) { ++ status = size < sizeof(how) ? -EINVAL : -E2BIG; ++ break; ++ } ++ status = read_data(tracee, &how, peek_reg(tracee, CURRENT, SYSARG_3), sizeof(how)); ++ if (status < 0) ++ break; ++ if ((how.resolve & ~(uint64_t) 0x3f) != 0 ++ || ((how.resolve & 0x08) != 0 && (how.resolve & 0x10) != 0) ++ || (how.mode != 0 && (how.flags & (O_CREAT | __O_TMPFILE)) == 0) ++ || (how.flags >> 32) != 0) { ++ status = -EINVAL; ++ break; ++ } ++ if ((how.resolve & 0x20) != 0) { ++ status = -EAGAIN; ++ break; ++ } ++ if ((how.resolve & 0x1f) != 0) { ++ status = -ENOSYS; ++ break; ++ } ++#ifdef __ANDROID__ ++ if ((how.flags & __O_TMPFILE) != 0) { ++ status = -EOPNOTSUPP; ++ break; ++ } ++#endif ++ dirfd = peek_reg(tracee, CURRENT, SYSARG_1); ++ status = get_sysarg_path(tracee, path, SYSARG_2); ++ if (status < 0) ++ break; ++ ++ if ( ((how.flags & O_NOFOLLOW) != 0) ++ || ((how.flags & O_EXCL) != 0 && (how.flags & O_CREAT) != 0)) ++ status = translate_path2(tracee, dirfd, path, SYSARG_2, SYMLINK); ++ else ++ status = translate_path2(tracee, dirfd, path, SYSARG_2, REGULAR); ++ if (status < 0) ++ break; ++ ++ set_sysnum(tracee, PR_openat); ++ poke_reg(tracee, SYSARG_3, how.flags); ++ poke_reg(tracee, SYSARG_4, how.mode); + break; ++ } + + + diff --git a/tools/proot/patches/0020-l2s-visible-exe.patch b/tools/proot/patches/0020-l2s-visible-exe.patch new file mode 100644 index 000000000..45ba5d2dc --- /dev/null +++ b/tools/proot/patches/0020-l2s-visible-exe.patch @@ -0,0 +1,123 @@ +From 771667d739c8501729b4037a7377793fd16e908e Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 14:12:37 -0400 +Subject: [PATCH] execve: show the linked name as /proc/self/exe for + link2symlink files + +--- + src/execve/enter.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +diff --git a/src/execve/enter.c b/src/execve/enter.c +index c562d14..f185e9a 100644 +--- a/src/execve/enter.c ++++ b/src/execve/enter.c +@@ -592,6 +592,96 @@ static inline const char *get_loader_path(const Tracee *tracee) + * translate_load_*(). This function returns -errno if an error + * occured, otherwise 0. + */ ++static bool is_l2s_name(const char *path) ++{ ++ const char *name = strrchr(path, '/'); ++ ++ name = name != NULL ? name + 1 : path; ++ return strncmp(name, ".l2s.", 5) == 0 || strncmp(name, ".proot.l2s.", 11) == 0; ++} ++ ++static void lexical_path(char path[PATH_MAX]) ++{ ++ char result[PATH_MAX]; ++ char *component; ++ char *next; ++ size_t length = 0; ++ ++ for (component = path; *component != '\0'; component = next) { ++ size_t size; ++ ++ while (*component == '/') ++ component++; ++ next = strchrnul(component, '/'); ++ size = next - component; ++ if (size == 0 || (size == 1 && component[0] == '.')) ++ continue; ++ if (size == 2 && component[0] == '.' && component[1] == '.') { ++ while (length > 0 && result[length - 1] != '/') ++ length--; ++ if (length > 0) ++ length--; ++ continue; ++ } ++ result[length++] = '/'; ++ memcpy(result + length, component, size); ++ length += size; ++ } ++ if (length == 0) ++ result[length++] = '/'; ++ result[length] = '\0'; ++ strcpy(path, result); ++} ++ ++static void visible_exe(Tracee *tracee, const char *user_path, char exe[PATH_MAX]) ++{ ++ char path[PATH_MAX]; ++ char host[PATH_MAX]; ++ char target[PATH_MAX]; ++ char *slash; ++ ssize_t length; ++ int i; ++ ++ if (user_path[0] == '/') { ++ if (strlen(user_path) >= PATH_MAX) ++ return; ++ strcpy(path, user_path); ++ } ++ else if (join_paths(2, path, tracee->fs->cwd, user_path) < 0) ++ return; ++ lexical_path(path); ++ ++ for (i = 0; i < 40; i++) { ++ if (translate_path(tracee, host, AT_FDCWD, path, false) < 0) ++ return; ++ if (is_l2s_name(host)) ++ break; ++ length = readlink(host, target, PATH_MAX - 1); ++ if (length < 0) ++ return; ++ target[length] = '\0'; ++ if (is_l2s_name(target)) ++ break; ++ if (target[0] == '/') ++ strcpy(path, target); ++ else { ++ slash = strrchr(path, '/'); ++ *slash = '\0'; ++ if (translate_path(tracee, host, AT_FDCWD, path[0] != '\0' ? path : "/", true) < 0) ++ return; ++ if (detranslate_path(tracee, host, NULL) < 0) ++ return; ++ if (join_paths(2, path, host, target) < 0) ++ return; ++ } ++ lexical_path(path); ++ } ++ if (i == 40) ++ return; ++ ++ strcpy(exe, path); ++} ++ + int translate_execve_enter(Tracee *tracee) + { + char user_path[PATH_MAX]; +@@ -642,6 +732,8 @@ int translate_execve_enter(Tracee *tracee) + strcpy(new_exe, host_path); + status = detranslate_path(tracee, new_exe, NULL); + if (status >= 0) { ++ if (is_l2s_name(new_exe)) ++ visible_exe(tracee, user_path, new_exe); + talloc_unlink(tracee, tracee->new_exe); + tracee->new_exe = talloc_strdup(tracee, new_exe); + } +-- +2.43.0 + diff --git a/tools/proot/patches/0021-fake-root-real-fifo-errors.patch b/tools/proot/patches/0021-fake-root-real-fifo-errors.patch new file mode 100644 index 000000000..cb5b12096 --- /dev/null +++ b/tools/proot/patches/0021-fake-root-real-fifo-errors.patch @@ -0,0 +1,30 @@ +From 4486efde6200dc8a8df4097a868b65e449d20e82 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 14:12:47 -0400 +Subject: [PATCH] fake_id0: report real errors for FIFO and socket mknod + +--- + src/extension/fake_id0/fake_id0.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/extension/fake_id0/fake_id0.c b/src/extension/fake_id0/fake_id0.c +index 5c8a8cd..dc28529 100644 +--- a/src/extension/fake_id0/fake_id0.c ++++ b/src/extension/fake_id0/fake_id0.c +@@ -940,7 +940,12 @@ static int handle_sysexit_end(Tracee *tracee, Config *config) + case PR_setgroups32: + #endif + case PR_mknod: +- case PR_mknodat: ++ case PR_mknodat: { ++ mode_t mode = peek_reg(tracee, ORIGINAL, sysnum == PR_mknod ? SYSARG_2 : SYSARG_3); ++ if (S_ISFIFO(mode) || S_ISSOCK(mode) || S_ISREG(mode) || (mode & S_IFMT) == 0) ++ return 0; ++ return handle_perm_err_exit_end(tracee, config, false); ++ } + case PR_capset: + case PR_chmod: + case PR_chown: +-- +2.43.0 + diff --git a/tools/proot/patches/0022-fake-root-statx-owners.patch b/tools/proot/patches/0022-fake-root-statx-owners.patch new file mode 100644 index 000000000..07cf3f010 --- /dev/null +++ b/tools/proot/patches/0022-fake-root-statx-owners.patch @@ -0,0 +1,24 @@ +From facb0f6476b374cb9bdb07e388936f4ca0a829ce Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 15:17:52 -0400 +Subject: [PATCH] fake_id0: keep the statx exit stop so owners stay faked + +--- + src/extension/fake_id0/fake_id0.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/extension/fake_id0/fake_id0.c b/src/extension/fake_id0/fake_id0.c +index dc28529..a5ee018 100644 +--- a/src/extension/fake_id0/fake_id0.c ++++ b/src/extension/fake_id0/fake_id0.c +@@ -349,6 +349,7 @@ static FilteredSysnum filtered_sysnums[] = { + { PR_stat64, FILTER_SYSEXIT }, + { PR_statfs, FILTER_SYSEXIT }, + { PR_statfs64, FILTER_SYSEXIT }, ++ { PR_statx, FILTER_SYSEXIT }, + FILTERED_SYSNUM_END, + }; + +-- +2.43.0 + diff --git a/tools/proot/patches/0023-reused-pid-new-child.patch b/tools/proot/patches/0023-reused-pid-new-child.patch new file mode 100644 index 000000000..ec4cbe5a4 --- /dev/null +++ b/tools/proot/patches/0023-reused-pid-new-child.patch @@ -0,0 +1,51 @@ +From 3e47c091e500b274b255d9b8d326236744aa4347 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 16:27:14 -0400 +Subject: [PATCH] tracee: replace a stale tracee when the kernel reuses its pid + for a new child + +--- + src/tracee/tracee.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c +index 5029bbc..cbadaec 100644 +--- a/src/tracee/tracee.c ++++ b/src/tracee/tracee.c +@@ -57,6 +57,8 @@ static Tracees buckets[TRACEE_BUCKETS]; + + static bool terminations_pending = false; + ++static Tracees reused_pid_tracees; ++ + static Tracees *bucket_of(pid_t pid) + { + return &buckets[(unsigned int) pid % TRACEE_BUCKETS]; +@@ -599,6 +601,24 @@ static int new_child_setup(Tracee *parent, unsigned long pid, word_t clone_flags + Tracee *child; + + child = get_tracee(parent, (pid_t) pid, true); ++ if (child != NULL ++ && (child->exe != NULL ++ || child->fs->cwd != NULL ++ || child->qemu != NULL ++ || child->glue != NULL ++ || child->parent != NULL ++ || child->as_ptracee.ptracer != NULL)) { ++ note(parent, WARNING, USER, ++ "pid %lu was reused before its previous task was released", ++ pid); ++ LIST_REMOVE(child, bucket_link); ++ LIST_INSERT_HEAD(&reused_pid_tracees, child, bucket_link); ++ if (child->as_ptracee.ptracer != NULL) ++ detach_from_ptracer(child); ++ child->terminated = true; ++ terminations_pending = true; ++ child = new_tracee((pid_t) pid); ++ } + if (child == NULL) { + note(parent, WARNING, SYSTEM, "running out of memory"); + return -ENOMEM; +-- +2.43.0 + diff --git a/tools/proot/patches/0024-execveat-absolute-path.patch b/tools/proot/patches/0024-execveat-absolute-path.patch new file mode 100644 index 000000000..a3b7038ca --- /dev/null +++ b/tools/proot/patches/0024-execveat-absolute-path.patch @@ -0,0 +1,44 @@ +From 968f450754f97907d72a756add5010f6be746b6a Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Fri, 30 Oct 2026 20:21:28 -0400 +Subject: [PATCH] syscall: run an execveat with an absolute path like execve + +The kernel ignores the directory descriptor of execveat when the path is +absolute, so such a call is an execve with flags. FEX runs every child +of an emulated program through execveat(fd, "/proc/self/exe"), which +proot refused unless the descriptor was AT_FDCWD. +--- + src/syscall/enter.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/syscall/enter.c b/src/syscall/enter.c +index f8ce2e7..98241bd 100644 +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -129,8 +129,13 @@ int translate_syscall_enter(Tracee *tracee) + status = translate_execve_enter(tracee); + break; + +- case PR_execveat: +- if ((int) peek_reg(tracee, CURRENT, SYSARG_1) == AT_FDCWD) { ++ case PR_execveat: { ++ word_t flags = peek_reg(tracee, CURRENT, SYSARG_5); ++ char first = '\0'; ++ bool absolute = (flags & (AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW)) == 0 ++ && read_data(tracee, &first, peek_reg(tracee, CURRENT, SYSARG_2), 1) == 0 ++ && first == '/'; ++ if ((int) peek_reg(tracee, CURRENT, SYSARG_1) == AT_FDCWD || absolute) { + set_sysnum(tracee, PR_execve); + poke_reg(tracee, SYSARG_1, peek_reg(tracee, CURRENT, SYSARG_2)); + poke_reg(tracee, SYSARG_2, peek_reg(tracee, CURRENT, SYSARG_3)); +@@ -142,6 +147,7 @@ int translate_syscall_enter(Tracee *tracee) + } + status = translate_execve_enter(tracee); + break; ++ } + + case PR_ptrace: + status = translate_ptrace_enter(tracee); +-- +2.43.0 + diff --git a/tools/proot/profile.h b/tools/proot/profile.h new file mode 100644 index 000000000..71173b31e --- /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/statx_mnt_id.h b/tools/proot/statx_mnt_id.h index deb1789b8..257707657 100644 --- a/tools/proot/statx_mnt_id.h +++ b/tools/proot/statx_mnt_id.h @@ -72,11 +72,6 @@ static inline bool droiddeck_proot_statx_fill_mnt_id(pid_t pid, int fd, int n = snprintf(tracee_fd_path, sizeof tracee_fd_path, "/proc/%ld/fd/%d", (long)pid, fd); if (n < 0 || (size_t)n >= sizeof tracee_fd_path) return false; - /* Another thread sharing the tracee's fd table can close/reuse fd after statx returns. Pin the - * current referent, then require both device and inode to match statx before trusting its mount. - * Read fdinfo from our pin so a later tracee fd reuse cannot change which mount ID is observed. - * A same-inode bind-mount alias has the same device/inode pair; at this exit stop we cannot - * distinguish that rare concurrent replacement from the mount used by the completed syscall. */ int pinned = open(tracee_fd_path, O_PATH | O_CLOEXEC); if (pinned < 0) return false; struct stat st; diff --git a/tools/proot_profile.py b/tools/proot_profile.py new file mode 100644 index 000000000..aa09e23d0 --- /dev/null +++ b/tools/proot_profile.py @@ -0,0 +1,55 @@ +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/quest/build-driver.py b/tools/quest/build-driver.py index e72b2991e..43c7c5a3b 100644 --- a/tools/quest/build-driver.py +++ b/tools/quest/build-driver.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Build the Quest allocation adapter around the unchanged bundled Android Turnip.""" import io import json from pathlib import Path @@ -34,7 +33,6 @@ def pack(entries, output): def build_a6xx(ndk, output_dir=OUTPUT.parent, archive_path=None): - """Pin a real A6xx driver, with a separate Quest adapter around the same bytes.""" cached = archive_path or ROOT / 'app/build/quest-inputs' / f'Turnip-{A6XX_TAG}.zip' if not cached.exists(): cached.parent.mkdir(parents=True, exist_ok=True) diff --git a/tools/quest/test_first_frame.c b/tools/quest/test_first_frame.c index f58da48bb..b0f0bac2a 100644 --- a/tools/quest/test_first_frame.c +++ b/tools/quest/test_first_frame.c @@ -1,5 +1,3 @@ -/* Exercise the production vkp_render entrypoint without Android/Vulkan hardware. - * The Python runner extracts that function verbatim into the included file. */ #include <assert.h> #include <stddef.h> #include <stdio.h> @@ -18,8 +16,6 @@ static void vkp_signal_first_frame(void) { first_frames++; } static int vkp_base_black(int w, int h) { base_calls++; return base_result; } static int sc_layer_present_pass(const struct vkp_draw *draws, int n, int w, int h) { pass_calls++; - /* Production sc_layer_present_pass signals only after a content submission. - * Its no-op results (off-screen geometry or pool exhaustion) also return 0. */ if (pass_result == 0 && pass_shown) vkp_signal_first_frame(); return pass_result; } @@ -40,12 +36,10 @@ int main(void) { for (int i = 0; i < 3; i++) assert(vkp_render(1280, 720, NULL, 0) == 0); assert(base_calls == 3 && pass_calls == 0 && first_frames == 0); - /* An accepted layer operation is not necessarily a displayed client frame. */ reset(); assert(vkp_render(1280, 720, &draw, 1) == 0); assert(pass_calls == 1 && base_calls == 1 && first_frames == 0); - /* Content is the sole owner of the notification, with no second backdrop event. */ reset(); pass_shown = 1; assert(vkp_render(1280, 720, &draw, 1) == 0); assert(first_frames == 1); @@ -59,7 +53,6 @@ int main(void) { assert(vkp_render(1280, 720, NULL, 0) == -1); assert(first_frames == 0); - /* Existing routes remain responsible for their own notifications. */ for (int mode = 0; mode < 3; mode++) { reset(); if (mode == 0) quest = 0; diff --git a/tools/quest/test_presentation.c b/tools/quest/test_presentation.c index dcbad6224..9ef5a826a 100644 --- a/tools/quest/test_presentation.c +++ b/tools/quest/test_presentation.c @@ -1,4 +1,3 @@ -/* Exercise the production backdrop with mock Android buffers/transactions. */ #include "../../app/src/main/cpp/waylandcomp/src/sc_layer.c" #include "../../app/src/main/cpp/waylandcomp/src/quest_device.h" #include <assert.h> @@ -40,7 +39,6 @@ static void tx_delete(ASurfaceTransaction *t) { assert(t == (ASurfaceTransaction static void tx_apply(ASurfaceTransaction *t) { (void)t; applies++; } static void set_buffer(ASurfaceTransaction *t, ASurfaceControl *s, AHardwareBuffer *b, int fd) { (void)t; (void)s; assert(b == &buffer && fd == -1); - /* No garbage, including padded row bytes, reaches the display. */ for (unsigned i=0; i<sizeof(buffer.pixels); i++) assert(buffer.pixels[i] == 0); assert(unlocks > 0); buffers++; } @@ -79,7 +77,7 @@ int main(void) { assert(visible==ASC_VISIBILITY_SHOW && zorder==0 && opacity==ASC_TRANSPARENCY_OPAQUE); assert(destination.right==1920 && destination.bottom==1080); assert(allocs==1 && locks==1 && buffers==1 && creates==1); - assert(sc_layer_base_black(1920,1080)==0 && applies==1); /* retained, not redrawn */ + assert(sc_layer_base_black(1920,1080)==0 && applies==1); assert(sc_layer_base_black(1440,1080)==0 && destination.right==1440 && allocs==1); sc_layer_hide_base(); assert(!visible && !g_base_shown); assert(sc_layer_base_black(1440,1080)==0 && visible && allocs==1); diff --git a/tools/quick_deploy.sh b/tools/quick_deploy.sh new file mode 100755 index 000000000..1310a5bcf --- /dev/null +++ b/tools/quick_deploy.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -euo pipefail +repo_root=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) +cd "${repo_root}" +sdk_dir=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-"${HOME}/Library/Android/sdk"}} +export ANDROID_HOME=${sdk_dir} ANDROID_SDK_ROOT=${sdk_dir} +export JAVA_HOME=${JAVA_HOME:-/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home} +out=${1:-"${TMPDIR:-/tmp}/droiddeck-quick-signed.apk"} + +signing_env=${DROIDDECK_SIGNING_ENV:-} +if [[ -z "${signing_env}" ]]; then + for candidate in "${repo_root}/.signing.env" \ + "$(dirname "$(git -C "${repo_root}" rev-parse --path-format=absolute --git-common-dir 2>/dev/null || echo .)")/.signing.env"; do + [[ -f "${candidate}" ]] && { signing_env=${candidate}; break; } + done +fi +[[ -f "${signing_env}" ]] || { echo "No signing env found; set DROIDDECK_SIGNING_ENV or add .signing.env." >&2; exit 1; } + +build_tools= +while IFS= read -r dir; do + [[ -x "${dir}/aapt" && -x "${dir}/zipalign" && -x "${dir}/apksigner" ]] && { build_tools=${dir}; break; } +done < <(ls -d "${sdk_dir}"/build-tools/* 2>/dev/null | sort -rV) +[[ -n "${build_tools}" ]] || { echo "No build-tools with aapt, zipalign and apksigner under ${sdk_dir}." >&2; exit 1; } + +./gradlew -q -PallowStaleRuntime=true :app:assembleRelease +( + cd "$(dirname "${signing_env}")" + set -a; . "${signing_env}"; set +a + BUILD_TOOLS=${build_tools} "${repo_root}/tools/release/sign-apk.sh" \ + "${repo_root}/app/build/outputs/apk/release/app-release.apk" standard "${out}" | tail -1 +) +"${repo_root}/tools/deploy_local.sh" "${out}" | tail -2 diff --git a/tools/release/announce-preview.sh b/tools/release/announce-preview.sh new file mode 100644 index 000000000..c4b63e727 --- /dev/null +++ b/tools/release/announce-preview.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -euo pipefail +if [ -z "$WEBHOOK" ]; then + echo "::notice::No DISCORD_BUILDS_WEBHOOK secret; nothing posted" + exit 0 +fi +commit=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA") +subject=$(jq -r '.commit.message | split("\n")[0]' <<<"$commit") +title=$(jq -r '.commit.message | split("\n") | map(select(length > 0)) | .[1] // ""' <<<"$commit") +pr=$(sed -n 's/^Merge pull request #\([0-9]*\).*/\1/p' <<<"$subject") +if [ -n "$pr" ]; then + what="[#$pr]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$pr): ${title:-$subject}" +else + what="[\`${GITHUB_SHA::7}\`]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA): $subject" +fi +get=$(printf 'Download: [standard APK](<%s>) · [all variants](<%s>)' "$APK" "$RELEASE") +content=$(printf '**New signed Preview build** `main-%s`\n%s\nIn the app: **Updates → Preview**\n%s' "${GITHUB_SHA::7}" "$what" "$get") +jq -n --arg content "$content" '{content: $content, allowed_mentions: {parse: []}}' | + curl -fsS -H 'Content-Type: application/json' -d @- "$WEBHOOK" -o /dev/null +echo "Posted: $content" diff --git a/tools/release/check_authorship.py b/tools/release/check_authorship.py index 37e2a716a..1b8542471 100644 --- a/tools/release/check_authorship.py +++ b/tools/release/check_authorship.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Reject bot authors and bot co-author trailers without executing reviewed code.""" import argparse import json import re @@ -11,7 +10,6 @@ PRODUCT = re.compile( r"Amazon Q|Tabnine|github-actions|dependabot|renovate)(?![a-z0-9])|\[bot\]", re.IGNORECASE, ) -# These are also people's names, so they only count alone or followed by a product word. ASSISTANT = r"(?:Claude|Cursor|Devin|Cody|Gemini)" ASSISTANT_ALONE = re.compile(ASSISTANT, re.IGNORECASE) ASSISTANT_PRODUCT = re.compile( diff --git a/tools/release/check_session_assets.py b/tools/release/check_session_assets.py index aa1985121..2042e470f 100644 --- a/tools/release/check_session_assets.py +++ b/tools/release/check_session_assets.py @@ -1,4 +1,3 @@ -"""Reject an APK with missing or stale session helpers, including cached local bundles.""" from pathlib import Path import re import sys @@ -10,7 +9,7 @@ SESSION_FILES = OVERLAY.parents[2] / 'app/src/main/java/com/droiddeck/launcher/s def check_extraction(overlay, source): - deployed = set(re.findall(r'"(usr/local/bin/droiddeck-[^"]+)"\s+to\s+"\1"', source)) + deployed = set(re.findall(r'"(usr/local/bin/droiddeck-[^"]+)"\s+to\s+"usr/local/bin/[^"/]+"', source)) return ['not extracted at session start: ' + path.relative_to(overlay).as_posix() for path in sorted((overlay / 'usr/local/bin').glob('droiddeck-*')) if path.relative_to(overlay).as_posix() not in deployed] diff --git a/tools/release/describe-build.sh b/tools/release/describe-build.sh new file mode 100644 index 000000000..46bc339ba --- /dev/null +++ b/tools/release/describe-build.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +set -euo pipefail +pr=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/pulls" \ + --jq '[.[] | select(.merged_at != null and .base.ref == "main")] | first // empty') +if [ -n "$pr" ]; then + number=$(jq -r .number <<<"$pr") + title=$(jq -r .title <<<"$pr") + merged=$(jq -r '.merged_at[:10]' <<<"$pr") + summary=$(jq -r '.body // ""' <<<"$pr" | tr -d '\r' | { grep -v '^🤖' || true; } | + awk '!p && /^#/ { next } NF { p = 1; print; next } p { exit }' | head -n 6 | cut -c1-400) + { + echo "**Merged to main** - [PR #$number]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/$number): $title (merged $merged)" + if [ -n "$summary" ]; then + echo + echo "$summary" + fi + } > notes-head.md +else + subject=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA" --jq '.commit.message | split("\n")[0]') + echo "**Pushed to main** without a PR - $subject" > notes-head.md +fi +cat notes-head.md diff --git a/tools/release/install_authorship_hooks.py b/tools/release/install_authorship_hooks.py index dae4eb517..9f7dda1a1 100644 --- a/tools/release/install_authorship_hooks.py +++ b/tools/release/install_authorship_hooks.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Install shared worktree hooks while preserving existing executable hooks.""" from pathlib import Path import shutil import subprocess diff --git a/tools/release/publish-ci.sh b/tools/release/publish-ci.sh new file mode 100644 index 000000000..987ef622d --- /dev/null +++ b/tools/release/publish-ci.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +set -euo pipefail +tag=main-${GITHUB_SHA::7} +cat signed/SHA256SUMS-*.txt > signed/SHA256SUMS.txt +rm signed/SHA256SUMS-*.txt +notes="$(cat notes-head.md) + +Signed build of $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA - in main, not yet in a DroidDeck release; for testing. +Commit: $GITHUB_SHA +VersionCode: $(sed -n 's/^ *versionCode \([0-9][0-9]*\)$/\1/p' app/build.gradle) +Each apk installs over a DroidDeck release and keeps its data. \`standard\` is the normal app; the others are the same app under another package name, installed beside it. + +SHA-256: +\`\`\` +$(cat signed/SHA256SUMS.txt) +\`\`\`" +gh release delete "$tag" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null || true +gh release create "$tag" -R "$CI_REPO" --target main --prerelease \ + --title "main ${GITHUB_SHA::7}" --notes "$notes" signed/* +gh release list -R "$CI_REPO" -L 200 --json tagName,publishedAt \ + --jq '[.[] | select(.tagName | startswith("main-"))] | sort_by(.publishedAt) | reverse | .['"$KEEP"':][] | .tagName' | + while IFS= read -r old; do + if [ "$old" = "$tag" ]; then + continue + fi + if ! gh release delete "$old" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null; then + if gh release view "$old" -R "$CI_REPO" >/dev/null 2>&1; then + echo "::error::Could not delete old release $old" + exit 1 + fi + fi + done +published=$(gh release view "$tag" -R "$CI_REPO" --json tagName,assets) +jq -e --arg tag "$tag" '.tagName == $tag and (.assets | length) > 0' <<< "$published" >/dev/null +url="$GITHUB_SERVER_URL/$CI_REPO/releases/tag/$tag" +apk=$(cd signed && ls DroidDeck-*.apk | awk 'length(a) == 0 || length($0) < length(a) { a = $0 } END { print a }') +echo "release=$url" >> "$GITHUB_OUTPUT" +echo "apk=$GITHUB_SERVER_URL/$CI_REPO/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" +echo "Published $url" diff --git a/tools/release/report-build.sh b/tools/release/report-build.sh new file mode 100644 index 000000000..835bb6c65 --- /dev/null +++ b/tools/release/report-build.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env bash +set -uo pipefail +MARK="<!-- droiddeck-pr-build -->" +{ + echo "$MARK" + echo "## Build of this pull request" + echo + [ -f /tmp/pr-merge.md ] && cat /tmp/pr-merge.md + echo + case "$BUILD_OUTCOME:$UNIT_TEST_OUTCOME:$APK_OUTCOME" in + success:success:success) + echo "### Build passed" + echo + echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." + echo + 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\`." + ;; + success:success:*) + echo "### APK publication incomplete" + echo + echo "Compilation and unit tests passed, but APK publication did not complete. See [the run]($RUN_URL)." + ;; + success:failure:*) + echo "### ERROR: Unit tests failed" + echo + echo "The APK compiled, but unit tests failed. No installable artifact was published." + echo + if [ -n "$TEST_DIAGNOSTICS_URL" ]; then + echo "The [unit-test-results]($TEST_DIAGNOSTICS_URL) artifact contains the test log and any generated reports." + else + echo "The test diagnostics upload did not complete. See [the test log]($RUN_URL)." + fi + ;; + success:*) + echo "### Build incomplete" + echo + echo "The APK compiled, but unit tests did not complete successfully. See [the run]($RUN_URL)." + ;; + failure:*) + echo "### ERROR: Build failed" + echo + echo "The compiler's errors ([full log]($RUN_URL)):" + echo + echo '```' + { grep -E '^e: |^w: .*error|error:|CMake Error|fatal error|ninja: error|FAILED|What went wrong|Execution failed for task|Unresolved reference|Type mismatch|Unresolved' /tmp/build.log 2>/dev/null \ + | sed -e 's#file:///home/runner/work/[^/]*/[^/]*/##' -e 's#/home/runner/work/[^/]*/[^/]*/##' \ + | grep -v '^w: ' | awk '!seen[$0]++' | head -80; } || true + echo '```' + echo + echo "<details><summary>What went wrong (Gradle)</summary>" + echo + echo '```' + awk '/^\* What went wrong/{p=1} /^\* Try:/{p=0} p{print}' /tmp/build.log 2>/dev/null | head -60 + echo '```' + echo "</details>" + ;; + skipped:*|cancelled:*) + echo "### Not built" + echo + echo "The build did not run (see above, or [the run]($RUN_URL))." + ;; + esac + echo +} > /tmp/pr-report.md +cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" +ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.user.login == \"github-actions[bot]\" and (.body | startswith(\"$MARK\"))) | .id" | head -1 || true) +if [ -n "$ID" ]; then + gh api -X PATCH "repos/${GITHUB_REPOSITORY}/issues/comments/${ID}" -F body=@/tmp/pr-report.md >/dev/null +else + gh api -X POST "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" -F body=@/tmp/pr-report.md >/dev/null +fi diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index a0ac10bfd..5b61cb637 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -1,4 +1,3 @@ -"""Attest prepared runtime inputs and reject stale local or CI APK payloads.""" import hashlib import gzip import json @@ -13,19 +12,19 @@ from zipfile import ZipFile ROOT = Path(__file__).resolve().parents[2] MANIFEST = Path('app/build/runtime-inputs.json') PACKS = Path('app/build/packs') -# Runtime trees shipped as add-on packs (tools/packs/build.sh) rather than inside the APK. PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxfs/usr/local/lib/droiddeck-comet/': 'comet', 'assets/directaudio/': 'directaudio'} PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'), 'lib/arm64-v8a/libproot-loader.so': ('proot', 'libproot-loader.so')} PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so'] -PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'] +PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', - 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', + 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', + 'tools/gpuload', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', 'app/src/main/cpp/venc/venc_proto.h', 'app/src/main/cpp/waylandcomp/src/spatialpose_shm.h', @@ -76,6 +75,7 @@ def required(): for name in ['turnip26.3.0-a6xx', 'turnip26.3.0-quest2']] paths += ['assets/linuxfs/' + name for name in ['libfakeinput.so', 'libblsession.so', 'libblfastpath.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', + 'usr/local/bin/droiddeck-gog-maintenance', 'usr/local/bin/gamescope', 'usr/local/lib/droiddeck/uruntime', 'usr/local/lib/droiddeck-pipewire.tzst']] for arch in ['x86_64', 'i386']: @@ -91,6 +91,8 @@ def required(): 'droiddeck/resources/settings/default.vrsettings', 'layer/libVkLayer_droiddeck_vr.so', 'layer/VK_LAYER_DROIDDECK_vr.json', 'layer/VK_LAYER_DROIDDECK_vr_implicit.json', 'layer/libdroiddeck_vr_scheduling.so']] + paths += ['assets/linuxfs/usr/local/lib/droiddeck-gpuload/' + name for name in + ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json']] for side in ['left', 'right']: paths += [f'assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/resources/rendermodels/droiddeck_hand_{side}/{name}' for name in [f'droiddeck_hand_{side}.json', 'hand.mtl', 'hand.png', 'hand_open.obj', 'hand_fist.obj', @@ -148,13 +150,21 @@ def record(root=ROOT): (root / MANIFEST).write_text(json.dumps(data, sort_keys=True, indent=2) + '\n') -def verify(root=ROOT): +def verify(root=ROOT, stale_sources_ok=False): try: data = json.loads((root / MANIFEST).read_text()) except (OSError, ValueError): raise ValueError('Runtime inputs have not been prepared. Run tools/build_local.sh.') - if data.get('version') != 1 or data.get('sources') != sources(root): + if data.get('version') != 1: raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + current = sources(root) + if data.get('sources') != current: + if not stale_sources_ok: + raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + recorded = data.get('sources') or {} + changed = sorted(name for name in recorded.keys() | current.keys() if recorded.get(name) != current.get(name)) + print('Warning: reusing runtime assets prepared from other sources (run tools/build_local.sh if these matter):\n ' + + '\n '.join(changed[:20]) + ('\n ...' if len(changed) > 20 else ''), file=sys.stderr) for name in required(): if name not in data['outputs']: raise ValueError('Runtime manifest missing ' + name) @@ -198,10 +208,12 @@ def check_apk(apk, root=ROOT): for name, output in data['outputs'].items(): if name in PACKED_FILES: pack, rel = PACKED_FILES[name] - if name in names: - raise ValueError('APK still carries ' + name + ', which the ' + pack + ' pack provides') if packs[pack].get(rel) != output['sha256']: raise ValueError('Add-on pack ' + pack + ' is missing or has a stale ' + name) + if name not in names: + raise ValueError('APK missing kernel-executed runtime input: ' + name) + if hashlib.sha256(package.read(name)).hexdigest() != output['sha256']: + raise ValueError('APK has stale runtime input: ' + name) continue prefix = next((p for p in PACKED if name.startswith(p)), None) if prefix: @@ -223,7 +235,7 @@ if __name__ == '__main__': if sys.argv[1] == 'record': record() elif sys.argv[1] == 'verify': - verify() + verify(stale_sources_ok='--allow-stale-sources' in sys.argv[2:]) elif sys.argv[1] == 'apk': check_apk(sys.argv[2]) else: diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 2cf46c551..160d49b5e 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -27,8 +27,9 @@ if [ "$pkg" = "$P" ]; then else python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ + "$P.pairingguide=$pkg.pairingguide" "$P.pin=$pkg.pin" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ - "$P.vr_recovery=$pkg.vr_recovery" \ + "$P.vr_recovery=$pkg.vr_recovery" "$P.dualscreen=$pkg.dualscreen" "$P.typing=$pkg.typing" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" fi got=$("$BUILD_TOOLS/aapt" dump badging "$work/renamed.apk" | sed -n "s/^package: name='\([^']*\)'.*/\1/p") diff --git a/tools/release/update_catalog.py b/tools/release/update_catalog.py index 808e576a0..94ecd1ce5 100755 --- a/tools/release/update_catalog.py +++ b/tools/release/update_catalog.py @@ -1,9 +1,4 @@ #!/usr/bin/env python3 -"""Build and publish the one-file update catalog consumed by DroidDeck. - -The catalog is derived from GitHub releases, but the Android app never has to infer -channels, parse release notes, dereference tags, or spend unauthenticated API quota. -""" from __future__ import annotations @@ -230,7 +225,6 @@ def release_entry( def preview_history_entry(release: dict, preview: dict, variants: list[tuple[str, str]]): - """Return compact history metadata for one complete, signed main build.""" tag = release.get("tag_name") or "" tag_match = MAIN_TAG.fullmatch(tag) commit = (preview.get("commit") or "").lower() @@ -259,7 +253,6 @@ def preview_history_entry(release: dict, preview: dict, variants: list[tuple[str def recent_previews(entries: list[dict], limit: int = 10) -> list[dict]: - """Keep the newest distinct Preview commits, newest first.""" result = [] seen = set() for entry in sorted(entries, key=lambda item: item["publishedAt"], reverse=True): @@ -288,8 +281,6 @@ def main_commit(release: dict) -> str | None: def stable_app_release(releases: list[dict]) -> dict | None: - """The newest published app release. The repo also publishes gamescope and desktop-package - releases that GitHub may mark latest, so an app release is one shipping DroidDeck-<tag>.apk.""" apps = [ r for r in releases if not r.get("draft") and not r.get("prerelease") diff --git a/tools/release/validate_apk.py b/tools/release/validate_apk.py index 8ed51ebf1..3ff90c2e2 100644 --- a/tools/release/validate_apk.py +++ b/tools/release/validate_apk.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Publish the APK result only after trusted source and metadata validation.""" import json import os import subprocess @@ -34,6 +33,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 +91,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/syncthing/build.sh b/tools/syncthing/build.sh new file mode 100755 index 000000000..ca9338eb6 --- /dev/null +++ b/tools/syncthing/build.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash +set -euo pipefail +OUTDIR=$(mkdir -p "$1" && cd "$1" && pwd) +: "${NDK:?set NDK to the Android NDK root}" +API=26 +HERE=$(cd "$(dirname "$0")" && pwd) +FORK="$HERE/syncthing-android" +SRC="$FORK/syncthing/src/github.com/syncthing/syncthing" +if [[ ! -f "$SRC/build.go" ]]; then + echo "Syncthing source missing; run: git submodule update --init --recursive tools/syncthing/syncthing-android" >&2 + exit 1 +fi +command -v go >/dev/null || { echo "Go is required to build Syncthing" >&2; exit 1; } +toml="$FORK/gradle/libs.versions.toml" +GO_VERSION=$(sed -n 's/^go_version *= *"\(.*\)"/\1/p' "$toml") +APP_VERSION=$(sed -n 's/^version-name *= *"\(.*\)"/\1/p' "$toml") +[[ -n "$GO_VERSION" && -n "$APP_VERSION" ]] || { echo "Cannot read go_version/version-name from $toml" >&2; exit 1; } +ST_VERSION="v$(echo "$APP_VERSION" | cut -d. -f1-3)" +case "$(uname -s):$(uname -m)" in + Darwin:*) NDK_HOST=darwin-x86_64 ;; + Linux:x86_64) NDK_HOST=linux-x86_64 ;; + Linux:aarch64|Linux:arm64) NDK_HOST=linux-aarch64 ;; + *) echo "Unsupported build host: $(uname -s) $(uname -m)" >&2; exit 1 ;; +esac +TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/$NDK_HOST/bin" +if [[ ! -d "$TOOLCHAIN" && -d "$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" ]]; then + TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" +fi +CC="$TOOLCHAIN/aarch64-linux-android${API}-clang" +[[ -x "$CC" ]] || { echo "Android NDK toolchain not found at $TOOLCHAIN" >&2; exit 1; } + +EPOCH=$(git -C "$SRC" show -s --format=%ct HEAD) +cache=${DROIDDECK_BUILD_CACHE:-"${HOME}/.cache/droiddeck-build"} +WORK=$(mktemp -d) +trap 'rm -rf "$WORK"' EXIT +cp -a "$SRC" "$WORK/syncthing" +rm -f "$WORK/syncthing/.git" +( + cd "$WORK/syncthing" + export GOTOOLCHAIN="go${GO_VERSION}" GOPATH="$cache/go" GOMODCACHE="$cache/go/pkg/mod" GOFLAGS=-buildvcs=false + export CGO_ENABLED=1 EXTRA_LDFLAGS=-checklinkname=0 BUILD_HOST=droiddeck BUILD_USER=reproducible-build SOURCE_DATE_EPOCH="$EPOCH" + go version + go run build.go -goos android -goarch arm64 -cc "$CC" -version "$ST_VERSION" -no-upgrade build +) +install -m755 "$WORK/syncthing/syncthing" "$OUTDIR/libsyncthingnative.so" +echo "Syncthing ${ST_VERSION} (fork ${APP_VERSION}, Go ${GO_VERSION}) built into $OUTDIR/libsyncthingnative.so" diff --git a/tools/syncthing/syncthing-android b/tools/syncthing/syncthing-android new file mode 160000 index 000000000..f8819078e --- /dev/null +++ b/tools/syncthing/syncthing-android @@ -0,0 +1 @@ +Subproject commit f8819078e7dec1e8a954eec839febd9f7385294e diff --git a/tools/test_local.sh b/tools/test_local.sh index bd29aef7d..4eb43ff22 100755 --- a/tools/test_local.sh +++ b/tools/test_local.sh @@ -5,7 +5,8 @@ cd "$repo_root" if [[ $(uname -s) == Linux ]]; then exec python3 -m unittest discover -s tools/tests "$@" fi -image=${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3} +. "${repo_root}/tools/docker_platform.sh" +image=${DROIDDECK_BUILD_IMAGE} python3 tools/docker_preflight.py "$image" -exec docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" \ +exec docker run --rm --platform "${DROIDDECK_DOCKER_PLATFORM}" --user "$(id -u):$(id -g)" \ -v "$repo_root:/src:ro" -w /src "$image" python3 -m unittest discover -s tools/tests "$@" diff --git a/tools/tests/cursor_composite_harness.c b/tools/tests/cursor_composite_harness.c new file mode 100644 index 000000000..e1f267794 --- /dev/null +++ b/tools/tests/cursor_composite_harness.c @@ -0,0 +1,61 @@ +#include <assert.h> +#include <stdio.h> + +#include "cursor_constants.inc" +#include "cursor_scene_positions.inc" +#include "cursor_clip_to_eye.inc" + +int main(void) { + int out[2]; + int dx, sx, dw; + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SCREEN, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_FLAT, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1, CARDBOARD_SOURCE_SBS, 0, 0, out) == 1); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 100, 0, out) == 2); + assert(out[0] == 100 && out[1] == 2020); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 2000, 0, out) == 2); + assert(out[0] == 2000 && out[1] == 80); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1919, 0, out) == 2); + assert(out[0] == 1919 && out[1] == 3839); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1920, 0, out) == 2); + assert(out[0] == 1920 && out[1] == 0); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 960, 32, out) == 2); + assert(out[0] == 928 && out[1] == -32); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 959, 32, out) == 2); + assert(out[0] == 927 && out[1] == 1887); + + assert(cursor_clip_to_eye(1920, -1, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 950 && sx == 0 && dw == 10); + + assert(cursor_clip_to_eye(1920, 1, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 10 && dw == 22); + + assert(cursor_clip_to_eye(1920, 1, 960, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 928, 32, &dx, &sx, &dw) == 1); + assert(dx == 928 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 1, 928, 32, &dx, &sx, &dw) == 0); + assert(cursor_clip_to_eye(1920, 0, -32, 32, &dx, &sx, &dw) == 0); + + puts("PASS: cursor stereo placement"); + return 0; +} diff --git a/tools/tests/ddfg_flow_levels_harness.cpp b/tools/tests/ddfg_flow_levels_harness.cpp new file mode 100644 index 000000000..e5cf7bf70 --- /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/kgsl_busy_harness.c b/tools/tests/kgsl_busy_harness.c new file mode 100644 index 000000000..14e96bf64 --- /dev/null +++ b/tools/tests/kgsl_busy_harness.c @@ -0,0 +1,56 @@ +#include <assert.h> +#include <stdio.h> +#include <string.h> + +#include "kgsl_busy.h" + +#define ENTRIES 819 + +static uint32_t memstore[ENTRIES * KGSL_BUSY_ENTRY_WORDS]; + +static void stamp(int entry, uint32_t sop, uint32_t eop) { + memstore[entry * KGSL_BUSY_ENTRY_WORDS + KGSL_BUSY_SOP] = sop; + memstore[entry * KGSL_BUSY_ENTRY_WORDS + KGSL_BUSY_EOP] = eop; +} + +int main(void) { + assert(kgsl_busy_first_slot(8 * 4096) == 813); + assert(kgsl_busy_first_slot(8 * 16384) == 3270); + assert(kgsl_busy_first_slot(7 * 40) == -1); + + int first = kgsl_busy_first_slot(sizeof(memstore)); + uint32_t last[KGSL_BUSY_SLOTS] = {0}; + int moved = 0; + + stamp(first, 100, 100); + stamp(first + 2, 7, 7); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 1 && last[0] == 100 && last[2] == 7); + + moved = 0; + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + stamp(first + 2, 8, 7); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 1); + assert(moved == 1); + + moved = 0; + stamp(first + 2, 8, 8); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + stamp(first + 4, 3, 2); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 1); + + memset(memstore, 0, sizeof(memstore)); + stamp(first - 1, 5, 4); + stamp(first + KGSL_BUSY_SLOTS, 9, 8); + memset(last, 0, sizeof(last)); + moved = 0; + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + puts("PASS: kgsl memstore busy"); + return 0; +} diff --git a/tools/tests/pointer_release_harness.c b/tools/tests/pointer_release_harness.c index 8369eb377..aaf58841f 100644 --- a/tools/tests/pointer_release_harness.c +++ b/tools/tests/pointer_release_harness.c @@ -23,8 +23,6 @@ static void wl_pointer_send_button(struct wl_resource *r, uint32_t serial, r->held &= ~(1u << (button - 0x110)); r->releases++; } -/* The old dispatcher calls this even for releases, emitting stale coordinates. - * Recording this boundary detects that unwanted motion/focus routing path. */ static void pointer_input(double x, double y, int relative, uint32_t button, int pressed) { assert(x == 0 && y == 0 && relative == 1 && button >= 0x110 && button <= 0x112); assert(pressed == 1); diff --git a/tools/tests/test_android_volume.py b/tools/tests/test_android_volume.py new file mode 100644 index 000000000..44d34f9b4 --- /dev/null +++ b/tools/tests/test_android_volume.py @@ -0,0 +1,109 @@ +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 uint64_t last_delay; +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++; last_delay=time; } +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 && last_delay==100*PA_USEC_PER_MSEC); + 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); + assert(last_delay==16*PA_USEC_PER_MSEC); + state(argv[1],"4 15 1\n"); + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(sink.real_volume.value==4*PA_VOLUME_NORM/15 && last_delay==16*PA_USEC_PER_MSEC); + for (int i = 0; i < ANDROID_VOLUME_ACTIVE_TICKS + 1; i++) + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(last_delay==100*PA_USEC_PER_MSEC); + 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_apt_remember.py b/tools/tests/test_apt_remember.py new file mode 100644 index 000000000..541918fc5 --- /dev/null +++ b/tools/tests/test_apt_remember.py @@ -0,0 +1,74 @@ +import hashlib +import os +import subprocess +import tempfile +import unittest +from pathlib import Path + +REMEMBER = Path(__file__).resolve().parents[1] / "ubuntu/overlay-runtime/usr/share/droiddeck/apt/remember" + + +class AptRememberTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.top = Path(temp.name) + self.dir = self.top / "share/apt" + self.state = self.top / "state" + self.etc = self.top / "etc/apt" + self.keys = self.top / "keyrings" + self.autostart = self.top / "autostart" + for d in (self.dir, self.etc / "sources.list.d", self.keys, self.autostart, self.top / "bin"): + d.mkdir(parents=True) + (self.dir / "system-manual.txt").write_text("base\n") + (self.dir / "runtime-id").write_text("new\n") + system = self.keys / "ubuntu-archive.gpg" + system.write_text("system key") + (self.dir / "system-sources.txt").write_text("%s %s\n" % (system, hashlib.sha256(b"system key").hexdigest())) + apt_mark = self.top / "bin/apt-mark" + apt_mark.write_text("#!/bin/sh\nprintf 'base\\nvlc\\n'\n") + apt_mark.chmod(0o755) + script = REMEMBER.read_text() + script = script.replace("/usr/share/droiddeck/apt", str(self.dir)) + script = script.replace("/root/.local/share/droiddeck/apt", str(self.state)) + script = script.replace("/etc/xdg/autostart", str(self.autostart)) + script = script.replace("/usr/share/keyrings", str(self.keys)) + script = script.replace("/etc/apt", str(self.etc)) + self.script = self.top / "remember" + self.script.write_text(script) + + def run_remember(self): + env = dict(os.environ, PATH="%s:%s" % (self.top / "bin", os.environ["PATH"])) + env.pop("DROIDDECK_APT_RESTORING", None) + subprocess.run(["bash", str(self.script)], env=env, check=True, timeout=30) + + def test_user_sources_and_keys_outside_etc_apt_are_kept(self): + (self.etc / "sources.list").write_text("deb http://example.invalid stable main\n") + (self.keys / "example.gpg").write_text("user key") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + self.assertTrue((self.state / "sources/sources.list").is_file()) + self.assertEqual("user key", (self.state / "keyrings" / ("%s_example.gpg" % str(self.keys).lstrip("/").replace("/", "_"))).read_text()) + self.assertFalse(any("ubuntu-archive" in p.name for p in (self.state / "keyrings").iterdir())) + + def test_the_previous_runtime_snapshot_waits_for_the_desktop_restore(self): + (self.autostart / "droiddeck-apt-restore.desktop").write_text("") + self.state.mkdir() + (self.state / "packages.txt").write_text("old-app\n") + (self.state / "restored").write_text("old\n") + self.run_remember() + self.assertEqual("old-app\n", (self.state / "packages.txt").read_text()) + (self.state / "attempted").write_text("new\n") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + + def test_without_the_desktop_the_snapshot_follows_the_runtime(self): + self.state.mkdir() + (self.state / "packages.txt").write_text("old-app\n") + (self.state / "restored").write_text("old\n") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py new file mode 100644 index 000000000..b93e11e7e --- /dev/null +++ b/tools/tests/test_battlenet.py @@ -0,0 +1,1296 @@ +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_a_large_desktop_scales_battle_net_to_fit_it(self): + sizes = {("1280", "720"): 96, ("1920", "1080"): 96, ("2400", "1504"): 120, ("2448", "1848"): 120, + ("1080", "2400"): 96, ("3840", "2160"): 192, ("2560", "1600"): 120} + for (width, height), want in sizes.items(): + with mock.patch.dict(os.environ, {"BL_WIDTH": width, "BL_HEIGHT": height}): + self.assertEqual(BNET["desktop_dpi"](), want, (width, height)) + + def test_battle_nets_desktop_scale_is_written_once_and_follows_the_size(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text('WINE REGISTRY Version 2\n\n[Control Panel\\\\Desktop] 1\n"LogPixels"=dword:00000060\n') + with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720"}): + self.assertTrue(BNET["dpi"](self.root)) + self.assertEqual((pfx / "user.reg").read_text().count("LogPixels"), 1) + with mock.patch.dict(os.environ, {"BL_WIDTH": "2448", "BL_HEIGHT": "1848"}): + self.assertTrue(BNET["dpi"](self.root)) + self.assertTrue(BNET["dpi"](self.root)) + reg = (pfx / "user.reg").read_text() + self.assertEqual(reg.count('"LogPixels"=dword:00000078'), 1) + self.assertTrue(reg.rstrip().endswith('"LogPixels"=dword:00000078')) + + 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_binfmt_preload.py b/tools/tests/test_binfmt_preload.py index 0d796ed51..2a7ed7276 100644 --- a/tools/tests/test_binfmt_preload.py +++ b/tools/tests/test_binfmt_preload.py @@ -60,7 +60,7 @@ class BinfmtPreloadTest(unittest.TestCase): cls.library = cls.tmp / "libbinfmt.so" subprocess.run(["gcc", "-shared", "-fPIC", "-O2", "-Wall", "-Wextra", "-Werror", "-DBINFMT_TEST", '-DBINFMT_HANDLER="%s"' % cls.handler, "-o", str(cls.library), - "-pthread"] + [str(PRELOAD / name) for name in ("binfmt.c", "net.c", "udevmon.c", "pathcache.c", "webhelper.c")] + ["-ldl"], + "-pthread"] + [str(PRELOAD / name) for name in ("binfmt.c", "net.c", "udevmon.c", "pathcache.c", "perms.c", "webhelper.c")] + ["-ldl"], check=True) source = cls.tmp / "program.c" source.write_text(PROGRAM) diff --git a/tools/tests/test_bwrap_fex.py b/tools/tests/test_bwrap_fex.py new file mode 100644 index 000000000..2fc646333 --- /dev/null +++ b/tools/tests/test_bwrap_fex.py @@ -0,0 +1,98 @@ +import os +import runpy +import shutil +import struct +import tempfile +import unittest +from pathlib import Path + +BWRAP = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-bwrap" + + +def elf(path, machine): + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"\x7fELF\x02\x01\x01" + bytes(11) + struct.pack("<H", machine) + bytes(64)) + path.chmod(0o755) + + +class BwrapFexTest(unittest.TestCase): + def setUp(self): + self.dir = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.dir, True) + self.shim = runpy.run_path(str(BWRAP)) + self.fex = self.dir / "fex" + for name in ("bin/FEX", "bin/FEXServer", "lib/libxxhash.so.0"): + elf(self.fex / name, 183) + self.shim["through_fex"].__globals__["OWN_FEX"] = str(self.fex) + self.runtime = self.dir / "runtime" + self.app = self.dir / "app" + elf(self.runtime / "bin/ldconfig", 62) + elf(self.runtime / "bin/bash", 62) + os.symlink("bash", self.runtime / "bin/sh") + elf(self.runtime / "bin/arm-tool", 183) + (self.app / "bin").mkdir(parents=True) + (self.app / "bin/r2modman").write_text("#!/bin/sh\nexec /app/r2modman \"$@\"\n") + + def spec(self, command, path="/app/bin:/usr/bin"): + s = self.shim["Spec"]() + s.env = {"PATH": path, "XDG_CACHE_HOME": "/home/user/.var/app/x/cache", "FEX_ROOTFS": "/sniper"} + s.ops = [ + {"t": "bind", "src": str(self.runtime), "dest": "/usr", "try": False, "ro": True}, + {"t": "bind", "src": str(self.app), "dest": "/app", "try": False, "ro": True}, + {"t": "symlink", "target": "usr/bin", "dest": "/bin"}, + ] + s.command = command + return s + + def test_an_x86_64_program_found_on_path_runs_through_fex(self): + s = self.spec(["ldconfig", "-X", "-C", "/run/cache"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual(["/run/droiddeck-fex/bin/FEX", "/usr/bin/ldconfig", "-X", "-C", "/run/cache"], s.command) + dests = {op["dest"]: op["src"] for op in s.ops if op["t"] == "bind"} + self.assertEqual(str(self.fex / "bin/FEX"), dests["/run/droiddeck-fex/bin/FEX"]) + self.assertEqual(str(self.fex / "lib/libxxhash.so.0"), dests["/run/droiddeck-fex/lib/libxxhash.so.0"]) + self.assertIn("/usr/lib/aarch64-linux-gnu", dests) + self.assertIn("/usr/lib/ld-linux-aarch64.so.1", dests) + self.assertNotIn("FEX_ROOTFS", s.env) + self.assertEqual("/home/user/.var/app/x/cache/droiddeck-fex/", s.env["FEX_APP_DATA_LOCATION"]) + + def test_a_script_whose_interpreter_is_x86_64_runs_through_fex(self): + s = self.spec(["r2modman", "--flag"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual(["/run/droiddeck-fex/bin/FEX", "/app/bin/r2modman", "--flag"], s.command) + + def test_a_program_reached_through_a_sandbox_symlink_is_checked(self): + s = self.spec(["/bin/sh", "-c", "true"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/bin/sh", s.command[1]) + + def test_a_bind_whose_source_is_a_symlink_resolves_from_the_source(self): + real = self.dir / "store" / "tool-real" + elf(real, 62) + os.symlink("tool-real", self.dir / "store" / "tool-link") + s = self.spec(["/opt/tool"]) + s.ops.append({"t": "bind", "src": str(self.dir / "store" / "tool-link"), "dest": "/opt/tool", "try": False, + "ro": True}) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/opt/tool", s.command[1]) + + def test_a_relative_path_entry_is_searched_from_the_working_directory(self): + s = self.spec(["r2modman"], path="bin") + s.cwd = "/app" + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/app/bin/r2modman", s.command[1]) + + def test_an_arm64_program_runs_as_it_is(self): + s = self.spec(["arm-tool"]) + self.assertFalse(self.shim["through_fex"](s)) + self.assertEqual(["arm-tool"], s.command) + self.assertEqual(3, len(s.ops)) + + def test_a_missing_program_is_left_alone(self): + s = self.spec(["nothing-here"]) + self.assertFalse(self.shim["through_fex"](s)) + self.assertEqual(["nothing-here"], s.command) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_bwrap_lock.py b/tools/tests/test_bwrap_lock.py new file mode 100644 index 000000000..6bd39dd31 --- /dev/null +++ b/tools/tests/test_bwrap_lock.py @@ -0,0 +1,107 @@ +import json +import os +import runpy +import socket +import struct +import subprocess +import sys +import tempfile +import threading +import unittest +from pathlib import Path + +BWRAP = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-bwrap" + +PROBE = """ +import fcntl, os, sys +fd = os.open(sys.argv[1], os.O_RDWR) +try: + fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) +except OSError: + print("held") +else: + print("free") +""" + + +class BwrapLockFileTest(unittest.TestCase): + def setUp(self): + self.shim = runpy.run_path(str(BWRAP)) + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.instance = Path(self.temp.name) / "instance" + self.instance.mkdir() + (self.instance / ".ref").write_text("") + + def spec(self, *extra): + argv = ["--ro-bind", str(self.instance), "/run/user/1000/.flatpak/7", *extra, "--", "true"] + return self.shim["parse"](argv) + + def probe(self): + return subprocess.run([sys.executable, "-c", PROBE, str(self.instance / ".ref")], + capture_output=True, text=True, timeout=30, check=True).stdout.strip() + + def test_sandbox_paths_resolve_through_the_binds(self): + spec = self.spec() + self.assertEqual(str(self.instance / ".ref"), self.shim["host_path"](spec, "/run/user/1000/.flatpak/7/.ref")) + self.assertEqual("/etc/hosts", self.shim["host_path"](spec, "/etc/hosts")) + + def test_the_instance_lock_is_held_while_the_sandbox_runs(self): + spec = self.spec("--lock-file", "/run/user/1000/.flatpak/7/.ref") + self.assertEqual("free", self.probe()) + self.shim["hold_locks"](spec) + self.assertEqual("held", self.probe()) + + def test_without_a_lock_file_nothing_is_locked(self): + self.shim["hold_locks"](self.spec()) + self.assertEqual("free", self.probe()) + + def test_the_lock_survives_exec(self): + script = ( + "import runpy, sys; shim = runpy.run_path(sys.argv[1]); " + "spec = shim['parse'](['--ro-bind', sys.argv[2], '/run/user/1000/.flatpak/7', " + "'--lock-file', '/run/user/1000/.flatpak/7/.ref', '--', 'true']); " + "shim['hold_locks'](spec); " + "import os; os.execv(sys.executable, [sys.executable, '-c', " + "'import subprocess, sys; print(subprocess.run([sys.executable, \"-c\", sys.argv[1], sys.argv[2]], " + "capture_output=True, text=True).stdout.strip())', sys.argv[3], sys.argv[4]])" + ) + out = subprocess.run([sys.executable, "-c", script, str(BWRAP), str(self.instance), PROBE, + str(self.instance / ".ref")], capture_output=True, text=True, timeout=30, check=True) + self.assertEqual("held", out.stdout.strip()) + + +class BwrapReportedPidTest(unittest.TestCase): + def test_flatpak_is_given_the_wrapper_so_killing_it_ends_the_whole_sandbox(self): + name = "droiddeck-bwrap-test-%d" % os.getpid() + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind("\0" + name) + server.listen(1) + self.addCleanup(server.close) + + def answer(): + conn, _ = server.accept() + with conn: + head = conn.recv(5) + size = struct.unpack(">I", head[1:])[0] + while size > 0: + size -= len(conn.recv(size)) + for kind, payload in ((b"P", b"424242"), (b"X", b"0")): + conn.sendall(kind + struct.pack(">I", len(payload)) + payload) + + thread = threading.Thread(target=answer, daemon=True) + thread.start() + read_end, write_end = os.pipe() + env = dict(os.environ, DROIDDECK_BWRAP_SOCKET=name) + proc = subprocess.Popen([sys.executable, str(BWRAP), "--ro-bind", "/", "/elsewhere", "--info-fd", + str(write_end), "--", "true"], env=env, pass_fds=[write_end]) + os.close(write_end) + info = os.read(read_end, 4096) + os.close(read_end) + self.assertEqual(0, proc.wait(30)) + thread.join(5) + self.assertEqual({"child-pid": proc.pid}, json.loads(info)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py new file mode 100644 index 000000000..52c1607aa --- /dev/null +++ b/tools/tests/test_ci_checks.py @@ -0,0 +1,95 @@ +import itertools +import json +import os +from pathlib import Path +import shlex +import shutil +import subprocess +import tempfile +import unittest + +import yaml + + +ROOT = Path(__file__).resolve().parents[2] + + +class CiChecksTest(unittest.TestCase): + def test_pr_cache_writes_and_source_timestamp_policy(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + cache = next(step for step in jobs['build']['steps'] + if step.get('uses') == 'gradle/actions/setup-gradle@v4')['with'] + self.assertEqual(cache['cache-read-only'], + "${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}") + gradle = (ROOT / 'app/build.gradle').read_text() + self.assertIn("gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit])", gradle) + + def test_report_comment_lookup_ignores_human_marker(self): + if not shutil.which('jq'): + self.skipTest('jq required to execute comment selection') + script = (ROOT / 'tools/release/report-build.sh').read_text() + line = next(line for line in script.splitlines() if line.startswith('ID=')) + arguments = shlex.split(line[len('ID=$('):].split(' | head', 1)[0]) + query = arguments[arguments.index('--jq') + 1].replace('$MARK', '<!-- build -->') + comments = [dict(id=1, user=dict(login='someone'), body='<!-- build --> forged'), + dict(id=2, user=dict(login='github-actions[bot]'), body='<!-- build --> result')] + result = subprocess.check_output(['jq', '-r', query], input=json.dumps(comments), text=True) + self.assertEqual(result.strip(), '2') + + def test_build_and_tests_use_identical_generated_metadata(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + steps = {step.get('id'): step for step in jobs['build']['steps']} + self.assertEqual(steps['build']['env'], steps['unit-tests']['env']) + self.assertIn('DROIDDECK_BUILD_LABEL', steps['unit-tests']['env']) + self.assertIn('SGDB_API_KEY', steps['unit-tests']['env']) + gradle = (ROOT / 'app/build.gradle').read_text() + self.assertIn("outputs.doNotCacheIf('CI executes the test suite on every run') { true }", gradle) + self.assertIn('outputs.upToDateWhen { false }', gradle) + + def test_independent_jobs_wait_only_for_the_pinned_source(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + for name in ('xbox', 'components', 'python-tests'): + self.assertEqual(jobs[name]['needs'], 'source') + self.assertEqual(set(jobs['build']['needs']), {'source', 'components', 'xbox'}) + + def test_dependency_update_errors_block_installation(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + sudo = root / 'sudo' + sudo.write_text('#!/bin/bash\nprintf "%s\\n" "$*" >> "$APT_LOG"\nexit "${APT_RESULT:-0}"\n') + sudo.chmod(0o755) + query = root / 'dpkg-query' + query.write_text('#!/bin/sh\nexit 1\n') + query.chmod(0o755) + log = root / 'apt.log' + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], APT_LOG=str(log)) + installer = ROOT / 'tools/ci/install-ubuntu-packages.sh' + result = subprocess.run(['bash', str(installer), 'qemu-user'], env=dict(env, APT_RESULT='17')) + self.assertEqual(result.returncode, 17) + self.assertEqual(len(log.read_text().splitlines()), 2) + log.unlink() + subprocess.run(['bash', str(installer), 'qemu-user'], env=env, check=True) + update, install = log.read_text().splitlines() + for command in (update, install): + self.assertIn('Dir::Etc::sourceparts=-', command) + self.assertIn('Acquire::https::Timeout=15', command) + self.assertIn('Acquire::Retries=1', command) + self.assertIn('APT::Update::Error-Mode=any', update) + self.assertIn('install -y -q --no-install-recommends qemu-user', install) + + def test_required_status_rejects_failed_cancelled_or_skipped_test_jobs(self): + jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] + gate = jobs['checks'] + self.assertEqual(gate['name'], 'Compile and test APK') + self.assertEqual(set(gate['needs']), {'build', 'python-tests'}) + self.assertIn('!cancelled()', gate['if']) + for build, python in itertools.product(('success', 'failure', 'cancelled', 'skipped'), repeat=2): + with self.subTest(build=build, python=python): + result = subprocess.run( + ['bash', '-c', gate['steps'][0]['run']], + env=dict(os.environ, BUILD_RESULT=build, PYTHON_RESULT=python), + capture_output=True) + self.assertEqual(result.returncode == 0, build == python == 'success') + for publisher in ('sign', 'packs'): + self.assertIn('checks', jobs[publisher]['needs']) + diff --git a/tools/tests/test_ci_ndk.py b/tools/tests/test_ci_ndk.py new file mode 100644 index 000000000..eef737db6 --- /dev/null +++ b/tools/tests/test_ci_ndk.py @@ -0,0 +1,27 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] + + +class CiNdkTest(unittest.TestCase): + def test_installed_ndk_must_match_the_declared_version(self): + version = (ROOT / 'tools/ci/toolchains.env').read_text().strip().split('=', 1)[1] + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + ndk = root / 'ndk' / version + ndk.mkdir(parents=True) + properties = ndk / 'source.properties' + properties.write_text('Pkg.Revision = ' + version + '\n') + output = root / 'environment' + env = dict(os.environ, ANDROID_HOME=str(root), GITHUB_ENV=str(output)) + script = ROOT / 'tools/ci/resolve-ndk.sh' + subprocess.run(['bash', str(script)], env=env, check=True) + self.assertIn('NDK_VERSION=' + version, output.read_text()) + self.assertIn('ANDROID_NDK_HOME=' + str(ndk), output.read_text()) + properties.write_text('Pkg.Revision = unexpected\n') + self.assertNotEqual(subprocess.run(['bash', str(script)], env=env).returncode, 0) diff --git a/tools/tests/test_client_core_mask.py b/tools/tests/test_client_core_mask.py index 59178b4db..9462c43af 100644 --- a/tools/tests/test_client_core_mask.py +++ b/tools/tests/test_client_core_mask.py @@ -1,4 +1,3 @@ -"""Single-core Steam affinity is rechecked even if its thread count stayed the same.""" import subprocess import tempfile import unittest diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py new file mode 100644 index 000000000..dda4e5b6e --- /dev/null +++ b/tools/tests/test_client_zram_focus.py @@ -0,0 +1,228 @@ +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_the_hidden_epic_launcher_is_compressed_with_the_client(self): + with tempfile.TemporaryDirectory() as tmp: + proc = Path(tmp) + + def task(pid, argv, env=()): + folder = proc / str(pid) + folder.mkdir() + (folder / 'cmdline').write_bytes(b''.join(arg.encode() + b'\0' for arg in argv)) + (folder / 'environ').write_bytes(b''.join(item.encode() + b'\0' for item in env)) + + fex = '/s/FEX-Emu/usr/bin/FEX' + task(5000010, ['/s/steamrtarm64/steam', '-gamepadui']) + task(5000011, [fex, '/e/usr/bin/EpicGamesLauncher'], ['HOME=/root', 'DROIDDECK_EPIC_HIDDEN=1']) + task(5000012, [fex, './/lib/webkit2gtk-4.1/WebKitWebProcess', '4'], ['DROIDDECK_EPIC_HIDDEN=1', 'LANG=C']) + task(5000013, [fex, '/e/usr/bin/EpicGamesLauncher'], ['HOME=/root']) + task(5000014, ['/e/WebKitWebProcess', '4'], ['DROIDDECK_EPIC_HIDDEN=1']) + task(5000015, [fex, '/e/usr/bin/EpicGamesLauncher'], ['DROIDDECK_EPIC_HIDDEN=10']) + task(5000016, ['/s/reaper', 'SteamLaunch', 'AppId=413150', '--', 'game']) + source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + result = run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game|$_bl_apps"') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('5000010 5000011 5000012|5000013 5000014 5000015|1| 413150', result.stdout.strip()) + + def scan_fake(self, tasks): + with tempfile.TemporaryDirectory() as tmp: + for pid, argv in tasks: + self.write_cmd(Path(tmp), pid, argv) + source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + return run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game"') + + def test_battlenet_is_compressed_with_the_client_while_one_of_its_games_runs(self): + launcher = [ + (6000010, ['/s/steamrtarm64/steam', '-gamepadui']), + (6000011, ['/s/reaper', 'SteamLaunch', 'AppId=2899116412', '--', 'droiddeck-battlenet']), + (6000012, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe', '--exec=launch S1']), + (6000013, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.15511\\Battle.net Helper.exe', '--type=renderer']), + (6000014, ['C:\\ProgramData\\Battle.net\\Agent\\Agent.9324\\Agent.exe', '--internalclienttools']), + (6000015, ['C:\\windows\\system32\\services.exe']), + (6000016, ['C:\\windows\\system32\\winedevice.exe', '-uid']), + ] + game = [(6000017, ['S:\\Games\\StarCraft\\x86\\StarCraft.exe', '-launch', '-uid', 's1'])] + before = self.scan_fake(launcher) + during = self.scan_fake(launcher + game) + for result in (before, during): + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('6000010|6000015 6000016 6000012 6000013 6000014|1', before.stdout.strip()) + self.assertEqual('6000010 6000012 6000013 6000014|6000015 6000016 6000017|1', during.stdout.strip()) + + def test_a_game_without_a_battlenet_uid_leaves_battlenet_alone(self): + result = self.scan_fake([ + (6000020, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe']), + (6000021, ['D:\\Games\\Other\\Game.exe', '-windowed']), + (6000022, ['/usr/bin/wine', 'game.exe', '-uid']), + ]) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) + + def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): + source = SCRIPT.read_text() + start = source.index(' if [ "$_bl_game" = 1 ] && bl_game_focused; then') + 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_clock_pause_preload.py b/tools/tests/test_clock_pause_preload.py new file mode 100644 index 000000000..652381112 --- /dev/null +++ b/tools/tests/test_clock_pause_preload.py @@ -0,0 +1,137 @@ +import os +from pathlib import Path +import shutil +import struct +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +PROGRAM = r""" +#define _GNU_SOURCE +#include <linux/futex.h> +#include <pthread.h> +#include <semaphore.h> +#include <stdint.h> +#include <stdio.h> +#include <sys/syscall.h> +#include <sys/timerfd.h> +#include <time.h> +#include <unistd.h> + +static int64_t ns(clockid_t clock) { + struct timespec ts; + clock_gettime(clock, &ts); + return (int64_t)ts.tv_sec * 1000000000LL + ts.tv_nsec; +} + +static struct timespec in(clockid_t clock, int64_t delay) { + int64_t t = ns(clock) + delay; + struct timespec ts = {(time_t)(t / 1000000000LL), (long)(t % 1000000000LL)}; + return ts; +} + +static int64_t start; +static void begin(void) { start = ns(CLOCK_BOOTTIME); } +static void end(const char *name) { printf("%s %lld\n", name, (long long)((ns(CLOCK_BOOTTIME) - start) / 1000000LL)); } + +int main(void) { + const int64_t wait = 60000000LL; + printf("gap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); + struct timespec raw; + syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &raw); + printf("rawgap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ((int64_t)raw.tv_sec * 1000000000LL + raw.tv_nsec)) / 1000000LL)); + + pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + pthread_condattr_t attr; + pthread_cond_t mono, real; + pthread_condattr_init(&attr); + pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); + pthread_cond_init(&mono, &attr); + pthread_cond_init(&real, NULL); + struct timespec ts; + + pthread_mutex_lock(&mutex); + ts = in(CLOCK_MONOTONIC, wait); begin(); pthread_cond_timedwait(&mono, &mutex, &ts); end("cond_mono"); + ts = in(CLOCK_REALTIME, wait); begin(); pthread_cond_timedwait(&real, &mutex, &ts); end("cond_real"); + ts = in(CLOCK_MONOTONIC, wait); begin(); pthread_cond_clockwait(&real, &mutex, CLOCK_MONOTONIC, &ts); end("clockwait"); + pthread_mutex_unlock(&mutex); + + sem_t sem; + sem_init(&sem, 0, 0); + ts = in(CLOCK_MONOTONIC, wait); begin(); sem_clockwait(&sem, CLOCK_MONOTONIC, &ts); end("sem"); + + ts = in(CLOCK_MONOTONIC, wait); begin(); clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, NULL); end("nanosleep"); + + int fd = timerfd_create(CLOCK_MONOTONIC, 0); + struct itimerspec it = {{0, 0}, in(CLOCK_MONOTONIC, wait)}; + uint64_t ticks; + timerfd_settime(fd, TFD_TIMER_ABSTIME, &it, NULL); + begin(); if (read(fd, &ticks, sizeof(ticks)) < 0) ticks = 0; end("timerfd"); + + static uint32_t word; + ts = in(CLOCK_MONOTONIC, wait); begin(); + syscall(SYS_futex, &word, FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG, 0, &ts, NULL, FUTEX_BITSET_MATCH_ANY); + end("futex"); + return 0; +} +""" + +SHIFT_MS = 10000 + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class ClockPausePreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.temp = tempfile.TemporaryDirectory() + cls.dir = Path(cls.temp.name) + cls.control = cls.dir / "clock" + build = cls.dir / "build" + build.mkdir() + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DBL_CLOCK_ANY_ARCH", + '-DCP_CTL="%s"' % cls.control, "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + cls.shell = build / "plasmashell" + subprocess.run(["cc", "-O2", "-pthread", "-o", str(cls.shell), str(build / "program.c")], check=True) + cls.other = build / "kwin_wayland" + shutil.copy(cls.shell, cls.other) + + @classmethod + def tearDownClass(cls): + cls.temp.cleanup() + + def run_program(self, program, shift_ms, preload=True): + self.control.write_bytes(struct.pack("<q", shift_ms * 1000000)) + env = dict(os.environ) + if preload: + env["LD_PRELOAD"] = str(self.preload) + result = subprocess.run([str(program)], env=env, capture_output=True, text=True, check=True, timeout=30) + return {name: int(value) for name, value in (line.split() for line in result.stdout.splitlines())} + + def test_the_shell_sees_monotonic_time_stopped_for_the_pause(self): + plain = self.run_program(self.shell, 0) + paused = self.run_program(self.shell, SHIFT_MS) + self.assertAlmostEqual(paused["gap"] - plain["gap"], SHIFT_MS, delta=50) + self.assertAlmostEqual(paused["rawgap"] - plain["rawgap"], SHIFT_MS, delta=50) + + def test_timed_waits_last_as_long_as_asked_after_a_pause(self): + paused = self.run_program(self.shell, SHIFT_MS) + for name in ("cond_mono", "cond_real", "clockwait", "sem", "nanosleep", "timerfd", "futex"): + self.assertGreaterEqual(paused[name], 50, name) + self.assertLess(paused[name], 1000, name) + + def test_other_programs_keep_the_real_clock(self): + plain = self.run_program(self.other, 0, preload=False) + paused = self.run_program(self.other, SHIFT_MS) + self.assertAlmostEqual(paused["gap"], plain["gap"], delta=50) + for name in ("cond_mono", "clockwait", "sem", "nanosleep", "timerfd", "futex"): + self.assertGreaterEqual(paused[name], 50, name) + self.assertLess(paused[name], 1000, name) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_close_eio_preload.py b/tools/tests/test_close_eio_preload.py new file mode 100644 index 000000000..0abe77d7b --- /dev/null +++ b/tools/tests/test_close_eio_preload.py @@ -0,0 +1,112 @@ +import errno +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +SHIM = r""" +#define _GNU_SOURCE +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <string.h> +#include <sys/syscall.h> +#include <unistd.h> + +int close(int fd) { + char link[64], path[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", fd); + ssize_t n = readlink(link, path, sizeof path - 1); + path[n > 0 ? n : 0] = 0; + long r = syscall(SYS_close, fd); + if (r == 0 && n > 4 && !strcmp(path + n - 4, ".eio")) { + errno = EIO; + return -1; + } + return (int)r; +} +""" + +PROGRAM = r""" +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <unistd.h> + +static void check(const char *name, const char *path, int flags) { + int fd = open(path, flags); + if (fd < 0) { printf("%s open-failed\n", name); return; } + char b[4]; + if (read(fd, b, sizeof b) < 0) {} + errno = 0; + int r = close(fd); + int error = r ? errno : 0; + int still_open = fcntl(fd, F_GETFD) >= 0; + printf("%s %d %d %d\n", name, r, error, still_open); +} + +int main(int argc, char **argv) { + check("readonly", argv[1], O_RDONLY); + check("readwrite", argv[1], O_RDWR); + check("plain", argv[2], O_RDONLY); + errno = 0; + int r = close(-1); + printf("badfd %d %d\n", r, errno == EBADF); + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class CloseEioPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.temp = tempfile.TemporaryDirectory() + cls.dir = Path(cls.temp.name) + (cls.dir / "shim.c").write_text(SHIM) + (cls.dir / "program.c").write_text(PROGRAM) + cls.preload = cls.dir / "libblsession.so" + cls.shim = cls.dir / "libshim.so" + cls.program = cls.dir / "program" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DBL_CLOCK_ANY_ARCH", + '-DCP_CTL="%s"' % (cls.dir / "clock"), "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.shim), str(cls.dir / "shim.c")], check=True) + subprocess.run(["cc", "-O2", "-o", str(cls.program), str(cls.dir / "program.c")], check=True) + (cls.dir / "data.eio").write_bytes(b"data") + (cls.dir / "plain").write_bytes(b"data") + + @classmethod + def tearDownClass(cls): + cls.temp.cleanup() + + def run_program(self, preloads): + env = dict(os.environ, LD_PRELOAD=":".join(map(str, preloads))) + result = subprocess.run([str(self.program), str(self.dir / "data.eio"), str(self.dir / "plain")], + env=env, capture_output=True, text=True, check=True, timeout=30) + return {line.split()[0]: line.split()[1:] for line in result.stdout.splitlines()} + + def test_a_flush_error_on_a_read_only_file_is_not_a_close_failure(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["0", "0", "0"], out["readonly"]) + + def test_a_flush_error_after_writing_access_is_still_reported(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["-1", str(errno.EIO), "0"], out["readwrite"]) + + def test_other_closes_are_unchanged(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["0", "0", "0"], out["plain"]) + self.assertEqual(["-1", "1"], out["badfd"]) + + def test_without_the_session_library_the_error_reaches_the_program(self): + out = self.run_program([self.shim]) + self.assertEqual("-1", out["readonly"][0]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_component_prepare.py b/tools/tests/test_component_prepare.py new file mode 100644 index 000000000..b513c8fe7 --- /dev/null +++ b/tools/tests/test_component_prepare.py @@ -0,0 +1,106 @@ +import importlib.util +import io +import json +import os +from pathlib import Path +import subprocess +import tarfile +import tempfile +import unittest +from unittest.mock import patch + +SPEC = importlib.util.spec_from_file_location('component_prepare', Path(__file__).resolve().parents[1] / 'components/prepare.py') +components = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(components) + + +class ComponentPrepareTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + self.fixture(self.root) + + def fixture(self, root): + for name in components.TREES: + (root / name).mkdir(parents=True) + (root / 'tools/components/recipes').mkdir(parents=True) + (root / 'input.h').write_text('#define VALUE 1\n') + (root / 'tools/components/recipes/fake.sh').write_text('printf binary > app/src/main/assets/linuxfs/demo.so\n') + spec = dict(script='tools/components/recipes/fake.sh', inputs=['input.h', 'tools/components/recipes/fake.sh'], + outputs=['app/src/main/assets/linuxfs/demo.so']) + (root / components.REGISTRY).write_text(json.dumps(dict(fake=spec))) + for name in components.LIBRARIES: + (root / name).parent.mkdir(parents=True, exist_ok=True) + (root / name).write_bytes(b'library') + subprocess.run(['git', 'init', '-q', str(root)], check=True) + subprocess.run(['git', '-C', str(root), 'config', 'core.autocrlf', 'false'], check=True) + subprocess.run(['git', '-C', str(root), 'add', '.'], check=True) + subprocess.run(['git', '-C', str(root), '-c', 'user.name=Test Developer', '-c', 'user.email=test@example.test', + 'commit', '-qm', 'baseline'], check=True) + + def test_recipe_failure_or_missing_output_does_not_succeed(self): + script = self.root / 'tools/components/recipes/fake.sh' + script.write_text('exit 7\n') + with self.assertRaises(subprocess.CalledProcessError): + components.prepare('fake', self.root) + script.write_text('exit 0\n') + with self.assertRaisesRegex(ValueError, 'required outputs'): + components.prepare('fake', self.root) + + def test_identity_covers_source_and_recipe_changes(self): + original = components.identity('fake', self.root) + (self.root / 'input.h').write_text('#define VALUE 2\n') + changed = components.identity('fake', self.root) + self.assertNotEqual(original, changed) + script = self.root / 'tools/components/recipes/fake.sh' + script.write_text(script.read_text() + '\nprintf changed\n') + self.assertNotEqual(changed, components.identity('fake', self.root)) + + def test_tool_requirements_are_installed_in_one_union(self): + definitions = dict(one=dict(packages=['gcc', 'cmake']), two=dict(packages=['gcc', 'qemu-user'])) + with patch.object(components, 'registry', return_value=definitions), patch.object(components.subprocess, 'run') as run: + components.prepare_tools(['one', 'two'], self.root) + run.assert_called_once_with(['bash', 'tools/ci/install-ubuntu-packages.sh', 'cmake', 'gcc', 'qemu-user'], + cwd=self.root, check=True) + + def test_prepared_handoff_verifies_every_file_and_source_tree(self): + components.prepare('fake', self.root) + archive = self.root / 'prepared.tar.gz' + components.pack(archive, self.root) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=self.root, text=True).strip() + target = self.root / 'target' + self.fixture(target) + components.unpack(archive, tree, target) + self.assertEqual((target / 'app/src/main/assets/linuxfs/demo.so').read_bytes(), b'binary') + with self.assertRaisesRegex(ValueError, 'pinned source'): + components.unpack(archive, 'wrong-tree', target) + + def test_tampered_component_bytes_fail_handoff_verification(self): + components.prepare('fake', self.root) + archive = self.root / 'prepared.tar.gz' + components.pack(archive, self.root) + corrupt = self.root / 'corrupt.tar.gz' + with tarfile.open(archive) as original, tarfile.open(corrupt, 'w:gz') as output: + for entry in original: + content = original.extractfile(entry).read() + if entry.name.endswith('demo.so'): + content = b'tampered' + entry.size = len(content) + output.addfile(entry, io.BytesIO(content)) + target = self.root / 'target' + self.fixture(target) + tree = subprocess.check_output(['git', 'rev-parse', 'HEAD^{tree}'], cwd=self.root, text=True).strip() + with self.assertRaisesRegex(ValueError, 'file hashes'): + components.unpack(corrupt, tree, target) + + def test_archive_cannot_overwrite_source_through_traversal(self): + archive = self.root / 'bad.tar.gz' + with tarfile.open(archive, mode='w:gz') as tar: + name = 'app/src/main/assets/linuxfs/../../../../../input.h' + entry = tarfile.TarInfo(name) + entry.size = 3 + tar.addfile(entry, io.BytesIO(b'bad')) + with self.assertRaisesRegex(ValueError, 'Unsafe'): + components.unpack(archive, 'tree', self.root) + self.assertEqual((self.root / 'input.h').read_text(), '#define VALUE 1\n') diff --git a/tools/tests/test_cursor_composite.py b/tools/tests/test_cursor_composite.py new file mode 100644 index 000000000..b3788d348 --- /dev/null +++ b/tools/tests/test_cursor_composite.py @@ -0,0 +1,53 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] + + +class CursorCompositeTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + header = (REPO / 'app/src/main/cpp/waylandcomp/src/cardboard.h').read_text() + sources = dict(re.findall(r'CARDBOARD_SOURCE_(SCREEN|SBS|FLAT)\s*=\s*(\d+)', header)) + for name in ('SCREEN', 'SBS', 'FLAT'): + if name not in sources: + raise AssertionError(f'cardboard.h no longer defines CARDBOARD_SOURCE_{name}') + if sources['SBS'] != '1': + raise AssertionError(f'CARDBOARD_SOURCE_SBS is {sources["SBS"]}, expected 1') + + source = (REPO / 'app/src/main/cpp/waylandcomp/src/compositor.c').read_text() + start = source.index('static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) {') + end = source.index('\n}\n', start) + 3 + + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-cursor-composite-') + cls.addClassCleanup(cls.temp.cleanup) + folder = Path(cls.temp.name) + (folder / 'cursor_scene_positions.inc').write_text(source[start:end]) + start = source.index('static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) {') + end = source.index('\n}\n', start) + 3 + (folder / 'cursor_clip_to_eye.inc').write_text(source[start:end]) + (folder / 'cursor_constants.inc').write_text( + f'#define CARDBOARD_SOURCE_SCREEN {sources["SCREEN"]}\n' + f'#define CARDBOARD_SOURCE_SBS {sources["SBS"]}\n' + f'#define CARDBOARD_SOURCE_FLAT {sources["FLAT"]}\n') + cls.binary = folder / 'cursor-composite-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', '-I', str(folder), + str(REPO / 'tools/tests/cursor_composite_harness.c'), + '-o', str(cls.binary)], check=True, capture_output=True, text=True) + + def test_cursor_is_drawn_once_for_one_eye_and_mirrored_for_sbs(self): + result = subprocess.run([str(self.binary)], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('PASS: cursor stereo placement', result.stdout) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_ddfg_flow_levels.py b/tools/tests/test_ddfg_flow_levels.py new file mode 100644 index 000000000..d5efd6355 --- /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_deploy_fast.py b/tools/tests/test_deploy_fast.py new file mode 100644 index 000000000..98f7f10ab --- /dev/null +++ b/tools/tests/test_deploy_fast.py @@ -0,0 +1,278 @@ +import hashlib +from pathlib import Path +import subprocess +import sys +import tempfile +import unittest +from unittest import mock +from zipfile import ZIP_DEFLATED, ZIP_STORED, ZipFile, ZipInfo + +sys.path.insert(0, str(Path(__file__).resolve().parents[1])) +import deploy_fast + + +def make_apk(path, entries): + with ZipFile(path, 'w') as package: + for name, (data, method) in entries.items(): + info = ZipInfo(name) + info.extra = b'\0' * 6 + package.writestr(info, data, compress_type=method) + + +class ClassifyTest(unittest.TestCase): + agent = 'tools/linuxfs/overlay/usr/local/bin/droiddeck-agent' + targets = {agent: 'assets/linuxfs/usr/local/bin/droiddeck-agent', + 'tools/linuxfs/overlay/usr/local/bin/droiddeck-new': 'assets/linuxfs/usr/local/bin/droiddeck-new'} + entries = {'assets/linuxfs/usr/local/bin/droiddeck-agent'} + + def classify(self, changes): + return deploy_fast.classify(changes, self.targets, self.entries) + + def test_helpers_graft_and_tests_or_docs_are_ignored(self): + grafts, ignored, blocked = self.classify({ + self.agent: 'M', 'tools/tests/test_x.py': 'M', 'docs/a/b.txt': 'A', 'README.md': 'M'}) + self.assertEqual(grafts, {self.agent: 'assets/linuxfs/usr/local/bin/droiddeck-agent'}) + self.assertEqual(sorted(ignored), ['README.md', 'docs/a/b.txt', 'tools/tests/test_x.py']) + self.assertEqual(blocked, {}) + + def test_everything_else_fails_closed(self): + changes = {'app/src/main/java/com/droiddeck/launcher/Foo.kt': 'M', 'tools/proot/build.sh': 'M', + 'tools/linuxfs/overlay/usr/local/bin/droiddeck-new': 'A'} + self.assertEqual(set(self.classify(changes)[2]), set(changes)) + self.assertEqual(set(self.classify({self.agent: 'D'})[2]), {self.agent}) + + def test_real_graft_targets_exist_in_the_overlay(self): + for path in deploy_fast.graft_targets(): + self.assertTrue((deploy_fast.ROOT / path).is_file(), path) + + +class GraftTest(unittest.TestCase): + def test_replaces_entries_keeps_the_rest_and_drops_the_signature(self): + with tempfile.TemporaryDirectory() as directory: + donor, output = Path(directory) / 'donor.apk', Path(directory) / 'out.apk' + make_apk(donor, {'classes.dex': (b'dex', ZIP_DEFLATED), 'lib/arm64-v8a/libx.so': (b'elf', ZIP_STORED), + 'assets/a': (b'old', ZIP_DEFLATED), 'META-INF/MANIFEST.MF': (b'm', ZIP_DEFLATED), + 'META-INF/CERT.SF': (b's', ZIP_DEFLATED), 'META-INF/CERT.RSA': (b'r', ZIP_DEFLATED), + 'META-INF/keep.version': (b'v', ZIP_DEFLATED)}) + deploy_fast.graft(donor, {'assets/a': b'new'}, output) + with ZipFile(output) as package: + self.assertEqual(package.read('assets/a'), b'new') + self.assertEqual(package.read('classes.dex'), b'dex') + self.assertEqual(package.getinfo('lib/arm64-v8a/libx.so').compress_type, ZIP_STORED) + self.assertEqual(package.getinfo('classes.dex').compress_type, ZIP_DEFLATED) + self.assertEqual(package.getinfo('classes.dex').extra, b'') + self.assertEqual([n for n in package.namelist() if n.startswith('META-INF/')], + ['META-INF/keep.version']) + + def test_unknown_replacement_entry_is_refused(self): + with tempfile.TemporaryDirectory() as directory: + donor = Path(directory) / 'donor.apk' + make_apk(donor, {'assets/a': (b'old', ZIP_DEFLATED)}) + with self.assertRaises(deploy_fast.Refused): + deploy_fast.graft(donor, {'assets/missing': b'x'}, Path(directory) / 'out.apk') + + +class RepoTest(unittest.TestCase): + def setUp(self): + self.directory = tempfile.TemporaryDirectory() + self.addCleanup(self.directory.cleanup) + self.root = Path(self.directory.name) + patch = mock.patch.object(deploy_fast, 'ROOT', self.root) + patch.start() + self.addCleanup(patch.stop) + self.git('init', '-q', '-b', 'trunk') + self.git('config', 'user.email', 'a@b.c') + self.git('config', 'user.name', 'a') + (self.root / 'kept').write_text('1') + (self.root / 'gone').write_text('1') + self.git('add', '.') + self.git('commit', '-q', '-m', 'base') + self.base = self.git('rev-parse', 'HEAD').strip() + + def git(self, *args): + return subprocess.run(['git', '-C', str(self.root), *args], capture_output=True, text=True, check=True).stdout + + def test_changed_paths_cover_staged_untracked_and_deleted_files(self): + (self.root / 'kept').write_text('2') + (self.root / 'gone').unlink() + (self.root / 'fresh').write_text('x') + self.git('add', 'kept') + self.assertEqual(deploy_fast.changed_paths(self.base), {'kept': 'M', 'gone': 'D', 'fresh': 'A'}) + + def test_helper_bytes_normalize_text_but_not_binaries(self): + (self.root / 'script').write_bytes(b'a\r\nb\r\n') + (self.root / 'binary').write_bytes(b'\0a\r\n') + self.assertEqual(deploy_fast.helper_bytes('script'), b'a\nb\n') + self.assertEqual(deploy_fast.helper_bytes('binary'), b'\0a\r\n') + + def test_a_donor_ahead_of_the_checkout_is_not_an_ancestor(self): + self.git('checkout', '-q', '-b', 'side') + (self.root / 'kept').write_text('3') + self.git('commit', '-qam', 'side') + side = self.git('rev-parse', 'HEAD').strip() + self.git('checkout', '-q', 'trunk') + self.assertTrue(deploy_fast.is_ancestor(self.base)) + self.assertFalse(deploy_fast.is_ancestor(side)) + + +class DonorTest(unittest.TestCase): + def test_pick_tag_takes_the_newest_ancestor(self): + commits = {'main-new': 'n', 'main-mid': 'm', 'main-old': 'o'} + with mock.patch.object(deploy_fast, 'release_tags', return_value=list(commits)), \ + mock.patch.object(deploy_fast, 'donor_commit', side_effect=lambda tag: commits[tag]), \ + mock.patch.object(deploy_fast, 'is_ancestor', side_effect=lambda commit: commit != 'n'): + self.assertEqual(deploy_fast.pick_tag(None), 'main-mid') + self.assertEqual(deploy_fast.pick_tag('main-new'), 'main-new') + + def test_pick_tag_without_an_ancestor_is_refused(self): + with mock.patch.object(deploy_fast, 'release_tags', return_value=['main-a']), \ + mock.patch.object(deploy_fast, 'donor_commit', return_value='a'), \ + mock.patch.object(deploy_fast, 'is_ancestor', return_value=False): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.pick_tag(None) + + def test_checksum_mismatch_discards_the_cached_donor(self): + with tempfile.TemporaryDirectory() as directory: + folder = Path(directory) / 'main-x' + folder.mkdir() + apk = folder / 'DroidDeck-main-x.apk' + sums = folder / 'SHA256SUMS.txt' + apk.write_bytes(b'apk') + sums.write_text('0' * 64 + ' DroidDeck-main-x.apk\n') + with mock.patch.object(deploy_fast, 'CACHE', Path(directory)): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.fetch_donor('main-x') + self.assertFalse(apk.exists()) + apk.write_bytes(b'apk') + sums.write_text(hashlib.sha256(b'apk').hexdigest() + ' DroidDeck-main-x.apk\n') + self.assertEqual(deploy_fast.fetch_donor('main-x'), apk) + + def test_a_cached_apk_without_checksums_is_downloaded_again(self): + with tempfile.TemporaryDirectory() as directory: + folder = Path(directory) / 'main-x' + folder.mkdir() + apk = folder / 'DroidDeck-main-x.apk' + apk.write_bytes(b'truncated') + calls = [] + sums = hashlib.sha256(b'apk').hexdigest() + ' ' + apk.name + '\n' + + def download(command, timeout, **options): + pattern = command[command.index('-p') + 1] + calls.append(pattern) + (folder / pattern).write_bytes(b'apk' if pattern.endswith('.apk') else sums.encode()) + return mock.Mock(returncode=0, stderr='') + + with mock.patch.object(deploy_fast, 'CACHE', Path(directory)): + with mock.patch.object(deploy_fast, 'run_bounded', download): + self.assertEqual(deploy_fast.fetch_donor('main-x'), apk) + self.assertEqual(calls, [apk.name, 'SHA256SUMS.txt']) + + def test_a_failed_download_removes_the_apk_and_a_timeout_is_refused(self): + with tempfile.TemporaryDirectory() as directory: + folder = Path(directory) / 'main-x' + folder.mkdir() + apk = folder / 'DroidDeck-main-x.apk' + apk.write_bytes(b'partial') + failed = mock.Mock(returncode=1, stderr='boom') + with mock.patch.object(deploy_fast, 'CACHE', Path(directory)): + with mock.patch.object(deploy_fast, 'run_bounded', return_value=failed): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.fetch_donor('main-x') + self.assertFalse(apk.exists()) + timeout = deploy_fast.subprocess.TimeoutExpired('git', 1) + with mock.patch.object(deploy_fast.subprocess, 'run', side_effect=timeout): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.git('status') + + +class SignTest(unittest.TestCase): + def test_paths_with_apostrophes_are_escaped_for_powershell(self): + seen = [] + + def run(command, **options): + seen.append(command) + return mock.Mock(returncode=1, stdout='', stderr='') + + with mock.patch.object(deploy_fast, 'pwsh', return_value='pwsh'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=None): + with mock.patch.object(deploy_fast, 'SIGNER', Path("C:/O'Brien/sign.ps1")): + with mock.patch.object(deploy_fast.subprocess, 'run', side_effect=run): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.sign(Path("C:/a'b/in.apk"), Path("C:/a'b/out.apk")) + script = seen[0][-1] + self.assertIn("O''Brien", script) + self.assertIn("a''b", script) + self.assertNotIn("a'b", script.replace("a''b", '')) + self.assertNotIn("O'Brien", script.replace("O''Brien", '')) + + def test_signing_env_prefers_the_override_then_the_checkout_then_the_main_checkout(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory) + (base / 'main').mkdir() + (base / 'checkout').mkdir() + base = base.resolve() + override, local, shared = base / 'override.env', base / 'checkout/.signing.env', base / 'main/.signing.env' + common = (str(base / 'main/.git') + '\n').encode() + with mock.patch.object(deploy_fast, 'ROOT', base / 'checkout'), \ + mock.patch.object(deploy_fast, 'git', return_value=common), \ + mock.patch.dict(deploy_fast.os.environ, {'DROIDDECK_SIGNING_ENV': str(override)}): + self.assertIsNone(deploy_fast.signing_env()) + shared.write_text('x') + self.assertEqual(deploy_fast.signing_env(), shared) + local.write_text('x') + self.assertEqual(deploy_fast.signing_env(), local) + override.write_text('x') + self.assertEqual(deploy_fast.signing_env(), override) + + def test_the_env_signer_is_used_when_the_windows_signer_is_missing(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory) + (base / 'build-tools/35.0.0').mkdir(parents=True) + for tool in ('aapt', 'zipalign', 'apksigner'): + (base / 'build-tools/35.0.0' / tool).write_text('') + signed = base / 'out.apk' + + def run(command, **options): + signed.write_text('apk') + return mock.Mock(returncode=0, stdout='', stderr='') + + with mock.patch.object(deploy_fast, 'SIGNER', base / 'missing.ps1'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=base / '.signing.env'), \ + mock.patch.object(deploy_fast, 'sdk_root', return_value=base), \ + mock.patch.object(deploy_fast.subprocess, 'run', side_effect=run) as run_: + deploy_fast.sign(base / 'in.apk', signed) + self.assertEqual(run_.call_args[0][0][-4:], [str(deploy_fast.ROOT / 'tools/release/sign-apk.sh'), str(base / 'in.apk'), str(signed), str((base / 'build-tools/35.0.0').resolve())]) + failed = mock.Mock(returncode=1, stdout='', stderr='boom') + signed.unlink() + with mock.patch.object(deploy_fast, 'SIGNER', base / 'missing.ps1'), \ + mock.patch.object(deploy_fast, 'signing_env', return_value=base / '.signing.env'), \ + mock.patch.object(deploy_fast, 'sdk_root', return_value=base), \ + mock.patch.object(deploy_fast.subprocess, 'run', return_value=failed): + with self.assertRaises(deploy_fast.Refused): + deploy_fast.sign(base / 'in.apk', signed) + + def test_the_newest_build_tools_win_numerically_and_the_env_file_cannot_replace_them(self): + with tempfile.TemporaryDirectory() as directory: + base = Path(directory).resolve() + for version in ('9.0.0', '35.0.0', '100.0.0'): + (base / 'build-tools' / version).mkdir(parents=True) + for tool in ('aapt', 'zipalign', 'apksigner'): + (base / 'build-tools' / version / tool).write_text('') + (base / 'build-tools/200.0.0').mkdir() + (base / 'build-tools/200.0.0/aapt').write_text('') + root = base / 'checkout' + (root / 'tools/release').mkdir(parents=True) + fake = root / 'tools/release/sign-apk.sh' + fake.write_text('#!/bin/bash\necho "$BUILD_TOOLS" > "$3"\n') + fake.chmod(0o755) + env_file = base / 'keys/.signing.env' + env_file.parent.mkdir() + env_file.write_text('BUILD_TOOLS=/wrong\n') + signed = base / 'out.apk' + with mock.patch.object(deploy_fast, 'ROOT', root), mock.patch.object(deploy_fast, 'sdk_root', return_value=base): + deploy_fast.sign_with_env(env_file, base / 'in.apk', signed) + self.assertEqual(signed.read_text().strip(), str(base / 'build-tools/100.0.0')) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_desktop_chromium_apps.py b/tools/tests/test_desktop_chromium_apps.py new file mode 100644 index 000000000..f8d6056d2 --- /dev/null +++ b/tools/tests/test_desktop_chromium_apps.py @@ -0,0 +1,88 @@ +import os +from pathlib import Path +import tempfile +import unittest + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/desktop/droiddeck-desktop-gpu" +PREFIX = "env -u WAYLAND_DISPLAY XDG_SESSION_TYPE=x11 ELECTRON_DISABLE_SANDBOX=1 " +FLAGS = " --no-sandbox --ozone-platform=x11" + + +def load(): + source = SCRIPT.read_text() + assert source.rstrip().endswith("main()") + scope = {"__name__": "droiddeck_desktop_gpu"} + exec(compile(source.rstrip()[:-len("main()")], str(SCRIPT), "exec"), scope) + return scope + + +class DesktopChromiumAppsTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.gpu = load() + self.electron = self.app("lib/chat/chat", sandbox=True) + self.plain = self.app("lib/editor/editor", sandbox=False) + bin_dir = self.root / "bin" + bin_dir.mkdir() + (bin_dir / "chat").symlink_to(self.electron) + old_path = os.environ.get("PATH", "") + os.environ["PATH"] = "%s:%s" % (bin_dir, old_path) + self.addCleanup(os.environ.__setitem__, "PATH", old_path) + + def app(self, relative, sandbox): + path = self.root / relative + path.parent.mkdir(parents=True) + path.write_text("#!/bin/sh\n") + path.chmod(0o755) + if sandbox: + (path.parent / "chrome-sandbox").write_text("") + return path + + def entry(self, exec_line, categories="Network;", actions=""): + text = "[Desktop Entry]\nType=Application\nName=App\nExec=%s\nCategories=%s\n" % (exec_line, categories) + if actions: + text += "Actions=new;\n\n[Desktop Action new]\nName=New\nExec=%s\n" % actions + return text + + def exec_lines(self, text): + return [l[5:] for l in text.splitlines() if l.startswith("Exec=")] + + def test_an_electron_app_starts_without_the_sandbox_on_x11(self): + out = self.gpu["wrap"](self.entry("%s %%U" % self.electron, actions="%s --new" % self.electron)) + self.assertEqual(self.exec_lines(out), [PREFIX + str(self.electron) + FLAGS + " %U", + PREFIX + str(self.electron) + FLAGS + " --new"]) + self.assertIn("X-DroidDeck-GPU=1", out) + self.assertIn("Actions=new;", out) + self.assertNotIn("droiddeck-window", out) + + def test_a_command_on_the_path_is_followed_to_its_install_folder(self): + out = self.gpu["wrap"](self.entry("chat %U")) + self.assertEqual(self.exec_lines(out), [PREFIX + "chat" + FLAGS + " %U"]) + + def test_a_quoted_program_keeps_its_quotes(self): + out = self.gpu["wrap"](self.entry('"%s" %%U' % self.electron)) + self.assertEqual(self.exec_lines(out), [PREFIX + '"%s"' % self.electron + FLAGS + " %U"]) + + def test_other_apps_are_left_alone(self): + self.assertIsNone(self.gpu["wrap"](self.entry("%s %%F" % self.plain))) + self.assertIsNone(self.gpu["wrap"](self.entry("missing-program %F"))) + + def test_an_electron_game_goes_to_the_gpu_and_keeps_a_window_action(self): + out = self.gpu["wrap"](self.entry(str(self.electron), categories="Game;")) + fixed = PREFIX + str(self.electron) + FLAGS + self.assertEqual(self.exec_lines(out), ["droiddeck-gpu " + fixed, fixed]) + + def test_with_the_gpu_off_electron_apps_are_still_fixed(self): + out = self.gpu["wrap"](self.entry(str(self.electron), categories="Game;"), False) + self.assertEqual(self.exec_lines(out), [PREFIX + str(self.electron) + FLAGS]) + self.assertIsNone(self.gpu["wrap"](self.entry(str(self.plain), categories="Game;"), False)) + + def test_games_that_are_not_chromium_are_unchanged(self): + out = self.gpu["wrap"](self.entry(str(self.plain), categories="Game;")) + self.assertEqual(self.exec_lines(out), ["droiddeck-gpu " + str(self.plain), str(self.plain)]) + + +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 000000000..ba3bfc549 --- /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_ime.py b/tools/tests/test_desktop_ime.py new file mode 100644 index 000000000..7062e8c09 --- /dev/null +++ b/tools/tests/test_desktop_ime.py @@ -0,0 +1,104 @@ +import json +import os +from pathlib import Path +import socket +import struct +import subprocess +import tempfile +import time +import unittest + +IME = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-ime' + + +def message(obj, opcode, payload=b''): + return struct.pack('<II', obj, ((8 + len(payload)) << 16) | opcode) + payload + + +def wl_string(value): + data = value.encode() + b'\0' + return struct.pack('<I', len(data)) + data + b'\0' * (-len(data) % 4) + + +class DesktopImeTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.session = Path(self.temp.name) + self.server, client = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM) + self.addCleanup(self.server.close) + env = dict(os.environ, BL_LAUNCH_DIR=str(self.session), WAYLAND_SOCKET=str(client.fileno())) + self.proc = subprocess.Popen(['python3', str(IME)], env=env, pass_fds=[client.fileno()], + stderr=subprocess.PIPE, text=True) + client.close() + self.addCleanup(self.stop) + self.server.settimeout(5) + self.assertEqual(self.read(12), message(1, 1, struct.pack('<I', 2))) + self.server.sendall(message(2, 0, struct.pack('<I', 7) + wl_string('zwp_input_method_v1') + struct.pack('<I', 1))) + bind = self.read(8 + 4 + len(wl_string('zwp_input_method_v1')) + 8) + self.assertEqual(bind, message(2, 0, struct.pack('<I', 7) + wl_string('zwp_input_method_v1') + struct.pack('<II', 1, 3))) + + def stop(self): + if self.proc.poll() is None: + self.proc.kill() + self.proc.wait(5) + self.proc.stderr.close() + + def read(self, size): + data = b'' + while len(data) < size: + chunk = self.server.recv(size - len(data)) + if not chunk: + break + data += chunk + return data + + def state(self, seq, timeout=5): + path = self.session / 'agent/ime.json' + deadline = time.monotonic() + timeout + while time.monotonic() < deadline: + try: + snapshot = json.loads(path.read_text()) + except (OSError, ValueError): + snapshot = None + if snapshot and snapshot['seq'] >= seq: + return snapshot + time.sleep(0.02) + self.fail('ime.json never reached seq %d' % seq) + + def test_focus_and_blur_are_reported(self): + self.server.sendall(message(3, 0, struct.pack('<I', 100))) + self.assertTrue(self.state(1)['textField']) + self.server.sendall(message(100, 2, struct.pack('<II', 0, 9))) + snapshot = self.state(2) + self.assertEqual((snapshot['textField'], snapshot['purpose']), (True, 9)) + self.server.sendall(message(3, 1, struct.pack('<I', 100))) + self.assertEqual(self.read(8), message(100, 0)) + self.assertFalse(self.state(3)['textField']) + self.assertEqual(oct((self.session / 'agent/ime.json').stat().st_mode & 0o777), '0o600') + + def test_switching_fields_does_not_flicker(self): + self.server.sendall(message(3, 0, struct.pack('<I', 100))) + self.assertTrue(self.state(1)['textField']) + self.server.sendall(message(3, 1, struct.pack('<I', 100)) + message(3, 0, struct.pack('<I', 101))) + self.assertEqual(self.read(8), message(100, 0)) + time.sleep(0.4) + self.assertEqual(self.state(1), {'textField': True, 'hint': 0, 'purpose': 0, 'seq': 1}) + + def test_compositor_exit_clears_the_field(self): + self.server.sendall(message(3, 0, struct.pack('<I', 100))) + self.assertTrue(self.state(1)['textField']) + self.server.close() + self.assertEqual(self.proc.wait(5), 0) + self.assertFalse(self.state(2)['textField']) + + + def test_a_protocol_error_clears_the_field(self): + self.server.sendall(message(3, 0, struct.pack('<I', 100))) + self.assertTrue(self.state(1)['textField']) + self.server.sendall(message(1, 0, struct.pack('<II', 3, 1) + wl_string('bad request'))) + self.assertEqual(self.proc.wait(5), 1) + self.assertFalse(self.state(2)['textField']) + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index de98e75c6..39eee38cf 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -316,7 +316,6 @@ class GameFolderTest(Temp): def appinfo(apps): - """appinfo.vdf as the client writes it (format 29: keys in a string table).""" strings = [] def key(name): @@ -456,6 +455,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 +473,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 +569,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 +627,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 000000000..6b3f56d5c --- /dev/null +++ b/tools/tests/test_device_controls.py @@ -0,0 +1,209 @@ +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 = []; +let now = 0; +Object.defineProperty(globalThis, 'performance', { value: { now: () => now }, configurable: true }); +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; +now = 10000; +bridge.set(0.5); +bridge.set(0.5); +assert.deepStrictEqual(requests, []); +callbacks.forEach(cb => cb({ flBrightness: 0.8 })); +assert.deepStrictEqual(requests, [0.8]); +now += 1000; +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); +now += 1000; +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]); +// A held stick: Android's lagging readbacks must not pull Steam back while it keeps stepping. +let applied = []; +SteamClient.System.Display.SetBrightness = value => applied.push(value); +for (const value of [0.71, 0.72, 0.73]) { now += 50; callbacks.forEach(cb => cb({ flBrightness: value })); } +assert.strictEqual(bridge.set(0.71), 'held'); +now += 100; +assert.strictEqual(bridge.set(0.72), 'held'); +assert.deepStrictEqual(applied, []); +now += 800; +assert.strictEqual(bridge.set(0.3), true); +assert.deepStrictEqual(applied, [0.3]); +""" + 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_a_readback_held_by_the_bridge_is_retried_instead_of_cached(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})) + results = ["held", "held", True] + helper = LIVE["Helper"]("/steam", 0) + helper.controls_installed = True + helper.page = type("Page", (), {"evaluate": lambda self, expression: results.pop(0)})() + helper.sync_controls() + helper.sync_controls() + self.assertTrue(helper.controls_installed) + self.assertIsNone(helper.controls_state) + helper.sync_controls() + self.assertEqual(helper.controls_state["revision"], 1) + self.assertEqual(results, []) + 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 9afeb919f..25478e0ab 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 66744b6d5..02e53f960 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -1,4 +1,3 @@ -"""The guest agent: its request files, exec, errors and the DevTools client, without a session.""" import base64 import hashlib import importlib.machinery @@ -26,7 +25,6 @@ loader.exec_module(agent) class FakeDevTools(threading.Thread): - """GET /json lists one target; its WebSocket answers Runtime.evaluate the way Chromium does.""" def __init__(self, answer): super().__init__(daemon=True) @@ -196,6 +194,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"]) @@ -578,6 +633,165 @@ class SteamKeyboardTest(unittest.TestCase): self.assertFalse(watcher.attached) self.assertEqual(3, log.call_count) + def test_requests_and_route_files(self): + watcher = agent.KeyboardWatcher(self.dir) + watcher.request() + watcher.request() + self.assertEqual({"seq": 2}, json.loads((self.dir / "keyboard-request.json").read_text())) + self.assertFalse(watcher.wanted_route()) + (self.dir / "keyboard-route").write_text("bottom") + self.assertTrue(watcher.wanted_route()) + (self.dir / "keyboard-route").write_text("top") + self.assertFalse(watcher.wanted_route()) + watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "request"}}) + self.assertEqual({"seq": 3}, json.loads((self.dir / "keyboard-request.json").read_text())) + self.assertIsNone(self.state()) + + def test_dismissals_are_written_for_the_app(self): + watcher = agent.KeyboardWatcher(self.dir) + watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "dismiss"}}) + watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "dismiss"}}) + self.assertEqual({"seq": 2}, json.loads((self.dir / "keyboard-dismiss.json").read_text())) + self.assertFalse((self.dir / "keyboard-request.json").exists()) + + @unittest.skipUnless(shutil.which("node"), "node is not installed") + def test_page_script_reports_when_the_routed_field_loses_focus(self): + harness = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const fs = require('fs'); +const script = fs.readFileSync(process.argv[2], 'utf8'); +const route = fs.readFileSync(process.argv[3], 'utf8'); +const calls = []; +window.droiddeckSteamKeyboard = value => calls.push(value); +const open = { m_currentValue: false }; +const vkm = { + m_currentVirtualKeyboardRef: null, + IsShowingVirtualKeyboard: { m_currentValue: false }, + m_bIsInlineVirtualKeyboardOpen: open, + m_bIsVirtualKeyboardModal: { m_currentValue: false }, + BUseVRKeyboard: () => false, + m_Instance: { IsDesktopOverlayWindow: () => false }, + SetActiveVirtualKeyboardTarget(ref, props) { this.m_currentVirtualKeyboardRef = ref; }, + SetVirtualKeyboardHidden() { open.m_currentValue = false; this.m_currentVirtualKeyboardRef = null; }, + ShowVirtualKeyboard(ref, props, modal) { this.m_currentVirtualKeyboardRef = ref; open.m_currentValue = true; }, +}; +globalThis.SteamUIStore = { WindowStore: { SteamUIWindows: [{ VirtualKeyboardManager: vkm }] } }; +eval(script); +vkm.ShowVirtualKeyboard('a', {}, false); +eval(route.replace('__ROUTE__', 'true')); +assert.strictEqual(open.m_currentValue, false); +assert.strictEqual(vkm.m_currentVirtualKeyboardRef, 'a'); +const wait = ms => new Promise(done => setTimeout(done, ms)); +(async () => { + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), []); + vkm.m_currentVirtualKeyboardRef = null; + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss']); + vkm.ShowVirtualKeyboard('b', {}, false); + assert.strictEqual(open.m_currentValue, false); + vkm.m_currentVirtualKeyboardRef = null; + await wait(160); + vkm.ShowVirtualKeyboard('c', {}, false); + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss']); + vkm.m_currentVirtualKeyboardRef = null; + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']); + let focused = false; + vkm.ShowVirtualKeyboard({ BIsElementValidForInput: () => focused }, {}, false); + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']); + focused = true; + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']); + focused = false; + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss']); + const doc = { activeElement: { tagName: 'INPUT', type: 'text' } }; + vkm.m_ownerWindow = { document: doc }; + vkm.ShowVirtualKeyboard({ BIsElementValidForInput: () => false }, {}, false); + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss']); + doc.activeElement = { tagName: 'DIV' }; + await wait(500); + assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss', 'dismiss']); + clearInterval(window.__droiddeckKeyboard.timer); +})().catch(e => { console.error(e); process.exit(1); }); +""" + (self.dir / "keyboard.js").write_text(agent.KEYBOARD_JS) + (self.dir / "route.js").write_text(agent.KEYBOARD_ROUTE_JS) + (self.dir / "harness.js").write_text(harness) + result = subprocess.run(["node", str(self.dir / "harness.js"), str(self.dir / "keyboard.js"), str(self.dir / "route.js")], + capture_output=True, text=True, timeout=20) + self.assertEqual(0, result.returncode, result.stderr) + + def test_route_is_applied_once_per_change(self): + watcher = agent.KeyboardWatcher(self.dir) + sent = [] + with patch.object(watcher, "call", side_effect=lambda ws, method, params: sent.append(params["expression"]) or {}): + watcher.apply_route(None) + watcher.apply_route(None) + (self.dir / "keyboard-route").write_text("bottom") + watcher.apply_route(None) + watcher.apply_route(None, force=True) + self.assertEqual(3, len(sent)) + self.assertTrue(sent[0].rstrip().endswith("(false)")) + self.assertTrue(sent[1].rstrip().endswith("(true)")) + self.assertNotIn("__ROUTE__", sent[2]) + self.assertNotIn("__BINDING__", sent[2]) + + @unittest.skipUnless(shutil.which("node"), "node is not installed") + def test_page_script_routes_the_keyboard_to_the_app(self): + harness = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const fs = require('fs'); +const script = fs.readFileSync(process.argv[2], 'utf8'); +const route = fs.readFileSync(process.argv[3], 'utf8'); +const calls = []; +window.droiddeckSteamKeyboard = value => calls.push(value); +const shown = [], targets = []; +const open = { m_currentValue: false }; +const vkm = { + IsShowingVirtualKeyboard: { m_currentValue: false }, + m_bIsInlineVirtualKeyboardOpen: open, + m_bIsVirtualKeyboardModal: { m_currentValue: false }, + BUseVRKeyboard: () => false, + m_Instance: { IsDesktopOverlayWindow: () => false }, + SetActiveVirtualKeyboardTarget(ref, props) { targets.push(ref); }, + SetVirtualKeyboardHidden() { open.m_currentValue = false; }, + ShowVirtualKeyboard(ref, props, modal) { shown.push(ref); open.m_currentValue = true; }, +}; +globalThis.SteamUIStore = { WindowStore: { SteamUIWindows: [{ VirtualKeyboardManager: vkm }] } }; +eval(script); +vkm.ShowVirtualKeyboard('a', {}, false); +assert.deepStrictEqual(shown, ['a']); +assert.strictEqual(eval(route.replace('__ROUTE__', 'true')), true); +assert.strictEqual(open.m_currentValue, false); +assert.deepStrictEqual(calls.filter(c => c === 'request'), ['request']); +vkm.ShowVirtualKeyboard('b', {}, false); +assert.deepStrictEqual(shown, ['a']); +assert.deepStrictEqual(targets, ['b']); +assert.deepStrictEqual(calls.filter(c => c === 'request'), ['request', 'request']); +vkm.ShowVirtualKeyboard('c', {}, true); +assert.deepStrictEqual(shown, ['a', 'c']); +eval(script); +vkm.ShowVirtualKeyboard('d', {}, false); +assert.deepStrictEqual(targets, ['b', 'd']); +eval(route.replace('__ROUTE__', 'false')); +vkm.ShowVirtualKeyboard('e', {}, false); +assert.deepStrictEqual(shown, ['a', 'c', 'e']); +clearInterval(window.__droiddeckKeyboard.timer); +""" + (self.dir / "keyboard.js").write_text(agent.KEYBOARD_JS) + (self.dir / "route.js").write_text(agent.KEYBOARD_ROUTE_JS) + (self.dir / "harness.js").write_text(harness) + result = subprocess.run(["node", str(self.dir / "harness.js"), str(self.dir / "keyboard.js"), str(self.dir / "route.js")], + capture_output=True, text=True, timeout=20) + self.assertEqual(0, result.returncode, result.stderr) + def test_no_shared_context_yet(self): with patch.object(agent, "cdp_targets", return_value=[{"title": "Steam", "webSocketDebuggerUrl": "ws://127.0.0.1:1/x"}]): with self.assertRaises(agent.AgentError) as caught: @@ -641,7 +855,6 @@ class VrFocusTest(unittest.TestCase): self.assertEqual(focus.order([42, 9, 7], [7, 42], None), [9, 7]) self.assertIsNone(focus.order([9, 7], [7], 42)) self.assertEqual(focus.order([9, 7], [7, 42], 42), [42, 9, 7]) - # Do not overwrite a different focus order installed after our last write. self.assertIsNone(focus.order([123, 7], [7, 42], None)) def test_scene_requires_live_server_and_game_environment(self): diff --git a/tools/tests/test_droiddeck_epic.py b/tools/tests/test_droiddeck_epic.py index 9e08abe6c..297168b00 100644 --- a/tools/tests/test_droiddeck_epic.py +++ b/tools/tests/test_droiddeck_epic.py @@ -326,6 +326,15 @@ class SignInHandoffTest(EpicTestCase): self.assertEqual((None, None, "unix:abstract=a11y"), (carried.get("NO_AT_BRIDGE"), carried.get("GTK_A11Y"), carried.get("AT_SPI_BUS_ADDRESS"))) + def test_only_the_hidden_launcher_skips_the_store_and_fab_pages(self): + with mock.patch.dict(G, {"fex_environment": lambda fex, files, base: {}}): + visible = G["client_environment"]({}, None, None, ":0", "bus", "broker") + hidden = G["client_environment"]({}, None, None, ":2", "bus", "broker", hidden=True) + self.assertNotIn("DROIDDECK_EPIC_HIDDEN", visible) + self.assertNotIn("EGL_DISABLE_STORE_PREWARM", visible) + self.assertEqual(("1", "1"), (hidden.get("DROIDDECK_EPIC_HIDDEN"), hidden.get("EGL_DISABLE_STORE_PREWARM"))) + self.assertEqual(visible["WEBKIT_SKIA_ENABLE_CPU_RENDERING"], hidden["WEBKIT_SKIA_ENABLE_CPU_RENDERING"]) + def session(self): session = G["Session"]("visible") session.carried = True @@ -906,6 +915,20 @@ class BrokerTest(EpicTestCase): self.assertNotIn(G["STEAM_PRELOAD"], envs[0]) self.assertNotIn("LD_PRELOAD", envs[1]) + + def test_a_game_started_by_the_hidden_launcher_does_not_inherit_its_page_switches(self): + folder = self.tmp / "Fig" + folder.mkdir() + envs = [] + + def popen(command, env=None, cwd=None, start_new_session=False): + envs.append(env) + return mock.Mock(wait=mock.Mock(return_value=0)) + + with mock.patch.object(subprocess, "Popen", popen): + G["run_game"]({"exe": str(folder / "Fig.exe"), "args": []}, dict(G["HIDDEN_ENV"], PATH="/usr/bin")) + self.assertFalse(set(G["HIDDEN_ENV"]) & set(envs[0])) + self.assertEqual("/usr/bin", envs[0]["PATH"]) def test_an_owner_gone_ends_a_game_the_open_launcher_handed_to_steam(self): broker, _ = self.broker("visible") session = G["Session"]("visible") diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index fed546ddd..456eec407 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) @@ -549,11 +620,12 @@ class LaunchTest(FexTestCase): def test_the_guest_environment(self): arm = self.write(self.tmp / "arm.so", elf(183)) x86 = self.write(self.tmp / "x86.so", elf(62)) - env = {"LD_PRELOAD": "%s:%s %s" % (arm, x86, self.tmp / "gone.so"), + env = {"LD_PRELOAD": "%s:%s %s libMelonLoader.Bootstrap.so" % (arm, x86, self.tmp / "gone.so"), "LD_LIBRARY_PATH": "/steam/steamrtarm64:/usr/lib/aarch64-linux-gnu:/game/lib:/steam/linuxarm64", "FEX_ROOTFS": "/usr/share/guestos/fex-mesa", "FEX_TSOENABLED": "1"} guest = FEX["guest_environment"]({"portable": True}, env) - self.assertEqual((guest["LD_PRELOAD"], guest["LD_LIBRARY_PATH"], guest["FEX_PORTABLE"]), (str(x86), "/game/lib", "1")) + self.assertEqual((guest["LD_PRELOAD"], guest["LD_LIBRARY_PATH"], guest["FEX_PORTABLE"]), + ("%s:libMelonLoader.Bootstrap.so" % x86, "/game/lib", "1")) self.assertNotIn("FEX_ROOTFS", guest) self.assertEqual(guest["FEX_TSOENABLED"], "1") self.assertTrue(guest["FEX_APP_CONFIG_LOCATION"].endswith("/config/")) @@ -690,6 +762,32 @@ class LaunchTest(FexTestCase): command, env, mode = G["launch"].call_args[0] self.assertEqual((command, mode), (["/game/run.sh", "-a"], "auto")) + def test_steam_games_get_their_settings_and_linux_unity_keeps_tso(self): + config = self.home / ".config/droiddeck/game-environment.json" + unity = self.write(self.tmp / "Megabonk/Megabonk.x86_64", elf(62), 0o755) + self.write(self.tmp / "Megabonk/UnityPlayer.so", elf(62)) + self.write(self.tmp / "Megabonk/GameAssembly.so", elf(62)) + other = self.write(self.tmp / "Other/game.x86_64", elf(62), 0o755) + self.write(config, json.dumps({"version": 1, "shared": {"FEX_TSOENABLED": "0", "FEX_MULTIBLOCK": "1"}, + "games": {"20": {"FEX_TSOENABLED": "0"}}})) + + def started(program, app): + with mock.patch.dict(G, {"launch": mock.Mock(return_value=0), "GAME_ENVIRONMENT": str(config)}), \ + mock.patch.dict(os.environ, {"SteamAppId": app}, clear=True): + _, said = self.quiet(FEX["main"], ["steam", "waitforexitandrun", str(program), "-arg"]) + command, env, _ = G["launch"].call_args[0] + self.assertEqual(command, [str(program), "-arg"]) + return env.get("FEX_TSOENABLED"), env.get("FEX_MULTIBLOCK"), said + + tso, multiblock, said = started(unity, "10") + self.assertEqual((tso, multiblock), ("1", "1")) + self.assertIn("Unity: FEX with TSO", said) + self.assertEqual(started(other, "10")[:2], ("0", "1")) + self.assertEqual(started(unity, "20")[:2], ("0", "1")) + config.unlink() + self.assertEqual(started(unity, "10")[:2], ("1", None)) + self.assertEqual(started(other, "10")[:2], (None, None)) + class AppInfoTest(unittest.TestCase): COMPAT = runpy.run_path(str(BIN / "steam-compatibility")) diff --git a/tools/tests/test_droiddeck_proton_default.py b/tools/tests/test_droiddeck_proton_default.py new file mode 100644 index 000000000..6c0665d57 --- /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 f6d29030a..f3cc0e620 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -1,4 +1,3 @@ -"""droiddeckctl and droiddeck-scenario against a fake adb: the JSON contract and exit codes.""" import base64 import contextlib import importlib.machinery @@ -88,8 +87,6 @@ def timestats_record(name, frames, histogram, hz): f"present2present histogram is as below:\n{bins}\nlatch2present histogram is as below:\n8ms={frames}\n") -# A capture where the panel went from 60 to 120 Hz: the game layer is split in two records. The -# activity's own window and an unrelated app draw too, and must not count. TIMESTATS_SPLIT = "SurfaceFlinger TimeStats:\ntotalFrames = 2000\n" + "".join([ timestats_record("droiddeck_wayland_game#6110", 900, {16: 700, 33: 199}, 60), timestats_record("droiddeck_wayland_game#6110", 900, {16: 850, 25: 49}, 120), @@ -99,7 +96,6 @@ TIMESTATS_SPLIT = "SurfaceFlinger TimeStats:\ntotalFrames = 2000\n" + "".join([ timestats_record("StatusBar#106", 1, {}, 60), ]) -# A build that presents the game on the session's SurfaceView instead of a layer of its own. TIMESTATS_SURFACEVIEW = "SurfaceFlinger TimeStats:\n" + "".join([ timestats_record("a1b2c3 SurfaceView[com.droiddeck.launcher/com.droiddeck.launcher.SessionActivity]#77", 1800, {16: 1796, 33: 3}, 120), @@ -155,7 +151,7 @@ class DroiddeckctlTest(FakeAdbTest): with unittest.mock.patch.dict(os.environ, {"DROIDDECK_PACKAGE": "com.antutu.benchmark.full"}): variant = load("droiddeckctl") self.assertEqual("content://com.antutu.benchmark.full.agent", variant.AUTHORITY) - with self.assertRaises(variant.ControlError): # the fake adb does not answer `am start` + with self.assertRaises(variant.ControlError): variant.start_agent_activity(str(self.adb), "fake-1", {"mode": "steam"}) started = [e["args"] for e in self.calls() if e["args"][:3] == ["shell", "am", "start"]] self.assertIn("com.antutu.benchmark.full/com.droiddeck.launcher.agent.AgentStartActivity", started[0]) @@ -413,6 +409,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_esync_packs.py b/tools/tests/test_esync_packs.py index 863a1003b..95ba8ede3 100644 --- a/tools/tests/test_esync_packs.py +++ b/tools/tests/test_esync_packs.py @@ -1085,7 +1085,9 @@ class LauncherTest(SyncTestCase): self.assertEqual([call[:2] for call in calls], [(str(dist / "proton"), [str(dist / "proton")] + command[1:]), (str(tool / "proton"), command)]) self.assertEqual((calls[0][2]["WINEESYNC"], calls[0][2]["PROTON_NO_ESYNC"], calls[0][2]["BL_SYNC_PACK"]), ("0", "1", pack["id"])) - self.assertEqual(calls[1][2], self.env(STEAM_COMPAT_APP_ID="2630", PROTON_NO_NTSYNC="1", BL_SYNC="0", WINEESYNC="1")) + self.assertEqual(calls[1][2], self.env(STEAM_COMPAT_APP_ID="2630", PROTON_NO_NTSYNC="1", BL_SYNC="0", WINEESYNC="1", + vblank_mode="0", GAMESCOPE_WSI_MIN_IMAGE_COUNT="8", + GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT="1")) self.assertIn("could not start (", said.getvalue()) def test_generated_launchers_run_the_dist_proton(self): @@ -1160,16 +1162,20 @@ class BundleTest(unittest.TestCase): except ImportError: self.skipTest("PyYAML is not installed") apk = yaml.safe_load((self.ROOT / ".github/workflows/build.yml").read_text()) - steps = {step.get("name"): step for step in apk["jobs"]["build"]["steps"]} - bundle = steps["Bundle the droiddeck-esync packs"] + steps = {step.get("name"): step for step in apk["jobs"]["components"]["steps"]} + import json + recipes = json.loads((self.ROOT / "tools/components/recipes.json").read_text()) + bundle = dict(steps["Bundle the droiddeck-esync packs"]) + self.assertIn("prepare.py esync", bundle["run"]) + bundle["run"] = (self.ROOT / recipes["esync"]["script"]).read_text() self.assertNotIn("if", bundle) self.assertIn("tools/droiddeck-esync/release.env", bundle["run"]) self.assertIn('release_url="https://github.com/${SYNC_BUNDLE_REPO}/releases/download/${SYNC_BUNDLE_TAG}"', bundle["run"]) - self.assertIn('curl -fsSL --retry 3 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET"', bundle["run"]) - self.assertIn('curl -fsSL --retry 3 -o sync-index.json "$release_url/index.json"', bundle["run"]) + self.assertIn('curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o sync-bundle.tzst "$release_url/$SYNC_BUNDLE_ASSET"', bundle["run"]) + self.assertIn('curl -fsSL --retry 5 --retry-all-errors --connect-timeout 20 -o sync-index.json "$release_url/index.json"', bundle["run"]) self.assertIn("sha256sum -c -", bundle["run"]) self.assertNotIn("revoked.txt", bundle["run"]) - stage = next(step for step in apk["jobs"]["build"]["steps"] if "overlay/usr/local/bin/droiddeck-*" in step.get("run", "")) + stage = {"run": (self.ROOT / recipes["runtime"]["script"]).read_text()} self.assertIn("tools/linuxfs/overlay/usr/local/bin/droiddeck-* ", stage["run"]) local = (self.ROOT / "tools/build_local.sh").read_text() self.assertIn("tools/linuxfs/overlay/usr/local/bin/droiddeck-* ", local) diff --git a/tools/tests/test_fastpath_svc.py b/tools/tests/test_fastpath_svc.py new file mode 100644 index 000000000..7a74aac9a --- /dev/null +++ b/tools/tests/test_fastpath_svc.py @@ -0,0 +1,290 @@ +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + + +HEADER = Path(__file__).resolve().parents[1] / "proot/fastpath/svc-patch.h" + + +class FastPathSvcEncodingTest(unittest.TestCase): + def compile_check(self, source, header): + if shutil.which("cc") is None: + self.skipTest("cc is not available") + with tempfile.TemporaryDirectory() as directory: + program = Path(directory) / "check.c" + program.write_text(source.replace('"HEADER"', '"' + (HEADER.parent / header).as_posix() + '"')) + output = Path(directory) / "check" + subprocess.run(["cc", "-O2", "-Wall", "-Wextra", "-Werror", str(program), "-o", str(output)], check=True) + subprocess.run([str(output)], check=True, timeout=10) + + def test_benchmark_checks_execute_with_ndebug(self): + self.compile_check(r''' +#define NDEBUG +#include "HEADER" +int main(void) { + int calls = 0; + assert(++calls == 1); + return calls != 1; +} +''', "../bench/checks.h") + + def test_stack_bounds_and_alternate_stack_fallback(self): + self.compile_check(r''' +#define _GNU_SOURCE +#include <assert.h> +#include <stdint.h> +#include <stddef.h> +#include <signal.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/resource.h> +static rlim_t stack_limit = 1024 * 1024; +static long sc(long n, long a, long b, long c, long d, long e) { + if (n == SYS_prlimit64) { + if (!stack_limit) return -1; + ((struct rlimit *)d)->rlim_cur = stack_limit; + return 0; + } + return syscall(n,a,b,c,d,e); +} +#include "HEADER" +int main(void) { + uintptr_t low, high; + assert(svc_stack_line("1000-9000 rw-p 00000000 00:00 0", 0x8000, &low, &high)); + assert(low == 0x1000 && high == 0x9000); + assert(!svc_stack_line("1000-9000 r--p", 0x8000, &low, &high)); + assert(!svc_stack_line("1000-9000 rw-p", 0x9000, &low, &high)); + assert(!svc_stack_line("9000-1000 rw-p", 0x8000, &low, &high)); + assert(!svc_stack_line("fffffffffffffffff-9000 rw-p", 0x8000, &low, &high)); + assert(!svc_stack_line("", 0x8000, &low, &high)); + char local; + assert(svc_stack_find((uintptr_t)&local)); + assert((uintptr_t)&local >= svc_stack_low && (uintptr_t)&local < svc_stack_high); + svc_stack_main = 0; svc_stack_low = 0x1000; svc_stack_high = 0x100000; + assert(!svc_stack_room(0x1000 + 96 * 1024 - 1)); + assert(svc_stack_room(0x1000 + 96 * 1024)); + svc_stack_main = 1; svc_stack_low = 0xf0000; svc_stack_gap = 0x1000; + assert(svc_stack_room(0xff000)); + stack_limit = 64 * 1024; + assert(!svc_stack_room(0xff000)); + stack_limit = 0; + assert(!svc_stack_room(0xff000)); + return 0; +} +''', "svc-stack.h") + + def test_patch_publication_failure_and_partial_success(self): + self.compile_check(r''' +#define _GNU_SOURCE +#include <assert.h> +#include <stdint.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/syscall.h> +static struct svc_site { uint32_t *site; uint32_t branch; } svc_plan[3]; +static size_t svc_planned = 3; +static unsigned svc_sites, svc_pages; +static int fail_alloc, fail_emit, fail_rx, fail_write, writes, live, rx; +static uint32_t *svc_relay_page(uintptr_t site, size_t page) { + (void)site; + if (fail_alloc) return NULL; + live++; rx = 0; + return calloc(1, page); +} +static int svc_emit(uint32_t *code, uint32_t *site, uint32_t *branch) { + (void)code; (void)site; + *branch = 0x14000001; + return !fail_emit; +} +static int mock_rx(void *p, size_t size, int prot) { + (void)p; (void)size; + assert(prot == (PROT_READ | PROT_EXEC)); + if (fail_rx) return -1; + rx = 1; + return 0; +} +static int mock_unmap(void *p, size_t size) { (void)size; free(p); live--; return 0; } +static long sc(long nr, long fd, long buf, long len, long at, long unused) { + (void)fd; (void)unused; + assert(nr == SYS_pwrite64 && len == 4 && rx); + if (++writes == fail_write) return -1; + memcpy((void *)at, (void *)buf, len); + return len; +} +#define mprotect mock_rx +#define munmap mock_unmap +#include "HEADER" +int main(void) { + static uint32_t sites[3]; + for (int mode = 0; mode < 5; mode++) { + for (int i=0; i<3; i++) { sites[i]=0xd4000001; svc_plan[i].site=&sites[i]; } + svc_sites=svc_pages=writes=live=rx=0; + fail_alloc=mode==0; fail_emit=mode==1; fail_rx=mode==2; fail_write=mode==3 ? 2 : 0; + svc_publish(7,4096); + if (mode<3) assert(!svc_sites && !svc_pages && !writes && !live); + else assert(svc_sites==(mode==3 ? 2U : 3U) && svc_pages==1 && live==1); + for (int i=0; i<3; i++) assert(sites[i]==(mode<3 || (mode==3 && i==1) ? 0xd4000001 : 0x14000001)); + } + return 0; +} +''', "svc-publish.h") + + def test_instruction_decoding_and_branch_limits(self): + if shutil.which("cc") is None: + self.skipTest("cc is not available") + source = r''' +#include <assert.h> +#include <stdint.h> +#include <stddef.h> +#define FP_SVC_ENCODINGS_ONLY +#include "HEADER" +int main(void) { + assert(svc_number(0xd2800708) == 56); + assert(svc_number(0x528009e8) == 79); + assert(svc_number(0xd2800709) == -1); + assert(svc_number(0xd2a00708) == -1); + assert(svc_number(0xf2800708) == -1); + assert(svc_number(0xaa0003e8) == -1); + const uint32_t create[] = {0xd2800708, 0x29047fe0, 0x92800c60, 0xd4000001}; + const uint32_t create_at[] = {0xd2800708, 0x29047fe3, 0xb9404be3, 0xd4000001}; + const uint32_t xstat[] = {0xd28009e8, 0xaa0203e1, 0xaa0303e2, 0x93407c83, 0xd4000001}; + const uint32_t overwritten[] = {0xd2800708, 0xaa0003e8, 0xd4000001}; + const uint32_t loaded[] = {0xd2800708, 0xf94003e8, 0xd4000001}; + const uint32_t branch[] = {0xd2800708, 0x14000001, 0xd4000001}; + const uint32_t call[] = {0xd2800708, 0x94000001, 0xd4000001}; + const uint32_t shift[] = {0xd2800708, 0xd2a00708, 0xd4000001}; + const uint32_t robust[] = {0xd2800c68, 0xf9000260, 0xa9000261, 0xf9400260, 0x9100e260, 0xd4000001}; + const uint32_t writeback[] = {0xd2800708, 0xa9bf07e0, 0xd4000001}; + const uint32_t added[] = {0xd2800708, 0x91000408, 0xd4000001}; + assert(svc_site_number(create, 3) == 56); + assert(svc_site_number(create_at, 3) == 56); + assert(svc_site_number(xstat, 4) == 79); + assert(svc_site_number(overwritten, 2) == -1); + assert(svc_site_number(loaded, 2) == -1); + assert(svc_site_number(branch, 2) == -1); + assert(svc_site_number(call, 2) == -1); + assert(svc_site_number(shift, 2) == -1); + assert(svc_site_number(robust, 5) == 99); + assert(svc_site_number(writeback, 2) == -1); + assert(svc_site_number(added, 2) == -1); + uint32_t out; + uintptr_t pc = 0x10000000; + assert(svc_branch(pc, pc + 4, &out) && out == 0x14000001); + assert(svc_branch(pc, pc - 4, &out) && out == 0x17ffffff); + assert(svc_branch(pc, pc + 0x7fffffc, &out) && out == 0x15ffffff); + assert(svc_branch(pc, pc - 0x8000000, &out) && out == 0x16000000); + assert(!svc_branch(pc, pc + 0x8000000, &out)); + assert(!svc_branch(pc, pc - 0x8000004, &out)); + assert(!svc_branch(pc, pc + 2, &out)); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + work = Path(directory) + program = work / "check.c" + program.write_text(source.replace("HEADER", HEADER.as_posix())) + output = work / "check" + subprocess.run(["cc", "-O2", "-Wall", "-Wextra", "-Werror", str(program), "-o", str(output)], check=True) + subprocess.run([str(output)], check=True, timeout=10) + + def test_cache_revalidates_image_offsets_and_untrusted_files(self): + if shutil.which("cc") is None: + self.skipTest("cc is not available") + source = r''' +#define _GNU_SOURCE +#include <assert.h> +#include <stdint.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <link.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#define FP_SVC_ENCODINGS_ONLY +#include "HEADER" +static int svc_android_api = 33; +static struct { uint32_t *site; } svc_plan[256]; +static size_t svc_planned; +static int svc_supported(int nr) { return nr == 56 || nr == 79; } +#define sc(n,a,b,c,d,e) syscall(n,a,b,c,d,e) +static long fp_open(int d, const char *p, int f, mode_t m) { return openat(d,p,f,m); } +static long fp_rename(int d, const char *p, int e, const char *q, int f) { (void)f; return renameat(d,p,e,q); } +static long fp_unlink(int d, const char *p, int f) { return unlinkat(d,p,f); } +#include "CACHE" +static void store(const char *path, struct svc_cached_sites *table) { + int fd = open(path, O_WRONLY | O_TRUNC); + assert(fd >= 0 && write(fd, table, sizeof *table) == sizeof *table && close(fd) == 0); +} +int main(void) { + uint32_t image[32] = {0xd2800708, 0xd4000001, 0xd28009e8, 0xd4000001}; + ElfW(Phdr) ph[] = {{.p_type=PT_LOAD, .p_flags=PF_R|PF_X, .p_memsz=sizeof image}, + {.p_type=PT_NOTE, .p_vaddr=64, .p_memsz=24}}; + struct dl_phdr_info info = {.dlpi_addr=(uintptr_t)image, .dlpi_phdr=ph, .dlpi_phnum=2}; + ElfW(Nhdr) note = {.n_type=NT_GNU_BUILD_ID, .n_namesz=4, .n_descsz=8}; + memcpy((char *)image+64, ¬e, sizeof note); + memcpy((char *)image+76, "GNU", 4); + uint64_t id = getpid(); + memcpy((char *)image+80, &id, 8); + char path[256], other[256]; + assert(svc_cache_name(&info, path, sizeof path)); + svc_android_api = 35; + assert(svc_cache_name(&info, other, sizeof other) && strcmp(path, other)); + svc_android_api = 33; + setenv("PROOT_FP_SVC_CACHE", "0", 1); + assert(!svc_cache_name(&info, other, sizeof other)); + unsetenv("PROOT_FP_SVC_CACHE"); + ph[1].p_memsz = sizeof image; + assert(!svc_cache_name(&info, other, sizeof other)); + ph[1].p_memsz = 24; + svc_plan[0].site = image+1; svc_plan[1].site = image+3; svc_planned=2; + svc_cache_write(&info, path, 0); + svc_planned=0; + assert(svc_cache_read(&info, path) && svc_planned==2 && svc_plan[1].site==image+3); + struct svc_cached_sites valid, table; + int fd = open(path, O_RDONLY); + assert(fd >= 0 && read(fd, &valid, sizeof valid)==sizeof valid && close(fd)==0); +#define REJECT(change) do { table=valid; change; store(path,&table); svc_planned=0; \ + assert(!svc_cache_read(&info,path) && svc_planned==0); } while(0) + REJECT(table.magic++); + REJECT(table.api=35); + REJECT(table.count=0); + REJECT(table.count=257); + REJECT(table.offset[0]=3); + REJECT(table.offset[0]=sizeof image); + REJECT(table.offset[0]=UINT64_MAX-3); + REJECT(table.offset[1]=table.offset[0]); + REJECT(table.offset[0]=12; table.offset[1]=4); + store(path,&valid); + image[1]=0x14000001; + assert(!svc_cache_read(&info,path)); + image[1]=0xd4000001; image[0]=0xd2800008; + assert(!svc_cache_read(&info,path)); + image[0]=0xd2800708; + assert(chmod(path,0644)==0 && !svc_cache_read(&info,path)); + assert(chmod(path,0600)==0 && truncate(path,8)==0 && !svc_cache_read(&info,path)); + assert(unlink(path)==0 && symlink("/dev/zero",path)==0 && !svc_cache_read(&info,path)); + assert(unlink(path)==0 && mkdir(path,0700)==0 && !svc_cache_read(&info,path)); + assert(rmdir(path)==0); + svc_planned=0; + svc_cache_write(&info,path,0); + assert(access(path,F_OK)<0); + (void)svc_cache_hits; (void)svc_cache_misses; + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + work = Path(directory) + program = work / "cache.c" + program.write_text(source.replace('"HEADER"', '"' + HEADER.as_posix() + '"') + .replace('"CACHE"', '"' + HEADER.with_name("svc-cache.h").as_posix() + '"')) + output = work / "cache" + subprocess.run(["cc", "-O2", "-Wall", "-Wextra", "-Werror", str(program), "-o", str(output)], check=True) + subprocess.run([str(output)], check=True, timeout=10) diff --git a/tools/tests/test_fex_install.py b/tools/tests/test_fex_install.py index 355b54038..51d5279e8 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 94008a1c7..3b351520e 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_bundle_arch.py b/tools/tests/test_flatpak_bundle_arch.py new file mode 100644 index 000000000..b46848b70 --- /dev/null +++ b/tools/tests/test_flatpak_bundle_arch.py @@ -0,0 +1,136 @@ +import importlib.machinery +import importlib.util +import io +import json +from pathlib import Path +import sys +import types +import unittest +from contextlib import redirect_stdout + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +class FakeRef: + def __init__(self, arch): + self.arch = arch + + def get_name(self): + return "io.github.ebkr.r2modman" + + def get_arch(self): + return self.arch + + +def load(bundle_arch, installs): + flatpak = types.SimpleNamespace( + get_default_arch=lambda: "aarch64", + BundleRef=types.SimpleNamespace(new=lambda bundle: FakeRef(bundle_arch)), + ) + repository = types.ModuleType("gi.repository") + repository.Flatpak = flatpak + repository.Gio = types.SimpleNamespace(File=types.SimpleNamespace(new_for_path=lambda path: path)) + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + module.installation = lambda: object() + module.app_ref = lambda inst, app_id: None + + def transaction(inst): + installs.append("bundle") + raise AssertionError("the bundle reached a transaction") + + module.transaction = transaction + return module + + +class FlatpakBundleArchTest(unittest.TestCase): + def run_install(self, arch): + installs = [] + module = load(arch, installs) + out = io.StringIO() + with redirect_stdout(out): + try: + rc = module.install_bundle("/tmp/r2modman.flatpak") + except AssertionError: + rc = None + return rc, [json.loads(line) for line in out.getvalue().splitlines()], installs + + def test_a_bundle_for_an_architecture_fex_cannot_run_is_refused_before_installing(self): + rc, events, installs = self.run_install("riscv64") + self.assertEqual(rc, 1) + self.assertEqual(installs, []) + self.assertEqual(events[0]["e"], "error") + self.assertEqual(events[0]["code"], "arch") + self.assertEqual(events[0]["arch"], "riscv64") + self.assertEqual(events[0]["id"], "io.github.ebkr.r2modman") + + def test_a_bundle_for_this_device_goes_on_to_install(self): + rc, events, installs = self.run_install("aarch64") + self.assertEqual(installs, ["bundle"]) + self.assertEqual(events, []) + + def test_an_x86_64_bundle_goes_on_to_install_for_fex(self): + rc, events, installs = self.run_install("x86_64") + self.assertEqual(installs, ["bundle"]) + self.assertEqual(events, []) + + def test_flathub_falls_back_to_the_x86_64_build(self): + module = load("aarch64", []) + asked = [] + + class Remote: + def __init__(self, branch): + self.branch = branch + + def get_branch(self): + return self.branch + + class Installation: + def fetch_remote_ref_sync(self, remote, kind, app_id, arch, branch, cancellable): + asked.append((arch, branch)) + if arch == "x86_64" and branch == "stable": + return Remote("stable") + raise RuntimeError("not found") + + added = [] + + class Transaction: + def add_install(self, remote, ref, subpaths): + added.append(ref) + + module.Flatpak.RefKind = types.SimpleNamespace(APP=0) + module.installation = lambda: Installation() + installed = [] + module.app_ref = lambda inst, app_id: (installed[0] if installed else None) + module.transaction = lambda inst: (Transaction(), {}) + + def run(t, state, report_done=True): + installed.append(object()) + return 0 + + module.run = run + out = io.StringIO() + with redirect_stdout(out): + rc = module.install("io.github.ebkr.r2modman") + self.assertEqual(rc, 0) + self.assertEqual(asked, [("aarch64", "stable"), ("aarch64", "master"), ("x86_64", "stable")]) + self.assertEqual(added, ["app/io.github.ebkr.r2modman/x86_64/stable"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_flatpak_setup.py b/tools/tests/test_flatpak_setup.py new file mode 100644 index 000000000..7de2d0f7a --- /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_flatpak_system_bus.py b/tools/tests/test_flatpak_system_bus.py new file mode 100644 index 000000000..ebddaa3a6 --- /dev/null +++ b/tools/tests/test_flatpak_system_bus.py @@ -0,0 +1,199 @@ +import importlib.machinery +import importlib.util +import os +from pathlib import Path +import socket +import sys +import tempfile +import types +import unittest +from unittest import mock + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +def load(): + repository = types.ModuleType("gi.repository") + repository.Flatpak = types.SimpleNamespace() + repository.Gio = types.SimpleNamespace() + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak_bus", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + return module + + +class FakeDaemon: + started = [] + + def __init__(self, argv, **kwargs): + conf = next(a for a in argv if a.startswith("--config-file=")).split("=", 1)[1] + text = open(conf).read() + self.path = text.split("<listen>unix:path=", 1)[1].split("</listen>", 1)[0] + self.server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.server.bind(self.path) + self.server.listen(4) + self.running = True + FakeDaemon.started.append(self) + + def poll(self): + return None if self.running else 0 + + def terminate(self): + self.running = False + self.server.close() + + def wait(self, timeout=None): + return 0 + + def kill(self): + self.terminate() + + +class FlatpakSystemBusTest(unittest.TestCase): + def setUp(self): + self.module = load() + self.tmp = tempfile.mkdtemp() + self.env = mock.patch.dict(os.environ, {"DBUS_SYSTEM_BUS_ADDRESS": "unix:path=" + os.path.join(self.tmp, "missing")}) + self.env.start() + FakeDaemon.started = [] + + def tearDown(self): + self.env.stop() + os.rmdir(self.tmp) + + def test_a_reachable_system_bus_is_used_as_it_is(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_without_a_system_bus_a_private_one_runs_for_the_command_and_is_removed_after(self): + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + bus = self.module.private_system_bus() + self.assertIsNotNone(bus) + _, work, conf, path = bus + self.assertEqual("unix:path=" + path, os.environ["DBUS_SYSTEM_BUS_ADDRESS"]) + self.assertTrue(self.module.bus_reachable(path)) + self.module.stop_system_bus(bus) + self.assertFalse(os.path.exists(work)) + + def test_any_reachable_address_in_a_list_counts_as_the_system_bus(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:guid=1,path=%s" % (os.path.join(self.tmp, "missing"), path) + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_escaped_and_abstract_addresses_are_probed_as_dbus_reads_them(self): + path = os.path.join(self.tmp, "sys-bus") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + abstract = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + abstract.bind(b"\0droiddeck-flatpak-test-%d\xff" % os.getpid()) + abstract.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path.replace("-", "%2D") + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:abstract=droiddeck-flatpak-test-%d%%FF" % (os.path.join(self.tmp, "missing"), os.getpid()) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d" % os.getpid() + self.assertFalse(self.module.system_bus_reachable()) + listener = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + listener.bind(("127.0.0.1", 0)) + listener.listen(8) + port = listener.getsockname()[1] + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d;tcp:host=127.0.0.1,port=%d" % (os.getpid(), port) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + "".join("%%%02X" % ord(c) for c in str(port)) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=000%d" % port + self.assertTrue(self.module.system_bus_reachable()) + listener.close() + self.assertFalse(self.module.system_bus_reachable()) + for bad in ("%C2%B2", "65536", "0", "000", "x", "9" * 5000): + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + bad + self.assertEqual([], self.module.system_bus_paths()) + self.assertFalse(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET" + self.assertTrue(self.module.system_bus_reachable()) + finally: + abstract.close() + server.close() + os.unlink(path) + + def test_a_daemon_that_cannot_launch_leaves_no_files_and_warns(self): + made = [] + real = tempfile.mkdtemp + + def mkdtemp(**kwargs): + made.append(real(**kwargs)) + return made[-1] + + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.tempfile, "mkdtemp", mkdtemp), \ + mock.patch.object(self.module.subprocess, "Popen", side_effect=OSError("exec failed")), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + self.assertFalse(os.path.exists(made[0])) + + def test_without_dbus_daemon_the_command_still_runs_and_warns(self): + with mock.patch.object(self.module.shutil, "which", return_value=None), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + + def test_every_command_that_changes_apps_gets_a_system_bus(self): + calls = [] + self.module.private_system_bus = lambda: calls.append("start") or "bus" + self.module.stop_system_bus = lambda bus: calls.append("stop:%s" % bus) + self.module.prepare_rootfs = lambda: None + self.module.install = lambda app_id: calls.append("install") or 0 + self.module.updates = lambda: calls.append("updates") or 0 + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "install", "org.example.App"]), \ + mock.patch.object(self.module.signal, "signal") as handler: + self.assertEqual(0, self.module.main()) + self.assertEqual(["start", "install", "stop:bus"], calls) + self.assertEqual(self.module.signal.SIGTERM, handler.call_args[0][0]) + with self.assertRaises(SystemExit): + handler.call_args[0][1](self.module.signal.SIGTERM, None) + calls.clear() + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "updates"]): + self.assertEqual(0, self.module.main()) + self.assertNotIn("start", calls) + self.assertIn("updates", calls) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_frame_limit_sync.py b/tools/tests/test_frame_limit_sync.py new file mode 100644 index 000000000..b14b0771a --- /dev/null +++ b/tools/tests/test_frame_limit_sync.py @@ -0,0 +1,138 @@ +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_fsync_preload.py b/tools/tests/test_fsync_preload.py index 63007f373..af8a51dc4 100644 --- a/tools/tests/test_fsync_preload.py +++ b/tools/tests/test_fsync_preload.py @@ -319,7 +319,7 @@ class FsyncPreloadTest(unittest.TestCase): source = base / "fsync-test.c" source.write_text(PROGRAM) subprocess.run(["cc", "-O2", "-Wall", "-fPIC", "-shared", "-pthread", "-o", str(cls.lib), - str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) subprocess.run(["cc", "-O2", "-Wall", "-pthread", "-o", str(cls.exe), str(source)], check=True) @classmethod diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index c5c308c8c..fb3317b3d 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1,4 +1,5 @@ import hashlib +import io import json import os import shutil @@ -8,6 +9,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" @@ -27,6 +29,442 @@ def config_text(entries): return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping +class DirtTelemetryFixTest(unittest.TestCase): + SHOWDOWN_ON = '<x><motion enabled="true" ip="127.0.0.1" port="20777" delay="1" extradata="3" /></x>' + SHOWDOWN_DEFAULT = '<x><motion enabled="true" ip="dbox" port="20777" delay="1" extradata="0" /></x>' + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + root = Path(self.tmp.name) + self.prefix = root / "compatdata/2848447563" + self.proton = root / "Proton/proton" + self.own = root / "Proton/files/lib/wine/i386-windows/ws2_32.dll" + self.own.parent.mkdir(parents=True) + self.own.write_bytes(b"MZ wine ws2_32") + self.proton.write_text("") + self.target = self.prefix / "pfx/drive_c/windows/syswow64/ws2_32.dll" + self.target.parent.mkdir(parents=True) + self.target.symlink_to(self.own) + self.stand_in = root / "droiddeck-dirt/ws2_32.dll" + self.stand_in.parent.mkdir() + self.stand_in.write_bytes(b"MZ droiddeck-dirt-ws2_32 stand-in") + self.patch = mock.patch.dict(MODULE["dirt_ws2_wanted"].__globals__, {"DIRT_WS2": str(self.stand_in)}) + self.patch.start() + + def tearDown(self): + self.patch.stop() + self.tmp.cleanup() + + def config(self, folder, text): + path = self.prefix / "pfx/drive_c/users/steamuser/Documents/My Games" / folder / "hardwaresettings/hardware_settings_config.xml" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(text) + + def command(self, exe="showdown.exe"): + return [str(self.proton), "waitforexitandrun", "/root/Storage/games/DiRT Showdown/" + exe] + + def env(self): + return {"STEAM_COMPAT_DATA_PATH": str(self.prefix)} + + def test_telemetry_counts_as_on_when_the_game_sends_somewhere(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON.replace('enabled="true"', 'enabled="false"')) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT3", '<x><motion enabled="true" ip="192.168.1.20" port="20777" /></x>') + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirt3")) + + def test_stand_in_is_wanted_only_for_the_dirt_games_with_telemetry_on_and_a_proton_without_the_fix(self): + wanted = MODULE["dirt_ws2_wanted"] + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertIsNone(wanted(self.command(), self.env())) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertEqual(wanted(self.command(), self.env()), str(self.prefix)) + self.assertEqual(wanted(self.command("Showdown_AVX.exe"), self.env()), str(self.prefix)) + self.assertIsNone(wanted(self.command("DiRTRally2.exe"), self.env())) + self.own.write_bytes(b"MZ wine ws2_32 " + "showdown_avx.exe".encode("utf-16-le")) + self.assertIsNone(wanted(self.command(), self.env())) + + def test_swap_keeps_the_prefix_link_and_restore_puts_it_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), self.stand_in.read_bytes()) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertEqual(self.own.read_bytes(), b"MZ wine ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + + def test_restore_keeps_a_file_proton_put_back_meanwhile(self): + MODULE["swap_dirt_ws2"](self.prefix) + newer = self.own.with_name("ws2_32-newer.dll") + newer.write_bytes(b"MZ newer wine ws2_32") + self.target.unlink() + self.target.symlink_to(newer) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(newer)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_after_a_proton_switch_the_running_protons_file_goes_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + other_own = other.parent / "files/lib/wine/i386-windows/ws2_32.dll" + other_own.parent.mkdir(parents=True) + other_own.write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(other_own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_restore_follows_a_proton_reached_through_a_linked_folder(self): + MODULE["swap_dirt_ws2"](self.prefix) + pack = Path(self.tmp.name) / "pack" + (pack / "files/lib/wine").mkdir(parents=True) + (pack / "files/lib/wine/i386-windows").symlink_to(self.own.parent) + (pack / "proton").write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, pack / "proton")) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_stand_in_left_without_the_saved_link_is_replaced_by_protons_own_file(self): + self.target.unlink() + self.target.write_bytes(self.stand_in.read_bytes()) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_launch_swaps_the_stand_in_in_for_the_game_and_back_afterwards(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("#!" + sys.executable + "\nimport os, sys\n" + "target = os.path.join(os.environ['STEAM_COMPAT_DATA_PATH'], 'pfx/drive_c/windows/syswow64/ws2_32.dll')\n" + "print(os.environ.get('WINEDLLOVERRIDES', ''))\n" + "print(os.path.islink(target), b'droiddeck-dirt-ws2_32' in open(target, 'rb').read())\n") + self.proton.chmod(0o755) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + overrides, state = result.stdout.splitlines()[-2:] + self.assertIn("ws2_32=n,b", overrides.split(";")) + self.assertEqual(state, "False True") + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_a_proton_that_cannot_start_leaves_the_prefix_as_it_was(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("not a program") + self.proton.chmod(0o644) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertNotEqual(result.returncode, 0) + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_launch_with_telemetry_off_leaves_the_prefix_alone(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.proton.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('WINEDLLOVERRIDES', ''))\n") + self.proton.chmod(0o755) + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertNotIn("ws2_32=n,b", result.stdout) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_failed_put_back_does_not_end_the_launch_with_an_error(self): + def fail(): + raise OSError(28, "No space left on device") + stderr = io.StringIO() + with mock.patch("sys.stderr", stderr): + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(0)"], dict(os.environ), None, fail) + self.assertEqual(code, 0) + self.assertIn("not put back", stderr.getvalue()) + + def test_a_half_done_swap_is_put_back(self): + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + os.replace(self.target, saved) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + + def test_a_native_ws2_32_goes_back_as_it_was_after_a_proton_switch(self): + self.target.unlink() + self.target.write_bytes(b"MZ a mod's own ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), b"MZ a mod's own ws2_32") + + def test_a_link_to_a_mods_ws2_32_goes_back_as_it_was(self): + mod = Path(self.tmp.name) / "mods/ws2_32.dll" + mod.parent.mkdir() + mod.write_bytes(b"MZ a mod's ws2_32") + self.target.unlink() + self.target.symlink_to(mod) + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(mod)) + + def test_start_gives_the_signal_handlers_back(self): + import signal + before = {s: signal.getsignal(s) for s in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + MODULE["start"]([sys.executable, "-c", "pass"], dict(os.environ), None, lambda: None) + self.assertEqual(before, {s: signal.getsignal(s) for s in before}) + + def test_start_puts_the_file_back_after_the_game_exits(self): + calls = [] + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(3)"], dict(os.environ), None, lambda: calls.append("restored")) + self.assertEqual(code, 3) + self.assertEqual(calls, ["restored"]) + with self.assertRaises(OSError): + MODULE["start"]([str(Path(self.tmp.name) / "missing")], dict(os.environ), None, lambda: calls.append("again")) + self.assertEqual(calls, ["restored"]) + + +class EgoCorePlanTest(unittest.TestCase): + + @staticmethod + def rule(op, value, worker_map): + return (' <restrict_if name="cores" op="%s" value="%d">\r\n <restrict_add>\r\n' + ' <threadStrategy parallelUpdateRender="true" workerMapFile="system/%s" updateProcessor="2" />\r\n' + ' </restrict_add>\r\n </restrict_if>\r\n' % (op, value, worker_map)) + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + self.addCleanup(self.tmp.cleanup) + self.system = Path(self.tmp.name) / "DiRT 3/system" + self.system.mkdir(parents=True) + cpu = "".join(self.rule("int_eq", n, "workerMap%dCore.xml" % n) for n in (2, 3, 4, 6)) + self.rule("int_ge", 8, "workerMap8Core.xml") + self.shipped = ('<?xml version="1.0" encoding="UTF-8" ?>\r\n<hardware_settings_restrictions>\r\n <cpu>\r\n' + ' <restrict_info>\r\n' + cpu + + ' <restrict_else>\r\n <restrict_add>\r\n' + ' <threadStrategy parallelUpdateRender="false" workerMapFile="system/workerMap.xml" />\r\n' + ' </restrict_add>\r\n </restrict_else>\r\n </restrict_info>\r\n </cpu>\r\n' + ' <audio_card>\r\n' + self.rule("int_eq", 5, "audio.xml") + ' </audio_card>\r\n' + '</hardware_settings_restrictions>').encode("latin-1") + self.path = self.system / "hardware_settings_restrictions.xml" + self.path.write_bytes(self.shipped) + for name in ("workerMap.xml", "workerMap2Core.xml", "workerMap3Core.xml", "workerMap4Core.xml", "workerMap6Core.xml", "workerMap8Core.xml"): + (self.system / name).write_text("<workerMap />") + self.command = ["/proton", "waitforexitandrun", str(self.system.parent / "dirt3_game.exe")] + self.saved = self.path.with_name(self.path.name + ".droiddeck-original") + + def plan(self, topology, command=None): + env = {} if topology is None else {"WINE_CPU_TOPOLOGY": topology} + return MODULE["ego_core_plan"](command or self.command, env) + + def test_five_cores_get_a_copy_of_the_four_core_plan(self): + note = self.plan("5:7,3,4,5,6") + self.assertIn("5 cores", note) + self.assertIn("4-core plan", note) + text = self.path.read_bytes() + four = self.rule("int_eq", 4, "workerMap4Core.xml").encode("latin-1") + five = self.rule("int_eq", 5, "workerMap4Core.xml").encode("latin-1") + self.assertEqual(text, self.shipped.replace(four, four + five)) + self.assertNotIn(b"\n", text.replace(b"\r\n", b"")) + self.assertEqual(self.saved.read_bytes(), self.shipped) + self.assertEqual(sorted(p.name for p in self.system.glob("*droiddeck-tmp*")), []) + self.assertIsNone(self.plan("5:7,3,4,5,6")) + self.assertEqual(self.path.read_bytes(), text) + self.assertEqual(self.saved.read_bytes(), self.shipped) + + def test_seven_cores_get_the_six_core_plan(self): + self.assertIn("6-core plan", self.plan("7:7,1,2,3,4,5,6")) + self.assertIn(b'value="7">\r\n <restrict_add>\r\n <threadStrategy parallelUpdateRender="true" ' + b'workerMapFile="system/workerMap6Core.xml"', self.path.read_bytes()) + + def test_counts_with_a_plan_are_left_alone(self): + for topology in ("2:7,6", "4:7,3,4,5", "6:7,3,4,5,6,2", "8:7,2,3,4,5,6,0,1", "12:0,1,2,3,4,5,6,7,8,9,10,11"): + self.assertIsNone(self.plan(topology), topology) + self.assertEqual(self.path.read_bytes(), self.shipped) + self.assertFalse(os.path.lexists(self.saved)) + + def test_nothing_changes_without_a_core_count_a_restrictions_file_a_smaller_plan_or_its_worker_map(self): + self.assertIsNone(self.plan(None)) + self.assertIsNone(self.plan("")) + self.assertIsNone(self.plan("x:1")) + self.assertIsNone(self.plan("\u00b2:7")) + self.assertIsNone(self.plan("1:7")) + self.assertIsNone(self.plan("5:7,3,4,5,6", ["/proton", "waitforexitandrun"])) + self.assertIsNone(self.plan("5:7,3,4,5,6", ["/proton", "waitforexitandrun", "/elsewhere/game.exe"])) + (self.system / "workerMap4Core.xml").unlink() + self.assertIsNone(self.plan("5:7,3,4,5,6")) + self.assertEqual(self.path.read_bytes(), self.shipped) + self.assertFalse(os.path.lexists(self.saved)) + + def test_an_unknown_comparison_counts_as_a_plan(self): + self.path.write_bytes(self.shipped.replace(b'op="int_ge" value="8"', b'op="int_between" value="8"')) + self.assertIsNone(self.plan("5:7,3,4,5,6")) + + def test_main_adds_the_plan_before_the_game_starts(self): + with tempfile.TemporaryDirectory() as tmp: + probe = Path(tmp) / "probe" + probe.write_text('#!/bin/sh\ngrep -c \'value="5"\' "%s"\n' % self.path) + probe.chmod(0o755) + env = {k: v for k, v in os.environ.items() if not k.startswith(("WINE", "PROTON", "DROIDDECK", "BL_", "STEAM"))} + env.update(HOME=tmp, STEAM_COMPAT_DATA_PATH="/compatdata/3791535942", WINE_CPU_TOPOLOGY="5:7,3,4,5,6") + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun", self.command[2]], + env=env, text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), "2", result.stderr) + self.assertIn("added a copy of its 4-core plan", result.stderr) + + +class GameDebugLoggingTest(unittest.TestCase): + def test_maintenance_precision_survives_run_with_performance_game_settings(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + config = home / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + config.write_text(json.dumps({"version": 1, "shared": {"FEX_X87REDUCEDPRECISION": "1"}, + "games": {"42": {"FEX_X87REDUCEDPRECISION": "1"}}})) + probe = home / "proton" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ['FEX_X87REDUCEDPRECISION'])\n") + probe.chmod(0o755) + base = {**os.environ, "HOME": tmp, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata/42")} + maintenance = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "run"], + env={**base, "DROIDDECK_GOG_MAINTENANCE": "1", "FEX_X87REDUCEDPRECISION": "0"}, text=True, capture_output=True, check=True) + game = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env={**base, "FEX_X87REDUCEDPRECISION": "1"}, text=True, capture_output=True, check=True) + self.assertEqual("0", maintenance.stdout.strip()) + self.assertEqual("1", game.stdout.strip()) + + def test_real_game_launch_without_config_file_keeps_the_base_environment(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + probe = home / "proton" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ['PROTON_LOG'])\n") + probe.chmod(0o755) + result = subprocess.run( + [sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env={**os.environ, "HOME": tmp, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata/42"), + "BL_DEBUG_DIR": tmp, "PROTON_LOG": "0"}, + text=True, capture_output=True, check=True, + ) + self.assertEqual(result.stdout.strip(), "0") + + def test_game_debug_logs_override_only_diagnostic_values_and_keep_raw_settings(self): + with tempfile.TemporaryDirectory(prefix="game logs '") as debug_dir: + inherited = {"BL_DEBUG_DIR": debug_dir, "PROTON_LOG": "0", "WINEDEBUG": "-all,+relay", + "PROTON_LOG_DIR": "/old", "PROTON_CRASH_REPORT_DIR": "/old-crashes", + "DXVK_LOG_PATH": "/old-dxvk", "DXVK_LOG_LEVEL": "none", "VKD3D_DEBUG": "none", + "CUSTOM": "$(touch never); 'quoted' = literal", "DXVK_CONFIG": "dxvk.tearFree = True"} + config = {"version": 1, "gameDebugLogs": True, + "shared": {"PROTON_LOG": "0", "BL_DEBUG_DIR": "/profile-redirect"}, + "games": {"42": {"PROTON_LOG_DIR": None, "DXVK_LOG_PATH": "/game-redirect"}}} + normal = MODULE["apply_config"](inherited, config, "42") + debug = MODULE["apply_game_debug_logs"](normal, config, inherited["BL_DEBUG_DIR"]) + self.assertEqual(debug["PROTON_LOG"], "1") + for key in ("PROTON_LOG_DIR", "PROTON_CRASH_REPORT_DIR", "DXVK_LOG_PATH"): + self.assertEqual(debug[key], debug_dir) + self.assertEqual(debug["DXVK_LOG_LEVEL"], "debug") + self.assertEqual(debug["VKD3D_DEBUG"], "info") + self.assertIn("+relay", debug["WINEDEBUG"].split(",")) + self.assertTrue(debug["WINEDEBUG"].endswith("+loaddll,+mscoree")) + for key in ("CUSTOM", "DXVK_CONFIG", "BL_DEBUG_DIR"): + self.assertEqual(debug[key], normal[key]) + self.assertEqual(normal["PROTON_LOG"], "0") + self.assertEqual(inherited["PROTON_LOG_DIR"], "/old") + self.assertIs(MODULE["apply_game_debug_logs"](normal, {**config, "gameDebugLogs": False}, debug_dir), normal) + self.assertEqual(MODULE["apply_game_debug_logs"](debug, config, debug_dir), debug) + + def test_wine_debug_channels_are_formatted_deduplicated_and_diagnostics_win(self): + formatted = MODULE["game_debug_channels"]( + " +relay, trace-vulkan, -all, -seh, +relay, trace+vulkan, garbage, $(touch never) ", + "+seh,warn-foo,warn+foo,+relay", + ) + self.assertEqual(formatted, "-all,trace+vulkan,warn+foo,+relay," + + "+timestamp,+pid,+tid,+seh,+unwind,+threadname,+debugstr,+loaddll,+mscoree") + self.assertEqual(MODULE["game_debug_channels"](formatted, "1"), formatted) + self.assertNotIn("-seh", formatted) + for value in ("x\0,+relay", "+" + "x" * 8192, 1, None): + self.assertEqual(MODULE["game_debug_channels"](value), MODULE["game_debug_channels"]()) + oversized = ",".join("+channel_" + str(i) for i in range(550)) + other = ",".join("+other_" + str(i) for i in range(550)) + self.assertLessEqual(len(MODULE["game_debug_channels"](oversized, other)), 8192) + self.assertTrue(MODULE["game_debug_channels"](oversized, other).endswith("+loaddll,+mscoree")) + + def test_game_debug_logs_require_opt_in_and_a_real_session_log_directory(self): + env = {"PROTON_LOG": "user", "CUSTOM": "keep"} + for config in ({}, {"version": 1}, {"version": 1, "gameDebugLogs": False}, + {"version": 1, "gameDebugLogs": "true"}, {"version": 2, "gameDebugLogs": True}): + self.assertIs(MODULE["apply_game_debug_logs"](env, config, "/"), env) + with tempfile.TemporaryDirectory() as tmp: + not_a_directory = Path(tmp) / "file" + not_a_directory.write_text("file") + for path in (None, "", "relative", "bad\0path", str(not_a_directory), str(Path(tmp) / "missing")): + with self.subTest(path=path): + self.assertIs(MODULE["apply_game_debug_logs"](env, {"version": 1, "gameDebugLogs": True}, path), env) + + def test_game_debug_toggle_is_live_preserves_command_and_excludes_probes(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + config_path = home / ".config/droiddeck/game-environment.json" + config_path.parent.mkdir(parents=True) + debug_dir = home / "session logs '$literal; directory'" + debug_dir.mkdir() + probe = home / "fake proton" + probe.write_text("#!" + sys.executable + "\nimport json, os, sys\n" + "print(json.dumps({'env': dict(os.environ), 'argv': sys.argv[1:]}))\n") + probe.chmod(0o755) + literal = "$(touch " + str(home / "never-created") + "); 'literal'=value" + config = {"version": 1, "gameDebugLogs": True, + "shared": {"PROTON_LOG": "0", "WINEDEBUG": "-all,+relay", "CUSTOM": literal, + "BL_DEBUG_DIR": "/profile-must-not-redirect"}} + env = {**os.environ, "HOME": tmp, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata/42"), + "BL_DEBUG_DIR": str(debug_dir), "PROTON_LOG": "0", "WINEDEBUG": "-all"} + command = [str(probe), "waitforexitandrun", "game 'with quotes'.exe", "argument with spaces", "$(literal)", "%command%"] + + def launch(arguments, environment): + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), *arguments], + env=environment, text=True, capture_output=True, check=True) + return json.loads(result.stdout) + + for enabled in (True, False, True): + config_path.write_text(json.dumps({**config, "gameDebugLogs": enabled})) + result = launch(command, env) + self.assertEqual(result["argv"], command[1:]) + self.assertEqual(result["env"]["CUSTOM"], literal) + self.assertEqual(result["env"]["PROTON_LOG"], "1" if enabled else "0") + if enabled: + self.assertEqual(result["env"]["PROTON_LOG_DIR"], str(debug_dir)) + self.assertIn("+relay", result["env"]["WINEDEBUG"].split(",")) + self.assertIn("+seh", result["env"]["WINEDEBUG"].split(",")) + else: + self.assertEqual(result["env"]["WINEDEBUG"], "-all,+relay") + for verb, prefix in (("run", "42"), ("waitforexitandrun", "0"), ("waitforexitandrun", "not-a-game")): + result = launch([str(probe), verb], {**env, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata" / prefix)}) + self.assertEqual(result["env"]["PROTON_LOG"], "0") + self.assertEqual(result["env"]["WINEDEBUG"], "-all") + result = launch(command, {**env, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata/-1")}) + self.assertEqual(result["env"]["PROTON_LOG"], "1") + self.assertFalse((home / "never-created").exists()) + self.assertEqual(json.loads(config_path.read_text())["shared"], config["shared"]) + + class ReadConfigMappingTest(unittest.TestCase): def test_missing_parent_or_unbalanced_vdf_is_not_treated_as_absent_choices(self): with tempfile.TemporaryDirectory() as tmp: @@ -59,23 +497,72 @@ class GameEnvironmentTest(unittest.TestCase): with tempfile.TemporaryDirectory() as tmp: home = Path(tmp) probe = home / "probe" - probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('BANNER_AUDIO_DIRECT_MIC', 'unset'))\n") + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('AUDIO_DIRECT_MIC', 'unset'))\n") probe.chmod(0o755) config = home / ".config/droiddeck/game-environment.json" config.parent.mkdir(parents=True) for enabled, override, expected in (("1", None, "1"), ("0", "1", "0"), ("1", "0", "0")): with self.subTest(enabled=enabled, override=override): profile = {} if override is None else { - "BANNER_AUDIO_DIRECT_MIC": override, "BL_MIC_ENABLED": override, + "AUDIO_DIRECT_MIC": override, "BL_MIC_ENABLED": override, } config.write_text(json.dumps({"version": 1, "games": {"42": profile}})) env = dict(os.environ, HOME=tmp, BL_MIC_ENABLED=enabled, - BANNER_AUDIO_DIRECT_MIC="1", STEAM_COMPAT_DATA_PATH="/compatdata/42") + AUDIO_DIRECT_MIC="1", STEAM_COMPAT_DATA_PATH="/compatdata/42") result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], env=env, text=True, capture_output=True, check=True) self.assertEqual(result.stdout.strip(), expected) + def test_game_profile_directaudio_settings_reach_the_driver(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + probe = home / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(' '.join(sorted(k + '=' + v for k, v in os.environ.items() if k.startswith('BANNER_AUDIO_DIRECT_'))))\n") + probe.chmod(0o755) + config = home / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + config.write_text(json.dumps({"version": 1, "games": {"42": {"AUDIO_DIRECT_MS": "80"}}})) + base = {key: value for key, value in os.environ.items() if "AUDIO_DIRECT_" not in key} + base.update(HOME=tmp, BL_MIC_ENABLED="0", STEAM_COMPAT_DATA_PATH="/compatdata/42", + AUDIO_DIRECT_MS="60", AUDIO_DIRECT_PERIOD_MS="20", AUDIO_DIRECT_MIC="1", + BANNER_AUDIO_DIRECT_MS="60", BANNER_AUDIO_DIRECT_MIC="1") + for driver, expected in (("directaudio,pulse", "BANNER_AUDIO_DIRECT_MIC=0 BANNER_AUDIO_DIRECT_MS=80 BANNER_AUDIO_DIRECT_PERIOD_MS=20"), + ("pulse", "BANNER_AUDIO_DIRECT_MIC=1 BANNER_AUDIO_DIRECT_MS=60")): + with self.subTest(driver=driver): + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env=dict(base, WINE_AUDIO_DRIVER=driver), 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 +667,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"}}} @@ -260,10 +755,17 @@ class GameEnvironmentTest(unittest.TestCase): (game / name).touch() env, extra, notes = MODULE["engine_fixes"](str(game / "Game.exe"), []) self.assertEqual(env["FEX_TSOENABLED"], "1") - self.assertEqual(env["FEX_MULTIBLOCK"], "0") + self.assertNotIn("FEX_MULTIBLOCK", env) 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 +859,290 @@ 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_little_nightmares_keeps_its_render_thread(self): + env, extra, notes = MODULE["engine_fixes"]("/game/Little Nightmares/Atlas/Binaries/Win64/LittleNightmares.exe", []) + self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Little Nightmares II/Moonlight/Binaries/Win64/LittleNightmaresII.exe", []), ({}, [], [])) + + def test_game_cores_are_parsed_from_lists_and_ranges(self): + parse = MODULE["parse_cores"] + self.assertEqual(parse("0-3,6"), {0, 1, 2, 3, 6}) + 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: + env["DROIDDECK_FASTEST_CORES"] = "0" + 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_only_games_get_the_larger_swapchain(self): + game = {"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/945360"} + self.assertTrue(MODULE["game_images"](game)) + self.assertEqual(game["GAMESCOPE_WSI_MIN_IMAGE_COUNT"], "8") + self.assertEqual(game["GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT"], "1") + own = {"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/945360", "GAMESCOPE_WSI_MIN_IMAGE_COUNT": "3"} + MODULE["game_images"](own) + self.assertEqual(own["GAMESCOPE_WSI_MIN_IMAGE_COUNT"], "3") + for env in ({}, {"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/0"}): + self.assertFalse(MODULE["game_images"](env)) + self.assertNotIn("GAMESCOPE_WSI_MIN_IMAGE_COUNT", env) + + def test_opengl_games_do_not_wait_for_the_screen_refresh(self): + cases = [ + ({}, "0"), + ({"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/-686078602"}, "0"), + ({"vblank_mode": "2"}, "2"), + ({"vblank_mode": ""}, ""), + ({"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/0"}, None), + ({"STEAM_COMPAT_DATA_PATH": ""}, None), + ] + for env, expected in cases: + env.setdefault("STEAM_COMPAT_DATA_PATH", "/steam/compatdata/3608888694") + added = expected == "0" and "vblank_mode" not in env + self.assertEqual(MODULE["gl_vsync"](env), added, env) + self.assertEqual(env.get("vblank_mode"), expected, env) + said = "OpenGL does not wait for the screen refresh" + with tempfile.TemporaryDirectory() as tmp: + probe = Path(tmp) / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('vblank_mode', 'unset'))\n") + probe.chmod(0o755) + config = Path(tmp) / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + for inherited, edits, expected in (({}, None, "0"), ({"vblank_mode": "3"}, None, "3"), + ({}, {"vblank_mode": None}, "unset"), ({}, {"vblank_mode": "2"}, "2"), + ({"vblank_mode": "3"}, {"vblank_mode": None}, "unset")): + with self.subTest(inherited=inherited, edits=edits): + config.write_text(json.dumps({"version": 1, "games": {"42": edits or {}}})) + env = {name: value for name, value in os.environ.items() if name != "vblank_mode"} + env.update(HOME=tmp, STEAM_COMPAT_DATA_PATH="/compatdata/42", **inherited) + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env=env, text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), expected) + self.assertEqual(said in result.stderr, expected == "0" and not inherited, result.stderr) + + def test_teardown_keeps_its_own_vsync_unless_the_player_chose(self): + with tempfile.TemporaryDirectory() as tmp: + probe = Path(tmp) / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('vblank_mode', 'unset'))\n") + probe.chmod(0o755) + game = Path(tmp) / "Teardown/teardown.exe" + game.parent.mkdir() + game.write_bytes(b"MZ") + config = Path(tmp) / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + for inherited, edits, shared, expected in (({}, None, None, "2"), ({"vblank_mode": "0"}, None, None, "0"), + ({}, {"vblank_mode": "1"}, None, "1"), + ({}, None, {"vblank_mode": "1"}, "1")): + with self.subTest(inherited=inherited, edits=edits, shared=shared): + config.write_text(json.dumps({"version": 1, "shared": shared or {}, "games": {"1167630": edits or {}}})) + env = {name: value for name, value in os.environ.items() if name != "vblank_mode"} + env.update(HOME=tmp, STEAM_COMPAT_DATA_PATH="/compatdata/1167630", **inherited) + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun", str(game)], + env=env, text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), expected, result.stderr) + + def test_windows_cpu_0_is_the_fastest_core(self): + os_mod = MODULE["os"] + pocket_fit = {0: 379, 1: 379, 2: 923, 3: 923, 4: 923, 5: 867, 6: 867, 7: 1024} + every = set(range(8)) + with tempfile.TemporaryDirectory() as tmp: + proton = Path(tmp) / "proton" + proton.write_text('default_cpu_limit = {\n "19900" : "16", # Far Cry 2\n' + ' "2229830" : "1", # Command & Conquer\n "11440" : "4", # DiRT\n' + ' "1038250" : "P", # DIRT 5\n "618970" : 4, # Outcast, written as Proton 10 does\n' + '}\n\nother = {\n "620" : "2",\n}\n') + command = [str(proton), "waitforexitandrun", "/game/game.exe"] + cases = [ + ({}, every, pocket_fit, "8:7,2,3,4,5,6,0,1", "8:7,2,3,4,5,6,0,1"), + ({"BL_GAME_CPUS": "6,7"}, {6, 7}, pocket_fit, "2:7,6", "2:7,6"), + ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, pocket_fit, "3:2,0,1", "3:2,0,1"), + ({"BL_GAME_CPUS": "0-7"}, every, pocket_fit, "8:7,2,3,4,5,6,0,1", "8:7,2,3,4,5,6,0,1"), + ({"WINE_CPU_TOPOLOGY": "2:0,1"}, every, pocket_fit, "2:0,1", "2:0,1"), + ({"WINE_CPU_TOPOLOGY": ""}, every, pocket_fit, "", None), + ({"PROTON_CPU_TOPOLOGY": "1:0"}, every, pocket_fit, None, "1:0"), + ({"DROIDDECK_FASTEST_CORES": "0"}, every, pocket_fit, None, None), + ({"SteamGameId": "2229830"}, every, pocket_fit, "1:7", "1:7"), + ({"SteamGameId": "11440"}, every, pocket_fit, "4:7,2,3,4", "4:7,2,3,4"), + ({"SteamGameId": "19900"}, every, pocket_fit, "8:7,2,3,4,5,6,0,1", "8:7,2,3,4,5,6,0,1"), + ({"SteamGameId": "1038250"}, every, pocket_fit, None, None), + ({"SteamGameId": "618970"}, every, pocket_fit, "4:7,2,3,4", "4:7,2,3,4"), + ({"SteamGameId": "620"}, every, pocket_fit, "8:7,2,3,4,5,6,0,1", "8:7,2,3,4,5,6,0,1"), + ({"SteamGameId": "2229830", "BL_GAME_CPUS": "0,1"}, {0, 1}, pocket_fit, "2:0,1", "2:0,1"), + ({"SteamGameId": "2229830", "DROIDDECK_GAME_CORES": "12-13"}, every, pocket_fit, "1:7", "1:7"), + ({"SteamGameId": "11440", "BL_GAME_CPUS": "0-7"}, every, pocket_fit, "4:7,2,3,4", "4:7,2,3,4"), + ({}, every, {core: 100 for core in every}, None, None), + ({}, every, None, None, None), + ({"SteamGameId": "11440"}, every, None, "4:0,1,2,3", "4:0,1,2,3"), + ({"BL_GAME_CPUS": "9"}, {9}, pocket_fit, None, None), + ] + cases += [ + ({"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/0"}, every, pocket_fit, None, None), + ({"STEAM_COMPAT_DATA_PATH": ""}, every, pocket_fit, None, None), + ({"STEAM_COMPAT_DATA_PATH": "/steam/compatdata/0", "BL_GAME_CPUS": "6,7"}, {6, 7}, pocket_fit, "2:6,7", "2:6,7"), + ] + for env, affinity, speeds, expected, proton_topology in cases: + env.setdefault("STEAM_COMPAT_DATA_PATH", "/steam/compatdata/3608888694") + with mock.patch.dict(MODULE["cpu_topology"].__globals__, {"online_cores": lambda: every}), \ + mock.patch.dict(MODULE["fastest_first"].__globals__, {"core_speeds": lambda cores, speeds=speeds: speeds}), \ + mock.patch.object(os_mod, "sched_getaffinity", return_value=affinity, create=True): + MODULE["cpu_topology"](env, command) + self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) + self.assertEqual(env.get("PROTON_CPU_TOPOLOGY"), proton_topology, env) + self.assertIsNone(MODULE["proton_cpu_limit"](["/missing/proton"], {"SteamGameId": "11440"})) + self.assertIsNone(MODULE["proton_cpu_limit"](command, {})) + self.assertEqual(MODULE["proton_cpu_limit"](command, {"SteamGameId": "1038250"}), "P") + self.assertEqual(MODULE["proton_cpu_limit"](command, {"SteamGameId": "618970"}), 4) + + def test_core_speeds_read_capacity_then_top_clock(self): + with tempfile.TemporaryDirectory() as tmp: + for core, capacity, clock in ((0, "379", "2265600"), (1, None, "3302400")): + folder = Path(tmp) / ("cpu%d" % core) / "cpufreq" + folder.mkdir(parents=True) + (folder / "cpuinfo_max_freq").write_text(clock + "\n") + if capacity: + (folder.parent / "cpu_capacity").write_text(capacity + "\n") + speeds = MODULE["core_speeds"] + self.assertEqual(speeds([0], tmp), {0: 379}) + self.assertEqual(speeds([0, 1], tmp), {0: 2265600, 1: 3302400}) + self.assertIsNone(speeds([0, 2], tmp)) + + 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): + for name in names: + (Path(tmp) / name).parent.mkdir(parents=True, exist_ok=True) + (Path(tmp) / name).touch() + return str(Path(tmp) / names[0]) + + il2cpp = game("Megabonk/Megabonk.x86_64", "Megabonk/UnityPlayer.so", "Megabonk/GameAssembly.so") + mono = game("Mono/Game.x86_64", "Mono/UnityPlayer.so") + windows = game("Crab Game/Crab Game.exe", "Crab Game/UnityPlayer.dll", "Crab Game/GameAssembly.dll") + windows_mono = game("RoR2/Risk of Rain 2.exe", "RoR2/UnityPlayer.dll", "RoR2/MonoBleedingEdge/mono-2.0-bdwgc.dll") + for exe in (il2cpp, mono, windows, windows_mono): + env, extra, notes = MODULE["engine_fixes"](exe, []) + self.assertEqual((env, extra, notes), ({"FEX_TSOENABLED": "1"}, [], ["Unity: FEX with TSO"])) + performance = {"version": 1, "shared": {"FEX_TSOENABLED": "0", "FEX_VECTORTSOENABLED": "0"}} + result = MODULE["apply_config"]({}, performance, "3405340", env) + self.assertEqual((result["FEX_TSOENABLED"], result["FEX_VECTORTSOENABLED"]), ("1", "0")) + performance["games"] = {"3405340": {"FEX_TSOENABLED": "0"}} + self.assertEqual(MODULE["apply_config"]({}, performance, "3405340", env)["FEX_TSOENABLED"], "0") + def test_a_new_fix_only_needs_registering(self): with tempfile.TemporaryDirectory() as tmp: (Path(tmp) / "Game.exe").touch() @@ -599,6 +1385,36 @@ class GameEnvironmentTest(unittest.TestCase): subprocess.run(["bash", "-n"], input=script, text=True, check=True) self.assertIn('bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', script) + def test_both_proton_wrappers_answer_steams_driver_query_without_wine(self): + scripts = (COMPAT["launcher_sh"](), COMPAT["extra_wrapper_sh"]("proton")) + query = "/root/.local/share/Steam/steamrtarm64/../bin/d3ddriverquery64.exe" + probe = "/root/.local/share/Steam/steamapps/compatdata/0" + for script in scripts: + subprocess.run(["bash", "-n"], input=script, text=True, check=True) + self.assertLess(script.index('case "$verb:${1##*/}:'), script.index("bl_components ")) + for args, prefix in (([query, "-d3d12"], probe), ([query], probe + "/"), + ([query.replace("64.exe", ".exe")], probe)): + result = subprocess.run(["bash", "-s", "run"] + args, input=script, text=True, capture_output=True, + env={"PATH": os.defpath, "HOME": "/nonexistent", "STEAM_COMPAT_DATA_PATH": prefix}, + timeout=10) + self.assertEqual(result.returncode, 1, result.stderr) + self.assertEqual(result.stdout, "") + self.assertIn("D3D driver query is not run", result.stderr) + skip = COMPAT["BL_DRIVER_QUERY_SKIP"] + for verb, args, prefix in ( + ("getcompatpath", [query], probe), + ("run", [query], "/root/.local/share/Steam/steamapps/compatdata/2276548447"), + ("run", [query], None), + ("waitforexitandrun", ["/games/AIO/AIO-Graphics-Test-64bit.exe", "--cube", "dx11"], probe), + ("run", ["/games/Tool/tool.exe", query], probe), + ("run", ["/games/d3ddriverquery64.exe.bak"], probe)): + env = {"PATH": os.defpath} + if prefix is not None: + env["STEAM_COMPAT_DATA_PATH"] = prefix + out = subprocess.run(["bash", "-c", "verb=" + verb + "\n" + skip + "echo continued", "_"] + args, + env=env, capture_output=True, text=True, check=True).stdout + self.assertEqual(out, "continued\n", (verb, args, prefix)) + def test_wrappers_preload_the_session_library_before_the_input_shim(self): overlay = "/root/.local/share/Steam/ubuntu12_64/gameoverlayrenderer.so" with tempfile.TemporaryDirectory() as tmp: @@ -1010,11 +1826,11 @@ class DirectAudioPrefixTest(unittest.TestCase): (self.windows / folder).mkdir(parents=True) self.reg = self.compat / "pfx/user.reg" - def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None): - script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\n' + def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None, extra=None): + script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\nenv | grep "^BANNER_AUDIO_DIRECT_" | sort\n' steam = self.compat.parent / "Steam" env = dict(os.environ, BL_DIRECTAUDIO=str(self.sets), STEAM_COMPAT_DATA_PATH=str(self.compat), - STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam)) + STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam), **(extra or {})) env.pop("WINEDLLPATH", None) env.pop("WINE_AUDIO_DRIVER", None) return subprocess.run(["bash", "-c", script, "bash", str(self.tool), verb, target], cwd=cwd, env=env, @@ -1062,6 +1878,21 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIn("DirectAudio selected", result.stderr) self.assertEqual(self.link("system32"), str(self.audio / "lib/wine/aarch64-windows/winedirectaudio.drv")) self.assertEqual(self.audio_values(), [("[Software\\\\Wine\\\\Drivers]", '"Audio"="directaudio,pulse"')]) + def test_audio_direct_settings_reach_the_driver_under_its_own_names(self): + self.reg.write_text("WINE REGISTRY Version 2\n\n#arch=win64\n") + result = self.run_setup(extra={"AUDIO_DIRECT_MS": "60", "AUDIO_DIRECT_PERIOD_MS": "20", + "AUDIO_DIRECT_RELAY": "/run/relay.sock", "OTHER_AUDIO_DIRECT_MS": "5"}) + lines = [line for line in result.stdout.splitlines() if line.startswith("BANNER_")] + self.assertEqual(lines, ["BANNER_AUDIO_DIRECT_MS=60", "BANNER_AUDIO_DIRECT_PERIOD_MS=20", + "BANNER_AUDIO_DIRECT_RELAY=/run/relay.sock"]) + + def test_audio_direct_settings_are_not_handed_on_when_directaudio_stays_off(self): + legacycompat = self.compat.parent / "Steam/legacycompat" + legacycompat.mkdir(parents=True) + (legacycompat / "iscriptevaluator.exe").write_bytes(b"Steam install-script evaluator") + result = self.run_setup(target="iscriptevaluator.exe", cwd=legacycompat, extra={"AUDIO_DIRECT_MS": "60"}) + self.assertNotIn("BANNER_AUDIO_DIRECT_MS", result.stdout) + def test_non_launch_verbs_preserve_audio_configuration(self): for verb in ("getcompatpath", "getnativepath", "destroyprefix"): with self.subTest(verb=verb): @@ -1163,6 +1994,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_gamescope_cursor_shm.py b/tools/tests/test_gamescope_cursor_shm.py index 35ca27acb..e88b19975 100644 --- a/tools/tests/test_gamescope_cursor_shm.py +++ b/tools/tests/test_gamescope_cursor_shm.py @@ -106,9 +106,6 @@ def main(): surface = alloc() send(comp, 0, U(surface)) if not args.unassigned_control: - # wlroots 0.20.2 assigns the cursor role before forwarding this serial - # to Gamescope, so zero avoids needing pointer focus but still tests the - # role guard in xwayland_surface_commit. send(pointer, 0, U(0, surface, 0, 0)) roundtrip() before = count() diff --git a/tools/tests/test_gog_maintenance.py b/tools/tests/test_gog_maintenance.py new file mode 100644 index 000000000..0465e91b4 --- /dev/null +++ b/tools/tests/test_gog_maintenance.py @@ -0,0 +1,216 @@ +import contextlib +import concurrent.futures +import errno +import json +import os +from pathlib import Path +import runpy +import subprocess +import sys +import stat +import tempfile +import unittest +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +G = runpy.run_path(str(BIN / "droiddeck-gog-maintenance"))["main"].__globals__ + + +class GogMaintenance(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.folder = Path(self.temp.name) + self.control = G["control"](self.folder) + (self.folder / ".droiddeck-store.json").write_text(json.dumps({"store": "gog", "id": "1"})) + + def test_only_downloaded_windows_executables_can_be_patches(self): + download = self.control / "downloads" + download.mkdir() + patch = download / "patch.exe" + patch.write_bytes(b"MZtest") + self.assertEqual(patch, G["validate_installer"](self.folder, patch)) + outside = self.folder / "outside.exe" + outside.write_bytes(b"MZtest") + with self.assertRaises(ValueError): + G["validate_installer"](self.folder, outside) + patch.write_bytes(b"not PE") + with self.assertRaises(ValueError): + G["validate_installer"](self.folder, patch) + + def test_overlapping_metadata_writes_publish_complete_documents(self): + target = self.control / "operation.json" + def publish(value): + G["write"](target, {"value": value, "payload": str(value) * 10000}) + result = G["read"](target) + self.assertEqual(str(result["value"]) * 10000, result["payload"]) + with concurrent.futures.ThreadPoolExecutor(max_workers=8) as pool: + list(pool.map(publish, range(32))) + self.assertEqual([], list(self.control.glob("*.new"))) + + def test_directory_sync_unsupported_by_external_storage_keeps_the_record(self): + original = os.fsync + def fsync(fd): + if stat.S_ISDIR(os.fstat(fd).st_mode): + raise OSError(errno.EINVAL, "directory sync unsupported") + return original(fd) + target = self.control / "operation.json" + with mock.patch.object(G["os"], "fsync", side_effect=fsync): + G["write"](target, {"phase": "download"}) + self.assertEqual("download", G["read"](target)["phase"]) + + def test_unsuccessful_registry_preparation_never_runs_the_installer(self): + download = self.control / "downloads"; download.mkdir() + patch = download / "patch.exe"; patch.write_bytes(b"MZtest") + prefix = self.folder / "prefix/pfx" + (prefix / "drive_c/windows/system32").mkdir(parents=True) + (prefix / "drive_c/windows/system32/reg.exe").write_bytes(b"MZreg") + (prefix / "system.reg").write_text("registry") + for result in ("timeout", "import-failed", "no-proton", "none", "unexpected"): + with self.subTest(result=result): + G["write"](self.control / "operation.json", {"phase": "patch-starting", "before": {"id": "1"}}) + def setup_main(): + pass + with mock.patch.dict(setup_main.__globals__, {"apply_gog_registry": lambda *a, **k: result}), \ + mock.patch.dict(G, {"runner": lambda *a: ("/proton", {}, str(self.folder / "prefix")), "active": lambda *a: []}), \ + mock.patch.object(G["runpy"], "run_path", return_value={"main": setup_main}), \ + mock.patch.object(G["subprocess"], "Popen") as spawn: + self.assertEqual(1, G["run_patch"](str(self.folder), "1", str(patch), "game.exe")) + spawn.assert_not_called() + self.assertIn("registry preparation failed", G["read"](self.control / "patch-status.json")["reason"]) + + def test_only_recognized_inno_installers_get_the_gog_ui_compatibility_argument(self): + path = self.folder / "patch.exe" + path.write_bytes(b"MZunknown installer") + self.assertEqual([], G["installer_arguments"](path)) + path.write_bytes(b"MZdata Inno Setup Setup Data (6.2.1)") + self.assertEqual(["/NOGUI"], G["installer_arguments"](path)) + + def test_game_launch_lease_excludes_updater_and_releases_on_owner_exit(self): + import fcntl + owner = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(30)"]) + self.addCleanup(lambda: owner.poll() is None and owner.kill()) + lease = subprocess.Popen([sys.executable, str(BIN / "droiddeck-gog-maintenance"), "lease", str(self.folder), str(owner.pid)], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + self.addCleanup(lease.stdout.close) + self.addCleanup(lease.stderr.close) + self.addCleanup(lambda: lease.poll() is None and lease.kill()) + self.assertEqual(b"ready\n", lease.stdout.readline()) + with G["lock_file"](self.control) as stream: + with self.assertRaises(BlockingIOError): + fcntl.lockf(stream, fcntl.LOCK_EX | fcntl.LOCK_NB) + owner.terminate(); owner.wait() + lease.wait(timeout=5) + with G["lock_file"](self.control) as stream: + fcntl.lockf(stream, fcntl.LOCK_EX | fcntl.LOCK_NB) + + def test_incomplete_update_cannot_launch(self): + (self.folder / ".droiddeck-store.json").write_text(json.dumps({"store": "gog", "id": "1", "state": "updating"})) + with self.assertRaises(ValueError): + G["lease"](self.folder, os.getpid()) + + def test_running_game_and_wrong_prefix_are_distinguished(self): + proc = self.folder / "proc" + for pid, prefix, name in [(10, "/prefix/pfx", "game.exe"), (11, "/other/pfx", "other.exe"), (12, "/prefix/pfx", "services.exe")]: + row = proc / str(pid); row.mkdir(parents=True) + (row / "environ").write_bytes(b"WINEPREFIX=" + prefix.encode() + b"\0") + (row / "cmdline").write_bytes(name.encode() + b"\0") + self.assertEqual([10], G["active"]("/prefix", proc)) + + def test_desktop_installer_inherits_the_nested_display_not_the_bridge_display(self): + proc = self.folder / "proc" + row = proc / "10"; row.mkdir(parents=True) + (row / "cmdline").write_bytes(b"/usr/bin/plasmashell\0") + (row / "environ").write_bytes(b"BL_DESKTOP=1\0XDG_RUNTIME_DIR=/run/session\0WAYLAND_DISPLAY=wayland-1\0DISPLAY=:0\0XAUTHORITY=/run/session/auth\0UNRELATED=value\0") + env = G["desktop_environment"]({"DROIDDECK_GOG_DESKTOP": "1", "XDG_RUNTIME_DIR": "/run/session", "WAYLAND_DISPLAY": "wayland-0"}, proc) + self.assertEqual("wayland-1", env["WAYLAND_DISPLAY"]) + self.assertEqual(":0", env["DISPLAY"]) + self.assertEqual("/run/session/auth", env["XAUTHORITY"]) + self.assertEqual("1", env["BL_DESKTOP"]) + self.assertNotIn("UNRELATED", env) + + def test_maintenance_uses_full_x87_precision_without_changing_game_preferences(self): + target = mock.Mock(compatdata="/selected/prefix", appid="2526420341") + run = {"tools": lambda root: {"selected": ("/selected/proton", "proton")}, + "mapping": lambda root: {}, "choose_tool": lambda *args: ("selected", None), + "environment": lambda env, *args, **kwargs: dict(env)} + with mock.patch.dict(G, {"target_for": lambda *args: (run, "/steam", target)}), \ + mock.patch.dict(os.environ, {"FEX_X87REDUCEDPRECISION": "1"}): + command, env, prefix = G["runner"]("/game", "2526420341", "/game/game.exe") + self.assertEqual("/selected/proton/proton", command) + self.assertEqual("/selected/prefix", prefix) + self.assertEqual("0", env["FEX_X87REDUCEDPRECISION"]) + self.assertEqual("1", os.environ["FEX_X87REDUCEDPRECISION"]) + + def test_legacy_setup_uses_authentic_timestamp_and_support_layout(self): + program = self.folder / "support/1/setup.exe" + program.parent.mkdir(parents=True); program.write_bytes(b"MZtest") + record = {"id": "1", "build": "3301", "products": ["1"], "language": "en-US", "manifest": {"product": { + "timestamp": 31847977, "support_commands": [{"gameID": "1", "executable": "/setup.exe", "languages": ["English"]}]}}} + G["write"](self.control / "installed.json", {"verified": False}) + G["write"](self.control / "operation.json", {"before": record}) + G["write"](self.folder / "goggame-1.info", {"language": "English"}) + with mock.patch.object(G["subprocess"], "run", return_value=mock.Mock(returncode=0)) as run: + G["prepare_setup"](str(self.folder), "/proton", {}) + args = run.call_args.args[0] + self.assertEqual(str(program), args[2]) + self.assertIn("/buildId=31847977", args) + self.assertNotIn("/buildId=3301", args) + self.assertIn("/Language=English", args) + + def test_interrupted_patch_is_not_started_again(self): + (self.control / "operation.json").write_text(json.dumps({"phase": "patch-applying"})) + with mock.patch.dict(G, {"validate_installer": lambda *a: self.folder / "patch.exe"}): + with self.assertRaises(ValueError): + G["start"](str(self.folder), "2147483666", "patch.exe", "game.exe") + + def test_dead_installer_helper_requires_recovery_without_replay(self): + G["write"](self.control / "operation.json", {"phase": "patch-applying"}) + G["write"](self.control / "patch-status.json", {"state": "running", "pid": 99999999, "generation": "123"}) + with mock.patch.dict(G, {"generation": lambda pid: None}), mock.patch.object(G["subprocess"], "Popen") as spawn: + self.assertEqual(0, G["status"](str(self.folder))) + self.assertFalse(spawn.called) + self.assertEqual("uncertain", G["read"](self.control / "patch-status.json")["state"]) + self.assertEqual("patch-uncertain", G["read"](self.control / "operation.json")["phase"]) + + def test_abandoned_start_and_confirmed_completion_are_distinct(self): + G["write"](self.control / "operation.json", {"phase": "patch-starting"}) + G["write"](self.control / "patch-status.json", {"state": "starting", "startedAt": 10}) + with mock.patch.object(G["time"], "time", return_value=100): + G["status"](str(self.folder)) + self.assertEqual("uncertain", G["read"](self.control / "patch-status.json")["state"]) + G["write"](self.control / "patch-status.json", {"state": "done", "exitCode": 0}) + G["status"](str(self.folder)) + self.assertEqual({"state": "done", "exitCode": 0}, G["read"](self.control / "patch-status.json")) + + def test_registry_and_installer_use_same_prefix_without_cloud_launch(self): + download = self.control / "downloads"; download.mkdir() + patch = download / "patch.exe"; patch.write_bytes(b"MZtest") + prefix = self.folder / "prefix/pfx" + (prefix / "drive_c/windows/system32").mkdir(parents=True) + (prefix / "drive_c/windows/system32/reg.exe").write_bytes(b"MZreg") + (prefix / "system.reg").write_text("registry") + G["write"](self.control / "operation.json", {"phase": "patch-starting"}) + calls = [] + setup = {"main": lambda: None} + def setup_main(): + pass + setup_main.__globals__["apply_gog_registry"] = lambda *a, **k: calls.append(("registry", a[1])) or "written=1" + fake = mock.Mock(); fake.wait.return_value = 0 + def spawn(argv, **kwargs): + self.assertEqual("run", argv[1]) + self.assertEqual("1", kwargs["env"]["DROIDDECK_GOG_MAINTENANCE"]) + calls.append(("patch", kwargs["env"]["STEAM_COMPAT_DATA_PATH"])) + return fake + with mock.patch.dict(G, {"runner": lambda *a: ("/proton", {"STEAM_COMPAT_DATA_PATH": str(self.folder / "prefix"), "DROIDDECK_GOG_MAINTENANCE": "1"}, str(self.folder / "prefix")), + "active": lambda *a: []}), \ + mock.patch.object(G["runpy"], "run_path", return_value={"main": setup_main}), \ + mock.patch.object(G["subprocess"], "Popen", side_effect=spawn): + self.assertEqual(0, G["run_patch"](str(self.folder), "2147483666", str(patch), "game.exe")) + self.assertEqual([("registry", str(self.folder / "prefix")), ("patch", str(self.folder / "prefix"))], calls) + self.assertEqual("done", G["read"](self.control / "patch-status.json")["state"]) + self.assertEqual("updating", G["read"](self.folder / ".droiddeck-store.json")["state"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_gpu_clock_pin.c b/tools/tests/test_gpu_clock_pin.c new file mode 100644 index 000000000..5fdbe6033 --- /dev/null +++ b/tools/tests/test_gpu_clock_pin.c @@ -0,0 +1,188 @@ +#include <assert.h> +#include <errno.h> +#include <pthread.h> +#include <stdarg.h> +#include <stdatomic.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <sys/mman.h> +#include <unistd.h> + +#include "../../app/src/main/cpp/adrenotools/src/hook/kgsl.h" +#include "../../app/src/main/cpp/waylandcomp/src/gpu_clock_pin.h" + +enum { NONE, OPEN, DEVICE, CONTEXT, CONSTRAINT, MEMORY, MAP, SYNC, SUBMIT, THREAD, WAIT }; +static atomic_int failure, descriptors, contexts, memories, mappings, submissions, waits; +static atomic_bool timeout_wait; +static bool legacy_core; +static uint32_t commands[1024]; + +int __android_log_print(int priority, const char *tag, const char *format, ...) { + (void)priority; (void)tag; (void)format; + return 0; +} + +int __wrap_open(const char *path, int flags, ...) { + (void)flags; + assert(!strcmp(path, "/dev/kgsl-3d0")); + if (atomic_load(&failure) == OPEN) { errno = EACCES; return -1; } + assert(atomic_fetch_add(&descriptors, 1) == 0); + return 91; +} + +int __wrap_close(int fd) { + assert(fd == 91); + assert(atomic_fetch_sub(&descriptors, 1) == 1); + errno = EBADF; + return 0; +} + +void *__wrap_mmap(void *address, size_t size, int protection, int flags, int fd, off_t offset) { + (void)address; (void)protection; (void)flags; + assert(fd == 91 && size == sizeof(commands) && offset == (23 << 12)); + if (atomic_load(&failure) == MAP) { errno = EACCES; return MAP_FAILED; } + assert(atomic_fetch_add(&mappings, 1) == 0); + return commands; +} + +int __wrap_munmap(void *address, size_t size) { + assert(address == commands && size == sizeof(commands)); + assert(atomic_fetch_sub(&mappings, 1) == 1); + return 0; +} + +#ifdef __ANDROID__ +int __wrap_ioctl(int fd, int request, ...) { +#else +int __wrap_ioctl(int fd, unsigned long request, ...) { +#endif + assert(fd == 91); + va_list args; + va_start(args, request); + void *arg = va_arg(args, void *); + va_end(args); + int step = NONE; + switch ((unsigned int)request) { + case IOCTL_KGSL_DEVICE_GETPROPERTY: step = DEVICE; break; + case IOCTL_KGSL_DRAWCTXT_CREATE: step = CONTEXT; break; + case IOCTL_KGSL_SETPROPERTY: step = CONSTRAINT; break; + case IOCTL_KGSL_GPUMEM_ALLOC_ID: step = MEMORY; break; + case IOCTL_KGSL_GPUMEM_SYNC_CACHE: step = SYNC; break; + case IOCTL_KGSL_GPU_COMMAND: step = SUBMIT; break; + case IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID: step = WAIT; break; + } + if (step && atomic_load(&failure) == step) { errno = EACCES; return -1; } + switch ((unsigned int)request) { + case IOCTL_KGSL_DEVICE_GETPROPERTY: { + struct kgsl_device_getproperty *property = arg; + assert(property->type == KGSL_PROP_DEVICE_INFO); + ((struct kgsl_devinfo *)property->value)->chip_id = legacy_core ? 0x04030000 : 0x07030000; + break; + } + case IOCTL_KGSL_DRAWCTXT_CREATE: { + struct kgsl_drawctxt_create *context = arg; + assert(context->flags & KGSL_CONTEXT_PWR_CONSTRAINT); + context->drawctxt_id = 17; + atomic_fetch_add(&contexts, 1); + break; + } + case IOCTL_KGSL_SETPROPERTY: { + struct kgsl_device_getproperty *property = arg; + assert(property->type == KGSL_PROP_PWR_CONSTRAINT); + struct kgsl_device_constraint *constraint = property->value; + assert(constraint->context_id == 17 && constraint->type == KGSL_CONSTRAINT_PWRLEVEL); + assert(((struct kgsl_device_constraint_pwrlevel *)constraint->data)->level == KGSL_CONSTRAINT_PWR_MAX); + break; + } + case IOCTL_KGSL_GPUMEM_ALLOC_ID: { + struct kgsl_gpumem_alloc_id *memory = arg; + memory->id = 23; memory->gpuaddr = 0x100000; memory->mmapsize = sizeof(commands); + atomic_fetch_add(&memories, 1); + break; + } + case IOCTL_KGSL_GPUMEM_SYNC_CACHE: + assert(((struct kgsl_gpumem_sync_cache *)arg)->op == KGSL_GPUMEM_CACHE_CLEAN); + break; + case IOCTL_KGSL_GPU_COMMAND: { + struct kgsl_gpu_command *command = arg; + struct kgsl_command_object *object = (void *)(uintptr_t)command->cmdlist; + assert(command->context_id == 17 && command->numcmds == 1); + assert(command->flags & KGSL_CMDBATCH_PWR_CONSTRAINT); + assert(object->id == 23 && object->gpuaddr == 0x100000 && object->size == 8); + assert(commands[0] == (legacy_core ? 0xc0001000 : 0x70100001) && commands[1] == 0); + command->timestamp = atomic_fetch_add(&submissions, 1) + 1; + break; + } + case IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID: + atomic_fetch_add(&waits, 1); + if (atomic_load(&timeout_wait)) { errno = ETIMEDOUT; return -1; } + break; + case IOCTL_KGSL_DRAWCTXT_DESTROY: + assert(atomic_fetch_sub(&contexts, 1) == 1); + break; + case IOCTL_KGSL_GPUMEM_FREE_ID: + assert(atomic_fetch_sub(&memories, 1) == 1); + break; + default: assert(!"unexpected ioctl"); + } + return 0; +} + +int __real_pthread_create(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *); +int __wrap_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start)(void *), void *arg) { + if (atomic_load(&failure) == THREAD) return EAGAIN; + return __real_pthread_create(thread, attr, start, arg); +} + +static void assert_released(void) { + assert(!atomic_load(&descriptors) && !atomic_load(&contexts)); + assert(!atomic_load(&memories) && !atomic_load(&mappings)); +} + +int main(void) { + assert(gpu_clock_pin_set(false)); + assert_released(); + legacy_core = true; + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(false)); + assert_released(); + legacy_core = false; + for (int step = OPEN; step <= THREAD; ++step) { + atomic_store(&failure, step); + assert(!gpu_clock_pin_set(true)); + assert(errno == (step == THREAD ? EAGAIN : EACCES)); + assert_released(); + } + atomic_store(&failure, NONE); + atomic_store(&submissions, 0); + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(true)); + for (int i = 0; i < 100 && atomic_load(&submissions) < 2; ++i) usleep(10000); + assert(atomic_load(&submissions) > 1); + assert(gpu_clock_pin_set(false)); + assert(gpu_clock_pin_set(false)); + assert_released(); + + atomic_store(&timeout_wait, true); + atomic_store(&submissions, 0); + atomic_store(&waits, 0); + assert(gpu_clock_pin_set(true)); + for (int i = 0; i < 100 && atomic_load(&waits) < 2; ++i) usleep(10000); + assert(atomic_load(&waits) >= 2); + assert(atomic_load(&submissions) == 1); + assert(gpu_clock_pin_set(false)); + assert_released(); + atomic_store(&timeout_wait, false); + + atomic_store(&failure, WAIT); + assert(gpu_clock_pin_set(true)); + for (int i = 0; i < 100 && atomic_load(&descriptors); ++i) usleep(10000); + assert_released(); + atomic_store(&failure, NONE); + assert(gpu_clock_pin_set(true)); + assert(gpu_clock_pin_set(false)); + assert_released(); + puts("gpu clock pin: failure cleanup, renewal, bounded queue and restart passed"); + return 0; +} diff --git a/tools/tests/test_gpu_clock_pin.py b/tools/tests/test_gpu_clock_pin.py new file mode 100644 index 000000000..f6f466871 --- /dev/null +++ b/tools/tests/test_gpu_clock_pin.py @@ -0,0 +1,30 @@ +import pathlib +import shutil +import subprocess +import sys +import tempfile +import unittest + + +ROOT = pathlib.Path(__file__).resolve().parents[2] + + +class GpuClockPinTest(unittest.TestCase): + @unittest.skipUnless(sys.platform.startswith('linux') and shutil.which('cc'), 'requires a Linux C compiler') + def test_constraint_lifecycle(self): + with tempfile.TemporaryDirectory() as tmp: + directory = pathlib.Path(tmp) + (directory / 'android').mkdir() + (directory / 'android/log.h').write_text( + '#define ANDROID_LOG_WARN 5\n' + 'int __android_log_print(int, const char *, const char *, ...);\n') + binary = directory / 'gpu-clock-pin-test' + subprocess.run([ + 'cc', '-std=c11', '-D_DEFAULT_SOURCE', '-D__user=', '-Wall', '-Wextra', '-Werror', + '-I', str(directory), '-pthread', + str(ROOT / 'tools/tests/test_gpu_clock_pin.c'), + str(ROOT / 'app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c'), + '-Wl,--wrap=open,--wrap=close,--wrap=mmap,--wrap=munmap,--wrap=ioctl,--wrap=pthread_create', + '-o', str(binary), + ], check=True) + subprocess.run([str(binary)], check=True, timeout=10) diff --git a/tools/tests/test_hud_frames.py b/tools/tests/test_hud_frames.py new file mode 100644 index 000000000..e7af1aa5e --- /dev/null +++ b/tools/tests/test_hud_frames.py @@ -0,0 +1,136 @@ +from pathlib import Path +import os +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +PATCH = ROOT / "tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch" +READER = ROOT / "app/src/main/cpp/waylandcomp/src/hudframes.c" + + +def patch_writer(): + added = [line[1:] for line in PATCH.read_text().splitlines() if line.startswith("+") and not line.startswith("+++")] + text = "\n".join(added) + start = text.index("static constexpr uint32_t k_uDroidDeckHudFramesMagic") + end = text.index("\n}\n", text.index("static void publish_droiddeck_hud_info()", start)) + 3 + return text[start:end] + + +PREAMBLE = r''' +#include <assert.h> +#include <cstdarg> +#include <cstdint> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <fcntl.h> +#include <memory> +#include <mutex> +#include <string> +#include <sys/mman.h> +#include <unistd.h> +#include <unordered_map> + +extern "C" { +#include "hudframes.h" +} + +struct steamcompmgr_win_t { int appID; }; +struct global_focus_t { + uint64_t ulBasePlaneCommitID = 0; + pid_t nFocusWindowPid = 0; + std::shared_ptr<std::string> pFocusWindowEngine; + steamcompmgr_win_t *inputFocusWindow = nullptr; +}; +static std::unordered_map<uint64_t, global_focus_t> g_VirtualConnectorFocuses; +static global_focus_t *GetCurrentFocus() { return nullptr; } +static bool window_is_steam(steamcompmgr_win_t *w) { return w && w->appID == 769; } +static uint64_t g_now = 1000000000ull; +static uint64_t get_time_in_nanos() { return g_now; } +static uint32_t g_nOutputWidth = 1280, g_nOutputHeight = 720; +static int g_nOutputRefresh = 144000; +struct Log { + void infof(const char *, ...) {} + void errorf_errno(const char *fmt, ...) { va_list a; va_start(a, fmt); vfprintf(stderr, fmt, a); va_end(a); } +} xwm_log; +''' + +MAIN = r''' +static void frame(uint64_t step) { g_now += step; droiddeck_hud_app_frame(g_now); } + +int main(int argc, char **argv) { + setenv("DROIDDECK_HUD_FRAMES", argv[1], 1); + assert(droiddeck_hud_frames_wanted()); + global_focus_t &focus = g_VirtualConnectorFocuses[0]; + focus.nFocusWindowPid = 4242; + focus.pFocusWindowEngine = std::make_shared<std::string>("DXVK"); + steamcompmgr_win_t game{ 12345 }; + focus.inputFocusWindow = &game; + publish_droiddeck_hud_info(); + + droiddeck_hud_app_frame(g_now); + struct hud_frames *h = hud_frames_open(argv[1]); + assert(h); + int64_t ft[2048], tm[2048]; + assert(hud_frames_poll(h, ft, tm, 2048) == 0); + + const uint64_t steps[] = { 2700000, 2800000, 41600000, 6944000 }; + for (uint64_t step : steps) frame(step); + int n = hud_frames_poll(h, ft, tm, 2048); + assert(n == 4); + for (int i = 0; i < 4; i++) assert((uint64_t)ft[i] == steps[i]); + assert((uint64_t)tm[3] == g_now); + assert(hud_frames_poll(h, ft, tm, 2048) == 0); + + int32_t info[5]; + char engine[41]; + assert(hud_frames_info(h, info, engine, sizeof(engine))); + assert(info[0] == 4242 && info[1] == 1280 && info[2] == 720 && info[3] == 144000 && info[4] == 0); + assert(strcmp(engine, "DXVK") == 0); + game.appID = 769; + publish_droiddeck_hud_info(); + assert(hud_frames_info(h, info, engine, sizeof(engine)) && info[4] == 1); + + for (int i = 0; i < 3000; i++) frame(1000000 + i); + n = hud_frames_poll(h, ft, tm, 2048); + assert(n == 1024); + assert(ft[1023] == 1000000 + 2999); + assert(ft[0] == 1000000 + 2999 - 1023); + + for (int i = 0; i < 10; i++) frame(2000000); + assert(hud_frames_poll(h, ft, tm, 4) == 4 && ft[3] == 2000000); + hud_frames_close(h); + puts("ok"); + return 0; +} +''' + + +@unittest.skipUnless(shutil.which("cc") and shutil.which("c++"), "needs a C and C++ compiler") +class HudFramesTest(unittest.TestCase): + def test_gamescope_writer_and_app_reader_agree(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + source = tmp / "writer.cpp" + source.write_text(PREAMBLE + patch_writer() + MAIN) + include = READER.parent + subprocess.run(["cc", "-std=gnu11", "-Wall", "-Wextra", "-Werror", "-c", str(READER), "-o", str(tmp / "reader.o")], check=True) + subprocess.run(["c++", "-std=c++20", "-Wall", "-Werror", "-Wno-unused-function", f"-I{include}", str(source), str(tmp / "reader.o"), + "-o", str(tmp / "hudframes")], check=True) + result = subprocess.run([str(tmp / "hudframes"), str(tmp / "frames")], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.strip(), "ok") + self.assertEqual(os.path.getsize(tmp / "frames"), 128 + 1024 * 16) + + def test_session_points_gamescope_at_the_file_the_app_reads(self): + session = (ROOT / "tools/linuxfs/overlay/usr/local/bin/droiddeck-session").read_text() + self.assertIn("export DROIDDECK_HUD_FRAMES=/run/droiddeck-hud/frames", session) + app = (ROOT / "app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt").read_text() + self.assertIn('"run/droiddeck-hud/frames"', app) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_kgsl_busy.py b/tools/tests/test_kgsl_busy.py new file mode 100644 index 000000000..7655b9873 --- /dev/null +++ b/tools/tests/test_kgsl_busy.py @@ -0,0 +1,33 @@ +"""Exercise the HUD's kgsl memstore busy sampling (app/src/main/cpp/gpuclock/kgsl_busy.h).""" +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] + + +class KgslBusyTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-kgsl-busy-') + cls.addClassCleanup(cls.temp.cleanup) + cls.binary = Path(cls.temp.name) / 'kgsl-busy-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', + '-I', str(REPO / 'app/src/main/cpp/gpuclock'), + str(REPO / 'tools/tests/kgsl_busy_harness.c'), '-o', str(cls.binary)], + check=True, capture_output=True, text=True) + + def test_ringbuffer_slots_and_busy_rule(self): + result = subprocess.run([str(self.binary)], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('PASS: kgsl memstore busy', result.stdout) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_launcher_cores.py b/tools/tests/test_launcher_cores.py index 4f05df242..b3e9fc929 100644 --- a/tools/tests/test_launcher_cores.py +++ b/tools/tests/test_launcher_cores.py @@ -19,7 +19,6 @@ ALL = set(range(8)) class FakeCores: - """Per-thread masks and priorities, with every change recorded.""" def __init__(self): self.state = {} diff --git a/tools/tests/test_library_perms.py b/tools/tests/test_library_perms.py new file mode 100644 index 000000000..60780c3c1 --- /dev/null +++ b/tools/tests/test_library_perms.py @@ -0,0 +1,98 @@ +import os +from pathlib import Path +import stat +import subprocess +import sys +import tempfile +import unittest + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-library-perms" + + +class LibraryPermsTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.restore) + self.root = Path(self.temp.name) + self.home = self.root / "home" + self.steam = self.home / ".local/share/Steam" + self.card = self.root / "card" + self.stores = self.root / "stores" + (self.steam / "steamapps").mkdir(parents=True) + (self.steam / "steamapps/libraryfolders.vdf").write_text( + '"libraryfolders"\n{\n\t"0"\n\t{\n\t\t"path"\t\t"%s"\n\t}\n\t"1"\n\t{\n\t\t"path"\t\t"%s"\n\t}\n}\n' + % (self.steam, self.card)) + self.locked = [] + + def restore(self): + for path in self.locked: + if path.exists() and not path.is_symlink(): + path.chmod(0o700 if path.is_dir() else 0o600) + for path in sorted(self.root.rglob("*"), key=lambda p: len(p.parts), reverse=True): + if path.is_dir() and not path.is_symlink(): + path.chmod(0o700) + self.temp.cleanup() + + def file(self, path, mode=0o400): + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text("x") + path.chmod(mode) + self.locked.append(path) + return path + + def folder(self, path, mode=0o500): + path.mkdir(parents=True, exist_ok=True) + self.locked.append(path) + return path + + def run_script(self): + env = dict(os.environ, HOME=str(self.home), DROIDDECK_STORES_ROOT=str(self.stores)) + for path in reversed(self.locked): + if path.is_dir(): + path.chmod(0o500) + return subprocess.run([sys.executable, str(SCRIPT)], env=env, check=True, capture_output=True, text=True).stdout + + def mode(self, path): + return stat.S_IMODE(os.lstat(path).st_mode) + + def test_read_only_game_files_and_folders_become_writable_in_every_library(self): + ini = self.file(self.steam / "steamapps/compatdata/3712566526/pfx/drive_c/users/steamuser/Documents/My Games/FalloutNV/FALLOUT.INI") + data = self.folder(self.steam / "steamapps/common/Game/Data") + game = self.file(data / "game.esm", 0o444) + card = self.file(self.card / "steamapps/common/Other/settings.ini") + gog = self.file(self.home / "Games/Stores/GOG/Fallout New Vegas/Fallout_default.ini") + store = self.file(self.stores / "abc/Game/config.cfg") + out = self.run_script() + self.assertEqual(self.mode(ini) & 0o600, 0o600) + self.assertEqual(self.mode(game), 0o644) + self.assertEqual(self.mode(data) & 0o700, 0o700) + for path in (card, gog, store): + self.assertEqual(self.mode(path) & 0o600, 0o600, path) + self.assertIn("made writable", out) + + def test_proton_and_steam_runtimes_are_left_as_valve_ships_them(self): + proton = self.file(self.steam / "steamapps/common/Proton Experimental (ARM64)/files/lib/wine/a.so", 0o444) + runtime = self.file(self.card / "steamapps/common/SteamLinuxRuntime_sniper/run", 0o555) + nested = self.file(self.steam / "steamapps/common/Game/Proton notes.txt") + self.run_script() + self.assertEqual(self.mode(proton), 0o444) + self.assertEqual(self.mode(runtime), 0o555) + self.assertEqual(self.mode(nested) & 0o600, 0o600) + + def test_symlinks_are_not_followed(self): + outside = self.file(self.root / "outside/keep.ini") + link = self.steam / "steamapps/compatdata/1/pfx/dosdevices/z:" + link.parent.mkdir(parents=True) + link.symlink_to(self.root / "outside") + self.run_script() + self.assertEqual(self.mode(outside), 0o400) + + def test_writable_files_are_untouched_and_missing_libraries_are_fine(self): + fine = self.file(self.steam / "steamapps/common/Game/ok.ini", 0o640) + out = self.run_script() + self.assertEqual(self.mode(fine), 0o640) + self.assertIn("0 files and folders made writable", out) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_login1.py b/tools/tests/test_login1.py index e257ccf81..fe69c209e 100644 --- a/tools/tests/test_login1.py +++ b/tools/tests/test_login1.py @@ -1,4 +1,3 @@ -"""Real login1 sleep handshakes; run with dbus-run-session and python3-gi.""" import os from pathlib import Path import subprocess diff --git a/tools/tests/test_msi_install.py b/tools/tests/test_msi_install.py index dda3eeea5..60d8fc8df 100644 --- a/tools/tests/test_msi_install.py +++ b/tools/tests/test_msi_install.py @@ -10,7 +10,6 @@ COMPONENTS = runpy.run_path(str(BIN / "droiddeck-wincomponents")) class FakePackage: - """A package's tables in memory, as msiinfo would give them.""" def __init__(self, tables, summary=None): self.path = "fake.msi" diff --git a/tools/tests/test_netmanager.py b/tools/tests/test_netmanager.py index 69159fdfc..5f65d97d4 100644 --- a/tools/tests/test_netmanager.py +++ b/tools/tests/test_netmanager.py @@ -1,7 +1,3 @@ -"""NetworkManager contract and real D-Bus handovers (requires python3-gi and dbus). - -Run on Linux: dbus-run-session -- python3 -m unittest discover -s tools/tests -p test_netmanager.py -""" import importlib.machinery import importlib.util import json diff --git a/tools/tests/test_noexec_preload.py b/tools/tests/test_noexec_preload.py index 2090a05a5..8f8b5235e 100644 --- a/tools/tests/test_noexec_preload.py +++ b/tools/tests/test_noexec_preload.py @@ -1,4 +1,5 @@ import os +import sys from pathlib import Path import shutil import subprocess @@ -11,6 +12,7 @@ PROGRAM = r""" #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <sys/mman.h> int main(int argc, char **argv) { @@ -43,7 +45,7 @@ class NoexecPreloadTest(unittest.TestCase): cls.tmp = Path(tempfile.mkdtemp()) cls.lib = cls.tmp / "libnoexec.so" subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-DNOEXEC_TEST", "-o", str(cls.lib), - str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) source = cls.tmp / "program.c" source.write_text(PROGRAM) for name in ("FEX", "game"): @@ -75,6 +77,7 @@ EXECMOD = r""" #include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <stdlib.h> #include <string.h> #include <sys/mman.h> #include <sys/syscall.h> @@ -97,6 +100,14 @@ static int private_file(void *addr) { return found; } +void *mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) { + if ((flags & MAP_ANONYMOUS) && getenv("DROIDDECK_TEST_FAIL_ANON")) { + errno = ENOMEM; + return MAP_FAILED; + } + return (void *)syscall(SYS_mmap, addr, len, prot, flags, fd, off); +} + int mprotect(void *addr, size_t len, int prot) { if ((prot & PROT_EXEC) && private_file(addr)) { errno = EACCES; @@ -110,6 +121,7 @@ CALLER = r""" #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <sys/mman.h> #include <unistd.h> @@ -127,27 +139,28 @@ int main(int argc, char **argv) { printf("protect %d\n", result ? errno : 0); __builtin___clear_cache((char *)code, (char *)code + 4096); if (!result) printf("call %d\n", ((int (*)(void))(code + 64))()); + if (result && getenv("DROIDDECK_TEST_WRITE_AFTER_FAILURE")) code[0] = 9; printf("data %d\n", code[0]); char line[512]; FILE *maps = fopen("/proc/self/maps", "r"); while (maps && fgets(line, sizeof line, maps)) { unsigned long lo, hi; if (sscanf(line, "%lx-%lx", &lo, &hi) == 2 && (unsigned long)code >= lo && (unsigned long)code < hi) - printf("shared %d\n", strstr(line, ".droiddeck-rx") != NULL); + printf("shared %d\n", strstr(line, getenv("DROIDDECK_NOEXEC_CACHE_DIR")) != NULL); } return 0; } """ -@unittest.skipUnless(shutil.which("cc") and os.uname().sysname == "Linux", "needs cc on Linux") +@unittest.skipUnless(sys.platform == "linux" and shutil.which("cc"), "needs cc on Linux") class ExecmodRebakeTest(unittest.TestCase): @classmethod def setUpClass(cls): cls.tmp = Path(tempfile.mkdtemp()) cls.lib = cls.tmp / "libnoexec.so" subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-DNOEXEC_TEST", "-o", str(cls.lib), - str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), "-ldl"], check=True) + str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "clockpause.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) (cls.tmp / "execmod.c").write_text(EXECMOD) cls.execmod = cls.tmp / "libexecmod.so" subprocess.run(["cc", "-O2", "-fPIC", "-shared", "-o", str(cls.execmod), str(cls.tmp / "execmod.c")], check=True) @@ -168,9 +181,10 @@ class ExecmodRebakeTest(unittest.TestCase): def tearDown(self): shutil.rmtree(self.tmp / self._testMethodName, ignore_errors=True) - def run_with(self, *libs): + def run_with(self, *libs, extra=None): env = dict(os.environ, LD_PRELOAD=":".join(str(lib) for lib in libs), DROIDDECK_NOEXEC_CACHE_DIR=str(self.cache)) + env.update(extra or {}) result = subprocess.run([str(self.caller), str(self.image)], env=env, capture_output=True, text=True, check=True) return result.stdout.split() @@ -179,7 +193,30 @@ class ExecmodRebakeTest(unittest.TestCase): def test_processes_share_one_copy_of_the_code(self): self.run_with(self.lib, self.execmod) + cached = next(self.cache.iterdir()) + before = cached.stat() self.run_with(self.lib, self.execmod) + after = cached.stat() + self.assertEqual((before.st_ino, before.st_mtime_ns), (after.st_ino, after.st_mtime_ns)) + self.assertEqual(len(os.listdir(self.cache)), 1) + + def test_unavailable_cache_uses_executable_anonymous_memory(self): + self.cache = self.tmp / "missing-parent" / ".droiddeck-rx" + self.assertEqual(self.run_with(self.lib, self.execmod), ["protect", "0", "call", "42", "data", "7", "shared", "0"]) + + def test_failed_fallback_preserves_original_writable_mapping(self): + self.cache = self.tmp / "missing-parent" / ".droiddeck-rx" + self.assertEqual(self.run_with(self.lib, self.execmod, extra={ + "DROIDDECK_TEST_FAIL_ANON": "1", "DROIDDECK_TEST_WRITE_AFTER_FAILURE": "1" + }), ["protect", "13", "data", "9", "shared", "0"]) + + def test_concurrent_processes_can_execute_the_same_relocated_code(self): + env = dict(os.environ, LD_PRELOAD=f"{self.lib}:{self.execmod}", DROIDDECK_NOEXEC_CACHE_DIR=str(self.cache)) + children = [subprocess.Popen([str(self.caller), str(self.image)], env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) for _ in range(8)] + for child in children: + output, error = child.communicate(timeout=10) + self.assertEqual(child.returncode, 0, error) + self.assertIn("call 42", output) self.assertEqual(len(os.listdir(self.cache)), 1) def test_without_the_preload_the_refusal_stands(self): diff --git a/tools/tests/test_ntsync_preload.py b/tools/tests/test_ntsync_preload.py new file mode 100644 index 000000000..a2c50a7d6 --- /dev/null +++ b/tools/tests/test_ntsync_preload.py @@ -0,0 +1,580 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +NTDLL = r""" +#define _GNU_SOURCE +#include <signal.h> +#include <string.h> + +int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen) { + struct sigaction sa, old; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = fn; + sa.sa_flags = SA_SIGINFO | SA_RESTART; + sigemptyset(&sa.sa_mask); + if (sigaction(sig, &sa, NULL) != 0) return -1; + if (sigaction(sig, NULL, &old) != 0) return -1; + *seen = (void *)old.sa_sigaction; + return 0; +} + +int install_oneshot(int sig, void (*fn)(int, siginfo_t *, void *)) { + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = fn; + sa.sa_flags = SA_SIGINFO | SA_RESTART | SA_RESETHAND; + sigemptyset(&sa.sa_mask); + return sigaction(sig, &sa, NULL); +} +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <linux/ioctl.h> +#include <pthread.h> +#include <semaphore.h> +#include <signal.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +struct sem_args { uint32_t count, max; }; +struct mutex_args { uint32_t owner, count; }; +struct event_args { uint32_t manual, signaled; }; +struct wait_args { uint64_t timeout, objs; uint32_t count, index, flags, owner, alert, pad; }; +#define NT_CREATE_SEM _IOW('N', 0x80, struct sem_args) +#define NT_SEM_RELEASE _IOWR('N', 0x81, uint32_t) +#define NT_WAIT_ANY _IOWR('N', 0x82, struct wait_args) +#define NT_WAIT_ALL _IOWR('N', 0x83, struct wait_args) +#define NT_CREATE_MUTEX _IOW('N', 0x84, struct mutex_args) +#define NT_MUTEX_UNLOCK _IOWR('N', 0x85, struct mutex_args) +#define NT_MUTEX_KILL _IOW('N', 0x86, uint32_t) +#define NT_CREATE_EVENT _IOW('N', 0x87, struct event_args) +#define NT_EVENT_SET _IOR('N', 0x88, uint32_t) +#define NT_EVENT_RESET _IOR('N', 0x89, uint32_t) +#define NT_EVENT_PULSE _IOR('N', 0x8a, uint32_t) +#define NT_SEM_READ _IOR('N', 0x8b, struct sem_args) +#define NT_MUTEX_READ _IOR('N', 0x8c, struct mutex_args) +#define NT_EVENT_READ _IOR('N', 0x8d, struct event_args) + +int install_handler(int sig, void (*fn)(int, siginfo_t *, void *), void **seen); +int install_oneshot(int sig, void (*fn)(int, siginfo_t *, void *)); + +static int dev, fails; +#define CHECK(name, cond) do { if (!(cond)) { printf("FAIL %s line %d errno %d\n", name, __LINE__, errno); fails++; } } while (0) + +static uint64_t mono_ns(int64_t delta_ms) { + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); + return (uint64_t)t.tv_sec * 1000000000ull + (uint64_t)t.tv_nsec + (uint64_t)(delta_ms * 1000000); +} + +static int wait_on(unsigned long req, const int *objs, uint32_t count, uint32_t owner, int alert, uint64_t timeout, uint32_t *index) { + struct wait_args w = {timeout, (uintptr_t)objs, count, 0xdead, 0, owner, (uint32_t)alert, 0}; + int r = ioctl(dev, req, &w); + if (index) *index = w.index; + return r < 0 ? errno : 0; +} + +static int event(int manual, int signaled) { + struct event_args a = {(uint32_t)manual, (uint32_t)signaled}; + return ioctl(dev, NT_CREATE_EVENT, &a); +} + +static int sem(uint32_t count, uint32_t max) { + struct sem_args a = {count, max}; + return ioctl(dev, NT_CREATE_SEM, &a); +} + +static int mutex(uint32_t owner, uint32_t count) { + struct mutex_args a = {owner, count}; + return ioctl(dev, NT_CREATE_MUTEX, &a); +} + +static uint32_t prev_of(int fd, unsigned long req, uint32_t in) { + uint32_t v = in; + if (ioctl(fd, req, &v) < 0) return 0xffffffff; + return v; +} + +static void semaphores(void) { + struct sem_args bad = {3, 2}, r; + CHECK("sem_create_invalid", ioctl(dev, NT_CREATE_SEM, &bad) < 0 && errno == EINVAL); + int s = sem(2, 2); + CHECK("sem_create", s >= 0); + uint32_t idx; + CHECK("sem_wait1", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, &idx) == 0 && idx == 0); + CHECK("sem_wait2", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, &idx) == 0); + CHECK("sem_empty", wait_on(NT_WAIT_ANY, &s, 1, 1, 0, 0, NULL) == ETIMEDOUT); + CHECK("sem_release_prev", prev_of(s, NT_SEM_RELEASE, 1) == 0); + CHECK("sem_overflow", prev_of(s, NT_SEM_RELEASE, 2) == 0xffffffff && errno == EOVERFLOW); + CHECK("sem_read", ioctl(s, NT_SEM_READ, &r) == 0 && r.count == 1 && r.max == 2); + close(s); +} + +static void mutexes(void) { + struct mutex_args bad = {0, 1}, r, u; + CHECK("mutex_create_invalid", ioctl(dev, NT_CREATE_MUTEX, &bad) < 0 && errno == EINVAL); + int m = mutex(0, 0); + uint32_t idx; + CHECK("mutex_owner_zero", wait_on(NT_WAIT_ANY, &m, 1, 0, 0, 0, NULL) == EINVAL); + CHECK("mutex_take", wait_on(NT_WAIT_ANY, &m, 1, 7, 0, 0, &idx) == 0 && idx == 0); + CHECK("mutex_recurse", wait_on(NT_WAIT_ANY, &m, 1, 7, 0, 0, NULL) == 0); + CHECK("mutex_other", wait_on(NT_WAIT_ANY, &m, 1, 8, 0, 0, NULL) == ETIMEDOUT); + CHECK("mutex_read", ioctl(m, NT_MUTEX_READ, &r) == 0 && r.owner == 7 && r.count == 2); + u = (struct mutex_args){8, 0}; + CHECK("mutex_unlock_eperm", ioctl(m, NT_MUTEX_UNLOCK, &u) < 0 && errno == EPERM); + u = (struct mutex_args){0, 0}; + CHECK("mutex_unlock_einval", ioctl(m, NT_MUTEX_UNLOCK, &u) < 0 && errno == EINVAL); + u = (struct mutex_args){7, 0}; + CHECK("mutex_unlock_prev", ioctl(m, NT_MUTEX_UNLOCK, &u) == 0 && u.count == 2); + uint32_t who = 8; + CHECK("mutex_kill_eperm", ioctl(m, NT_MUTEX_KILL, &who) < 0 && errno == EPERM); + who = 7; + CHECK("mutex_kill", ioctl(m, NT_MUTEX_KILL, &who) == 0); + CHECK("mutex_read_dead", ioctl(m, NT_MUTEX_READ, &r) < 0 && errno == EOWNERDEAD && r.owner == 0 && r.count == 0); + CHECK("mutex_abandoned", wait_on(NT_WAIT_ANY, &m, 1, 9, 0, 0, &idx) == EOWNERDEAD && idx == 0); + CHECK("mutex_after_abandon", ioctl(m, NT_MUTEX_READ, &r) == 0 && r.owner == 9 && r.count == 1); + close(m); +} + +static void events(void) { + int a = event(0, 1), m = event(1, 0); + struct event_args r; + CHECK("auto_take", wait_on(NT_WAIT_ANY, &a, 1, 1, 0, 0, NULL) == 0); + CHECK("auto_consumed", wait_on(NT_WAIT_ANY, &a, 1, 1, 0, 0, NULL) == ETIMEDOUT); + CHECK("set_prev0", prev_of(m, NT_EVENT_SET, 0) == 0); + CHECK("set_prev1", prev_of(m, NT_EVENT_SET, 0) == 1); + CHECK("manual_kept", wait_on(NT_WAIT_ANY, &m, 1, 1, 0, 0, NULL) == 0 && wait_on(NT_WAIT_ANY, &m, 1, 1, 0, 0, NULL) == 0); + CHECK("reset_prev", prev_of(m, NT_EVENT_RESET, 0) == 1); + CHECK("pulse_prev", prev_of(m, NT_EVENT_PULSE, 0) == 0); + CHECK("pulse_leaves_unsignaled", ioctl(m, NT_EVENT_READ, &r) == 0 && r.manual == 1 && r.signaled == 0); + close(a); + close(m); +} + +static void any_order(void) { + int o[4] = {event(1, 0), sem(1, 5), event(1, 1), sem(0, 5)}; + int alert = event(0, 1); + uint32_t idx; + CHECK("any_lowest", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 1); + CHECK("any_next", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 2); + prev_of(o[2], NT_EVENT_RESET, 0); + CHECK("any_alert", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, &idx) == 0 && idx == 4); + CHECK("any_alert_consumed", wait_on(NT_WAIT_ANY, o, 4, 1, alert, 0, NULL) == ETIMEDOUT); + int dup[3] = {o[3], o[0], o[3]}; + prev_of(o[3], NT_SEM_RELEASE, 1); + CHECK("any_duplicate_lowest", wait_on(NT_WAIT_ANY, dup, 3, 1, 0, 0, &idx) == 0 && idx == 0); + int many[65]; + for (int i = 0; i < 65; i++) many[i] = o[0]; + CHECK("any_too_many", wait_on(NT_WAIT_ANY, many, 65, 1, 0, 0, NULL) == EINVAL); + int badfd = 0; + CHECK("any_invalid_fd", wait_on(NT_WAIT_ANY, &badfd, 1, 1, 0, 0, NULL) == EINVAL); + CHECK("any_timeout", wait_on(NT_WAIT_ANY, o, 1, 1, 0, mono_ns(30), NULL) == ETIMEDOUT); + for (int i = 0; i < 4; i++) close(o[i]); + close(alert); +} + +static void all_semantics(void) { + int s = sem(1, 5), e = event(0, 0), m = mutex(0, 0); + int o[3] = {s, e, m}; + struct sem_args sr; + uint32_t idx; + CHECK("all_not_ready", wait_on(NT_WAIT_ALL, o, 3, 4, 0, 0, NULL) == ETIMEDOUT); + CHECK("all_untouched", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 1); + prev_of(e, NT_EVENT_SET, 0); + CHECK("all_ready", wait_on(NT_WAIT_ALL, o, 3, 4, 0, 0, &idx) == 0 && idx == 0); + CHECK("all_took_sem", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 0); + int dup[2] = {s, s}; + CHECK("all_duplicate", wait_on(NT_WAIT_ALL, dup, 2, 4, 0, 0, NULL) == EINVAL); + int alert = event(1, 1); + CHECK("all_alert", wait_on(NT_WAIT_ALL, o, 3, 4, alert, 0, &idx) == 0 && idx == 3); + close(s); + close(e); + close(m); + close(alert); +} + +static int wake_obj; +static uint32_t wake_index; +static int wake_ret; +static void *waiter(void *p) { + int all = (int)(intptr_t)p; + int objs[2] = {wake_obj, wake_obj + 0}; + wake_ret = wait_on(all ? NT_WAIT_ALL : NT_WAIT_ANY, objs, 1, 3, 0, UINT64_MAX, &wake_index); + return NULL; +} + +static void cross_thread(void) { + wake_obj = event(0, 0); + pthread_t t; + pthread_create(&t, NULL, waiter, NULL); + usleep(30000); + prev_of(wake_obj, NT_EVENT_SET, 0); + pthread_join(t, NULL); + CHECK("thread_wake", wake_ret == 0 && wake_index == 0); + struct event_args r; + CHECK("thread_auto_reset", ioctl(wake_obj, NT_EVENT_READ, &r) == 0 && r.signaled == 0); + close(wake_obj); + int s = sem(0, 10); + wake_obj = s; + pthread_t ts[3]; + for (int i = 0; i < 3; i++) pthread_create(&ts[i], NULL, waiter, NULL); + usleep(30000); + CHECK("sem_release_three", prev_of(s, NT_SEM_RELEASE, 3) == 0); + for (int i = 0; i < 3; i++) pthread_join(ts[i], NULL); + struct sem_args sr; + CHECK("sem_all_taken", ioctl(s, NT_SEM_READ, &sr) == 0 && sr.count == 0); + close(s); +} + +static void cross_process(void) { + int sv[2]; + CHECK("socketpair", socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + int inherited = event(0, 0); + pid_t pid = fork(); + if (pid == 0) { + uint32_t idx; + int r1 = wait_on(NT_WAIT_ANY, &inherited, 1, 5, 0, mono_ns(5000), &idx); + char c; + struct iovec io = {&c, 1}; + char cbuf[CMSG_SPACE(sizeof(int))]; + struct msghdr msg = {0}; + msg.msg_iov = &io; + msg.msg_iovlen = 1; + msg.msg_control = cbuf; + msg.msg_controllen = sizeof(cbuf); + int got = -1; + if (recvmsg(sv[1], &msg, 0) == 1) memcpy(&got, CMSG_DATA(CMSG_FIRSTHDR(&msg)), sizeof(int)); + int r2 = wait_on(NT_WAIT_ANY, &got, 1, 5, 0, mono_ns(5000), NULL); + _exit(r1 == 0 && r2 == 0 ? 0 : 1); + } + usleep(30000); + prev_of(inherited, NT_EVENT_SET, 0); + int sent = sem(0, 1); + char c = 'x'; + struct iovec io = {&c, 1}; + char cbuf[CMSG_SPACE(sizeof(int))]; + struct msghdr msg = {0}; + msg.msg_iov = &io; + msg.msg_iovlen = 1; + msg.msg_control = cbuf; + msg.msg_controllen = sizeof(cbuf); + struct cmsghdr *cm = CMSG_FIRSTHDR(&msg); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SCM_RIGHTS; + cm->cmsg_len = CMSG_LEN(sizeof(int)); + memcpy(CMSG_DATA(cm), &sent, sizeof(int)); + sendmsg(sv[0], &msg, 0); + usleep(30000); + prev_of(sent, NT_SEM_RELEASE, 1); + int status = 0; + waitpid(pid, &status, 0); + CHECK("process_wake", WIFEXITED(status) && WEXITSTATUS(status) == 0); + close(inherited); + close(sent); + close(sv[0]); + close(sv[1]); +} + +static int ping_obj, pong_obj, stress_sem; +static void *stress_ponger(void *p) { + long n = (long)p; + uint32_t v; + for (long i = 0; i < n; i++) { + if (wait_on(NT_WAIT_ANY, &ping_obj, 1, 21, 0, UINT64_MAX, NULL) != 0) return (void *)1; + ioctl(pong_obj, NT_EVENT_SET, &v); + } + return NULL; +} +static void *stress_hammer(void *p) { + long n = (long)p; + for (long i = 0; i < n; i++) { + if (wait_on(NT_WAIT_ANY, &stress_sem, 1, 22, 0, UINT64_MAX, NULL) != 0) return (void *)1; + uint32_t c = 1; + ioctl(stress_sem, NT_SEM_RELEASE, &c); + } + return NULL; +} + +static void stress(void) { + long rounds = 20000; + ping_obj = event(0, 0); + pong_obj = event(0, 0); + pthread_t t; + void *bad = NULL; + pthread_create(&t, NULL, stress_ponger, (void *)rounds); + uint32_t v; + int ok = 1; + for (long i = 0; i < rounds && ok; i++) { + ioctl(ping_obj, NT_EVENT_SET, &v); + ok = wait_on(NT_WAIT_ANY, &pong_obj, 1, 20, 0, UINT64_MAX, NULL) == 0; + } + pthread_join(t, &bad); + CHECK("stress_pingpong", ok && bad == NULL); + stress_sem = sem(1, 1); + pthread_t th[4]; + for (int i = 0; i < 4; i++) pthread_create(&th[i], NULL, stress_hammer, (void *)5000L); + int hammer_ok = 1; + for (int i = 0; i < 4; i++) { + pthread_join(th[i], &bad); + hammer_ok &= bad == NULL; + } + struct sem_args sr; + CHECK("stress_contended", hammer_ok && ioctl(stress_sem, NT_SEM_READ, &sr) == 0 && sr.count == 1); + close(ping_obj); + close(pong_obj); + close(stress_sem); +} + +static int busy_obj; +static volatile int handled, stop_worker; +static sem_t parked, unpark; +static void reentrant(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t v = 0; + ioctl(busy_obj, NT_EVENT_SET, &v); + handled++; +} +static void suspending(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + sem_post(&parked); + while (sem_wait(&unpark) != 0) {} + handled++; +} +static void *worker(void *p) { + (void)p; + uint32_t v; + while (!stop_worker) { + ioctl(busy_obj, NT_EVENT_SET, &v); + wait_on(NT_WAIT_ANY, &busy_obj, 1, 11, 0, 0, NULL); + } + return NULL; +} + +static void signals(void) { + void *seen = NULL; + busy_obj = event(0, 0); + CHECK("install_reentrant", install_handler(SIGUSR1, reentrant, &seen) == 0); + CHECK("query_original", seen == (void *)reentrant); + pthread_t w; + stop_worker = 0; + handled = 0; + pthread_create(&w, NULL, worker, NULL); + for (int i = 0; i < 2000; i++) { + pthread_kill(w, SIGUSR1); + if (i % 64 == 0) usleep(100); + } + usleep(20000); + stop_worker = 1; + pthread_join(w, NULL); + CHECK("reentrant_ran", handled > 0); + sem_init(&parked, 0, 0); + sem_init(&unpark, 0, 0); + CHECK("install_suspending", install_handler(SIGUSR1, suspending, &seen) == 0); + stop_worker = 0; + handled = 0; + pthread_create(&w, NULL, worker, NULL); + uint32_t v; + for (int i = 0; i < 300; i++) { + pthread_kill(w, SIGUSR1); + while (sem_wait(&parked) != 0) {} + ioctl(busy_obj, NT_EVENT_SET, &v); + wait_on(NT_WAIT_ANY, &busy_obj, 1, 12, 0, 0, NULL); + sem_post(&unpark); + } + stop_worker = 1; + pthread_join(w, NULL); + CHECK("suspend_ran", handled == 300); + close(busy_obj); +} + +static volatile int burst_count; +static void bursting(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t v = 0; + ioctl(busy_obj, NT_EVENT_SET, &v); + __atomic_add_fetch(&burst_count, 1, __ATOMIC_RELAXED); +} + +static void bursts(void) { + void *seen = NULL; + busy_obj = event(0, 0); + for (int s = 0; s < 8; s++) CHECK("install_burst", install_handler(SIGRTMIN + s, bursting, &seen) == 0); + pthread_t w; + stop_worker = 0; + burst_count = 0; + pthread_create(&w, NULL, worker, NULL); + union sigval val = {0}; + int sent = 0; + for (int i = 0; i < 400; i++) { + for (int s = 0; s < 8; s++) + if (pthread_sigqueue(w, SIGRTMIN + s, val) == 0) sent++; + usleep(200); + } + for (int i = 0; i < 2000 && __atomic_load_n(&burst_count, __ATOMIC_RELAXED) < sent; i++) usleep(1000); + stop_worker = 1; + pthread_join(w, NULL); + CHECK("burst_all_handled", burst_count == sent && sent > 0); + close(busy_obj); +} + +static volatile int oneshot_count; +static void oneshot(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + __atomic_add_fetch(&oneshot_count, 1, __ATOMIC_RELAXED); +} + +static void oneshots(void) { + busy_obj = event(0, 0); + pthread_t w; + stop_worker = 0; + oneshot_count = 0; + pthread_create(&w, NULL, worker, NULL); + int fired = 0; + for (int i = 0; i < 300; i++) { + if (install_oneshot(SIGWINCH, oneshot) != 0) break; + int before = __atomic_load_n(&oneshot_count, __ATOMIC_RELAXED); + pthread_kill(w, SIGWINCH); + fired++; + for (int j = 0; j < 2000 && __atomic_load_n(&oneshot_count, __ATOMIC_RELAXED) == before; j++) usleep(50); + } + stop_worker = 1; + pthread_join(w, NULL); + CHECK("oneshot_handlers_run", oneshot_count == fired && fired == 300); + close(busy_obj); +} + +static int outer_obj, inner_obj, other_dev, other_obj; +static volatile int nested_ok, nested_done, outer_done; +static void nesting(int sig, siginfo_t *si, void *uc) { + (void)sig; (void)si; (void)uc; + uint32_t idx = 99; + int ok = wait_on(NT_WAIT_ANY, &inner_obj, 1, 21, 0, mono_ns(50), &idx) == 0 && idx == 0; + struct wait_args w = {mono_ns(2), (uintptr_t)&other_obj, 1, 0xdead, 0, 22, 0, 0}; + ok = ok && ioctl(other_dev, NT_WAIT_ANY, &w) < 0 && errno == ETIMEDOUT; + nested_ok += ok; + __atomic_store_n(&nested_done, 1, __ATOMIC_RELEASE); +} +static void *outer_waiter(void *p) { + struct wait_args w = {mono_ns(3000), (uintptr_t)&outer_obj, 1, 99, 0, 23, 0, 0}; + int r; + do { r = ioctl(dev, NT_WAIT_ANY, &w); } while (r < 0 && errno == EINTR); + *(int *)p = r == 0 && w.index == 0; + __atomic_store_n(&outer_done, 1, __ATOMIC_RELEASE); + return NULL; +} + +static void nested_waits(void) { + void *seen = NULL; + other_dev = open("/dev/ntsync", O_RDWR | O_CLOEXEC); + CHECK("second_device", other_dev >= 0); + struct event_args ea = {0, 0}; + other_obj = ioctl(other_dev, NT_CREATE_EVENT, &ea); + inner_obj = event(1, 1); + CHECK("install_nesting", install_handler(SIGUSR2, nesting, &seen) == 0); + int good = 0, early = 0; + nested_ok = 0; + for (int i = 0; i < 40; i++) { + outer_obj = event(0, 0); + int result = 0; + pthread_t t; + nested_done = outer_done = 0; + pthread_create(&t, NULL, outer_waiter, &result); + usleep(5000); + pthread_kill(t, SIGUSR2); + while (!__atomic_load_n(&nested_done, __ATOMIC_ACQUIRE)) usleep(200); + usleep(5000); + early += __atomic_load_n(&outer_done, __ATOMIC_ACQUIRE); + uint32_t v = 0; + ioctl(outer_obj, NT_EVENT_SET, &v); + pthread_join(t, NULL); + good += result; + close(outer_obj); + } + CHECK("outer_wait_not_woken_by_nested_wait", early == 0); + CHECK("outer_wait_survives_nested_waits", good == 40); + CHECK("nested_waits_complete", nested_ok == 40); + close(inner_obj); + close(other_obj); + close(other_dev); +} + +int main(void) { + alarm(60); + dev = open("/dev/ntsync", O_RDWR | O_CLOEXEC); + if (dev < 0) { + printf("no device %d\n", errno); + return 1; + } + semaphores(); + mutexes(); + events(); + any_order(); + all_semantics(); + cross_thread(); + cross_process(); + stress(); + signals(); + bursts(); + oneshots(); + nested_waits(); + printf("done fails=%d\n", fails); + return fails != 0; +} +""" + + +class NtsyncPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + if not shutil.which("cc"): + raise unittest.SkipTest("no compiler") + cls.tmp = tempfile.TemporaryDirectory() + tmp = Path(cls.tmp.name) + (tmp / "ntdll.c").write_text(NTDLL) + (tmp / "prog.c").write_text(PROGRAM) + sources = sorted(str(p) for p in PRELOAD.glob("*.c")) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(tmp / "libblsession.so"), *sources, "-ldl"], + check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(tmp / "ntdll.so"), str(tmp / "ntdll.c")], check=True) + subprocess.run(["cc", "-O1", "-pthread", "-o", str(tmp / "prog"), str(tmp / "prog.c"), str(tmp / "ntdll.so"), + "-Wl,-rpath," + str(tmp)], check=True) + cls.program = tmp / "prog" + cls.preload = tmp / "libblsession.so" + + @classmethod + def tearDownClass(cls): + cls.tmp.cleanup() + + def run_program(self): + env = dict(os.environ, LD_PRELOAD=str(self.preload), BL_SYNC="1") + return subprocess.run([str(self.program)], env=env, capture_output=True, text=True, timeout=90) + + def test_emulation_matches_the_ntsync_driver(self): + out = self.run_program() + self.assertEqual(out.returncode, 0, out.stdout + out.stderr) + self.assertIn("done fails=0", out.stdout) + + def test_repeated_runs_stay_consistent(self): + for _ in range(3): + out = self.run_program() + self.assertEqual(out.returncode, 0, out.stdout + out.stderr) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_openat2_preload.py b/tools/tests/test_openat2_preload.py index eb27bcc7e..cbaefaab2 100644 --- a/tools/tests/test_openat2_preload.py +++ b/tools/tests/test_openat2_preload.py @@ -9,8 +9,6 @@ import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" FASTPATH = Path(__file__).resolve().parents[1] / "proot/fastpath/fastpath.c" -# Opens each "<dirfd>\t<flags>\t<path>" case with openat2(RESOLVE_IN_ROOT) as FEX does: first through the kernel's own -# openat2 on argv[1] when it has one, then, with openat2 failing ENOSYS as under proot, through the preload on argv[2]. PROGRAM = r""" #define _GNU_SOURCE #include <dlfcn.h> @@ -94,7 +92,7 @@ COUNTER = r""" #include <sys/stat.h> #include <unistd.h> -static int opens, stats, links; +static int opens, stats, links, statxs; int openat(int dirfd, const char *path, int flags, ...) { va_list args; @@ -120,8 +118,13 @@ ssize_t readlinkat(int dirfd, const char *path, char *buf, size_t size) { return ((ssize_t (*)(int, const char *, char *, size_t))dlsym(RTLD_NEXT, "readlinkat"))(dirfd, path, buf, size); } +int statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *out) { + statxs++; + return ((int (*)(int, const char *, int, unsigned int, struct statx *))dlsym(RTLD_NEXT, "statx"))(dirfd, path, flags, mask, out); +} + __attribute__((destructor)) static void report(void) { - fprintf(stderr, "calls %d %d %d\n", opens, stats, links); + fprintf(stderr, "calls %d %d %d %d\n", opens, stats, links, statxs); } """ @@ -141,9 +144,85 @@ int main(int argc, char **argv) { } """ +WRAPPER = r""" +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/filter.h> +#include <linux/seccomp.h> +#include <stddef.h> +#include <stdint.h> +#include <stdio.h> +#include <sys/prctl.h> +#include <sys/syscall.h> +#include <unistd.h> + +#ifndef SYS_openat2 +#define SYS_openat2 437 +#endif + +struct how { uint64_t flags, mode, resolve; }; + +int main(int argc, char **argv) { + struct sock_filter filter[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, SYS_openat2, 0, 1), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ERRNO | ENOSYS), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog prog = {sizeof(filter) / sizeof(filter[0]), filter}; + if (argc < 3 || prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog)) return 3; + int (*call)(int, const char *, struct how *, size_t) = (int (*)(int, const char *, struct how *, size_t))dlsym(RTLD_DEFAULT, "openat2"); + if (!call) return 4; + int dir = open(argv[1], O_PATH | O_DIRECTORY | O_CLOEXEC); + struct how h = {O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, 0644, 0x08}; + int fd = call(dir, argv[2], &h, sizeof(h)); + if (fd < 0) { + printf("ERR %d\n", errno); + return 1; + } + printf("OK\n"); + return close(fd); +} +""" + +RAW_LOOKUP = r""" +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <unistd.h> + +#ifdef SYS_newfstatat +#define RAW_FSTATAT SYS_newfstatat +#else +#define RAW_FSTATAT SYS_fstatat64 +#endif + +int main(int argc, char **argv) { + struct stat st; + struct statx sx; + char link[64] = ""; + if (syscall(RAW_FSTATAT, AT_FDCWD, argv[1], &st, 0) != 0) return 1; + if (syscall(RAW_FSTATAT, AT_FDCWD, argv[2], &st, 0) != -1 || errno != ENOENT) return 2; + long n = syscall(SYS_readlinkat, AT_FDCWD, argv[3], link, sizeof(link) - 1); + if (n <= 0) return 3; + sx.stx_size = 0; + long found = syscall(SYS_statx, AT_FDCWD, argv[1], 0, STATX_SIZE, &sx); + int have_statx = !(found == -1 && errno == ENOSYS); + if (have_statx && found != 0) return 4; + long missing = syscall(SYS_statx, AT_FDCWD, argv[2], 0, STATX_SIZE, &sx); + if (have_statx && (missing != -1 || errno != ENOENT)) return 5; + printf("%lld %.*s %llu\n", (long long)st.st_size, (int)n, link, (unsigned long long)sx.stx_size); + return 0; +} +""" + O_PATH = getattr(os, "O_PATH", 0o10000000) -# (dirfd: r = the tree, o = "/"), flags, path, expected: a path in the tree, an errno name, or "proc" for a file outside it. CASES = [ ("r", os.O_RDONLY, "etc/alternatives/hn", "etc/hostname"), ("r", os.O_RDONLY, "/lib64/x86_64-linux-gnu/libfoo.so.1", "usr/lib/x86_64-linux-gnu/libfoo.so.1.2"), @@ -174,7 +253,6 @@ CASES = [ ("o", os.O_RDONLY, "proc/self/status", "proc"), ] -# Only the preload: an absolute link to a path missing in the tree but present outside it, as droiddeck-fex's rootfs has. HOST_CASES = [ ("r", os.O_RDONLY, "lib/x86_64-linux-gnu/libbar.so.2", "host:libbar.so.2"), ("r", os.O_RDONLY, "hostdir/sub/data", "host:sub/data"), @@ -230,7 +308,7 @@ class Openat2PreloadTest(unittest.TestCase): cls.tmp = Path(tempfile.mkdtemp()) cls.lib = cls.tmp / "libopenat2.so" subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-o", str(cls.lib), - str(PRELOAD / "robust.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "robust.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) source = cls.tmp / "openat2.c" source.write_text(PROGRAM) subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "openat2"), str(source), "-ldl"], check=True) @@ -268,6 +346,14 @@ class Openat2PreloadTest(unittest.TestCase): cls.raw = subprocess.run([str(cls.tmp / "raw_open"), str(tree / "etc/hostname"), str(tree / "missing")], capture_output=True, text=True, timeout=60, env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libblfastpath.so"))) + lookup = cls.tmp / "raw_lookup.c" + lookup.write_text(RAW_LOOKUP) + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "raw_lookup"), str(lookup)], check=True) + cls.lookup_args = [str(tree / "etc/hostname"), str(tree / "missing"), str(tree / "etc/alternatives/hn")] + cls.lookup_plain = subprocess.run([str(cls.tmp / "raw_lookup"), *cls.lookup_args], capture_output=True, text=True, + timeout=60, env=dict(os.environ, LD_PRELOAD=str(cls.lib))) + cls.lookup = subprocess.run([str(cls.tmp / "raw_lookup"), *cls.lookup_args], capture_output=True, text=True, timeout=60, + env=dict(os.environ, LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "fp/libblfastpath.so"))) (cls.tmp / "real").mkdir() subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-o", str(cls.tmp / "real/libblfastpath.so"), str(FASTPATH), "-ldl"], check=True) @@ -279,6 +365,20 @@ class Openat2PreloadTest(unittest.TestCase): LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libblfastpath.so"))) except subprocess.TimeoutExpired: cls.fex = None + wrapper = cls.tmp / "wrapper.c" + wrapper.write_text(WRAPPER) + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "wrapper"), str(wrapper), "-ldl"], check=True) + (cls.tmp / "extract").mkdir() + cls.wrapper = subprocess.run([str(cls.tmp / "wrapper"), str(cls.tmp / "extract"), "file"], capture_output=True, + text=True, timeout=20, env=dict(os.environ, LD_PRELOAD=str(cls.lib))) + (cls.tmp / "fex-lookup").mkdir() + shutil.copy(cls.tmp / "raw_lookup", cls.tmp / "fex-lookup/FEX") + try: + cls.fex_lookup = subprocess.run([str(cls.tmp / "fex-lookup/FEX"), *cls.lookup_args], capture_output=True, text=True, + timeout=20, env=dict(os.environ, PROOT_FP_ROOT="/", PROOT_FP_KEY="test", + LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libblfastpath.so"))) + except subprocess.TimeoutExpired: + cls.fex_lookup = None @classmethod def tearDownClass(cls): @@ -295,18 +395,33 @@ class Openat2PreloadTest(unittest.TestCase): def test_the_walk_asks_the_fast_path_when_it_is_loaded(self): self.assertEqual(self.counted, self.preload) - self.assertTrue(all(n > 0 for n in self.calls), self.calls) + self.assertTrue(all(n > 0 for n in self.calls[:3]), self.calls) def test_a_raw_openat_syscall_asks_the_fast_path_too(self): self.assertEqual(self.raw.returncode, 0, self.raw.stderr) self.assertEqual(self.raw.stdout, "inside\n") - self.assertEqual(self.raw.stderr.split("calls ")[-1].split(), ["2", "0", "0"]) + self.assertEqual(self.raw.stderr.split("calls ")[-1].split(), ["2", "0", "0", "0"]) + + def test_raw_stat_readlink_and_statx_syscalls_ask_the_fast_path(self): + self.assertEqual(self.lookup_plain.returncode, 0, self.lookup_plain.stderr) + self.assertEqual(self.lookup.returncode, 0, self.lookup.stderr) + self.assertEqual(self.lookup.stdout, self.lookup_plain.stdout) + self.assertEqual(self.lookup.stderr.split("calls ")[-1].split(), ["0", "2", "1", "2"]) + + def test_raw_lookups_in_fex_answer_through_the_real_fast_path(self): + self.assertIsNotNone(self.fex_lookup, "hung") + self.assertEqual(self.fex_lookup.returncode, 0, self.fex_lookup.stderr) + self.assertEqual(self.fex_lookup.stdout, self.lookup_plain.stdout) def test_a_first_raw_openat_in_fex_does_not_wait_on_the_fast_path_starting(self): self.assertIsNotNone(self.fex, "hung") self.assertEqual(self.fex.returncode, 0, self.fex.stderr) self.assertEqual(self.fex.stdout, "inside\n") + def test_the_libc_openat2_wrapper_creates_files_without_openat2(self): + self.assertEqual(self.wrapper.returncode, 0, self.wrapper.stdout + self.wrapper.stderr) + self.assertTrue((self.tmp / "extract/file").exists()) + def test_the_kernel_agrees(self): if self.kernel is None: self.skipTest("this kernel or sandbox has no openat2") diff --git a/tools/tests/test_output_refresh.py b/tools/tests/test_output_refresh.py index 7b252649e..456e230d4 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_pack_downloads.py b/tools/tests/test_pack_downloads.py new file mode 100644 index 000000000..0b5eb6060 --- /dev/null +++ b/tools/tests/test_pack_downloads.py @@ -0,0 +1,125 @@ +import hashlib +import http.server +import json +import os +from pathlib import Path +import shutil +import socket +import subprocess +import tempfile +import threading +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +FETCH = ROOT / 'tools/packs/fetch-verified.sh' + + +class PackDownloadsTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + self.cache = self.root / 'cache' + self.cache.mkdir() + self.destination = self.root / 'download' + self.remote = self.root / 'remote' + self.remote.write_bytes(b'verified input') + self.checksum = hashlib.sha256(self.remote.read_bytes()).hexdigest() + self.log = self.root / 'curl.log' + tool = self.root / 'bin/curl' + tool.parent.mkdir() + tool.write_text('#!/usr/bin/env python3\nimport json,os,shutil,sys\n' + 'args=sys.argv[1:]\n' + 'with open(os.environ["CURL_LOG"],"a") as f: f.write(json.dumps(args)+"\\n")\n' + 'shutil.copyfile(os.environ["REMOTE"],args[args.index("-o")+1])\n') + tool.chmod(0o755) + self.env = dict(os.environ, DROIDDECK_PACK_CACHE=str(self.cache), CURL_LOG=str(self.log), + REMOTE=str(self.remote), PATH=str(tool.parent) + os.pathsep + os.environ['PATH']) + + def fetch(self, checksum=None, url='https://example.test/pinned', env=None): + return subprocess.run(['bash', str(FETCH), url, checksum or self.checksum, str(self.destination)], + env=env or self.env, capture_output=True, text=True) + + def test_cold_download_then_warm_reuse_and_corruption_repair(self): + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 1) + self.assertEqual(self.destination.read_bytes(), b'verified input') + (self.cache / self.checksum).write_bytes(b'corrupt') + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + self.assertEqual((self.cache / self.checksum).read_bytes(), b'verified input') + + def test_directory_cache_entry_is_replaced_only_after_verification(self): + entry = self.cache / self.checksum + entry.mkdir() + sentinel = entry / 'old-entry' + sentinel.write_bytes(b'preserve until verified') + self.remote.write_bytes(b'tampered download') + self.assertNotEqual(self.fetch().returncode, 0) + self.assertEqual(sentinel.read_bytes(), b'preserve until verified') + self.assertFalse(self.destination.exists()) + self.remote.write_bytes(b'verified input') + result = self.fetch() + self.assertEqual(result.returncode, 0, result.stderr) + self.assertTrue(entry.is_file()) + self.assertEqual(entry.read_bytes(), b'verified input') + self.assertEqual(self.destination.read_bytes(), b'verified input') + self.assertEqual(list(self.cache.iterdir()), [entry]) + self.assertEqual(self.fetch().returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + + def test_changed_pin_cannot_reuse_old_bytes(self): + self.assertEqual(self.fetch().returncode, 0) + self.remote.write_bytes(b'new approved input') + updated = hashlib.sha256(self.remote.read_bytes()).hexdigest() + self.assertEqual(self.fetch(updated).returncode, 0) + self.assertEqual(len(self.log.read_text().splitlines()), 2) + self.assertEqual(self.destination.read_bytes(), b'new approved input') + + def test_bad_download_is_not_cached_or_written(self): + self.remote.write_bytes(b'tampered download') + self.assertNotEqual(self.fetch().returncode, 0) + self.assertFalse((self.cache / self.checksum).exists()) + self.assertFalse(self.destination.exists()) + self.assertEqual(list(self.cache.iterdir()), []) + arguments = json.loads(self.log.read_text()) + self.assertIn('--retry-all-errors', arguments) + self.assertIn('--max-time', arguments) + self.assertIn('--retry-max-time', arguments) + + def test_connection_reset_retries_then_verifies_real_download(self): + if not shutil.which('curl'): + self.skipTest('curl required for transport test') + content = self.remote.read_bytes() + attempts = [] + + class Handler(http.server.BaseHTTPRequestHandler): + def do_GET(self): + attempts.append(True) + if len(attempts) == 1: + self.connection.shutdown(socket.SHUT_RDWR) + self.connection.close() + return + self.send_response(200) + self.send_header('Content-Length', str(len(content))) + self.end_headers() + self.wfile.write(content) + + def log_message(self, *args): + pass + + server = http.server.ThreadingHTTPServer(('127.0.0.1', 0), Handler) + thread = threading.Thread(target=server.serve_forever, daemon=True) + thread.start() + try: + env = dict(self.env, PATH=os.environ['PATH']) + result = self.fetch(url=f'http://127.0.0.1:{server.server_port}/input', env=env) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertGreaterEqual(len(attempts), 2) + self.assertEqual(self.destination.read_bytes(), content) + finally: + server.shutdown() + server.server_close() + thread.join() diff --git a/tools/tests/test_pacman_shared_files.py b/tools/tests/test_pacman_shared_files.py new file mode 100644 index 000000000..775688a97 --- /dev/null +++ b/tools/tests/test_pacman_shared_files.py @@ -0,0 +1,71 @@ +import io +import os +import runpy +import subprocess +import tarfile +import tempfile +import unittest +from pathlib import Path + +PACMAN = Path(__file__).resolve().parents[1] / "desktop-kde/overlay/usr/share/droiddeck/pacman" + + +class PacmanSharedFilesTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.top = Path(temp.name) + + def keep(self, action): + lib = self.top / "lib" + lib.mkdir(exist_ok=True) + script = (PACMAN / "keep").read_text().replace("/var/lib/pacman", str(lib)) + subprocess.run(["bash", "-c", script, "keep", action], check=True, timeout=30) + return lib + + def test_an_upgrade_that_drops_a_shared_file_gets_it_back(self): + shared = self.top / "usr/lib/libshared.so" + shared.parent.mkdir(parents=True) + shared.write_text("shared") + lib = self.top / "lib" + lib.mkdir() + (lib / "droiddeck-shared-files").write_text("%s\n%s\n" % (shared, self.top / "usr/lib/never-there")) + self.keep("save") + shared.unlink() + self.keep("restore") + self.assertEqual("shared", shared.read_text()) + self.assertFalse((self.top / "usr/lib/never-there").exists()) + self.assertFalse((lib / "droiddeck-shared-keep").exists()) + + def test_a_backup_for_a_file_still_missing_survives_the_next_save(self): + shared = self.top / "usr/lib/libshared.so" + shared.parent.mkdir(parents=True) + shared.write_text("shared") + lib = self.top / "lib" + lib.mkdir() + (lib / "droiddeck-shared-files").write_text("%s\n" % shared) + self.keep("save") + shared.unlink() + self.keep("save") + self.keep("restore") + self.assertEqual("shared", shared.read_text()) + + def test_only_identical_files_are_taken_over(self): + adopt = runpy.run_path(str(PACMAN / "adopt"), run_name="adopt") + package = io.BytesIO() + with tarfile.open(fileobj=package, mode="w") as archive: + for name, data in (("same", b"one"), ("different", b"two")): + info = tarfile.TarInfo(name) + info.size = len(data) + archive.addfile(info, io.BytesIO(data)) + (self.top / "same").write_bytes(b"one") + (self.top / "different").write_bytes(b"other") + package.seek(0) + with tarfile.open(fileobj=package) as archive: + members = {m.name: m for m in archive} + self.assertTrue(adopt["same"](archive, members["same"], str(self.top / "same"))) + self.assertFalse(adopt["same"](archive, members["different"], str(self.top / "different"))) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_picture_position_mapping.py b/tools/tests/test_picture_position_mapping.py index 597fec938..2c9eb8e32 100644 --- a/tools/tests/test_picture_position_mapping.py +++ b/tools/tests/test_picture_position_mapping.py @@ -1,4 +1,3 @@ -"""Test the renderer's actual map and inverse map without a Vulkan device.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_pointer_release.py b/tools/tests/test_pointer_release.py index 9da5672e3..37e096c7a 100644 --- a/tools/tests/test_pointer_release.py +++ b/tools/tests/test_pointer_release.py @@ -1,4 +1,3 @@ -"""Exercise the compositor's real button dispatcher with a recording Wayland sink.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py new file mode 100644 index 000000000..6629d1ab2 --- /dev/null +++ b/tools/tests/test_preload_snapshots.py @@ -0,0 +1,186 @@ +import copy +import importlib.util +import io +import json +import os +from pathlib import Path +import subprocess +import tarfile +import tempfile +import unittest +from unittest.mock import patch + +SPEC = importlib.util.spec_from_file_location('preload_snapshots', Path(__file__).resolve().parents[1] / 'components/preloads.py') +snapshots = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(snapshots) + + +def archive(files): + stream = io.BytesIO() + with tarfile.open(fileobj=stream, mode='w:gz') as tar: + for name, content in files.items(): + entry = tarfile.TarInfo(name) + entry.size = len(content) + tar.addfile(entry, io.BytesIO(content)) + return stream.getvalue() + + +class PreloadSnapshotTest(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.root = Path(directory.name) + for group in snapshots.INPUTS: + for name in snapshots.source_files(group): + if name.startswith('@'): + continue + target = self.root / name + target.parent.mkdir(parents=True, exist_ok=True) + target.write_bytes((snapshots.ROOT / name).read_bytes()) + recipe = 'tools/components/build-arm64-preloads.sh' + (self.root / recipe).parent.mkdir(parents=True, exist_ok=True) + (self.root / recipe).write_text((snapshots.ROOT / recipe).read_text()) + x86 = 'tools/components/recipes/x86-preloads.sh' + (self.root / x86).parent.mkdir(parents=True, exist_ok=True) + (self.root / x86).write_text((snapshots.ROOT / x86).read_text()) + (self.root / '.github/workflows').mkdir(parents=True) + (self.root / '.github/workflows/build.yml').write_text((snapshots.ROOT / '.github/workflows/build.yml').read_text()) + self.git('init', '-q') + self.git('config', 'core.autocrlf', 'false') + self.git('config', 'user.name', 'Test Developer') + self.git('config', 'user.email', 'test@example.test') + self.git('add', '.') + self.binaries = {name: ('verified-' + name).encode() for name in snapshots.FILES} + self.content = archive(self.binaries) + self.data = dict(version=1, origin=dict(run=123, commit='abc', artifact=456, artifact_sha256='0' * 64), + groups={g: snapshots.source_files(g, self.root) for g in snapshots.INPUTS}, + arm64_recipe=snapshots.recipe(self.root), x86_recipe=snapshots.x86_recipe(self.root), + archive_sha256=snapshots.sha(self.content), + outputs={name: snapshots.sha(value) for name, value in self.binaries.items()}) + (self.root / snapshots.LOCK).write_text(json.dumps(self.data)) + self.git('add', '.') + self.git('commit', '-qm', 'Approved baseline') + self.base = self.git('rev-parse', 'HEAD').strip() + + def git(self, *args): + return subprocess.check_output(['git', *args], cwd=self.root, text=True) + + def restore(self, base=None): + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=base or self.base, FORCE_PRELOAD_REBUILD='false'), \ + patch.object(snapshots.urllib.request, 'urlopen', return_value=io.BytesIO(self.content)) as fetch, \ + patch.object(snapshots, 'prove_origin') as prove: + result = snapshots.restore(self.root) + return result, fetch, prove + + def test_reviewed_unchanged_binaries_reused_and_written(self): + result, fetch, prove = self.restore() + self.assertEqual(result, dict(arm64=True, x86=True)) + prove.assert_not_called() + fetch.assert_called_once() + for name, value in self.binaries.items(): + self.assertEqual((self.root / 'app/src/main/assets/linuxfs' / name).read_bytes(), value) + + def test_changed_common_source_requires_both_rebuilds(self): + path = self.root / snapshots.COMMON[0] + path.write_text(path.read_text() + '\n// Changed source\n') + result, fetch, prove = self.restore() + self.assertEqual(result, dict(arm64=False, x86=False)) + fetch.assert_not_called() + prove.assert_not_called() + + def test_new_transitive_header_is_an_input(self): + source = self.root / snapshots.COMMON[0] + source.write_text(source.read_text() + '\n#include "new-header.h"\n') + header = source.with_name('new-header.h') + header.write_text('#define VALUE 1\n') + before = snapshots.source_files('arm64', self.root) + header.write_text('#define VALUE 2\n') + self.assertNotEqual(before, snapshots.source_files('arm64', self.root)) + + def test_changed_recipe_rebuilds_arm64_only(self): + script = self.root / 'tools/components/build-arm64-preloads.sh' + script.write_text(script.read_text().replace('-O2', '-O3')) + result, _, _ = self.restore() + self.assertEqual(result, dict(arm64=False, x86=True)) + + def test_shell_newline_changes_invalidate_the_recipe(self): + script = self.root / 'tools/components/build-arm64-preloads.sh' + original = snapshots.recipe(self.root) + text = script.read_text() + script.write_text(text.replace('-ldl\n', '-ldl ', 1)) + self.assertNotEqual(original, snapshots.recipe(self.root)) + + def test_x86_container_recipe_changes_rebuild_x86_only(self): + script = self.root / 'tools/components/recipes/x86-preloads.sh' + script.write_text(script.read_text().replace('debian:bullseye', 'debian:bookworm')) + result, _, _ = self.restore() + self.assertEqual(result, dict(arm64=True, x86=False)) + + def test_new_manifest_requires_main_build_proof(self): + result, _, prove = self.restore('HEAD~1') + self.assertTrue(all(result.values())) + prove.assert_called_once() + + def test_forged_binary_hash_cannot_prove_main_origin(self): + data = copy.deepcopy(self.data) + data['outputs']['libblsession.so'] = 'f' * 64 + with patch.object(snapshots, 'artifact_bytes', return_value=self.binaries): + with self.assertRaisesRegex(ValueError, 'original main APK'): + snapshots.prove_origin(data, self.root / 'cache', self.root) + + def test_modified_input_policy_cannot_omit_producer_dependencies(self): + data = copy.deepcopy(self.data) + data['origin']['commit'] = self.base + omitted = snapshots.COMMON[0] + del data['groups']['arm64'][omitted] + with patch.object(snapshots, 'artifact_bytes', return_value=self.binaries), \ + patch.object(snapshots, 'run', return_value=b''), \ + patch.object(snapshots, 'source_files', side_effect=lambda group, *args: data['groups'][group]), \ + patch.object(snapshots, 'producer_sources', return_value={omitted: self.data['groups']['arm64'][omitted]}): + with self.assertRaisesRegex(ValueError, 'producing build dependency'): + snapshots.prove_origin(data, self.root / 'cache', self.root) + + def test_non_main_or_unsuccessful_run_cannot_prove_origin(self): + build = dict(event='pull_request', head_branch='main', conclusion='success', head_sha='abc', + path='.github/workflows/build.yml', repository=dict(full_name=snapshots.REPO)) + for field, value in [('event', 'pull_request'), ('head_branch', 'feature'), ('conclusion', 'failure')]: + candidate = dict(build, event='push') + candidate[field] = value + with self.subTest(field=field), patch.object(snapshots, 'api', return_value=candidate): + with self.assertRaisesRegex(ValueError, 'successful main'): + snapshots.artifact_bytes(self.data['origin'], self.root / 'cache') + + def test_corrupt_archive_is_rejected(self): + with self.assertRaisesRegex(ValueError, 'checksum'): + snapshots.unpack(self.content + b'tampered', self.data) + + def test_missing_duplicate_or_traversal_entries_are_rejected(self): + for files in ({}, {'../escaped': b'bad'}, {'libblsession.so': b'wrong'}): + content = archive(files) + data = dict(self.data, archive_sha256=snapshots.sha(content)) + with self.subTest(names=list(files)), self.assertRaises(ValueError): + snapshots.unpack(content, data) + + def test_missing_release_rebuilds_without_accepting_unverified_bytes(self): + error = snapshots.urllib.error.HTTPError('https://example.test', 404, 'missing', {}, None) + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', side_effect=error): + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + + def test_transient_download_failure_rebuilds_but_integrity_errors_fail(self): + errors = [TimeoutError('network'), snapshots.http.client.IncompleteRead(b'partial'), + snapshots.urllib.error.HTTPError('https://example.test', 503, 'unavailable', {}, None)] + for error in errors: + with self.subTest(error=type(error).__name__), patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', side_effect=error): + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + with patch.dict(os.environ, COMPONENT_TRUSTED_BASE=self.base), \ + patch.object(snapshots.urllib.request, 'urlopen', return_value=io.BytesIO(b'corrupt')): + with self.assertRaisesRegex(ValueError, 'checksum'): + snapshots.restore(self.root) + + def test_manual_rebuild_does_not_download_snapshot(self): + with patch.dict(os.environ, FORCE_PRELOAD_REBUILD='true'), \ + patch.object(snapshots.urllib.request, 'urlopen') as fetch: + self.assertEqual(snapshots.restore(self.root), dict(arm64=False, x86=False)) + fetch.assert_not_called() diff --git a/tools/tests/test_proot_profile.py b/tools/tests/test_proot_profile.py new file mode 100644 index 000000000..954870515 --- /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_quest_presentation.py b/tools/tests/test_quest_presentation.py index 9c87926e4..81b726a56 100644 --- a/tools/tests/test_quest_presentation.py +++ b/tools/tests/test_quest_presentation.py @@ -10,8 +10,6 @@ ROOT = Path(__file__).resolve().parents[2] @unittest.skipUnless(shutil.which('cc'), 'needs a C compiler') class QuestBackdropTest(unittest.TestCase): def test_first_frame_requires_client_content(self): - # Compile the real entrypoint with controlled layer outcomes, including the - # successful no-op that previously dismissed the loading UI on a black frame. source = (ROOT / 'app/src/main/cpp/waylandcomp/src/vk_present.c').read_text() start = source.index('\nint vkp_render(') end = source.index('\nint vkp_render_hdr(', start) diff --git a/tools/tests/test_render_on_commit.py b/tools/tests/test_render_on_commit.py new file mode 100644 index 000000000..698944f84 --- /dev/null +++ b/tools/tests/test_render_on_commit.py @@ -0,0 +1,225 @@ +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import unittest + +from test_output_refresh import SOURCE, extract_function + + +PREAMBLE = r''' +#include <assert.h> +#include <stdatomic.h> +#include <stdint.h> +#include <stdio.h> + +struct wl_event_source { int armed; }; +static struct wl_event_source idle_source, timer_source; +static void (*idle_func)(void *); +static int idles_added, timers_armed, renders, window_requests, effects_changes, pose_changes; +static int64_t clock_ns; +static int g_display_storage; +static void *g_display = &g_display_storage; +static struct wl_event_source *g_render_idle, *g_fallback_timer; +static int g_fallback_armed, g_dirty, g_hud_fresh, framegen; +static void *g_hud_surface; +static int64_t g_dirty_since_ns, g_last_vsync_ns, g_tick_vsync_ns, g_hud_last_ns, g_rendered_tick_ns; +static int g_tick_held; +static int64_t g_hold_missed_ns; +#define HOLD_RETRY_NS 1000000000LL +static int64_t g_refresh_ns = 16666667; +volatile int g_render_on_commit = 1; +volatile int g_release_unpaced = 1; +volatile int g_fps_limit; +static int64_t g_scene_due_ns; +static atomic_int g_stream_on; +static struct { unsigned ticks, ticks_late_2ms, commit_renders; int64_t tick_late_ns, tick_late_max_ns; } g_pace; +static struct { unsigned ticks; } g_perf; +static int64_t now_ns(void) { return clock_ns; } +static void *wl_display_get_event_loop(void *display) { return display; } +static struct wl_event_source *wl_event_loop_add_idle(void *loop, void (*func)(void *), void *data) { + idles_added++; idle_func = func; return &idle_source; +} +static struct wl_event_source *wl_event_loop_add_timer(void *loop, int (*func)(void *), void *data) { return &timer_source; } +static int wl_event_source_timer_update(struct wl_event_source *source, int ms) { timers_armed++; return 0; } +static int vkp_framegen_active(void) { return framegen; } +static int vkp_apply_window_request(void) { return window_requests; } +static int vkp_effects_sync(void) { return effects_changes; } +static int vkp_cardboard_pose_changed(void) { return pose_changes; } +static void render_scene(void) { renders++; g_dirty = 0; g_dirty_since_ns = 0; g_rendered_tick_ns = g_tick_vsync_ns; g_tick_held = 0; } +static int on_fallback_timer(void *data) { return 0; } +static void on_commit_idle(void *data); +''' + +CHECKS = r''' +static void run_idle(void) { + void (*func)(void *) = idle_func; + idle_func = NULL; + if (func) func(NULL); +} + +static void tick(int64_t t) { clock_ns = t; on_vsync(t); } + +static void arrive(int64_t after_ns) { clock_ns += after_ns; schedule_render(); } + +int main(void) { + const int64_t refresh = 6944444, ms = 1000000; + int64_t t = 1000000000LL; + int r0; + unsigned c0; + g_refresh_ns = refresh; + tick(t); + assert(renders == 0); + + /* a new frame is drawn when it arrives */ + arrive(2 * ms); + assert(idles_added == 1 && renders == 0); + run_idle(); + assert(renders == 1 && g_pace.commit_renders == 1 && g_render_idle == NULL); + + /* a second frame in the same refresh is left for the next arrival, which is drawn when it arrives */ + arrive(1 * ms); + assert(idles_added == 1); + tick(t += refresh); + assert(renders == 1 && g_tick_held == 1); + arrive(2 * ms); + assert(idles_added == 2); + run_idle(); + assert(renders == 2 && g_pace.commit_renders == 2 && g_tick_held == 0); + + /* a frame no other frame follows is drawn at the tick after next */ + arrive(1 * ms); + tick(t += refresh); + assert(renders == 2); + tick(t += refresh); + assert(renders == 3 && g_pace.commit_renders == 2); + + /* after that, the tick draws every frame for a second, then holds one again */ + arrive(1 * ms); + tick(t += refresh); + assert(renders == 4 && g_tick_held == 0); + t += HOLD_RETRY_NS; + tick(t); + arrive(1 * ms); + run_idle(); + arrive(1 * ms); + tick(t += refresh); + assert(renders == 5 && g_tick_held == 1); + arrive(2 * ms); + run_idle(); + assert(renders == 6 && g_pace.commit_renders == 4); + + /* one frame per refresh, starting right after a tick draw, settles on drawing every frame when it arrives */ + window_requests = 1; + tick(t += refresh); + window_requests = 0; + arrive(2 * ms); + r0 = renders; c0 = g_pace.commit_renders; + for (int i = 0; i < 10; i++) { + tick(t += refresh); + arrive(2 * ms); + run_idle(); + } + assert(renders - r0 == 10 && g_pace.commit_renders - c0 == 10); + + /* a client that draws again only after its frame callback (sent when the scene is drawn) keeps one frame + per refresh: two held frames in 200 refreshes, about 1.4 s */ + r0 = renders; c0 = g_pace.commit_renders; + { + int seen = renders - 1; + for (int i = 0; i < 200; i++) { + if (renders != seen) { seen = renders; arrive(1 * ms); run_idle(); } + tick(t += refresh); + } + } + assert(renders - r0 == 198 && g_pace.commit_renders == c0); + + /* a window, effect or headset change at the tick draws the waiting frame now */ + t += HOLD_RETRY_NS; + tick(t); + arrive(1 * ms); + run_idle(); + r0 = renders; + arrive(1 * ms); + window_requests = 1; + tick(t += refresh); + window_requests = 0; + assert(renders - r0 == 1 && g_tick_held == 0); + + /* a draw queued before the tick still draws the frame once */ + tick(t += refresh); + r0 = renders; c0 = g_pace.commit_renders; + arrive(1 * ms); + tick(t += refresh); + assert(renders == r0); + run_idle(); + assert(renders - r0 == 1 && g_pace.commit_renders - c0 == 1); + tick(t += refresh); + assert(renders - r0 == 1); + + /* streaming switched on after the draw was queued leaves the frame for the tick */ + tick(t += refresh); + r0 = renders; c0 = g_pace.commit_renders; + arrive(1 * ms); + atomic_store(&g_stream_on, 1); + run_idle(); + assert(renders == r0); + tick(t += refresh); + atomic_store(&g_stream_on, 0); + assert(renders - r0 == 1 && g_pace.commit_renders == c0); + + /* paced output, frame generation, the switch off and streaming keep drawing on the tick */ + const int idles = idles_added; + r0 = renders; + for (int c = 0; c < 4; c++) { + tick(t += refresh); + if (c == 0) g_release_unpaced = 0; + if (c == 1) framegen = 1; + if (c == 2) g_render_on_commit = 0; + if (c == 3) atomic_store(&g_stream_on, 1); + arrive(1 * ms); + assert(idles_added == idles); + tick(t += refresh); + g_release_unpaced = 1; framegen = 0; g_render_on_commit = 1; atomic_store(&g_stream_on, 0); + assert(renders - r0 == c + 1); + } + + /* without screen ticks the fallback timer still draws */ + clock_ns += 200000000LL; + schedule_render(); + assert(idles_added == idles && g_fallback_armed == 1 && timers_armed == 1); + puts("PASS"); + return 0; +} +''' + + +@unittest.skipUnless(sys.platform.startswith('linux'), 'needs a Linux host compiler') +class RenderOnCommitTest(unittest.TestCase): + def test_a_new_frame_is_drawn_on_arrival_at_most_once_per_refresh(self): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + self.skipTest('A host C compiler is required') + source = SOURCE.read_text() + render = extract_function(source, 'render_scene') + self.assertIn('g_rendered_tick_ns = g_tick_vsync_ns;', render) + self.assertIn('g_tick_held = 0;', render) + functions = ('scene_held_for_limit', 'commit_renders_on', 'render_on_commit', 'schedule_render', 'scene_waits_for_game', 'on_commit_idle', 'on_vsync') + harness = PREAMBLE + '\n'.join(extract_function(source, name) for name in functions) + CHECKS + with tempfile.TemporaryDirectory(prefix='droiddeck-render-on-commit-') as folder: + path = Path(folder) + (path / 'commit.c').write_text(harness) + binary = path / 'commit-test' + build = subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', + '-Wno-unused-parameter', '-Wno-unused-function', '-O2', + str(path / 'commit.c'), '-o', str(binary)], capture_output=True, text=True) + self.assertEqual(0, build.returncode, build.stderr) + result = subprocess.run([str(binary)], capture_output=True, text=True, timeout=10) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('PASS', result.stdout.strip()) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_run_windows.py b/tools/tests/test_run_windows.py index 143fba925..ac1be22f4 100644 --- a/tools/tests/test_run_windows.py +++ b/tools/tests/test_run_windows.py @@ -1,4 +1,3 @@ -"""Exercise the Windows launcher without building an APK or contacting a phone.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index e368290e3..9bac8a0f7 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -48,13 +48,14 @@ class RuntimeInputsTest(unittest.TestCase): for name, (pack, rel) in runtime.PACKED_FILES.items(): proot[rel] = (self.root / runtime.outputs(self.root)[name]).read_bytes() self.pack('proot', proot) + self.pack('butler', {'butler': b'butler', '7z.so': b'7z', 'libc7zip.so': b'c7zip', 'version': b'15.32.0'}) for prefix, name in runtime.PACKED.items(): base = self.root / 'app/src/main' / prefix self.pack(name, {path.relative_to(base).as_posix(): path.read_bytes() for path in base.rglob('*') if path.is_file()}) @staticmethod def in_apk(name): - return name not in runtime.PACKED_FILES and not any(name.startswith(prefix) for prefix in runtime.PACKED) + return not any(name.startswith(prefix) for prefix in runtime.PACKED) def audio(self, names): stream = io.BytesIO() @@ -66,10 +67,16 @@ class RuntimeInputsTest(unittest.TestCase): path = self.root / 'app/build/prepared-assets/pulseaudio.tzst' path.write_bytes(subprocess.run(['zstd', '-q', '-c'], input=stream.getvalue(), capture_output=True, check=True).stdout) - def test_an_apk_still_carrying_proot_is_rejected(self): - apk = self.current_apk(self.root / 'bundled.apk', {'lib/arm64-v8a/libproot.so': b'prepared runtime'}) - with self.assertRaisesRegex(ValueError, 'proot pack provides'): - runtime.check_apk(apk, self.root) + def test_an_apk_must_carry_the_matching_proot_loader_pair(self): + apk = self.current_apk(self.root / 'bundled.apk') + runtime.check_apk(apk, self.root) + missing = self.root / 'missing-loader.apk' + with ZipFile(apk) as source, ZipFile(missing, 'w') as destination: + for name in source.namelist(): + if name != 'lib/arm64-v8a/libproot-loader.so': + destination.writestr(name, source.read(name)) + with self.assertRaisesRegex(ValueError, 'kernel-executed runtime input'): + runtime.check_apk(missing, self.root) def test_missing_proot_cannot_be_attested(self): (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').unlink() @@ -87,6 +94,19 @@ class RuntimeInputsTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'sources changed'): runtime.verify(self.root) + def test_dev_loop_can_reuse_assets_from_other_sources(self): + runtime.record(self.root) + self.source.write_text('new implementation') + with mock.patch('sys.stderr', new_callable=io.StringIO) as stderr: + runtime.verify(self.root, stale_sources_ok=True) + self.assertIn('tools/linuxfs/preload/test.c', stderr.getvalue()) + + def test_dev_loop_still_rejects_changed_outputs(self): + runtime.record(self.root) + (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').write_bytes(b'old APK binary') + with self.assertRaisesRegex(ValueError, 'changed runtime input'): + runtime.verify(self.root, stale_sources_ok=True) + def test_changed_quest_source_rejects_old_outputs(self): source = self.root / 'tools/quest/kgsl_compat.c' source.parent.mkdir(parents=True) diff --git a/tools/tests/test_scene_limit_hold.py b/tools/tests/test_scene_limit_hold.py new file mode 100644 index 000000000..e2c32937e --- /dev/null +++ b/tools/tests/test_scene_limit_hold.py @@ -0,0 +1,105 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +SOURCE = ROOT / 'app/src/main/cpp/waylandcomp/src/compositor.c' + + +def extract_function(source, name): + match = re.search(r'^static int(?:64_t)? ' + re.escape(name) + r'\([^;]*?\) \{', source, re.MULTILINE) + if match is None: + raise AssertionError(f'Missing compositor function: {name}') + cursor, depth = match.end(), 1 + while depth: + depth += (source[cursor] == '{') - (source[cursor] == '}') + cursor += 1 + return source[match.start():cursor] + + +HARNESS = r''' +#include <assert.h> +#include <stdint.h> +#include <stdio.h> + +@FUNCTIONS@ + +#define MS 1000000LL + +static int run(int64_t refresh, int limit, int64_t jitter, int seconds) { + int renders = 0; + int64_t due = 0; + for (int64_t tick = 0; tick * refresh < seconds * 1000 * MS; tick++) { + int64_t now = 1000 * MS + tick * refresh + (tick % 2 ? jitter : -jitter); + if (scene_held_for_limit(now, due, limit, 0)) continue; + renders++; + due = scene_next_due(now, due, limit); + } + return renders; +} + +int main(void) { + assert(!scene_held_for_limit(100 * MS, 0, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 130 * MS, 0, 0)); + assert(!scene_held_for_limit(100 * MS, 130 * MS, 30, 1)); + assert(scene_held_for_limit(100 * MS, 130 * MS, 30, 0)); + assert(scene_held_for_limit(100 * MS, 102 * MS, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 101 * MS, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 90 * MS, 30, 0)); + assert(scene_next_due(100 * MS, 0, 0) == 0); + assert(scene_next_due(100 * MS, 0, 25) == 140 * MS); + assert(scene_next_due(101 * MS, 100 * MS, 25) == 140 * MS); + assert(scene_next_due(200 * MS, 100 * MS, 25) == 240 * MS); + const struct { int64_t refresh; int limit; int expected; } cases[] = { + {8333333, 30, 300}, {8333333, 60, 600}, {16666667, 25, 250}, {16666667, 30, 300}, + {10000000, 30, 300}, {11111111, 30, 300}, {6944444, 40, 400}, {16666667, 120, 600}, + }; + for (unsigned i = 0; i < sizeof cases / sizeof cases[0]; i++) { + int got = run(cases[i].refresh, cases[i].limit, 0, 10); + if (got > cases[i].expected + 1 || got < cases[i].expected - 2) { + fprintf(stderr, "refresh %lld limit %d: %d renders, expected %d\n", + (long long)cases[i].refresh, cases[i].limit, got, cases[i].expected); + return 1; + } + got = run(cases[i].refresh, cases[i].limit, 300000, 10); + if (got > cases[i].expected + 1 || got < cases[i].expected - 2) { + fprintf(stderr, "jittered refresh %lld limit %d: %d renders, expected %d\n", + (long long)cases[i].refresh, cases[i].limit, got, cases[i].expected); + return 1; + } + } + int fallback = run(8 * MS, 30, 0, 10); + assert(fallback <= 301 && fallback >= 290); + puts("PASS"); + return 0; +} +''' + + +class SceneLimitHoldTest(unittest.TestCase): + def test_a_frame_limit_holds_scene_renders_to_its_rate_without_slowing_paced_frames(self): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + self.skipTest('A host C compiler is required') + source = SOURCE.read_text() + harness = HARNESS.replace('@FUNCTIONS@', '\n'.join(extract_function(source, name) for name in ('scene_held_for_limit', 'scene_next_due'))) + with tempfile.TemporaryDirectory(prefix='droiddeck-scene-hold-') as folder: + path = Path(folder) + (path / 'hold.c').write_text(harness) + binary = path / 'hold-test' + build = subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', '-O2', + str(path / 'hold.c'), '-o', str(binary)], + capture_output=True, text=True) + self.assertEqual(0, build.returncode, build.stderr) + result = subprocess.run([str(binary)], capture_output=True, text=True, timeout=10) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('PASS', result.stdout.strip()) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 042ab87d4..bc71403f8 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_assets.py b/tools/tests/test_session_assets.py index 14052c9d3..5f7f8675d 100644 --- a/tools/tests/test_session_assets.py +++ b/tools/tests/test_session_assets.py @@ -43,3 +43,10 @@ class SessionAssetsTest(unittest.TestCase): assets.check_extraction(self.overlay, '')) mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/droiddeck-login1"' self.assertEqual([], assets.check_extraction(self.overlay, mapping)) + + def test_helper_extracted_under_another_name_counts(self): + mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/login1"' + self.assertEqual([], assets.check_extraction(self.overlay, mapping)) + mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/sub/login1"' + self.assertEqual(['not extracted at session start: usr/local/bin/droiddeck-login1'], + assets.check_extraction(self.overlay, mapping)) diff --git a/tools/tests/test_session_cursor_routing.py b/tools/tests/test_session_cursor_routing.py index fdc88f75d..dd2c77d94 100644 --- a/tools/tests/test_session_cursor_routing.py +++ b/tools/tests/test_session_cursor_routing.py @@ -1,4 +1,3 @@ -"""The XTest cursor path is enabled only for Steam sessions.""" import os from pathlib import Path import re @@ -8,29 +7,37 @@ import unittest SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' SOURCE = SESSION.read_text() MATCH = re.search( - r'^ if \[ "\$mode" = steam \]; then\n.*?^ fi\n', SOURCE, re.M | re.S) + r'^ if \[ "\$mode" = steam \] && \[ "\$\{BL_CURSOR_COMPOSITE:-0\}" = 1 \]; then\n.*?^ fi\n', + SOURCE, re.M | re.S) assert MATCH is not None CURSOR_SETUP = MATCH.group(0) class SessionCursorRoutingTest(unittest.TestCase): - def run_setup(self, mode, initial=None): + def run_setup(self, mode, initial=None, composite=None): env = dict(os.environ, mode=mode) if initial is not None: env['gamescope_cursor_composite'] = initial else: env.pop('gamescope_cursor_composite', None) + if composite is not None: + env['BL_CURSOR_COMPOSITE'] = composite + else: + env.pop('BL_CURSOR_COMPOSITE', None) result = subprocess.run( ['bash', '-c', CURSOR_SETUP + 'printf "%s\n" "${gamescope_cursor_composite-}"'], env=env, text=True, capture_output=True, check=True) return result.stdout.strip() - def test_steam_enables_manual_composition_for_the_nested_cursor(self): - self.assertEqual('2', self.run_setup('steam')) + def test_steam_leaves_the_cursor_with_the_host_unless_asked(self): + self.assertEqual('', self.run_setup('steam')) + + def test_steam_composites_the_cursor_when_the_setting_is_on(self): + self.assertEqual('2', self.run_setup('steam', composite='1')) def test_other_sessions_keep_their_existing_cursor_composition(self): - self.assertEqual('', self.run_setup('desktop')) - self.assertEqual('1', self.run_setup('run', '1')) + self.assertEqual('', self.run_setup('desktop', composite='1')) + self.assertEqual('1', self.run_setup('run', '1', composite='1')) if __name__ == '__main__': diff --git a/tools/tests/test_session_guest_command.py b/tools/tests/test_session_guest_command.py index 9c319ce95..5938b8c45 100644 --- a/tools/tests/test_session_guest_command.py +++ b/tools/tests/test_session_guest_command.py @@ -1,9 +1,3 @@ -"""Exercise the literal launch prefix from SessionService without an Android runtime. - -This is a focused source/exec regression check, not a Kotlin or PRoot integration -test. PRoot executes the first guest argument directly; KEY=VALUE is meaningful -only after /usr/bin/env. Read the production prefix rather than duplicate it. -""" import json from pathlib import Path import re @@ -22,7 +16,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_log.py b/tools/tests/test_session_log.py index baf506484..19dbb2716 100644 --- a/tools/tests/test_session_log.py +++ b/tools/tests/test_session_log.py @@ -9,8 +9,8 @@ SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/d def log_redirect(): - match = re.search(r"^\s*(exec > >\(.*\) 2>&1)$", SESSION.read_text(), re.M) - return match.group(1) + match = re.search(r"^\s*(dd=.*)\n\s*(exec > >\(.*\) 2>&1)$", SESSION.read_text(), re.M) + return "%s\n%s" % match.groups() class SessionLogTest(unittest.TestCase): diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py new file mode 100644 index 000000000..67b616669 --- /dev/null +++ b/tools/tests/test_session_pacing.py @@ -0,0 +1,63 @@ +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_sign_apk_renames.py b/tools/tests/test_sign_apk_renames.py new file mode 100644 index 000000000..bd111fa0f --- /dev/null +++ b/tools/tests/test_sign_apk_renames.py @@ -0,0 +1,27 @@ +import re +import unittest +from pathlib import Path + + +ROOT = Path(__file__).resolve().parents[2] +PACKAGE = 'com.droiddeck.launcher' + + +class SignApkRenamesTest(unittest.TestCase): + def test_variants_rename_every_authority_and_task_named_after_the_package(self): + manifest = (ROOT / 'app/src/main/AndroidManifest.xml').read_text() + names = set() + for attribute in ('authorities', 'taskAffinity'): + for value in re.findall(r'android:%s="([^"]*)"' % attribute, manifest): + self.assertNotIn(';', value, 'sign-apk.sh renames whole values, so give each authority its own provider') + name = value.strip().replace('${applicationId}', PACKAGE) + if name.startswith(PACKAGE + '.'): + names.add(name[len(PACKAGE):]) + self.assertIn('.agent', names) + script = (ROOT / 'tools/release/sign-apk.sh').read_text() + renamed = set(re.findall(r'"\$P(\.[A-Za-z0-9_.-]+)=\$pkg\1"', script)) + self.assertEqual(set(), names - renamed, 'add these to the axml_rename call in tools/release/sign-apk.sh') + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_steam_cold_launch.py b/tools/tests/test_steam_cold_launch.py index 162037eba..1695ad0e1 100644 --- a/tools/tests/test_steam_cold_launch.py +++ b/tools/tests/test_steam_cold_launch.py @@ -1,4 +1,3 @@ -"""Retry a dropped shortcut without duplicating a launch that is still preparing its first window.""" import os from pathlib import Path import subprocess @@ -29,7 +28,6 @@ class SteamColdLaunchTest(unittest.TestCase): self.agent_count = self.root / "agent-count" self.focus_count = self.root / "focus-count" - # FOCUS lists the focused app per xprop call; the last value repeats. xprop = self.bin / "xprop" xprop.write_text( "#!/bin/sh\n" diff --git a/tools/tests/test_steam_compat_environment.py b/tools/tests/test_steam_compat_environment.py index 22a15e0d4..5ecaba177 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_compat_live.py b/tools/tests/test_steam_compat_live.py index a86aab864..af2d8cfb6 100644 --- a/tools/tests/test_steam_compat_live.py +++ b/tools/tests/test_steam_compat_live.py @@ -641,6 +641,114 @@ class ReconcileTest(unittest.TestCase): self.assertEqual(page.mapping["10"], "GE-Proton9-1") self.assertEqual(state["auto"], {"11": TOOL}) + def games(self): + return json.loads((self.state / "games.json").read_text())["games"] + + def write_games(self, games): + (self.state / "games.json").write_text(json.dumps({"version": 1, "games": games})) + + def test_a_steam_pick_after_the_app_choice_is_kept_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + state = self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL_11)]) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + self.assertEqual(self.games(), {}) + self.assertEqual(state["games_applied"], {}) + + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL_11)]) + + def test_a_steam_pick_of_our_proton_becomes_the_app_choice_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.sets.clear() + page.mapping["10"] = TOOL + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(self.games(), {"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + self.assertEqual(state["games_applied"], self.games()) + + def test_use_the_default_applies_once_then_steam_picks_stand_live(self): + page = FakePage({"0": TOOL, "10": TOOL_11, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": None}) + self.reconcile(page) + self.assertEqual(page.sets, [("10", TOOL)]) + + page.sets.clear() + self.reconcile(page) + self.assertEqual(self.games(), {}) + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + + def test_choices_an_earlier_build_applied_give_way_to_steam_picks_live(self): + (self.state / "state.json").write_text(json.dumps({"default": TOOL, "auto": {"11": TOOL}, "tools": []})) + self.write_games({"10": None, "11": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + page = FakePage({"0": TOOL, "10": COMPAT["FEX_TOOL"], "11": "steamlinuxruntime_sniper"}, + [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(self.games(), {}) + + def test_an_app_choice_written_during_a_sync_is_not_overwritten(self): + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + requests, text = COMPAT["read_game_requests"]() + self.write_games({"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + self.assertFalse(COMPAT["write_game_requests"]({}, text)) + self.assertEqual(self.games(), {"10": {"valve": True, "dir": "Proton Experimental (ARM64)"}}) + + def test_an_app_the_client_briefly_refuses_keeps_its_applied_choice_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.refused = {"10"} + state = self.reconcile(page) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + page.refused = set() + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping["10"], COMPAT["FEX_TOOL"]) + + def test_an_app_rewriting_its_choices_during_both_tries_applies_none_of_them_live(self): + page = FakePage({"0": TOOL, "10": TOOL, "11": TOOL}, [TOOL, TOOL_11, COMPAT["FEX_TOOL"]]) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + self.reconcile(page) + page.sets.clear() + page.mapping["10"] = COMPAT["FEX_TOOL"] + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}, "11": None}) + with mock.patch.dict(COMPAT["settled_game_requests"].__globals__, write_game_requests=lambda *_: False): + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(state["games_applied"], {"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + + def test_a_steam_pick_is_kept_at_the_next_start(self): + config = self.steam / "config/config.vdf" + config.parent.mkdir(parents=True) + vdf = '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' + entry = '"%s" { "name" "%s" "config" "" "priority" "250" }' + catalog = COMPAT["tool_catalog"](str(self.steam)) + self.write_games({"10": {"valve": True, "dir": "Proton 11.0 (ARM64)"}}) + config.write_text(vdf % (entry % ("0", TOOL) + entry % ("10", TOOL))) + with mock.patch.dict(COMPAT["register_default"].__globals__, steam_running=lambda: False): + COMPAT["register_default"](str(config), ["10"], catalog=catalog, directory=str(self.state), settle=True) + self.assertIn(entry % ("10", TOOL_11), " ".join(config.read_text().split())) + config.write_text(vdf % (entry % ("0", TOOL) + entry % ("10", COMPAT["FEX_TOOL"]))) + COMPAT["register_default"](str(config), ["10"], catalog=catalog, directory=str(self.state), settle=True) + self.assertIn(entry % ("10", COMPAT["FEX_TOOL"]), " ".join(config.read_text().split())) + self.assertEqual(self.games(), {}) + def test_file_mode_defers_to_the_live_helper(self): (self.state / "live.pid").write_text("%d\n" % os.getpid()) self.assertTrue(COMPAT["live_helper_running"]()) diff --git a/tools/tests/test_steam_compat_x64.py b/tools/tests/test_steam_compat_x64.py index 3d4b069e0..9f9abc478 100644 --- a/tools/tests/test_steam_compat_x64.py +++ b/tools/tests/test_steam_compat_x64.py @@ -50,14 +50,12 @@ CONFIG = '''"InstallConfigStore" class X64RepointTest(unittest.TestCase): - """steam-compatibility --x64: the x86-64 client's Proton entries go to its arm64 wrapper.""" def setUp(self): self.home = tempfile.TemporaryDirectory() self.root = Path(self.home.name) / "Steam" (self.root / "config").mkdir(parents=True) (self.root / "config" / "config.vdf").write_text(CONFIG) - # A wrapper of its own whose name starts with "proton": kept, never repointed. own = self.root / "compatibilitytools.d" / "proton-cachyos-a64" own.mkdir(parents=True) (own / "compatibilitytool.vdf").write_text('"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"proton-cachyos-a64"\n\t\t{\n\t\t}\n\t}\n}\n') @@ -82,12 +80,10 @@ class X64RepointTest(unittest.TestCase): self.assertEqual(m["550"], "GE-Proton11-7-a64") self.assertEqual(m["620"], "proton-cachyos-a64") self.assertEqual(m["730"], "steamlinuxruntime") - # The arm64 client's own Proton name, which this client ignores. self.assertEqual(m["880"], "GE-Proton11-7-a64") self.assertEqual(m["0"], "GE-Proton11-7-a64") def test_repoints_arm64_name_even_with_its_stray_tool(self): - # An arm64 compat pass that ran against this client also left its tool folder here. stray = self.root / "compatibilitytools.d" / "droiddeck-proton-arm64" stray.mkdir(parents=True) (stray / "compatibilitytool.vdf").write_text('"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"droiddeck-proton-arm64"\n\t\t{\n\t\t}\n\t}\n}\n') diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 626631e7f..7d5064087 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -1,4 +1,3 @@ -"""Desktop Steam stays on KDE; explicit Big Picture still switches sessions.""" import fcntl import os from pathlib import Path @@ -42,12 +41,38 @@ 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) self.assertEqual(result.stdout.splitlines()[-1], 'steam://rungameid/501590') self.assertFalse((self.session / 'steam-launch').exists()) + def test_exit_without_a_running_client_starts_nothing(self): + result = self.launch('desktop', 'steam://exit') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout, '') + self.assertFalse((self.session / 'steam-launch').exists()) + + def test_shim_turns_shutdown_into_exit_url(self): + launch = self.root / 'record-launch' + launch.write_text('#!/bin/bash\nprintf "%s\\n" "$@"\n') + launch.chmod(0o755) + shim = self.root / 'shim' + shim.write_text((BIN / 'droiddeck-steam-shim').read_text().replace( + '/usr/local/bin/droiddeck-steam-launch', str(launch))) + result = subprocess.run(['bash', str(shim), '-shutdown'], env=self.env, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['desktop', 'steam://exit']) + def test_second_click_forwards_without_another_supervisor(self): lock = self.root / 'cache/droiddeck/steam-desktop.lock' lock.parent.mkdir(parents=True) @@ -66,6 +91,30 @@ class DesktopSteamLaunchTest(unittest.TestCase): '-cef-disable-gpu', 'steam://open/settings']) self.assertFalse((self.session / 'steam-launch').exists()) + def _running_client(self): + steam = self.root / 'data/Steam/steamrtarm64/steam' + steam.parent.mkdir(parents=True) + steam.write_text('#!/bin/bash\nprintf "%s\\n" "$@"\n') + steam.chmod(0o755) + (self.root / '.steam').mkdir() + os.mkfifo(self.root / '.steam/steam.pipe') + (self.root / '.steam/steam.pid').write_text(str(os.getpid())) + + def test_bottom_screen_desktop_hands_games_to_the_running_client(self): + self._running_client() + self.env['BL_BOTTOM_DESKTOP'] = '1' + result = self.launch('desktop', '501590') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['-nobigpicture', '-no-cef-sandbox', '-cef-ozone-platform=x11', + '-cef-disable-gpu', 'steam://rungameid/501590']) + self.assertFalse((self.root / 'cache/droiddeck/steam-desktop.lock').exists()) + + def test_bottom_screen_desktop_starts_its_own_client_when_none_runs(self): + self.env.update(BL_BOTTOM_DESKTOP='1', DISPLAY=':7') + result = self.launch('desktop') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['1', 'desktop', ':7', 'steam', 'steam://open/library']) + def test_second_click_forwards_to_the_x86_64_client_in_its_own_home(self): lock = self.root / 'cache/droiddeck/steam-desktop.lock' lock.parent.mkdir(parents=True) diff --git a/tools/tests/test_steam_devtools_port.py b/tools/tests/test_steam_devtools_port.py new file mode 100644 index 000000000..8015ba260 --- /dev/null +++ b/tools/tests/test_steam_devtools_port.py @@ -0,0 +1,78 @@ +import re +import shlex +import socket +import subprocess +import tempfile +import unittest +from pathlib import Path + +SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" + + +def devtools_function(): + match = re.search(r"^steam_devtools\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S) + return match.group(0) if match else None + + +class SteamDevtoolsPortTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + + def free_port(self): + with socket.socket() as sock: + sock.bind(("127.0.0.1", 0)) + return sock.getsockname()[1] + + def choose(self, port): + function = devtools_function() + self.assertIsNotNone(function, "droiddeck-session has no steam_devtools()") + script = function + "steam_root=%s\nsteam_devtools %d\n" % (shlex.quote(str(self.root)), port) + script += 'echo "port=$BL_CDP_PORT"\necho "args=${_bl_cdp[*]}"\n' + out = subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, check=True).stdout + lines = out.splitlines() + port_line = next(l for l in lines if l.startswith("port=")) + args_line = next(l for l in lines if l.startswith("args=")) + return int(port_line[5:]), args_line[5:].split(), out + + def test_without_remote_debugging_steam_gets_a_private_port(self): + port, args, _ = self.choose(self.free_port()) + self.assertEqual(["-cef-enable-debugging", "-devtools-port", str(port)], args) + self.assertTrue(20000 <= port < 50000) + + def test_remote_debugging_keeps_the_fixed_port_when_it_is_free(self): + (self.root / ".cef-enable-remote-debugging").touch() + fixed = self.free_port() + port, args, out = self.choose(fixed) + self.assertEqual(fixed, port) + self.assertEqual([], args) + self.assertNotIn("held by another app", out) + + def test_a_fixed_port_another_app_holds_falls_back_to_a_private_one(self): + (self.root / ".cef-enable-remote-debugging").touch() + with socket.socket() as other: + other.bind(("127.0.0.1", 0)) + other.listen(1) + taken = other.getsockname()[1] + port, args, out = self.choose(taken) + self.assertNotEqual(taken, port) + self.assertEqual(["-cef-enable-debugging", "-devtools-port", str(port)], args) + self.assertIn("held by another app", out) + + def test_a_fixed_port_bound_without_listening_also_falls_back(self): + (self.root / ".cef-enable-remote-debugging").touch() + with socket.socket() as other: + other.bind(("127.0.0.1", 0)) + taken = other.getsockname()[1] + port, args, out = self.choose(taken) + self.assertNotEqual(taken, port) + self.assertEqual(["-cef-enable-debugging", "-devtools-port", str(port)], args) + + def test_the_x86_64_decky_exemption_only_covers_the_fixed_port(self): + text = SESSION.read_text() + self.assertIn('[ "${decky_arch:-}" = x86_64 ] && [ ${#_bl_cdp[@]} = 0 ]', text) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_steam_file_dialog.py b/tools/tests/test_steam_file_dialog.py new file mode 100644 index 000000000..f557b3557 --- /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_games.py b/tools/tests/test_steam_games.py index 7ad6e5300..491284935 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -113,9 +113,11 @@ class ImportsTest(unittest.TestCase): listing = self.root / 'games.json' listing.write_text(json.dumps([self.game])) from unittest.mock import Mock + idle = imports.downloads_idle result = Mock(returncode=0, stdout='DROIDDECK_OWNERSHIP=' + json.dumps(dict(account='123', owned={'42': True}))) with patch.object(imports, 'identify', side_effect=[None, 42]) as identify, \ patch.object(imports, 'request_restart'), \ + patch.object(imports, 'ask_restart', return_value=True), \ patch.object(imports, 'time', Mock(monotonic=Mock(side_effect=[0, 301]), sleep=Mock(side_effect=[None, RuntimeError('stop')]))), \ patch.object(imports.subprocess, 'run', return_value=result), \ @@ -126,7 +128,7 @@ class ImportsTest(unittest.TestCase): snapshot = imports.read_json(self.acct / 'config' / imports.STATE, {}) self.assertTrue(snapshot['owned']['42']) - def run_watch(self, beats, routes=None, busy=False): + def run_watch(self, beats, routes=None, busy=False, answer=True, started=False): listing = self.root / 'games.json' listing.write_text(json.dumps([self.game])) if routes is not None: @@ -134,21 +136,64 @@ class ImportsTest(unittest.TestCase): if busy: (self.steam / 'steamapps/downloading/7').mkdir(parents=True) from unittest.mock import Mock + idle = imports.downloads_idle result = Mock(returncode=0, stdout='DROIDDECK_OWNERSHIP=' + json.dumps(dict(account='123', owned={'42': True}))) with patch.object(imports, 'identify', return_value=42), \ patch.object(imports, 'game_running', return_value=False), \ patch.object(imports, 'request_restart') as restart, \ + patch.object(imports, 'ask_restart', return_value=answer) as asked, \ + patch.object(imports, 'downloads_idle', side_effect=lambda root: idle(root) and not (started and asked.called)), \ patch.object(imports, 'time', Mock(monotonic=Mock(side_effect=list(range(0, 30 * beats, 30))), sleep=Mock(side_effect=[None] * (beats - 1) + [RuntimeError('stop')]))), \ patch.object(imports.subprocess, 'run', return_value=result), \ patch('builtins.print'): with self.assertRaisesRegex(RuntimeError, 'stop'): imports.watch(self.steam, listing) + self.asked = asked return restart def test_newly_owned_game_restarts_the_client_once(self): self.assertEqual(1, self.run_watch(3).call_count) + def test_an_import_that_did_not_take_restarts_only_once_across_sessions(self): + self.assertEqual(1, self.run_watch(3).call_count) + self.assertEqual(0, self.run_watch(3).call_count) + self.assertEqual([42], imports.read_json(self.acct / 'config' / imports.TRIED, None)) + + def test_later_skips_the_restart_and_does_not_ask_again(self): + self.assertEqual(0, self.run_watch(3, answer=False).call_count) + self.assertEqual([['Example']], [c.args[0] for c in self.asked.call_args_list]) + self.assertEqual(0, self.run_watch(3).call_count) + self.assertEqual(0, self.asked.call_count) + + def test_a_download_started_while_asking_leaves_the_import_for_the_next_start(self): + self.assertEqual(0, self.run_watch(3, started=True).call_count) + self.assertEqual(1, self.asked.call_count) + + def test_the_app_answers_the_restart_question(self): + home = self.root / 'home' + folder = home / '.cache/droiddeck' + replies = [] + def sleep(_): + ask = json.loads((folder / 'steam-import.json').read_text()) + replies.append(ask['games']) + (folder / 'steam-import.answer').write_text(json.dumps(dict(token=ask['token'], choice=choice))) + for choice, expected in (('now', True), ('later', False)): + with patch.dict(os.environ, HOME=str(home)): + self.assertEqual(expected, imports.ask_restart(['Example'], clock=iter(range(100)).__next__, sleep=sleep)) + self.assertFalse((folder / 'steam-import.json').exists()) + self.assertFalse((folder / 'steam-import.answer').exists()) + self.assertEqual([['Example'], ['Example']], replies) + + def test_no_answer_means_later(self): + with patch.dict(os.environ, HOME=str(self.root / 'home')): + self.assertFalse(imports.ask_restart(['Example'], timeout=5, clock=iter(range(100)).__next__, sleep=lambda _: None)) + + def test_a_tried_import_that_took_is_forgotten(self): + imports.save_json(self.acct / 'config' / imports.TRIED, [42]) + self.assertEqual(0, self.run_watch(2, routes={'1': 42}).call_count) + self.assertEqual([], imports.read_json(self.acct / 'config' / imports.TRIED, None)) + def test_imported_game_does_not_restart_the_client(self): self.assertEqual(0, self.run_watch(2, routes={'1': 42}).call_count) @@ -346,6 +391,61 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(self.game)) + def test_spacewar_appid_names_no_game(self): + (self.folder / 'steam_appid.txt').write_text('480\n') + with patch.object(imports.urllib.request, 'urlopen', side_effect=OSError): + self.assertIsNone(imports.identify(self.game)) + + def import_as(self, appid): + self.assertTrue(imports.seed_install(self.steam, self.game, appid)) + self.assertTrue((self.steam / f'steamapps/appmanifest_{appid}.acf').is_file()) + + def snapshot_names(self, appid, owned): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={str(appid): owned}, + candidates={str(self.folder): appid}, + sources={str(self.folder): imports.source_stamp(self.game)})) + + def assert_not_imported_as(self, appid): + self.assertFalse((self.steam / f'steamapps/appmanifest_{appid}.acf').exists()) + self.assertFalse(os.path.lexists(self.steam / f'steamapps/common/DroidDeck-{appid}')) + + def test_spacewar_import_is_released_and_never_made_again(self): + self.import_as(480) + self.snapshot_names(480, owned=True) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(480) + self.assertEqual(b'game', self.exe.read_bytes()) + + def test_import_follows_the_app_the_files_name_now(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=True) + with patch('builtins.print'): + self.assertEqual(([], {str(self.game['appid']): 43}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assertEqual(self.folder, (self.steam / 'steamapps/common/DroidDeck-43').resolve()) + + def test_unowned_new_appid_leaves_a_shortcut(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=False) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assert_not_imported_as(43) + + def test_import_stays_while_the_new_identity_is_unknown(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + for candidates in ({}, {str(self.folder): 43}): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={'43': True}, candidates=candidates, + sources={str(self.folder): ['stale']})) + imports.route(self.steam, self.acct, [self.game]) + self.assertTrue((self.steam / 'steamapps/appmanifest_42.acf').is_file()) + def test_manifest_identity_uses_install_directory(self): folder = self.root / 'second/steamapps/common/Custom Name' folder.mkdir(parents=True) @@ -354,6 +454,21 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(game)) + def test_a_spacewar_manifest_names_no_game(self): + folder = self.root / 'second/steamapps/common/PEAK' + folder.mkdir(parents=True) + (folder.parent.parent / 'appmanifest_480.acf').write_text('"AppState" { "installdir" "PEAK" }') + (folder / 'steam_appid.txt').write_text('3527290\n') + game = dict(self.game, folder=str(folder), exe=str(folder / 'PEAK.exe')) + with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): + self.assertEqual(3527290, imports.identify(game)) + + def test_a_store_search_answering_spacewar_names_no_game(self): + with patch.object(imports.urllib.request, 'urlopen') as request: + request.return_value.__enter__.return_value.read.return_value = json.dumps( + {'items': [{'id': 480, 'name': 'Spacewar'}]}).encode() + self.assertIsNone(imports.identify(dict(self.game, name='Spacewar'))) + def test_store_requires_unique_exact_title(self): cases = [([{'id': 42, 'name': 'Example Deluxe'}], None), ([{'id': 42, 'name': 'Example'}, {'id': 43, 'name': 'Example'}], None), diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 8692d5649..81e2724cb 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,8 +78,9 @@ 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)) - for channel in ('steamdeck_publicbeta',): + 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: package.writestr('steamrtarm64/steam', channel) @@ -68,12 +92,17 @@ cp "$TEST_CDN/${url##*/}" "$out" f'\t\t"file" "{archive.name}"\n\t\t"sha2" "{digest}"\n' '\t}\n}\n') - def install(self, fail_host=None): + def install(self, fail_host=None, *args, **extra): env = self.env if fail_host is None else dict(self.env, TEST_FAIL_HOST=fail_host) - return subprocess.run(['bash', str(SCRIPT)], env=env, text=True, capture_output=True) + return subprocess.run(['bash', str(SCRIPT), *args], env=dict(env, **extra), text=True, capture_output=True) - def assert_installed(self, channel='steamdeck_publicbeta', fail_host=None, expected=None): - result = self.install(fail_host) + def channel(self, **extra): + result = self.install(None, '--channel', **extra) + self.assertEqual(0, result.returncode, result.stderr) + return result.stdout.strip() + + def assert_installed(self, channel='steamdeck_publicbeta', fail_host=None, expected=None, **extra): + result = self.install(fail_host, **extra) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual(channel + '\n', (self.steam / 'package/beta').read_text()) self.assertEqual('123456\n', (self.steam / 'package/droiddeck-installed').read_text()) @@ -87,6 +116,7 @@ cp "$TEST_CDN/${url##*/}" "$out" 'https://client-update.steamstatic.com/' + channel + '.zip', ] self.assertEqual(expected, self.requests.read_text().splitlines()) + return result def test_downloads_the_deck_beta_client(self): self.assert_installed() @@ -155,8 +185,80 @@ cp "$TEST_CDN/${url##*/}" "$out" self.requests.unlink() with (package / 'droiddeck-unconfirmed').open('a') as marker: marker.write('start\nstart\nstart\n') + self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertFalse(self.requests.exists()) + + def test_the_default_channel_is_the_deck_beta(self): + self.assertEqual('steamdeck_publicbeta', self.channel()) + + def stable_requests(self, beta_manifest=True): + stable = [ + 'https://client-update.steamstatic.com/steam_client_steamdeck_stable_linuxarm64', + 'https://client-update.steamstatic.com/steamdeck_stable.zip', + ] + if beta_manifest: + stable.insert(0, 'https://client-update.steamstatic.com/steam_client_steamdeck_publicbeta_linuxarm64') + return stable + + def test_a_repaired_beta_client_that_still_shows_nothing_falls_back_to_stable(self): + package = self.break_client(2) + self.assertEqual(0, self.install().returncode) + self.requests.unlink() + with (package / 'droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\n') + result = self.assert_installed('steamdeck_stable', expected=self.stable_requests(False)) + self.assertIn("falling back to Valve's steamdeck_stable Steam client", result.stdout) + self.assertEqual('steamdeck_stable\n', (package / 'droiddeck-channel').read_text()) + self.assertEqual('repaired\n', (package / 'droiddeck-unconfirmed').read_text()) + self.assertEqual('steamdeck_stable', self.channel()) + + def test_the_stable_fallback_is_not_repeated(self): + self.test_a_repaired_beta_client_that_still_shows_nothing_falls_back_to_stable() + self.requests.unlink() + with (self.steam / 'package/droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\nstart\n') self.assertEqual(0, self.install().returncode) self.assertFalse(self.requests.exists()) + self.assertEqual('steamdeck_stable\n', (self.steam / 'package/beta').read_text()) + + def test_a_pinned_beta_channel_never_falls_back(self): + package = self.break_client(2) + self.assertEqual(0, self.install().returncode) + with (package / 'droiddeck-unconfirmed').open('a') as marker: + marker.write('start\nstart\n') + self.assertEqual('steamdeck_publicbeta', self.channel(BL_STEAM_CHANNEL='beta')) + self.assertEqual(0, self.install(BL_STEAM_CHANNEL='beta').returncode) + self.assertFalse((package / 'droiddeck-channel').exists()) + + def test_the_channel_setting_selects_stable(self): + setting = self.home / '.config/droiddeck/steam-channel' + setting.parent.mkdir(parents=True) + setting.write_text('stable\n') + self.assertEqual('steamdeck_stable', self.channel()) + self.assert_installed('steamdeck_stable', expected=self.stable_requests(False)) + self.assertFalse((self.steam / 'package/droiddeck-channel').exists()) + + def empty_beta_manifest(self): + (self.cdn / 'steam_client_steamdeck_publicbeta_linuxarm64').write_text( + '"linuxarm64"\n{\n\t"version" "123457"\n' + '\t"client_steamrtarm64_linuxarm64"\n\t{\n' + '\t\t"file" "client.zip"\n\t\t"sha2" "00"\n' + '\t}\n}\n') + + def test_a_beta_manifest_without_an_arm64_client_falls_back_to_stable(self): + self.empty_beta_manifest() + result = self.assert_installed('steamdeck_stable', expected=self.stable_requests()) + self.assertIn('no client components in steam_client_steamdeck_publicbeta_linuxarm64', result.stderr) + self.assertIn('client_steamrtarm64_linuxarm64', result.stderr) + self.assertEqual('steamdeck_stable\n', (self.steam / 'package/droiddeck-channel').read_text()) + self.assertEqual('steamdeck_stable', self.channel()) + + def test_a_pinned_beta_manifest_without_an_arm64_client_fails_and_names_its_blocks(self): + self.empty_beta_manifest() + result = self.install(BL_STEAM_CHANNEL='beta') + self.assertNotEqual(0, result.returncode) + self.assertIn('client_steamrtarm64_linuxarm64', result.stderr) + self.assertFalse((self.steam / 'package/droiddeck-installed').exists()) def test_requested_repair_runs_once_and_is_retried_until_it_completes(self): package = self.break_client(0) @@ -177,6 +279,141 @@ cp "$TEST_CDN/${url##*/}" "$out" self.assertEqual(0, self.install().returncode) self.assertFalse(self.requests.exists()) + def publish(self, **parts): + 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 4f416a840..18c477a78 100644 --- a/tools/tests/test_steam_libraries.py +++ b/tools/tests/test_steam_libraries.py @@ -90,6 +90,20 @@ class LibraryListTest(unittest.TestCase): self.assertIn(self.pc, self.paths(self.run_main())) self.assertIn(self.card, self.paths(self.vdf.read_text())) + def test_added_library_is_registered_while_listed_and_forgotten_once_removed(self): + added = self.root / "lib" / "1" + manifest(added / "steamapps", 20) + with patch.object(library, "ADDED_DIR", str(self.root / "lib") + "/"): + self.listing.write_text(json.dumps([{"path": str(added), "label": "Documents"}])) + text = self.run_main() + self.assertIn(added, self.paths(text)) + self.assertIn('"20"\t\t"0"', text) + self.listing.write_text(json.dumps([])) + text = self.run_main() + self.assertNotIn(added, self.paths(text)) + self.assertIn(self.user, self.paths(text)) + self.assertTrue((added / "steamapps/appmanifest_20.acf").is_file()) + def test_without_a_list_only_the_card_is_managed(self): text = self.run_main(listing=False) self.assertEqual([self.steam, self.old, self.user, self.card], self.paths(text)) @@ -153,6 +167,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_restart_cap.py b/tools/tests/test_steam_restart_cap.py index 1763bc77f..d8c3e63d3 100644 --- a/tools/tests/test_steam_restart_cap.py +++ b/tools/tests/test_steam_restart_cap.py @@ -1,5 +1,7 @@ import re +import shlex import subprocess +import tempfile import unittest from pathlib import Path @@ -20,6 +22,30 @@ class SteamRestartCapTest(unittest.TestCase): return subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, check=True).stdout.split() + def installs(self, *steps): + function = stuck_function() + self.assertIsNotNone(function, "droiddeck-session has no steam_update_stuck()") + with tempfile.TemporaryDirectory() as root: + script = function + "steam_root=%s\nmkdir -p \"$steam_root/package\"\n" % shlex.quote(root) + script += "installed=\"$steam_root/package/steam_client_linuxarm64.installed\"\n" + script += "echo 0 > \"$installed\"\nsteam_updates=0\nsteam_installs=0\n" + script += "steam_update_stamp=$(stat -c '%n %Y %s' \"$steam_root\"/package/*.installed)\n" + for n, installed in enumerate(steps, 1): + if installed: + script += "printf '%%0%dd' 0 > \"$installed\"\n" % (n + 1) + script += "if steam_update_stuck 10; then echo stop; else echo restart; fi\n" + return subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, + check=True).stdout.split() + + def test_restarts_that_each_install_an_update_go_on(self): + self.assertEqual(["restart"] * 4, self.installs(True, False, True, False)) + + def test_an_update_that_never_installs_is_stopped_on_the_third(self): + self.assertEqual(["restart", "restart", "stop"], self.installs(False, False, False)) + + def test_installs_that_never_settle_are_stopped(self): + self.assertIn("stop", self.installs(*[True] * 12)) + def test_an_update_that_keeps_asking_at_once_is_stopped_on_the_third(self): self.assertEqual(["restart", "restart", "stop"], self.restarts(11, 13, 9)) diff --git a/tools/tests/test_steam_shaders.py b/tools/tests/test_steam_shaders.py new file mode 100644 index 000000000..1d273215a --- /dev/null +++ b/tools/tests/test_steam_shaders.py @@ -0,0 +1,88 @@ +from pathlib import Path +import runpy +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +MODULE = runpy.run_path(str(BIN / 'droiddeck-steam-shaders')) +apply = MODULE['apply'] +set_text = MODULE['set_text'] +parse = runpy.run_path(str(BIN / 'droiddeck-steam-ui-scale'))['parse'] + +THOR = '''"InstallConfigStore" +{ +\t"Software" +\t{ +\t\t"Valve" +\t\t{ +\t\t\t"Steam" +\t\t\t{ +\t\t\t\t"ShaderCacheManager" +\t\t\t\t{ +\t\t\t\t\t"HasCurrentBucket"\t\t"1" +\t\t\t\t\t"ProcessingQueue"\t\t"207140;848350;" +\t\t\t\t\t"App" +\t\t\t\t\t{ +\t\t\t\t\t} +\t\t\t\t} +\t\t\t} +\t\t} +\t} +} +''' + + +def disabled(text): + steam = parse(text).get('InstallConfigStore').get('Software').get('Valve').get('Steam') + return steam.get('ShaderCacheManager').get('DisableShaderCache') + + +class SteamShadersTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.config = self.root / 'config/config.vdf' + self.config.parent.mkdir() + + def test_off_adds_the_key_the_client_writes(self): + text, changed = set_text(THOR, False) + self.assertTrue(changed) + self.assertEqual('1', disabled(text)) + self.assertIn('\t\t\t\t\t"DisableShaderCache"\t\t"1"\n\t\t\t\t}', text) + self.assertIn('"ProcessingQueue"\t\t"207140;848350;"', text) + + def test_existing_value_is_replaced_in_place(self): + off, _ = set_text(THOR, False) + on, changed = set_text(off, True) + self.assertTrue(changed) + self.assertEqual('0', disabled(on)) + self.assertEqual(off.replace('"DisableShaderCache"\t\t"1"', '"DisableShaderCache"\t\t"0"'), on) + + def test_matching_value_leaves_the_file_alone(self): + off, _ = set_text(THOR, False) + self.assertEqual((off, False), set_text(off, False)) + + def test_missing_sections_are_created(self): + text, changed = set_text('"InstallConfigStore"\n{\n}\n', False) + self.assertTrue(changed) + self.assertEqual('1', disabled(text)) + + def test_apply_writes_config_and_creates_a_fresh_one(self): + self.config.write_text(THOR) + self.assertTrue(apply(self.root, False)) + self.assertEqual('1', disabled(self.config.read_text())) + self.assertFalse(apply(self.root, False)) + fresh = Path(self.temp.name) / 'fresh' + fresh.mkdir() + self.assertTrue(apply(fresh, True)) + self.assertEqual('0', disabled((fresh / 'config/config.vdf').read_text())) + + def test_invalid_config_is_rejected(self): + with self.assertRaises(ValueError): + set_text('"InstallConfigStore" {', False) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_steam_share.py b/tools/tests/test_steam_share.py new file mode 100644 index 000000000..214543357 --- /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 60a2998a6..a927d4db0 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_steam_x64_cpu.py b/tools/tests/test_steam_x64_cpu.py new file mode 100644 index 000000000..ad8e2dc27 --- /dev/null +++ b/tools/tests/test_steam_x64_cpu.py @@ -0,0 +1,79 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-steam-x64' + + +class SteamX64CpuTest(unittest.TestCase): + def selection(self, features, *, forced=False, same_build=True, unreadable=False): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + arm = root / 'arm' + x64 = root / 'x64' + for base in (arm, x64): + (base / 'package').mkdir(parents=True) + (arm / 'steamrtarm64').mkdir() + (arm / 'steamrtarm64/steamwebhelper').touch(mode=0o700) + shim = root / 'arm-shim' + shim.touch(mode=0o700) + (x64 / 'package/beta').write_text('publicbeta\n') + for base, arch, version in ((x64, 'steamrt64', '123'), (arm, 'linuxarm64', '123' if same_build else '122')): + (base / f'package/steam_client_publicbeta_{arch}.manifest').write_text(f'"version" "{version}"\n') + cpuinfo = root / 'cpuinfo' + if not unreadable: + cpuinfo.write_text(features) + text = SCRIPT.read_text() + start = text.find('x64_arm_webhelper_cpu_supported() {') + helper = text[start:text.index('x64_exec() {')] if start >= 0 else '' + selection = text.split('x64_exec() {', 1)[1].split(' mkdir -p "$STEAM_X64/logs"', 1)[0] + shell = helper + '\nx64_env() { :; }\nx64_webhelper_gpu() { return 1; }\nselect_helper() {' + selection + '\nprintf "%s|%s\\n" "${BL_X64_ARM_WEBHELPER:-x86}" "${BL_WEBHELPER_ARGS:-}";\n}\nselect_helper\n' + shell = shell.replace('/proc/cpuinfo', str(cpuinfo)).replace('/usr/local/bin/droiddeck-x64-arm-webhelper', str(shim)) + env = dict(os.environ, STEAM_X64=str(x64), ARM_STEAM=str(arm), X64_CHANNEL='publicbeta', BL_X64_X86_WEBHELPER='1' if forced else '0') + env.pop('BL_X64_ARM_WEBHELPER', None) + env.pop('BL_WEBHELPER_ARGS', None) + result = subprocess.run(['bash', '-eu', '-c', shell], env=env, capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stderr) + return result.stdout.strip(), str(shim) + + def test_missing_atomics_keeps_x86_helper(self): + result, _ = self.selection('Features : fp asimd aes crc32\n') + self.assertEqual(result, 'x86|stock') + + def test_atomics_keeps_same_build_arm_helper(self): + result, arm = self.selection('Features : fp asimd atomics aes\n') + self.assertEqual(result, arm + '|') + + def test_exact_token_required(self): + result, _ = self.selection('Features : fp noatomics atomics_extra\n') + self.assertEqual(result, 'x86|stock') + + def test_any_explicit_core_without_atomics_keeps_x86_helper(self): + result, _ = self.selection('processor : 0\nFeatures : fp atomics\nprocessor : 1\nFeatures : fp aes\n') + self.assertEqual(result, 'x86|stock') + + def test_empty_features_is_explicitly_unsupported(self): + result, _ = self.selection('Features : \n') + self.assertEqual(result, 'x86|stock') + + def test_absent_features_preserves_existing_behavior(self): + result, arm = self.selection('processor : 0\n') + self.assertEqual(result, arm + '|') + + def test_unreadable_cpuinfo_preserves_existing_behavior(self): + result, arm = self.selection('', unreadable=True) + self.assertEqual(result, arm + '|') + + def test_forced_x86_still_wins(self): + result, _ = self.selection('Features : atomics\n', forced=True) + self.assertEqual(result, 'x86|stock') + + def test_supported_cpu_still_requires_same_build(self): + result, _ = self.selection('Features : atomics\n', same_build=False) + self.assertEqual(result, 'x86|stock') + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_steam_x64_signin.py b/tools/tests/test_steam_x64_signin.py index c294108e8..ea761c68c 100644 --- a/tools/tests/test_steam_x64_signin.py +++ b/tools/tests/test_steam_x64_signin.py @@ -39,12 +39,16 @@ class X64SignInTest(unittest.TestCase): self.write(self.x64 / 'config/loginusers.vdf', '"users"\n{\n}\n') self.write(self.x64 / 'config/config.vdf', CONFIG % '') self.write(self.home / '.droiddeck-x64/.steam/registry.vdf', REGISTRY % '') + self.bin = self.home / 'bin' + self.bin.mkdir() + (self.bin / 'pgrep').write_text('#!/bin/sh\nexit 1\n') + (self.bin / 'pgrep').chmod(0o755) def write(self, path, text): path.write_text(text) def sync(self): - env = dict(os.environ, HOME=str(self.home)) + env = dict(os.environ, HOME=str(self.home), PATH='%s:%s' % (self.bin, os.environ['PATH'])) env.pop('XDG_DATA_HOME', None) env.pop('BL_X64_HOME', None) return subprocess.run(['bash', str(SCRIPT), '--sync-login'], env=env, capture_output=True, text=True, check=True) diff --git a/tools/tests/test_steamrt_shim.py b/tools/tests/test_steamrt_shim.py new file mode 100644 index 000000000..05f7345fe --- /dev/null +++ b/tools/tests/test_steamrt_shim.py @@ -0,0 +1,123 @@ +import os +from pathlib import Path +import re +import subprocess +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +SHIM = BIN / 'droiddeck-steamrt-shim' +SESSION = (BIN / 'droiddeck-session').read_text() +X64 = (BIN / 'droiddeck-steam-x64').read_text() + + +class SteamrtShimTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.client = self.root / 'steamrtarm64' + self.client.mkdir() + self.shim = self.root / 'shim' + + def runtime(self, path): + runtime = self.client / path + (runtime / 'bin').mkdir(parents=True) + (runtime / 'bin/steam-runtime-check-requirements').write_text('#!/bin/sh\nexit 1\n') + (runtime / 'bin/steam-runtime-system-info').write_text('#!/bin/sh\necho info\n') + (runtime / 'files').mkdir() + (runtime / 'files/marker').write_text('runtime files') + return runtime + + def build(self): + return subprocess.run(['bash', str(SHIM), str(self.client), str(self.shim)], + capture_output=True, text=True, timeout=30) + + def sh(self, *args): + return subprocess.run(['sh', *map(str, args)], capture_output=True, text=True, timeout=30) + + def assert_shim(self): + result = self.build() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(0, self.sh(self.shim / 'bin/steam-runtime-check-requirements').returncode) + self.assertEqual('info\n', self.sh(self.shim / 'bin/steam-runtime-system-info').stdout) + self.assertEqual('runtime files', (self.shim / 'files/marker').read_text()) + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=BL_SHIM_TEST=yes', + f'--directory={self.root}', '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + self.assertEqual(f'yes {self.root.name}\n', launched.stdout) + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env', 'BL_SHIM_TEST=split', + '--directory', self.root, '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + self.assertEqual(f'split {self.root.name}\n', launched.stdout) + missing = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--directory', self.root / 'missing', + '--', 'true') + self.assertEqual(127, missing.returncode) + + def test_a_client_without_a_container_gets_no_shim(self): + self.shim.mkdir() + self.assertEqual(1, self.build().returncode) + self.assertFalse(self.shim.exists()) + + def test_the_pressure_vessel_runtime_is_shimmed(self): + self.runtime('pv-runtime/steam-runtime-steamrt') + self.assert_shim() + + def test_a_requirements_probe_elsewhere_is_shimmed(self): + self.runtime('steam-runtime') + self.assert_shim() + + def test_the_arm64_session_starts_a_containerized_client_through_the_shim(self): + block = re.search(r'\n( +steam_client=\("\$steam_root/steamrtarm64/steam"\)\n.*?\n fi\n)', SESSION, re.S).group(1) + stub = self.root / 'droiddeck-steamrt-shim' + for status, shimmed in ((1, False), (0, True)): + stub.write_text(f'#!/bin/bash\nexit {status}\n') + stub.chmod(0o755) + script = 'if :; then\n' + block + 'printf "%s\\n" "${steam_client[@]}"\n' + env = dict(os.environ, HOME=str(self.root), steam_root='/steam', + PATH=str(self.root) + os.pathsep + os.environ['PATH']) + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=30) + self.assertEqual(0, result.returncode, result.stderr) + lines = result.stdout.splitlines() + self.assertEqual('/steam/steamrtarm64/steam', lines[-1]) + self.assertEqual(shimmed, 'Valve containerized the arm64 Steam client' in result.stdout) + self.assertEqual(shimmed, any(line.startswith('STEAM_RUNTIME_STEAMRT=') and + line.endswith('/.droiddeck-steamrt-shim') for line in lines)) + + def test_both_clients_are_told_they_already_run_inside_the_container(self): + guard = SESSION.index('export STEAM_STEAMRT_RECURSION_GUARD=1') + self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_bl_ui[@]}"')) + self.assertIn('-u STEAM_STEAMRT_RECURSION_GUARD', SESSION[:guard]) + self.assertIn('export STEAM_STEAMRT_RECURSION_GUARD=1', X64) + self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim"', X64) + + +class SessionChannelTest(unittest.TestCase): + BLOCK = re.search(r'\n( +steam_channel=steamdeck_publicbeta\n.*?\n +fi\n)', SESSION, re.S).group(1) + + def channel(self, x64, installer): + with tempfile.TemporaryDirectory() as temp: + stub = Path(temp) / 'droiddeck-steam-install' + stub.write_text('#!/bin/bash\n' + installer + '\n') + stub.chmod(0o755) + env = dict(os.environ, steam_x64=x64, PATH=temp + os.pathsep + os.environ['PATH']) + result = subprocess.run(['bash', '-c', self.BLOCK + 'echo "$steam_channel"\n'], env=env, + capture_output=True, text=True, timeout=30) + self.assertEqual(0, result.returncode, result.stderr) + return result.stdout.strip() + + def test_the_arm64_client_follows_the_installed_channel(self): + self.assertEqual('steamdeck_stable', self.channel('0', '[ "$1" = --channel ] && echo steamdeck_stable')) + + def test_an_installer_without_an_answer_keeps_the_deck_beta(self): + self.assertEqual('steamdeck_publicbeta', self.channel('0', 'exit 1')) + + def test_the_x86_client_keeps_its_own_channel(self): + self.assertEqual('steamdeck_publicbeta', self.channel('1', 'echo steamdeck_stable')) + + def test_the_client_branch_on_disk_and_clientbeta_use_the_same_channel(self): + self.assertIn('-clientbeta "$steam_channel"', SESSION) + self.assertIn('echo "$steam_channel" > "$steam_beta"', SESSION) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_storage_owner_preload.py b/tools/tests/test_storage_owner_preload.py new file mode 100644 index 000000000..a66719860 --- /dev/null +++ b/tools/tests/test_storage_owner_preload.py @@ -0,0 +1,105 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +FAKE = r""" +#define _GNU_SOURCE +#include <fcntl.h> +#include <stdio.h> +#include <string.h> +#include <sys/statfs.h> +#include <sys/syscall.h> +#include <unistd.h> + +uid_t getuid(void) { + return (uid_t)syscall(SYS_getuid) + 1; +} + +int fstatfs(int fd, struct statfs *out) { + char link[32], path[4096]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", fd); + long n = syscall(SYS_readlinkat, AT_FDCWD, link, path, sizeof(path) - 1); + path[n > 0 ? n : 0] = '\0'; + int result = (int)syscall(SYS_fstatfs, fd, out); + if (result == 0 && strstr(path, "/fuse/")) out->f_type = 0x65735546; + if (result == 0 && strstr(path, "/sdcardfs/")) out->f_type = 0x5dca2df5; + if (result == 0 && strstr(path, "/ext4/")) out->f_type = 0xef53; + return result; +} +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <unistd.h> + +int main(int argc, char **argv) { + uid_t real = (uid_t)syscall(SYS_getuid); + for (int i = 1; i < argc; i++) { + int fd = open(argv[i], O_RDONLY); + struct stat st; + errno = 1234; + int result = fstat(fd, &st); + printf("%s %d\n", st.st_uid == real ? "real" : st.st_uid == real + 1 ? "user" : "other", result == 0 && errno == 1234); + close(fd); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class StorageOwnerPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.temp = tempfile.TemporaryDirectory() + cls.dir = Path(cls.temp.name) + build = cls.dir / "build" + build.mkdir() + (build / "fake.c").write_text(FAKE) + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + cls.fake = build / "fake.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.fake), str(build / "fake.c")], check=True) + cls.wineserver = build / "wineserver" + subprocess.run(["cc", "-O2", "-o", str(cls.wineserver), str(build / "program.c")], check=True) + cls.other = build / "wine64-preloader" + shutil.copy(cls.wineserver, cls.other) + for kind in ("fuse", "sdcardfs", "ext4"): + (cls.dir / kind).mkdir() + (cls.dir / kind / "file").write_text("x") + + @classmethod + def tearDownClass(cls): + cls.temp.cleanup() + + def owners(self, program, *kinds): + env = dict(os.environ, LD_PRELOAD="%s:%s" % (self.fake, self.preload)) + env.pop("BL_STORAGE_DIAGNOSTICS", None) + paths = [str(self.dir / kind / "file") for kind in kinds] + result = subprocess.run([str(program)] + paths, env=env, capture_output=True, text=True, check=True) + return result.stdout.split() + + def test_wineserver_owns_what_is_on_android_storage(self): + self.assertEqual(["user", "1", "user", "1"], self.owners(self.wineserver, "fuse", "sdcardfs")) + + def test_other_filesystems_keep_their_owner(self): + self.assertEqual(["real", "1"], self.owners(self.wineserver, "ext4")) + + def test_other_programs_see_the_real_owner(self): + self.assertEqual(["real", "1", "real", "1"], self.owners(self.other, "fuse", "sdcardfs")) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_storage_preload.py b/tools/tests/test_storage_preload.py index 4bdee7826..f2408fd1e 100644 --- a/tools/tests/test_storage_preload.py +++ b/tools/tests/test_storage_preload.py @@ -81,7 +81,7 @@ class StoragePreloadTest(unittest.TestCase): (build / "program.c").write_text(PROGRAM) cls.storage = build / "storage.so" cls.fake = build / "fake.so" - subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.storage), str(PRELOAD / "storage.c"), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.storage), str(PRELOAD / "storage.c"), str(PRELOAD / "owner.c"), "-ldl"], check=True) subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.fake), str(build / "fake.c")], check=True) cls.steam = cls.dir / "steamrtarm64/steam" cls.steam.parent.mkdir() diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 5da2972ed..fcdcbb21e 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -1,6 +1,3 @@ -"""droiddeck-store-launch: a launch from anywhere - the Steam client's own Play button included - -asks the app for an Epic game's sign-in code before Proton starts. These pin how it recognises a -store game, how it asks, and that both Proton launchers call it.""" import importlib.machinery import importlib.util import json @@ -277,11 +274,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 @@ -362,6 +388,30 @@ def set_registry(**arguments): class GogRegistry(unittest.TestCase): + def test_patch_registration_uses_authentic_build_and_the_prefix_registry_executable(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='7') + (folder / 'goggame-7.id').write_text(json.dumps({'buildId': 'opaque-0001'})) + proton = Path(root) / 'proton'; proton.write_text('selected Proton') + data = Path(root) / 'compat' + executable = data / 'pfx/drive_c/windows/system32/reg.exe' + executable.parent.mkdir(parents=True); executable.write_bytes(b'MZreg') + (data / 'pfx/system.reg').write_text('registry') + imported = [] + def run(argv, **kwargs): + self.assertEqual([str(proton), 'run', str(executable), 'import'], argv[:4]) + text = Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le') + imported.append(text) + return __import__('subprocess').CompletedProcess(argv, 0) + record = {'id': '7', 'build': 'opaque-0001', 'version': 'RC-final'} + with patch.object(store.subprocess, 'run', side_effect=run): + self.assertTrue(store.apply_gog_registry(folder, str(data), str(proton), installation=record).startswith('written=')) + self.assertIn('[HKEY_LOCAL_MACHINE\\Software\\GOG.com\\Games\\7]', imported[0]) + self.assertIn('"BUILDID"="opaque-0001"', imported[0]) + self.assertIn('"VER"="RC-final"', imported[0]) + with self.assertRaises(ValueError): + store.apply_gog_registry(folder, str(data), str(proton), installation=dict(record, build='invented')) + def test_the_scripts_registry_values_are_read_with_the_games_paths(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog', ident='1454587428') diff --git a/tools/tests/test_store_shortcuts.py b/tools/tests/test_store_shortcuts.py index 082011e8f..1c454fa77 100644 --- a/tools/tests/test_store_shortcuts.py +++ b/tools/tests/test_store_shortcuts.py @@ -1,6 +1,3 @@ -"""The shortcuts writer and a store install: the app registers a game GOG, Epic or Amazon -installed through the same listing as an added folder, pointing the shortcut at the game's -launcher .bat when it has one. These pin the parts of the writer that contract relies on.""" import importlib.machinery import importlib.util import json @@ -28,8 +25,6 @@ LAUNCHER = FOLDER + '/.droiddeck-launch.bat' def app_id(exe, name): - """The appid the app computes for a shortcut (AddedGames.scanGame): CRC32 of the quoted exe - and the name, high bit set - what Steam itself derives for a shortcut it is given.""" return (zlib.crc32(('"%s"' % exe + name).encode()) | 0x80000000) & 0xFFFFFFFF diff --git a/tools/tests/test_su_wrapper.py b/tools/tests/test_su_wrapper.py new file mode 100644 index 000000000..215420bdb --- /dev/null +++ b/tools/tests/test_su_wrapper.py @@ -0,0 +1,53 @@ +import getpass +import os +import subprocess +import tempfile +import unittest +from pathlib import Path + +SU = Path(__file__).resolve().parents[1] / "ubuntu/overlay-runtime/usr/local/bin/su" + + +class SuWrapperTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.dir = Path(temp.name) + sudo = self.dir / "sudo" + sudo.write_text("#!/bin/bash\nprintf 'sudo'; printf ' <%s>' \"$@\"; echo\n") + sudo.chmod(0o755) + self.su = self.dir / "su" + self.su.write_text(SU.read_text().replace("/usr/local/bin/sudo", str(sudo))) + self.su.chmod(0o755) + + def run_su(self, *args): + env = dict(os.environ, SHELL="/bin/bash") + return subprocess.run([str(self.su), *args], capture_output=True, text=True, timeout=30, env=env) + + def test_a_command_after_the_user_reaches_the_root_shell(self): + out = self.run_su("root", "-c", "echo hi") + self.assertEqual("sudo <-s> <echo hi>\n", out.stdout) + + def test_the_current_user_is_not_elevated(self): + out = self.run_su(getpass.getuser(), "-c", "echo as-me") + if getpass.getuser() == "root": + self.assertEqual("sudo <-s> <echo as-me>\n", out.stdout) + else: + self.assertEqual("as-me\n", out.stdout) + + def test_arguments_after_the_user_go_to_the_shell(self): + out = self.run_su("-", "root", "-c", "echo $0 $1", "zero", "one") + self.assertEqual("sudo <-i> </bin/bash> <-c> <echo $0 $1> <zero> <one>\n", out.stdout) + + def test_other_users_are_refused(self): + out = self.run_su("droiddeck-nobody-here") + self.assertEqual(1, out.returncode) + self.assertEqual("", out.stdout) + + def test_plain_su_opens_a_root_shell(self): + self.assertEqual("sudo <-s>\n", self.run_su().stdout) + self.assertEqual("sudo <-i>\n", self.run_su("-").stdout) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_termux_jni.py b/tools/tests/test_termux_jni.py index 6fd3d9787..94fe29fd3 100644 --- a/tools/tests/test_termux_jni.py +++ b/tools/tests/test_termux_jni.py @@ -12,7 +12,6 @@ TERMUX_DIR = TESTS.parents[1] / "app/src/main/cpp/termux" def jni_include_dir(): - """A directory holding jni.h: JNI_INCLUDE, then the JDK, then the Android NDK.""" candidates = [os.environ.get("JNI_INCLUDE")] java_home = os.environ.get("JAVA_HOME") if java_home: @@ -29,7 +28,6 @@ def jni_include_dir(): def include_flags(): - """-I flags for jni.h, plus the JDK's per-platform directory that holds jni_md.h.""" base = jni_include_dir() flags = ["-I", base] for sub in glob.glob(os.path.join(base, "*")): diff --git a/tools/tests/test_validate_apk.py b/tools/tests/test_validate_apk.py index d197d74cf..448d969a9 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 000000000..8f9fbd644 --- /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 9fcf1f10d..416f6b61b 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_vrclient_loader.py b/tools/tests/test_vrclient_loader.py index fa1a778bf..d3b41e563 100644 --- a/tools/tests/test_vrclient_loader.py +++ b/tools/tests/test_vrclient_loader.py @@ -33,6 +33,7 @@ int probe(void) { #include <dlfcn.h> int bl_fsync_syscall(long n, const long *a, long *r) { (void)n; (void)a; (void)r; return 0; } int bl_writewatch_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } +int bl_clock_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } #include """ + '"' + robust.as_posix() + '"' + r""" int main(int argc, char **argv) { assert(argc == 3); diff --git a/tools/tests/test_webkitinput.py b/tools/tests/test_webkitinput.py new file mode 100644 index 000000000..31dbae0aa --- /dev/null +++ b/tools/tests/test_webkitinput.py @@ -0,0 +1,74 @@ +import os +import platform +import shutil +import subprocess +import tempfile +import unittest +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] +SOURCE = ROOT / "tools/linuxfs/fex/webkitinput.c" + +WEBKIT = r""" +#include <stdio.h> +#include <stdlib.h> +const char *g_getenv(const char *name) { return getenv(name); } +void webkit_web_view_load_uri(void *view, const char *uri) { (void)view; printf("%s\n", uri); } +""" + +LOADER = r""" +void webkit_web_view_load_uri(void *view, const char *uri); +int main(int argc, char **argv) { + for (int i = 1; i < argc; i++) webkit_web_view_load_uri(0, argv[i]); + return 0; +} +""" + +URIS = [ + "https://www.fab.com", + "https://fab.com/listings/1", + "http://www.fab.com?x=1", + "https://www.fab.com:443/", + "https://store.epicgames.com/en-US/", + "https://www.fab.community/", + "https://notfab.com/", + "tauri://localhost", +] + + +@unittest.skipUnless(platform.machine() == "x86_64" and shutil.which("gcc"), "webkitinput is built for x86_64 guests") +class WebKitInputTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.tmp = Path(tempfile.mkdtemp()) + (cls.tmp / "webkit.c").write_text(WEBKIT) + (cls.tmp / "loader.c").write_text(LOADER) + subprocess.run(["gcc", "-m64", "-shared", "-fPIC", "-O2", "-Wall", "-Wextra", "-nostdlib", "-fno-stack-protector", + "-fno-builtin", "-fvisibility=hidden", "-o", str(cls.tmp / "libwebkitinput.so"), str(SOURCE)], check=True) + subprocess.run(["gcc", "-shared", "-fPIC", "-o", str(cls.tmp / "libfakewebkit.so"), str(cls.tmp / "webkit.c")], check=True) + subprocess.run(["gcc", "-o", str(cls.tmp / "loader"), str(cls.tmp / "loader.c"), "-L" + str(cls.tmp), + "-Wl,--no-as-needed", "-lwebkitinput", "-lfakewebkit", "-ldl", "-Wl,-rpath," + str(cls.tmp)], check=True) + + @classmethod + def tearDownClass(cls): + shutil.rmtree(cls.tmp, ignore_errors=True) + + def load(self, hidden): + env = {k: v for k, v in os.environ.items() if k != "DROIDDECK_EPIC_HIDDEN"} + if hidden is not None: + env["DROIDDECK_EPIC_HIDDEN"] = hidden + result = subprocess.run([str(self.tmp / "loader")] + URIS, env=env, capture_output=True, text=True, timeout=10) + self.assertEqual(0, result.returncode, result.stderr) + return result.stdout.splitlines() + + def test_the_hidden_launcher_loads_a_blank_page_for_fab(self): + self.assertEqual(["about:blank"] * 4 + URIS[4:], self.load("1")) + + def test_the_visible_launcher_loads_every_page(self): + self.assertEqual(URIS, self.load(None)) + self.assertEqual(URIS, self.load("0")) + self.assertEqual(URIS, self.load("10")) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_wincomponents.py b/tools/tests/test_wincomponents.py index ac50803d1..d7686ebf1 100644 --- a/tools/tests/test_wincomponents.py +++ b/tools/tests/test_wincomponents.py @@ -123,6 +123,103 @@ class WinComponentsTest(unittest.TestCase): self.assertEqual(names, []) self.assertEqual(notes, ["physx is not installed; skipped"]) + def test_a_component_gone_from_the_store_keeps_what_it_placed(self): + self.component("dmband", ["dmband"], {"syswow64/dmband.dll": b"band"}) + meta = self.store / "directmusic" + meta.mkdir(parents=True) + (meta / "component.json").write_text(json.dumps({"id": "directmusic", "overrides": [], "requires": ["dmband"]})) + self.component("openal", ["openal32"], {"syswow64/OpenAL32.dll": b"x86"}) + self.pick("directmusic", "openal") + self.apply() + for cid in ("dmband", "directmusic", "openal"): + for path in sorted((self.store / cid).rglob("*"), reverse=True): + path.rmdir() if path.is_dir() else path.unlink() + (self.store / cid).rmdir() + names, notes = self.apply() + self.assertEqual(MODULE["overrides_value"](names), "dmband=n,b;openal32=n,b") + self.assertEqual((self.pfx / "syswow64/dmband.dll").read_bytes(), b"band") + self.assertEqual((self.pfx / "syswow64/openal32.dll").read_bytes(), b"x86") + self.assertTrue(all("kept the files it placed" in note for note in notes), notes) + self.component("openal", ["openal32"], {"syswow64/OpenAL32.dll": b"x86 v2"}) + os.utime(self.store / "openal/syswow64/OpenAL32.dll", (1, 1)) + names, _ = self.apply() + self.assertEqual(MODULE["overrides_value"](names), "dmband=n,b;openal32=n,b") + self.assertEqual((self.pfx / "syswow64/openal32.dll").read_bytes(), b"x86 v2") + self.pick() + self.apply() + self.assertFalse((self.pfx / "syswow64/dmband.dll").exists()) + self.assertFalse((self.pfx / "syswow64/openal32.dll").exists()) + + def test_state_from_before_the_update_keeps_a_missing_bundles_parts(self): + self.component("dmband", ["dmband"], {"syswow64/dmband.dll": b"band"}) + meta = self.store / "directmusic" + meta.mkdir(parents=True) + (meta / "component.json").write_text(json.dumps({"id": "directmusic", "overrides": [], "requires": ["dmband"]})) + self.pick("directmusic") + self.apply() + state_file = self.compat / ".droiddeck-wincomponents.json" + state = json.loads(state_file.read_text()) + rel = next(iter(state["files"])) + state_file.write_text(json.dumps({"files": state["files"], "components": state["components"], "registry": {}})) + for cid in ("dmband", "directmusic"): + for path in sorted((self.store / cid).rglob("*"), reverse=True): + path.rmdir() if path.is_dir() else path.unlink() + (self.store / cid).rmdir() + dll = self.compat / "pfx" / rel + for _ in range(2): + names, notes = self.apply() + self.assertEqual(MODULE["overrides_value"](names), "dmband=n,b") + self.assertEqual(dll.read_bytes(), b"band") + self.assertEqual(len(notes), 2) + saved = json.loads(state_file.read_text()) + self.assertEqual(saved["guessed"], ["directmusic"]) + self.assertNotIn("directmusic", saved["requires"]) + self.component("dmband", ["dmband"], {"syswow64/dmband.dll": b"band2"}) + names, _ = self.apply() + self.assertEqual(MODULE["overrides_value"](names), "dmband=n,b") + self.assertEqual(dll.read_bytes(), b"band2") + self.assertEqual(json.loads(state_file.read_text())["guessed"], ["directmusic"]) + self.pick() + self.apply() + self.assertFalse(dll.exists()) + + def test_a_missing_legacy_bundle_with_its_own_files_keeps_its_parts_and_their_registry(self): + self.pfx.parent.mkdir(parents=True) + user = self.compat / "pfx/user.reg" + user.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Test] 1700000000\n"Mode"="ours"\n') + ident = "HKCU\tsoftware\\test\tmode" + own = self.compat / "pfx/drive_c/windows/syswow64/bundle.dll" + part = self.compat / "pfx/drive_c/windows/syswow64/part.dll" + for path in (own, part): + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"x") + self.compat.joinpath(".droiddeck-wincomponents.json").write_text(json.dumps({ + "files": {"drive_c/windows/syswow64/bundle.dll": "bundle", "drive_c/windows/syswow64/part.dll": "part"}, + "components": ["bundle", "part", "tweak"], + "registry": {ident: {"prev": None, "cid": "tweak", "hive": "HKCU", "key": "Software\\Test", "name": "Mode"}}})) + self.pick("bundle") + names, _ = self.apply() + self.assertEqual(set(MODULE["overrides_value"](names).split(";")), {"bundle=n,b", "part=n,b"}) + self.assertTrue(own.exists() and part.exists()) + self.assertIn('"Mode"="ours"', user.read_text()) + saved = json.loads((self.compat / ".droiddeck-wincomponents.json").read_text()) + self.assertEqual(saved["guessed"], ["bundle"]) + self.assertIn(ident, saved["registry"]) + + def test_a_missing_component_that_only_set_registry_values_keeps_them(self): + self.pfx.parent.mkdir(parents=True) + user = self.compat / "pfx/user.reg" + user.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Test] 1700000000\n"Mode"="ours"\n') + ident = "HKCU\tsoftware\\test\tmode" + self.compat.joinpath(".droiddeck-wincomponents.json").write_text(json.dumps({ + "files": {}, "components": ["tweak"], "requires": {}, "overrides": {"tweak": []}, + "registry": {ident: {"prev": None, "cid": "tweak", "hive": "HKCU", "key": "Software\\Test", "name": "Mode"}}})) + self.pick("tweak") + _, notes = self.apply() + self.assertIn('"Mode"="ours"', user.read_text()) + self.assertIn("tweak is not in the store; kept the files it placed until it is installed again", notes) + self.assertIn(ident, json.loads((self.compat / ".droiddeck-wincomponents.json").read_text())["registry"]) + def test_no_selection_touches_nothing(self): self.assertEqual(self.apply(), ([], [])) self.assertFalse(self.compat.exists()) diff --git a/tools/tests/test_winebus_rumble_preload.py b/tools/tests/test_winebus_rumble_preload.py index 82e3b0112..abd60c274 100644 --- a/tools/tests/test_winebus_rumble_preload.py +++ b/tools/tests/test_winebus_rumble_preload.py @@ -8,7 +8,6 @@ import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" -# Stands in for libfakeinput.so, which ld.so.preload lists after libblsession.so. SHIM = r""" #include <linux/input.h> #include <stdarg.h> diff --git a/tools/tests/test_writable_preload.py b/tools/tests/test_writable_preload.py new file mode 100644 index 000000000..dd18f6365 --- /dev/null +++ b/tools/tests/test_writable_preload.py @@ -0,0 +1,109 @@ +import os +from pathlib import Path +import shutil +import stat +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +PROGRAM = r""" +#define _GNU_SOURCE +#include <fcntl.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +int main(int argc, char **argv) { + for (int i = 1; i + 1 < argc; i += 2) { + const char *op = argv[i], *path = argv[i + 1]; + int ok; + if (strcmp(op, "access") == 0) ok = access(path, W_OK) == 0; + else if (strcmp(op, "access-rw") == 0) ok = access(path, R_OK | W_OK) == 0; + else if (strcmp(op, "faccessat") == 0) { + int dir = open(".", O_RDONLY | O_DIRECTORY); + ok = faccessat(dir, path, W_OK, 0) == 0; + close(dir); + } else if (strcmp(op, "write") == 0) { + int fd = open(path, O_WRONLY | O_TRUNC); + ok = fd >= 0 && write(fd, "saved", 5) == 5; + if (fd >= 0) close(fd); + } else if (strcmp(op, "create") == 0) { + int fd = open(path, O_WRONLY | O_CREAT | O_EXCL, 0600); + ok = fd >= 0; + if (fd >= 0) close(fd); + } else ok = 0; + printf("%s %d\n", op, ok); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc") and os.geteuid() != 0, "needs a C compiler and a non-root user") +class WritablePreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.dir = Path(tempfile.mkdtemp()) + build = cls.dir / "build" + build.mkdir() + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + cls.editor = build / "kate" + subprocess.run(["cc", "-O2", "-o", str(cls.editor), str(build / "program.c")], check=True) + cls.wine = build / "wine64-preloader" + shutil.copy(cls.editor, cls.wine) + + @classmethod + def tearDownClass(cls): + shutil.rmtree(cls.dir, True) + + def setUp(self): + self.work = Path(tempfile.mkdtemp(dir=self.dir)) + self.addCleanup(self.unlock) + self.ini = self.work / "My Games/FalloutNV/FALLOUT.INI" + self.ini.parent.mkdir(parents=True) + self.ini.write_text("bUseThreadedAI=0\n") + self.ini.chmod(0o400) + self.locked = self.work / "Locked" + self.locked.mkdir() + self.locked.chmod(0o500) + + def unlock(self): + for path in (self.ini, self.locked): + path.chmod(0o700) + + def run_as(self, program, *args, preload=True): + env = dict(os.environ) + env.pop("LD_PRELOAD", None) + if preload: + env["LD_PRELOAD"] = str(self.preload) + out = subprocess.run([str(program), *map(str, args)], env=env, cwd=self.ini.parent, + capture_output=True, text=True, check=True, timeout=60).stdout + return dict(line.split() for line in out.splitlines()) + + def test_without_the_preload_a_read_only_file_cannot_be_saved(self): + out = self.run_as(self.editor, "access", self.ini, "write", self.ini, preload=False) + self.assertEqual(out, {"access": "0", "write": "0"}) + + def test_a_desktop_app_can_save_a_read_only_file_like_root(self): + out = self.run_as(self.editor, "access", self.ini, "access-rw", self.ini, "faccessat", self.ini.name, + "write", self.ini, "create", self.locked / "new.tmp") + self.assertEqual(out, {"access": "1", "access-rw": "1", "faccessat": "1", "write": "1", "create": "1"}) + self.assertEqual(self.ini.read_text(), "saved") + + def test_checking_access_alone_leaves_the_mode_alone(self): + self.run_as(self.editor, "access", self.ini) + self.assertEqual(stat.S_IMODE(self.ini.stat().st_mode), 0o400) + + def test_wine_keeps_windows_read_only_files_read_only(self): + out = self.run_as(self.wine, "access", self.ini, "write", self.ini, "create", self.locked / "new.tmp") + self.assertEqual(out, {"access": "0", "write": "0", "create": "0"}) + self.assertEqual(self.ini.read_text(), "bUseThreadedAI=0\n") + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_xbox_build_source.py b/tools/tests/test_xbox_build_source.py index 8177a1cbc..427cea342 100644 --- a/tools/tests/test_xbox_build_source.py +++ b/tools/tests/test_xbox_build_source.py @@ -31,14 +31,14 @@ class XboxBuildSourceTest(unittest.TestCase): git('switch', '-q', 'main') (root / 'backend').write_text('merged backend') git('commit', '-qam', 'backend changed after branch') - for name in ('xbox', 'apk'): + for name in ('source', 'xbox', 'components', 'apk', 'tests', 'dispatch'): git('clone', '-q', str(root), str(root / name)) git('checkout', '-q', head, cwd=root / name) output = root / 'output' env['GITHUB_OUTPUT'] = str(output) - subprocess.run(['bash', '-c', step('xbox', 'Pin and merge the APK source')], cwd=root / 'xbox', env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step('source', 'Pin and merge the APK source')], cwd=root / 'source', env=env, check=True, capture_output=True) base = output.read_text().strip().split('=', 1)[1] - tree = git('rev-parse', 'HEAD^{tree}', cwd=root / 'xbox') + tree = git('rev-parse', 'HEAD^{tree}', cwd=root / 'source') (root / 'backend').write_text('newer main, after backend build') git('commit', '-qam', 'main advanced again') env.update(BUILD_BASE_SHA=base, XBOX_SOURCE_TREE=tree) @@ -46,3 +46,19 @@ class XboxBuildSourceTest(unittest.TestCase): subprocess.run(['bash', '-c', step('build', 'Verify backend and APK source match')], cwd=root / 'apk', env=env, check=True, capture_output=True) self.assertEqual((root / 'apk/backend').read_text(), 'merged backend') self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / 'apk'), tree) + + subprocess.run(['bash', '-c', step('python-tests', 'Merge the pinned APK base')], cwd=root / 'tests', env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step('python-tests', 'Verify backend and test source match')], cwd=root / 'tests', env=env, check=True, capture_output=True) + self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / 'tests'), tree) + + env['SOURCE_TREE'] = tree + for job in ('xbox', 'components'): + subprocess.run(['bash', '-c', step(job, 'Merge the pinned APK base')], cwd=root / job, env=env, check=True, capture_output=True) + subprocess.run(['bash', '-c', step(job, 'Verify pinned source tree')], cwd=root / job, env=env, check=True, capture_output=True) + self.assertEqual(git('rev-parse', 'HEAD^{tree}', cwd=root / job), tree) + + trusted = root / 'trusted-output' + env['GITHUB_OUTPUT'] = str(trusted) + subprocess.run(['bash', '-c', step('source', 'Resolve trusted manifest base')], cwd=root / 'dispatch', env=env, check=True, capture_output=True) + self.assertEqual(trusted.read_text().strip(), 'base-sha=' + git('rev-parse', 'main')) + self.assertNotEqual(git('rev-parse', 'HEAD', cwd=root / 'dispatch'), git('rev-parse', 'main')) diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index fb7bfdc0d..1701d6ea4 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_its_own_folder_on_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:\\droiddeck-xbox-1ZpM3D\\Bin\\Game.exe'], str(view.parent))]) + 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:\\droiddeck-xbox-new\\Game.exe', devices / 'v:')) + self.assertEqual(os.readlink(devices / 'v:'), str(view.parent)) + 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/ubuntu/README.md b/tools/ubuntu/README.md new file mode 100644 index 000000000..ceea395c5 --- /dev/null +++ b/tools/ubuntu/README.md @@ -0,0 +1,48 @@ +# The Linux runtime (Ubuntu) + +DroidDeck's Linux runtime: Ubuntu 26.04 LTS for arm64, with Kubuntu's Plasma desktop as a separate download, set up as +SteamOS's desktop mode (Valve's Vapor theme, the Steam Deck wallpaper, "Return to Gaming Mode" and +Steam on the desktop). The app installs it into `files/linuxfs` and runs it under its patched proot. + +- `build-debs.sh` (run in an `ubuntu:26.04` container on an arm64 runner) rebuilds two Ubuntu source + packages: Mesa with `-Dfreedreno-kmds=msm,kgsl`, so Turnip and freedreno reach Android's + `/dev/kgsl-3d0`, and KWin with `patches/kwin` (nested desktop scale, an explicit render node, + scroll source/discrete forwarding). Both get a `+droiddeck` version. `patches/mesa` adds KGSL + UBWC 5/6 (backported from upstream Mesa) and the KGSL device numbers for WSI (from + [Droid-Deck/Drivers](https://github.com/Droid-Deck/Drivers)). +- The runtime's built-in Vulkan driver is DroidDeck's DD-Turnip Linux build (`DD_TURNIP_URL` and + `DD_TURNIP_SHA256` in `base.env`): Ubuntu's Turnip is diverted to `libvulkan_freedreno.so.distrib` + because it lacks the Adreno 8xx fixes. Zink, EGL and llvmpipe stay Ubuntu's. +- `build.sh` verifies Ubuntu's base image (`base.env`: signed `SHA256SUMS` from cdimage plus the + pinned hash), chroots into it and runs `setup.sh` twice. The `runtime` stage is everything gaming + mode needs; it is packed as `<tag>.tar.zst`. The `desktop` stage then adds Plasma on top, and + `desktop-pack.py` packs only what that stage added or changed as `<tag>-desktop.tar.zst`, so the + desktop shares every runtime file instead of shipping its own copy. The runtime carries + `usr/share/droiddeck/desktop-pack.json` (tag, URL, hash, size) naming its matching desktop pack. +- `setup.sh runtime` installs `packages-runtime.txt` without recommends and the `+droiddeck` debs from + a local repository in `/var/lib/droiddeck/apt` (pinned at 1001 and held), then builds the + `droiddeck-runtime` package from `overlay-runtime/`. `setup.sh desktop` installs + `packages-desktop.txt`, Firefox from Mozilla's apt repository (`mozilla.asc`, fingerprint + 35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3) and builds `droiddeck-desktop` from `overlay-desktop/`. + Both packages are Protected, depend on `protected-*.txt`, own our files and divert any Ubuntu file + they replace, so apt neither removes the essentials nor overwrites our settings on upgrade. +- The desktop pack's `usr/share/droiddeck/desktop/files.tsv.gz` lists each path the desktop added + (N), changed (C) or removed (R), and `originals/` keeps the runtime's copies of changed and removed + files. Removing the desktop restores those and deletes the added files the user has not changed; + a runtime update replaces the tree, and the desktop is downloaded again when it is next opened. + +At run time: + +- `sudo`, `su`, `pkexec` and apt/aptitude (for commands that change the system) go through + `droiddeck-root`: the app runs them in a separate proot with `-0 --link2symlink`, passing the + caller's terminal, so dpkg gets root ownership emulation and hard links while the desktop keeps + the fast path. PackageKit (Discover) and polkit are started the same way by the session's system + bus (`/usr/share/droiddeck/system-services`). +- `apt/remember` (a `DPkg::Post-Invoke` hook) keeps the packages, sources and keys the user added in + `~/.local/share/droiddeck/apt`; `apt/restore` (autostarted) puts them back after a runtime update. +- The installer turns the image's hard links into proot's link2symlink layout, and proot shows the + linked name as `/proc/self/exe` (patch 0020), so Ubuntu's multi-call coreutils work. + +`.github/workflows/build-ubuntu-runtime.yml` builds it and, run with a new tag (`ubuntu-rN`), +publishes the runtime and its desktop pack in Droid-Deck/DroidDeck-Components; `linuxfs-ubuntu.json` there names the release the +app installs. diff --git a/tools/ubuntu/apt/apt.conf.d/50droiddeck b/tools/ubuntu/apt/apt.conf.d/50droiddeck new file mode 100644 index 000000000..695a3c48c --- /dev/null +++ b/tools/ubuntu/apt/apt.conf.d/50droiddeck @@ -0,0 +1,5 @@ +APT::Install-Recommends "true"; +APT::Sandbox::User "root"; +Dpkg::Options { "--force-confdef"; "--force-confold"; }; +DPkg::Post-Invoke { "[ ! -x /usr/share/droiddeck/apt/remember ] || /usr/share/droiddeck/apt/remember"; }; +APT::Update::Post-Invoke { "[ ! -x /usr/share/droiddeck/apt/remember ] || /usr/share/droiddeck/apt/remember"; }; diff --git a/tools/ubuntu/apt/preferences.d/droiddeck b/tools/ubuntu/apt/preferences.d/droiddeck new file mode 100644 index 000000000..33a7c3679 --- /dev/null +++ b/tools/ubuntu/apt/preferences.d/droiddeck @@ -0,0 +1,3 @@ +Package: plymouth plymouth-* grub-* initramfs-tools initramfs-tools-* cryptsetup-initramfs linux-image-* linux-headers-* linux-modules-* linux-generic* apport whoopsie +Pin: release * +Pin-Priority: -1 diff --git a/tools/ubuntu/base.env b/tools/ubuntu/base.env new file mode 100644 index 000000000..3d5de326c --- /dev/null +++ b/tools/ubuntu/base.env @@ -0,0 +1,5 @@ +UBUNTU_BASE_URL=https://cdimage.ubuntu.com/ubuntu-base/releases/26.04/release/ubuntu-base-26.04.1-base-arm64.tar.gz +UBUNTU_BASE_SHA256=5a1906794ced63a71a8119c3f211ef5f0bbe0a243001b4bbd41fdf80c5b219fd +UBUNTU_CDIMAGE_KEY=843938DF228D22F7B3742BC0D94AA3F0EFE21092 +DD_TURNIP_URL=https://github.com/Droid-Deck/Drivers-CI/releases/download/DD-Turnip-v0.3.4/DD-Turnip-v0.3.4.zip +DD_TURNIP_SHA256=81db74cff1bf6568581cfd79203bec22f48856006aeac09e9e0a3eb3f9416fc1 diff --git a/tools/ubuntu/build-debs.sh b/tools/ubuntu/build-debs.sh new file mode 100755 index 000000000..ab54b2e6d --- /dev/null +++ b/tools/ubuntu/build-debs.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=$(realpath -m "${1:?out dir}") +export DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 DEBEMAIL=maxjividen@gmail.com DEBFULLNAME=maxjivi05 +export DEB_BUILD_OPTIONS="nocheck noddebs parallel=$(nproc)" +sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources +apt-get update -qq +apt-get install -y -qq build-essential devscripts equivs patch >/dev/null +mkdir -p "$out" +work=$(mktemp -d) +cd "$work" + +apt-get source -qq mesa +cd mesa-*/ +sed -i '0,/GALLIUM_DRIVERS += freedreno/s//GALLIUM_DRIVERS += freedreno\n\tconfflags_GALLIUM += -Dfreedreno-kmds=msm,kgsl/' debian/rules +grep -q 'freedreno-kmds=msm,kgsl' debian/rules +for p in "$here"/patches/mesa/*.patch; do patch -p1 --forward < "$p"; done +dch -l +droiddeck -D resolute "Enable the KGSL kernel interface for freedreno and Turnip." +apt-get build-dep -y -qq ./ >/dev/null +dpkg-buildpackage -b -uc -us >"$work/mesa.log" 2>&1 || { tail -80 "$work/mesa.log"; exit 1; } +cd "$work" + +apt-get source -qq kwin +cd kwin-*/ +for p in "$here"/patches/kwin/*.patch; do patch -p1 --forward < "$p"; done +dch -l +droiddeck -D resolute "Scale nested outputs, open the selected render node, forward scroll details." +apt-get build-dep -y -qq ./ >/dev/null +dpkg-buildpackage -b -uc -us >"$work/kwin.log" 2>&1 || { tail -80 "$work/kwin.log"; exit 1; } +cd "$work" + +for deb in *.deb; do + case $deb in *-dbgsym_*) continue ;; esac + cp "$deb" "$out/" +done +ls -l "$out" diff --git a/tools/ubuntu/build.sh b/tools/ubuntu/build.sh new file mode 100755 index 000000000..6c920efbc --- /dev/null +++ b/tools/ubuntu/build.sh @@ -0,0 +1,72 @@ +#!/bin/bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +debs=$(realpath "${1:?directory with the DroidDeck-built .deb files}") +out=$(realpath -m "${2:?out dir}") +runtime_id=${3:?runtime id, e.g. ubuntu-r1} +[ "$(uname -m)" = aarch64 ] || { echo 'the Ubuntu runtime needs a native arm64 runner' >&2; exit 1; } +source "$here/base.env" +fetch() { curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$1" "$2"; } +work=$(mktemp -d) +root=$work/root +cleanup() { + for m in dev/pts dev proc sys; do sudo umount "$root/$m" 2>/dev/null || true; done + sudo rm -rf "$work" +} +trap cleanup EXIT +mkdir -p "$root" "$out" +base=$work/base.tar.gz +fetch "$base" "$UBUNTU_BASE_URL" +fetch "$work/SHA256SUMS" "${UBUNTU_BASE_URL%/*}/SHA256SUMS" +fetch "$work/SHA256SUMS.gpg" "${UBUNTU_BASE_URL%/*}/SHA256SUMS.gpg" +gpgv --status-fd 1 --keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg "$work/SHA256SUMS.gpg" "$work/SHA256SUMS" 2>/dev/null \ + | grep -Eq "^\[GNUPG:\] VALIDSIG .* $UBUNTU_CDIMAGE_KEY\$" +grep -q "^$UBUNTU_BASE_SHA256 \*${UBUNTU_BASE_URL##*/}\$" "$work/SHA256SUMS" +echo "$UBUNTU_BASE_SHA256 $base" | sha256sum -c - >/dev/null + +sudo tar -xzf "$base" -C "$root" --numeric-owner +sudo cp /etc/resolv.conf "$root/etc/resolv.conf" +for m in dev dev/pts proc sys; do sudo mount --bind "/$m" "$root/$m"; done +sudo mkdir -p "$root/tmp/droiddeck/debs" +sudo cp -r "$here/." "$root/tmp/droiddeck/src" +sudo cp "$debs"/*.deb "$root/tmp/droiddeck/debs/" +base_url=${DESKTOP_BASE_URL:-https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$runtime_id} +desktop_id=$runtime_id-desktop +stage() { + sudo chroot "$root" /bin/bash /tmp/droiddeck/src/setup.sh /tmp/droiddeck/debs "$runtime_id" "$1" +} +seal() { + for m in dev/pts dev proc sys; do sudo umount "$root/$m"; done + sudo rm -f "$root/etc/resolv.conf" + printf 'nameserver 1.1.1.1\nnameserver 8.8.8.8\n' | sudo tee "$root/etc/resolv.conf" >/dev/null +} +unseal() { + sudo cp /etc/resolv.conf "$root/etc/resolv.conf" + for m in dev dev/pts proc sys; do sudo mount --bind "/$m" "$root/$m"; done +} + +stage runtime +seal +sudo mv "$root/tmp/droiddeck" "$work/src-keep" +sudo chroot "$root" dpkg-query -W -f '${Package} ${Version}\n' > "$out/$runtime_id.packages.txt" +sudo tar -C "$root" --numeric-owner -cf "$work/runtime.tar" . +sudo python3 "$here/desktop-pack.py" manifest "$root" "$work/runtime.manifest" +unseal +sudo mv "$work/src-keep" "$root/tmp/droiddeck" +stage desktop +seal +sudo rm -rf "$root/tmp/droiddeck" +sudo chroot "$root" dpkg-query -W -f '${Package} ${Version}\n' > "$out/$desktop_id.packages.txt" +sudo python3 "$here/desktop-pack.py" pack "$root" "$work/runtime.manifest" "$work/runtime.tar" "$work/desktop.tar" "$work/meta" +sudo zstd -q -19 -T0 --rm "$work/desktop.tar" -o "$out/$desktop_id.tar.zst" +sudo chown "$(id -u):$(id -g)" "$out/$desktop_id.tar.zst" +sha256sum "$out/$desktop_id.tar.zst" | cut -d' ' -f1 > "$out/$desktop_id.sha256" + +mkdir -p "$work/stamp" +python3 "$here/desktop-pack.py" describe "$out/$desktop_id.tar.zst" "$base_url/$desktop_id.tar.zst" "$desktop_id" \ + "$work/stamp/usr/share/droiddeck/desktop-pack.json" +sudo tar -C "$work/stamp" --numeric-owner --owner=0 --group=0 -rf "$work/runtime.tar" ./usr/share/droiddeck/desktop-pack.json +sudo zstd -q -19 -T0 --rm "$work/runtime.tar" -o "$out/$runtime_id.tar.zst" +sudo chown "$(id -u):$(id -g)" "$out/$runtime_id.tar.zst" +sha256sum "$out/$runtime_id.tar.zst" | cut -d' ' -f1 > "$out/$runtime_id.sha256" +ls -l "$out" diff --git a/tools/ubuntu/desktop-pack.py b/tools/ubuntu/desktop-pack.py new file mode 100644 index 000000000..794b8815e --- /dev/null +++ b/tools/ubuntu/desktop-pack.py @@ -0,0 +1,128 @@ +#!/usr/bin/env python3 +import gzip +import hashlib +import json +import os +import stat +import subprocess +import sys + +SKIP = {"proc", "sys", "dev", "run", "tmp", "var/tmp", "var/log", "var/cache/apt", "var/lib/apt/lists", + "etc/resolv.conf", "etc/machine-id", "var/lib/dbus/machine-id"} +META = "usr/share/droiddeck/desktop" + + +def walk(root): + out = {} + for top, dirs, files in os.walk(root): + rel_top = os.path.relpath(top, root) + rel_top = "" if rel_top == "." else rel_top + dirs[:] = [d for d in dirs if os.path.join(rel_top, d) not in SKIP] + for name in dirs + files: + rel = os.path.join(rel_top, name) + if rel in SKIP or name.startswith(".l2s."): + continue + st = os.lstat(os.path.join(root, rel)) + if stat.S_ISDIR(st.st_mode): + out[rel] = ("d", 0, st.st_mode & 0o7777, "", 0) + elif stat.S_ISLNK(st.st_mode): + out[rel] = ("l", 0, 0, os.readlink(os.path.join(root, rel)), 0) + elif stat.S_ISREG(st.st_mode): + out[rel] = ("f", st.st_size, st.st_mode & 0o7777, "%d.%d" % (st.st_ino, st.st_mtime_ns), 0) + return out + + +def sha256(path): + h = hashlib.sha256() + with open(path, "rb") as f: + for block in iter(lambda: f.read(1 << 20), b""): + h.update(block) + return h.hexdigest() + + +def save(manifest, path): + with open(path, "w") as f: + for rel, (kind, size, mode, extra, _) in sorted(manifest.items()): + f.write("%s\t%d\t%o\t%s\t%s\n" % (kind, size, mode, extra, rel)) + + +def load(path): + out = {} + with open(path) as f: + for line in f: + kind, size, mode, extra, rel = line.rstrip("\n").split("\t", 4) + if os.path.basename(rel).startswith(".l2s."): + continue + out[rel] = (kind, int(size), int(mode, 8), extra, 0) + return out + + +def describe(root, rel, entry): + kind, size, _, extra, _ = entry + if kind == "f": + return "F\t%d\t%s" % (size, sha256(os.path.join(root, rel))) + if kind == "l": + return "L\t0\t%s" % extra + return "D\t0\t-" + + +def pack(root, before_path, runtime_tar, out_tar, meta_root): + before = load(before_path) + after = walk(root) + added = sorted(p for p in after if p not in before) + changed = sorted(p for p in after if p in before and after[p][:4] != before[p][:4] and after[p][0] != "d") + removed = sorted(p for p in before if p not in after) + if any(p.startswith(META + "/") or p == META for p in added + changed + removed): + sys.exit("the desktop stage must not write " + META) + meta = os.path.join(meta_root, META) + originals = os.path.join(meta, "originals") + os.makedirs(originals, exist_ok=True) + restore = [p for p in changed + removed if before[p][0] != "d"] + if restore: + listing = os.path.join(meta_root, "restore.list") + with open(listing, "w") as f: + f.write("".join("./%s\n" % p for p in restore)) + subprocess.run(["tar", "-xf", runtime_tar, "-C", originals, "--numeric-owner", "--no-recursion", "-T", listing], check=True) + os.unlink(listing) + with gzip.open(os.path.join(meta, "files.tsv.gz"), "wt") as f: + for p in added: + f.write("N\t%s\t%s\n" % (describe(root, p, after[p]), p)) + for p in changed: + f.write("C\t%s\t%s\n" % (describe(root, p, after[p]), p)) + for p in removed: + f.write("R\t%s\t%s\n" % (describe(originals, p, before[p]) if before[p][0] != "d" else "D\t0\t-", p)) + listing = os.path.join(meta_root, "pack.list") + with open(listing, "w") as f: + f.write("".join("./%s\n" % p for p in added + changed)) + metalist = os.path.join(meta_root, "meta.list") + with open(metalist, "w") as f: + for top, dirs, files in os.walk(meta): + for name in dirs + files: + f.write("./%s\n" % os.path.relpath(os.path.join(top, name), meta_root)) + f.write("./%s\n" % META) + subprocess.run(["tar", "--numeric-owner", "--no-recursion", "--hard-dereference", "-cf", out_tar, "-C", root, "-T", listing, + "-C", meta_root, "-T", metalist], check=True) + os.unlink(listing) + os.unlink(metalist) + print("desktop pack: %d added, %d changed, %d removed" % (len(added), len(changed), len(removed))) + + +def describe_pack(archive, url, tag, out): + digest = sha256(archive) + size = os.path.getsize(archive) + os.makedirs(os.path.dirname(out), exist_ok=True) + with open(out, "w") as f: + json.dump({"tag": tag, "url": url, "sha256": digest, "size": size}, f, indent=2) + f.write("\n") + + +if __name__ == "__main__": + command = sys.argv[1] if len(sys.argv) > 1 else "" + if command == "manifest" and len(sys.argv) == 4: + save(walk(sys.argv[2]), sys.argv[3]) + elif command == "pack" and len(sys.argv) == 7: + pack(*sys.argv[2:]) + elif command == "describe" and len(sys.argv) == 6: + describe_pack(*sys.argv[2:]) + else: + sys.exit("usage: desktop-pack.py manifest ROOT OUT | pack ROOT BEFORE RUNTIME_TAR OUT_TAR META_ROOT | describe ARCHIVE URL TAG OUT_JSON") diff --git a/tools/ubuntu/mozilla.asc b/tools/ubuntu/mozilla.asc new file mode 100644 index 000000000..1e2a71ed0 --- /dev/null +++ b/tools/ubuntu/mozilla.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq +/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/ +e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD +T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+ +ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW +QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz +dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0 +b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6 +XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc +YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC +7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf +ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq +fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G +C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8 +XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU= +=QnvN +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck b/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck new file mode 100644 index 000000000..64326de6c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck @@ -0,0 +1 @@ +path-exclude=/etc/skel/Desktop/* diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop b/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop new file mode 100644 index 000000000..0a5a357cb --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=DroidDeck software restore +Exec=/usr/share/droiddeck/apt/restore +NoDisplay=true +X-KDE-autostart-phase=2 +OnlyShowIn=KDE; diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc b/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc new file mode 100644 index 000000000..1735f7a8d --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc @@ -0,0 +1,2 @@ +[Basic Settings] +Indexing-Enabled=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/fastfetch/config.jsonc b/tools/ubuntu/overlay-desktop/etc/xdg/fastfetch/config.jsonc new file mode 100644 index 000000000..387047c78 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/fastfetch/config.jsonc @@ -0,0 +1,18 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "file", + "source": "/usr/share/droiddeck/fastfetch/logo.txt", + "color": { + "1": "38;2;255;255;255", + "2": "38;2;26;159;255" + }, + "padding": { "right": 3 } + }, + "modules": [ + "title", "separator", "os", "host", "kernel", "uptime", "packages", "shell", + "display", "de", "wm", "wmtheme", "theme", "icons", "font", "cursor", + "terminal", "cpu", "gpu", "memory", "swap", "disk", "battery", "locale", + "break", "colors" + ] +} diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini b/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini new file mode 100644 index 000000000..3d33a8a93 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini @@ -0,0 +1,5 @@ +[Settings] +gtk-theme-name=Breeze-Dark +gtk-icon-theme-name=breeze-dark +gtk-font-name=Noto Sans 11 +gtk-application-prefer-dark-theme=true diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc b/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc new file mode 100644 index 000000000..bdac20ee3 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc @@ -0,0 +1,5 @@ +[Mouse] +cursorTheme=breeze_cursors + +[Libinput][Defaults] +PointerAccelerationProfile=1 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc b/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc new file mode 100644 index 000000000..3db443cde --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc @@ -0,0 +1,8 @@ +[Module-bluedevil] +autoload=false + +[Module-kded_bolt] +autoload=false + +[Module-smart] +autoload=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals b/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals new file mode 100644 index 000000000..d8ba273a4 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals @@ -0,0 +1,24 @@ +[KDE] +LookAndFeelPackage=com.valve.vapor.desktop +SingleClick=false +widgetStyle=Breeze + +[General] +ColorScheme=Vapor +font=Noto Sans,11,-1,5,50,0,0,0,0,0 +menuFont=Noto Sans,11,-1,5,50,0,0,0,0,0 +smallestReadableFont=Noto Sans,9,-1,5,50,0,0,0,0,0 +toolBarFont=Noto Sans,11,-1,5,50,0,0,0,0,0 +fixed=Noto Sans Mono,11,-1,5,50,0,0,0,0,0 + +[Icons] +Theme=breeze-dark + +[KDE Action Restrictions][$i] +action/switch_user=false +action/start_new_session=false +action/lock_screen=false + +[KDE Control Module Restrictions][$i] +kcm_sddm.desktop=false +kcm_plymouth.desktop=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc b/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc new file mode 100644 index 000000000..f93c61af6 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc @@ -0,0 +1,2 @@ +[Desktop Entry] +DefaultProfile=Vapor.profile diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc b/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc new file mode 100644 index 000000000..8a52bc54c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc @@ -0,0 +1,3 @@ +[Daemon] +Autolock=false +LockOnResume=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc b/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc new file mode 100644 index 000000000..b47cc8917 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc @@ -0,0 +1,2 @@ +[General] +loginMode=emptySession diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc b/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc new file mode 100644 index 000000000..c252676bf --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc @@ -0,0 +1,3 @@ +[KSplash] +Engine=none +Theme=None diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc new file mode 100644 index 000000000..3f28331ef --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc @@ -0,0 +1,3 @@ +[Wallet] +Enabled=false +First Use=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc new file mode 100644 index 000000000..f9656dd00 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc @@ -0,0 +1,12 @@ +[org.kde.kdecoration2] +library=org.kde.breeze + +[WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[Plugins] +blurEnabled=false +contrastEnabled=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc new file mode 100644 index 000000000..bd7a15c1a --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc @@ -0,0 +1,32 @@ +[$Version] +update_info=kwinrules.upd:replace-placement-string-to-enum,kwinrules.upd:use-virtual-desktop-ids + +[1] +Description=Window settings for Steam Keyboard +above=true +aboverule=2 +acceptfocusrule=2 +skiptaskbar=true +skiptaskbarrule=2 +title=Steam Keyboard +types=256 +typerule=2 +wmclass=steamwebhelper steam +wmclasscomplete=true +wmclassmatch=2 + +[9bd6e503-ac60-4e7b-9131-0b10c84b37eb] +Description=Window settings for Steam Keyboard +above=true +aboverule=2 +title=Steam Keyboard +titlematch=2 +type=16 +typerule=2 +wmclass=steam +wmclasscomplete=true +wmclassmatch=2 + +[General] +count=1 +rules=1 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc b/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc new file mode 100644 index 000000000..c2a661e5d --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc @@ -0,0 +1,2 @@ +[Theme] +name=Vapor diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc b/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc new file mode 100644 index 000000000..98636006a --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc @@ -0,0 +1,20 @@ +[AC][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[AC][SuspendAndShutdown] +AutoSuspendAction=0 + +[Battery][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[Battery][SuspendAndShutdown] +AutoSuspendAction=0 + +[LowBattery][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[LowBattery][SuspendAndShutdown] +AutoSuspendAction=0 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/startkderc b/tools/ubuntu/overlay-desktop/etc/xdg/startkderc new file mode 100644 index 000000000..2ebf976ad --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/startkderc @@ -0,0 +1,2 @@ +[General] +systemdBoot=false diff --git a/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd b/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd new file mode 100755 index 000000000..8d472afd6 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd @@ -0,0 +1,92 @@ +#!/usr/bin/python3 +from gi.repository import Gio, GLib + +XML = """ +<node> + <interface name="org.freedesktop.PolicyKit1.Authority"> + <method name="EnumerateActions"> + <arg type="s" name="locale" direction="in"/> + <arg type="a(ssssssuuua{ss})" name="action_descriptions" direction="out"/> + </method> + <method name="CheckAuthorization"> + <arg type="(sa{sv})" name="subject" direction="in"/> + <arg type="s" name="action_id" direction="in"/> + <arg type="a{ss}" name="details" direction="in"/> + <arg type="u" name="flags" direction="in"/> + <arg type="s" name="cancellation_id" direction="in"/> + <arg type="(bba{ss})" name="result" direction="out"/> + </method> + <method name="CancelCheckAuthorization"> + <arg type="s" name="cancellation_id" direction="in"/> + </method> + <method name="RegisterAuthenticationAgent"> + <arg type="(sa{sv})" name="subject" direction="in"/> + <arg type="s" name="locale" direction="in"/> + <arg type="s" name="object_path" direction="in"/> + </method> + <method name="RegisterAuthenticationAgentWithOptions"> + <arg type="(sa{sv})" name="subject" direction="in"/> + <arg type="s" name="locale" direction="in"/> + <arg type="s" name="object_path" direction="in"/> + <arg type="a{sv}" name="options" direction="in"/> + </method> + <method name="UnregisterAuthenticationAgent"> + <arg type="(sa{sv})" name="subject" direction="in"/> + <arg type="s" name="object_path" direction="in"/> + </method> + <method name="AuthenticationAgentResponse"> + <arg type="s" name="cookie" direction="in"/> + <arg type="(sa{sv})" name="identity" direction="in"/> + </method> + <method name="AuthenticationAgentResponse2"> + <arg type="u" name="uid" direction="in"/> + <arg type="s" name="cookie" direction="in"/> + <arg type="(sa{sv})" name="identity" direction="in"/> + </method> + <method name="EnumerateTemporaryAuthorizations"> + <arg type="(sa{sv})" name="subject" direction="in"/> + <arg type="a(ss(sa{sv})tt)" name="temporary_authorizations" direction="out"/> + </method> + <method name="RevokeTemporaryAuthorizations"> + <arg type="(sa{sv})" name="subject" direction="in"/> + </method> + <method name="RevokeTemporaryAuthorizationById"> + <arg type="s" name="id" direction="in"/> + </method> + <signal name="Changed"/> + <property type="s" name="BackendName" access="read"/> + <property type="s" name="BackendVersion" access="read"/> + <property type="u" name="BackendFeatures" access="read"/> + </interface> +</node> +""" + +REPLIES = { + "EnumerateActions": GLib.Variant("(a(ssssssuuua{ss}))", ([],)), + "CheckAuthorization": GLib.Variant("((bba{ss}))", ((True, False, {}),)), + "EnumerateTemporaryAuthorizations": GLib.Variant("(a(ss(sa{sv})tt))", ([],)), +} +PROPERTIES = { + "BackendName": GLib.Variant("s", "droiddeck"), + "BackendVersion": GLib.Variant("s", "1"), + "BackendFeatures": GLib.Variant("u", 1), +} + + +def call(connection, sender, path, interface, method, parameters, invocation): + invocation.return_value(REPLIES.get(method)) + + +def get_property(connection, sender, path, interface, name): + return PROPERTIES.get(name) + + +def acquired(connection, name): + info = Gio.DBusNodeInfo.new_for_xml(XML).interfaces[0] + connection.register_object("/org/freedesktop/PolicyKit1/Authority", info, call, get_property, None) + + +loop = GLib.MainLoop() +Gio.bus_own_name(Gio.BusType.SYSTEM, "org.freedesktop.PolicyKit1", Gio.BusNameOwnerFlags.NONE, + acquired, None, lambda *a: loop.quit()) +loop.run() diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop new file mode 100644 index 000000000..67f1d7f21 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Return to Gaming Mode +Comment=Log out of the desktop and go back to Steam +Exec=dbus-send --session --type=method_call --dest=org.kde.Shutdown /Shutdown org.kde.Shutdown.logout +Icon=steamdeck-gaming-return +Terminal=false +Type=Application +StartupNotify=false +NoDisplay=true diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop new file mode 100644 index 000000000..98c3b27b1 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Steam Big Picture +Comment=The Steam client, full screen with a controller +Exec=/usr/local/bin/steamdeck-steam bigpicture +Icon=steam +Terminal=false +Categories=Game; diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop new file mode 100644 index 000000000..794c1e448 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Steam +Comment=The Steam client, in a window +Exec=/usr/local/bin/steamdeck-steam desktop +Icon=steam +Terminal=false +Categories=Game; diff --git a/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors b/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors new file mode 100644 index 000000000..820af1df3 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors @@ -0,0 +1,119 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Complementary] +BackgroundAlternate=59,64,69 +BackgroundNormal=49,54,59 +DecorationFocus=30,146,255 +DecorationHover=61,174,230 +ForegroundActive=246,116,0 +ForegroundInactive=175,176,179 +ForegroundLink=61,174,230 +ForegroundNegative=237,21,21 +ForegroundNeutral=201,206,59 +ForegroundNormal=239,240,241 +ForegroundPositive=17,209,22 +ForegroundVisited=61,174,230 + +[Colors:Selection] +BackgroundAlternate=29,153,243 +BackgroundNormal=86,159,204 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=252,252,252 +ForegroundInactive=239,240,241 +ForegroundLink=253,188,75 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=31,31,38 +ForegroundPositive=126,166,75 +ForegroundVisited=189,195,199 + +[Colors:Tooltip] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:View] +BackgroundAlternate=26,33,42 +BackgroundNormal=21,28,35 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Window] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[General] +ColorScheme=Breeze Dark +Name=Vapor +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=36,39,47 +activeBlend=255,255,255 +activeForeground=239,240,241 +inactiveBackground=36,39,44 +inactiveBlend=74,83,101 +inactiveForeground=127,140,141 diff --git a/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service b/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service new file mode 100644 index 000000000..5919feb45 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.bluez.obex +Exec=/bin/false diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/fastfetch/logo.txt b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/fastfetch/logo.txt new file mode 100644 index 000000000..c196d40f0 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/fastfetch/logo.txt @@ -0,0 +1,18 @@ +$1MMMMMMMMMMMMMM MMMMM +$1MddddddddddddM MdddMMMMM +$1MddddddddddMMM MMMdddddMMM +$1MddddddMMMMM MMMMMdddMMM +$1MddddMMM $2o $1MMMdddMMM +$1MdddMM $2ooooooooooo $1MMddddMM +$1MddMM $2oooyyyyyyyyyooo $1MMddddM +$1MddM $2ooyyyyyyyyyyyyyoo $1MddddMM +$1MddM $2oyyyyyyyyyyyyyyyoo $1MdddddM +$1MddM $2oyyyyyyyyyyyyyyyoo $1MdddddM +$1MddM $2ooyyyyyyyyyyyyyoo $1MddddMM +$1MddMM $2oooyyyyyyyyyooo $1MMddddM +$1MdddMM $2ooooooooooo $1MMddddMM +$1MddddMMM $2o $1MMMdddMMM +$1MddddddMMMMM MMMMMdddMMM +$1MddddddddddMMM MMMdddddMMM +$1MddddddddddddM MdddMMMMM +$1MMMMMMMMMMMMMM MMMMM diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor new file mode 100644 index 000000000..a6797bf62 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor @@ -0,0 +1 @@ +opengl diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service new file mode 100644 index 000000000..b131073b5 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.PackageKit +Exec=/usr/local/bin/droiddeck-root /usr/libexec/packagekitd diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service new file mode 100644 index 000000000..0f9e5620d --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.PolicyKit1 +Exec=/usr/local/bin/droiddeck-polkitd diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg new file mode 100644 index 000000000..96d426607 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg @@ -0,0 +1,6 @@ +<svg id="svg2" height="64" style="" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="deck_icon.svg" inkscape:version="1.2-dev (d2dd25d878, 2022-02-01, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"> + <path id="path42220" d="m 32 4 v 10 a 18 18 0 0 1 18 18 a 18 18 0 0 1 -18 18 v 10 a 28 28 0 0 0 28 -28 a 28 28 0 0 0 -28 -28 z" style="fill:#fff;fill-rule:evenodd"/> + <circle id="path43518" cx="32" cy="32" r="14" style="fill:#1a9fff;fill-rule:evenodd"/> + <path id="path52048" d="m 32 22 a 2 2 0 0 0 -1.4140625 .5859375 l -8 8 a 2.0002 2.0002 0 0 0 0 2.828125 l 8 8 a 2 2 0 0 0 2.828125 0 a 2 2 0 0 0 0 -2.828125 l -4.5859375 -4.5859375 h 11.171875 a 2 2 0 0 0 2 -2 a 2 2 0 0 0 -2 -2 h -11.171875 l 4.5859375 -4.5859375 a 2 2 0 0 0 0 -2.828125 a 2 2 0 0 0 -1.4140625 -.5859375 z" style="fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0"/> + <g id="path89696" style=""/> +</svg> diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg new file mode 100644 index 000000000..d5926b262 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg @@ -0,0 +1,11 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1.1"> + <circle style="opacity:0.2" cx="32" cy="33" r="28"/> + <path style="fill:#1955aa" d="M 60,32 C 60,47.463973 47.463973,60 32,60 18.913155,60 7.9232734,51.021833 4.853777,38.888922 4.2962258,36.685069 6.0625889,38.217811 6.0625889,35.840683 6.0625889,35.576732 4.0036523,31.472952 4.010909,31.210755 4.4288017,16.111731 16.799978,4 32,4 47.463973,4 60,16.536027 60,32 Z"/> + <path style="opacity:0.2" d="M 40,16 A 11,11 0 0 0 29,27 11,11 0 0 0 29.011719,27.246094 L 23.753906,36.009766 A 8.5,8.5 0 0 0 23.5,36 8.5,8.5 0 0 0 17.837891,38.171875 L 4.046875,32.078125 A 28,28 0 0 0 4,33 28,28 0 0 0 4.9375,40.123047 L 15.003906,44.572266 A 8.5,8.5 0 0 0 23.5,53 8.5,8.5 0 0 0 32,44.5 8.5,8.5 0 0 0 31.966797,43.849609 L 41.373047,37.904297 A 11,11 0 0 0 51,27 11,11 0 0 0 40,16 Z M 40,20 A 7,7 0 0 1 47,27 7,7 0 0 1 40,34 7,7 0 0 1 33,27 7,7 0 0 1 40,20 Z M 40,22 A 5,5 0 0 0 35,27 5,5 0 0 0 40,32 5,5 0 0 0 45,27 5,5 0 0 0 40,22 Z M 23.5,39 A 5.5,5.5 0 0 1 29,44.5 5.5,5.5 0 0 1 23.5,50 5.5,5.5 0 0 1 18.207031,45.986328 L 22.085938,47.701172 A 3.50035,3.50035 0 1 0 24.914062,41.298828 L 21.035156,39.583984 A 5.5,5.5 0 0 1 23.5,39 Z"/> + <path style="fill:#ffffff" d="M 30.6,23.6 34.8,33.4 44.7,34.8 29.2,44.6 V 37.6 H 22.2 Z"/> + <path style="fill:#ffffff" d="M 40 15 A 11 11 0 0 0 29 26 A 11 11 0 0 0 40 37 A 11 11 0 0 0 51 26 A 11 11 0 0 0 40 15 z M 40 19 A 7 7 0 0 1 47 26 A 7 7 0 0 1 40 33 A 7 7 0 0 1 33 26 A 7 7 0 0 1 40 19 z"/> + <path style="fill:#ffffff" d="M 23.5 35 A 8.5 8.5 0 0 0 15 43.5 A 8.5 8.5 0 0 0 23.5 52 A 8.5 8.5 0 0 0 32 43.5 A 8.5 8.5 0 0 0 23.5 35 z M 23.5 38 A 5.5 5.5 0 0 1 29 43.5 A 5.5 5.5 0 0 1 23.5 49 A 5.5 5.5 0 0 1 18 43.5 A 5.5 5.5 0 0 1 23.5 38 z"/> + <circle style="fill:#ffffff" cx="40" cy="26" r="5"/> + <path style="fill:#ffffff" d="M 4.046875 31.078125 A 28 28 0 0 0 4 32 A 28 28 0 0 0 4.9375 39.123047 L 22.085938 46.701172 A 3.50035 3.50035 0 1 0 24.914062 40.298828 L 4.046875 31.078125 z"/> + <path style="opacity:0.1;fill:#ffffff" d="M 32,4 C 17.100366,4 4.9180811,15.636956 4.0488281,30.318359 4.0459379,30.367175 4.08106,30.473412 4.1113281,30.572266 5.3425337,16.245714 17.354447,5 32,5 47.296335,5 59.718596,17.267575 59.986328,32.5 59.989262,32.333062 60,32.167638 60,32 60,16.536027 47.463973,4 32,4 Z"/> +</svg> diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg new file mode 100644 index 000000000..b0ac005cb --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg @@ -0,0 +1,12 @@ +<svg id="svg2" height="64" style="" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="start.svg" inkscape:version="1.2-dev (d2dd25d878, 2022-02-01, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"> + <style type="text/css" id="current-color-scheme"> + .ColorScheme-Text { + color:#ffffff; + } + </style> + <g id="start-here-kde"> + <rect style="fill:#808080;fill-rule:evenodd;opacity:0.000001" id="rect1101" width="64" height="64" x="0" y="0" /> + <path id="path42220" d="m 32 4 v 10 a 18 18 0 0 1 18 18 a 18 18 0 0 1 -18 18 v 10 a 28 28 0 0 0 28 -28 a 28 28 0 0 0 -28 -28 z" style="fill:currentColor;fill-rule:evenodd" class="ColorScheme-Text" /> + <circle id="path43518" cx="32" cy="32" r="14" style="fill:#1a9fff;fill-rule:evenodd" /> + </g> +</svg> diff --git a/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme new file mode 100644 index 000000000..91f6921c8 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme @@ -0,0 +1,94 @@ +[Background] +Color=21,27,33 + +[BackgroundFaint] +Color=22,32,45 + +[BackgroundIntense] +Color=19,46,69 + +[Color0] +Color=21,27,33 + +[Color0Faint] +Color=49,54,59 + +[Color0Intense] +Color=127,140,141 + +[Color1] +Color=237,21,21 + +[Color1Faint] +Color=120,50,40 + +[Color1Intense] +Color=192,57,43 + +[Color2] +Color=71,146,176 + +[Color2Faint] +Color=52,108,146 + +[Color2Intense] +Color=171,207,228 + +[Color3] +Color=246,116,0 + +[Color3Faint] +Color=182,86,25 + +[Color3Intense] +Color=253,188,75 + +[Color4] +Color=29,153,243 + +[Color4Faint] +Color=27,102,143 + +[Color4Intense] +Color=61,174,233 + +[Color5] +Color=155,89,182 + +[Color5Faint] +Color=97,74,115 + +[Color5Intense] +Color=142,68,173 + +[Color6] +Color=227,255,194 + +[Color6Faint] +Color=91,118,56 + +[Color6Intense] +Color=141,189,85 + +[Color7] +Color=239,240,241 + +[Color7Faint] +Color=99,104,109 + +[Color7Intense] +Color=252,252,252 + +[Foreground] +Color=239,240,241 + +[ForegroundFaint] +Color=220,230,231 + +[ForegroundIntense] +Color=252,252,252 + +[General] +Description=SteamOS +Opacity=0.9 +Wallpaper= diff --git a/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile new file mode 100644 index 000000000..b4557e15e --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile @@ -0,0 +1,6 @@ +[Appearance] +ColorScheme=Vapor + +[General] +Name=Vapor +Parent=FALLBACK/ diff --git a/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE b/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE new file mode 100644 index 000000000..7a5fd044e --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE @@ -0,0 +1,19 @@ +Third-party files in DroidDeck's Ubuntu runtime (tools/ubuntu/overlay): + +- Vapor (color scheme, Plasma theme, look-and-feel package, Konsole profile and color scheme) and the + steamdeck-gaming-return / distributor-logo-steamdeck icons: Valve's steamdeck-kde-presets + (https://github.com/Jovian-Experiments/steamdeck-kde-presets), GPL-2.0-or-later (look-and-feel) + and GPL-3.0 (Plasma theme), as their metadata states. The look-and-feel package's defaults, setup + scripts and layout were adapted for DroidDeck; its Plasma 5 splash screen was left out. +- steam.svg: Papirus icon theme (https://github.com/PapirusDevelopmentTeam/papirus-icon-theme), + GPL-3.0. + +- KWin (kwin-wayland and related packages, version +droiddeck): Kubuntu's KWin source package, + GPL-2.0-or-later, rebuilt with tools/ubuntu/patches/kwin. Corresponding source: `apt source kwin` + plus those patches (https://github.com/Droid-Deck/DroidDeck/tree/main/tools/ubuntu/patches/kwin). +- Mesa (packages with version +droiddeck): Ubuntu's Mesa source package, MIT and others, rebuilt with + the freedreno KGSL kernel interface enabled (tools/ubuntu/build-debs.sh). Corresponding source: + `apt source mesa`. + +Everything else in the runtime is Ubuntu's own packages, under their own licenses +(/usr/share/doc/*/copyright). diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors new file mode 100644 index 000000000..673d46a28 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors @@ -0,0 +1,147 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Complementary] +BackgroundAlternate=59,64,69 +BackgroundNormal=49,54,59 +DecorationFocus=30,146,255 +DecorationHover=61,174,230 +ForegroundActive=246,116,0 +ForegroundInactive=175,176,179 +ForegroundLink=61,174,230 +ForegroundNegative=237,21,21 +ForegroundNeutral=201,206,59 +ForegroundNormal=239,240,241 +ForegroundPositive=17,209,22 +ForegroundVisited=61,174,230 + +[Colors:Selection] +BackgroundAlternate=29,153,243 +BackgroundNormal=86,159,204 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=252,252,252 +ForegroundInactive=239,240,241 +ForegroundLink=253,188,75 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=31,31,38 +ForegroundPositive=126,166,75 +ForegroundVisited=189,195,199 + +[Colors:Tooltip] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:View] +BackgroundAlternate=26,33,42 +BackgroundNormal=21,28,35 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Window] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Header] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Header][Inactive] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[General] +ColorScheme=Vapor +Name=Vapor +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=36,39,47 +activeBlend=255,255,255 +activeForeground=239,240,241 +inactiveBackground=36,39,44 +inactiveBlend=74,83,101 +inactiveForeground=127,140,141 diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json new file mode 100644 index 000000000..53e9f8642 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json @@ -0,0 +1,13 @@ +{ + "KPlugin": { + "Authors": [{ "Name": "Valve" }], + "Category": "Plasma Theme", + "Description": "Vapor - SteamOS Theme based on KDE Breeze and Breath", + "EnabledByDefault": true, + "Id": "Vapor", + "License": "GPL-3.0", + "Name": "Vapor", + "Version": "0.0.17" + }, + "X-Plasma-API": "5.0" +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg new file mode 100644 index 000000000..4d9284779 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg id="svg2" version="1.1" viewBox="0 0 173 56.000004" sodipodi:docname="plasmoidheading.svg" inkscape:version="1.2-dev (3978b257e3, 2021-12-14, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + <defs id="defs50" /> + <sodipodi:namedview id="namedview48" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" showgrid="true" inkscape:zoom="7.5562581" inkscape:cx="71.265432" inkscape:cy="14.292789" inkscape:window-width="1920" inkscape:window-height="1007" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:blackoutopacity="0.0"> + <inkscape:grid type="xygrid" id="grid4266" /> + </sodipodi:namedview> + <style id="current-color-scheme" type="text/css"> + .ColorScheme-Text { + color:#232629; + } + .ColorScheme-Background { + color:#eff0f1; + } + .ColorScheme-ViewBackground { + color:#ffffff; + } + </style> + <path id="hint-stretch-borders" d="m-7-7h5v5h-5z" opacity=".6" /> + <g id="header-topleft"> + <path id="path1780" class="ColorScheme-Background" fill="currentColor" d="M 16 6 C 14.338 6 13 7.338 13 9 L 13 12 L 19 12 L 19 6 L 16 6 z " opacity=".75" /> + <path id="rect20523-3" class="ColorScheme-ViewBackground" style="fill:currentColor;fill-rule:evenodd;fill-opacity:.5" d="M 16 6 C 14.3774542034 6 13.0653658941 7.27584226003 13.00390625 8.8828125 C 13.0641327208 7.82972546125 13.9313095588 7 15 7 L 19 7 L 19 6 L 16 6 z " /> + <path id="rect20523-3" style="fill:#fff;fill-rule:evenodd;fill-opacity:.15" d="M 16 6 C 14.3774542034 6 13.0653658941 7.27584226003 13.00390625 8.8828125 C 13.0641327208 7.82972546125 13.9313095588 7 15 7 L 19 7 L 19 6 L 16 6 z " /> + </g> + <g id="header-top"> + <path id="path1066" class="ColorScheme-Background" transform="rotate(-90)" d="m-12 19h6v32h-6z" fill="currentColor" opacity=".75" /> + <rect id="rect934" x="19" y="6" width="32" height="1" ry="0" class="ColorScheme-ViewBackground" style="fill:currentColor;fill-rule:evenodd;fill-opacity:.5" /> + <rect id="rect934" x="19" y="6" width="32" height="1" ry="0" style="fill:#fff;fill-rule:evenodd;fill-opacity:.15" /> + </g> + <g id="header-topright"> + <path id="path1785" class="ColorScheme-Background" fill="currentColor" d="M 51 6 L 51 12 L 57 12 L 57 9 C 57 7.338 55.662 6 54 6 L 51 6 z " opacity=".75" /> + <path id="rect20523-3-7" class="ColorScheme-ViewBackground" style="fill:currentColor;fill-rule:evenodd;fill-opacity:.5" d="m 54,6 c 1.6225457966,0 2.9346341059,1.27584226003 2.99609375,2.8828125 C 56.9358672792,7.82972546125 56.0686904412,7 55,7 H 51 V 6 Z" /> + <path id="rect20523-3-7" style="fill:#fff;fill-opacity:.15;fill-rule:evenodd" d="m 54,6 c 1.6225457966,0 2.9346341059,1.27584226003 2.99609375,2.8828125 C 56.9358672792,7.82972546125 56.0686904412,7 55,7 H 51 V 6 Z" /> + </g> + <path id="header-left" class="ColorScheme-Background" transform="scale(-1)" d="m-19-44h6v32h-6z" fill="currentColor" opacity=".75" /> + <path id="header-center" class="ColorScheme-Background" d="m19 12h32v32h-32z" fill="currentColor" opacity=".75" /> + <path id="header-right" class="ColorScheme-Background" d="m51 12h6v32h-6z" fill="currentColor" opacity=".75" /> + <g id="header-bottomleft" fill="currentColor"> + <path id="path3182" class="ColorScheme-Background" d="m 19,50 v -6 h -6 v 6 z" opacity="0.75" fill="currentColor" sodipodi:nodetypes="ccccc" /> + <path id="path3184" class="ColorScheme-Text" d="m19 50v-1h-4l-2-2e-5v1l2 2e-5h1z" fill-rule="evenodd" opacity=".15" fill="currentColor" /> + </g> + <g id="header-bottom" fill="currentColor"> + <path id="rect3152" class="ColorScheme-Background" transform="rotate(90)" d="m44-51h6v32h-6z" opacity=".75" fill="currentColor" /> + <path id="rect3154" class="ColorScheme-Text" transform="rotate(90)" d="m49-51h1v32h-1z" opacity=".15" fill="currentColor" /> + </g> + <g id="header-bottomright" fill="currentColor"> + <path id="path3176" class="ColorScheme-Background" d="m 57,44 h -6 v 6 h 6 z" opacity="0.75" fill="currentColor" sodipodi:nodetypes="ccccc" /> + <path id="path3178" class="ColorScheme-Text" d="m57 49h-6v1h6c0-1-2e-5 0 0-1z" fill-rule="evenodd" opacity=".15" fill="currentColor" /> + </g> + <g id="footer-topleft" fill="currentColor"> + <path id="path3182-1" class="ColorScheme-Background" d="m 67,6 v 6 H 61 V 6 Z" opacity="0.75" fill="currentColor" sodipodi:nodetypes="ccccc" /> + <path id="path3184-8" class="ColorScheme-Text" d="m67 6v1h-4l-2 2e-5v-1l2-2e-5h1z" fill-rule="evenodd" opacity=".15" fill="currentColor" /> + </g> + <g id="footer-top" fill="currentColor"> + <path id="rect3152-0" class="ColorScheme-Background" transform="matrix(0 -1 -1 0 0 0)" d="m-12-99h6v32h-6z" opacity=".75" fill="currentColor" /> + <path id="rect3154-9" class="ColorScheme-Text" transform="matrix(0 -1 -1 0 0 0)" d="m-7-99h1v32h-1z" opacity=".15" fill="currentColor" /> + </g> + <g id="footer-topright" fill="currentColor"> + <path id="path3176-6" class="ColorScheme-Background" d="M 105,12 H 99 V 6 h 6 z" opacity="0.75" fill="currentColor" sodipodi:nodetypes="ccccc" /> + <path id="path3178-2" class="ColorScheme-Text" d="m105 7h-6v-1h6c0 1-2e-5 0 0 1z" fill-rule="evenodd" opacity=".15" fill="currentColor" /> + </g> + <path id="footer-left" class="ColorScheme-Background" transform="scale(-1 1)" d="m-67 12h6v32h-6z" fill="currentColor" opacity=".75" /> + <path id="footer-center" class="ColorScheme-Background" transform="scale(1 -1)" d="m67-44h32v32h-32z" fill="currentColor" opacity=".75" /> + <path id="footer-right" class="ColorScheme-Background" transform="scale(1 -1)" d="m99-44h6v32h-6z" fill="currentColor" opacity=".75" /> + <path id="footer-bottomleft" opacity=".75" class="ColorScheme-Background" fill="currentColor" d="M 61 44 L 61 47 C 61 48.662 62.338 50 64 50 L 67 50 L 67 44 L 61 44 z " /> + <path id="footer-bottom" class="ColorScheme-Background" transform="matrix(0 1 1 0 0 0)" d="m44 67h6v32h-6z" fill="currentColor" opacity=".75" /> + <path id="footer-bottomright" class="ColorScheme-Background" fill="currentColor" d="M 99 44 L 99 50 L 102 50 C 103.662 50 105 48.662 105 47 L 105 44 L 99 44 z " opacity=".75" /> + <path id="hint-top-margin" d="m33 12h4v6h-4z" fill="#f0f" /> + <path id="hint-bottom-margin" d="m33 38h4v6h-4z" fill="#f0f" /> + <path id="hint-right-margin" transform="rotate(90)" d="m26-51h4v6h-4z" fill="#f0f" /> + <path id="hint-left-margin" transform="rotate(90)" d="m26-25h4v6h-4z" fill="#f0f" /> +</svg> diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults new file mode 100644 index 000000000..2e46cd938 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults @@ -0,0 +1,27 @@ +[kdeglobals][KDE] +widgetStyle=Breeze + +[kdeglobals][General] +ColorScheme=Vapor + +[kdeglobals][Icons] +Theme=breeze-dark + +[plasmarc][Theme] +name=Vapor + +[kcminputrc][Mouse] +cursorTheme=breeze_cursors + +[kwinrc][WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][org.kde.kdecoration2] +library=org.kde.breeze + +[KSplash] +Engine=none +Theme=None diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png new file mode 100644 index 000000000..7e596c00c Binary files /dev/null and b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png differ diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js new file mode 100644 index 000000000..4010c768f --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -0,0 +1,42 @@ +var desktops = desktopsForActivity(currentActivity()); +for (var i = 0; i < desktops.length; i++) { + desktops[i].wallpaperPlugin = "org.kde.image"; + desktops[i].currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; + desktops[i].writeConfig("Image", "file:///usr/share/wallpapers/DroidDeck"); +} + +var dock = new Panel; +dock.location = "bottom"; +dock.height = 2 * Math.ceil(gridUnit * 2.5 / 2); + +var kickoff = dock.addWidget("org.kde.plasma.kickoff"); +kickoff.currentConfigGroup = ["Shortcuts"]; +kickoff.writeConfig("global", "Alt+F1"); +kickoff.currentConfigGroup = ["General"]; +kickoff.writeConfig("icon", "distributor-logo-steamdeck"); +kickoff.writeConfig("favorites", [ + "preferred://browser", + "applications:org.kde.dolphin.desktop", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", + "applications:org.kde.discover.desktop", + "applications:systemsettings.desktop", +]); + +var tasks = dock.addWidget("org.kde.plasma.icontasks"); +tasks.currentConfigGroup = ["General"]; +tasks.writeConfig("launchers", [ + "applications:steamdeck-steam.desktop", + "preferred://filemanager", + "preferred://browser", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", +]); + +var tray = dock.addWidget("org.kde.plasma.systemtray"); +var trayId = tray.readConfig("SystrayContainmentId"); +if (trayId) { + var trayContainment = desktopById(trayId); + trayContainment.currentConfigGroup = ["General"]; + trayContainment.writeConfig("scaleIconsToFit", true); +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js new file mode 100644 index 000000000..4baaa9a59 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js @@ -0,0 +1,4 @@ +applet.wallpaperPlugin = 'org.kde.image' +applet.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"] +applet.writeConfig("Image", "file:///usr/share/wallpapers/DroidDeck") +applet.reloadConfig() diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js new file mode 100644 index 000000000..2ef00cb57 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js @@ -0,0 +1,3 @@ +applet.currentConfigGroup = ["General"] +applet.writeConfig("icon", "distributor-logo-steamdeck") +applet.reloadConfig() diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js new file mode 100644 index 000000000..7eaae7a1c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js @@ -0,0 +1,6 @@ +systemtrayId = applet.readConfig("SystrayContainmentId"); +if (systemtrayId) { + const systrayContainer = desktopById(systemtrayId); + systrayContainer.currentConfigGroup = ["General"]; + systrayContainer.writeConfig("scaleIconsToFit", true); +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png new file mode 100644 index 000000000..708bcf312 Binary files /dev/null and b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png differ diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json new file mode 100644 index 000000000..5a0cdc78b --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json @@ -0,0 +1,22 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "", + "Name": "Valve" + } + ], + "Category": "", + "Description": "Vapor - SteamOS theme variant of KDE BreezeDark", + "Id": "com.valve.vapor.desktop", + "License": "GPLv2+", + "Name": "Vapor", + "ServiceTypes": [ + "Plasma/LookAndFeel" + ], + "Version": "0.01", + "Website": "" + }, + "X-KDE-ParentApp": "", + "X-Plasma-MainScript": "defaults" +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js new file mode 100644 index 000000000..ee5384608 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js @@ -0,0 +1,11 @@ +panels().forEach(function (panel) { + panel.widgets("org.kde.plasma.icontasks").forEach(function (tasks) { + tasks.currentConfigGroup = ["General"]; + var launchers = tasks.readConfig("launchers"); + if (typeof launchers === "string") launchers = launchers.length ? launchers.split(",") : []; + if (launchers.indexOf("applications:org.kde.kate.desktop") < 0) { + launchers.push("applications:org.kde.kate.desktop"); + tasks.writeConfig("launchers", launchers); + } + }); +}); diff --git a/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg new file mode 100644 index 000000000..229397123 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg @@ -0,0 +1,25 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="1920" height="1080" viewBox="0 0 1920 1080"> + <defs> + <radialGradient id="bg" cx="960" cy="540" r="1150" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#14213a"/> + <stop offset="0.5" stop-color="#0a1120"/> + <stop offset="1" stop-color="#04060b"/> + </radialGradient> + <radialGradient id="glow" cx="947.21" cy="540.00" r="420" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#1A9FFF" stop-opacity="0.22"/> + <stop offset="1" stop-color="#1A9FFF" stop-opacity="0"/> + </radialGradient> + <mask id="negative-space" maskUnits="userSpaceOnUse" x="-31.98" y="0" width="207.92" height="223.72"> + <rect x="-31.98" y="0" width="207.92" height="223.72" fill="#fff"/> + <circle cx="63.98" cy="111.86" r="71.81" fill="#000"/> + <rect x="56.055" y="0" width="15.83" height="45" fill="#000"/> + <rect x="56.055" y="178.72" width="15.83" height="45" fill="#000"/> + </mask> + </defs> + <rect width="1920" height="1080" fill="url(#bg)"/> + <circle cx="947.21" cy="540.00" r="420" fill="url(#glow)"/> + <g transform="translate(844.84 361.02) scale(1.6)"> + <path fill="#FFFFFF" mask="url(#negative-space)" d="M-31.98 0H63.97c61.84 0 111.96 50.08 111.96 111.86S125.81 223.72 63.97 223.72H-31.98V0Z"/> + <circle cx="63.98" cy="111.86" r="55.98" fill="#1A9FFF"/> + </g> +</svg> diff --git a/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json new file mode 100644 index 000000000..c4431e01c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json @@ -0,0 +1,8 @@ +{ + "KPlugin": { + "Authors": [{ "Name": "DroidDeck" }], + "Id": "DroidDeck", + "License": "GPL-3.0-or-later", + "Name": "DroidDeck" + } +} diff --git a/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf b/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf new file mode 100644 index 000000000..207e152eb --- /dev/null +++ b/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf @@ -0,0 +1 @@ +autospawn = no diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/apt b/tools/ubuntu/overlay-runtime/usr/local/bin/apt new file mode 100755 index 000000000..3a3cfe685 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/apt @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/apt "$@" ;; + esac + break + done +fi +exec /usr/bin/apt "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get b/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get new file mode 100755 index 000000000..85cbc0289 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/apt-get "$@" ;; + esac + break + done +fi +exec /usr/bin/apt-get "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude b/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude new file mode 100755 index 000000000..1f14363c7 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/aptitude "$@" ;; + esac + break + done +fi +exec /usr/bin/aptitude "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec b/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec new file mode 100755 index 000000000..c447280d8 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec @@ -0,0 +1,14 @@ +#!/bin/bash +while [ $# -gt 0 ]; do + case $1 in + --version) echo "pkexec version 126 (droiddeck)"; exit 0 ;; + --help) echo "usage: pkexec [--user username] [PROGRAM] [ARGUMENTS...]"; exit 0 ;; + --disable-internal-agent|--keep-cwd) shift ;; + --user) [ $# -ge 2 ] || exit 127; case $2 in root|0) ;; *) echo "pkexec: no user $2" >&2; exit 127 ;; esac; shift 2 ;; + --) shift; break ;; + *) break ;; + esac +done +[ $# -gt 0 ] || set -- "$(getent passwd root | cut -d: -f7)" +[ "$(id -u)" = 0 ] && exec "$@" +exec /usr/local/bin/droiddeck-root "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/su b/tools/ubuntu/overlay-runtime/usr/local/bin/su new file mode 100755 index 000000000..ad520ee45 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/su @@ -0,0 +1,43 @@ +#!/bin/bash +login=0 command= shell= user= named=0 +while [ $# -gt 0 ]; do + case $1 in + -|-l|--login) login=1; shift ;; + -c|--command) [ $# -ge 2 ] || { echo "su: option requires an argument -- 'c'" >&2; exit 1; }; command=$2; shift 2 ;; + --command=*) command=${1#*=}; shift ;; + -s|--shell) [ $# -ge 2 ] || { echo "su: option requires an argument -- 's'" >&2; exit 1; }; shell=$2; shift 2 ;; + --shell=*) shell=${1#*=}; shift ;; + -m|-p|--preserve-environment|-P|--pty|-f|--fast) shift ;; + -h|--help) echo "usage: su [-] [-c command] [-s shell] [root]"; exit 0 ;; + -V|--version) echo "DroidDeck su: runs a root shell inside the DroidDeck desktop"; exit 0 ;; + --) shift; break ;; + -*) echo "su: invalid option -- '${1#-}'" >&2; exit 1 ;; + *) [ "$named" = 1 ] && break; user=$1; named=1; shift ;; + esac +done +if [ "$named" = 0 ] && [ $# -gt 0 ]; then user=$1; shift; fi +user=${user:-root} +me=$(id -un 2>/dev/null) +case $user in + root|0) ;; + "$me") + run=${shell:-${SHELL:-/bin/bash}} + if [ -n "$command" ]; then exec "$run" -c "$command" "$@"; fi + [ "$login" = 1 ] && exec "$run" -l "$@" + exec "$run" "$@" + ;; + *) echo "su: user $user does not exist or the user entry does not contain all the required fields" >&2; exit 1 ;; +esac +args=() +[ "$login" = 1 ] && args+=(-i) +if [ -n "$shell" ]; then + if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" "$shell" -c "$command" "$@"; fi + exec /usr/local/bin/sudo "${args[@]}" "$shell" "$@" +fi +if [ -n "$command" ]; then + [ $# -eq 0 ] && exec /usr/local/bin/sudo "${args[@]}" -s "$command" + exec /usr/local/bin/sudo "${args[@]}" /bin/bash -c "$command" "$@" +fi +[ $# -gt 0 ] && exec /usr/local/bin/sudo "${args[@]}" /bin/bash "$@" +[ "$login" = 1 ] && exec /usr/local/bin/sudo -i +exec /usr/local/bin/sudo -s diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/sudo b/tools/ubuntu/overlay-runtime/usr/local/bin/sudo new file mode 100755 index 000000000..d6f0fb6dc --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/sudo @@ -0,0 +1,90 @@ +#!/bin/bash +me=${0##*/} +usage() { + echo "usage: $me [-EHiknsSv] [-u user] [-g group] [-D directory] [--] command [arg ...]" + echo " $me -e file ..." +} +known_user() { + case $1 in + ''|root|0|'#0'|"$(id -un 2>/dev/null)"|"#$(id -ru 2>/dev/null)") return 0 ;; + esac + echo "$me: unknown user $1" >&2 + exit 1 +} + +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +login=0 shell=0 edit=0 background=0 dir= +[ "$me" = sudoedit ] && edit=1 +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -h|--help) usage; exit 0 ;; + -V|--version) echo "DroidDeck sudo: runs commands as root inside the DroidDeck desktop"; exit 0 ;; + -l|--list) echo "User $(id -un 2>/dev/null) may run the following commands on $(uname -n):"; echo " (ALL : ALL) ALL"; exit 0 ;; + -v|--validate|-K|--remove-timestamp) exit 0 ;; + -k|--reset-timestamp) shift; [ $# -eq 0 ] && exit 0 ;; + -i|--login) login=1; shift ;; + -s|--shell) shell=1; shift ;; + -e|--edit) edit=1; shift ;; + -b|--background) background=1; shift ;; + -E|--preserve-env|--preserve-env=*|-H|--set-home|-n|--non-interactive|-S|--stdin|-P|--preserve-groups|-A|--askpass|-B|--bell|-N|--no-update) shift ;; + -u|--user|-g|--group) [ $# -ge 2 ] || { usage >&2; exit 1; }; known_user "$2"; shift 2 ;; + --user=*|--group=*) known_user "${1#*=}"; shift ;; + -u*|-g*) known_user "${1:2}"; shift ;; + -D|--chdir) [ $# -ge 2 ] || { usage >&2; exit 1; }; dir=$2; shift 2 ;; + --chdir=*) dir=${1#*=}; shift ;; + -p|--prompt|-C|--close-from|-r|--role|-t|--type|-T|--command-timeout|-R|--chroot) [ $# -ge 2 ] || { usage >&2; exit 1; }; shift 2 ;; + --prompt=*|--close-from=*|--role=*|--type=*|--command-timeout=*) shift ;; + -[A-Za-z][A-Za-z]*) + flags=${1#-}; shift + split=() + while [ -n "$flags" ]; do + split+=("-${flags:0:1}") + case ${flags:0:1} in + u|g|D|p|C|r|t|T|R) [ -n "${flags:1}" ] && split+=("${flags:1}"); flags= ;; + *) flags=${flags:1} ;; + esac + done + set -- "${split[@]}" "$@" + ;; + -*) echo "$me: invalid option -- '${1#-}'" >&2; usage >&2; exit 1 ;; + *) break ;; + esac +done + +if [ "$edit" = 1 ]; then + [ $# -gt 0 ] || { usage >&2; exit 1; } + editor=${SUDO_EDITOR:-${VISUAL:-${EDITOR:-nano}}} + exec $editor "$@" +fi + +export SUDO_USER=${SUDO_USER:-$(id -un 2>/dev/null)} +export SUDO_UID=${SUDO_UID:-$(id -ru 2>/dev/null)} +export SUDO_GID=${SUDO_GID:-$(id -rg 2>/dev/null)} +export SUDO_COMMAND="$*" USER=root LOGNAME=root +[ -z "$dir" ] || cd "$dir" || exit 1 + +target_shell=$(getent passwd "$(id -un 2>/dev/null)" | cut -d: -f7) +target_shell=${target_shell:-/bin/bash} +if [ "$login" = 1 ]; then + cd "${HOME:-/root}" 2>/dev/null + if [ $# -gt 0 ]; then set -- "$target_shell" -l -c "$*"; else set -- "$target_shell" -l; fi +elif [ "$shell" = 1 ]; then + if [ $# -gt 0 ]; then set -- "${SHELL:-$target_shell}" -c "$*"; else set -- "${SHELL:-$target_shell}"; fi +elif [ $# -eq 0 ]; then + usage >&2 + exit 1 +elif ! command -v "$1" >/dev/null 2>&1; then + echo "$me: $1: command not found" >&2 + exit 1 +fi + +if [ "$(id -u)" = 0 ]; then + [ "$background" = 1 ] && { "$@" & exit 0; } + exec "$@" +fi +if [ "$background" = 1 ]; then + /usr/local/bin/droiddeck-root "$@" </dev/null & + exit 0 +fi +exec /usr/local/bin/droiddeck-root "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/sudoedit b/tools/ubuntu/overlay-runtime/usr/local/bin/sudoedit new file mode 120000 index 000000000..3b0e384e5 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/sudoedit @@ -0,0 +1 @@ +sudo \ No newline at end of file diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/avahi-discover.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/avahi-discover.desktop new file mode 100644 index 000000000..9b9f23812 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/avahi-discover.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi Zeroconf Browser +Exec=/usr/bin/avahi-discover +Icon=network-wired +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/bssh.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/bssh.desktop new file mode 100644 index 000000000..46c4ebc18 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/bssh.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi SSH Server Browser +Exec=/usr/bin/bssh +Icon=network-wired +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/bvnc.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/bvnc.desktop new file mode 100644 index 000000000..8aa902547 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/bvnc.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi VNC Server Browser +Exec=/usr/bin/bvnc +Icon=network-wired +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/foot-server.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/foot-server.desktop new file mode 100644 index 000000000..77719ad7c --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/foot-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Server +Exec=foot --server +Icon=foot +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/footclient.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/footclient.desktop new file mode 100644 index 000000000..bf59b5c19 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/footclient.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Client +Exec=footclient +Icon=foot +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/lstopo.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/lstopo.desktop new file mode 100644 index 000000000..31fd6bd08 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/lstopo.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Hardware Locality lstopo +Exec=lstopo +Icon=hwloc +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop new file mode 100644 index 000000000..8e494cc19 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=IBus Preferences +Exec=ibus-setup +Icon=ibus-setup +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/qv4l2.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/qv4l2.desktop new file mode 100644 index 000000000..f4e2dce80 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/qv4l2.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 test Utility +Exec=qv4l2 +Icon=qv4l2 +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/local/share/applications/qvidcap.desktop b/tools/ubuntu/overlay-runtime/usr/local/share/applications/qvidcap.desktop new file mode 100644 index 000000000..3e01700fa --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/share/applications/qvidcap.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 video capture utility +Exec=qvidcap +Icon=qvidcap +NoDisplay=true diff --git a/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/remember b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/remember new file mode 100755 index 000000000..22990e118 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/remember @@ -0,0 +1,22 @@ +#!/bin/bash +dir=/usr/share/droiddeck/apt +state=/root/.local/share/droiddeck/apt +[ -r "$dir/system-manual.txt" ] || exit 0 +[ -z "${DROIDDECK_APT_RESTORING:-}" ] || exit 0 +runtime=$(cat "$dir/runtime-id" 2>/dev/null) +if [ -e /etc/xdg/autostart/droiddeck-apt-restore.desktop ] && [ -s "$state/restored" ] && [ "$(cat "$state/restored")" != "$runtime" ] && [ "$(cat "$state/attempted" 2>/dev/null)" != "$runtime" ]; then + exit 0 +fi +mkdir -p "$state/sources" "$state/keyrings" 2>/dev/null || exit 0 +manual=$(apt-mark showmanual 2>/dev/null) || exit 0 +{ printf '%s\n' "$manual" | grep -vxF -f "$dir/system-manual.txt" || true; } > "$state/packages.txt.tmp" && mv -f "$state/packages.txt.tmp" "$state/packages.txt" +rm -f "$state/sources"/* "$state/keyrings"/* 2>/dev/null +for f in /etc/apt/sources.list /etc/apt/sources.list.d/* /etc/apt/keyrings/* /etc/apt/trusted.gpg.d/* /usr/share/keyrings/*; do + [ -f "$f" ] || continue + grep -qxF "$f $(sha256sum "$f" | cut -d' ' -f1)" "$dir/system-sources.txt" 2>/dev/null && continue + case $f in /etc/apt/sources.list|/etc/apt/sources.list.d/*) to=sources ;; *) to=keyrings ;; esac + name=${f#/etc/apt/} + cp -f "$f" "$state/$to/$(printf '%s' "${name#/}" | tr / _)" +done +[ -s "$state/restored" ] || cat "$dir/runtime-id" > "$state/restored" 2>/dev/null +exit 0 diff --git a/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore new file mode 100755 index 000000000..6c374e2b8 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore @@ -0,0 +1,62 @@ +#!/bin/bash +dir=/usr/share/droiddeck/apt +state=/root/.local/share/droiddeck/apt +log=/root/.cache/droiddeck/apt-restore.log +[ -r "$dir/runtime-id" ] || exit 0 +runtime=$(cat "$dir/runtime-id") +[ "$(cat "$state/restored" 2>/dev/null)" = "$runtime" ] && exit 0 +[ "$(cat "$state/attempted" 2>/dev/null)" = "$runtime" ] && exit 0 +mkdir -p "$state" "${log%/*}" +tries=$(cat "$state/tries" 2>/dev/null) +count=0 +[ "${tries% *}" = "$runtime" ] && count=${tries##* } +count=$((count + 1)) +echo "$runtime $count" > "$state/tries" +[ "$count" -ge 3 ] && echo "$runtime" > "$state/attempted" +mapfile -t wanted < <(grep -v '^$' "$state/packages.txt" 2>/dev/null) +have_sources=0 +for f in "$state"/sources/* "$state"/keyrings/*; do [ -f "$f" ] && have_sources=1; done +if [ ${#wanted[@]} -eq 0 ] && [ "$have_sources" = 0 ]; then + echo "$runtime" > "$state/restored" + exit 0 +fi +notify() { notify-send -a DroidDeck -i system-software-update "$@" 2>/dev/null; } +notify "$(droiddeck-text desktop_restore_title)" "$(droiddeck-text desktop_restore_body)" +{ + date + ok=1 + DROIDDECK_APT_RESTORING=1 /usr/local/bin/sudo /bin/bash -s "$state" <<'ROOT' || ok=0 +state=$1 +mapfile -t wanted < <(grep -v '^$' "$state/packages.txt" 2>/dev/null) +for f in "$state"/sources/*; do + [ -f "$f" ] || continue + case $(basename "$f") in + sources.list) cp -f "$f" /etc/apt/sources.list ;; + *) cp -n "$f" "/etc/apt/$(basename "$f" | sed 's#^sources.list.d_#sources.list.d/#')" ;; + esac +done +for f in "$state"/keyrings/*; do + [ -f "$f" ] || continue + name=$(basename "$f") + case $name in keyrings_*) mkdir -p /etc/apt/keyrings; cp -n "$f" "/etc/apt/keyrings/${name#keyrings_}" ;; trusted.gpg.d_*) cp -n "$f" "/etc/apt/trusted.gpg.d/${name#trusted.gpg.d_}" ;; usr_share_keyrings_*) mkdir -p /usr/share/keyrings; cp -n "$f" "/usr/share/keyrings/${name#usr_share_keyrings_}" ;; esac +done +apt-get update || exit 1 +[ ${#wanted[@]} -eq 0 ] && exit 0 +found=() unknown=() +for p in "${wanted[@]}"; do + if apt-cache show "$p" >/dev/null 2>&1; then found+=("$p"); else unknown+=("$p"); fi +done +if [ ${#found[@]} -gt 0 ]; then DEBIAN_FRONTEND=noninteractive apt-get install -y "${found[@]}" || exit 1; fi +if [ ${#unknown[@]} -gt 0 ]; then + printf 'not in any source: %s\n' "${unknown[*]}" + exit 1 +fi +ROOT +} >> "$log" 2>&1 +if [ "$ok" = 1 ]; then + echo "$runtime" > "$state/restored" + notify "$(droiddeck-text desktop_restore_done_title)" "$(droiddeck-text desktop_restore_done_body)" +else + [ ${#wanted[@]} -eq 0 ] || printf 'sudo apt install %s\n' "${wanted[*]}" >> "$log" + notify "$(droiddeck-text desktop_restore_failed_title)" "$(droiddeck-text desktop_restore_failed_body)" +fi diff --git a/tools/ubuntu/packages-desktop.txt b/tools/ubuntu/packages-desktop.txt new file mode 100644 index 000000000..df725eab9 --- /dev/null +++ b/tools/ubuntu/packages-desktop.txt @@ -0,0 +1,259 @@ +alsa-base +alsa-utils +anacron +appstream +aptitude +ark +at-spi2-core +avahi-daemon +baloo6 +bc +bind9-dnsutils +bluedevil +bluez +bluez-cups +breeze +breeze-gtk-theme +cups +cups-bsd +cups-client +cups-filters +desktop-file-utils +dolphin +dolphin-plugins +drkonqi +e2fsprogs +elisa +fastfetch +ffmpegthumbs +fonts-liberation +fonts-noto-cjk +fonts-noto-extra- +fonts-noto-ui-core +fonts-noto-ui-extra- +fonts-ubuntu +foot +frameworkintegration6 +fwupd- +fwupd-signed- +gdb +genisoimage +ghostscript +gir1.2-gtk-3.0 +git +gstreamer1.0-gl +gstreamer1.0-libav +gstreamer1.0-pipewire +gstreamer1.0-plugins-bad +gstreamer1.0-plugins-base +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-tools +gwenview +haruna +htop +im-config +init-system-helpers +iw +kaccounts-providers +kactivitymanagerd +kate +kcalc +kcharselect +kde-cli-tools +kde-config-gtk-style +kde-config-gtk-style-preview +kde-config-screenlocker +kde-config-tablet +kde-config-updates +kde-spectacle +kde-style-oxygen-qt6 +kdeconnect +kdegraphics-thumbnailers +kdenetwork-filesharing +kdialog +kgamma +khelpcenter +kimageformat6-plugins +kinfocenter +kio-admin +kio-audiocd +kio-extras +kio-fuse +kio6 +kmahjongg +kmenuedit +kmines +konsole +kpat +kscreen +ksshaskpass +ksudoku +ksystemlog +ksystemstats +kubuntu-settings-desktop +kubuntu-wallpapers +kwalletmanager +kwin-addons +kwin-common +kwin-decoration-oxygen +kwin-wayland +kwrited +language-selector-common +layer-shell-qt +libacl1 +libapt-pkg7.0 +libattr1 +libaudit-common +libaudit1 +libayatana-appindicator3-1 +libbsd0 +libcap-ng0 +libcrypt1 +libdb5.3t64 +libdebconfclient0 +libedit2 +libevent-2.1-7t64 +libext2fs2t64 +libfcft4t64 +libgcrypt20 +libglib2.0-bin +libgoogle-perftools4t64 +libgpg-error0 +libgraphene-1.0-0 +libgtk-4-1 +libgupnp-igd-1.6-0 +libhidapi-hidraw0 +libhidapi-libusb0 +liblz4-1 +libmd0 +libmpdec4 +libncursesw6 +libnice10 +libnotify-bin +libpam-modules +libpam-modules-bin +libpam-runtime +libpam0g +libproc2-0 +libqca-qt6-plugins +libqt6svg6 +libsasl2-modules +libsdl2-2.0-0 +libsdl3-0 +libsemanage-common +libsemanage2 +libsepol2 +libsmartcols1 +libspa-0.2-bluetooth +libss2 +libtcmalloc-minimal4t64 +libtinfo6 +libturbojpeg0 +libunwind8 +libutf8proc3 +libva-glx2 +libva-wayland2 +libwebpdecoder3 +libxcb-dri2-0 +libxcb-screensaver0 +libxcb-xf86dri0 +libxcb-xtest0 +libxcb-xvmc0 +libxxhash0 +logsave +man-db +mesa-utils +milou +mobile-broadband-provider-info +mount +neochat +network-manager +network-manager-openconnect +network-manager-openvpn +network-manager-pptp +okular +okular-extra-backends +orca +oxygen-sounds +packagekit +pastebinit +phonon4qt6-backend-vlc +phonon4settings +pinentry-qt +pipewire +pipewire-audio +plasma-browser-integration +plasma-calendar-addons +plasma-dataengines-addons +plasma-desktop +plasma-discover +plasma-discover-backend-flatpak +plasma-discover-backend-fwupd- +plasma-discover-backend-snap +plasma-discover-notifier +plasma-disks +plasma-integration +plasma-keyboard +plasma-nm +plasma-pa +plasma-runners-addons +plasma-session-wayland +plasma-systemmonitor +plasma-theme-oxygen +plasma-vault +plasma-wallpapers-addons +plasma-welcome +plasma-widgets-addons +plasma-workspace +plasma-workspace-wallpapers- +plasma5-integration +plocate +policykit-desktop-privileges +polkit-kde-agent-1 +power-profiles-daemon +powerdevil +ppa-purge +print-manager +python3-dbus +python3-launchpadlib +python3-setuptools +python3-yaml +qml6-module-org-kde-breeze +qml6-module-org-kde-desktop +qml6-module-org-kde-ksysguard +qml6-module-org-kde-pipewire +qml6-module-qt-labs-folderlistmodel +qml6-module-qt5compat-graphicaleffects +qml6-module-qtqml-xmllistmodel +qt6-image-formats-plugins +qt6-translations-l10n +qttranslations5-l10n +remmina +rfkill +signon-kwallet-extension +signon-plugin-oauth2 +signon-ui-qt +signon-ui-service +skanpage +snapd +software-properties-qt +squashfs-tools +synaptic +systemsettings +udisks2 +unrar-free +upower +va-driver-all +vim +vulkan-tools +wireplumber +wl-clipboard +wpasupplicant +xclip +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xsettingsd +zsync diff --git a/tools/ubuntu/packages-runtime.txt b/tools/ubuntu/packages-runtime.txt new file mode 100644 index 000000000..c6bcd3618 --- /dev/null +++ b/tools/ubuntu/packages-runtime.txt @@ -0,0 +1,242 @@ +7zip +apt +base-files +base-passwd +bash +bsdextrautils +bsdutils +bubblewrap +ca-certificates +coreutils +curl +dash +dbus +dbus-daemon +dbus-x11 +debconf +debianutils +diffutils +dpkg +file +findutils +flatpak +fontconfig +fonts-dejavu-core +fonts-noto-color-emoji +fonts-noto-core +gamescope +gir1.2-flatpak-1.0 +gir1.2-glib-2.0 +gir1.2-gtk-3.0 +gnu-coreutils +gnupg-agent +gpgv +grep +gzip +hostname +iproute2 +iputils-ping +less +libapparmor1 +libarchive-tools +libasound2t64 +libasyncns0 +libatk-bridge2.0-0t64 +libatk1.0-0t64 +libatomic1 +libatspi2.0-0t64 +libavahi-client3 +libavahi-common3 +libblas3 +libblkid1 +libbrotli1 +libbz2-1.0 +libc-bin +libc-gconv-modules-extra +libc6 +libcairo2 +libcap2 +libcom-err2 +libcups2t64 +libdatrie1 +libdbus-1-3 +libdecor-0-0 +libdisplay-info3 +libdrm2 +libegl-mesa0 +libegl1 +libeis1 +libevdev2 +libexpat1 +libffi8 +libflac14 +libfmt10 +libfontconfig1 +libfreetype6 +libfribidi0 +libgbm1 +libgcc-s1 +libgdk-pixbuf-2.0-0 +libgl1 +libgl1-mesa-dri +libgles2 +libglib2.0-0t64 +libglvnd0 +libglx-mesa0 +libglx0 +libglycin-2-0 +libgmp10 +libgnutls30t64 +libgraphite2-3 +libgssapi-krb5-2 +libgtk2.0-0t64 +libgudev-1.0-0 +libharfbuzz0b +libhogweed6t64 +libibus-1.0-5 +libice6 +libidn2-0 +libinput10 +libjsoncpp26 +libk5crypto3 +libkeyutils1 +libkrb5-3 +libkrb5support0 +liblapack3 +liblcms2-2 +libliftoff0 +liblua5.4-0 +libluajit-5.1-2 +liblzma5 +liblzo2-2 +libmount1 +libmp3lame0 +libmpg123-0t64 +libmtdev1t64 +libnettle8t64 +libnghttp2-14 +libnm0 +libnspr4 +libnss-mdns +libnss-myhostname +libnss3 +libopenal1 +libopengl0 +libopenvr-api2 +libopus0 +libp11-kit0 +libpango-1.0-0 +libpangocairo-1.0-0 +libpangoft2-1.0-0 +libpci3 +libpcre2-8-0 +libpcsclite1 +libpipewire-0.3-0t64 +libpixman-1-0 +libpng16-16t64 +libpulse0 +libsamplerate0 +libsdl2-classic +libseat1 +libseccomp2 +libselinux1 +libsm6 +libsndfile1 +libssh2-1t64 +libssl3t64 +libstdc++6 +libsystemd0 +libtasn1-6 +libthai0 +libudev1 +libunistring5 +libusb-1.0-0 +libuuid1 +libva-drm2 +libva-x11-2 +libva2 +libvdpau1 +libvulkan1 +libwacom9 +libwayland-client0 +libwayland-cursor0 +libwayland-egl1 +libwayland-server0 +libwlroots-0.19 +libx11-6 +libx11-xcb1 +libxau6 +libxcb-composite0 +libxcb-dri3-0 +libxcb-errors0 +libxcb-ewmh2 +libxcb-icccm4 +libxcb-keysyms1 +libxcb-present0 +libxcb-render-util0 +libxcb-render0 +libxcb-res0 +libxcb-shm0 +libxcb-xfixes0 +libxcb-xinput0 +libxcb1 +libxcomposite1 +libxcursor1 +libxdamage1 +libxdmcp6 +libxext6 +libxfixes3 +libxi6 +libxinerama1 +libxkbcommon0 +libxml2-16 +libxmu6 +libxrandr2 +libxrender1 +libxres1 +libxss1 +libxt6t64 +libxtst6 +libxxf86vm1 +libzstd1 +locales +locales-all +login +login.defs +lsof +mawk +mesa-libgallium +mesa-vulkan-drivers +nano +ncurses-base +ncurses-bin +openssl-provider-legacy +passwd +perl-base +procps +psmisc +pulseaudio-utils +python3 +python3-gi +python3-zstandard +sed +sensible-utils +strace +sysvinit-utils +tar +tzdata +ubuntu-keyring +unzip +util-linux +util-linux-extra +wayland-utils +wget +x11-utils +x11-xserver-utils +xdg-utils +xkb-data +xwayland +xz-utils +zip +zlib1g +zstd diff --git a/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch b/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch new file mode 100644 index 000000000..592cfbf13 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch @@ -0,0 +1,183 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 07:28:38 -0400 +Subject: [PATCH] Respect nested desktop scale + +--- + src/backends/wayland/wayland_backend.cpp | 34 +++++++++++++++++++++++----- + src/backends/wayland/wayland_egl_backend.cpp | 4 +++- + src/backends/wayland/wayland_layer.cpp | 2 +- + src/backends/wayland/wayland_output.cpp | 26 ++++++++++++++++---- + src/backends/wayland/wayland_output.h | 2 ++ + 5 files changed, 55 insertions(+), 13 deletions(-) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index 557156e..1f88013 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -105,8 +105,10 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + WaylandOutput *output = m_seat->backend()->findOutput(m_pointer->enteredSurface()); + Q_ASSERT(output); + const auto subsurface = m_seat->backend()->findSubSurface(m_pointer->enteredSurface()); +- const QPointF absolutePos = output->position() + relativeToSurface +- + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF hostPosition = relativeToSurface + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF absolutePos = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? output->mapToOutput(hostPosition) ++ : output->position() + hostPosition; + Q_EMIT pointerMotionAbsolute(absolutePos, std::chrono::milliseconds(time), this); + }); + connect(pointer, &Pointer::buttonStateChanged, this, [this](quint32 serial, quint32 time, quint32 button, Pointer::ButtonState nativeState) { +@@ -180,7 +182,15 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::RelativePointer *relati + , m_relativePointer(relativePointer) + { + connect(relativePointer, &RelativePointer::relativeMotion, this, [this](const QSizeF &delta, const QSizeF &deltaNonAccelerated, quint64 timestamp) { +- Q_EMIT pointerMotion(sizeToPoint(delta), sizeToPoint(deltaNonAccelerated), std::chrono::microseconds(timestamp), this); ++ const auto pointer = m_seat->pointerDevice(); ++ const auto output = pointer && pointer->m_pointer ++ ? m_seat->backend()->findOutput(pointer->m_pointer->enteredSurface()) : nullptr; ++ const auto toOutput = [output](const QSizeF &hostDelta) { ++ return output && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? output->mapToOutput(sizeToPoint(hostDelta)) - output->mapToOutput(QPointF()) ++ : sizeToPoint(hostDelta); ++ }; ++ Q_EMIT pointerMotion(toOutput(delta), toOutput(deltaNonAccelerated), std::chrono::microseconds(timestamp), this); + }); + } + +@@ -197,13 +207,21 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Touch *touch, WaylandSe + connect(touch, &Touch::sequenceStarted, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchDown(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + connect(touch, &Touch::pointAdded, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchDown(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + connect(touch, &Touch::pointRemoved, this, [this](TouchPoint *tp) { +@@ -212,7 +230,11 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Touch *touch, WaylandSe + connect(touch, &Touch::pointMoved, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchMotion(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + } +diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp +index 66ae1b2..fb17c31 100644 +--- a/src/backends/wayland/wayland_egl_backend.cpp ++++ b/src/backends/wayland/wayland_egl_backend.cpp +@@ -204,7 +204,9 @@ bool WaylandEglCursorLayer::doEndFrame(const Region &renderedDeviceRegion, const + wl_buffer *buffer = m_backend->backend()->importBuffer(m_buffer->buffer()); + Q_ASSERT(buffer); + +- static_cast<WaylandOutput *>(m_output.get())->cursor()->update(buffer, m_buffer->buffer()->size() / m_output->scale(), (hotspot() / m_output->scale()).toPoint()); ++ auto output = static_cast<WaylandOutput *>(m_output.get()); ++ output->cursor()->update(buffer, m_buffer->buffer()->size() / output->presentationScale(), ++ (hotspot() / output->presentationScale()).toPoint()); + + EGLNativeFence releaseFence{m_backend->eglDisplayObject()}; + m_swapchain->release(m_buffer, releaseFence.takeFileDescriptor()); +diff --git a/src/backends/wayland/wayland_layer.cpp b/src/backends/wayland/wayland_layer.cpp +index 1bc003e..15b1624 100644 +--- a/src/backends/wayland/wayland_layer.cpp ++++ b/src/backends/wayland/wayland_layer.cpp +@@ -93,7 +93,7 @@ void WaylandLayer::commit(PresentationMode presentationMode) + // this is a bit annoying, we need a new Wayland protocol + // to do this properly with fractional scaling. Until we + // have that, it may cause blurriness in some cases! +- const Rect logicalTarget = targetRect().scaled(1.0 / m_output->scale()).rounded(); ++ const Rect logicalTarget = targetRect().scaled(1.0 / static_cast<WaylandOutput *>(m_output.get())->presentationScale()).rounded(); + if (m_viewport) { + m_viewport->setSource(sourceRect()); + m_viewport->setDestination(logicalTarget.size()); +diff --git a/src/backends/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp +index e435266..2bc8ee9 100644 +--- a/src/backends/wayland/wayland_output.cpp ++++ b/src/backends/wayland/wayland_output.cpp +@@ -312,7 +312,7 @@ bool WaylandOutput::present(const QList<OutputLayer *> &layersToUpdate, const st + m_surface->attachBuffer(buffer); + m_mapped = true; + } +- m_viewport->setDestination(QSize(std::round(modeSize().width() / scale()), std::round(modeSize().height() / scale()))); ++ m_viewport->setDestination(QSize(std::round(modeSize().width() / presentationScale()), std::round(modeSize().height() / presentationScale()))); + m_surface->setScale(1); + // commit the subsurfaces before the main surface + for (OutputLayer *layer : layersToUpdate) { +@@ -375,9 +375,10 @@ void WaylandOutput::applyChanges(const OutputConfiguration &config) + next.enabled = props->enabled.value_or(m_state.enabled); + next.transform = props->transform.value_or(m_state.transform); + next.position = props->pos.value_or(m_state.position); +- // intentionally ignored, as it would get overwritten +- // with the fractional scale protocol anyways +- // next.scale = props->scale.value_or(m_state.scale); ++ if (qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ next.scale = props->scale.value_or(m_state.scale); ++ next.scaleSetting = props->scaleSetting.value_or(m_state.scaleSetting); ++ } + next.desiredModeSize = props->desiredModeSize.value_or(m_state.desiredModeSize); + next.desiredModeRefreshRate = props->desiredModeRefreshRate.value_or(m_state.desiredModeRefreshRate); + next.desiredModeFlags = props->desiredModeFlags.value_or(m_state.desiredModeFlags); +@@ -395,6 +396,19 @@ void WaylandOutput::applyChanges(const OutputConfiguration &config) + setState(next); + } + ++qreal WaylandOutput::presentationScale() const ++{ ++ return qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ? m_pendingScale : scale(); ++} ++ ++QPointF WaylandOutput::mapToOutput(const QPointF &hostPosition) const ++{ ++ const QPointF inPanel = hostPosition * presentationScale() / scale(); ++ const QSizeF panelSize = QSize(std::round(modeSize().width() / scale()), ++ std::round(modeSize().height() / scale())); ++ return position() + transform().inverted().map(inPanel, panelSize); ++} ++ + bool WaylandOutput::isReady() const + { + return m_ready; +@@ -468,7 +482,9 @@ void WaylandOutput::applyConfigure(const QSize &size, quint32 serial) + State next = m_state; + next.modes = {mode}; + next.currentMode = mode; +- next.scale = m_pendingScale; ++ if (!qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ next.scale = m_pendingScale; ++ } + setState(next); + + Q_EMIT m_backend->outputsQueried(); +diff --git a/src/backends/wayland/wayland_output.h b/src/backends/wayland/wayland_output.h +index 7c30ce3..d9dcb0c 100644 +--- a/src/backends/wayland/wayland_output.h ++++ b/src/backends/wayland/wayland_output.h +@@ -86,6 +86,8 @@ public: + + void init(const QSize &pixelSize, qreal scale, bool fullscreen); + ++ qreal presentationScale() const; ++ QPointF mapToOutput(const QPointF &hostPosition) const; + bool isReady() const; + KWayland::Client::Surface *surface() const; + WaylandCursor *cursor() const; diff --git a/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch b/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch new file mode 100644 index 000000000..ba31e80c5 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 07:28:38 -0400 +Subject: [PATCH] Select explicit nested render node + +--- + src/backends/wayland/wayland_backend.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index e07e146..54f5a70 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -455,6 +455,15 @@ bool WaylandBackend::initialize() + + if (WaylandClient::LinuxDmabufV1 *dmabuf = m_display->linuxDmabuf()) { + m_drmDevice = DrmDevice::open(dmabuf->mainDevice()); ++ if (!m_drmDevice && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ const QStringList nodes = qEnvironmentVariable("KWIN_RENDER_NODES").split(QLatin1Char(':'), Qt::SkipEmptyParts); ++ if (nodes.size() == 1) { ++ m_drmDevice = DrmDevice::open(nodes.constFirst()); ++ if (m_drmDevice) { ++ qCWarning(KWIN_WAYLAND_BACKEND) << "Using explicitly selected nested render node" << nodes.constFirst(); ++ } ++ } ++ } + if (!m_drmDevice) { + qCWarning(KWIN_WAYLAND_BACKEND) << "Failed to open drm render node" << dmabuf->mainDevice(); + } diff --git a/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch b/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch new file mode 100644 index 000000000..a624b9415 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch @@ -0,0 +1,78 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 07:28:45 -0400 +Subject: [PATCH] Forward nested scroll source + +--- + src/backends/wayland/wayland_backend.cpp | 42 +++++++++++++++++++++--- + 1 file changed, 38 insertions(+), 4 deletions(-) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index 54f5a70..25bd0d0 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -29,6 +29,9 @@ + + #include <QAbstractEventDispatcher> + ++#include <array> ++#include <memory> ++ + #include <drm_fourcc.h> + #include <fcntl.h> + #include <gbm.h> +@@ -123,8 +126,31 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + } + Q_EMIT pointerButtonChanged(button, state, std::chrono::milliseconds(time), this); + }); +- // TODO: Send discreteDelta and source as well. +- connect(pointer, &Pointer::axisChanged, this, [this](quint32 time, Pointer::Axis nativeAxis, qreal delta) { ++ auto axisSource = std::make_shared<PointerAxisSource>(PointerAxisSource::Unknown); ++ auto axisDiscrete = std::make_shared<std::array<qint32, 2>>(); ++ connect(pointer, &Pointer::axisSourceChanged, this, [axisSource](Pointer::AxisSource source) { ++ switch (source) { ++ case Pointer::AxisSource::Wheel: ++ *axisSource = PointerAxisSource::Wheel; ++ break; ++ case Pointer::AxisSource::Finger: ++ *axisSource = PointerAxisSource::Finger; ++ break; ++ case Pointer::AxisSource::Continuous: ++ *axisSource = PointerAxisSource::Continuous; ++ break; ++ case Pointer::AxisSource::WheelTilt: ++ *axisSource = PointerAxisSource::WheelTilt; ++ break; ++ default: ++ *axisSource = PointerAxisSource::Unknown; ++ break; ++ } ++ }); ++ connect(pointer, &Pointer::axisDiscreteChanged, this, [axisDiscrete](Pointer::Axis nativeAxis, qint32 discreteDelta) { ++ (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1] = discreteDelta * 120; ++ }); ++ connect(pointer, &Pointer::axisChanged, this, [this, axisSource, axisDiscrete](quint32 time, Pointer::Axis nativeAxis, qreal delta) { + PointerAxis axis; + switch (nativeAxis) { + case Pointer::Axis::Horizontal: +@@ -136,10 +162,18 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + default: + Q_UNREACHABLE(); + } +- Q_EMIT pointerAxisChanged(axis, delta, 0, PointerAxisSource::Unknown, false, std::chrono::milliseconds(time), this); ++ qint32 &discrete = (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1]; ++ Q_EMIT pointerAxisChanged(axis, delta, discrete, *axisSource, false, std::chrono::milliseconds(time), this); ++ discrete = 0; ++ }); ++ connect(pointer, &Pointer::axisStopped, this, [this, axisSource](quint32 time, Pointer::Axis nativeAxis) { ++ const PointerAxis axis = nativeAxis == Pointer::Axis::Vertical ? PointerAxis::Vertical : PointerAxis::Horizontal; ++ Q_EMIT pointerAxisChanged(axis, 0, 0, *axisSource, false, std::chrono::milliseconds(time), this); + }); + +- connect(pointer, &Pointer::frame, this, [this]() { ++ connect(pointer, &Pointer::frame, this, [this, axisSource, axisDiscrete]() { ++ *axisSource = PointerAxisSource::Unknown; ++ axisDiscrete->fill(0); + Q_EMIT pointerFrame(this); + }); + diff --git a/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch new file mode 100644 index 000000000..9165715ed --- /dev/null +++ b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 10:02:00 -0400 +Subject: [PATCH] Keep dmabuf tranches that target the main device + +--- + src/wayland-client/linuxdmabuf.cpp | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/wayland-client/linuxdmabuf.cpp b/src/wayland-client/linuxdmabuf.cpp +--- a/src/wayland-client/linuxdmabuf.cpp ++++ b/src/wayland-client/linuxdmabuf.cpp +@@ -130,15 +130,16 @@ + drmFreeDevice(&mainDevice); + drmFreeDevice(&trancheDevice); + }); +- if (drmGetDeviceFromDevId(feedback->m_mainDeviceId, 0, &mainDevice) != 0 +- || drmGetDeviceFromDevId(feedback->m_trancheDeviceId, 0, &trancheDevice) != 0) { +- qCWarning(KWIN_WAYLAND_CLIENT, "drmGetDeviceFromDevId() failed"); +- return; +- } +- if (!drmDevicesEqual(mainDevice, trancheDevice)) { +- // TODO take multi GPU handling into account as well +- qCDebug(KWIN_WAYLAND_CLIENT, "Ignoring tranche from non-main device"); +- return; ++ if (feedback->m_mainDeviceId != feedback->m_trancheDeviceId) { ++ if (drmGetDeviceFromDevId(feedback->m_mainDeviceId, 0, &mainDevice) != 0 ++ || drmGetDeviceFromDevId(feedback->m_trancheDeviceId, 0, &trancheDevice) != 0) { ++ qCWarning(KWIN_WAYLAND_CLIENT, "drmGetDeviceFromDevId() failed"); ++ return; ++ } ++ if (!drmDevicesEqual(mainDevice, trancheDevice)) { ++ qCDebug(KWIN_WAYLAND_CLIENT, "Ignoring tranche from non-main device"); ++ return; ++ } + } + + struct linux_dmabuf_feedback_v1_table_entry diff --git a/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch b/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch new file mode 100644 index 000000000..16a72ae82 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 09:30:00 -0400 +Subject: [PATCH] turnip/kgsl: keep the GPU when VK_KHR_display is enabled + +KGSL has no DRM display node, so the display WSI has nothing to list. +Refusing the whole physical device left instances that enable +VK_KHR_display (vulkaninfo, vkcube, SDL) with no GPU at all. +--- + src/freedreno/vulkan/tu_knl_kgsl.cc | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/freedreno/vulkan/tu_knl_kgsl.cc b/src/freedreno/vulkan/tu_knl_kgsl.cc +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc +@@ -1757,11 +1757,6 @@ tu_kgsl_get_raytracing(int fd) + VkResult + tu_knl_kgsl_load(struct tu_instance *instance, int fd) + { +- if (instance->vk.enabled_extensions.KHR_display) { +- return vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED, +- "I can't KHR_display"); +- } +- + struct tu_physical_device *device = (struct tu_physical_device *) + vk_zalloc(&instance->vk.alloc, sizeof(*device), 8, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); diff --git a/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch b/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch new file mode 100644 index 000000000..1bdc8be42 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 13:30:00 -0400 +Subject: [PATCH] turnip/kgsl: accept UBWC 5 and 6 + +Backport of upstream Mesa's KGSL_UBWC_5_0/6_0 handling so Adreno 8xx +(UBWC 6) is found by the KGSL backend. +--- +--- a/src/freedreno/vulkan/msm_kgsl.h 2026-10-28 13:27:57.698671357 -0400 ++++ b/src/freedreno/vulkan/msm_kgsl.h 2026-10-28 13:27:57.700490261 -0400 +@@ -247,6 +247,8 @@ + #define KGSL_UBWC_2_0 2 + #define KGSL_UBWC_3_0 3 + #define KGSL_UBWC_4_0 4 ++#define KGSL_UBWC_5_0 5 ++#define KGSL_UBWC_6_0 6 + + /* + * Reset status values for context +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 13:27:57.697821704 -0400 ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 13:27:57.710313562 -0400 +@@ -1884,6 +1884,8 @@ + device->ubwc_config.macrotile_mode = FDL_MACROTILE_4_CHANNEL; + break; + case KGSL_UBWC_4_0: ++ case KGSL_UBWC_5_0: ++ case KGSL_UBWC_6_0: + device->ubwc_config.bank_swizzle_levels = 0x6; + device->ubwc_config.macrotile_mode = FDL_MACROTILE_8_CHANNEL; + break; diff --git a/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch b/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch new file mode 100644 index 000000000..5d09c46d8 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Wed, 28 Oct 2026 15:00:00 -0400 +Subject: [PATCH] turnip/kgsl: report the KGSL device numbers for WSI + +Expose VK_EXT_physical_device_drm with the kgsl-3d0 device numbers so a +nested compositor such as gamescope can advertise dma-buf feedback and +Vulkan swapchains work without the software WSI. Ported from +Droid-Deck/Drivers (patches/scripts/linux_kgsl_wsi.py). +--- +--- a/src/freedreno/vulkan/tu_device.cc 2026-10-28 14:41:54.161481991 -0400 ++++ b/src/freedreno/vulkan/tu_device.cc 2026-10-28 14:41:54.174757117 -0400 +@@ -312,7 +312,7 @@ + .EXT_mutable_descriptor_type = true, + .EXT_nested_command_buffer = true, + .EXT_non_seamless_cube_map = true, +- .EXT_physical_device_drm = !is_kgsl(device->instance), ++ .EXT_physical_device_drm = !is_kgsl(device->instance) || device->has_local, + .EXT_pipeline_creation_cache_control = true, + .EXT_pipeline_creation_feedback = true, + .EXT_primitive_topology_list_restart = true, +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 14:41:54.159481934 -0400 ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 14:41:54.174233883 -0400 +@@ -11,6 +11,8 @@ + #include <stdint.h> + #include <sys/ioctl.h> + #include <sys/mman.h> ++#include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <linux/dma-heap.h> + + #define __user +@@ -1907,6 +1909,13 @@ + + instance->knl = &kgsl_knl_funcs; + ++ struct stat kgsl_st; ++ if (fstat(fd, &kgsl_st) == 0 && S_ISCHR(kgsl_st.st_mode)) { ++ device->has_local = device->has_master = true; ++ device->local_major = device->master_major = major(kgsl_st.st_rdev); ++ device->local_minor = device->master_minor = minor(kgsl_st.st_rdev); ++ } ++ + result = tu_physical_device_init(device, instance); + if (result != VK_SUCCESS) + goto fail; diff --git a/tools/ubuntu/proc/cap_last_cap b/tools/ubuntu/proc/cap_last_cap new file mode 100644 index 000000000..425151f3a --- /dev/null +++ b/tools/ubuntu/proc/cap_last_cap @@ -0,0 +1 @@ +40 diff --git a/tools/ubuntu/proc/loadavg b/tools/ubuntu/proc/loadavg new file mode 100644 index 000000000..376825638 --- /dev/null +++ b/tools/ubuntu/proc/loadavg @@ -0,0 +1 @@ +0.00 0.00 0.00 1/100 1 diff --git a/tools/ubuntu/proc/overflowgid b/tools/ubuntu/proc/overflowgid new file mode 100644 index 000000000..e8f3792bb --- /dev/null +++ b/tools/ubuntu/proc/overflowgid @@ -0,0 +1 @@ +65534 diff --git a/tools/ubuntu/proc/overflowuid b/tools/ubuntu/proc/overflowuid new file mode 100644 index 000000000..e8f3792bb --- /dev/null +++ b/tools/ubuntu/proc/overflowuid @@ -0,0 +1 @@ +65534 diff --git a/tools/ubuntu/proc/stat b/tools/ubuntu/proc/stat new file mode 100644 index 000000000..9ea5a5eeb --- /dev/null +++ b/tools/ubuntu/proc/stat @@ -0,0 +1,8 @@ +cpu 0 0 0 0 0 0 0 0 0 0 +cpu0 0 0 0 0 0 0 0 0 0 0 +intr 0 +ctxt 0 +btime 0 +processes 1 +procs_running 1 +procs_blocked 0 diff --git a/tools/ubuntu/proc/uptime b/tools/ubuntu/proc/uptime new file mode 100644 index 000000000..d8ccf3fa0 --- /dev/null +++ b/tools/ubuntu/proc/uptime @@ -0,0 +1 @@ +100.00 100.00 diff --git a/tools/ubuntu/proc/version b/tools/ubuntu/proc/version new file mode 100644 index 000000000..5e6716a59 --- /dev/null +++ b/tools/ubuntu/proc/version @@ -0,0 +1 @@ +Linux version 6.1.0 (bannerlator@android) (gcc version 12.0) #1 SMP PREEMPT diff --git a/tools/ubuntu/proc/vmstat b/tools/ubuntu/proc/vmstat new file mode 100644 index 000000000..f13797199 --- /dev/null +++ b/tools/ubuntu/proc/vmstat @@ -0,0 +1 @@ +nr_free_pages 0 diff --git a/tools/ubuntu/protected-desktop.txt b/tools/ubuntu/protected-desktop.txt new file mode 100644 index 000000000..038f1e804 --- /dev/null +++ b/tools/ubuntu/protected-desktop.txt @@ -0,0 +1,11 @@ +dolphin +kde-cli-tools +konsole +kwin-wayland +pipewire +pipewire-pulse +plasma-desktop +plasma-discover +plasma-workspace +wireplumber +xdg-desktop-portal-kde diff --git a/tools/ubuntu/protected-runtime.txt b/tools/ubuntu/protected-runtime.txt new file mode 100644 index 000000000..646225220 --- /dev/null +++ b/tools/ubuntu/protected-runtime.txt @@ -0,0 +1,19 @@ +apt +bash +coreutils +dbus-daemon +dpkg +flatpak +fontconfig +gamescope +libegl-mesa0 +libgl1-mesa-dri +libluajit-5.1-2 +libseat1 +libvulkan1 +locales-all +mesa-libgallium +mesa-vulkan-drivers +python3 +python3-gi +xwayland diff --git a/tools/ubuntu/setup.sh b/tools/ubuntu/setup.sh new file mode 100755 index 000000000..20673844e --- /dev/null +++ b/tools/ubuntu/setup.sh @@ -0,0 +1,186 @@ +#!/bin/bash +set -euo pipefail +umask 022 +here=$(cd "$(dirname "$0")" && pwd) +debs=${1:?directory with the DroidDeck-built .deb files} +runtime_id=${2:?runtime id} +stage=${3:?runtime or desktop} +export DEBIAN_FRONTEND=noninteractive DROIDDECK_APT_RESTORING=1 LANG=C.UTF-8 LC_ALL=C.UTF-8 +repo=/var/lib/droiddeck/apt + +install_held() { + local held=() deb name + for deb in "$repo"/*.deb; do + name=$(dpkg-deb -f "$deb" Package) + dpkg-query -W -f '${Status}' "$name" 2>/dev/null | grep -q ' ok installed' || continue + held+=("$name=$(dpkg-deb -f "$deb" Version)") + done + [ ${#held[@]} -gt 0 ] || return 0 + apt-get install -y --no-install-recommends --allow-downgrades "${held[@]}" + apt-mark hold "${held[@]%%=*}" >/dev/null +} + +build_package() { + local name=$1 overlay=$2 protected=$3 summary=$4 pkg depends + pkg=$(mktemp -d) + mkdir -p "$pkg/DEBIAN" + cp -r "$overlay/." "$pkg/" + rm -rf "$pkg/usr/local" + [ -d "$overlay/usr/local" ] && cp -r "$overlay/usr/local/." /usr/local/ + (cd "$pkg" && find . -path ./DEBIAN -prune -o \( -type f -o -type l \) -print | sed 's#^\.##') | sort > "$pkg.files" + { + echo '#!/bin/sh' + echo 'set -e' + echo 'if [ "$1" = install ] || [ "$1" = upgrade ]; then' + echo ' :' + while read -r path; do + owner=$(dpkg-query -S "$path" 2>/dev/null | grep -v '^diversion' | cut -d: -f1 | head -1) || true + [ -n "$owner" ] && [ "$owner" != "$name" ] && echo " dpkg-divert --package $name --rename --divert '$path.distrib' --add '$path'" + done < "$pkg.files" + echo 'fi' + } > "$pkg/DEBIAN/preinst" + { + echo '#!/bin/sh' + echo 'set -e' + echo 'if [ "$1" = remove ] || [ "$1" = purge ]; then' + echo " dpkg-divert --list $name | awk '{print \$3}' | while read -r f; do rm -f \"\$f\"; dpkg-divert --package $name --rename --remove \"\$f\"; done" + echo 'fi' + } > "$pkg/DEBIAN/postrm" + chmod 755 "$pkg/DEBIAN/preinst" "$pkg/DEBIAN/postrm" + depends=$(grep -v '^$' "$protected" | paste -sd, | sed 's/,/, /g') + cat > "$pkg/DEBIAN/control" <<EOF +Package: $name +Version: 1.0+${runtime_id//-/.} +Architecture: all +Maintainer: DroidDeck <maxjividen@gmail.com> +Protected: yes +Priority: required +Depends: $depends +Section: admin +Description: $summary + DroidDeck needs these files and packages inside its Ubuntu runtime. + Removing them would break it, so apt refuses to. +EOF + dpkg-deb --root-owner-group -b "$pkg" "/tmp/$name.deb" + dpkg -i "/tmp/$name.deb" + rm -rf "$pkg" "$pkg.files" "/tmp/$name.deb" +} + +install_turnip() { + local multiarch=/usr/lib/aarch64-linux-gnu work + source "$here/base.env" + work=$(mktemp -d) + curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$work/turnip.zip" "$DD_TURNIP_URL" + echo "$DD_TURNIP_SHA256 $work/turnip.zip" | sha256sum -c - >/dev/null + unzip -q "$work/turnip.zip" -d "$work/turnip" + dpkg-divert --package droiddeck-runtime --rename --divert "$multiarch/libvulkan_freedreno.so.distrib" --add "$multiarch/libvulkan_freedreno.so" + install -m 644 "$work/turnip/linux/libvulkan_freedreno.so" "$multiarch/libvulkan_freedreno.so" + mkdir -p /usr/share/licenses/dd-turnip + cp -r "$work/turnip/LICENSES" "$work/turnip/NOTICE" "$work/turnip/linux/meta.json" /usr/share/licenses/dd-turnip/ + rm -rf "$work" + if ldd "$multiarch/libvulkan_freedreno.so" 2>&1 | grep 'not found'; then + echo "DD-Turnip needs libraries this runtime does not ship; add their packages to packages-runtime.txt" >&2 + return 1 + fi +} + +divert_to() { + local path=$1 target=$2 owner=$3 + [ -e "$path" ] || [ -L "$path" ] || return 0 + dpkg-divert --package "$owner" --rename --divert "$path.distrib" --add "$path" + ln -sf "$target" "$path" +} + +record_apt_state() { + mkdir -p /usr/share/droiddeck/apt + apt-mark showmanual > /usr/share/droiddeck/apt/system-manual.txt + for f in /etc/apt/sources.list /etc/apt/sources.list.d/* /etc/apt/keyrings/* /etc/apt/trusted.gpg.d/* /usr/share/keyrings/*; do + [ -f "$f" ] && echo "$f $(sha256sum "$f" | cut -d' ' -f1)" + done > /usr/share/droiddeck/apt/system-sources.txt +} + +finish() { + sed -i 's/^Types: deb deb-src$/Types: deb/' /etc/apt/sources.list.d/ubuntu.sources + record_apt_state + apt-get clean + rm -rf /var/lib/apt/lists/* /var/cache/apt/*.bin /var/log/apt/* /var/log/dpkg.log /var/tmp/* + find /tmp -mindepth 1 -maxdepth 1 ! -name droiddeck -exec rm -rf {} + + rm -f /etc/machine-id /var/lib/dbus/machine-id /etc/ssh/ssh_host_* + : > /etc/machine-id +} + +if [ "$stage" = runtime ]; then + printf '#!/bin/sh\nexit 101\n' > /usr/sbin/policy-rc.d + chmod 755 /usr/sbin/policy-rc.d + cp -r "$here/apt/." /etc/apt/ + sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources + echo 'man-db man-db/auto-update boolean false' | debconf-set-selections + apt-get update + apt-get -y full-upgrade + + mkdir -p "$repo" + cp "$debs"/*.deb "$repo/" + apt-get install -y --no-install-recommends apt-utils ca-certificates + (cd "$repo" && apt-ftparchive packages . > Packages && apt-ftparchive release . > Release) + echo "deb [trusted=yes lang=none] file:$repo ./" > /etc/apt/sources.list.d/droiddeck.list + built=$(for deb in "$repo"/*.deb; do dpkg-deb -f "$deb" Package; done | sort -u | paste -sd' ') + printf 'Package: %s\nPin: version /\\+droiddeck/\nPin-Priority: 1001\n' "$built" > /etc/apt/preferences.d/droiddeck-built + apt-get update + + grep -v '^$' "$here/packages-runtime.txt" | xargs apt-get install -y --no-install-recommends + install_held + build_package droiddeck-runtime "$here/overlay-runtime" "$here/protected-runtime.txt" "DroidDeck's Ubuntu runtime" + + update-alternatives --install /usr/bin/sudo sudo /usr/local/bin/sudo 1000 + update-alternatives --set sudo /usr/local/bin/sudo + divert_to /usr/bin/su /usr/local/bin/su droiddeck-runtime + multiarch=/usr/lib/aarch64-linux-gnu + ln -sf liblua5.4.so.0 "$multiarch/liblua.so.5.4" + divert_to "$multiarch/gamescope/libVkLayer_FROG_gamescope_wsi_aarch64.so" ../../libVkLayer_FROG_gamescope_wsi_aarch64.so droiddeck-runtime + install_turnip + + mkdir -p /var/cache/droiddeck-flatpak /usr/share/droiddeck/apt /etc/droiddeck/proc /etc/droiddeck/empty /root/Desktop + touch /var/cache/droiddeck-flatpak/installed + cp -r "$here/proc/." /etc/droiddeck/proc/ + echo "$runtime_id" > /usr/share/droiddeck/apt/runtime-id + + echo "LANG=C.UTF-8" > /etc/default/locale + printf 'DroidDeck\n' > /etc/hostname + . /etc/os-release + printf 'NAME="%s"\nVERSION="%s"\nID=%s\nID_LIKE=debian\nPRETTY_NAME="%s"\nVERSION_ID="%s"\nVERSION_CODENAME=%s\nUBUNTU_CODENAME=%s\nHOME_URL="https://github.com/Droid-Deck/DroidDeck"\nSUPPORT_URL="https://github.com/Droid-Deck/DroidDeck/issues"\nBUG_REPORT_URL="https://github.com/Droid-Deck/DroidDeck/issues"\nLOGO=distributor-logo-steamdeck\nVARIANT="DroidDeck"\nVARIANT_ID=droiddeck\n' \ + "$NAME" "$VERSION" "$ID" "$PRETTY_NAME" "$VERSION_ID" "$VERSION_CODENAME" "$UBUNTU_CODENAME" > /etc/os-release.droiddeck + dpkg-divert --package droiddeck-runtime --rename --divert /usr/lib/os-release.distrib --add /usr/lib/os-release + mv /etc/os-release.droiddeck /usr/lib/os-release + ln -sf ../usr/lib/os-release /etc/os-release + finish + exit 0 +fi + +[ "$stage" = desktop ] || { echo "unknown stage $stage" >&2; exit 1; } +sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources +install -d -m 0755 /etc/apt/keyrings +install -m 0644 "$here/mozilla.asc" /etc/apt/keyrings/packages.mozilla.org.asc +cat > /etc/apt/sources.list.d/mozilla.sources <<'EOF' +Types: deb +URIs: https://packages.mozilla.org/apt +Suites: mozilla +Components: main +Signed-By: /etc/apt/keyrings/packages.mozilla.org.asc +EOF +cat > /etc/apt/preferences.d/mozilla <<'EOF' +Package: firefox* thunderbird* +Pin: origin packages.mozilla.org +Pin-Priority: 1000 +EOF +apt-get update +[[ $(apt-cache policy firefox) == *packages.mozilla.org* ]] || { echo "packages.mozilla.org is unreachable" >&2; exit 1; } + +grep -v '^$' "$here/packages-desktop.txt" | xargs apt-get install -y firefox +install_held +build_package droiddeck-desktop "$here/overlay-desktop" "$here/protected-desktop.txt" "DroidDeck's Plasma desktop" + +divert_to /usr/bin/pkexec /usr/local/bin/pkexec droiddeck-desktop +divert_to /usr/lib/snapd/snap-confine /usr/local/bin/droiddeck-snap-confine droiddeck-desktop +mkdir -p /snap/bin /var/lib/snapd/desktop/applications +rm -rf /etc/skel/Desktop +finish diff --git a/tools/vr/build.sh b/tools/vr/build.sh index fd8aebd1c..f28ef326b 100755 --- a/tools/vr/build.sh +++ b/tools/vr/build.sh @@ -2,6 +2,7 @@ set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) repo=$(cd "$here/../.." && pwd) +. "$repo/tools/docker_platform.sh" native=0 if [ "${1:-}" = --native ]; then native=1; shift; fi @@ -87,7 +88,7 @@ compile() { if [ "$native" = 1 ]; then (cd "$repo" && "${cmd[@]}") else - docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" -v "$repo:/src" -w /src \ + docker run --rm --platform "${DROIDDECK_DOCKER_PLATFORM:-linux/amd64}" --user "$(id -u):$(id -g)" -v "$repo:/src" -w /src \ "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" fi } diff --git a/tools/vr/build_windows.py b/tools/vr/build_windows.py index 06a1dde74..af8fa4d46 100644 --- a/tools/vr/build_windows.py +++ b/tools/vr/build_windows.py @@ -129,8 +129,6 @@ def build(folder, include, root=ROOT, image=IMAGE): workspace.mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix='vr-build-', dir=workspace) as temp: snapshot = Path(temp).resolve() - # build.sh's recursive output cleanup and TemporaryDirectory cleanup are - # confined to this new, verified directory, never the real checkout. if not snapshot.is_relative_to(workspace): raise ValueError('Temporary VR workspace escapes the checkout') inspect = subprocess.run([docker, 'image', 'inspect', '--format', '{{.Id}}', image], @@ -159,7 +157,6 @@ def build(folder, include, root=ROOT, image=IMAGE): manifest = {'version': 1, 'source_commit': revision, 'sources': hashes(input_files), 'headers': hashes(input_headers), 'compiler_image': image_id, 'outputs': hashes(files), 'native_tests': 'passed in tools/vr/build.sh'} - # Publish only after the complete build and native regression tests pass. for name, data in files.items(): target = folder / name if not target.resolve().is_relative_to(folder): diff --git a/tools/vr/src/driver_droiddeck.cpp b/tools/vr/src/driver_droiddeck.cpp index 1398a1d05..2535e04cc 100644 --- a/tools/vr/src/driver_droiddeck.cpp +++ b/tools/vr/src/driver_droiddeck.cpp @@ -281,7 +281,6 @@ public: const uint32_t create = 0x8 ; for (int i = 0; i < 3; i++) { SharedTextureHandle_t h = 0; - // Compute access makes SteamVR substitute UNORM for sRGB, darkening direct compositor output. if (!VRIPCResourceManager()->NewSharedVulkanImage(d->nFormat, d->nWidth, d->nHeight, true, false, false, 1, 1, create, usage, &h)) { Log("NewSharedVulkanImage failed"); @@ -1276,7 +1275,6 @@ public: } private: - // Face buttons, menus and the stick, for both the game pad and optical hands. void UpdatePadButtons(uint32_t b, float stickX, float stickY, bool stickToGame) { auto in = VRDriverInput(); const bool touch = stickToGame && stickX * stickX + stickY * stickY > 0.01f; @@ -1289,7 +1287,6 @@ private: in->UpdateBooleanComponent(padClick_, (b & (right_ ? (PAD_A | PAD_R3) : PAD_X)) != 0, 0); return; } - // Touch and Index: face buttons are their own inputs and the stick is a thumbstick. const bool primary = b & (right_ ? PAD_A : PAD_X), secondary = b & (right_ ? PAD_B : PAD_Y); const bool both = (b & PAD_L3) && (b & PAD_R3); if (menu_) in->UpdateBooleanComponent(menu_, !right_ && (b & (PAD_START | PAD_SELECT)), 0); @@ -1754,7 +1751,6 @@ public: void SetHands(CardboardController *left, CardboardController *right) { hands_[0] = left; hands_[1] = right; } void SetSticksMoveHands(bool on) { sticksMoveHands_ = on; } - // Called only from the pose thread: a replaced pair is disconnected there, so it never races an update. CardboardController *ActiveHand(int side) { CardboardController *wanted = hands_[side].load(); if (wanted != active_[side]) { @@ -1908,10 +1904,7 @@ private: target.frequency = std::max(pulse.fFrequency, 0.f); __atomic_store_n(&haptics_->seq, (sequence | 1u) + 1u, __ATOMIC_RELEASE); } - // SteamVR fixes a device's input profile when it activates, so each type gets its own pair, - // added the first time it is chosen; devices cannot be removed, only disconnected. void ApplyPadConfig(bool initial) { - // The file is a few bytes, so compare what it says; two quick writes can share an mtime. const PadControllerConfig pads = read_pad_controller_config("/run/droiddeck/" DROIDDECK_VR_CONTROLLERS_FILE); if (!initial && pads.profile == configProfile_ && pads.sticksMoveHands == configSticks_) return; configProfile_ = pads.profile; diff --git a/tools/vr/src/fence_tracker.h b/tools/vr/src/fence_tracker.h index d016d9ded..273ecbd4d 100644 --- a/tools/vr/src/fence_tracker.h +++ b/tools/vr/src/fence_tracker.h @@ -4,8 +4,6 @@ #include <stdlib.h> #include <vulkan/vulkan.h> -/* All pool operations require the caller's tracker lock. Reserved fences are - * invisible to the completer until vkQueueSubmit has returned successfully. */ struct tracked { struct tracked *next; VkDevice dev; @@ -33,8 +31,6 @@ static struct tracked *track_pool_take(struct tracked **pool, VkDevice dev, PFN_ t.destroy = (PFN_vkDestroyFence)gdpa(dev, "vkDestroyFence"); PFN_vkCreateFence create = (PFN_vkCreateFence)gdpa(dev, "vkCreateFence"); if (!t.wait || !t.reset || !t.destroy || !create) return NULL; - /* Never wait for a slot: the next submission may signal a semaphore that - * every outstanding fence is waiting on. Grow only at the high-water mark. */ struct tracked *slot = idle ? idle : calloc(1, sizeof(*slot)); if (!slot) return NULL; VkFenceCreateInfo fci = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, NULL, 0}; @@ -69,8 +65,6 @@ static int track_pool_reap(struct tracked *pool, uint32_t issued, uint32_t *done uint32_t through = issued; for (struct tracked *t = pool; t; t = t->next) { if (t->state != TRACK_SUBMITTED) continue; - /* Scan all fences without blocking behind an earlier submission on a - * different queue. Device loss retires fences as in the previous path. */ if (t->wait(t->dev, 1, &t->fence, VK_TRUE, 0) == VK_TIMEOUT) { pending = 1; if ((int32_t)(t->mark - through) <= 0) through = t->mark - 1; @@ -79,9 +73,6 @@ static int track_pool_reap(struct tracked *pool, uint32_t issued, uint32_t *done t->state = TRACK_IDLE; } } - /* done is a contiguous watermark, not a count of completed fences. Later - * work may free its slot but cannot release an unfinished presenter frame. - * Signed differences also handle the uint32_t counter wrapping. */ *done = through; return pending; } @@ -92,7 +83,6 @@ static int track_pool_device_busy(struct tracked *pool, VkDevice dev) { return 0; } -/* The caller must first wait for all this device's reservations and work. */ static void track_pool_forget(struct tracked **pool, VkDevice dev) { for (struct tracked **p = pool; *p;) { struct tracked *t = *p; diff --git a/tools/vr/src/hand_skeleton.h b/tools/vr/src/hand_skeleton.h index 8ade4a609..0bb9f1e78 100644 --- a/tools/vr/src/hand_skeleton.h +++ b/tools/vr/src/hand_skeleton.h @@ -1,5 +1,4 @@ -// Adapted from Valve's OpenVR handskeletonsimulation driver sample (BSD-3-Clause, see OPENVR_LICENSE), -// which follows Moshi Turner's hand simulation in Monado. +// Adapted from Valve's OpenVR handskeletonsimulation driver sample (BSD-3-Clause, see OPENVR_LICENSE), which follows Moshi Turner's hand simulation in Monado. #pragma once #include "arm_model.h" diff --git a/tools/vr/src/pad_controller_config.h b/tools/vr/src/pad_controller_config.h index 387832b3a..fd1e08d52 100644 --- a/tools/vr/src/pad_controller_config.h +++ b/tools/vr/src/pad_controller_config.h @@ -11,7 +11,6 @@ struct PadControllerConfig { bool sticksMoveHands = false; }; -// One key=value per line, written by the app before SteamVR starts. inline PadControllerConfig pad_controller_config(const char *text) { PadControllerConfig config; if (!text) return config; diff --git a/tools/vr/src/presenter.cpp b/tools/vr/src/presenter.cpp index 20b0ad63c..efc110640 100644 --- a/tools/vr/src/presenter.cpp +++ b/tools/vr/src/presenter.cpp @@ -606,7 +606,6 @@ private: im.height = p.height; im.producerPid = p.producerPid; im.format = (VkFormat)p.format; - // Dedicated OPAQUE_FD imports must match SteamVR's exported image description. SharedEyeImage description(im.format, p.width, p.height); VkResult r = vk_.CreateImage(dev_, &description.info, nullptr, &im.image); if (r != VK_SUCCESS) { Log("presenter: import image %d", r); close(p.fd); return; } diff --git a/tools/vr/src/scheduling.c b/tools/vr/src/scheduling.c index df8919650..381397cea 100644 --- a/tools/vr/src/scheduling.c +++ b/tools/vr/src/scheduling.c @@ -28,7 +28,6 @@ int setrlimit(__rlimit_resource_t resource, const struct rlimit *limit) { struct rlimit current; if (!getrlimit(resource, ¤t) && (limit->rlim_cur < current.rlim_cur || limit->rlim_max < current.rlim_max)) { - // SDL's failed RTKit fallback leaves a fatal RT budget on Android GPU submissions. errno = EPERM; return -1; } diff --git a/tools/vr/src/spatial_tracking.h b/tools/vr/src/spatial_tracking.h index 20842c887..1f9f65a7c 100644 --- a/tools/vr/src/spatial_tracking.h +++ b/tools/vr/src/spatial_tracking.h @@ -78,7 +78,6 @@ struct OpticalPose { } auto target = filtered; if (predict) { - // Inference already consumes most capture age; receipt-relative prediction advances between results. float seconds = std::clamp(float(now-receivedAt)/1e9f,0.f,.08f); float speed2 = 0; for (float v : velocity) speed2 += v*v; diff --git a/tools/vr/src/vk_layer_droiddeck_vr.c b/tools/vr/src/vk_layer_droiddeck_vr.c index 5b315f243..be74139e5 100644 --- a/tools/vr/src/vk_layer_droiddeck_vr.c +++ b/tools/vr/src/vk_layer_droiddeck_vr.c @@ -981,8 +981,6 @@ static int submit_drop_wait(VkSemaphore s, uint64_t value) { for (;;) { uint64_t local = 0; if (get(dev, s, &local) == VK_SUCCESS && local >= value) return 0; - /* Only the poller mirrors shared values. A second host signal here can - * race its signal and submit the same timeline value twice. */ if (now_us() >= until) break; usleep(100); } @@ -1073,7 +1071,7 @@ static void *completer(void *arg) { if (pending) { struct timespec until; clock_gettime(CLOCK_REALTIME, &until); - until.tv_nsec += 1000000; /* Poll pending GPU work at most every 1 ms. */ + until.tv_nsec += 1000000; if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; } pthread_cond_timedwait(&g_trk_cond, &g_trk_lock, &until); } else { @@ -1345,8 +1343,6 @@ static VkResult VKAPI_CALL CreateImage(VkDevice d, const VkImageCreateInfo *ci, VkImageCreateInfo compatible = *ci; VkExternalMemoryImageCreateInfo shared; const VkBaseInStructure *first = ci->pNext; - // SteamVR's OpenXR stereo arrays omit a format list, while DXVK adds one on import. - // Leave single-layer OpenVR images alone: the application owns their export layout. if (dev_for(d)->quest_images && ci->arrayLayers > 1 && (ci->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) && ci->tiling == VK_IMAGE_TILING_OPTIMAL && first && first->sType == VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO) { const VkBaseInStructure *second = first->pNext; diff --git a/tools/vr/src/wsi_capture.cpp b/tools/vr/src/wsi_capture.cpp index 11f4d4e2b..ee7a7266c 100644 --- a/tools/vr/src/wsi_capture.cpp +++ b/tools/vr/src/wsi_capture.cpp @@ -395,7 +395,6 @@ extern "C" VkResult droiddeck_wsi_present(VkDevice device, VkQueue queue, const VkResult result = it->second->Capture(queue, present->pImageIndices[0], *present, &completion); if (result) return result; if (!completion) return next(queue, present); - // Reacquiring this swapchain image also proves its previous present wait semaphore is reusable. VkPresentInfoKHR copy = *present; copy.waitSemaphoreCount = 1; copy.pWaitSemaphores = &completion; return next(queue, ©); } catch (...) { diff --git a/tools/vr/src/xr_frame_math.h b/tools/vr/src/xr_frame_math.h index a78de7987..473c02847 100644 --- a/tools/vr/src/xr_frame_math.h +++ b/tools/vr/src/xr_frame_math.h @@ -9,7 +9,6 @@ struct DroidDeckXrRenderView { inline void xr_frame_projection_raw(const float fov[4], float *left, float *right, float *top, float *bottom) { *left = std::tan(fov[0]); *right = std::tan(fov[1]); - // OpenVR's top/bottom parameters are the lower/upper Y bounds in its projection formula. *top = std::tan(fov[3]); *bottom = std::tan(fov[2]); } diff --git a/tools/vr/src/xr_gpu_channel.h b/tools/vr/src/xr_gpu_channel.h index 8735d3dc5..52fb5d9d3 100644 --- a/tools/vr/src/xr_gpu_channel.h +++ b/tools/vr/src/xr_gpu_channel.h @@ -31,7 +31,6 @@ inline XrGpuFrameState xr_gpu_frame_state(const XrGpuFrame &frame, uint32_t widt return now - frame.header.captured_ns > 200000000LL ? XrGpuFrameState::Stale : XrGpuFrameState::Ready; } -// SEQPACKET keeps descriptor transfer and its metadata in one indivisible message. inline bool xr_gpu_send(int socket, const void *data, size_t size, const int *fds = nullptr, unsigned count = 0) { if (count > XR_GPU_SLOTS) return false; iovec bytes{const_cast<void *>(data), size}; diff --git a/tools/vr/tests/test_fence_tracker.c b/tools/vr/tests/test_fence_tracker.c index 8eecc3936..b747304b9 100644 --- a/tools/vr/tests/test_fence_tracker.c +++ b/tools/vr/tests/test_fence_tracker.c @@ -66,8 +66,6 @@ static void saturated_pool_and_out_of_order_completion(void) { struct tracked *pool = NULL, *pending[130]; VkDevice dev = (VkDevice)(uintptr_t)1; uint32_t issued = 0, done = 0; - /* These waits can all depend on a signal from a later queue submission. - * A fixed 64-slot pool blocks that signal before it reaches the driver. */ for (unsigned i = 0; i < 130; i++) pending[i] = submit(&pool, dev, &issued); assert(issued == 130); assert(track_pool_reap(pool, issued, &done) && done == 0); @@ -79,7 +77,6 @@ static void saturated_pool_and_out_of_order_completion(void) { unsigned before = created; struct tracked *signal = submit(&pool, dev, &issued); assert(signal == pending[129] && created == before && issued == 131); - /* Freeing the latest fence must not mark the older work as drawn. */ for (unsigned i = 0; i < 129; i++) fake(pending[i]->fence)->result = VK_SUCCESS; assert(track_pool_reap(pool, issued, &done) && done == 130); fake(signal->fence)->result = VK_SUCCESS; diff --git a/tools/vr/tests/test_presenter_image.cpp b/tools/vr/tests/test_presenter_image.cpp index baf36bddf..2cf58ce2f 100644 --- a/tools/vr/tests/test_presenter_image.cpp +++ b/tools/vr/tests/test_presenter_image.cpp @@ -6,7 +6,6 @@ int main() { droiddeck::SharedEyeImage image(VK_FORMAT_R8G8B8A8_SRGB, 1728, 1080); const auto &info = image.info; - // SteamVR's shared-eye creation trace on the Fold7: format 43, flags 8, usage 0x97, list 43/37. assert(info.format == 43 && info.flags == 8 && info.usage == 0x97); assert(info.extent.width == 1728 && info.extent.height == 1080 && info.extent.depth == 1); assert(info.samples == VK_SAMPLE_COUNT_1_BIT && info.mipLevels == 1 && info.arrayLayers == 1); diff --git a/tools/vr/tests/test_semaphore_layer.c b/tools/vr/tests/test_semaphore_layer.c index 89f4ce8ae..45b387cfa 100644 --- a/tools/vr/tests/test_semaphore_layer.c +++ b/tools/vr/tests/test_semaphore_layer.c @@ -39,7 +39,6 @@ static void check_shared_images(VkDevice device) { image.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image.tiling = VK_IMAGE_TILING_OPTIMAL; VkImage output; - /* Other targets, nonmutable, linear and DMA-BUF images retain their caller's chain. */ expected_image_chain = &list; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); g_dev[0].quest_images = 1; @@ -58,7 +57,6 @@ static void check_shared_images(VkDevice device) { expected_image_chain = &external; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); assert(image.pNext == &list && list.pNext == &external && external.pNext == &tail); - /* The reverse chain order preserves its tail without modifying caller memory. */ external.pNext = &list; list.pNext = &tail; image.pNext = &external; expect_cloned_external = 1; expected_external_tail = &tail; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); diff --git a/tools/vr/tests/test_xr_shared.cpp b/tools/vr/tests/test_xr_shared.cpp index fae4efde6..2e60bc215 100644 --- a/tools/vr/tests/test_xr_shared.cpp +++ b/tools/vr/tests/test_xr_shared.cpp @@ -58,7 +58,6 @@ int main() { assert(!absent.SendShared(path, header, buffer)); assert(!absent.SharedLeaseLost()); XrFrameReceiver receiver; assert(receiver.Start(path)); XrFrameSender invalid; - // An ordinary file is not a DMA-BUF and must never be acknowledged as one. assert(!invalid.SendShared(path, Header(), buffer)); assert(invalid.SharedLeaseLost() && receiver.Rejected() == 1); DroidDeckXrPixels frame; assert(!receiver.Take(&frame)); diff --git a/tools/xbox/README.md b/tools/xbox/README.md index abe39f8c9..986fc1bd7 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/backend.lock.json b/tools/xbox/backend.lock.json index f1568f94d..86a1c807e 100644 --- a/tools/xbox/backend.lock.json +++ b/tools/xbox/backend.lock.json @@ -1,12 +1,12 @@ { "schema": 1, - "version": "0.2.8", + "version": "0.2.12", "repository": "https://github.com/xodus-gaming/xodus.git", "commit": "53ea781dcd073e31d7ea68e894134e9c959bff04", "rust": "1.99.0", "cargoLockSha256": "2259b343e00dadc263018beb7664b12e9d58a0b73bff502ad566f5f8619ce28a", - "patchId": "linux-run-v24", - "compatibility": "linux-run-v18", + "patchId": "linux-run-v54", + "compatibility": "linux-run-v25", "patches": [ { "file": "xodus-linux-run.patch", @@ -70,7 +70,7 @@ }, { "file": "xodus-package-selection.patch", - "sha256": "7507cb0535cd914d3607e7940d5e17b949d106d0b89c139b84372a1ee1732c54" + "sha256": "28a2b566afdc1a572cd5ec52027fb48cc1823a25e8f304f282d9bf61e8d46463" }, { "file": "xodus-package-metadata.patch", @@ -103,7 +103,119 @@ { "file": "xodus-content-response.patch", "sha256": "e9997951526cfa08e3dd8c5fc4c383bf630e7ab8992d9e211acee40fdc6422a4" + }, + { + "file": "xodus-streaming-recovery.patch", + "sha256": "7e8550d7b50faf3b3cb7cfcf6e47cff35a0369737d421ef454d4dcf0c9c8ffad" + }, + { + "file": "xodus-download-bandwidth.patch", + "sha256": "4655c51eb93811ea41500be05062a4ff0f64dde3d819dddde12e48d91b075293" + }, + { + "file": "xodus-ticket-diagnostics.patch", + "sha256": "6559c77e06f3c7f29caac95ed979b7644bd4082f9ff777f66713888969c3905e" + }, + { + "file": "xodus-auth-consistency.patch", + "sha256": "930dd88e5ecef2628973ebb4f1652f6888951d71e6531dda7d5d7a258eb435dd" + }, + { + "file": "xodus-metadata-recovery.patch", + "sha256": "b72c473615f2e5d359101cb5fae404aa3b54a34a73118b1c7f99238bd16860e3" + }, + { + "file": "xodus-streaming-handoff.patch", + "sha256": "3be60b5dbca7fae0cb97e18e64665662620b9527c4c1340acfb4c2e2d497e648" + }, + { + "file": "xodus-store-ticket.patch", + "sha256": "5302a699a06208c9b51809eea31261a2a53facce1af3177611ecfc050abb4eb5" + }, + { + "file": "xodus-keyring-encoding.patch", + "sha256": "fa6a0d4ce87f39fdb74950248f1dfd6ccecc4724c76773f5cbf84a8a003729b8" + }, + { + "file": "xodus-encrypted-resume.patch", + "sha256": "73629791cbd91e93664cd77908640484298fa0a17e42a5c1b94b71b2298e8e2c" + }, + { + "file": "xodus-launch-image-errors.patch", + "sha256": "180a4c094a81a6da55044fdc5be7be834575148c12e6789d11f67960d9a22ecf" + }, + { + "file": "xodus-keyring-unlock.patch", + "sha256": "7762a87353d4c1a25133c8c541678cec7e233a6f67589e3d16f66b4738975baa" + }, + { + "file": "xodus-keyring-session-stop.patch", + "sha256": "864e9e427f6298afa012cbbf7586b627e788bcbdc75cabf493274947dce0e8cd" + }, + { + "file": "xodus-keyring-persistence.patch", + "sha256": "78782b557ec3f5457b6e697bb9262ad2403497691d8f23814b42fdd9300b7b46" + }, + { + "file": "xodus-keyring-create.patch", + "sha256": "c79a46f387f7de54e3d3004d646f9e9b141c4d498eebd69a47144450b15442e6" + }, + { + "file": "xodus-bundle-membership.patch", + "sha256": "a5eacc683d006b40247fbf124a62078080685b814cb09a33756083ab99adb72d" + }, + { + "file": "xodus-licensing-jwe.patch", + "sha256": "6f0087e657f225e9a770405fbb34c2317f840615742c89b62f241f1b65c590ca" + }, + { + "file": "xodus-hosted-signin.patch", + "sha256": "f52b16944ca7dfc837337e0257be380467f01872706252d7c2e981db0c57a8bc" + }, + { + "file": "xodus-durable-content.patch", + "sha256": "3d2310fffb020396a68b99e217a81ae1b82920bfa425bf6fd8024c9ea1af6a55" + }, + { + "file": "xodus-conditional-entitlements.patch", + "sha256": "8acc3e079d6f8242d364e5d6cd88bddda7004016c12ed4c48bb353499b95f347" + }, + { + "file": "xodus-content-device-limit.patch", + "sha256": "d6a7115a6efd5d2acaf600590c61e38802632c7afad083639884212984fbccb7" + }, + { + "file": "xodus-authenticated-account-metadata.patch", + "sha256": "1c3845c44efcb4afa49d6618b89e15f39e06804182f281a975f2df14e5a2164d" + }, + { + "file": "xodus-social.patch", + "sha256": "c1571a719715df08fde865a4ec88e359dbeccf27ef3d990310692eb953d01484" + }, + { + "file": "xodus-social-send-receipt.patch", + "sha256": "5b1db84e7d5754b4d2f56771c6d931ecc0579e3a00f7678b4f870fe713d60bc0" + }, + { + "file": "xodus-social-session.patch", + "sha256": "96862af0bb672d6c7ed9575a21412ac68764b5c554f3aa9a380fba7b1fce235a" + }, + { + "file": "xodus-launch-filesystem.patch", + "sha256": "8c898a5756149e2205ad9091203d0953506256bb84bba9080308db840d3ad030" + }, + { + "file": "xodus-plain-launch-entry.patch", + "sha256": "6106f03e38d57f6d62f6662b3567dd5599a3e95b09d653d48e99eb5bba3d3fb8" + }, + { + "file": "xodus-package-storage.patch", + "sha256": "76c2c805a62cc3b424bd5b91c26402a1aee46f21efbd785402aa52aea7784510" + }, + { + "file": "xodus-social-stdout.patch", + "sha256": "9386eedd91d6ac48fd7c369565bb3c2f7c22688a87239ef434d3c6aeb45cf115" } ], - "nexusCommit": "396e7fb8fe0e5f00d956091195c614b8a0732ab1" + "nexusCommit": "ba0e191e1eb8088d00eee7bfe8da80f0a8c5ec72" } diff --git a/tools/xbox/build-local.sh b/tools/xbox/build-local.sh index 6a3eb90ce..979c95b12 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 f5598aee1..99bee8c76 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 000000000..665dd17d7 --- /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 000000000..97493f4a0 --- /dev/null +++ b/tools/xbox/droiddeck-cloud-token.patch @@ -0,0 +1,266 @@ +--- a/crates/xodus-cli/src/commands.rs ++++ b/crates/xodus-cli/src/commands.rs +@@ -6,6 +6,7 @@ + pub mod login; + pub mod logout; + pub mod profile; ++pub mod cloud_token; + pub mod social; + pub mod game_activity; + pub mod achievements; +--- a/crates/xodus-cli/src/main.rs ++++ b/crates/xodus-cli/src/main.rs +@@ -70,6 +70,8 @@ + #[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)] +@@ -251,6 +253,7 @@ + args.command, + SubCommand::Account { .. } + | SubCommand::Profile { .. } ++ | SubCommand::CloudToken + | SubCommand::Social { .. } + | SubCommand::GameActivity { .. } + | SubCommand::Achievements { .. } +@@ -317,6 +320,7 @@ + } + }, + SubCommand::Profile { json } => commands::profile::run(&tokens, json).await, ++ SubCommand::CloudToken => commands::cloud_token::run(&tokens).await, + SubCommand::Social { .. } => commands::social::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, +--- /dev/null ++++ b/crates/xodus-cli/src/commands/cloud_token.rs +@@ -0,0 +1,226 @@ ++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"]; ++ ++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"), ++ }; ++ 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::try_from(response).map_err(|_| "msa-ticket")? 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)) ++} ++ ++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() ++} ++ ++fn offering_response(body: &[u8]) -> Result<Value, &'static str> { ++ let value: Value = serde_json::from_slice(body).map_err(|_| "gssv-json")?; ++ value["gsToken"].as_str().filter(|token| !token.is_empty() && token.len() <= 16384).ok_or("gs-token")?; ++ Ok(value) ++} ++ ++async fn request_offering(client: &reqwest::Client, endpoint: &str, xsts: &str, offering: &str) -> Result<Value, &'static str> { ++ let response = client.post(endpoint) ++ .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 body = super::profile::bounded(response, 256 * 1024).await.map_err(|_| "gssv-response")?; ++ offering_response(&body) ++} ++ ++async fn select_offering<F, Fut>(mut request: F) -> Result<(&'static str, Value), String> ++where ++ F: FnMut(&'static str) -> Fut, ++ Fut: std::future::Future<Output = Result<Value, &'static str>>, ++{ ++ let mut failures = Vec::new(); ++ for offering in OFFERINGS { ++ match request(offering).await { ++ Ok(value) => return Ok((offering, value)), ++ Err(stage) => failures.push(format!("{offering}:{stage}")), ++ } ++ } ++ Err(format!("gssv-login {}", failures.join(" "))) ++} ++ ++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 (offering, value) = select_offering(|offering| { ++ let endpoint = format!("https://{offering}.gssv-play-prod.xboxlive.com/v2/login/user"); ++ let client = &client; ++ let xsts = &xsts; ++ async move { request_offering(client, &endpoint, xsts, offering).await } ++ }).await?; ++ 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()); } ++ Ok(json!({ "schema": 1, "account": account, "offering": offering, "gsToken": value["gsToken"], "userToken": transfer.ok(), ++ "durationInSeconds": value["durationInSeconds"].as_u64().unwrap_or(0), "market": value["market"].as_str().unwrap_or_default(), ++ "regions": regions(&value) })) ++} ++ ++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"); ++ } ++ #[tokio::test] ++ async fn cloud_fallback_first_success_does_not_call_second_offering() { ++ let mut calls = Vec::new(); ++ let (offering, value) = select_offering(|name| { ++ calls.push(name); ++ std::future::ready(Ok(json!({"gsToken":"synthetic"}))) ++ }).await.unwrap(); ++ assert_eq!(calls, vec!["xgpuweb"]); ++ assert_eq!(offering, "xgpuweb"); ++ assert_eq!(value["gsToken"], "synthetic"); ++ } ++ ++ #[tokio::test] ++ async fn cloud_fallback_request_failure_tries_second_offering() { ++ let mut calls = Vec::new(); ++ let (offering, _) = select_offering(|name| { ++ calls.push(name); ++ std::future::ready(if name == "xgpuweb" { Err("gssv-request") } ++ else { Ok(json!({"gsToken":"synthetic"})) }) ++ }).await.unwrap(); ++ assert_eq!(calls, OFFERINGS); ++ assert_eq!(offering, "xgpuwebf2p"); ++ } ++ ++ #[tokio::test] ++ async fn cloud_fallback_invalid_json_or_token_tries_second_offering() { ++ let invalid = vec![b"not-json".to_vec(), b"{}".to_vec(), ++ br#"{"gsToken":""}"#.to_vec(), br#"{"gsToken":17}"#.to_vec(), ++ serde_json::to_vec(&json!({"gsToken":"x".repeat(16385)})).unwrap()]; ++ for body in invalid { ++ let mut calls = Vec::new(); ++ let (offering, _) = select_offering(|name| { ++ calls.push(name); ++ std::future::ready(if name == "xgpuweb" { offering_response(&body) } ++ else { offering_response(br#"{"gsToken":"synthetic"}"#) }) ++ }).await.unwrap(); ++ assert_eq!(calls, OFFERINGS); ++ assert_eq!(offering, "xgpuwebf2p"); ++ } ++ assert!(offering_response(&serde_json::to_vec(&json!({"gsToken":"x".repeat(16384)})).unwrap()).is_ok()); ++ } ++ ++ #[tokio::test] ++ async fn cloud_fallback_all_failures_report_only_fixed_stages() { ++ let mut calls = Vec::new(); ++ let error = select_offering(|name| { ++ calls.push(name); ++ std::future::ready(offering_response(b"private response containing a token or URL")) ++ }).await.unwrap_err(); ++ assert_eq!(calls, OFFERINGS); ++ assert_eq!(error, "gssv-login xgpuweb:gssv-json xgpuwebf2p:gssv-json"); ++ } ++ ++ async fn http_fixture(status: u16, body: Vec<u8>) -> (String, tokio::task::JoinHandle<()>) { ++ use tokio::{io::{AsyncReadExt, AsyncWriteExt}, net::TcpListener}; ++ let server = TcpListener::bind("127.0.0.1:0").await.unwrap(); ++ let address = server.local_addr().unwrap(); ++ let task = tokio::spawn(async move { ++ let (mut socket, _) = server.accept().await.unwrap(); ++ let mut request = Vec::new(); ++ let mut buffer = [0u8; 4096]; ++ loop { ++ let n = socket.read(&mut buffer).await.unwrap(); ++ assert!(n > 0 && request.len() + n < 16384); ++ request.extend_from_slice(&buffer[..n]); ++ if let Some(end) = request.windows(4).position(|part| part == b"\r\n\r\n") { ++ let headers = String::from_utf8_lossy(&request[..end]).to_ascii_lowercase(); ++ let length: usize = headers.lines().find_map(|line| line.strip_prefix("content-length:").map(str::trim)).unwrap_or("0").parse().unwrap(); ++ if request.len() >= end + 4 + length { break; } ++ } ++ } ++ let header = format!("HTTP/1.1 {status} Fixture\r\nContent-Length: {}\r\nConnection: close\r\n\r\n", body.len()); ++ if socket.write_all(header.as_bytes()).await.is_ok() { let _ = socket.write_all(&body).await; } ++ }); ++ (format!("http://{address}/login"), task) ++ } ++ ++ #[tokio::test] ++ async fn cloud_fallback_http_refusal_or_oversized_body_reaches_second_offering() { ++ let client = reqwest::Client::builder().no_proxy().timeout(Duration::from_secs(15)).build().unwrap(); ++ for (status, body) in [(403, b"<html>Forbidden</html>".to_vec()), (200, vec![b'x'; 256 * 1024 + 1])] { ++ let (first, first_task) = http_fixture(status, body).await; ++ let (second, second_task) = http_fixture(200, br#"{"gsToken":"synthetic"}"#.to_vec()).await; ++ let (offering, _) = select_offering(|name| request_offering(&client, ++ if name == "xgpuweb" { &first } else { &second }, "synthetic-xsts", name)).await.unwrap(); ++ assert_eq!(offering, "xgpuwebf2p"); ++ first_task.await.unwrap(); second_task.await.unwrap(); ++ } ++ } ++ ++} diff --git a/tools/xbox/droiddeck-credential-diagnostics.patch b/tools/xbox/droiddeck-credential-diagnostics.patch new file mode 100644 index 000000000..f1d441d3b --- /dev/null +++ b/tools/xbox/droiddeck-credential-diagnostics.patch @@ -0,0 +1,233 @@ +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,22 @@ 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); ++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| { ++ 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 +38,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 +50,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,49 @@ impl TokenStoreError { + eprintln!("{self}"); + } + } ++ ++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 000000000..4dec0d7e6 --- /dev/null +++ b/tools/xbox/droiddeck-credential-fallback.patch @@ -0,0 +1,112 @@ +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,45 @@ + 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)?; ++// 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 +47,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/droiddeck-credentials.patch b/tools/xbox/droiddeck-credentials.patch index bf92276e3..7a94928b4 100644 --- a/tools/xbox/droiddeck-credentials.patch +++ b/tools/xbox/droiddeck-credentials.patch @@ -85,8 +85,44 @@ +pub fn destroy_secrets() {} --- a/crates/xodus/src/tokens/backend/keychain.rs +++ b/crates/xodus/src/tokens/backend/keychain.rs -@@ -1,22 +1,43 @@ +@@ -1,131 +1,43 @@ +-use base64::{Engine as _, engine::general_purpose::STANDARD}; +- use crate::tokens::store::{TokenBackend, TokenStoreError}; +- +-// GNOME Keyring's passwordless textual format writes secrets with +-// g_key_file_set_value but reads them with g_key_file_get_string. Backslash +-// escapes in JSON (notably XML token attributes) can therefore be rejected or +-// changed on reload. ASCII base64 avoids those escapes without changing the +-// selected keyring or its security policy. This is encoding, not encryption. +-const ENVELOPE: &[u8] = b"XODUS_KEYRING_BASE64_V1:"; +- +-fn encode_secret(value: &[u8]) -> Vec<u8> { +- let mut encoded = ENVELOPE.to_vec(); +- encoded.extend_from_slice(STANDARD.encode(value).as_bytes()); +- encoded +-} +- +-fn decode_secret(bytes: Vec<u8>) -> Result<Vec<u8>, TokenStoreError> { +- match bytes.strip_prefix(ENVELOPE) { +- Some(encoded) => STANDARD.decode(encoded).map_err(|_| { +- std::io::Error::new( +- std::io::ErrorKind::InvalidData, +- "Invalid encoded Xodus credential", +- ) +- .into() +- }), +- // Existing credentials are raw JSON. Do not rewrite or delete on reads. +- None => Ok(bytes), +- } +-} +- +-fn deletion_result(result: Result<(), keyring_core::Error>) -> Result<(), TokenStoreError> { +- match result { +- Ok(()) | Err(keyring_core::Error::NoEntry) => Ok(()), +- Err(error) => Err(error.into()), +- } +-} +use serde_json::{Value, json}; +use std::io::{BufRead, Read, Write}; +use std::os::linux::net::SocketAddrExt; @@ -118,7 +154,7 @@ fn get(&self, key: &str) -> Result<Option<Vec<u8>>, TokenStoreError> { - let entry = crate::secrets::get_entry(key)?; - match entry.get_secret() { -- Ok(bytes) => Ok(Some(bytes)), +- Ok(bytes) => Ok(Some(decode_secret(bytes)?)), - Err(keyring_core::Error::NoEntry) => Ok(None), - Err(e) => Err(e.into()), - } @@ -128,27 +164,185 @@ } - fn set(&self, key: &str, value: &[u8]) -> Result<(), TokenStoreError> { -- Ok(crate::secrets::get_entry(key)?.set_secret(value)?) +- crate::secrets::get_entry(key)?.set_secret(&encode_secret(value))?; +- #[cfg(all(target_os = "linux", not(feature = "key-chain-file")))] +- crate::keyring_persistence::sync_after_write(); + request(json!({"op":"set", "key":key, "value":value}))?; -+ Ok(()) + Ok(()) } - fn remove(&self, key: &str) -> Result<(), TokenStoreError> { -- Ok(crate::secrets::get_entry(key)?.delete_credential()?) +- deletion_result(crate::secrets::get_entry(key)?.delete_credential())?; +- #[cfg(all(target_os = "linux", not(feature = "key-chain-file")))] +- crate::keyring_persistence::sync_after_write(); + request(json!({"op":"remove", "key":key}))?; -+ Ok(()) + Ok(()) } } +- +-#[cfg(test)] +-mod tests { +- use super::*; +- +- #[test] +- fn credential_encoding_preserves_xml_json_and_binary() { +- let xml_json = br#"{"token":"<EncryptedData Id=\"synthetic\">dummy</EncryptedData>","escapes":"a\\b\n\t\r"}"#; +- let binary: Vec<u8> = (0..=255).collect(); +- for value in [ +- xml_json.as_slice(), +- b"".as_slice(), +- binary.as_slice(), +- "synthetic-\u{00e9}".as_bytes(), +- ] { +- let encoded = encode_secret(value); +- assert!(encoded.starts_with(ENVELOPE)); +- // No GKeyFile escapes or physical line breaks can be introduced. +- assert!(encoded.is_ascii()); +- assert!( +- !encoded +- .iter() +- .any(|byte| matches!(byte, b'\\' | b'\n' | b'\r' | 0)) +- ); +- assert_eq!(decode_secret(encoded).unwrap(), value); +- } +- } +- +- #[test] +- fn credential_encoding_accepts_legacy_values_without_rewriting() { +- for value in [ +- br#"{"username":"synthetic"}"#.as_slice(), +- b"".as_slice(), +- b"invalid legacy JSON".as_slice(), +- ] { +- // Validation of legacy JSON remains the TokenManager's job. +- assert_eq!(decode_secret(value.to_vec()).unwrap(), value); +- } +- } +- +- #[test] +- fn credential_encoding_rejects_malformed_envelopes_without_leaking_values() { +- for bad in [ +- b"%%%synthetic-secret-never-print".as_slice(), +- b"YQ".as_slice(), +- ] { +- let mut encoded = ENVELOPE.to_vec(); +- encoded.extend_from_slice(bad); +- let error = decode_secret(encoded).unwrap_err(); +- assert!(matches!(error, TokenStoreError::Io(_))); +- assert!(!error.to_string().contains("synthetic-secret-never-print")); +- } +- } +- +- #[test] +- fn credential_deletion_is_idempotent_but_keeps_other_errors() { +- assert!(deletion_result(Ok(())).is_ok()); +- assert!(deletion_result(Err(keyring_core::Error::NoEntry)).is_ok()); +- assert!(matches!( +- deletion_result(Err(keyring_core::Error::Invalid( +- "synthetic".into(), +- "failure".into() +- ))), +- Err(TokenStoreError::Keychain(_)) +- )); +- } +-} --- a/crates/xodus/Cargo.toml +++ b/crates/xodus/Cargo.toml -@@ -43,8 +43,8 @@ +@@ -43,9 +43,9 @@ smbios-lib = "0.9.4" [target.'cfg(target_os = "linux")'.dependencies] -dbus = "=0.9.12" +-x11-dl = "=2.21.0" -dbus-secret-service-keyring-store = { version = "1.0.1", features = ["crypto-openssl"]} +dbus = { version = "=0.9.12", optional = true } ++x11-dl = { version = "=2.21.0", optional = true } +dbus-secret-service-keyring-store = { version = "1.0.1", features = ["crypto-openssl"], optional = true} [target.'cfg(target_os = "macos")'.dependencies] apple-native-keyring-store = { version = "1.0.2", features = ["keychain"]} +--- a/crates/xodus/src/lib.rs ++++ b/crates/xodus/src/lib.rs +@@ -2,12 +2,6 @@ + pub mod auth; + pub mod clep; + pub mod hardware; +-#[cfg(target_os = "linux")] +-mod keyring_persistence; +-#[cfg(target_os = "linux")] +-pub mod keyring_session; +-#[cfg(target_os = "linux")] +-pub mod keyring_unlock; + pub mod licensing; + pub mod models; + pub mod secrets; +--- a/crates/xodus-cli/src/main.rs ++++ b/crates/xodus-cli/src/main.rs +@@ -18,24 +18,6 @@ + + #[derive(Subcommand)] + enum SubCommand { +- #[cfg(target_os = "linux")] +- #[command(about = "Gracefully stop only a Nexus-owned session keyring without accessing credentials")] +- KeyringSessionStop { +- #[arg(long)] +- provider_pid: u32, +- }, +- #[cfg(target_os = "linux")] +- #[command(about = "Create the first default wallet using the provider's password dialog")] +- KeyringCreate { +- #[arg(long, default_value = "")] +- window_id: String, +- }, +- #[cfg(target_os = "linux")] +- #[command(about = "Unlock the default system wallet without reading credentials or signing in")] +- KeyringUnlock { +- #[arg(long, default_value = "")] +- window_id: String, +- }, + #[command(about = "Resolve public Store packages without sign-in or downloading")] + ResolvePackage { + product: String, +@@ -238,29 +220,6 @@ + .build() + .unwrap(); + let args = CliArgs::parse(); +- #[cfg(target_os = "linux")] +- if let SubCommand::KeyringSessionStop { provider_pid } = &args.command { +- let state = xodus::keyring_session::stop_session_provider(*provider_pid); +- println!("{}", serde_json::json!({"schema": 1, "state": state.as_str()})); +- return if state == xodus::keyring_session::StopState::Unavailable { ExitCode::FAILURE } else { ExitCode::SUCCESS }; +- } +- #[cfg(target_os = "linux")] +- if let SubCommand::KeyringUnlock { window_id } | SubCommand::KeyringCreate { window_id } = &args.command { +- use std::sync::{Arc, atomic::{AtomicBool, Ordering}}; +- let cancelled = Arc::new(AtomicBool::new(false)); +- let signal = cancelled.clone(); +- let state = if ctrlc::set_handler(move || { signal.store(true, Ordering::SeqCst); }).is_err() { +- xodus::keyring_unlock::UnlockState::Unavailable +- } else { +- if matches!(&args.command, SubCommand::KeyringCreate { .. }) { +- xodus::keyring_unlock::create_default(window_id, &cancelled) +- } else { +- xodus::keyring_unlock::unlock_default(window_id, &cancelled) +- } +- }; +- println!("{}", serde_json::json!({"schema": 1, "state": state.as_str()})); +- return ExitCode::SUCCESS; +- } + #[cfg(not(feature = "native-webview"))] + if args.external_webview_stdio { + webview::enable_stdio(); +@@ -308,12 +267,6 @@ + } + + let code = match args.command { +- #[cfg(target_os = "linux")] +- SubCommand::KeyringSessionStop { .. } => unreachable!(), +- #[cfg(target_os = "linux")] +- SubCommand::KeyringUnlock { .. } => unreachable!(), +- #[cfg(target_os = "linux")] +- SubCommand::KeyringCreate { .. } => unreachable!(), + SubCommand::ResolvePackage { .. } => unreachable!(), + SubCommand::Download { + product, diff --git a/tools/xbox/droiddeck-launch-view.patch b/tools/xbox/droiddeck-launch-view.patch index 4f8836a18..d3ca2d3df 100644 --- a/tools/xbox/droiddeck-launch-view.patch +++ b/tools/xbox/droiddeck-launch-view.patch @@ -1,6 +1,6 @@ --- a/crates/xodus-cli/src/commands/run.rs +++ b/crates/xodus-cli/src/commands/run.rs -@@ -77,6 +77,7 @@ +@@ -146,6 +146,7 @@ launch_image: &Path, materialize_chain: bool, ) -> (String, String) { @@ -8,7 +8,7 @@ let source_nt = source.to_string_lossy().replace('/', "\\"); let source_nt = source_nt.trim_end_matches('\\'); let mirror_unix = mirror_nt_prefix.map(|prefix| prefix.replace('\\', "/")); -@@ -200,9 +201,7 @@ +@@ -303,9 +304,7 @@ let entry_path = checked_relative_path(entry_suffix)?; let mut decrypted = HashMap::new(); for (name, fd) in fds { @@ -19,22 +19,41 @@ } if !decrypted.contains_key(&entry_path) { return Err(std::io::Error::new( -@@ -222,11 +221,8 @@ +@@ -325,7 +324,8 @@ } } let decrypted_files: HashSet<PathBuf> = decrypted.keys().cloned().collect(); -- let parent = source_root.parent().unwrap_or_else(|| Path::new("/tmp")); -- let mirror = Builder::new() -- .prefix(".xodus-chain-") -- .tempdir_in(parent) -- .or_else(|_| Builder::new().prefix("xodus-chain-").tempdir())?; +- let mirror = launch_view_directory(source_root, ".xodus-chain-")?; + let mirror = Builder::new().prefix("droiddeck-xbox-") + .permissions(std::os::unix::fs::PermissionsExt::from_mode(0o700)).tempdir()?; populate_launch_view( source_root, mirror.path(), -@@ -667,21 +663,15 @@ - use std::os::fd::AsRawFd; +@@ -725,6 +725,22 @@ + ); + } + ++ if wine == "droiddeck:prepare" { ++ use std::io::Write; ++ if !materialize_chain { return ExitCode::FAILURE; } ++ let ready = serde_json::json!({ ++ "exe": stub_path, ++ "playfab": playfab_auth_header(client, tokens).await, ++ }); ++ println!("DROIDDECK_LAUNCH_V1 {}", ready); ++ let _ = std::io::stdout().flush(); ++ let mut release = String::new(); ++ let _ = std::io::stdin().read_line(&mut release); ++ drop(launch_mirror); ++ cleanup().await; ++ return ExitCode::SUCCESS; ++ } ++ + let mut command = Command::new(wine); + command + .arg(&stub_path) +@@ -831,21 +847,15 @@ + } #[test] - fn full_launch_view_uses_real_executables_and_preserves_encrypted_dll_maps() { @@ -58,13 +77,10 @@ } #[test] -@@ -778,6 +768,25 @@ - .is_symlink()); - assert_eq!(std::fs::read(source.join("Dungeons.exe")).unwrap(), b"encrypted launcher"); - assert_eq!(std::fs::read(nested.join("Shipping.exe")).unwrap(), b"encrypted child"); -+ } -+ -+ #[test] +@@ -945,6 +955,44 @@ + } + + #[test] + fn launch_view_materializes_encrypted_dlls_in_private_storage() { + let root = tempfile::tempdir().unwrap(); + std::fs::write(root.path().join("Game.exe"), b"encrypted").unwrap(); @@ -81,26 +97,54 @@ + assert_eq!(std::fs::read(root.path().join("Secret.dll")).unwrap(), b"encrypted-dll"); + use std::os::unix::fs::PermissionsExt; + assert_eq!(std::fs::metadata(view.path()).unwrap().permissions().mode() & 0o077, 0); - } - - #[test] ---- a/crates/xodus-cli/src/commands/run.rs -+++ b/crates/xodus-cli/src/commands/run.rs -@@ -618 +618,17 @@ -+ if wine == "droiddeck:prepare" { -+ use std::io::Write; -+ if !materialize_chain { return ExitCode::FAILURE; } -+ let ready = serde_json::json!({ -+ "exe": stub_path, -+ "playfab": playfab_auth_header(client, tokens).await, -+ }); -+ println!("DROIDDECK_LAUNCH_V1 {}", ready); -+ let _ = std::io::stdout().flush(); -+ let mut release = String::new(); -+ let _ = std::io::stdin().read_line(&mut release); -+ drop(launch_mirror); -+ cleanup().await; -+ return ExitCode::SUCCESS; + } + - let mut command = Command::new(wine); ++ ++ #[test] ++ fn launch_view_rejects_invalid_decrypted_library_without_changing_sources() { ++ let root = tempfile::tempdir().unwrap(); ++ std::fs::write(root.path().join("Game.exe"), b"encrypted executable").unwrap(); ++ std::fs::write(root.path().join("Bad.dll"), b"encrypted library").unwrap(); ++ let mut exe_image = tempfile::tempfile().unwrap(); ++ exe_image.write_all(&fake_pe()).unwrap(); ++ let mut dll_image = tempfile::tempfile().unwrap(); ++ dll_image.write_all(b"not a PE library").unwrap(); ++ let exe = String::from("Game.exe"); ++ let dll = String::from("Bad.dll"); ++ let images = [(&exe, exe_image.as_raw_fd()), (&dll, dll_image.as_raw_fd())]; ++ let error = create_launch_chain_mirror(root.path(), &exe, &images).unwrap_err(); ++ assert_eq!(error.kind(), std::io::ErrorKind::InvalidData); ++ assert_eq!(std::fs::read(root.path().join("Game.exe")).unwrap(), b"encrypted executable"); ++ assert_eq!(std::fs::read(root.path().join("Bad.dll")).unwrap(), b"encrypted library"); ++ } ++ ++ #[test] + fn launch_chain_rejects_parent_path_components() { + assert!(checked_relative_path("..\\outside.exe").is_err()); + } +@@ -961,16 +1009,20 @@ + assert_eq!(name, "Bin\\MINECRAFT.WINDOWS.EXE"); + assert!(!fcntl_getfd(file.as_fd()).unwrap().contains(FdFlags::CLOEXEC)); + let dll_name = String::from("Encrypted.dll"); +- let mut dll = tempfile::tempfile().unwrap(); dll.write_all(b"synthetic decrypted library").unwrap(); ++ std::fs::write(root.path().join("Encrypted.dll"), b"encrypted library").unwrap(); ++ let mut dll = tempfile::tempfile().unwrap(); dll.write_all(&fake_pe()).unwrap(); + let images = [(&dll_name, dll.as_raw_fd()), (&name, file.as_raw_fd())]; + assert!(select_launch_entry(&images[..1], Some("bin/Minecraft.Windows.exe")).is_err()); + assert_eq!(select_launch_entry(&images, Some("bin/Minecraft.Windows.exe")).unwrap().1, file.as_raw_fd()); + let (mirror, entry, count, bytes) = create_launch_chain_mirror(root.path(), &name, &images).unwrap(); +- assert_eq!(count, 1); assert_eq!(bytes, original.len() as u64); ++ assert_eq!(count, 2); assert_eq!(bytes, 2 * original.len() as u64); + assert_eq!(std::fs::read(entry).unwrap(), original); +- let (nt, _) = launch_file_maps(&images, root.path(), Some("\\synthetic-view"), &name, file.as_raw_fd(), &mirror.path().join("Bin/MINECRAFT.WINDOWS.EXE"), true); +- assert!(nt.contains("synthetic-view\\Encrypted.dll")); +- assert!(!nt.contains("synthetic-view\\Bin\\MINECRAFT.WINDOWS.EXE")); ++ let (nt, unix) = launch_file_maps(&images, root.path(), Some("\\synthetic-view"), &name, file.as_raw_fd(), &mirror.path().join("Bin/MINECRAFT.WINDOWS.EXE"), true); ++ assert!(nt.is_empty()); ++ assert!(unix.is_empty()); ++ assert_eq!(std::fs::read(mirror.path().join("Encrypted.dll")).unwrap(), fake_pe()); ++ assert!(!std::fs::symlink_metadata(mirror.path().join("Encrypted.dll")).unwrap().file_type().is_symlink()); ++ assert_eq!(std::fs::read(root.path().join("Encrypted.dll")).unwrap(), b"encrypted library"); + assert_eq!(std::fs::read(root.path().join("Bin/MINECRAFT.WINDOWS.EXE")).unwrap(), original); + assert_eq!(std::fs::read(root.path().join("MicrosoftGame.config")).unwrap(), b"metadata unchanged"); + } diff --git a/tools/xbox/droiddeck-xbox-ticket.patch b/tools/xbox/droiddeck-xbox-ticket.patch new file mode 100644 index 000000000..bb8f5d08f --- /dev/null +++ b/tools/xbox/droiddeck-xbox-ticket.patch @@ -0,0 +1,75 @@ +--- a/crates/xodus/src/models/secrets.rs ++++ b/crates/xodus/src/models/secrets.rs +@@ -80,9 +80,13 @@ + } + } + +-/// Store and licensing services reject delegation-compact tickets in the "d=" +-/// form that Xbox Live sign-in needs (InvalidMsaTicketFormat) and accept the +-/// same value as "t=". Convert only where a ticket is sent to those services. ++pub fn xbox_ticket(ticket: String) -> String { ++ match ticket.strip_prefix("d=") { ++ Some(raw) if is_compact_jwe(raw) => raw.to_owned(), ++ _ => ticket, ++ } ++} ++ + pub fn store_ticket(ticket: String) -> String { + match ticket.strip_prefix("d=") { + Some(value) => format!("t={value}"), +--- a/crates/xodus/src/models/licensing_ticket_tests.rs ++++ b/crates/xodus/src/models/licensing_ticket_tests.rs +@@ -1,5 +1,5 @@ + //! Public synthetic data only, no account, keyring or network access. +-use super::{Token, licensing_ticket, store_ticket}; ++use super::{Token, licensing_ticket, store_ticket, xbox_ticket}; + use crate::models::soap; + use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; + use serde_json::json; +@@ -77,3 +77,35 @@ + let long_header = jwe(json!({"alg":"dir","enc":"A256GCM","kid":"a".repeat(9000)}), ""); + assert_eq!(licensing_ticket(format!("d={long_header}")), format!("t={long_header}")); + } ++ ++#[test] ++fn credential_xbox_ticket_compact_jwe_uses_bare_wire_format_without_changing_store_conversion() { ++ for raw in [ ++ jwe(json!({"alg":"dir","enc":"A128CBC-HS256"}), ""), ++ jwe(json!({"alg":"RSA-OAEP-256","enc":"A256GCM"}), "a2V5"), ++ ] { ++ let Token::Compact(original) = delegation(&raw) else { panic!("fixture"); }; ++ assert_eq!(original, format!("d={raw}")); ++ assert_eq!(store_ticket(original.clone()), format!("t={raw}")); ++ assert_eq!(xbox_ticket(original), raw); ++ assert_eq!(xbox_ticket(raw.clone()), raw); ++ assert_eq!(xbox_ticket(format!("t={raw}")), format!("t={raw}")); ++ } ++} ++ ++#[test] ++fn credential_xbox_ticket_opaque_and_malformed_tokens_are_preserved() { ++ let valid = jwe(json!({"alg":"dir","enc":"A256GCM"}), ""); ++ let mut cases = vec!["d=opaque".to_string(), "opaque".into(), "".into(), "d=".into(), ++ "d=opaque..iv.ciphertext.tag".into(), "d=eyJ..a.b.c".into(), ++ format!("d={valid}.extra"), format!("d={}", valid.replace("..", ".+.")), ++ format!("d={}", jwe(json!({"alg":"dir"}), "")), ++ format!("d={}", jwe(json!({"alg":"dir","enc":""}), "")), ++ format!("d={}", jwe(json!({"alg":"dir","enc":"A256GCM","kid":"a".repeat(9000)}), ""))]; ++ let mut parts: Vec<_> = valid.split('.').map(str::to_string).collect(); ++ for index in [2, 3, 4] { ++ let old = parts[index].clone(); parts[index].clear(); ++ cases.push(format!("d={}", parts.join("."))); parts[index] = old; ++ } ++ for ticket in cases { assert_eq!(xbox_ticket(ticket.clone()), ticket); } ++} +--- a/crates/xodus/src/api/xbox/auth.rs ++++ b/crates/xodus/src/api/xbox/auth.rs +@@ -12,7 +12,7 @@ + properties: UserAuthProperties { + auth_method: "RPS".to_string(), + site_name: "user.auth.xboxlive.com".to_string(), +- rps_ticket, ++ rps_ticket: crate::models::secrets::xbox_ticket(rps_ticket), + }, + }; + diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 30afc1b01..ef2b23024 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Reproduce the pinned Nexus source and DroidDeck credential transport.""" import hashlib import json from pathlib import Path @@ -9,7 +8,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', 'droiddeck-xbox-ticket.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 d8e3de855..eb3042fa4 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/xbox/runtime.py b/tools/xbox/runtime.py index cbe3589ff..38bb10239 100755 --- a/tools/xbox/runtime.py +++ b/tools/xbox/runtime.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Extract only pinned Windows GDK modules; Linux Wine stays ARM64.""" import hashlib import json from pathlib import Path @@ -35,7 +34,6 @@ def download(name, expected, algorithm): return target archive = download(lock['archive'], lock['sha512'], 'sha512') -# Keep corresponding source available beside the build cache for redistribution. source = lock['source'] download(source['name'], source['sha256'], 'sha256') remaining = set(lock['dlls']) @@ -49,8 +47,6 @@ with tarfile.open(archive) as tar: data = tar.extractfile(member).read() if hashlib.sha256(data).hexdigest() != lock['dlls'][name] or data[:2] != b'MZ': raise RuntimeError('Xbox Windows runtime module checksum mismatch') - # Wine rejects builtin-tagged PE files when WINEDLLOVERRIDES selects native. - # These standalone Windows modules must use the native x64 loader on ARM64EC. if data[64:80] == b'Wine builtin DLL': data = data[:64] + b'DroidDeck native' + data[80:] (output / name).write_bytes(data) diff --git a/tools/xcloud-player/NOTICE.md b/tools/xcloud-player/NOTICE.md new file mode 100644 index 000000000..851957ad2 --- /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 000000000..0246e96bb --- /dev/null +++ b/tools/xcloud-player/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +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 000000000..d135074c6 --- /dev/null +++ b/tools/xcloud-player/entry.ts @@ -0,0 +1,197 @@ +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 } + +interface Settings extends Effects { + bitrateMbps: number + codec: string + preventDrops: boolean + statsLevel: number + statsLayout: string + statsCorner: string + server: string + volume: number + rumble: number +} +let settings: Settings = JSON.parse(DDCloud.settings()) + +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 + +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 + + 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) + } + + 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) + } + ;(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') + 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)) + + 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}`) + ;(window as any).__ddNexus = () => { pad.sendButtonState('Nexus', 1); setTimeout(() => pad.sendButtonState('Nexus', 0), 200) } + ;(window as any).__ddButton = (name: string, value: number) => pad.sendButtonState(name, value) + ;(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) { } } +} + +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 000000000..92583d295 --- /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 000000000..897b9a92e --- /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 000000000..b230c5abb --- /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 000000000..7e409aca7 --- /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 000000000..e8d89938c --- /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 000000000..c24e472b9 --- /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 000000000..6b8562db3 --- /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 000000000..0aa4dadeb --- /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 000000000..de94758c2 --- /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 000000000..18c6cfa74 --- /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 000000000..eae0eee90 --- /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 000000000..9475e1d69 --- /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 000000000..54dc7ff32 --- /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 000000000..0eedc0262 --- /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 000000000..7020ed823 --- /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 000000000..0821c67e1 --- /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 000000000..90c0321f2 --- /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 000000000..9ea899d75 --- /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 000000000..673ee1d02 --- /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 000000000..e89fb60f4 --- /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 000000000..f6eeaacb3 --- /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 000000000..1b5108ed3 --- /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 000000000..7f123e4a9 --- /dev/null +++ b/tools/xcloud-player/renderer.ts @@ -0,0 +1,380 @@ +// Sharpening (CAS and unsharp mask) from Better xCloud by redphx, MIT. Screen effects from Bannerlator. + +export interface Effects { + brightness: number + contrast: number + gamma: number + saturation: number + sharpen: number + sharpenMode: string + deband: number + fxaa: boolean + toon: boolean + crt: boolean + ntsc: boolean + maxFps: number +} + +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); +}` + +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 } + + 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 000000000..2fbb7c541 --- /dev/null +++ b/tools/xcloud-player/sdp-tweaks.ts @@ -0,0 +1,32 @@ +// Offer tweaks after Better xCloud by redphx (MIT, src/utils/sdp.ts). + +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') +} + +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 000000000..738b1120a --- /dev/null +++ b/tools/xcloud-player/streamstats.ts @@ -0,0 +1,64 @@ +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 + 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 000000000..f55aa7c0c --- /dev/null +++ b/tools/xcloud-player/uuid.ts @@ -0,0 +1 @@ +export function v4(): string { return crypto.randomUUID() }