diff --git a/.github/workflows/authorship.yml b/.github/workflows/authorship.yml
index 97c6637a8f..ebbcae644f 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.yml b/.github/workflows/build.yml
index ebfd545ca2..146e7fe3bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,26 +16,29 @@ on:
- 'LICENSE'
- '.gitignore'
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
-
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
@@ -53,9 +56,46 @@ jobs:
git config user.name "ci"
git config user.email "ci@users.noreply.github.com"
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
+ 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 --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 +103,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 +121,158 @@ 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
+ 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 --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: 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
@@ -150,7 +335,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"
@@ -208,7 +393,7 @@ 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
@@ -218,13 +403,11 @@ jobs:
- uses: gradle/actions/setup-gradle@v4
with:
+ cache-read-only: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
cache-cleanup: 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
@@ -250,264 +433,6 @@ jobs:
echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$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 +450,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,18 +471,26 @@ 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
@@ -567,7 +501,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
@@ -598,16 +531,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
@@ -683,86 +611,84 @@ jobs:
TEST_DIAGNOSTICS_URL: ${{ steps.unit-test-diagnostics.outputs.artifact-url }}
APK_OUTCOME: ${{ steps.apk-upload.outcome }}
SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+ run: bash tools/release/report-build.sh
+
+ python-tests:
+ 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
+ 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 --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: python3 -m unittest discover -s tools/tests -p 'test_*.py'
+
+ checks:
+ name: Compile and test APK
+ needs: [build, python-tests]
+ if: ${{ always() && (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 +700,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 +720,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 +741,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 +755,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/README.md b/README.md
index fb86fa6534..653df9f720 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,16 @@ DroidDeck brings the SteamOS experience to Android: Valve's Steam client in Big

+
+
+
+
+
+
+
+
+
+

> Note: DroidDeck does not have a stand-alone website. Do not click on any download links from websites claiming to be the DroidDeck team.
@@ -47,7 +57,7 @@ Compatibility and performance vary by device; hardware validation is limited. De
## Credits and licence
-GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve.
+GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve.
XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them.
@@ -56,3 +66,5 @@ Joy-Con VR controllers port the arm model of Google's [Google VR SDK for Unity](
Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Tasks Vision library with its Pose Landmarker (Lite) model, BlazePose GHUM 3D, and its Hand Landmarker model (all Apache-2.0), on frames from AndroidX [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) (Apache-2.0); MediaPipe's usage reports are switched off. The design was checked against [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr) camera app (MIT), and the short Joy-Con movements follow the accelerometer mode of the [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk)'s arm model, Eric Foxlin's zero-velocity updates and Frosio, Pedersini and Borghese's accelerometer autocalibration, and the camera and Joy-Con are joined by a Kalman filter (R. E. Kalman, 1960). Bare camera hands take their gestures after [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, with distances checked on photos from the [HaGRID](https://github.com/hukenovs/hagrid) gesture set (CC BY-SA 4.0, not included), fit the palm with Horn's quaternion method (1987) and smooth it with the 1€ filter (Casiez, Roussel and Vogel, 2012); the white glove model follows Valve's OpenVR render model reference and Index controller poses, is meshed with surface nets (Gibson, 1998; Mikola Lysenko) and blends and shades it with Inigo Quilez's smooth minimum and distance-field ambient occlusion, porting his polygon distance (MIT); see [docs/third-party/handtracking](docs/third-party/handtracking/README.md).
The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead.
+
+Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam.
diff --git a/app/build.gradle b/app/build.gradle
index e81b92711c..8ba8c8ea09 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,7 +80,7 @@ def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getO
def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' }
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()] }
@@ -220,6 +220,10 @@ android {
unitTests.returnDefaultValues = true
unitTests.includeAndroidResources = true
unitTests.all {
+ if (ciBuild) {
+ outputs.upToDateWhen { false }
+ outputs.doNotCacheIf('CI executes the test suite on every run') { true }
+ }
// Robolectric keeps a sandbox per SDK level the tests ask for; seven no longer fit in Gradle's default 512 MB.
maxHeapSize = '2g'
def logTarget = providers.systemProperty('robolectric.logging').orNull
@@ -333,6 +337,8 @@ dependencies {
implementation 'androidx.camera:camera-camera2:1.4.2'
implementation 'androidx.camera:camera-lifecycle:1.4.2'
implementation 'androidx.webkit:webkit:1.12.1'
+ // Google's WebRTC (BSD) for the native Xbox Cloud Gaming player (XboxNativePlayerActivity).
+ implementation 'io.github.webrtc-sdk:android:125.6422.07'
implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") {
exclude group: 'com.google.auto.value', module: 'auto-value'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fcd9b2e11b..29718e0879 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
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"
@@ -151,6 +152,27 @@
android:process=":xboxlogin" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density"
android:theme="@style/AppTheme" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/assets/xcloud/player.js b/app/src/main/assets/xcloud/player.js
new file mode 100644
index 0000000000..3d3762149d
--- /dev/null
+++ b/app/src/main/assets/xcloud/player.js
@@ -0,0 +1,187 @@
+/* DroidDeck Xbox Cloud Gaming player. Includes Greenlight's player (c) UnknownSKL (Jim Kroon), MIT. */
+(()=>{var _=class{_player;_dataChannel;constructor(e){this._player=e,this._dataChannel=this._player._peerConnection.createDataChannel(this.getChannelName(),this.getChannelConfig()),this._dataChannel.onopen=this.onOpen.bind(this),this._dataChannel.onmessage=this.onMessage.bind(this),this._dataChannel.onclosing=this.onClosing.bind(this),this._dataChannel.onclose=this.onClose.bind(this),this._dataChannel.onerror=this.onError.bind(this)}getChannelName(){return"channel"}getChannelConfig(){return{}}onOpen(e){console.log(this.getChannelName(),"Opening channel:",e)}onMessage(e){console.log(this.getChannelName(),"Message channel:",e)}onClosing(e){console.log(this.getChannelName(),"Closing channel:",e)}onClose(e){console.log(this.getChannelName(),"Closed channel:",e)}onError(e){console.log(this.getChannelName(),"Error channel:",e)}send(e){if(this._dataChannel.readyState!=="open"){console.log("["+this.getChannelName()+"] Tried to send data while channel is not open. readyState is:",this._dataChannel.readyState);return}return typeof e=="string"&&(e=new TextEncoder().encode(e)),this._dataChannel.send(e)}getPlayer(){return this._player}destroy(){}};var S=class extends _{_micPermissions="prompt";_micStream;constructor(e){super(e),navigator.permissions.query({name:"microphone"}).then(t=>{this._micPermissions=t.state,t.onchange=()=>{this._micPermissions=t.state}})}getChannelName(){return"chat"}getChannelConfig(){return{ordered:!0,protocol:"chatV1"}}destroy(){}};var v=class r{_player;_index;_physicalGamepadId=-1;_rumbleInterval;_isFocused=!0;_gamepadOverride={buttons:{}};_options={enable_keyboard:!1,enable_gamepad:!0,enable_vibration:!0,keyboard_mapping:{A:"Enter",B:"Backspace",X:"x",Y:"y",DPadUp:"ArrowUp",DPadDown:"ArrowDown",DPadLeft:"ArrowLeft",DPadRight:"ArrowRight",LeftShoulder:"[",RightShoulder:"]",LeftThumb:"l",RightThumb:"r",LeftTrigger:"-",RightTrigger:"=",Menu:"m",View:"v",Nexus:"n"},gamepad_mapping:{A:"0",B:"1",X:"2",Y:"3",DPadUp:"12",DPadDown:"13",DPadLeft:"14",DPadRight:"15",LeftShoulder:"4",RightShoulder:"5",LeftThumb:"10",RightThumb:"11",LeftTrigger:"6",RightTrigger:"7",Menu:"9",View:"8",Nexus:"16"},gamepad_axes_mapping:{LeftThumbXAxis:"0",LeftThumbYAxis:"1",RightThumbXAxis:"2",RightThumbYAxis:"3"},gamepad_deadzone:.08,gamepad_force_capture:!1};_listener={keyDown:this.onKeyDown.bind(this),keyUp:this.onKeyUp.bind(this),gamepadConnected:this.onGamepadConnected.bind(this),gamepadDisconnected:this.onGamepadDisconnected.bind(this),windowFocus:this.onWindowFocus.bind(this),windowBlur:this.onWindowBlur.bind(this)};constructor(e,t={}){this._index=e,this._options={...this._options,...t}}attach(e){this._player=e,this._player._channels.control.sendGamepadState(this._index,!0,this),this._options.enable_keyboard===!0&&(window.addEventListener("keydown",this._listener.keyDown),window.addEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.addEventListener("gamepadconnected",this._listener.gamepadConnected),window.addEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.addEventListener("blur",this._listener.windowBlur),window.addEventListener("focus",this._listener.windowFocus)),this.detectActiveGamepad()}detach(){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}this._player._channels.control.sendGamepadState(this._index,!1),this._physicalGamepadId=-1,this._rumbleInterval!==void 0&&clearInterval(this._rumbleInterval),this._options.enable_keyboard===!0&&(window.removeEventListener("keydown",this._listener.keyDown),window.removeEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.removeEventListener("gamepadconnected",this._listener.gamepadConnected),window.removeEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.removeEventListener("blur",this._listener.windowBlur),window.removeEventListener("focus",this._listener.windowFocus))}sendButtonState(e,t){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}if(!(e in this.getDefaultFamepadFrame())){console.log("[Gamepad] Invalid button:",e);return}let n=this.getDefaultFamepadFrame();n.GamepadIndex=this._index,this._gamepadOverride.buttons[e]=t}onKeyDown(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=1,e.preventDefault())}onKeyUp(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=0,e.preventDefault())}onWindowFocus(){this._isFocused=!0}onWindowBlur(){}getDefaultFamepadFrame(){return{GamepadIndex:0,Nexus:0,Menu:0,View:0,A:0,B:0,X:0,Y:0,DPadUp:0,DPadDown:0,DPadLeft:0,DPadRight:0,LeftShoulder:0,RightShoulder:0,LeftThumb:0,RightThumb:0,LeftThumbXAxis:0,LeftThumbYAxis:0,RightThumbXAxis:0,RightThumbYAxis:0,LeftTrigger:0,RightTrigger:0}}detectActiveGamepad(){if(this._physicalGamepadId<0)for(let e in navigator.getGamepads()){let t=navigator.getGamepads()[e]?.index;if(t===void 0)continue;let n=!1;for(let i in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[i]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId===navigator.getGamepads()[e]?.index){console.log("[Gamepad] Active gamepad already detected:",t,(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId),n=!0;continue}n===!1&&(this._physicalGamepadId=t,console.log("[Gamepad] Active gamepad detected:",this._physicalGamepadId))}else console.log("[Gamepad] Physical gamepad already detected:",this._physicalGamepadId)}onGamepadConnected(e){if(this._physicalGamepadId<0){for(let t in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[t]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[t])._physicalGamepadId===e.gamepad.index)return;this._physicalGamepadId=e.gamepad.index}}onGamepadDisconnected(e){e.gamepad.index===this._physicalGamepadId&&(this._physicalGamepadId=-1)}hasOverrideButtons(){return Object.keys(this._gamepadOverride.buttons).length>0}getGamepadState(){let e=this.getGamepad(this._physicalGamepadId);if((this._physicalGamepadId<0||e===void 0||this._isFocused===!1)&&this.hasOverrideButtons()===!1)return;let t=this.getDefaultFamepadFrame();if(t.GamepadIndex=this._index,e!==void 0){for(let i in this._options.gamepad_mapping)t[i]=e.buttons[this._options.gamepad_mapping[i]]?.value??0;for(let i in this._options.gamepad_axes_mapping)t[i]=this.normaliseAxis(e.axes[this._options.gamepad_axes_mapping[i]]??0)}for(let i in this._gamepadOverride.buttons)t[i]=this._gamepadOverride.buttons[i];let n=[];for(let i in this._gamepadOverride.buttons)this._gamepadOverride.buttons[i]===0&&n.push(i);for(let i of n)delete this._gamepadOverride.buttons[i];return t.View>0&&t.Menu>0&&(t.View=0,t.Menu=0,t.Nexus=1),t}getGamepad(e=-1){let t=navigator.getGamepads()[e];if(t!==null)return t}getPhysicalGamepadId(){return this._physicalGamepadId}handleVibration(e){if(this._physicalGamepadId<0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}let t=this.getGamepad(this._physicalGamepadId);if(t===void 0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}if(this._options.enable_vibration===!1)return;let n={startDelay:0,duration:e.durationMs,weakMagnitude:e.rightMotorPercent*(window.__ddRumble??1),strongMagnitude:e.leftMotorPercent*(window.__ddRumble??1),leftTrigger:e.leftTriggerMotorPercent,rightTrigger:e.rightTriggerMotorPercent};if(t.vibrationActuator?.type==="dual-rumble"){let i=e.rightMotorPercent<.6?(.6-e.rightMotorPercent)/2:0,a=(e.leftTriggerMotorPercent+e.rightTriggerMotorPercent)/4,s=Math.min(i,a);if(n.weakMagnitude=Math.min(1,(e.rightMotorPercent+s)*(window.__ddRumble??1)),n.leftTrigger=0,n.rightTrigger=0,t.vibrationActuator?.playEffect("dual-rumble",n),clearInterval(this._rumbleInterval),e.repeat>0){let o=e.repeat;this._rumbleInterval=setInterval(()=>{o<=0&&clearInterval(this._rumbleInterval),t.vibrationActuator!==void 0&&t.vibrationActuator?.playEffect("dual-rumble",n),o--},e.delayMs+e.durationMs)}}else console.log("[Gamepad] Unknown vibration type:",t.vibrationActuator.type)}normaliseAxis(e){return Math.abs(e)0&&(this._reportType|=1,s=s+this._calculateMetadataSize(e),this._metadataFrames=e),t.length>0&&(this._reportType|=2,s=s+this._calculateGamepadSize(t),this._gamepadFrames=t),n.length>0&&(this._reportType|=4,s=s+this._calculatePointerSize(n),this._pointerFrames=n),i.length>0&&(this._reportType|=32,s=s+this._calculateMouseSize(i),this._mouseFrames=i),a.length>0&&(this._reportType|=64,s=s+this._calculateKeyboardSize(a),this._keyboardFrames=a),this._totalSize=s}_calculateMetadataSize(e){return 1+7*4*e.length}_calculateGamepadSize(e){return 1+23*e.length}_calculatePointerSize(e){let t=1;for(let n in e)t=t+1+e[n].events.length*20;return t}_calculateMouseSize(e){return 1+18*e.length}_calculateKeyboardSize(e){return 1+3*e.length}_writeMetadataData(e,t,n){e.setUint8(t,n.length),t++,n.length>=30&&console.warn("metadataQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("gamepadQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(s|=2),a.Menu>0&&(s|=4),a.View>0&&(s|=8),a.A>0&&(s|=16),a.B>0&&(s|=32),a.X>0&&(s|=64),a.Y>0&&(s|=128),a.DPadUp>0&&(s|=256),a.DPadDown>0&&(s|=512),a.DPadLeft>0&&(s|=1024),a.DPadRight>0&&(s|=2048),a.LeftShoulder>0&&(s|=4096),a.RightShoulder>0&&(s|=8192),a.LeftThumb>0&&(s|=16384),a.RightThumb>0&&(s|=32768),e.setUint16(t,s,!0),e.setInt16(t+2,this._normalizeAxisValue(a.LeftThumbXAxis),!0),e.setInt16(t+4,this._normalizeAxisValue(-a.LeftThumbYAxis),!0),e.setInt16(t+6,this._normalizeAxisValue(a.RightThumbXAxis),!0),e.setInt16(t+8,this._normalizeAxisValue(-a.RightThumbYAxis),!0),e.setUint16(t+10,this._normalizeTriggerValue(a.LeftTrigger),!0),e.setUint16(t+12,this._normalizeTriggerValue(a.RightTrigger),!0),e.setUint32(t+14,1,!0),e.setUint32(t+18,1,!1),t+=22}return t}_writePointerData(e,t,n){e.setUint8(t,1),t++,n.length>=2&&console.warn("pointerQueue is bigger then 1. Only one event will be sent.");let i=n[0];if(i!==void 0){e.setUint8(t,i.events.length),t++;let a=this._serverVideoWidth,s=this._serverVideoHeight;for(let o=0;o=30&&console.warn("mouseQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("keyboardQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(n=this._writeMetadataData(t,n,this._metadataFrames)),this._gamepadFrames.length>0&&(n=this._writeGamepadData(t,n,this._gamepadFrames)),this._pointerFrames.length>0&&(n=this._writePointerData(t,n,this._pointerFrames)),this._mouseFrames.length>0&&(n=this._writeMouseData(t,n,this._mouseFrames)),this._keyboardFrames.length>0&&(n=this._writeKeyboardData(t,n,this._keyboardFrames)),this._reportType===8&&(t.setUint8(n,this._maxTouchpoints),n++),n!==n)throw new Error("Packet length mismatch. Something is wrong!");return t}_normalizeTriggerValue(e){return e<=0||Number.isNaN(e)?0:e>=1?65535:e*65535|0}_normalizeAxisValue(e){let i=Math.round(e*32767);return i>32767?32767:i<-32767?-32767:i}};var F=class{_player;_inputSequenceNum=0;_metadataQueue=[];_gamepadQueue=[];_pointerQueue=[];_mouseQueue=[];_keyboardQueue=[];_gamepadHeartbeatTimers=new Map;_lastGamepadState=new Map;_axisChangeThreshold=.08;constructor(e){this._player=e}_hasQueuedData(){return this._metadataQueue.length>0||this._gamepadQueue.length>0||this._pointerQueue.length>0||this._mouseQueue.length>0||this._keyboardQueue.length>0}_upsertGamepadFrame(e){for(let t=0;tthis._axisChangeThreshold||o>.15)return!0}for(let a of i)if(Math.abs(e[a]-t[a])>.01)return!0;return!1}_isHeartbeatDue(e){let t=this._gamepadHeartbeatTimers.get(e)??0;return performance.now()-t>33}queueMetadataFrame(e){this._metadataQueue.push(e),this.checkQueueAndSend()}queueGamepadFrame(e){let t=this._lastGamepadState.get(e.GamepadIndex),n=this._hasSignificantAxisChange(e,t),i=this._isHeartbeatDue(e.GamepadIndex);(n||i)&&(this._upsertGamepadFrame(e),this._lastGamepadState.set(e.GamepadIndex,e),this._gamepadHeartbeatTimers.set(e.GamepadIndex,performance.now()),this.checkQueueAndSend())}queueGamepadFrames(e,t=!1){for(let n of e)this._upsertGamepadFrame(n);this.checkQueueAndSend(t)}queueMouseFrame(e){this._mouseQueue.push(e),this.checkQueueAndSend()}queueKeyboardFrame(e){this._keyboardQueue.push(e),this.checkQueueAndSend()}queuePointerFrame(e){this._pointerQueue.length>0?this._pointerQueue[0].events=this._pointerQueue[0].events.concat(e.events):this._pointerQueue.push(e),this.checkQueueAndSend()}checkQueueAndSend(e=!1){if(e===!0){this._hasQueuedData()&&this.sendQueue();return}if(this._gamepadQueue.length>0){this.sendQueue();return}if(this._mouseQueue.length>0||this._keyboardQueue.length>0||this._pointerQueue.length>0){this.sendQueue();return}this._metadataQueue.length>5&&this.sendQueue()}sendQueue(){let e=new y(this.getSequenceNum());this._pointerQueue.length>0&&e.setStreamConfig({width:this._player._channels.input.getServerVideoWidth(),height:this._player._channels.input.getServerVideoHeight()}),e.setData(this._metadataQueue,this._gamepadQueue,this._pointerQueue,this._mouseQueue,this._keyboardQueue),this._player._channels.input.send(e.toBuffer()),this.clearQueues()}clearQueues(){this._metadataQueue=[],this._gamepadQueue=[],this._pointerQueue=[],this._mouseQueue=[],this._keyboardQueue=[]}getSequenceNum(){return this._inputSequenceNum++,this._inputSequenceNum}};var A=class extends _{_serverVideoWidth=0;_serverVideoHeight=0;_inputQueue=new F(this.getPlayer());getChannelName(){return"input"}getChannelConfig(){return{ordered:!0,protocol:"1.0"}}getServerVideoWidth(){return this._serverVideoWidth}getServerVideoHeight(){return this._serverVideoHeight}start(){let e=new y(0);e.setMetadata(navigator.maxTouchPoints>1?navigator.maxTouchPoints:1),this.send(e.toBuffer()),console.log("[InputChannel] Sent metadata:",e,e.toBuffer()),setTimeout(this.gamepadStateLoop.bind(this),16)}onMessage(e){let t=new DataView(e.data),n=t.getUint8(0);if(console.log("[InputChannel] received:",t),n===128){console.log("Received a vibration report"),t.getUint8(2);let i=t.getUint8(3),a=this.getPlayer()._channels.control.getGamepadHandler(i);if(a!==void 0){let s=t.getUint8(4)/100,o=t.getUint8(5)/100,d=t.getUint8(6)/100,u=t.getUint8(7)/100,h=t.getUint16(8,!0),g=t.getUint16(10,!0),p=t.getUint8(12),c={gamepadIndex:i,leftMotorPercent:s,rightMotorPercent:o,leftTriggerMotorPercent:d,rightTriggerMotorPercent:u,durationMs:h,delayMs:g,repeat:p};a.handleVibration(c)}else console.log("[InputChannel] Received a vibration report but no gamepad handler is available")}else n===16&&(console.log("[InputChannel] Received server video dimensions:",t.getUint32(2,!0),t.getUint32(6,!0)),this._serverVideoHeight=t.getUint32(2,!0),this._serverVideoWidth=t.getUint32(6,!0))}gamepadStateLoop(){let e=this.getPlayer()._channels.control.getGamepadHandlers(),t=[];for(let n in e)if(e[n]instanceof v){let i=e[n].getGamepadState();i!==void 0&&t.push(i)}t.length>0&&this.queueGamepadFrames(t),setTimeout(this.gamepadStateLoop.bind(this),16)}queueMetadataFrame(e){return this._inputQueue.queueMetadataFrame(e)}queueGamepadFrames(e,t=!1){this._inputQueue.queueGamepadFrames(e,t)}queueMouseFrame(e){this._inputQueue.queueMouseFrame(e)}queueKeyboardFrame(e){this._inputQueue.queueKeyboardFrame(e)}queuePointerFrame(e){this._inputQueue.queuePointerFrame(e)}destroy(){}};function Q(){return crypto.randomUUID()}var D=class{_channel;_data;constructor(e,t){this._channel=e,this._data=t,this.handle(this._data)}handle(e){switch(console.log("[MessageHandler] Handling:",e),e.target){case"/streaming/sessionLifetimeManagement/serverInitiatedDisconnect":this.completeTransaction(e.id,""),this._channel.getPlayer().destroy();break;case"/streaming/properties/titleinfo":console.log("Title update:",e);break;case"/streaming/touchcontrols/showlayoutv2":break;case"/streaming/systemUi/messages/ShowMessageDialog":this.handleMessage(e);break;default:console.log("[MessageChannel] Unhandled transaction:",e)}}completeTransaction(e,t){let n=JSON.stringify({type:"TransactionComplete",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}cancelTransaction(e,t){let n=JSON.stringify({type:"ReceiverCancel",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}handleMessage(e){let t=JSON.parse(e.content);console.log(t),confirm(t.TitleText+`
+
+`+t.ContentText)?this.completeTransaction(e.id,{Result:0}):this.completeTransaction(e.id,{Result:1})}};var M=class extends _{_handshakeCompleted=!1;getChannelName(){return"message"}getChannelConfig(){return{protocol:"messageV1",ordered:!0}}onOpen(){console.log("[MessageChannel] Sending handshake...");let e=JSON.stringify({type:"Handshake",version:"messageV1",id:"be0bfc6d-1e83-4c8a-90ed-fa8601c5a179",cv:"0"});this.send(e)}onMessage(e){let t=JSON.parse(e.data);switch(t.type){case"HandshakeAck":console.log("[MessageChannel] Handshake completed"),this._handshakeCompleted=!0,this.getPlayer()._channels.control.sendAuthorization(),this.getPlayer()._channels.input.start(),this.sendConfig();break;case"TransactionStart":case"Message":new D(this,t);break;default:console.log("[MessageChannel] Unhandled message type:",t.type,t)}}sendConfig(){let e=[],t=[0,2,0],n=JSON.stringify(this.generateMessage("/streaming/systemUi/configuration",{version:t,systemUis:e}));this.send(n);let i=JSON.stringify(this.generateMessage("/streaming/properties/clientappinstallidchanged",{clientAppInstallId:"c97d7ee0-73b2-4239-bf1d-9d805a338429"}));this.send(i);let a=JSON.stringify(this.generateMessage("/streaming/characteristics/orientationchanged",{orientation:0}));this.send(a);let s=JSON.stringify(this.generateMessage("/streaming/characteristics/touchinputenabledchanged",{touchInputEnabled:!1}));this.send(s);let o=JSON.stringify(this.generateMessage("/streaming/characteristics/clientdevicecapabilities",{}));this.send(o);let d=JSON.stringify(this.generateMessage("/streaming/characteristics/dimensionschanged",{horizontal:1920,vertical:1080,preferredWidth:1920,preferredHeight:1080,safeAreaLeft:0,safeAreaTop:0,safeAreaRight:1920,safeAreaBottom:1080,supportsCustomResolution:!0}));this.send(d)}generateMessage(e,t){return{type:"Message",content:JSON.stringify(t),id:Q(),target:e,cv:""}}destroy(){}};var E=class{_address;_ipv4Address;_ipv4Port;constructor(e){this._address=e;let t=this._address.split(":"),n=t[6]+t[7],i=t[5],a=~parseInt(n.substring(0,2),16)&255,s=~parseInt(n.substring(2,4),16)&255,o=~parseInt(n.substring(4,6),16)&255,d=~parseInt(n.substring(6,8),16)&255,u=~parseInt(i.substring(0,4),16)&65535;this._ipv4Address=a+"."+s+"."+o+"."+d,this._ipv4Port=u}getIpv4Address(){return this._ipv4Address}getIpv4Port(){return this._ipv4Port}};var R=class{_peerConnection;_iceCandidates=[];constructor(e){this._peerConnection=e._peerConnection,this._peerConnection.addEventListener("icecandidate",t=>{t.candidate&&this._iceCandidates.push(t.candidate)})}getCandidates(){return this._iceCandidates}setRemoteCandidates(e){e.length===0&&console.warn("Error: No candidates received!");for(let t in e){if(e[t].candidate==="a=end-of-candidates")continue;let n=e[t].candidate.split(" ");if(n.length>4&&n[4].substr(0,4)==="2001"){let i=new E(n[4]);this._peerConnection.addIceCandidate({candidate:"a=candidate:10 1 UDP 1 "+i.getIpv4Address()+" 9002 typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid}),this._peerConnection.addIceCandidate({candidate:"a=candidate:11 1 UDP 1 "+i.getIpv4Address()+" "+i.getIpv4Port()+" typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid})}this._peerConnection.addIceCandidate({candidate:e[t].candidate,sdpMid:e[t].sdpMid,sdpMLineIndex:e[t].sdpMLineIndex})}}};var I=class{_player;_peerConnection;constructor(e){this._player=e,this._peerConnection=e._peerConnection}getAvailableCodecs(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[];for(let n in e)t.includes(e[n].mimeType)||t.push(e[n].mimeType);return t}setLocalSDP(e){return console.log("[SDP] setLocalSDP() Setting local SDP:",e),e.sdp=e.sdp?.replace("useinbandfec=1","useinbandfec=1; stereo=1"),e}setRemoteSDP(e){return console.log("[SDP] setRemoteSDP() Setting remote SDP:",e),e}getDefaultCodecPreferences(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[],n=[],i=[],a=[];for(let o in e)e[o].mimeType.includes("H264")?e[o].sdpFmtpLine?.includes("profile-level-id=4d")?t.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=42e")?n.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=420")&&i.push(e[o]):(e[o].mimeType.includes("ulpfec")||e[o].mimeType.includes("flexfec")||e[o].mimeType.includes("VP9")||e[o].mimeType.includes("VP8"))&&a.push(e[o]);return[...t,...n,...i,...a]}_setBitrate(e,t,n){let i=e.split(`
+`),a=-1;for(let o=0;o{e.forEach(t=>{t.type==="inbound-rtp"?this.readInboundRtp(t):t.type==="candidate-pair"&&t.packetsReceived!==void 0&&t.packetsReceived>0?this.readCandidatePair(t):t.type==="remote-candidate"&&this.readRemoteCandidate(t)})})}readInboundRtp(e){e.kind==="video"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0?(e.codecId.includes("profile-level-id=4d")?this._videoCodec="H264 (High)":e.codecId.includes("profile-level-id=42e")?this._videoCodec="H264 (Normal)":e.codecId.includes("profile-level-id=420")?this._videoCodec="H264 (Low)":this._videoCodec="Other ("+e.codecId+")",e.frameWidth&&(this._videoWidth=e.frameWidth),e.frameHeight&&(this._videoHeight=e.frameHeight),e.framesPerSecond&&(this._videoFps=e.framesPerSecond)):e.kind==="audio"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0&&(this._audioCodec=e.codecId)}readCandidatePair(e){this._activeRemoteCandidate=e.remoteCandidateId,this._rtt=e.currentRoundTripTime}readRemoteCandidate(e){e.id===this._activeRemoteCandidate&&(this.isPrivateIP(e.address)?this._remoteIsLocal=!0:this._remoteIsLocal=!1,this.isIpv6(e.address)?this._remoteIsIpv6=!0:this._remoteIsIpv6=!1,this._remoteHost=e.address,this._remotePort=e.port)}isPrivateIP(e){let t=e.split(".");return t[0]==="10"||t[0]==="172"&&parseInt(t[1],10)>=16&&parseInt(t[1],10)<=31||t[0]==="192"&&t[1]==="168"}isIpv6(e){return e.split(":").length>3}};var G=class{_player;_videoComponent;_overlays={debug:void 0};constructor(e,t){this._videoComponent=e,this._player=t}toggleDebug(){this._overlays.debug===void 0?this.createDebugOverlay():this.destroy()}createDebugOverlay(){this._overlays.debug=document.createElement("div"),this._overlays.debug.id="playerDebugOverlay",this._overlays.debug.style.position="absolute",this._overlays.debug.style.top="0",this._overlays.debug.style.left="0",this._overlays.debug.style.width=this._videoComponent.getElement()?.style.width||"100%",this._overlays.debug.style.height=this._videoComponent.getElement()?.style.height||"auto",this._overlays.debug.style.background="linear-gradient(0deg, rgba(0,0,0, 0) 0%, rgba(0,0,0, 0) 75%, rgba(0,0,0, 0.5) 100%)",this._overlays.debug.style.padding="10px",this._overlays.debug.style.pointerEvents="none",document.getElementById(this._player.getElementId())?.appendChild(this._overlays.debug),setTimeout(()=>{this.refreshDebugOverlay()},500),this.refreshDebugOverlay()}destroy(){this._overlays.debug?.remove(),this._overlays.debug=void 0}refreshDebugOverlay(){if(this._overlays.debug!==void 0){this._overlays.debug.innerHTML="",this._overlays.debug.appendChild(this.createLabel("Local Play",this._player.getStats()._remoteIsLocal?"Local":"Remote","ok")),this._overlays.debug.appendChild(this.createLabel("Resolution",this._player.getStats()._videoWidth+"x"+this._player.getStats()._videoHeight,"ok")),this._overlays.debug.appendChild(this.createLabel("Stream FPS",this._player.getStats()._videoFps.toString(),this._player.getStats()._videoFps>=58?"ok":"warning"));let e=this._videoComponent.getFrameStats?.();e&&(this._overlays.debug.appendChild(this.createLabel("Render FPS",e.renderingFps.toString(),e.renderingFps>=58?"ok":"warning")),this._overlays.debug.appendChild(this.createLabel("Render Delay",e.renderDelayMs.toString()+" ms",e.renderDelayMs<16?"ok":e.renderDelayMs<33?"warning":"error")),this._overlays.debug.appendChild(this.createLabel("Dropped Frames",e.droppedFrames.toString(),e.droppedFrames===0?"ok":e.droppedFrames<30?"warning":"error"))),this._overlays.debug.appendChild(this.createLabel("Connection",this._player.getStats()._remoteIsIpv6?"IPv6":"IPv4","ok")),this._overlays.debug.appendChild(this.createLabel("Video",this._player.getStats()._videoCodec,"ok"));let t=this._player.getStats()._rtt*1e3>75?"error":this._player.getStats()._rtt*1e3>40?"warning":"ok";this._overlays.debug.appendChild(this.createLabel("RTT",(this._player.getStats()._rtt*1e3).toString()+" ms",t)),setTimeout(()=>{this.refreshDebugOverlay()},500)}}createLabel(e,t="",n=""){let i={borderRadius:"5px",background:"linear-gradient(0deg, rgba(28,26,26,1) 0%, rgba(47,45,45,1) 100%)",padding:"10px",fontSize:"12px",marginTop:"3px",marginRight:"10px",marginBottom:"2px",textTransform:"uppercase",color:"white",display:"inline-block"},a=document.createElement("span"),s={error:"rgb(220, 53, 69)",warning:"rgb(255, 193, 7)",ok:"rgb(25, 135, 84)"};t!==""?a.innerHTML=`${e}: ${t}`:a.innerText=e;for(let o in i)a.style[o]=i[o];return a}};var L=class{_player;_element;_overlay;constructor(e){this._player=e,this._overlay=new G(this,this._player)}create(e){let t=document.createElement("video");t.srcObject=e,t.autoplay=!0,t.muted=!0,t.playsInline=!0,t.style.width="100%",t.style.height="100%",t.style.objectFit="contain",t.style.backgroundColor="black",t.style.touchAction="none",t.poster="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";let n=document.getElementById(this._player.getElementId());if(n===null)return;this._element=t,n.appendChild(this._element),getComputedStyle(n).position==="static"===!0&&(n.style.position="relative"),this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this))}processVideoMetadata(e,t){this._element!==void 0&&(this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)),this._player._channels.input.queueMetadataFrame({serverDataKey:t.rtpTimestamp,firstFramePacketArrivalTimeMs:t.receiveTime,frameSubmittedTimeMs:t.receiveTime,frameDecodedTimeMs:t.expectedDisplayTime,frameRenderedTimeMs:t.expectedDisplayTime}))}getElement(){return this._element}toggleDebugOverlay(){this._overlay.toggleDebug()}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("video");this._overlay!==void 0&&this._overlay.destroy(),t&&t.remove()}};var N=class{_player;_element;constructor(e){this._player=e}create(e){let t=document.createElement("audio");t.srcObject=e,t.autoplay=!0,t.muted=!1,this._element=t;let n=document.getElementById(this._player.getElementId());n!==null&&n.appendChild(this._element)}getElement(){return this._element}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("audio");t&&t.remove()}};var U=class{_peerConnection=new RTCPeerConnection({});_channels={chat:new S(this),control:new w(this),input:new A(this),message:new M(this)};_elementId;_isDestoyed=!1;_iceHelper=new R(this);_sdpHelper=new I(this);_statsHelper=new P(this);_videoComponent;_audioComponent;constructor(e){console.log("xCloudPlayer constructing..."),this._elementId=e,this._peerConnection.addTransceiver("audio",{direction:"sendrecv"}),this._peerConnection.addTransceiver("video",{direction:"recvonly"}).setCodecPreferences(this._sdpHelper.getDefaultCodecPreferences()),this._peerConnection.ontrack=n=>{n.track.kind==="video"?(this._videoComponent=new L(this),this._videoComponent.create(n.streams[0])):n.track.kind==="audio"?(this._audioComponent=new N(this),this._audioComponent.create(n.streams[0])):console.log("[xPlayer] Detected an unknown stream type: ",n.track.kind)},console.log("xCloudPlayer constructed.")}init(){console.log("xCloudPlayer init called.")}getElementId(){return this._elementId}async createOffer(){let e=await this._peerConnection.createOffer({offerToReceiveAudio:!0,offerToReceiveVideo:!0}),t=this._sdpHelper.setLocalSDP(e);return this._peerConnection.setLocalDescription(t),t}async setRemoteSDP(e){let t=this._sdpHelper.setRemoteSDP(e);return await this._peerConnection.setRemoteDescription({type:"answer",sdp:t})}async getICECandidates(){return this._iceHelper.getCandidates()}async setRemoteIceCandidates(e){this._iceHelper.setRemoteCandidates(e)}getVideoElement(){if(this._videoComponent)return this._videoComponent.getElement()}getAudioElement(){if(this._audioComponent)return this._audioComponent.getElement()}toggleDebugOverlay(){this._videoComponent&&this._videoComponent.toggleDebugOverlay()}getStats(){return this._statsHelper}destroy(){if(this._isDestoyed===!1){this._peerConnection.close(),this._peerConnection.onconnectionstatechange&&this._peerConnection.onconnectionstatechange(new Event("connectionstatechanged"));for(let e in this._channels)this._channels[e].destroy();this._videoComponent&&this._videoComponent.destroy(),this._audioComponent&&this._audioComponent.destroy(),this._isDestoyed=!0}else console.log("Cannot destroy because the player is already destroyed.")}};function X(r){return r.brightness!==0||r.contrast!==0||Math.abs(r.gamma-1)>.001||r.saturation!==100||r.sharpen>0||r.deband>0||r.fxaa||r.toon||r.crt||r.ntsc||r.maxFps>0}var J=`#version 300 es
+in vec2 position;
+out vec2 vUV;
+void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,j=`attribute vec2 position;
+varying vec2 vUV;
+void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,Z=`#version 300 es
+precision mediump float;
+uniform sampler2D screenTexture;
+uniform vec2 resolution;
+uniform int filterId;
+uniform float sharpenFactor;
+uniform float brightness;
+uniform float contrast;
+uniform float gamma;
+uniform float saturation;
+uniform float deband;
+out vec4 fragColor;
+const float CAS_CONTRAST_PEAK = 0.8 * -3.0 + 8.0;
+
+vec3 sharpen(vec2 coord, vec3 e) {
+ vec2 px = 1.0 / resolution;
+ vec3 b = texture(screenTexture, coord + px * vec2(0, 1)).rgb;
+ vec3 d = texture(screenTexture, coord + px * vec2(-1, 0)).rgb;
+ vec3 f = texture(screenTexture, coord + px * vec2(1, 0)).rgb;
+ vec3 h = texture(screenTexture, coord + px * vec2(0, -1)).rgb;
+ vec3 a = texture(screenTexture, coord + px * vec2(-1, 1)).rgb;
+ vec3 c = texture(screenTexture, coord + px * vec2(1, 1)).rgb;
+ vec3 g = texture(screenTexture, coord + px * vec2(-1, -1)).rgb;
+ vec3 i = texture(screenTexture, coord + px * vec2(1, -1)).rgb;
+ if (filterId == 1) {
+ vec3 blur = ((a + c + g + i) + (b + d + f + h) * 2.0 + e * 4.0) / 16.0;
+ return e + (e - blur) * sharpenFactor / 3.0;
+ }
+ vec3 minRgb = min(min(min(d, e), min(f, b)), h) + min(min(a, c), min(g, i));
+ vec3 maxRgb = max(max(max(d, e), max(f, b)), h) + max(max(a, c), max(g, i));
+ vec3 amplify = inversesqrt(clamp(min(minRgb, 2.0 - maxRgb) / maxRgb, 0.0, 1.0));
+ vec3 weight = -(1.0 / (amplify * CAS_CONTRAST_PEAK));
+ vec3 outColor = clamp(((b + d + f + h) * weight + e) / (4.0 * weight + 1.0), 0.0, 1.0);
+ return mix(e, outColor, sharpenFactor / 2.0);
+}
+
+float ign(vec2 p) { return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715)))); }
+
+void main() {
+ vec2 uv = gl_FragCoord.xy / resolution;
+ vec3 color = texture(screenTexture, uv).rgb;
+ if (sharpenFactor > 0.0) color = sharpen(uv, color);
+ color = clamp(color + brightness, 0.0, 1.0);
+ color = (color - 0.5) * clamp(contrast + 1.0, 0.5, 2.0) + 0.5;
+ color = mix(vec3(dot(color, vec3(0.2126, 0.7152, 0.0722))), color, saturation);
+ color = pow(max(color, 0.0), vec3(1.0 / gamma));
+ if (deband > 0.0) color += vec3(((ign(gl_FragCoord.xy) + ign(gl_FragCoord.xy + vec2(11.0, 17.0))) - 1.0) * (deband / 255.0));
+ fragColor = vec4(color, 1.0);
+}`,ee=`precision highp float;
+#define FXAA_MIN_REDUCE (1.0 / 128.0)
+#define FXAA_MUL_REDUCE (1.0 / 8.0)
+#define MAX_SPAN 8.0
+uniform sampler2D screenTexture;
+uniform vec2 resolution;
+const vec3 luma = vec3(0.299, 0.587, 0.114);
+void main() {
+ vec2 invResolution = 1.0 / resolution;
+ vec3 rgbNW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, -1.0)) * invResolution).rgb;
+ vec3 rgbNE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, -1.0)) * invResolution).rgb;
+ vec3 rgbSW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, 1.0)) * invResolution).rgb;
+ vec3 rgbSE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, 1.0)) * invResolution).rgb;
+ vec3 rgbM = texture2D(screenTexture, gl_FragCoord.xy * invResolution).rgb;
+ float lumaNW = dot(rgbNW, luma);
+ float lumaNE = dot(rgbNE, luma);
+ float lumaSW = dot(rgbSW, luma);
+ float lumaSE = dot(rgbSE, luma);
+ float lumaM = dot(rgbM, luma);
+ float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+ float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+ vec2 dir;
+ dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+ dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+ float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * 0.25 * FXAA_MUL_REDUCE, FXAA_MIN_REDUCE);
+ float minDirFactor = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
+ dir = clamp(dir * minDirFactor, vec2(-MAX_SPAN), vec2(MAX_SPAN)) * invResolution;
+ vec4 rgbA = 0.5 * (
+ texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (1.0 / 3.0 - 0.5)) +
+ texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (2.0 / 3.0 - 0.5)));
+ vec4 rgbB = rgbA * 0.5 + 0.25 * (
+ texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * -0.5) +
+ texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * 0.5));
+ float lumaB = dot(rgbB, vec4(luma, 0.0));
+ gl_FragColor = lumaB < lumaMin || lumaB > lumaMax ? rgbA : rgbB;
+}`,te=`precision highp float;
+uniform sampler2D screenTexture;
+uniform vec2 resolution;
+void main() {
+ vec2 uv = gl_FragCoord.xy / resolution;
+ float edgeThreshold = 0.2;
+ vec2 offset = vec2(1.0) / resolution;
+ vec3 colorCenter = texture2D(screenTexture, uv).rgb;
+ vec3 colorLeft = texture2D(screenTexture, uv - vec2(offset.x, 0.0)).rgb;
+ vec3 colorRight = texture2D(screenTexture, uv + vec2(offset.x, 0.0)).rgb;
+ vec3 colorUp = texture2D(screenTexture, uv - vec2(0.0, offset.y)).rgb;
+ vec3 colorDown = texture2D(screenTexture, uv + vec2(0.0, offset.y)).rgb;
+ float diffHorizontal = length(colorRight - colorLeft);
+ float diffVertical = length(colorUp - colorDown);
+ float edgeFactor = step(edgeThreshold, diffHorizontal + diffVertical);
+ vec3 outlineColor = mix(colorCenter, vec3(0.0), edgeFactor);
+ gl_FragColor = vec4(outlineColor, 1.0);
+}`,ne=`precision highp float;
+#define CA_AMOUNT 1.0025
+#define SCANLINE_INTENSITY_X 0.125
+#define SCANLINE_INTENSITY_Y 0.375
+#define SCANLINE_SIZE 1024.0
+uniform sampler2D screenTexture;
+varying vec2 vUV;
+void main() {
+ vec4 finalColor = texture2D(screenTexture, vUV);
+ finalColor.rgb = vec3(
+ texture2D(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r,
+ finalColor.g,
+ texture2D(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b
+ );
+ float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X);
+ float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y);
+ gl_FragColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a);
+}`,ie=`precision highp float;
+#define PI 3.14159265
+#define SCANLINE_INTENSITY 0.35
+#define CHROMA_OFFSET 0.005
+#define BLUR_RADIUS 0.002
+#define WARP_AMOUNT 0.01
+#define SCANLINE_DARKEN 0.5
+uniform sampler2D screenTexture;
+uniform int FrameCount;
+uniform vec2 TextureSize;
+uniform vec2 resolution;
+varying vec2 vUV;
+const mat3 yiq_mat = mat3(
+ 0.299, 0.587, 0.114,
+ 0.596, -0.275, -0.321,
+ 0.212, -0.523, 0.311
+);
+const mat3 yiq2rgb_mat = mat3(
+ 1.0, 0.956, 0.621,
+ 1.0, -0.272, -0.647,
+ 1.0, -1.106, 1.705
+);
+vec3 applyNTSC(vec2 uv) {
+ vec3 col = texture2D(screenTexture, uv).rgb;
+ vec3 yiq = col * yiq_mat;
+ float chromaPhase = PI * (mod(uv.y * TextureSize.y, 2.0) + float(FrameCount));
+ yiq.y *= cos(chromaPhase * 0.5);
+ yiq.z *= sin(chromaPhase * 0.5);
+ vec3 rgb = yiq * yiq2rgb_mat;
+ vec3 finalColor;
+ finalColor.r = texture2D(screenTexture, uv + vec2(CHROMA_OFFSET, 0.0)).r;
+ finalColor.g = texture2D(screenTexture, uv + vec2(0.0, BLUR_RADIUS)).g;
+ finalColor.b = texture2D(screenTexture, uv - vec2(CHROMA_OFFSET, 0.0)).b;
+ return finalColor;
+}
+vec3 applyScanlines(vec2 uv) {
+ vec3 col = texture2D(screenTexture, uv).rgb;
+ float scanline = abs(sin(uv.y * resolution.y * 2.0)) * SCANLINE_INTENSITY;
+ col *= 1.0 - (scanline * SCANLINE_DARKEN);
+ return col;
+}
+vec2 applyWarp(vec2 uv) {
+ uv = uv * 2.0 - 1.0;
+ float r = sqrt(uv.x * uv.x + uv.y * uv.y);
+ uv += uv * (r * r) * WARP_AMOUNT;
+ return uv * 0.5 + 0.5;
+}
+void main() {
+ vec2 warpedUV = applyWarp(vUV);
+ vec3 ntscColor = applyNTSC(warpedUV);
+ vec3 scanlineColor = applyScanlines(warpedUV);
+ vec3 finalColor = mix(ntscColor, scanlineColor, 0.7);
+ gl_FragColor = vec4(finalColor, 1.0);
+}`,H=class{constructor(e,t){this.video=e;this.effects=t;this.canvas=document.createElement("canvas"),Object.assign(this.canvas.style,{position:"absolute",inset:"0",width:"100%",height:"100%",objectFit:"contain",zIndex:"1"}),e.parentElement?.appendChild(this.canvas);let n=this.canvas.getContext("webgl2",{alpha:!1,antialias:!1,depth:!1,desynchronized:!0,powerPreference:"high-performance"});if(n===null)throw new Error("WebGL2 unavailable");this.gl=n;let i=n.createBuffer();n.bindBuffer(n.ARRAY_BUFFER,i),n.bufferData(n.ARRAY_BUFFER,new Float32Array([-1,-1,3,-1,-1,3]),n.STATIC_DRAW),this.passes.set("base",this.compile(J,Z,["screenTexture","resolution","filterId","sharpenFactor","brightness","contrast","gamma","saturation","deband"])),this.videoTexture=this.texture(),this.schedule()}canvas;gl;passes=new Map;videoTexture;targets=[];width=0;height=0;frame=0;lastDraw=0;stopped=!1;idle=!1;pending=!1;update(e){this.effects=e}pause(){this.idle||this.stopped||(this.idle=!0,this.canvas.style.display="none")}resume(e){this.effects=e,!(!this.idle||this.stopped)&&(this.idle=!1,this.canvas.style.display="",this.schedule())}schedule(){this.pending||(this.pending=!0,this.video.requestVideoFrameCallback(this.onFrame))}compile(e,t,n){let i=this.gl,a=(o,d)=>{let u=i.createShader(o);if(i.shaderSource(u,d),i.compileShader(u),!i.getShaderParameter(u,i.COMPILE_STATUS))throw new Error(`shader: ${i.getShaderInfoLog(u)}`);return u},s=i.createProgram();if(i.attachShader(s,a(i.VERTEX_SHADER,e)),i.attachShader(s,a(i.FRAGMENT_SHADER,t)),i.bindAttribLocation(s,0,"position"),i.linkProgram(s),!i.getProgramParameter(s,i.LINK_STATUS))throw new Error(`program: ${i.getProgramInfoLog(s)}`);return{program:s,uniforms:new Map(n.map(o=>[o,i.getUniformLocation(s,o)]))}}extra(e){let t=this.passes.get(e);if(t===void 0){let n={fxaa:ee,toon:te,crt:ne,ntsc:ie}[e];t=this.compile(j,n,["screenTexture","resolution","TextureSize","FrameCount"]),this.passes.set(e,t)}return t}texture(){let e=this.gl,t=e.createTexture();return e.bindTexture(e.TEXTURE_2D,t),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MIN_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MAG_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_S,e.CLAMP_TO_EDGE),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_T,e.CLAMP_TO_EDGE),t}resize(e,t){let n=this.gl;this.width=e,this.height=t,this.canvas.width=e,this.canvas.height=t;for(let i of this.targets)n.deleteFramebuffer(i.framebuffer),n.deleteTexture(i.texture);this.targets=[0,1].map(()=>{let i=this.texture();n.texImage2D(n.TEXTURE_2D,0,n.RGBA,e,t,0,n.RGBA,n.UNSIGNED_BYTE,null);let a=n.createFramebuffer();return n.bindFramebuffer(n.FRAMEBUFFER,a),n.framebufferTexture2D(n.FRAMEBUFFER,n.COLOR_ATTACHMENT0,n.TEXTURE_2D,i,0),{framebuffer:a,texture:i}}),n.bindFramebuffer(n.FRAMEBUFFER,null)}onFrame=e=>{if(this.pending=!1,this.stopped||this.idle)return;this.schedule();let t=this.effects.maxFps;if(!(t>0&&e-this.lastDraw<1e3/t-2)){this.lastDraw=e;try{this.draw()}catch(n){window.DDCloud?.log(`effects: ${String(n).slice(0,200)}`),this.destroy()}}};draw(){let e=this.gl,t=this.effects,n=this.video.videoWidth,i=this.video.videoHeight;if(n===0||i===0)return;(n!==this.width||i!==this.height)&&this.resize(n,i),this.frame++,e.activeTexture(e.TEXTURE0),e.bindTexture(e.TEXTURE_2D,this.videoTexture),e.pixelStorei(e.UNPACK_FLIP_Y_WEBGL,!0),e.texImage2D(e.TEXTURE_2D,0,e.RGBA,e.RGBA,e.UNSIGNED_BYTE,this.video);let a=["fxaa","toon","crt","ntsc"].filter(d=>t[d]);e.viewport(0,0,n,i),e.enableVertexAttribArray(0),e.vertexAttribPointer(0,2,e.FLOAT,!1,0,0);let s=this.passes.get("base");e.bindFramebuffer(e.FRAMEBUFFER,a.length>0?this.targets[0].framebuffer:null),e.useProgram(s.program);let o=s.uniforms;e.uniform1i(o.get("screenTexture"),0),e.uniform2f(o.get("resolution"),n,i),e.uniform1i(o.get("filterId"),t.sharpenMode==="usm"?1:2),e.uniform1f(o.get("sharpenFactor"),t.sharpen),e.uniform1f(o.get("brightness"),t.brightness/100),e.uniform1f(o.get("contrast"),t.contrast/100),e.uniform1f(o.get("gamma"),Math.min(5,Math.max(.1,t.gamma))),e.uniform1f(o.get("saturation"),t.saturation/100),e.uniform1f(o.get("deband"),t.deband),e.drawArrays(e.TRIANGLES,0,3),a.forEach((d,u)=>{let h=this.extra(d),g=this.targets[u%2],p=u===a.length-1;e.bindFramebuffer(e.FRAMEBUFFER,p?null:this.targets[(u+1)%2].framebuffer),e.useProgram(h.program),e.bindTexture(e.TEXTURE_2D,g.texture);let c=h.uniforms;e.uniform1i(c.get("screenTexture")??null,0),e.uniform2f(c.get("resolution")??null,n,i),e.uniform2f(c.get("TextureSize")??null,n,i),e.uniform1i(c.get("FrameCount")??null,this.frame),e.drawArrays(e.TRIANGLES,0,3)})}destroy(){this.stopped=!0,this.canvas.remove(),this.gl.getExtension("WEBGL_lose_context")?.loseContext()}};var V=class{constructor(e){this.pc=e;this.element=document.createElement("div"),Object.assign(this.element.style,{position:"absolute",top:"8px",right:"8px",zIndex:"3",padding:"4px 8px",borderRadius:"6px",background:"rgba(0,0,0,0.55)",color:"#e8e8e8",font:"12px monospace",lineHeight:"16px",pointerEvents:"none",display:"none",whiteSpace:"pre",textAlign:"right"}),document.body.appendChild(this.element)}element;timer;level=0;vertical=!1;left=!1;server="";last={bytes:0,time:0,decode:0,frames:0,lost:0,received:0};show(e,t,n,i=!1){this.level=e,this.vertical=t,this.server=n,this.left=i,Object.assign(this.element.style,i?{left:"8px",right:"",textAlign:"left"}:{left:"",right:"8px",textAlign:"right"}),this.element.style.display=e>0?"block":"none",e>0&&this.timer===void 0&&(this.timer=setInterval(()=>this.update(),1e3),this.update()),e===0&&this.timer!==void 0&&(clearInterval(this.timer),this.timer=void 0)}async update(){let e=await this.pc.getStats(),t,n,i=new Map;if(e.forEach(c=>{c.type==="inbound-rtp"&&c.kind==="video"?t=c:c.type==="candidate-pair"&&c.state==="succeeded"&&c.nominated?n=c:c.type==="codec"&&i.set(c.id,c)}),t===void 0)return;let a=this.last.time>0?(t.timestamp-this.last.time)/1e3:0,s=a>0?(t.bytesReceived-this.last.bytes)*8/a/1e6:0,o=(t.framesDecoded??0)-this.last.frames,d=o>0?((t.totalDecodeTime??0)-this.last.decode)*1e3/o:0,u=(t.packetsLost??0)-this.last.lost,h=(t.packetsReceived??0)-this.last.received,g=u+h>0?u*100/(u+h):0;this.last={bytes:t.bytesReceived,time:t.timestamp,decode:t.totalDecodeTime??0,frames:t.framesDecoded??0,lost:t.packetsLost??0,received:t.packetsReceived??0};let p=["web",`${Math.round(t.framesPerSecond??0)} fps`];if(this.level>=2&&(n?.currentRoundTripTime!==void 0&&p.push(`ping ${Math.round(n.currentRoundTripTime*1e3)} ms`),p.push(`${t.frameWidth??"?"}x${t.frameHeight??"?"}`)),this.level>=3&&p.push(`${s.toFixed(1)} Mb/s`,`decode ${d.toFixed(1)} ms`,`loss ${g.toFixed(1)}%`),this.level>=4){let c=i.get(t.codecId);c&&p.push(String(c.mimeType??"").replace("video/","")),p.push(`jitter ${Math.round((t.jitter??0)*1e3)} ms`,`dropped ${t.framesDropped??0}`),this.server&&p.push(this.server)}this.element.textContent=p.join(this.vertical?`
+`:" \xB7 ")}destroy(){this.show(0,this.vertical,this.server,this.left),this.element.remove()}};function z(r,e){let t=e==="high"?"4d":e==="low"?"420":"42e",n=[];for(let d of r.matchAll(/a=fmtp:(\d+).*profile-level-id=([0-9a-f]{6})/g))d[2].startsWith(t)&&n.push(d[1]);if(n.length===0)return r;let i=r.split(`\r
+`),a=i.findIndex(d=>d.startsWith("m=video"));if(a<0)return r;let s=i[a].trim().split(" "),o=s.slice(3).filter(d=>!n.includes(d));return i[a]=s.slice(0,3).concat(n,o).join(" "),i.join(`\r
+`)}function K(r,e){let t=r.split(`\r
+`),n=t.findIndex(a=>a.startsWith("m=video"));if(n<0)return r;let i=`b=AS:${e}`;for(let a=n+1;a<=t.length;a++){let s=t[a];if(s===void 0||s.startsWith("m=")){t.splice(a,0,i);break}if(!(s.startsWith("i=")||s.startsWith("c="))){if(s.startsWith("b=AS:")){t[a]=i;break}t.splice(a,0,i);break}}return t.join(`\r
+`)}var m=JSON.parse(DDCloud.settings()),ae=RTCPeerConnection.prototype.setLocalDescription;RTCPeerConnection.prototype.setLocalDescription=function(r){return r?.sdp&&((m.codec==="high"||m.codec==="normal"||m.codec==="low")&&(r.sdp=z(r.sdp,m.codec)),m.bitrateMbps>0&&(r.sdp=K(r.sdp,m.bitrateMbps*1e3))),ae.call(this,r)};window.__ddRumble=m.rumble/100;window.addEventListener("error",r=>DDCloud.log(`error: ${r.message} @${r.lineno}`));window.addEventListener("unhandledrejection",r=>DDCloud.log(`rejection: ${String(r.reason).slice(0,200)}`));window.addEventListener("gamepadconnected",r=>DDCloud.log(`controller: ${r.gamepad.id.slice(0,60)} mapping=${r.gamepad.mapping||"none"} buttons=${r.gamepad.buttons.length} axes=${r.gamepad.axes.length}`));var W=new Map,re=1;window.__ddResolve=(r,e,t)=>{let n=W.get(r);W.delete(r),n&&n({status:e,body:t})};function C(r,e=""){return new Promise(t=>{let n=re++;W.set(n,t),DDCloud.call(n,r,typeof e=="string"?e:JSON.stringify(e))})}var B=r=>new Promise(e=>setTimeout(e,r)),se=r=>r.status>=200&&r.status<300;function x(r){let e=document.getElementById("status");e&&(e.textContent=r),DDCloud.status(r)}var T=class extends Error{constructor(t,n){super(t);this.stage=t;this.detail=n}};function k(r,e){if(!se(e))throw new T(r,`${e.status} ${e.body.slice(0,300)}`);return e}function oe(r,e){return new Promise(t=>{if(r.iceGatheringState==="complete")return t();let n=setTimeout(t,e);r.addEventListener("icegatheringstatechange",()=>{r.iceGatheringState==="complete"&&(clearTimeout(n),t())})})}async function de(){x("Starting the game on Xbox Cloud Gaming\u2026"),k("start",await C("start"));let r=!1,e=0;for(;;){let l=k("state",await C("state")),f=JSON.parse(l.body||"{}");if(f.state==="Provisioned")break;if(f.state==="Failed")throw new T("provision",JSON.stringify(f.errorDetails??{}).slice(0,300));f.state==="ReadyToConnect"&&!r?(r=!0,x("Signing in to the cloud console\u2026"),k("connect",await C("connect"))):f.state==="WaitingForResources"?x(`In the queue for a cloud console\u2026 ${Math.round(e/1e3)} s`):x(`Getting a cloud console ready\u2026 ${Math.round(e/1e3)} s`),await B(1e3),e+=1e3}x("Connecting\u2026");let t=new U("player");t.init();let n=t._peerConnection,i=t._channels.input,a=i.queueMetadataFrame.bind(i);i.queueMetadataFrame=l=>{if(m.preventDrops){let f=l.frameRenderedTimeMs-l.frameDecodedTimeMs;l.frameDecodedTimeMs=l.frameSubmittedTimeMs+10,l.frameRenderedTimeMs=l.frameDecodedTimeMs+f}a(l)};let s,o,d=()=>{if(!(o===void 0||s===void 0&&m.volume===100)){if(s===void 0){let l=new AudioContext;s=l.createGain(),l.createMediaStreamSource(o).connect(s).connect(l.destination);let f=document.querySelector("#player audio");f&&(f.muted=!0)}s.gain.value=m.volume/100}};n.addEventListener("track",l=>{l.track.kind==="audio"&&(o=l.streams[0],d())});let u=new V(n),h,g=()=>{let l=t.getVideoElement();if(l!==void 0){if(!X(m)){h?.pause();return}if(h===void 0)try{h=new H(l,m)}catch(f){DDCloud.log(`effects unavailable: ${String(f).slice(0,200)}`)}else h.resume(m)}};window.__ddApply=l=>{m=JSON.parse(l),window.__ddRumble=m.rumble/100,u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),d(),g()},n.addEventListener("connectionstatechange",()=>{n.connectionState==="connected"?(x(""),DDCloud.playing(),u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),setTimeout(g,500)):n.connectionState==="failed"?DDCloud.failed("webrtc","connection failed"):n.connectionState==="disconnected"&&x("Connection lost\u2026")});let p=await t.createOffer(),c=k("sdp",await C("sdp",p.sdp??"")),O=JSON.parse(JSON.parse(c.body).exchangeResponse);if(O.status&&O.status!=="success")throw new T("sdp-answer",JSON.stringify(O).slice(0,300));await t.setRemoteSDP(O.sdp),await oe(n,3e3);let Y=(await t.getICECandidates()).map(l=>JSON.stringify({candidate:l.candidate,sdpMid:l.sdpMid,sdpMLineIndex:l.sdpMLineIndex,usernameFragment:l.usernameFragment})),$=k("ice",await C("ice",Y));t.setRemoteIceCandidates(JSON.parse(JSON.parse($.body).exchangeResponse));let q=Date.now();for(;!t._channels.message._handshakeCompleted&&Date.now()-q<2e4;)await B(100);DDCloud.log(`handshake ${t._channels.message._handshakeCompleted?"done":"missing"} after ${Date.now()-q} ms`),await B(300);let b=new v(0,{enable_keyboard:!1});b.attach(t),DDCloud.log(`controllers at attach: ${Array.from(navigator.getGamepads()).filter(Boolean).length}`),window.__ddNexus=()=>{b.sendButtonState("Nexus",1),setTimeout(()=>b.sendButtonState("Nexus",0),200)},window.__ddButton=(l,f)=>b.sendButtonState(l,f),window.__ddInput=l=>{l?b.onWindowFocus():b.onWindowBlur()},setInterval(()=>{C("keepalive")},3e4),window.__ddStop=()=>{try{h?.destroy(),u.destroy(),b.detach(),t.destroy()}catch{}}}de().catch(r=>{r instanceof T?DDCloud.failed(r.stage,r.detail):DDCloud.failed("page",String(r).slice(0,300))});})();
diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt
index 33585818ba..c2bfc86434 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
@@ -94,4 +95,5 @@ target_link_libraries(droiddeckwayland
dl
log
android
+ nativewindow
)
diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c
index 95a8bf83a6..562a83a750 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"
@@ -808,10 +809,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) {
@@ -1841,7 +1846,121 @@ static void hdr_count_copied(const struct draw_list *dl, const char *reason) {
}
}
+/*
+ * Stream mode (the Xbox Cloud Gaming native player, in its own process): no Wayland clients, the scene is one
+ * picture handed over as AHardwareBuffers (ImageReader images of the decoded video). Each buffer is imported once
+ * and kept while the reader cycles through its few buffers; the newest frame is the scene, so the screen effects
+ * and frame generation apply to it as to a game.
+ */
+#define STREAM_SLOTS 6
+static pthread_mutex_t g_stream_lock = PTHREAD_MUTEX_INITIALIZER;
+static atomic_int g_stream_on;
+static AHardwareBuffer *g_stream_pending;
+static struct { AHardwareBuffer *ahb; struct vkp_image *img; uint64_t used; } g_stream_slots[STREAM_SLOTS];
+static struct vkp_image *g_stream_img;
+static uint64_t g_stream_seq;
+static atomic_uint g_stream_frames;
+
+static void stream_forget_all(void) {
+ vkp_wait_idle();
+ for (int i = 0; i < STREAM_SLOTS; i++) {
+ if (g_stream_slots[i].img) vkp_image_destroy(g_stream_slots[i].img);
+ if (g_stream_slots[i].ahb) AHardwareBuffer_release(g_stream_slots[i].ahb);
+ g_stream_slots[i].img = NULL; g_stream_slots[i].ahb = NULL; g_stream_slots[i].used = 0;
+ }
+ g_stream_img = NULL;
+}
+
+/* Compositor thread: the newest handed-over buffer becomes the scene picture. */
+static void stream_take(void) {
+ pthread_mutex_lock(&g_stream_lock);
+ AHardwareBuffer *ahb = g_stream_pending;
+ g_stream_pending = NULL;
+ pthread_mutex_unlock(&g_stream_lock);
+ if (!ahb) return;
+ if (!atomic_load(&g_stream_on)) { AHardwareBuffer_release(ahb); return; }
+ int slot = -1, oldest = 0;
+ for (int i = 0; i < STREAM_SLOTS; i++) {
+ if (g_stream_slots[i].ahb == ahb) { slot = i; break; }
+ if (g_stream_slots[i].used < g_stream_slots[oldest].used) oldest = i;
+ }
+ if (slot >= 0) {
+ AHardwareBuffer_release(ahb); /* the slot keeps its own reference */
+ } else {
+ struct vkp_image *img = vkp_image_from_ahb(ahb);
+ if (!img) {
+ static int said;
+ if (!said) { said = 1; droiddeck_log("stream", "a decoded frame could not be imported: nothing to show"); }
+ AHardwareBuffer_release(ahb);
+ return;
+ }
+ droiddeck_log("stream", "decoded frame buffer imported (%dx%d)", vkp_image_width(img), vkp_image_height(img));
+ slot = oldest;
+ if (g_stream_slots[slot].img) {
+ vkp_wait_idle(); /* the GPU may still read the picture being replaced */
+ if (g_stream_img == g_stream_slots[slot].img) g_stream_img = NULL;
+ vkp_image_destroy(g_stream_slots[slot].img);
+ }
+ if (g_stream_slots[slot].ahb) AHardwareBuffer_release(g_stream_slots[slot].ahb);
+ g_stream_slots[slot].ahb = ahb;
+ g_stream_slots[slot].img = img;
+ }
+ g_stream_slots[slot].used = ++g_stream_seq;
+ g_stream_img = g_stream_slots[slot].img;
+ atomic_fetch_add(&g_stream_frames, 1);
+ schedule_render();
+}
+
+static void render_stream(void) {
+ g_dirty = 0;
+ struct vkp_image *img = g_stream_img;
+ if (!img) return;
+ int w = vkp_image_width(img), h = vkp_image_height(img);
+ if (w != g_scene_w || h != g_scene_h) {
+ droiddeck_log("stream", "picture %dx%d", w, h);
+ g_scene_w = w;
+ g_scene_h = h;
+ }
+ struct vkp_draw d = {.img = img, .sx = 0, .sy = 0, .sw = (float)w, .sh = (float)h, .dx = 0, .dy = 0, .dw = w, .dh = h, .blend = 0};
+ vkp_apply_window_request();
+ sc_layer_hide();
+ int r = vkp_render(w, h, &d, 1);
+ if (r == 0) {
+ g_stat_frames++;
+ static int first;
+ if (!first) { first = 1; droiddeck_log("stream", "first stream frame presented"); }
+ } else {
+ static int failed;
+ if (failed++ % 600 == 0) droiddeck_log("stream", "presenting a stream frame failed (%d, %d times)", r, failed);
+ }
+}
+
+void droiddeck_stream_set(int on) {
+ atomic_store(&g_stream_on, on ? 1 : 0);
+ if (g_input_pipe[1] < 0) return;
+ struct input_msg m = { 21, on ? 1 : 0, 0, 0, 0 };
+ ssize_t n = write(g_input_pipe[1], &m, sizeof(m));
+ (void)n;
+}
+
+/* Any thread: hands over one decoded frame (acquires its own reference). */
+void droiddeck_stream_frame(AHardwareBuffer *ahb) {
+ if (!ahb || !atomic_load(&g_stream_on) || g_input_pipe[1] < 0) return;
+ AHardwareBuffer_acquire(ahb);
+ pthread_mutex_lock(&g_stream_lock);
+ AHardwareBuffer *dropped = g_stream_pending;
+ g_stream_pending = ahb;
+ pthread_mutex_unlock(&g_stream_lock);
+ if (dropped) { AHardwareBuffer_release(dropped); return; } /* a wake-up is already queued */
+ struct input_msg m = { 20, 0, 0, 0, 0 };
+ ssize_t n = write(g_input_pipe[1], &m, sizeof(m));
+ (void)n;
+}
+
+unsigned droiddeck_stream_frames(void) { return atomic_load(&g_stream_frames); }
+
static void render_scene(void) {
+ if (atomic_load(&g_stream_on)) { render_stream(); return; }
struct draw_list dl = {0};
struct surface *s;
int w, h;
@@ -3001,6 +3120,8 @@ static int on_input_readable(int fd, uint32_t mask, void *data) {
break;
case 10: break;
case 11: axis_event(m.p1, m.p2); break;
+ case 20: stream_take(); break;
+ case 21: if (!m.p1) stream_forget_all(); schedule_render(); break;
default: deliver_pointer(&m); break;
}
}
diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c
index 94bb581a02..9de2824d78 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,17 +362,25 @@ 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;
}
+ /* The ring and the engine's images are new on this frame. Dispatching into them now
+ * null-dereferenced Turnip (vkp_framegen_run, first Steam frame, 2560x1440 to the panel).
+ * Show this frame as it is; generation starts once the size has settled. */
+ 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. */
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 0000000000..0f8e1f61bf
--- /dev/null
+++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c
@@ -0,0 +1,170 @@
+#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;
+ // A3xx/A4xx use type-3 CP_NOP; newer cores use type-7 with zero odd-parity bits.
+ 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;
+ }
+ // Constraints expire after idle_timer (normally 80 ms); renew with a NOP, keeping devfreq alive.
+ 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 0000000000..5fe17d102e
--- /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/vk_loader.h b/app/src/main/cpp/waylandcomp/src/vk_loader.h
index e10950d0d1..54cb888816 100644
--- a/app/src/main/cpp/waylandcomp/src/vk_loader.h
+++ b/app/src/main/cpp/waylandcomp/src/vk_loader.h
@@ -21,7 +21,7 @@
X(BindImageMemory) X(DestroyImage) X(FreeMemory) X(AcquireNextImageKHR) \
X(ResetCommandBuffer) X(BeginCommandBuffer) X(CmdPipelineBarrier) X(CmdBlitImage) \
X(EndCommandBuffer) X(ResetFences) X(QueueSubmit) X(QueuePresentKHR) X(WaitForFences) \
- X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) \
+ X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) X(GetAndroidHardwareBufferPropertiesANDROID) \
X(GetImageSubresourceLayout) X(MapMemory) X(UnmapMemory) X(CmdClearColorImage) \
\
X(CreateShaderModule) X(DestroyShaderModule) X(CreatePipelineLayout) X(DestroyPipelineLayout) \
diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c
index 96d0b415d3..c917afbbab 100644
--- a/app/src/main/cpp/waylandcomp/src/vk_present.c
+++ b/app/src/main/cpp/waylandcomp/src/vk_present.c
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#define TAG "DroidDeckWayland"
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
@@ -39,6 +40,7 @@ struct vkp_image {
};
static ANativeWindow *g_window;
+static int g_ahb_import;
static char *g_driver_path, *g_library_name, *g_native_lib_dir;
static int g_dev_state;
static VkInstance g_inst;
@@ -459,17 +461,19 @@ static int dev_init(void) {
}
g_vk.GetPhysicalDeviceMemoryProperties(g_pd, &g_memprops);
- const char *dev_exts[7] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME, "VK_KHR_external_memory_fd",
- "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier",
- "VK_KHR_image_format_list", NULL, NULL};
- uint32_t n_dev_exts = 5;
+ static const char *const import_exts[4] = {"VK_KHR_external_memory_fd", "VK_EXT_external_memory_dma_buf",
+ "VK_EXT_image_drm_format_modifier", "VK_KHR_image_format_list"};
+ const char *dev_exts[9] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME};
+ uint32_t n_dev_exts = 1;
uint32_t ne = 0;
g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, NULL);
VkExtensionProperties *exts = calloc(ne ? ne : 1, sizeof(*exts));
g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, exts);
- for (unsigned i = 0; i < 5; i++)
- if (!has_ext(exts, ne, dev_exts[i]))
- LOGE("present: driver MISSING %s (dmabuf import will fail)", dev_exts[i]);
+ /* Only what the driver has: the system driver lacks the dma-buf ones, which the cloud player never needs. */
+ for (unsigned i = 0; i < 4; i++) {
+ if (has_ext(exts, ne, import_exts[i])) dev_exts[n_dev_exts++] = import_exts[i];
+ else LOGE("present: driver MISSING %s (dmabuf import will fail)", import_exts[i]);
+ }
int want_hdr_md = 0;
if (droiddeck_color_requested()) {
want_hdr_md = has_ext(exts, ne, VK_EXT_HDR_METADATA_EXTENSION_NAME);
@@ -477,6 +481,13 @@ static int dev_init(void) {
}
const int want_sem_fd = has_ext(exts, ne, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
if (want_sem_fd) dev_exts[n_dev_exts++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME;
+ /* The cloud player's decoded frames arrive as AHardwareBuffers (vkp_image_from_ahb). */
+ g_ahb_import = has_ext(exts, ne, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME) &&
+ has_ext(exts, ne, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME);
+ if (g_ahb_import) {
+ dev_exts[n_dev_exts++] = VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME;
+ dev_exts[n_dev_exts++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
+ }
free(exts);
float prio = 1.0f;
@@ -987,6 +998,60 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t
return img;
}
+void vkp_wait_idle(void) {
+ if (g_dev && g_vk.DeviceWaitIdle) g_vk.DeviceWaitIdle(g_dev);
+}
+
+struct vkp_image *vkp_image_from_ahb(AHardwareBuffer *ahb) {
+ if (!ahb || dev_init() != 0) return NULL;
+ if (!g_ahb_import || !g_vk.GetAndroidHardwareBufferPropertiesANDROID) {
+ static int said;
+ if (!said) { said = 1; LOGE("ahb: the driver cannot import AHardwareBuffers (VK_ANDROID_external_memory_android_hardware_buffer)"); }
+ return NULL;
+ }
+ AHardwareBuffer_Desc desc;
+ AHardwareBuffer_describe(ahb, &desc);
+ VkAndroidHardwareBufferFormatPropertiesANDROID fp = {
+ .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID};
+ VkAndroidHardwareBufferPropertiesANDROID props = {
+ .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID, .pNext = &fp};
+ VkResult pr = g_vk.GetAndroidHardwareBufferPropertiesANDROID(g_dev, ahb, &props);
+ if (pr != VK_SUCCESS || fp.format == VK_FORMAT_UNDEFINED) {
+ LOGE("ahb: %ux%u format %u: properties %s, Vulkan format %d", desc.width, desc.height, desc.format,
+ vk_result_name(pr), (int)fp.format);
+ return NULL;
+ }
+ struct vkp_image *img = calloc(1, sizeof(*img));
+ if (!img) return NULL;
+ img->w = (int)desc.width; img->h = (int)desc.height; img->dmabuf = 1; img->fmt = fp.format; img->sampled = 1;
+ VkExternalMemoryImageCreateInfo ext = {
+ .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
+ .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID};
+ VkImageCreateInfo ici = {
+ .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &ext,
+ .imageType = VK_IMAGE_TYPE_2D, .format = fp.format, .extent = {desc.width, desc.height, 1},
+ .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, .tiling = VK_IMAGE_TILING_OPTIMAL,
+ .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+ .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED};
+ VkResult cr = g_vk.CreateImage(g_dev, &ici, NULL, &img->image);
+ if (cr != VK_SUCCESS) { LOGE("ahb: vkCreateImage %ux%u -> %s", desc.width, desc.height, vk_result_name(cr)); free(img); return NULL; }
+ int idx = -1;
+ for (int i = 0; i < 32; i++) if (props.memoryTypeBits & (1u << i)) { idx = i; break; }
+ VkImportAndroidHardwareBufferInfoANDROID imp = {
+ .sType = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, .buffer = ahb};
+ VkMemoryDedicatedAllocateInfo ded = {.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
+ .pNext = &imp, .image = img->image};
+ VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = &ded,
+ .allocationSize = props.allocationSize, .memoryTypeIndex = (uint32_t)(idx < 0 ? 0 : idx)};
+ VkResult mr = idx < 0 ? VK_ERROR_FEATURE_NOT_PRESENT : g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem);
+ if (mr != VK_SUCCESS || g_vk.BindImageMemory(g_dev, img->image, img->mem, 0) != VK_SUCCESS) {
+ LOGE("ahb: importing %ux%u -> %s", desc.width, desc.height, vk_result_name(mr));
+ if (img->mem) g_vk.FreeMemory(g_dev, img->mem, NULL);
+ g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL;
+ }
+ return img;
+}
+
static int shm_sampled(void) {
static int known;
if (!known) {
@@ -1626,6 +1691,10 @@ 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);
+ /* Frame generation samples every output pixel. Upscaling first made it interpolate
+ * the whole panel (3200x1440 on a 1440p phone) and rebuild on Steam's first frame.
+ * Grade at the game's size instead; the screen blit still scales to the panel. */
+ 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;
diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h
index 48d32ab4dc..7271f468b6 100644
--- a/app/src/main/cpp/waylandcomp/src/vk_present.h
+++ b/app/src/main/cpp/waylandcomp/src/vk_present.h
@@ -34,6 +34,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t
int vkp_image_is_dmabuf(const struct vkp_image *img);
struct vkp_image *vkp_image_create_shm(int w, int h);
+struct AHardwareBuffer;
+struct vkp_image *vkp_image_from_ahb(struct AHardwareBuffer *ahb);
+void vkp_wait_idle(void);
void vkp_image_upload_shm(struct vkp_image *img, const void *data, int stride);
int vkp_image_width(const struct vkp_image *img);
diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c
index 6a407088bb..16e42d1b5d 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);
@@ -26,6 +28,9 @@ extern int droiddeck_cursor_serial(void);
extern void droiddeck_wayland_send_key(int evdev, int state);
extern void droiddeck_wayland_send_scene_input(int type, int a, int b);
extern void droiddeck_wayland_vsync(int64_t frame_time_ns);
+extern void droiddeck_stream_set(int on);
+extern void droiddeck_stream_frame(AHardwareBuffer *ahb);
+extern unsigned droiddeck_stream_frames(void);
extern void droiddeck_wayland_output_resized(void);
extern void droiddeck_wayland_set_output_refresh_rate(int mhz);
extern volatile int g_fps_limit;
@@ -634,8 +639,14 @@ 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));
+ }
+ // Clear a legacy global pin when recovering its marker after an app upgrade or crash.
+ if (on != JNI_TRUE) adrenotools_set_turbo(false);
}
JNIEXPORT jint JNICALL
@@ -660,3 +671,21 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCardboardSpatialP
(*env)->GetFloatArrayRegion(env, pos, 0, 3, p);
vkp_cardboard_set_spatial_pose(m, p, live ? 1 : 0);
}
+
+/* The Xbox Cloud Gaming native player: its decoded frames are the whole scene (no Wayland clients). */
+JNIEXPORT void JNICALL
+Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamMode(JNIEnv *env, jclass clazz, jboolean on) {
+ droiddeck_stream_set(on ? 1 : 0);
+}
+
+JNIEXPORT void JNICALL
+Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrame(JNIEnv *env, jclass clazz, jobject hardwareBuffer) {
+ if (!hardwareBuffer) return;
+ AHardwareBuffer *ahb = AHardwareBuffer_fromHardwareBuffer(env, hardwareBuffer);
+ if (ahb) droiddeck_stream_frame(ahb);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrames(JNIEnv *env, jclass clazz) {
+ return (jint)droiddeck_stream_frames();
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt
index 3fc4383772..928d7caa8c 100644
--- a/app/src/main/java/com/droiddeck/launcher/App.kt
+++ b/app/src/main/java/com/droiddeck/launcher/App.kt
@@ -25,9 +25,19 @@ class App : Application() {
if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xbox")
return
}
+ if (process == "$packageName:xboxcloud") {
+ if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xboxcloud")
+ return
+ }
+ if (process == "$packageName:xcloudnative") {
+ // The native cloud player: the stores log and nothing that touches the Linux session.
+ com.droiddeck.launcher.stores.StoresState.init(this)
+ return
+ }
if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return
CrashHandler.install(this)
com.droiddeck.launcher.session.QuestExperimental.initialize(this)
+ 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)
diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt
index 7ccbba7f55..344aa7452a 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 2ca43f5024..3092aa187b 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -91,7 +91,7 @@ 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 && pkgStage == null && components.compBusy == null }
private var installed by mutableStateOf(null)
private var flood by mutableStateOf(null)
@@ -120,6 +120,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)
@@ -154,6 +155,7 @@ class FrontEndActivity : ComponentActivity() {
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,7 +163,7 @@ 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 launcherFullscreen by mutableStateOf(true)
private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO)
private var downloadMirror by mutableStateOf("")
@@ -170,7 +172,6 @@ class FrontEndActivity : ComponentActivity() {
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())
@@ -462,7 +463,13 @@ class FrontEndActivity : ComponentActivity() {
}
private fun launchFlooded(f: PendingFlood) {
- if (busy || LinuxRuntimeInstaller.isBusy()) { flood = null; floodProgress = 0f; return }
+ if (busy || LinuxRuntimeInstaller.isBusy() || protons.protonBusyId != null ||
+ ProtonExtras.installInProgress || pkgStage != null) {
+ flood = null
+ floodProgress = 0f
+ com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
+ 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)
@@ -546,12 +553,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)
@@ -562,6 +569,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({
@@ -575,7 +588,7 @@ 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())
@@ -584,7 +597,7 @@ class FrontEndActivity : ComponentActivity() {
SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
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
}
@@ -763,7 +776,6 @@ class FrontEndActivity : ComponentActivity() {
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)
@@ -827,7 +839,6 @@ class FrontEndActivity : ComponentActivity() {
launcherIcon = launcherIcon,
gameStoresEnabled = gameStoresEnabled,
gameStoresSpeedTier = gameStoresSpeedTier,
- storesOpenTab = storesOpenTab,
navigate = navRequest,
addedGamesArt = addedGamesArt,
sgdbUserKey = sgdbUserKey,
@@ -1002,7 +1013,6 @@ class FrontEndActivity : ComponentActivity() {
applyLauncherFullscreen()
},
onGameStoresSpeedTier = { tier -> SessionPrefs.setGameStoresSpeedTier(this, tier); gameStoresSpeedTier = tier },
- onStoresOpenTab = { tab -> SessionPrefs.setStoresOpenTab(this, tab); storesOpenTab = tab },
onNavigated = { navRequest = null },
onStoresShowMature = { show -> SessionPrefs.setStoresShowMature(this, show); storesShowMature = show },
onStoresSort = { sort -> SessionPrefs.setStoresSort(this, sort); storesSort = sort },
@@ -1513,6 +1523,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,
@@ -1638,6 +1649,7 @@ class FrontEndActivity : ComponentActivity() {
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,
@@ -1724,9 +1736,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)
@@ -1767,7 +1785,8 @@ class FrontEndActivity : ComponentActivity() {
fsyncFirst = fsyncFirst,
gamescopeRealtime = gamescopeRealtime,
gpuClockPin = gpuClockPin,
- prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, guestHostname = guestHostname, phantomWarning = phantomWarning,
+ 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 },
@@ -1781,6 +1800,7 @@ class FrontEndActivity : ComponentActivity() {
onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on },
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
@@ -1881,6 +1901,19 @@ class FrontEndActivity : ComponentActivity() {
private var pipAutoEnter by mutableStateOf(false)
private var unfoldedControls by mutableStateOf(false)
private var unfoldedControlsWithController by mutableStateOf(false)
+ private var shaderPrecacheGeneration = 0
+
+ private fun loadShaderPrecache(mode: String) {
+ val generation = ++shaderPrecacheGeneration
+ shaderPrecache = null
+ if (mode != SessionService.MODE_STEAM) return
+ Thread({
+ val precache = SessionPrefs.shaderPrecache(this)
+ ui.post {
+ if (!isDestroyed && generation == shaderPrecacheGeneration) shaderPrecache = precache
+ }
+ }, "shader-precache").start()
+ }
private fun loadModeSettings(mode: String) {
pipAutoEnter = SessionPrefs.pipAutoEnter(this)
@@ -1896,6 +1929,7 @@ 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()
@@ -1962,6 +1996,7 @@ class FrontEndActivity : ComponentActivity() {
gpuClockPin = SessionPrefs.gpuClockPin(this)
prootNoSeccomp = SessionPrefs.prootNoSeccomp(this)
prootFastPath = SessionPrefs.prootFastPath(this)
+ cursorComposite = SessionPrefs.cursorComposite(this)
guestHostname = SessionPrefs.guestHostname(this)
refreshPhantomStatus()
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt
index 5bd651cf5f..5e49b5cf5d 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,47 @@ 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) {
+internal class ProtonMenu(
+ private val activity: android.app.Activity,
+ private val ui: Handler,
+ private val idle: () -> Boolean = { true },
+) {
var protonRows by mutableStateOf>(emptyList())
var protonBusyId by mutableStateOf(null)
var protonStage by mutableStateOf(null)
var protonPercent by mutableIntStateOf(-1)
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
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 }
ui.post {
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()
}
@@ -64,7 +82,25 @@ 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
+ 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) ?: return@firstNotNullOfOrNull null
+ val previous = attempts.getLong("${tool.id}.at", 0L)
+ if (attempts.getString("${tool.id}.tag", null) != update || now - previous !in 0 until 15L * 60 * 1000) tool to update else null
+ } ?: return
+ attempts.edit().putString("${tool.id}.tag", update).putLong("${tool.id}.at", now).apply()
+ installProton(tool.id, automatic = true)
+ }
}
diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index fb3edbb4ac..f149d93565 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -329,6 +329,8 @@ 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 trackingRecovery by mutableStateOf(null)
private var glasses3dForVr = false
private var ended = false
@@ -823,6 +825,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
lossless = lossless,
oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy,
steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode,
+ micAvailable = SessionState.micAvailable && !SessionState.suspended,
+ micEnabled = SessionState.micEnabled,
+ onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) },
touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct),
fexPreset = fexPreset,
secondScreenMode = secondScreenMode,
@@ -1020,9 +1025,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
SessionAchievements(inFront.game, inFront.title, onClose = ::closeAchievements)
}
com.droiddeck.launcher.ui.AchievementNotificationOverlay()
- if (SessionState.suspended) SessionPausedOverlay(
+ // Auto and Native resume on their own as the session comes back; only a failed resume needs the button.
+ val autoResume = suspendPolicy == SessionPrefs.SUSPEND_AUTO || suspendPolicy == SessionPrefs.SUSPEND_NATIVE
+ SessionPausedOverlay(
+ suspended = SessionState.suspended && (!autoResume || SessionState.resumeFailed),
+ engaged = SessionState.resumeRequested || SessionState.resuming,
+ failures = SessionState.resumeFailures,
+ frame = pausedFrame,
title = pausedTitle(),
onResume = { SessionService.resume(this@SessionActivity) },
+ onFrameNeeded = ::requestPausedFrame,
+ onHidden = {
+ pausedFrame = null
+ pausedFrameWanted = false
+ },
)
if (leaving) com.droiddeck.launcher.ui.FloodSpread(
com.droiddeck.launcher.ui.LocalPalette.current.signal,
@@ -1718,7 +1734,7 @@ 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(),
)
@@ -1905,7 +1921,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")
@@ -1938,6 +1955,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
@@ -2885,6 +2903,50 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (down || code !in gestureKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0)
}
+ // The frozen game cannot draw again, so the paused overlay shows a copy taken while the surface still holds its frame.
+ private fun capturePausedFrame() {
+ if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return
+ if (SessionState.suspended && pausedFrame != null) return
+ if (suspendPolicy == SessionPrefs.SUSPEND_NEVER || !::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()
+ }
+ }
+
+ // Sessions that froze from picture-in-picture, or before onPause could copy a frame, have none; the
+ // compositor shows the frozen frame again once its output is back, so copy it from there.
+ 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
@@ -2995,6 +3057,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
@@ -3015,6 +3078,7 @@ 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 (intent?.action == SessionService.ACTION_RESUME) {
@@ -3040,6 +3104,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun onPause() {
if (runtimeRemovalBlocked) { super.onPause(); return }
+ capturePausedFrame()
sessionClipboard.stop()
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
if (::touchpad.isInitialized) touchpad.cancel()
@@ -3278,6 +3343,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
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) {
@@ -3512,17 +3580,33 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
return
}
- super.finish()
if (!closeAtOnce && intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) {
com.droiddeck.launcher.ui.QuitFlood.take()
com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
- startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
- }
+ closeLinkTasks()
+ if (!isTaskRoot) moveTaskToBack(true)
+ super.finishAndRemoveTask()
+ } else super.finish()
if (quitFlooded) overridePendingTransition(0, 0)
else overridePendingTransition(R.anim.session_hold, R.anim.session_sink)
}
+ private fun closeLinkTasks() {
+ val linkTask = intent.getIntExtra(EXTRA_LINK_TASK, -1)
+ if (linkTask == -1) return
+ val tasks = runCatching { getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty()
+ for (task in tasks) {
+ runCatching {
+ val info = task.taskInfo
+ @Suppress("DEPRECATION")
+ val id = if (android.os.Build.VERSION.SDK_INT >= 29) info.taskId else info.persistentId
+ val base = info.baseIntent
+ if (id == linkTask && base.component?.className == FrontEndActivity::class.java.name &&
+ com.droiddeck.launcher.frontend.GameLaunchIntent.accepts(base.action)) task.finishAndRemoveTask()
+ }
+ }
+ }
+
private fun completeLeave() {
if (isFinishing) return
val signal = com.droiddeck.launcher.ui.Themes.current(this).signal
@@ -3534,9 +3618,12 @@ 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 PAUSED_FRAME_MAX_EDGE = 1920f
+ private const val PAUSED_FRAME_REDRAW_MS = 150L
private const val TAG = "SessionActivity"
private var startedScreens = 0
@Volatile private var activeInstallWorker: Any? = null
diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java
index f1fa534927..f8f1b2a3e1 100644
--- a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java
+++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java
@@ -3,6 +3,7 @@ package com.droiddeck.launcher.audio;
import android.os.Process;
import android.util.Log;
+import com.droiddeck.launcher.core.FileUtils;
import com.droiddeck.launcher.core.SessionPart;
import com.droiddeck.launcher.core.HostProcess;
@@ -19,10 +20,13 @@ public class DirectAudioRelayComponent extends SessionPart {
private volatile int pid = -1;
private final Object micLock = new Object();
private boolean micHot;
+ private final File micControl;
+ public java.util.function.Consumer onMicEnabled;
public DirectAudioRelayComponent(File socketPath, File micFifoPath) {
this.socketPath = socketPath;
this.micFifoPath = micFifoPath;
+ this.micControl = micFifoPath == null ? null : new File(micFifoPath.getParentFile(), "mic-enabled");
}
public void setLogFile(File file) {
@@ -63,8 +67,13 @@ public class DirectAudioRelayComponent extends SessionPart {
StringBuilder command = new StringBuilder(binary.getAbsolutePath());
command.append(" --socket ").append(socketPath.getAbsolutePath());
command.append(" --log");
- if (micFifoPath != null) {
+ final boolean withMic = micFifoPath != null && setMicEnabled(true);
+ if (withMic) {
command.append(" --mic-fifo ").append(micFifoPath.getAbsolutePath());
+ command.append(" --mic-control ").append(micControl.getAbsolutePath());
+ } else if (micFifoPath != null) {
+ Log.w(TAG, "microphone control unavailable; starting with capture disabled");
+ command.append(" --mic-control /dev/null");
}
ArrayList env = new ArrayList<>();
env.add("HOME=" + app().getFilesDir());
@@ -73,7 +82,7 @@ public class DirectAudioRelayComponent extends SessionPart {
try {
out = new java.io.PrintWriter(new java.io.FileWriter(logFile, true));
out.println("== DirectAudio relay helper starting"
- + (micFifoPath != null ? " with the microphone" : " (no microphone)"));
+ + (withMic ? " with the microphone" : " (no microphone)"));
out.flush();
} catch (Exception e) {
Log.w(TAG, "could not open " + logFile, e);
@@ -84,14 +93,23 @@ public class DirectAudioRelayComponent extends SessionPart {
app().getFilesDir(), null,
line -> {
Log.i(TAG, line);
- trackMic(line);
+ if (withMic) trackMic(line);
if (log != null) synchronized (log) { log.println(line); log.flush(); }
});
Log.i(TAG, "started pid=" + pid + " socket=" + socketPath
- + (micFifoPath != null ? " mic=" + micFifoPath : " (no microphone)"));
+ + (withMic ? " mic=" + micFifoPath : " (no microphone)"));
+ }
+
+ public synchronized boolean setMicEnabled(boolean enabled) {
+ if (micControl == null) return false;
+ File next = new File(micControl.getPath() + ".new");
+ return FileUtils.writeString(next, enabled ? "1" : "0") && next.renameTo(micControl);
}
private void trackMic(String line) {
+ if (line.startsWith("DA-Relay: mic enabled=") && onMicEnabled != null) {
+ onMicEnabled.accept(line.equals("DA-Relay: mic enabled=1"));
+ }
boolean start = line.startsWith("DA-Relay: mic start ");
if (!start && !line.startsWith("DA-Relay: mic stop ")) return;
synchronized (micLock) {
diff --git a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt b/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt
deleted file mode 100644
index adaa106a02..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.droiddeck.launcher.core
-
-import com.droiddeck.launcher.gpu.GpuInfo
-import com.droiddeck.launcher.gpu.SocNames
-
-object CpuAllocationDefaults {
- data class Allocation(val client: String, val game: String)
-
- val device: Allocation? by lazy {
- forDevice(SocNames.model(), GpuInfo.systemProperty("ro.board.platform"),
- CpuCores.all.associateWith(CpuCores::maxGhz))
- }
-
- fun forDevice(model: String, platform: String, frequencies: Map): Allocation? {
- val chip = model.trim().uppercase().substringBefore('-')
- val gen2 = chip in setOf("SM8550", "QCS8550") ||
- (chip.isEmpty() && platform.trim().equals("kalama", ignoreCase = true))
- if (!gen2 || frequencies.size != 8 || frequencies.keys.any { it < 0 } ||
- frequencies.values.any { it == null || !it.isFinite() || it <= 0.0 }) return null
- val clusters = frequencies.entries.groupBy { it.value }.toSortedMap(compareBy { it ?: 0.0 }).values.toList()
- if (clusters.map { it.size } != listOf(3, 4, 1)) return null
- return Allocation(
- client = CpuCores.format(clusters[2].map { it.key }.toSet()),
- game = CpuCores.format(clusters[1].map { it.key }.toSet()),
- )
- }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
index 903851a5a9..058b07dd5d 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
@@ -152,13 +152,17 @@ object DeviceReport {
k("RAM total", FileUtils.sizeToString(mi.totalMem))
k("RAM available", FileUtils.sizeToString(mi.availMem))
}
- runCatching {
- val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) k("Thermal status", thermalStatusName(pm.currentThermalStatus))
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- k("Thermal headroom (10 s)", pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) })
+ val pm = runCatching { context.getSystemService(Context.POWER_SERVICE) as? PowerManager }.getOrNull()
+ if (pm != null) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ k("Thermal status", runCatching { thermalStatusName(pm.currentThermalStatus) }.getOrNull())
}
- k("Power saver", pm.isPowerSaveMode)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ k("Thermal headroom (10 s)", runCatching {
+ pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) }
+ }.getOrNull())
+ }
+ k("Power saver", runCatching { pm.isPowerSaveMode }.getOrNull())
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
val rate = runCatching { context.getSystemService(PerformanceHintManager::class.java)?.preferredUpdateRateNanos }.getOrNull()
@@ -200,7 +204,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),
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 27cb9dbcea..1425a78e7e 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
@@ -29,7 +29,7 @@ class FileManagerActivity : ComponentActivity() {
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/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
index 0843057f75..627761c2da 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
@@ -28,6 +28,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
@@ -90,12 +92,18 @@ 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 }
+
+internal fun canNavigateUp(currentDir: File, currentRoot: File): Boolean =
+ currentDir != currentRoot && currentDir.parentFile?.exists() == true
+
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun FileManagerScreen(
@@ -105,6 +113,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 +127,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 +150,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 +163,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,9 +192,10 @@ 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) }
fun loadDirectory(dir: File, resetScroll: Boolean = true) {
+ if (cancellingNavigation) return
currentDir = dir
if (pickMode) pickPrefs.edit().putString("lastFilePickerDir", dir.absolutePath).apply()
listingJob?.cancel()
@@ -205,25 +220,90 @@ 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 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) {
+ 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)
+ }
+ }
+ }) { Text(stringResource(R.string.fm_accept)) }
+ },
+ dismissButton = {
+ TextButton(onClick = { pendingNavigation = null }) {
+ Text(stringResource(R.string.fm_decline))
+ }
+ },
+ )
}
fun uniqueDestination(dir: File, name: String): File {
@@ -241,11 +321,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 +343,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 +352,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 +405,7 @@ fun FileManagerScreen(
isOperationRunning = false
operationDeterminate = false
- operationJob = null
+ if (operationJob === job) operationJob = null
clipboardFiles = emptyList()
isCutOperation = false
selectionMode = false
@@ -340,32 +423,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()
}
@@ -481,18 +570,20 @@ 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()
@@ -582,7 +673,7 @@ fun FileManagerScreen(
.background(MaterialTheme.colorScheme.surfaceContainer)
.padding(horizontal = 8.dp, vertical = 6.dp),
) {
- IconButton(onClick = { goUp() }, enabled = canGoUp) {
+ IconButton(onClick = { requestNavigation(FileManagerNavigation.BACK) }, enabled = canGoUp && !cancellingNavigation) {
Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary)
}
@@ -672,6 +763,13 @@ fun FileManagerScreen(
)
}
+ if (launchDir != null) {
+ IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation) {
+ 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(
@@ -747,6 +845,11 @@ fun FileManagerScreen(
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) {
+ Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant)
+ }
+ }
}
if (showSearch && !showFavorites) {
@@ -986,7 +1089,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.BACK) })
}
items(shownEntries, key = { it.absolutePath }) { file ->
val isFav = remember(file.absolutePath, favTick) {
@@ -1052,7 +1155,7 @@ fun FileManagerScreen(
} else
LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) {
if (canGoUp) item(key = "..") {
- ParentFolderRow(compact = compactRows, onTap = { goUp() })
+ ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) })
}
if (entries.isEmpty()) {
item {
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 29df5ff6d6..05d467ef51 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,12 @@ object FileOps {
return true
}
if (!copyWithProgress(src, dst, progress, isCancelled)) return false
- if (isCancelled()) return false
+ // Once the destination is committed, finish deleting the source.
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 +75,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 +130,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 +138,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 6fd89fa99f..498ec504e8 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
@@ -50,6 +50,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/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
index 5de835f6e1..340bc83ce0 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
@@ -274,7 +274,7 @@ 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)
@@ -283,7 +283,7 @@ object AddedGames {
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()) {
val path = canonical(sub)
if (listed.any { it == path || inside(path, it) || inside(it, path) }) { already++; continue }
onChecking(sub.name)
@@ -387,11 +387,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/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
index 91691cb1e7..05f3f98691 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
@@ -27,6 +27,7 @@ object Library {
const val ADDED = "added"
const val EPIC_LAUNCHER = "epic-launcher"
const val EPIC_LAUNCHER_NAME = "Epic Games 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 +47,14 @@ object Library {
1054830,
1070560,
1113280,
+ 1161040,
1245040,
1391110,
1420170,
1493710,
1580130,
1628350,
+ 1826330,
1887720,
2180100,
228980,
@@ -104,7 +107,10 @@ object Library {
.firstOrNull { it.isDirectory }
}
- fun steamGames(context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context)): List {
+ fun steamGames(
+ context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context),
+ withShared: Boolean = true,
+ ): List {
val root = SessionPrefs.steamRoot(context, arch)
val cache = File(root, "appcache/librarycache")
val libraries = steamLibraries(context, arch)
@@ -121,8 +127,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 +138,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")
@@ -210,13 +227,19 @@ object Library {
)
}
- internal fun steamCacheImage(cache: File, appId: Int, names: List): File? {
- val appDir = File(cache, appId.toString())
- val dirs = listOf(appDir) + appDir.listFiles()
- .orEmpty().filter { it.isDirectory }.sortedBy { it.name }
- return names.asSequence()
+ internal fun steamCacheImage(cache: File, appId: Int, names: List): File? =
+ SteamCacheImages(File(cache, appId.toString())).find(names)
+
+ internal class SteamCacheImages(appDir: File) {
+ private val entries = appDir.listFiles().orEmpty()
+ private val dirs = listOf(appDir) + entries.filter { it.isDirectory }.sortedBy { it.name }
+
+ fun find(names: List): File? = names.asSequence()
.flatMap { name -> dirs.asSequence().map { File(it, name) } }
.firstOrNull { it.isFile && it.length() > 0L }
+
+ fun icon(): File? = find(listOf("icon.jpg", "icon.png"))
+ ?: entries.firstOrNull { it.isFile && STEAM_ICON.matches(it.name) }
}
private class Spec(val id: String, val name: String, val system: String, val program: String, val folders: List, val exts: Set, val atPanel: Boolean = false)
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt
index 7562cc1ee0..63e8627790 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt
@@ -3,12 +3,13 @@ package com.droiddeck.launcher.frontend
import android.content.Context
import com.droiddeck.launcher.stores.Store
import com.droiddeck.launcher.stores.StoreGameSidecar
+import com.droiddeck.launcher.session.WinComponents
import org.json.JSONObject
import java.io.File
import java.util.Locale
object WinCompSources {
- enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER }
+ enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER, XBOX }
data class Finding(val component: String?, val original: String, val origin: Origin, val auto: Boolean, val args: List = emptyList())
@@ -49,6 +50,17 @@ object WinCompSources {
fun installer(path: String): List = if (UE_PREREQ.containsMatchIn(path)) listOf("vcredist2022", "d3dx9") else DependencyDetector.componentsFor(path)
+ private val XBOX_KNOWN = Regex("""> {
+ val config = folder?.listFiles().orEmpty().firstOrNull { it.isFile && it.name.equals("MicrosoftGame.config", ignoreCase = true) && it.length() < 1L shl 20 }
+ val declared = config?.let { file -> runCatching { XBOX_KNOWN.findAll(file.readText()).map { it.groupValues[1] }.toList() }.getOrNull() }.orEmpty()
+ return (listOf("VC14") + declared).flatMap { name -> XBOX_COMPONENTS[name].orEmpty().map { it to name } }.distinctBy { it.first }
+ }
+
fun steamDepots(ids: List): List> = ids.mapNotNull { SteamRedists.DEPOTS[it] }.distinctBy { it.first }
@@ -94,6 +106,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/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt
index 4282ecf6f3..3d493c6063 100644
--- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt
+++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt
@@ -50,8 +50,10 @@ object FrameGen {
else -> context.getString(R.string.frame_gen_off)
}
- fun apply(context: Context, refreshHz: Float): String? {
- val mode = mode(context)
+ fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz)
+
+ /** Arms [mode] in this process's compositor; the cloud player passes its own mode and frame-rate cap. */
+ fun apply(context: Context, mode: Mode, refreshHz: Float): String? {
when (mode.engine) {
ENGINE_LSFG -> {
val status = Lossless.sync(context)
diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt
index 1ccee78e24..893d569a60 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,43 @@ 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.
+ // match the system driver. 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/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt
index ac87bd0aa5..45f07471bc 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt
@@ -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 11be5bf9b4..6d17f2d75a 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java
@@ -110,6 +110,11 @@ public final class LinuxRuntime {
File root = rootDir(context);
List binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds);
if (sessionRoot != null) lastBinds = binds;
+ return commandWithBinds(context, root, binds, guestCommand);
+ }
+
+ public static List commandWithBinds(Context context, File root, List binds,
+ List guestCommand) {
List cmd = prootPrefix(context, root, "/root");
for (String spec : binds) bind(cmd, spec);
cmd.addAll(guestCommand);
diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
index 8267edd57a..953196900c 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
@@ -51,7 +51,7 @@ object BootMovie {
SessionPrefs.setBootMovieApplyNext(context, true)
BootMovieReport.note(context, "picked $id here; Steam names ${SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))}")
// Whatever Steam names right now is about to be replaced, so it is not a pick to adopt later.
- SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) }
+ SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) }
}
fun customName(context: Context): String? =
@@ -167,10 +167,12 @@ object BootMovie {
* that movie becomes the choice here. Steam already plays it, so nothing is staged over it. True when the choice changed.
*/
fun syncFromSteam(context: Context): Boolean {
- val path = SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context)) ?: return false
- if (path == SessionPrefs.bootMovieSteamSeen(context)) return false
- SessionPrefs.setBootMovieSteamSeen(context, path)
- if (path == SessionFiles.BOOT_MOVIE_PATH) return false
+ val named = SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context)) ?: return false
+ val seen = SessionPrefs.bootMovieSteamSeen(context)
+ if (named == seen) return false
+ SessionPrefs.setBootMovieSteamSeen(context, named)
+ if (named == SessionFiles.BOOT_MOVIE_PATH || (named.isEmpty() && seen == null)) return false
+ val path = named.ifEmpty { "/movies/steam_os_startup.webm" }
val prefix = "/uioverrides/movies/"
// The list names a bought movie from the Steam folder (/config/communityitemscache/...), Steam's config from its config folder.
val id = if (path.startsWith(prefix)) BootMovieLibrary.idOf(path.removePrefix(prefix)) else {
diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt
index 7c125e8196..0dd7a0fadf 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt
@@ -79,8 +79,9 @@ object BootMovieLibrary {
return customMovieDirs(context).map { File(it, name) }.firstOrNull { it.isFile && it.length() > 0L }
}
- private fun isMovie(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) &&
- file.name !in STAGED && !file.name.startsWith(".")
+ private fun isMovie(file: File) = isWebm(file) && file.name !in STAGED
+
+ private fun isWebm(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && !file.name.startsWith(".")
private fun readMeta(context: Context): JSONObject =
runCatching { JSONObject(metaFile(context).readText()) }.getOrDefault(JSONObject())
@@ -136,7 +137,7 @@ object BootMovieLibrary {
}
val bought = HashMap()
for (root in steamRoots(context)) {
- File(root, "steamui/movies").listFiles { f -> isMovie(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty()
+ File(root, "steamui/movies").listFiles { f -> isWebm(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty()
.sortedBy { it.name.lowercase() }.forEach { steam.putIfAbsent(STEAM_PREFIX + "/movies/" + it.name, it) }
val scan = pointShopMovies(root)
bought.putAll(scan.titles)
@@ -144,8 +145,8 @@ object BootMovieLibrary {
}
val seen = HashSet()
for ((id, file) in steam) {
- if (file.name in STAGED || !seen.add(file.canonicalPath)) continue
val native = file.nameWithoutExtension.lowercase() in NATIVE
+ if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue
// Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it.
val title = if (native) NATIVE[file.nameWithoutExtension.lowercase()] ?: file.nameWithoutExtension else bought[file.path] ?: boughtId(file)?.let { "#$it" } ?: file.nameWithoutExtension
out.add(Entry(id, title, if (native) SOURCE_STEAM else SOURCE_POINTSHOP, file, removable = false))
@@ -153,8 +154,11 @@ object BootMovieLibrary {
return out
}
- /** The three startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */
- private val NATIVE = mapOf("deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup")
+ /** The four startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */
+ private val NATIVE = mapOf(
+ "deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup",
+ "steam_os_startup" to "SteamOS startup",
+ )
private val skippedFolders = setOf("uioverrides", "steamapps", "librarycache", "httpcache", "logs", "compatdata", "shadercache")
diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt
index d1aae9d720..ae405a80ae 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt
@@ -721,13 +721,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, val originals: List)
- private fun packagesInUse(state: JSONObject): Set {
+ 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): Set {
val names = HashSet()
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 +753,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 +780,50 @@ object ComponentsManager {
true
}
+ 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()
+ }
+ }
+
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) }
- }
- 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) }
+ 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)
}
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 7855c49590..40135f08de 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/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt
index a23f23bebf..f69983f0db 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt
@@ -87,11 +87,10 @@ class LoadingState(context: Context, private val steam: Boolean = true) {
if (line.startsWith("== STEP ")) {
stepAt = at
stepText = line.substringAfter("== STEP ").substringAfter(' ')
- val m = INSTALL_COUNT.find(line)
- if (m != null) {
+ clientDownload(line)?.let { (what, percent) ->
clientDownloadAt = at
- clientDownload = m.groupValues[1]
- clientPercent = m.groupValues[2].toInt() * 100 / maxOf(1, m.groupValues[3].toInt())
+ clientDownload = what
+ clientPercent = percent
}
} else {
val m = UPDATE_PROGRESS.find(line)
@@ -132,6 +131,19 @@ class LoadingState(context: Context, private val steam: Boolean = true) {
}
}
+ internal fun clientDownload(line: String): Pair? {
+ 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/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt
index 42c0deeb6f..20714ba95a 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt
@@ -136,11 +136,13 @@ 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)
+ }
}
@Synchronized
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
index 9ec21c2090..c356bf0d04 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt
@@ -200,22 +200,86 @@ object SessionArtifacts {
internal fun recordedClient(dir: File): String? =
runCatching { File(dir, CLIENT_FILE).readText().trim() }.getOrNull()?.takeIf { it == "arm64" || it == "x86_64" }
+ private const val LOG_MARKS = "steam-log-marks.txt"
+ private const val MAX_STEAM_LOG = 8L * 1024 * 1024
+ private const val HEAD = 4096L
+
+ private class Mark(val size: Long, val head: String)
+
+ fun markSteamLogs(dir: File, logs: File) {
+ val lines = logs.listFiles { f -> f.isFile }?.mapNotNull { f ->
+ val size = f.length()
+ head(f, size)?.let { "$size\t$it\t${f.name}" }
+ } ?: return
+ runCatching { File(dir, LOG_MARKS).writeText(lines.joinToString("") { "$it\n" }) }
+ }
+
+ private fun head(f: File, length: Long): String? = runCatching {
+ val buf = ByteArray(minOf(length, HEAD).toInt())
+ f.inputStream().use { input ->
+ var off = 0
+ while (off < buf.size) {
+ val n = input.read(buf, off, buf.size - off)
+ if (n < 0) return@runCatching null
+ off += n
+ }
+ }
+ java.security.MessageDigest.getInstance("SHA-1").digest(buf).joinToString("") { "%02x".format(it) }
+ }.getOrNull()
+
+ private fun steamLogMarks(dir: File): List? = 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): Long {
+ val heads = HashMap()
+ return marks.filter { it.size <= size }.sortedByDescending { it.size }
+ .firstOrNull { m -> heads.getOrPut(minOf(m.size, HEAD)) { head(src, m.size) } == m.head }?.size ?: 0L
+ }
+
private fun copySteamLogs(context: Context, dir: File, record: Record, steamArch: String? = null) {
val logs = File(steamArch?.let { SessionPrefs.steamRoot(context, it) } ?: SessionPrefs.activeSteamRoot(context), "logs")
if (!logs.isDirectory) return
val out = File(dir, "steam").apply { mkdirs() }
- logs.listFiles { f -> f.isFile && f.length() < 8L * 1024 * 1024 }?.forEach { src ->
+ copySessionLogs(logs, dir, out).forEach { dst -> record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) }
+ Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out")
+ }
+
+ internal fun copySessionLogs(logs: File, dir: File, out: File): List {
+ val marks = steamLogMarks(dir)
+ val copied = ArrayList()
+ logs.listFiles { f -> f.isFile }?.forEach { src ->
+ val size = src.length()
+ val from = marks?.let { startOf(src, size, it) } ?: 0L
+ if (marks != null && from == size || size - from >= MAX_STEAM_LOG) return@forEach
try {
val dst = File(out, src.name)
- dst.bufferedWriter().use { w ->
- src.forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() }
+ src.inputStream().buffered().use { input ->
+ var left = if (from > 0) from - 1 else 0L
+ while (left > 0) {
+ val skipped = input.skip(left)
+ if (skipped <= 0) break
+ left -= skipped
+ }
+ if (from > 0 && input.read() != '\n'.code) {
+ while (true) {
+ val c = input.read()
+ if (c < 0 || c == '\n'.code) break
+ }
+ }
+ dst.bufferedWriter().use { w ->
+ input.bufferedReader().forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() }
+ }
}
- record.files[dst] = Scrubbed(dst.length(), dst.lastModified())
+ copied.add(dst)
} catch (e: Exception) {
Log.w(TAG, "could not scrub ${src.name}", e)
}
}
- Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out")
+ return copied
}
@Synchronized
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
index 0dab068d85..38d6c6fd08 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
@@ -58,8 +58,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",
@@ -78,6 +80,7 @@ object SessionFiles {
"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-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",
@@ -388,10 +391,12 @@ object SessionFiles {
private fun activeStartupMovie(text: String): VdfBlock? = customizationMovie(text) ?: olderMovie(text)
/** The movie Steam's config selects, as a path like `/uioverrides/movies/x.webm`; null when none is named. */
- internal fun startupMoviePath(config: File): String? {
+ internal fun startupMoviePath(config: File): String? = startupMovieLocalPath(config)?.takeIf { it.isNotEmpty() }
+
+ internal fun startupMovieLocalPath(config: File): String? {
val text = runCatching { config.readText() }.getOrNull() ?: return null
val movie = activeStartupMovie(text) ?: return null
- return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath")?.takeIf { it.isNotEmpty() }
+ return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath")
}
/** Both `StartupMovie` sections of Steam's config as written there, for the report; null when there is none. */
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
index d9d2d8e1d3..d77cced0b8 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
@@ -4,7 +4,6 @@ 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
@@ -50,9 +49,9 @@ object SessionPrefs {
)
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 })
@@ -92,13 +91,6 @@ object SessionPrefs {
*/
fun storesEpicMode(context: Context): String = prefs(context).getString("storesEpicMode", "adaptive") ?: "adaptive"
- fun storesOpenTab(context: Context): String =
- prefs(context).getString("storesOpenTab", STORES_OPEN_LIBRARY)?.takeIf { it == STORES_OPEN_STORE } ?: STORES_OPEN_LIBRARY
-
- fun setStoresOpenTab(context: Context, tab: String) {
- prefs(context).edit().putString("storesOpenTab", if (tab == STORES_OPEN_STORE) STORES_OPEN_STORE else STORES_OPEN_LIBRARY).apply()
- }
-
fun storesShowMature(context: Context): Boolean = prefs(context).getBoolean("storesShowMature", false)
fun setStoresShowMature(context: Context, show: Boolean) {
@@ -136,9 +128,6 @@ object SessionPrefs {
val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc")
val STORES_VIEWS = listOf("cards", "capsules", "list")
- const val STORES_OPEN_LIBRARY = "library"
- const val STORES_OPEN_STORE = "store"
-
fun storesInstallTarget(context: Context): String = prefs(context).getString("storesInstallTarget", "") ?: ""
fun setStoresInstallTarget(context: Context, path: String) {
@@ -263,6 +252,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
@@ -304,6 +306,34 @@ object SessionPrefs {
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")
+
+ /**
+ * Shader pre-caching as the launcher last set it, until a session reports it written into the
+ * client's config.vdf; after that the client's own toggle is the user's again.
+ */
+ fun pendingShaderPrecache(context: Context): Boolean? {
+ val prefs = prefs(context)
+ if (!prefs.contains("shaderPrecache")) return null
+ 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()
+ }
+
+ fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context)
+ ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache(
+ java.io.File(steamRoot(context, steamClientArch(context)), "config/config.vdf").readText()) }.getOrDefault(true)
+
fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false)
fun setStretch16x9(context: Context, on: Boolean) {
@@ -341,30 +371,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()
@@ -376,7 +395,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()
@@ -411,6 +430,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) {
@@ -444,6 +474,13 @@ object SessionPrefs {
prefs(context).edit().putBoolean("prootFastPath", on).apply()
}
+ /** gamescope draws the cursor itself. Off by default: on a phone that plane costs frames. */
+ fun cursorComposite(context: Context): Boolean = prefs(context).getBoolean("cursorComposite", false)
+
+ fun setCursorComposite(context: Context, on: Boolean) {
+ prefs(context).edit().putBoolean("cursorComposite", on).apply()
+ }
+
const val DEFAULT_GUEST_HOSTNAME = "DroidDeck"
@JvmStatic
@@ -764,6 +801,14 @@ object SessionPrefs {
it.getInt("gradientSecondary", com.droiddeck.launcher.ui.Themes.DEFAULT_SECONDARY)
}
+ /** How fast the Inner Gamer theme cycles its colours, 1 to 10. */
+ 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()
}
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 a62f11b10a..f4aa173315 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt
@@ -71,6 +71,7 @@ class SessionService : Service() {
private val steamDownloadMonitor = SteamDownloadMonitor()
private var downloadMonitorTask: Runnable? = null
private var downloadActive = false
+ private var clientInstallActive = false
@Volatile private var steamLibraryMounts = emptyMap()
private var suspendDownloadNow = false
private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL
@@ -277,6 +278,16 @@ class SessionService : Service() {
updateSuspendPolicy()
return START_NOT_STICKY
}
+ ACTION_MIC_CHANGED -> {
+ if (SessionState.running && SessionState.micAvailable && !SessionState.suspended) {
+ val enabled = intent.getBooleanExtra("enabled", false)
+ val relay = components.firstNotNullOfOrNull { it as? DirectAudioRelayComponent }
+ if (relay?.setMicEnabled(enabled) != true) {
+ android.widget.Toast.makeText(this, R.string.drawer_mic_failed, android.widget.Toast.LENGTH_LONG).show()
+ }
+ }
+ return START_NOT_STICKY
+ }
ACTION_SUSPEND_POLICY_CHANGED -> {
if (!SessionState.running) return START_NOT_STICKY
suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode)
@@ -321,13 +332,19 @@ 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
SessionState.pipActive = false
pipTask = false
SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM)
@@ -394,7 +411,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) {
@@ -637,8 +654,8 @@ class SessionService : Service() {
}
},
)
- mainHandler.post { updateSuspendPolicy() }
updateDownloadMonitoring()
+ mainHandler.post { updateSuspendPolicy() }
}
}
@@ -670,6 +687,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")
@@ -692,7 +710,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")
@@ -705,7 +722,10 @@ class SessionService : Service() {
SessionState.steamClientArch = if (steamHere) SessionPrefs.steamClientArch(this) else null
SessionState.steamClientArch?.let { arch ->
guest.add("BL_STEAM_CLIENT_ARCH=$arch")
- SessionPaths.current()?.let { SessionArtifacts.recordClient(it, arch) }
+ SessionPaths.current()?.let {
+ SessionArtifacts.recordClient(it, arch)
+ SessionArtifacts.markSteamLogs(it, File(SessionPrefs.steamRoot(this, arch), "logs"))
+ }
if (arch == "x86_64") FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) }
}
if (SessionState.mode == MODE_STEAM) {
@@ -716,11 +736,13 @@ 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 (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1")
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 (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)))
@@ -751,6 +773,15 @@ class SessionService : Service() {
components.add(pulse)
if (wantsDirectAudio || wantsMic) {
val relay = DirectAudioRelayComponent(relaySocket, micFifo)
+ val gen = sessionGen
+ relay.onMicEnabled = java.util.function.Consumer { enabled ->
+ mainHandler.post {
+ if (gen == sessionGen && SessionState.running && wantsMic) {
+ SessionState.micAvailable = true
+ SessionState.micEnabled = enabled
+ }
+ }
+ }
relay.setLogFile(audioLog)
relay.attach(this)
components.add(relay)
@@ -1210,6 +1241,7 @@ class SessionService : Service() {
}
private fun resumeSession(panelVisible: Boolean = true) {
+ if (SessionState.suspended) SessionState.resumeRequested = true
if (panelVisible) activityVisible = true
screenOn = readScreenOn()
manualPauseRequested = false
@@ -1407,10 +1439,12 @@ 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) {
+ // Coming back before the freeze finished keeps the game running instead of pausing it a moment later.
+ manualPauseRequested = false
}
val controller = suspendController ?: return
if (downloadsBlockingSuspend) acquireLocks()
@@ -1436,6 +1470,7 @@ class SessionService : Service() {
freezeCancelled = true
controller.cancelFreeze()
}
+ if (shouldSuspend && SessionState.suspended && !suspendOperationPending) SessionState.resumeRequested = false
if (suspendOperationPending || suspendAttemptFailed || shouldSuspend == SessionState.suspended) return
val gen = sessionGen
suspendOperationPending = true
@@ -1459,6 +1494,7 @@ class SessionService : Service() {
freezePending = false
if (success) {
SessionState.suspended = true
+ SessionState.resumeFailed = false
SessionEvents.transition(SessionPhase.SUSPENDED, "session.suspended")
releaseLocks()
refreshNotification()
@@ -1477,16 +1513,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()
@@ -1576,6 +1618,9 @@ class SessionService : Service() {
return@post
}
SessionState.suspended = false
+ SessionState.resumeRequested = false
+ SessionState.resuming = false
+ SessionState.resumeFailed = false
SessionState.pipActive = false
pipTask = false
SessionState.guestPid = -1
@@ -1627,19 +1672,21 @@ class SessionService : Service() {
completeNativeSleep()
val (ended, endedArch) = synchronized(stopLock) {
if (!SessionState.running) return
+ SessionEvents.record("guest.exited", mapOf("status" to status))
+ SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status))
SessionState.running = false
SessionPaths.take() to SessionState.steamClientArch
}
+ SessionState.micAvailable = false
+ SessionState.micEnabled = false
xrActivityVisible = false
updateDownloadMonitoring()
val stoppedGen = sessionGen
val stoppedSession = SessionState.sessionId
val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC
SessionState.stopRequested = false
- SessionEvents.record("guest.exited", mapOf("status" to status))
GpuClockPin.stop(this)
GameThreadHints.stop()
- SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status))
suspendOperationPending = false
freezePending = false
launchWatcher?.stopWatching()
@@ -1808,8 +1855,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
}
))
@@ -1817,8 +1863,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),
@@ -1838,33 +1883,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)
@@ -1909,6 +1971,7 @@ class SessionService : Service() {
const val ACTION_LAUNCH_GAME = "com.droiddeck.launcher.LAUNCH_STEAM_GAME"
const val ACTION_HOME_GUIDE = "com.droiddeck.launcher.HOME_GUIDE"
const val ACTION_AGENT_START = "com.droiddeck.launcher.AGENT_START"
+ private const val ACTION_MIC_CHANGED = "com.droiddeck.launcher.MIC_CHANGED"
private const val ACTION_SUSPEND_POLICY_CHANGED = "com.droiddeck.launcher.SUSPEND_POLICY_CHANGED"
private const val ACTION_ACTIVITY_VISIBLE = "com.droiddeck.launcher.ACTIVITY_VISIBLE"
private const val ACTION_ACTIVITY_HIDDEN = "com.droiddeck.launcher.ACTIVITY_HIDDEN"
@@ -2023,6 +2086,7 @@ class SessionService : Service() {
fun resume(context: Context) {
if (!SessionState.running) return
+ if (SessionState.suspended) SessionState.resumeRequested = true
context.startService(Intent(context, SessionService::class.java).setAction(ACTION_RESUME))
}
@@ -2039,6 +2103,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 75388e980a..e5af742994 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
@@ -48,7 +49,13 @@ 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)
+ var resumeFailures by mutableIntStateOf(0)
+ var resumeFailed by mutableStateOf(false)
@Volatile var pipActive = false
@Volatile
var program: String? = null
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 0c430c1c5e..27bc081b0d 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt
@@ -20,7 +20,7 @@ object SettingsReset {
"gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop",
"tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime",
"directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus",
- "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath",
+ "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite",
"guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics",
"upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias",
"steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds",
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt
index 37f7c1fb90..ff3602c1bd 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt
@@ -1,7 +1,7 @@
package com.droiddeck.launcher.session
import java.io.File
-import java.io.RandomAccessFile
+import java.io.FileInputStream
internal class SteamDownloadMonitor {
private data class ManifestState(
@@ -63,16 +63,17 @@ internal class SteamDownloadMonitor {
lastContentActivityAt = 0L
}
runCatching {
- RandomAccessFile(log, "r").use { input ->
- input.seek(contentLogOffset)
+ FileInputStream(log).use { input ->
+ input.channel.position(contentLogOffset)
+ val reader = input.bufferedReader(Charsets.ISO_8859_1)
while (true) {
- val line = input.readLine() ?: break
+ val line = reader.readLine() ?: break
when {
"Client version:" in line -> {
activeContentUpdates.clear()
lastContentActivityAt = 0L
}
- CONTENT_UPDATE.find(line)?.let { match ->
+ " update changed : " in line && CONTENT_UPDATE.find(line)?.let { match ->
val appId = match.groupValues[1]
val updateType = match.groupValues[2]
val state = match.groupValues[3]
@@ -85,14 +86,15 @@ internal class SteamDownloadMonitor {
}
true
} == true -> Unit
- CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true ->
+ "Current download rate: " in line &&
+ CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true ->
lastContentActivityAt = now
"Downloading " in line && " chunks for depot " in line ->
lastContentActivityAt = now
}
if (activeContentUpdates.isNotEmpty()) lastContentActivityAt = now
}
- contentLogOffset = input.filePointer
+ contentLogOffset = input.channel.position()
}
}
return activeContentUpdates.isNotEmpty() && lastContentActivityAt > 0L &&
@@ -138,13 +140,21 @@ internal class SteamDownloadMonitor {
private fun value(text: String, key: String): String? =
Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1)
- private companion object {
- const val MANIFEST_PROGRESS_GRACE_MS = 8_000L
- const val CONTENT_ACTIVITY_GRACE_MS = 90_000L
- const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L
- val PATH = Regex("\"path\"\\s+\"([^\"]+)\"")
- val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam")
- val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""")
- val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""")
+ companion object {
+ fun clientInstallPending(runtimeRoot: File): Boolean {
+ val home = File(runtimeRoot, "root")
+ val steam = File(home, ".local/share/Steam")
+ val stamped = File(steam, "package/droiddeck-installed").isFile ||
+ File(steam, "package/bannerlator-installed").isFile
+ return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists()
+ }
+
+ private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L
+ private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L
+ private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L
+ private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"")
+ private val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam")
+ private val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""")
+ private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""")
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt
index 2c5a1aa0d1..4b355caa40 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt
@@ -101,10 +101,28 @@ object WinComponents {
fun cached(context: Context): List? =
runCatching { parse(File(context.filesDir, CATALOG_CACHE).readText()) }.getOrNull()
+ const val VCREDIST_ARM64 = "vcredist2022_arm64"
+
+ /**
+ * The ARM64 Visual C++ 2015-2022 runtime as registry values only (the version a 14.44.35211 installer writes, in both
+ * registry views). Xbox games' launchers running as ARM64EC check for it; Wine's own CRT does the work. Same approach as
+ * MGamer404's Bannerlator #627. Used until the catalog carries a component of this name.
+ */
+ internal fun builtInArm64Runtime(): Component {
+ fun value(view: String, name: String, type: String, data: String) = Step("set_register_key", JSONObject()
+ .put("action", "set_register_key").put("key", "HKLM\\Software\\${view}Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64")
+ .put("value", name).put("type", type).put("data", data))
+ val steps = listOf("", "Wow6432Node\\").flatMap { view ->
+ listOf(value(view, "Installed", "REG_DWORD", "1"), value(view, "Major", "REG_DWORD", "14"), value(view, "Minor", "REG_DWORD", "44"),
+ value(view, "Bld", "REG_DWORD", "35211"), value(view, "Rbld", "REG_DWORD", "0"), value(view, "Version", "REG_SZ", "v14.44.35211.00"))
+ }
+ return Component(VCREDIST_ARM64, "Microsoft Visual C++ 2015-2022 ARM64 runtime 14.44.35211 (registry entries only)", "Microsoft", "ready", emptyList(), steps)
+ }
+
private fun parse(body: String): List? {
return try {
val arr = JSONObject(body).getJSONArray("components")
- (0 until arr.length()).mapNotNull { i ->
+ val listed = (0 until arr.length()).mapNotNull { i ->
val o = arr.getJSONObject(i)
val name = o.optString("name")
if (!validId(name)) return@mapNotNull null
@@ -117,6 +135,7 @@ object WinComponents {
o.optString("snapshot"),
)
}
+ if (listed.any { it.name == VCREDIST_ARM64 }) listed else listed + builtInArm64Runtime()
} catch (e: Exception) {
Log.w(TAG, "catalog: $e"); null
}
diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt
index e707fd59fc..9697addd64 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?,
@@ -118,6 +120,28 @@ 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? {
+ val blocks = ArrayList()
+ 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")
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt
index aa07484231..01c7eebcf4 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt
@@ -1,6 +1,5 @@
package com.droiddeck.launcher.stores
-import android.os.Build
import android.security.keystore.KeyGenParameterSpec
import android.security.keystore.KeyProperties
import android.util.Base64
@@ -13,6 +12,8 @@ import javax.crypto.spec.GCMParameterSpec
object CredentialCipher {
const val VERSION = 1
+ /** Sealed with the hardware-keystore (TEE) key; [VERSION] envelopes keep opening with the older, possibly StrongBox, key. */
+ const val VERSION_TEE = 2
const val ALG = "AES/GCM"
private const val TRANSFORMATION = "AES/GCM/NoPadding"
private const val TAG_BITS = 128
@@ -21,6 +22,11 @@ object CredentialCipher {
fun key(): SecretKey
fun existing(): SecretKey = key()
+
+ /** Key for [VERSION] envelopes written before [VERSION_TEE]. */
+ fun legacy(): SecretKey = existing()
+
+ val version: Int get() = VERSION
}
class KeyMissing : java.security.GeneralSecurityException("no key")
@@ -29,33 +35,33 @@ object CredentialCipher {
e is android.security.keystore.KeyPermanentlyInvalidatedException ||
e is KeyMissing || e is org.json.JSONException || e is IllegalArgumentException
+ // StrongBox took over 10 s per Xbox credential write on a tester's phone, past the backend's
+ // 10 s reply timeout, so new writes use a TEE key. The old alias stays readable.
object Keystore : KeyProvider {
- private const val ALIAS = "droiddeck-store-credentials"
+ private const val LEGACY_ALIAS = "droiddeck-store-credentials"
+ private const val ALIAS = "droiddeck-store-credentials-tee"
private const val PROVIDER = "AndroidKeyStore"
- @Synchronized
- override fun existing(): SecretKey {
- val ks = KeyStore.getInstance(PROVIDER).apply { load(null) }
- return ks.getKey(ALIAS, null) as? SecretKey ?: throw KeyMissing()
- }
+ override val version: Int get() = VERSION_TEE
@Synchronized
- override fun key(): SecretKey {
- val ks = KeyStore.getInstance(PROVIDER).apply { load(null) }
- (ks.getKey(ALIAS, null) as? SecretKey)?.let { return it }
- if (Build.VERSION.SDK_INT >= 28) {
- try { return generate(strongBox = true) } catch (e: Exception) { }
- }
- return generate(strongBox = false)
- }
+ override fun existing(): SecretKey = stored(ALIAS) ?: throw KeyMissing()
- private fun generate(strongBox: Boolean): SecretKey {
+ @Synchronized
+ override fun legacy(): SecretKey = stored(LEGACY_ALIAS) ?: throw KeyMissing()
+
+ @Synchronized
+ override fun key(): SecretKey = stored(ALIAS) ?: generate()
+
+ private fun stored(alias: String): SecretKey? =
+ KeyStore.getInstance(PROVIDER).apply { load(null) }.getKey(alias, null) as? SecretKey
+
+ private fun generate(): SecretKey {
val spec = KeyGenParameterSpec.Builder(ALIAS, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
.setKeySize(256)
.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
.setUserAuthenticationRequired(false)
- .apply { if (strongBox && Build.VERSION.SDK_INT >= 28) setIsStrongBoxBacked(true) }
.build()
return KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, PROVIDER).run { init(spec); generateKey() }
}
@@ -64,15 +70,16 @@ object CredentialCipher {
fun seal(plain: String, keys: KeyProvider): JSONObject {
val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.ENCRYPT_MODE, keys.key()) }
val ct = cipher.doFinal(plain.toByteArray(Charsets.UTF_8))
- return JSONObject().put("v", VERSION).put("alg", ALG)
+ return JSONObject().put("v", keys.version).put("alg", ALG)
.put("iv", b64(cipher.iv)).put("ct", b64(ct))
}
fun open(envelope: JSONObject, keys: KeyProvider): String {
- require(envelope.optInt("v", -1) == VERSION && envelope.optString("alg") == ALG) { "unknown envelope" }
+ val version = envelope.optInt("v", -1)
+ require((version == VERSION || version == VERSION_TEE) && envelope.optString("alg") == ALG) { "unknown envelope" }
val iv = Base64.decode(envelope.getString("iv"), Base64.NO_WRAP)
val ct = Base64.decode(envelope.getString("ct"), Base64.NO_WRAP)
- val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, keys.existing(), GCMParameterSpec(TAG_BITS, iv)) }
+ val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, if (version == VERSION) keys.legacy() else keys.existing(), GCMParameterSpec(TAG_BITS, iv)) }
return String(cipher.doFinal(ct), Charsets.UTF_8)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt
index bf9d5f6dc9..adb507e996 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt
@@ -8,8 +8,8 @@ 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
@@ -18,9 +18,8 @@ internal object LoginFlows {
@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/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
index cfb0ed53de..967e56ca7b 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
@@ -61,33 +61,38 @@ fun installedCards(store: Store, installed: List, 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,
+fun sortGames(
+ items: List,
sort: String,
- lastPlayed: (CatalogItem) -> Long = { 0L },
- installedAt: (CatalogItem) -> Long = { 0L },
- size: (CatalogItem) -> Long = { it.sizeBytes },
-): List = 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 { 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 {
+ val byTitle = compareBy { 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 { size(it).takeIf { b -> b > 0 } ?: Long.MAX_VALUE }.then(byTitle))
+ "releaseDateDesc" -> items.sortedWith(compareByDescending { releaseDateValue(releaseDate(it)) }.then(byTitle))
+ else -> items
+ }
}
-internal fun retainCatalogOrder(items: List, previous: List): List {
+internal fun retainOrder(items: List, previous: List, key: (T) -> String): List {
if (items.size != previous.size) return items
- val byKey = items.associateBy { it.key }
- if (previous.any { it.key !in byKey }) return items
- return previous.map { byKey.getValue(it.key) }
+ val byKey = items.associateBy(key)
+ if (previous.any { key(it) !in byKey }) return items
+ return previous.map { byKey.getValue(key(it)) }
}
/** A detail page opens for search results too; the library wins when it already knows the product. */
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt
index 611b7f3dba..91a0f96f5b 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt
@@ -104,6 +104,29 @@ object StoreInstallRoot {
.map { it to guestFor(context, it) }
}
+ /** Xodus has its own PRoot mount table and cannot see the selected Steam library's SD bind. */
+ fun externalRootsForXodus(context: Context): List> {
+ val roots = externalRoots(context).toMutableList()
+ val selectedLibrary = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) }
+ ?.takeUnless { isInternal(context, it) }
+ if (selectedLibrary != null && roots.none { it.first.absolutePath == selectedLibrary.absolutePath }) {
+ roots += selectedLibrary to guestFor(context, selectedLibrary)
+ }
+ return roots
+ }
+
+ fun externalBindSpecs(context: Context): List = externalBindSpecs(externalRoots(context), LinuxRuntime.rootDir(context))
+
+ fun externalBindSpecsForXodus(context: Context): List =
+ externalBindSpecs(externalRootsForXodus(context), LinuxRuntime.rootDir(context))
+
+ internal fun externalBindSpecs(roots: List>, guestRoot: File): List =
+ roots.mapNotNull { (host, guest) ->
+ if (!host.isDirectory || !host.canRead()) return@mapNotNull null
+ val target = File(guestRoot, guest.removePrefix("/"))
+ if (target.isDirectory || target.mkdirs()) "${host.path}:$guest" else null
+ }
+
private fun guestFor(context: Context, root: File): String {
val sm = context.getSystemService(StorageManager::class.java)
val uuid = runCatching { sm?.getStorageVolume(root)?.uuid }.getOrNull()?.takeIf { it.isNotBlank() }?.replace(Regex("[^A-Za-z0-9-]"), "")
@@ -114,11 +137,21 @@ object StoreInstallRoot {
fun isInternal(context: Context, root: File): Boolean = root.absolutePath == internalRoot(context).absolutePath
fun externalGuestPath(context: Context, host: File): String? {
+ return externalGuestPath(host, externalRoots(context))
+ }
+
+ fun guestPath(context: Context, host: File): String = externalGuestPath(context, host) ?: host.path
+
+ fun guestPathForXodus(context: Context, host: File): String =
+ externalGuestPath(host, externalRootsForXodus(context)) ?: host.path
+
+ internal fun externalGuestPath(host: File, roots: List>): 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
}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt
index 1b5c6ccdd7..9a4f97c877 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt
@@ -130,7 +130,7 @@ class StoreLoginActivity : ComponentActivity() {
private fun newFlow(state: String): Flow? {
val url = clientUrl
if (url != null) return com.droiddeck.launcher.stores.epic.EpicClient.loginFlow(url, chromeUa)
- return store?.let { LoginFlows.forStore(it, state) }
+ return store?.let { LoginFlows.forStore(it, state, chromeUa) }
}
override fun finish() {
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt
index 317757a8bf..1fcbcd4815 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt
@@ -14,6 +14,7 @@ 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()
@@ -85,7 +86,7 @@ object StoresState {
main.post {
androidx.compose.runtime.snapshots.Snapshot.withMutableSnapshot {
val restored = found.toMap()
- accounts.keys.toList().filter { it !in restored }.forEach { accounts.remove(it) }
+ accounts.keys.toList().filter { it !in restored }.forEach { accounts.remove(it); libraryAsked.remove(it) }
accounts.putAll(restored)
installed = onDisk
unfinished = partial
@@ -126,7 +127,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 else emptyList(),
+ shelves[store],
)
fun open(context: Context, store: Store, force: Boolean = false) {
@@ -137,6 +140,18 @@ object StoresState {
if (force || !shelves.containsKey(store)) backend.loadShelves(app, force)
}
+ private val libraryAsked = java.util.concurrent.ConcurrentHashMap()
+
+ /** Once per store, again after a minute when the last sync never produced a library (offline, expired sign-in). */
+ fun loadLibrary(context: Context, store: Store) {
+ if (!isSignedIn(store) || library.containsKey(store)) return
+ val now = android.os.SystemClock.elapsedRealtime()
+ val asked = libraryAsked[store]
+ if (asked != null && now - asked < LIBRARY_RETRY_MS) return
+ libraryAsked[store] = now
+ backends[store]?.syncLibrary(context.applicationContext, false)
+ }
+
fun preview(context: Context, store: Store) {
if (!shelves.containsKey(store)) backends[store]?.loadShelves(context.applicationContext, false)
}
@@ -163,6 +178,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")
}
@@ -175,13 +191,15 @@ object StoresState {
else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store)
main.post {
if (store == Store.XBOX && StoreAccounts.signedInAs(app, store) != null) return@post
- accounts.remove(store); library.remove(store); status.remove(store); problems.remove(store)
+ accounts.remove(store); library.remove(store); status.remove(store); problems.remove(store); libraryAsked.remove(store)
logLine("${store.label}: signed out")
}
}
}
var openDownloads by mutableStateOf(false)
+ /** A "store:id" key another page asks the Stores page to open. */
+ var openGameRequest by mutableStateOf(null)
private fun askForNotifications(context: Context) {
val activity = context as? android.app.Activity ?: return
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt
index 316cabb656..ce5afa91b6 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt
@@ -47,6 +47,8 @@ object EpicBackend : StoreBackend, EpicLaunchSupport {
if (!quiet) StoresState.status[store] = app.getString(R.string.stores_sync_library)
}
val result = EpicLibrary.sync(app, force) { line -> if (!quiet) StoresState.post { StoresState.status[store] = line } }
+ // Throttled means the cache is fresh, possibly written by another sync after this one read it.
+ val fresh = if (result == EpicLibrary.SyncResult.Throttled) EpicLibrary.cached(app).map { EpicLibrary.toCatalogItem(app, it) } else cached
StoresState.post {
StoresState.status.remove(store)
when (result) {
@@ -56,7 +58,7 @@ object EpicBackend : StoreBackend, EpicLaunchSupport {
}
is EpicLibrary.SyncResult.Failed -> StoresState.problems[store] = result.message
EpicLibrary.SyncResult.NotLoggedIn -> StoresState.problems[store] = StoresState.notSignedInLine(store)
- EpicLibrary.SyncResult.Throttled -> if (!StoresState.library.containsKey(store)) StoresState.library[store] = cached
+ EpicLibrary.SyncResult.Throttled -> if (fresh.isNotEmpty()) StoresState.library[store] = mergeItems(StoresState.library[store], fresh)
EpicLibrary.SyncResult.Busy -> {}
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt
index 7f0e86b14b..8da3a96ad4 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, launcher: Library.SteamGame?): List {
- 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
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt
index 8521a90f5d..e5ea933d83 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt
@@ -251,7 +251,7 @@ internal object EpicClientLibrary {
SessionPrefs.addedGameStoredAppId(app, oldFolder.path)?.let { SteamLiveShortcuts.remove(app, it) }
changed = true
}
- val next = StoreGameSidecar(
+ val next = withLaunchArgs(StoreGameSidecar(
Store.EPIC, appName, item.optString("DisplayName").ifEmpty { appName }, exe,
installVersion = item.optString("AppVersionString"), installedAt = existing?.installedAt?.takeIf { it > 0 } ?: folder.lastModified(),
cover = existing?.cover, hero = existing?.hero,
@@ -260,7 +260,7 @@ internal object EpicClientLibrary {
epic = existing?.epic ?: com.droiddeck.launcher.stores.EpicOptions(),
cloud = existing?.cloud ?: true,
launcher = StoreLaunch.LAUNCHER,
- )
+ ), commandArgs(item.optString("LaunchCommand")))
val sidecarChanged = existing?.toJson()?.toString(2) != next.toJson().toString(2)
val launcher = File(folder, StoreLaunch.LAUNCHER)
if (sidecarChanged || runCatching { launcher.readText() }.getOrNull() != StoreLaunch.launcherText(next)) {
@@ -328,6 +328,7 @@ internal object EpicClientLibrary {
.put("CatalogItemId", record.optString("itemId"))
.put("InstallLocation", dir)
.put("LaunchExecutable", record.optString("launchExecutable"))
+ .put("LaunchCommand", record.optString("launchCommand"))
.put("AppVersionString", record.optString("version"))
.put("SidecarDeploymentId", record.optJSONObject("sidecar")?.optString("deploymentId").orEmpty())
.put("DisplayName", title?.takeIf(String::isNotBlank) ?: dir.substringAfterLast('/'))
@@ -358,7 +359,11 @@ internal object EpicClientLibrary {
write(File(manifests, "$guid.item"), item(install, tags, ownership == true).toString(2))
runCatching { egstore(install, guid) { token } }.onFailure { Log.w(TAG, "${install.appName}: .egstore not written (${it.javaClass.simpleName})") }
after.put(install.appName, JSONObject().put("guid", guid).put("signature", install.signature).apply { if (ownership != null) put("ownership", ownership) })
- StoreGameSidecar.read(install.folder)?.let { StoreLaunch.refreshLauncher(install.folder, it) }
+ StoreGameSidecar.read(install.folder)?.let { sidecar ->
+ val next = runCatching { manifestArgs(install, guid) }.getOrNull()?.let { withLaunchArgs(sidecar, it) } ?: sidecar
+ if (next !== sidecar) next.write(install.folder)
+ StoreLaunch.refreshLauncher(install.folder, next)
+ }
}
for (name in before.keys().asSequence().toList()) {
if (after.has(name)) continue
@@ -376,6 +381,33 @@ internal object EpicClientLibrary {
return changed
}
+ private const val LAUNCH_ARGS = "launchArgs"
+
+ private fun manifestArgs(install: Install, guid: String): List? {
+ 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 {
+ 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): 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/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt
new file mode 100644
index 0000000000..d430d11434
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt
@@ -0,0 +1,176 @@
+package com.droiddeck.launcher.stores.itch
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.droiddeck.launcher.stores.CatalogItem
+import com.droiddeck.launcher.stores.StoresState
+import org.json.JSONArray
+import java.io.File
+import java.security.MessageDigest
+
+internal data class BrowseQuery(
+ val sort: String = ItchBrowse.SORT_POPULAR,
+ val price: String = ItchBrowse.PRICE_ANY,
+ val platforms: Set = emptySet(),
+ val tags: List = emptyList(),
+) {
+ val isDefault: Boolean get() = this == BrowseQuery()
+}
+
+internal class BrowsePage(val items: List, 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 {
+ 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? {
+ 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) {
+ 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>(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/ItchShelves.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt
index 0fd783ed66..acf3324315 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt
@@ -108,7 +108,7 @@ internal object ItchShelves {
return shelves.takeUnless { it.isEmpty }
}
- private fun open(url: String): Pair {
+ internal fun open(url: String): Pair {
var conn: HttpURLConnection? = null
return try {
conn = (URL(url).openConnection() as HttpURLConnection).apply {
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt
index 9121a35c9b..d678a2f410 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt
@@ -26,6 +26,8 @@ object XboxBackend : StoreBackend {
access = emptyMap()
}
XboxLibraryCache.clear(context)
+ XboxCloudSession.clear()
+ XboxCloudActivity.clearWebSignIn(context)
XboxRuntime.stop()
}
StoresState.post { packageChoice = null; StoresState.shelves.remove(store); StoresState.found.remove(store) }
@@ -49,7 +51,7 @@ object XboxBackend : StoreBackend {
if (current == generation) {
if (cached != null) StoresState.library[store] = mergeItems(StoresState.library[store], cached.games)
StoresState.problems.remove(store)
- if (cached == null || force) StoresState.status[store] = "Syncing Xbox library…"
+ if (cached == null || force) StoresState.status[store] = app.getString(com.droiddeck.launcher.R.string.stores_sync_library)
else StoresState.status.remove(store)
}
}
@@ -57,9 +59,13 @@ object XboxBackend : StoreBackend {
val response = Xodus.run(app, listOf("library", "--json", "--market", market))
val licenses = XboxCatalog.access(response, account, market, report = { StoresState.logLine("Xbox: $it") })
val products = XboxCatalog.rawProducts(licenses.keys.toList(), market)
- val games = products.mapNotNull { XboxCatalog.product(it, licenses) }.sortedBy { it.title.lowercase() }
+ val cloud = runCatching { XboxCatalog.cloudCatalog(market) }
+ .onFailure { StoresState.logLine("Xbox: cloud lists unavailable (${it.javaClass.simpleName})") }.getOrNull()
+ val games = mergeEditions(products.mapNotNull { XboxCatalog.product(it, licenses, cloud) }).sortedBy { it.title.lowercase() }
StoresState.logLine("Xbox: library catalog requested=${licenses.size} returned=${products.size} supported=${games.size} " +
- "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")}")
+ "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")} " +
+ "pc=${games.count { it.xboxPc }} cloud=${games.count { it.xboxCloud }} cloud-only=${games.count { !it.xboxPc }} " +
+ "cloud-lists=${cloud?.gamePass?.size ?: -1}/${cloud?.all?.size ?: -1}")
synchronized(this) {
if (current != generation || StoreAccounts.signedInAs(app, store) != account) return@Thread
access = licenses
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt
index 100371b06e..d4a16c4098 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt
@@ -10,7 +10,7 @@ import java.time.Instant
internal object XboxCatalog {
private val productId = Regex("[A-Z0-9]{12}")
private val plans = setOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC0K6L8", "CFQ7TTC10QFD")
- /** Plans that include PC games; the retired console-only plan must not offer a Windows install. */
+ /** Plans whose store offers advertise PC games. Library entitlements under any active plan count, as the backend resolves a PC package for them. */
private val pcPlans = mapOf(
"CFQ7TTC0KGQ8" to "PC Game Pass",
"CFQ7TTC0KHS0" to "Game Pass Ultimate",
@@ -61,7 +61,7 @@ internal object XboxCatalog {
val parent = row.optString("satisfiedByProductId").takeUnless { it.isBlank() || it == "null" }
if (parent == null) return if (id in plans) null else "owned"
if (parent in blocked) return null
- if (parent in plans) return if (parent in pcPlans && activePlan(parent)) "gamepass" else null
+ if (parent in plans) return if (activePlan(parent)) "gamepass" else null
return kind(parent, visited + id)
}
val result = rows.keys.mapNotNull { id -> kind(id)?.let { id to it } }.toMap()
@@ -98,7 +98,7 @@ internal object XboxCatalog {
return products(objects(body.optJSONArray("productsList")).map { it.optString("productId") }.take(24), access)
}
- internal fun product(json: JSONObject, access: Map): CatalogItem? {
+ internal fun product(json: JSONObject, access: Map, cloud: XboxCloudCatalog? = null): CatalogItem? {
val id = json.optString("ProductId").uppercase()
if (!productId.matches(id) || json.optString("ProductType") != "Game") return null
val localized = objects(json.optJSONArray("LocalizedProperties")).firstOrNull() ?: return null
@@ -107,7 +107,9 @@ internal object XboxCatalog {
objects(it.optJSONObject("Sku")?.optJSONObject("Properties")?.optJSONArray("Packages"))
}
val pc = packages.filter { pkg -> objects(pkg.optJSONArray("PlatformDependencies")).any { it.optString("PlatformName") == "Windows.Desktop" } }
- if (pc.none { it.optString("PackageFormat").equals("MSIXVC", true) }) return null
+ val installable = pc.any { it.optString("PackageFormat").equals("MSIXVC", true) }
+ val streams = cloud?.streams(id, access[id].orEmpty()) == true
+ if (!installable && !streams) return null
val images = objects(localized.optJSONArray("Images"))
fun image(vararg kinds: String): String? = kinds.firstNotNullOfOrNull { purpose ->
images.firstOrNull { it.optString("ImagePurpose") == purpose }?.optString("Uri")?.let { raw ->
@@ -127,13 +129,57 @@ internal object XboxCatalog {
storeUrl = "https://www.xbox.com/games/store/$id",
publisher = localized.optString("PublisherName"), developer = localized.optString("DeveloperName"),
description = localized.optString("ProductDescription"),
- sizeBytes = pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L,
- extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty()),
+ sizeBytes = if (installable) pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L else 0L,
+ extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty(), "pc" to flag(installable), "cloud" to flag(streams)),
)
}
+ private const val CLOUD_GAME_PASS = "29a81209-df6f-41fd-a528-2ae6b91f719c"
+ private const val CLOUD_ALL = "ce573635-7c18-4d0c-9d68-90b932393470"
+
+ /** Microsoft's public cloud lists (catalog.gamepass.com "sigls"; ids as Better xCloud by redphx, MIT, uses them). */
+ fun cloudCatalog(market: String = Xodus.market()): XboxCloudCatalog =
+ XboxCloudCatalog(cloudList(CLOUD_GAME_PASS, market), cloudList(CLOUD_ALL, market))
+
+ private fun cloudList(id: String, market: String): Set {
+ 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 = 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, val all: Set) {
+ fun streams(id: String, access: String): Boolean = when (access) {
+ "gamepass" -> id in gamePass
+ "owned" -> id in all || id in gamePass
+ else -> false
+ }
+}
+
+val CatalogItem.xboxPc: Boolean get() = extra["pc"] != "0"
+val CatalogItem.xboxCloud: Boolean get() = extra["cloud"] == "1"
+val CatalogItem.xboxCloudId: String get() = extra["cloudId"]?.takeIf { it.isNotEmpty() } ?: id
+
+/** Microsoft lists console and PC editions as separate products; a cloud-only one with a PC game's title folds into that card. */
+internal fun mergeEditions(games: List): List {
+ 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()
+ val merged = games.map { game ->
+ if (!game.xboxPc || game.xboxCloud) game
+ else cloudOnly[key(game.title)]?.firstOrNull()?.let { console ->
+ folded.add(console.id)
+ game.copy(extra = game.extra + mapOf("cloud" to "1", "cloudId" to console.id))
+ } ?: game
+ }
+ return merged.filter { it.id !in folded }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt
new file mode 100644
index 0000000000..1fa7bdfe56
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt
@@ -0,0 +1,189 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.util.Log
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowManager
+import android.webkit.ConsoleMessage
+import android.webkit.CookieManager
+import android.webkit.PermissionRequest
+import android.webkit.WebChromeClient
+import android.webkit.WebResourceRequest
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.FrameLayout
+import androidx.activity.ComponentActivity
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
+
+/**
+ * Microsoft's web player (xbox.com/play) in its own process and WebView data directory: the store sign-in
+ * clears its own web data after each attempt, so the player keeps a separate Microsoft session. Signing out of
+ * the store clears it ([clearWebSignIn]).
+ */
+class XboxCloudActivity : ComponentActivity() {
+ private var web: WebView? = null
+ private var custom: View? = null
+ private var customCallback: WebChromeClient.CustomViewCallback? = null
+ private lateinit var root: FrameLayout
+
+ @SuppressLint("SetJavaScriptEnabled")
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+ hideBars()
+ root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) }
+ setContentView(root)
+ Log.i(TAG, "WebView ${WebViewCompat.getCurrentWebViewPackage(this)?.versionName}")
+
+ val view = WebView(this)
+ web = view
+ view.settings.apply {
+ javaScriptEnabled = true
+ domStorageEnabled = true
+ databaseEnabled = true
+ mediaPlaybackRequiresUserGesture = false
+ allowFileAccess = false
+ allowContentAccess = false
+ mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW
+ useWideViewPort = true
+ loadWithOverviewMode = true
+ userAgentString = chromeUserAgent(userAgentString)
+ }
+ // No "X-Requested-With: " header: it marks the page as embedded in an app.
+ if (WebViewFeature.isFeatureSupported(WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST))
+ WebSettingsCompat.setRequestedWithHeaderOriginAllowList(view.settings, emptySet())
+ Log.i(TAG, "UA ${view.settings.userAgentString}")
+ CookieManager.getInstance().setAcceptCookie(true)
+ CookieManager.getInstance().setAcceptThirdPartyCookies(view, true)
+ view.webViewClient = object : WebViewClient() {
+ override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean =
+ request.url.scheme != "https"
+ override fun onPageFinished(view: WebView, url: String) { Log.i(TAG, "page ${url.substringBefore('?')}") }
+ }
+ view.webChromeClient = object : WebChromeClient() {
+ override fun onConsoleMessage(message: ConsoleMessage): Boolean {
+ Log.d(TAG, "console ${message.messageLevel()}: ${message.message().take(300)}")
+ return true
+ }
+ override fun onPermissionRequest(request: PermissionRequest) {
+ Log.i(TAG, "permission request ${request.resources.joinToString()} denied")
+ request.deny()
+ }
+ override fun onShowCustomView(view: View, callback: CustomViewCallback) {
+ custom?.let { root.removeView(it) }
+ custom = view; customCallback = callback
+ root.addView(view, FrameLayout.LayoutParams(-1, -1))
+ hideBars()
+ }
+ override fun onHideCustomView() {
+ custom?.let { root.removeView(it) }
+ custom = null; customCallback = null
+ }
+ }
+ root.addView(view, FrameLayout.LayoutParams(-1, -1))
+ if (savedInstanceState != null) view.restoreState(savedInstanceState)
+ else view.loadUrl(startUrl(intent))
+ }
+
+ override fun onNewIntent(intent: Intent) {
+ super.onNewIntent(intent)
+ setIntent(intent)
+ web?.loadUrl(startUrl(intent))
+ }
+
+ private fun startUrl(intent: Intent): String =
+ intent.getStringExtra("url")?.takeIf { url -> runCatching { java.net.URI(url) }.getOrNull()?.let {
+ it.scheme == "https" && it.host == "www.xbox.com" && it.userInfo == null && it.port == -1 } == true } ?: START_URL
+
+ // Without the WebView markers the page treats this as Chrome for Android.
+ private fun chromeUserAgent(default: String): String =
+ default.replace("; wv)", ")").replace(Regex(" Version/\\d+(\\.\\d+)*"), "")
+
+ private fun hideBars() {
+ WindowCompat.setDecorFitsSystemWindows(window, false)
+ WindowInsetsControllerCompat(window, window.decorView).apply {
+ hide(WindowInsetsCompat.Type.systemBars())
+ systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+ }
+ }
+
+ override fun onWindowFocusChanged(hasFocus: Boolean) {
+ super.onWindowFocusChanged(hasFocus)
+ if (hasFocus) hideBars()
+ }
+
+ // A controller's unused B arrives as BACK; ask before leaving so a stray press never ends a stream.
+ override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+ if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+ val fromController = event.source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD ||
+ event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+ when {
+ custom != null -> customCallback?.onCustomViewHidden()
+ fromController -> confirmLeave()
+ web?.canGoBack() == true -> web?.goBack()
+ else -> finish()
+ }
+ return true
+ }
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) return true
+ return super.dispatchKeyEvent(event)
+ }
+
+ private var leaving: android.app.AlertDialog? = null
+
+ private fun confirmLeave() {
+ if (leaving?.isShowing == true) return
+ leaving = android.app.AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
+ .setTitle("Leave Xbox Cloud Gaming?")
+ .setMessage("The stream ends when you leave.")
+ .setPositiveButton("Leave") { _, _ -> finish() }
+ .setNegativeButton("Stay", null)
+ .show()
+ }
+
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ web?.saveState(outState)
+ }
+
+ override fun onPause() { super.onPause(); CookieManager.getInstance().flush() }
+
+ override fun onDestroy() {
+ web?.let { root.removeView(it); it.stopLoading(); it.destroy() }
+ web = null
+ super.onDestroy()
+ }
+
+ companion object {
+ private const val TAG = "XboxCloud"
+ const val START_URL = "https://www.xbox.com/play"
+
+ fun intent(context: Context, url: String? = null): Intent = Intent(context, XboxCloudActivity::class.java)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+ .apply { if (url != null) putExtra("url", url) }
+
+ const val PROCESS_SUFFIX = ":xboxcloud"
+ const val WEBVIEW_SUFFIX = "xboxcloud"
+
+ fun clearWebSignIn(context: Context) {
+ val am = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
+ am.runningAppProcesses.orEmpty().filter { it.processName.endsWith(PROCESS_SUFFIX) }
+ .forEach { android.os.Process.killProcess(it.pid) }
+ val suffix = WEBVIEW_SUFFIX
+ listOf(java.io.File(context.applicationInfo.dataDir, "app_webview_$suffix"), java.io.File(context.cacheDir.parentFile, "cache/webview_$suffix"))
+ .forEach { runCatching { it.deleteRecursively() } }
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt
new file mode 100644
index 0000000000..10b034eaae
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt
@@ -0,0 +1,135 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import android.content.Intent
+import androidx.compose.runtime.mutableStateListOf
+import com.droiddeck.launcher.frontend.Library
+import com.droiddeck.launcher.session.SessionState
+import com.droiddeck.launcher.stores.CatalogItem
+import com.droiddeck.launcher.stores.Store
+import com.droiddeck.launcher.stores.StoresState
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+
+/** Xbox games added to the Games tab to stream before (or without) installing them. */
+object XboxCloudGames {
+ class Entry(val id: String, val title: String, val poster: String?, val hero: String?)
+
+ private const val PREFS = "xbox_cloud_games"
+ private val idPattern = Regex("[A-Z0-9]{12}")
+ val entries = mutableStateListOf()
+ @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): 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 = runCatching {
+ val array = JSONArray(text ?: return emptyList())
+ (0 until minOf(array.length(), 2000)).mapNotNull { array.optJSONObject(it) }.mapNotNull { o ->
+ val id = o.optString("id")
+ val title = o.optString("title")
+ if (!idPattern.matches(id) || title.isBlank()) null
+ else Entry(id, title.take(200), o.optString("poster").takeIf { it.isNotEmpty() }, o.optString("hero").takeIf { it.isNotEmpty() })
+ }.distinctBy { it.id }
+ }.getOrDefault(emptyList())
+
+ /** Games-tab rows for the added games that are not installed (an installed copy has its own row). */
+ fun rows(context: Context, installedIds: Set): List = entries.filter { it.id !in installedIds }.map { e ->
+ val dir = artDir(context, e.id)
+ val appId = rowId(e.id)
+ Library.SteamGame(appId = appId, name = e.title, art = File(dir, "poster").takeIf { it.isFile }, library = Library.XBOX_CLOUD,
+ hero = File(dir, "hero").takeIf { it.isFile }, source = Store.XBOX.id, storeId = e.id)
+ }
+
+ internal fun rowId(id: String): Int = ("xbox-cloud:$id").hashCode() or Int.MIN_VALUE
+
+ private fun artDir(context: Context, id: String) = File(context.filesDir, "xbox-cloud-art/$id")
+
+ private fun fetch(url: String?, target: File) {
+ if (url == null) return
+ runCatching {
+ val parsed = URL(url)
+ require(parsed.protocol == "https" && parsed.host in setOf("store-images.s-microsoft.com", "store-images.microsoft.com"))
+ val connection = parsed.openConnection() as HttpURLConnection
+ try {
+ connection.connectTimeout = 15_000; connection.readTimeout = 30_000
+ check(connection.responseCode == 200)
+ val bytes = connection.inputStream.use { it.readBytes() }
+ require(bytes.size in 1..12_000_000)
+ target.parentFile?.mkdirs()
+ File(target.path + ".tmp").apply { writeBytes(bytes); check(renameTo(target)) }
+ } finally { connection.disconnect() }
+ }
+ }
+
+ private val prefetching = java.util.concurrent.atomic.AtomicBoolean(false)
+
+ /**
+ * Fetches the streaming tokens in the background while a cloud game is on screen (about 20 s), so Stream starts at
+ * once; both players take them from this process (the native one through XboxCloudTokenService).
+ */
+ fun prefetch(context: Context) {
+ val app = context.applicationContext
+ if (!prefetching.compareAndSet(false, true)) return
+ Thread({
+ try {
+ val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return@Thread
+ runCatching { XboxCloudSession.get(app, account) }
+ .onFailure { StoresState.logLine("Xbox: cloud tokens not fetched ahead: ${it.message?.take(160)}") }
+ } finally { prefetching.set(false) }
+ }, "xcloud-prefetch").start()
+ }
+
+ /** Streaming runs outside the Linux session; the session owns the screen, audio and controllers while it runs. */
+ fun stream(context: Context, id: String, title: String) {
+ if (SessionState.running) {
+ android.widget.Toast.makeText(context, "Close the Steam session to stream Xbox games.", android.widget.Toast.LENGTH_LONG).show()
+ return
+ }
+ context.startActivity(XboxCloudPlayerActivity.playerIntent(context, id, title).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+ }
+
+ /** Whether the signed-in library says this game streams (cached library; reads disk). */
+ fun streams(context: Context, id: String): Boolean = runCatching {
+ StoresState.library[Store.XBOX]?.firstOrNull { it.id == id }?.let { return it.xboxCloud }
+ val app = context.applicationContext
+ val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return false
+ XboxLibraryCache.read(app, account, Xodus.market())?.games?.firstOrNull { it.id == id }?.xboxCloud == true
+ }.getOrDefault(false)
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt
new file mode 100644
index 0000000000..9b8d11c0d0
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt
@@ -0,0 +1,399 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.WindowManager
+import android.webkit.JavascriptInterface
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.webkit.WebViewAssetLoader
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.ui.unit.dp
+import com.droiddeck.launcher.stores.Store
+import com.droiddeck.launcher.stores.StoreAccounts
+import com.droiddeck.launcher.stores.StoresState
+import org.json.JSONObject
+import java.util.concurrent.Executors
+
+/** Runs the WebRTC client page (tools/xcloud-player); signalling and tokens stay on this side of the bridge. */
+class XboxCloudPlayerActivity : ComponentActivity() {
+ private lateinit var root: FrameLayout
+ private var web: WebView? = null
+ private var notice: LinearLayout? = null
+ private val worker = Executors.newSingleThreadExecutor()
+ private val signalling = Executors.newCachedThreadPool()
+ @Volatile private var session: XboxCloudSession.Session? = null
+ @Volatile private var sessionPath: String? = null
+ @Volatile private var titleId: String? = null
+ @Volatile private var closed = false
+ @Volatile private var webUrl: String? = null
+ @Volatile private var settings = XboxCloudSettings()
+ @Volatile private var sessionSignals: XboxCloudSignalling? = null
+ /** The settings this stream started with (stream-start settings changed since then need a restart). */
+ @Volatile private var startedWith: XboxCloudSettings? = null
+ private var menu: androidx.compose.ui.platform.ComposeView? = null
+
+ @SuppressLint("SetJavaScriptEnabled")
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+ hideBars()
+ watchBars()
+ root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) }
+ setContentView(root)
+ val requested = intent.getStringExtra("product").orEmpty()
+ showNotice("Signing in to Xbox Cloud Gaming…", withButtons = false)
+ worker.execute {
+ val result = runCatching {
+ val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: error("Sign in to the Xbox store first.")
+ val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested }
+ val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested
+ webUrl = XboxCatalog.cloudUrl(requested, cached?.title ?: intent.getStringExtra("title").orEmpty(), product)
+ val active = XboxCloudSession.get(applicationContext, account)
+ val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.")
+ settings = XboxCloudSettings.load(applicationContext)
+ startedWith = settings
+ session = active.forStream(settings.region, settings.osName); titleId = title
+ diag("cloud player: $product -> title $title, region ${java.net.URI(session!!.baseUri).host}, transfer=${active.userToken != null}")
+ }
+ runOnUiThread {
+ if (closed) return@runOnUiThread
+ result.onSuccess { openPlayer() }.onFailure {
+ diag("cloud player not started: ${it.javaClass.simpleName}: ${it.message?.take(160)}")
+ showNotice(it.message ?: "Xbox Cloud Gaming could not start.", withButtons = true)
+ }
+ }
+ }
+ }
+
+ @SuppressLint("SetJavaScriptEnabled")
+ private fun openPlayer() {
+ val loader = WebViewAssetLoader.Builder().addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this)).build()
+ val view = WebView(this)
+ web = view
+ view.settings.apply {
+ javaScriptEnabled = true
+ mediaPlaybackRequiresUserGesture = false
+ allowFileAccess = false
+ allowContentAccess = false
+ }
+ view.setBackgroundColor(Color.BLACK)
+ // The Gamepad API only sees controllers while the WebView has input focus.
+ view.isFocusable = true
+ view.isFocusableInTouchMode = true
+ view.addJavascriptInterface(Bridge(), "DDCloud")
+ view.webViewClient = object : WebViewClient() {
+ override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? =
+ loader.shouldInterceptRequest(request.url)
+ override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = true
+ }
+ view.webChromeClient = object : android.webkit.WebChromeClient() {
+ override fun onConsoleMessage(message: android.webkit.ConsoleMessage): Boolean {
+ android.util.Log.d("XboxCloudPlayer", "console ${message.messageLevel()}: ${message.message().take(300)}")
+ return true
+ }
+ }
+ root.addView(view, 0, FrameLayout.LayoutParams(-1, -1))
+ notice?.let { root.removeView(it) }
+ notice = null
+ view.requestFocus()
+ view.loadUrl("https://appassets.androidplatform.net/assets/xcloud/player.html")
+ }
+
+ private inner class Bridge {
+ @JavascriptInterface
+ fun call(id: Int, op: String, arg: String) {
+ signalling.execute {
+ val reply = runCatching { handle(op, arg) }.getOrElse { XboxCloudSession.Reply(0, it.javaClass.simpleName) }
+ if (reply.status !in 200..299) diag("cloud player $op: ${reply.status} ${reply.body.take(300)}")
+ else if (op != "state" && op != "keepalive") diag("cloud player $op: ${reply.status}")
+ runOnUiThread { web?.evaluateJavascript("window.__ddResolve($id, ${reply.status}, ${JSONObject.quote(reply.body)})", null) }
+ }
+ }
+
+ @JavascriptInterface
+ fun status(text: String) { android.util.Log.i("XboxCloudPlayer", "status: ${text.take(120)}") }
+
+ @JavascriptInterface
+ fun playing() {
+ diag("cloud player streaming")
+ runOnUiThread { web?.requestFocus() }
+ }
+
+ @JavascriptInterface
+ fun settings(): String = pageSettings(this@XboxCloudPlayerActivity.settings)
+
+ @JavascriptInterface
+ fun log(text: String) { diag("cloud player page: ${text.take(240)}") }
+
+ @JavascriptInterface
+ fun failed(stage: String, detail: String) {
+ diag("cloud player failed at ${stage.take(40)}: ${detail.take(300)}")
+ runOnUiThread { if (!closed) showNotice("The stream could not start ($stage).", withButtons = true) }
+ }
+ }
+
+ private fun handle(op: String, arg: String): XboxCloudSession.Reply {
+ val active = session ?: error("no session")
+ val signals = sessionSignals ?: XboxCloudSignalling(active, titleId ?: error("no title"), settings).also { sessionSignals = it }
+ return signals.op(op, arg).also { sessionPath = signals.path }
+ }
+
+ private fun showNotice(text: String, withButtons: Boolean) {
+ notice?.let { root.removeView(it) }
+ val box = LinearLayout(this).apply {
+ orientation = LinearLayout.VERTICAL
+ gravity = Gravity.CENTER
+ setBackgroundColor(if (withButtons) Color.argb(230, 0, 0, 0) else Color.TRANSPARENT)
+ }
+ box.addView(TextView(this).apply { setTextColor(Color.WHITE); textSize = 18f; gravity = Gravity.CENTER; this.text = text; setPadding(32, 16, 32, 16) })
+ if (withButtons) {
+ val row = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER }
+ (webUrl ?: intent.getStringExtra("webUrl"))?.let { url ->
+ row.addView(Button(this).apply { this.text = "Open in Microsoft's player"; setOnClickListener { startActivity(XboxCloudActivity.intent(this@XboxCloudPlayerActivity, url)); finish() } })
+ }
+ row.addView(Button(this).apply { this.text = "Close"; setOnClickListener { finish() } })
+ box.addView(row)
+ }
+ notice = box
+ root.addView(box, FrameLayout.LayoutParams(-1, -1))
+ }
+
+ private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() }
+
+ private fun watchBars() {
+ androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
+ if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) {
+ v.removeCallbacks(rehideBars)
+ v.postDelayed(rehideBars, 1500)
+ }
+ androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets)
+ }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ hideBars()
+ }
+
+ private fun hideBars() {
+ WindowCompat.setDecorFitsSystemWindows(window, false)
+ WindowInsetsControllerCompat(window, window.decorView).apply {
+ hide(WindowInsetsCompat.Type.systemBars())
+ systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+ }
+ }
+
+ override fun onWindowFocusChanged(hasFocus: Boolean) {
+ super.onWindowFocusChanged(hasFocus)
+ if (hasFocus) hideBars()
+ }
+
+ private var guideDown = false
+ private var guideDownAt = 0L
+ private var lastGuideUp = 0L
+ private var pendingNexus: Runnable? = null
+ private var swallowGuideUp = false
+
+ private fun isGuideKey(event: KeyEvent): Boolean = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE
+
+ /** One press is the stream's Xbox button; two quick presses or a hold open the player menu. */
+ private fun guideKey(event: KeyEvent): Boolean {
+ if (!isGuideKey(event)) return false
+ if (event.action == KeyEvent.ACTION_DOWN) {
+ if (event.repeatCount == 0) {
+ guideDown = true; guideDownAt = event.eventTime
+ val pending = pendingNexus
+ if (pending != null && event.eventTime - lastGuideUp <= DOUBLE_PRESS_MS) {
+ root.removeCallbacks(pending); pendingNexus = null; guideDown = false
+ swallowGuideUp = true
+ openMenu()
+ }
+ } else if (guideDown && event.eventTime - guideDownAt >= 600) {
+ guideDown = false
+ swallowGuideUp = true
+ openMenu()
+ }
+ } else if (event.action == KeyEvent.ACTION_UP && guideDown) {
+ guideDown = false
+ lastGuideUp = event.eventTime
+ val tap = Runnable { pendingNexus = null; pressNexus(1); root.postDelayed({ pressNexus(0) }, 150) }
+ pendingNexus = tap
+ root.postDelayed(tap, DOUBLE_PRESS_MS)
+ }
+ return true
+ }
+
+ private fun pressNexus(value: Int) {
+ web?.evaluateJavascript("window.__ddButton && window.__ddButton('Nexus', $value)", null)
+ }
+
+ // Back opens the player menu so a stray press never ends a stream.
+ override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+ if (menu != null) {
+ if (isGuideKey(event)) {
+ if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() }
+ return true
+ }
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) {
+ if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() }
+ return true
+ }
+ return super.dispatchKeyEvent(event)
+ }
+ if (notice == null && guideKey(event)) return true
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) {
+ if (event.action == KeyEvent.ACTION_UP) { if (notice == null) openMenu() else finish() }
+ return true
+ }
+ // Reporting controller buttons handled stops Android turning an unused one into a fallback key.
+ val handled = super.dispatchKeyEvent(event)
+ val fromController = event.source and android.view.InputDevice.SOURCE_GAMEPAD == android.view.InputDevice.SOURCE_GAMEPAD ||
+ event.source and android.view.InputDevice.SOURCE_JOYSTICK == android.view.InputDevice.SOURCE_JOYSTICK
+ return handled || (notice == null && web != null && fromController)
+ }
+
+ private var menuPage by androidx.compose.runtime.mutableStateOf("")
+
+ private fun openMenu() {
+ if (menu != null || web == null) return
+ web?.evaluateJavascript("window.__ddInput && window.__ddInput(false)", null)
+ menuPage = ""
+ val regions = session?.regionList?.map { it.name }.orEmpty()
+ val view = androidx.compose.ui.platform.ComposeView(this)
+ view.setContent {
+ com.droiddeck.launcher.ui.DroidDeckTheme {
+ var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) }
+ val entries = androidx.compose.runtime.remember { List(6) { androidx.compose.ui.focus.FocusRequester() } }
+ androidx.compose.runtime.LaunchedEffect(menuPage) {
+ if (menuPage.isEmpty()) runCatching { entries[lastMainEntry.coerceIn(0, 5)].requestFocus() }
+ }
+ val cs = androidx.compose.material3.MaterialTheme.colorScheme
+ androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) {
+ androidx.compose.foundation.layout.Column(
+ androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f))
+ .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp),
+ ) {
+ androidx.compose.material3.Text(intent.getStringExtra("title").orEmpty().ifEmpty { "Xbox Cloud Gaming" },
+ style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp))
+ if (menuPage.isEmpty()) {
+ MenuEntry("Resume", "Back to the game", entries[0], 0) { closeMenu() }
+ MenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once, or View + Menu)", entries[1], 1) {
+ closeMenu(); web?.evaluateJavascript("window.__ddNexus && window.__ddNexus()", null)
+ }
+ MenuEntry("Screen effects", "Sharpen, colour, deband, FXAA, CRT, NTSC, Toon, fps cap", entries[2], 2) { menuPage = "picture" }
+ MenuEntry("Stream quality", "Resolution, region, language, codec, bitrate (next stream)", entries[3], 3) { menuPage = "stream" }
+ MenuEntry("Performance overlay and sound", "Overlay level and layout, volume, controller rumble", entries[4], 4) { menuPage = "overlay" }
+ MenuEntry("Leave", "End the stream", entries[5], 5) { finish() }
+ androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.",
+ style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp))
+ } else {
+ MenuEntry("‹ Back", null) { menuPage = "" }
+ if (menuPage == "stream") MenuEntry("Restart the stream with these settings",
+ "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() }
+ val page = menuPage
+ XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0,
+ onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed ->
+ current = changed
+ settings = changed
+ XboxCloudSettings.save(this@XboxCloudPlayerActivity, changed)
+ web?.evaluateJavascript("window.__ddApply && window.__ddApply(${JSONObject.quote(pageSettings(changed))})", null)
+ }
+ }
+ }
+ }
+ }
+ }
+ menu = view
+ root.addView(view, FrameLayout.LayoutParams(-1, -1))
+ view.requestFocus()
+ }
+
+ private fun pageSettings(s: XboxCloudSettings): String = JSONObject(s.toJson())
+ .put("server", session?.let { active -> active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name } ?: "").toString()
+
+ private var lastMainEntry = 0
+ private val lastRow = mutableMapOf()
+
+ @androidx.compose.runtime.Composable
+ private fun MenuEntry(title: String, note: String?, focus: androidx.compose.ui.focus.FocusRequester? = null, index: Int = -1, onClick: () -> Unit) =
+ XboxMenuEntry(title, note, focus, { if (index >= 0) lastMainEntry = index }, onClick)
+
+ private fun restartStream() {
+ val active = session; val path = sessionPath
+ sessionPath = null
+ closeMenu()
+ showNotice("Restarting the stream…", withButtons = false)
+ Thread({
+ if (active != null && path != null) runCatching { XboxCloudSession.request(active, "DELETE", "/$path") }
+ .onSuccess { diag("cloud player restart: session closed ${it.status}") }
+ runOnUiThread { if (!isFinishing) { startActivity(playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } }
+ }, "xcloud-restart").start()
+ }
+
+ private fun closeMenu() {
+ menu?.let { root.removeView(it) }
+ menu = null
+ web?.evaluateJavascript("window.__ddInput && window.__ddInput(true)", null)
+ web?.requestFocus()
+ }
+
+ override fun onDestroy() {
+ closed = true
+ web?.let { it.evaluateJavascript("window.__ddStop && window.__ddStop()", null); root.removeView(it); it.destroy() }
+ web = null
+ val active = session; val path = sessionPath
+ if (active != null && path != null) Thread({
+ runCatching { XboxCloudSession.request(active, "DELETE", "/$path") }
+ .onSuccess { diag("cloud player session closed: ${it.status}") }
+ }, "xcloud-stop").start()
+ worker.shutdownNow(); signalling.shutdownNow()
+ super.onDestroy()
+ }
+
+ private fun diag(text: String) = StoresState.logLine("Xbox: $text")
+
+ companion object {
+ private const val DOUBLE_PRESS_MS = 350L
+
+ fun intent(context: Context, productId: String, title: String): Intent = Intent(context, XboxCloudPlayerActivity::class.java)
+ .putExtra("product", productId.uppercase()).putExtra("title", title)
+
+ /** The player the settings pick: the native engine (frame generation) where it can run, else the web player. */
+ fun playerIntent(context: Context, productId: String, title: String): Intent {
+ val native = XboxNativePlayerActivity.supported() && XboxCloudSettings.load(context).playerEngine == "native"
+ return if (!native) intent(context, productId, title) else Intent(context, XboxNativePlayerActivity::class.java)
+ .putExtra("product", productId.uppercase()).putExtra("title", title)
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt
new file mode 100644
index 0000000000..ca21202781
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt
@@ -0,0 +1,120 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import org.json.JSONArray
+import org.json.JSONObject
+import java.net.HttpURLConnection
+import java.net.URL
+
+/** Streaming-service tokens stay in memory only. Request shapes follow Greenlight / xal-node by unknownskl (MIT). */
+internal object XboxCloudSession {
+ class Region(val name: String, val baseUri: String, val isDefault: Boolean)
+
+ class Session(val account: String, val token: String, val offering: String, val baseUri: String, val regionList: List,
+ val userToken: String?, internal val expiresAt: Long,
+ val osName: String = "windows") {
+ val fresh get() = System.currentTimeMillis() < expiresAt - 5 * 60_000L
+ val regions get() = regionList.size
+
+ fun forStream(regionName: String, os: String): Session = Session(account, token, offering,
+ regionList.firstOrNull { it.name == regionName }?.baseUri ?: baseUri, regionList, userToken, expiresAt, os)
+ }
+
+ @Volatile private var cached: Session? = null
+
+ /** One fetch at a time (about 20 s: two ticket exchanges); a second caller waits and gets the same tokens. */
+ @Synchronized
+ fun get(app: Context, account: String): Session {
+ cached?.takeIf { it.account == account && it.fresh }?.let { return it }
+ val json = Xodus.run(app, listOf("cloud-token"), timeout = 60)
+ require(json.getInt("schema") == 1 && json.getString("account") == account)
+ val array = json.getJSONArray("regions")
+ val regions = (0 until array.length()).map { array.getJSONObject(it) }
+ .map { Region(it.getString("name"), it.getString("baseUri"), it.optBoolean("isDefault")) }
+ val default = regions.firstOrNull { it.isDefault } ?: regions.firstOrNull() ?: error("No Xbox Cloud Gaming region")
+ val seconds = json.optLong("durationInSeconds").coerceIn(0, 24 * 3600)
+ return Session(account, json.getString("gsToken"), json.getString("offering"), default.baseUri, regions,
+ json.optString("userToken").takeIf { !json.isNull("userToken") && it.isNotEmpty() }, System.currentTimeMillis() + seconds * 1000).also { cached = it }
+ }
+
+ fun clear() { cached = null; titleIds = null }
+
+ /**
+ * For the native player's own process: the main process's tokens (it keeps them, and fetches them ahead while a
+ * cloud game's page is open), handed over in memory through XboxCloudTokenService; null if that is not reachable.
+ */
+ fun fromMainProcess(app: Context, account: String, timeoutSeconds: Long = 90): Session? {
+ cached?.takeIf { it.account == account && it.fresh }?.let { return it }
+ val reply = XboxCloudTokenService.request(app, account, timeoutSeconds) ?: return null
+ reply.getString("error")?.let { error(it) }
+ return fromBundle(reply).takeIf { it.account == account && it.fresh }?.also { cached = it }
+ }
+
+ internal fun toBundle(s: Session) = android.os.Bundle().apply {
+ putString("account", s.account); putString("token", s.token); putString("offering", s.offering)
+ putString("baseUri", s.baseUri); putString("userToken", s.userToken); putLong("expiresAt", s.expiresAt)
+ putStringArrayList("regionNames", ArrayList(s.regionList.map { it.name }))
+ putStringArrayList("regionUris", ArrayList(s.regionList.map { it.baseUri }))
+ putBooleanArray("regionDefaults", s.regionList.map { it.isDefault }.toBooleanArray())
+ }
+
+ internal fun fromBundle(b: android.os.Bundle): Session {
+ val names = b.getStringArrayList("regionNames").orEmpty()
+ val uris = b.getStringArrayList("regionUris").orEmpty()
+ val defaults = b.getBooleanArray("regionDefaults") ?: BooleanArray(0)
+ val regions = names.indices.map { Region(names[it], uris.getOrElse(it) { "" }, defaults.getOrElse(it) { false }) }
+ return Session(b.getString("account").orEmpty(), b.getString("token").orEmpty(), b.getString("offering").orEmpty(),
+ b.getString("baseUri").orEmpty(), regions, b.getString("userToken"), b.getLong("expiresAt"))
+ }
+
+ @Volatile private var titleIds: Pair>? = null
+
+ fun titles(session: Session): Map {
+ titleIds?.takeIf { it.first == session.account }?.let { return it.second }
+ val reply = request(session, "GET", "/v2/titles")
+ check(reply.status == 200) { "Xbox Cloud Gaming answered ${reply.status}" }
+ val results = JSONObject(reply.body).optJSONArray("results") ?: JSONArray()
+ val map = (0 until results.length()).mapNotNull { index ->
+ val row = results.optJSONObject(index) ?: return@mapNotNull null
+ val product = row.optJSONObject("details")?.optString("productId")?.uppercase().orEmpty()
+ val title = row.optString("titleId")
+ if (product.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && title.length <= 64) product to title else null
+ }.toMap()
+ titleIds = session.account to map
+ return map
+ }
+
+ class Reply(val status: Int, val body: String)
+
+ fun request(session: Session, method: String, path: String, body: String? = null): Reply {
+ val connection = URL(session.baseUri + path).openConnection() as HttpURLConnection
+ try {
+ connection.connectTimeout = 15_000; connection.readTimeout = 30_000
+ connection.requestMethod = method
+ connection.setRequestProperty("Authorization", "Bearer ${session.token}")
+ connection.setRequestProperty("Accept", "application/json")
+ connection.setRequestProperty("Content-Type", "application/json")
+ connection.setRequestProperty("X-Gssv-Client", "XboxComBrowser")
+ connection.setRequestProperty("X-MS-Device-Info", deviceInfo(session.osName))
+ if (body != null) {
+ connection.doOutput = true
+ connection.outputStream.use { it.write(body.toByteArray(Charsets.UTF_8)) }
+ }
+ val status = connection.responseCode
+ val stream = if (status in 200..299) connection.inputStream else connection.errorStream
+ val text = stream?.use { it.readBytes() }?.also { require(it.size <= 16_000_000) } ?: ByteArray(0)
+ return Reply(status, String(text, Charsets.UTF_8))
+ } finally { connection.disconnect() }
+ }
+
+ private fun deviceInfo(os: String) = JSONObject()
+ .put("appInfo", JSONObject().put("env", JSONObject().put("clientAppId", "www.xbox.com").put("clientAppType", "browser")
+ .put("clientAppVersion", "21.1.98").put("clientSdkVersion", "8.5.3").put("httpEnvironment", "prod").put("sdkInstallId", "")))
+ .put("dev", JSONObject()
+ .put("hw", JSONObject().put("make", "Microsoft").put("model", "unknown").put("sdktype", "web"))
+ .put("os", JSONObject().put("name", os).put("ver", "22631.2715").put("platform", "desktop"))
+ .put("displayInfo", JSONObject().put("dimensions", JSONObject().put("widthInPixels", 1920).put("heightInPixels", 1080))
+ .put("pixelDensity", JSONObject().put("dpiX", 2).put("dpiY", 2)))
+ .put("browser", JSONObject().put("browserName", "chrome").put("browserVersion", "119.0")))
+ .toString()
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt
new file mode 100644
index 0000000000..7b8806a36e
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt
@@ -0,0 +1,108 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import org.json.JSONObject
+
+data class XboxCloudSettings(
+ val resolution: String = "1080p", // 720p | 1080p | 1080p_hq
+ val region: String = "", // "" = Microsoft's choice
+ val language: String = "", // "" = the device's language
+ val codec: String = "default", // default | high | normal | low
+ val bitrateMbps: Int = 0, // 0 = no cap
+ val preventDrops: Boolean = false,
+ val statsLevel: Int = 0, // 0 off, 1 fps, 2 basic, 3 detailed, 4 full
+ val statsLayout: String = "horizontal",
+ val statsCorner: String = "right", // right | left
+ val volume: Int = 100, // 100..300 %
+ val rumble: Int = 100, // 0..100 %
+ val maxFps: Int = 0,
+ val brightness: Int = 0,
+ val contrast: Int = 0,
+ val gamma: Float = 1f,
+ val saturation: Int = 100,
+ val sharpen: Int = 0,
+ val sharpenMode: String = "cas", // cas | usm
+ val deband: Int = 0,
+ val fxaa: Boolean = false,
+ val toon: Boolean = false,
+ val crt: Boolean = false,
+ val ntsc: Boolean = false,
+ val playerEngine: String = "web", // web | native (WebRTC library + DroidDeck's compositor, frame generation)
+ val frameGen: String = "ddfg", // native engine: off | ddfg (2x) | lsfg | lsfg3 | lsfg4 (needs Lossless.dll)
+ val fpsLimit: Int = 0, // native engine target: 0 = the screen's rate, else 30/45/60/120/144/165
+ val fpsCustomOn: Boolean = false, // use fpsCustom instead of the presets
+ val fpsCustom: Int = 60, // 10..165
+ val instantInput: Boolean = true, // native: send controller changes at once (else every 16 ms)
+ val smallBuffer: Boolean = false, // native: WebRTC shows frames as soon as decoded (no playout delay)
+ val fastDecoder: Boolean = true, // native: the hardware decoder's low-latency mode
+ val zeroCopy: Boolean = false, // native, frame generation off: decode straight onto the screen
+) {
+ /** The native engine's frame-rate target (0 = the screen's own rate). */
+ val fpsTarget get() = if (fpsCustomOn) fpsCustom else fpsLimit
+
+ /** The service picks the stream resolution from the reported OS (Better xCloud's mapping). */
+ val osName get() = when (resolution) { "720p" -> "android"; "1080p_hq" -> "tizen"; else -> "windows" }
+
+ fun toJson(): String = JSONObject()
+ .put("resolution", resolution).put("region", region).put("language", language).put("codec", codec)
+ .put("bitrateMbps", bitrateMbps).put("preventDrops", preventDrops).put("statsLevel", statsLevel).put("statsLayout", statsLayout).put("statsCorner", statsCorner)
+ .put("volume", volume).put("rumble", rumble).put("maxFps", maxFps).put("brightness", brightness).put("contrast", contrast)
+ .put("gamma", gamma.toDouble()).put("saturation", saturation).put("sharpen", sharpen).put("sharpenMode", sharpenMode)
+ .put("deband", deband).put("fxaa", fxaa).put("toon", toon).put("crt", crt).put("ntsc", ntsc)
+ .put("playerEngine", playerEngine).put("frameGen", frameGen)
+ .put("fpsLimit", fpsLimit).put("fpsCustomOn", fpsCustomOn).put("fpsCustom", fpsCustom)
+ .put("instantInput", instantInput).put("smallBuffer", smallBuffer).put("fastDecoder", fastDecoder).put("zeroCopy", zeroCopy)
+ .toString()
+
+ fun withoutEffects() = copy(brightness = 0, contrast = 0, gamma = 1f, saturation = 100, sharpen = 0, sharpenMode = "cas",
+ deband = 0, fxaa = false, toon = false, crt = false, ntsc = false)
+
+ companion object {
+ private const val PREFS = "xbox_cloud"
+ private const val KEY = "settings"
+
+ fun load(context: Context): XboxCloudSettings =
+ decode(context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null))
+
+ internal fun decode(text: String?): XboxCloudSettings = runCatching {
+ val json = JSONObject(text ?: return XboxCloudSettings())
+ val d = XboxCloudSettings()
+ XboxCloudSettings(
+ resolution = json.optString("resolution", d.resolution).takeIf { it in setOf("720p", "1080p", "1080p_hq") } ?: d.resolution,
+ region = json.optString("region", d.region).take(64), language = json.optString("language", d.language).take(16),
+ codec = json.optString("codec", d.codec).takeIf { it in setOf("default", "high", "normal", "low") } ?: d.codec,
+ bitrateMbps = json.optInt("bitrateMbps", d.bitrateMbps).coerceIn(0, 100),
+ preventDrops = json.optBoolean("preventDrops", d.preventDrops),
+ statsLevel = json.optInt("statsLevel", d.statsLevel).coerceIn(0, 4),
+ statsLayout = json.optString("statsLayout", d.statsLayout).takeIf { it == "vertical" } ?: "horizontal",
+ statsCorner = json.optString("statsCorner", d.statsCorner).takeIf { it == "left" } ?: "right",
+ volume = json.optInt("volume", d.volume).coerceIn(100, 300), rumble = json.optInt("rumble", d.rumble).coerceIn(0, 100),
+ maxFps = json.optInt("maxFps", d.maxFps).coerceIn(0, 120),
+ brightness = json.optInt("brightness", d.brightness).coerceIn(-50, 50), contrast = json.optInt("contrast", d.contrast).coerceIn(-100, 100),
+ gamma = json.optDouble("gamma", 1.0).toFloat().coerceIn(0.5f, 3f), saturation = json.optInt("saturation", d.saturation).coerceIn(0, 200),
+ sharpen = json.optInt("sharpen", d.sharpen).coerceIn(0, 10),
+ sharpenMode = json.optString("sharpenMode", d.sharpenMode).takeIf { it == "usm" } ?: "cas",
+ deband = json.optInt("deband", d.deband).coerceIn(0, 8),
+ fxaa = json.optBoolean("fxaa"), toon = json.optBoolean("toon"), crt = json.optBoolean("crt"), ntsc = json.optBoolean("ntsc"),
+ playerEngine = json.optString("playerEngine", d.playerEngine).takeIf { it == "native" } ?: "web",
+ frameGen = json.optString("frameGen", d.frameGen).let { if (it == "winfg") "ddfg" else it }
+ .takeIf { it in setOf("off", "ddfg", "lsfg", "lsfg3", "lsfg4") } ?: d.frameGen,
+ fpsLimit = json.optInt("fpsLimit", d.fpsLimit).takeIf { it in setOf(0, 30, 45, 60, 120, 144, 165) } ?: 0,
+ fpsCustomOn = json.optBoolean("fpsCustomOn", d.fpsCustomOn),
+ fpsCustom = json.optInt("fpsCustom", d.fpsCustom).coerceIn(10, 165),
+ instantInput = json.optBoolean("instantInput", d.instantInput), smallBuffer = json.optBoolean("smallBuffer", d.smallBuffer),
+ fastDecoder = json.optBoolean("fastDecoder", d.fastDecoder), zeroCopy = json.optBoolean("zeroCopy", d.zeroCopy),
+ )
+ }.getOrDefault(XboxCloudSettings())
+
+ fun save(context: Context, settings: XboxCloudSettings) {
+ context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, settings.toJson()).apply()
+ }
+
+ val LANGUAGES = listOf("" to "Device language", "en-US" to "English (US)", "en-GB" to "English (UK)", "de-DE" to "Deutsch",
+ "es-ES" to "Español (España)", "es-MX" to "Español (México)", "fr-FR" to "Français", "it-IT" to "Italiano",
+ "ja-JP" to "日本語", "ko-KR" to "한국어", "nl-NL" to "Nederlands", "pl-PL" to "Polski", "pt-BR" to "Português (Brasil)",
+ "pt-PT" to "Português (Portugal)", "ru-RU" to "Русский", "sv-SE" to "Svenska", "tr-TR" to "Türkçe", "zh-CN" to "中文 (简体)",
+ "zh-TW" to "中文 (繁體)")
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt
new file mode 100644
index 0000000000..bfe1e3908e
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt
@@ -0,0 +1,60 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.droiddeck.launcher.stores.Store
+import com.droiddeck.launcher.stores.StoreAccounts
+import com.droiddeck.launcher.ui.DroidDeckTheme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class XboxCloudSettingsActivity : ComponentActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContent {
+ DroidDeckTheme {
+ var settings by remember { mutableStateOf(XboxCloudSettings.load(this)) }
+ var regions by remember { mutableStateOf(emptyList()) }
+ LaunchedEffect(Unit) {
+ regions = withContext(Dispatchers.IO) {
+ runCatching {
+ val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: return@runCatching emptyList()
+ XboxCloudSession.get(applicationContext, account).regionList.map { it.name }
+ }.getOrDefault(emptyList())
+ }
+ }
+ Column(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).verticalScroll(rememberScrollState())) {
+ Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
+ OutlinedButton(onClick = { finish() }) { Text("Back") }
+ Text("Xbox Cloud Gaming", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold,
+ color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 16.dp))
+ }
+ XboxCloudSettingsPanel(settings, regions, live = false) { changed ->
+ settings = changed
+ XboxCloudSettings.save(this@XboxCloudSettingsActivity, changed)
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt
new file mode 100644
index 0000000000..0a09fd7890
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt
@@ -0,0 +1,313 @@
+package com.droiddeck.launcher.stores.xbox
+
+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.border
+import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+/** Shared by the Xbox cloud settings page and the in-player menu; [live] changes reach the running stream. */
+@Composable
+fun XboxCloudSettingsPanel(
+ settings: XboxCloudSettings,
+ regions: List,
+ live: Boolean,
+ /** "stream", "picture" or "overlay" shows that section only; null shows all. */
+ section: String? = null,
+ /** The row to select when the panel opens (the last one used), or null for no initial selection. */
+ restoreRow: Int? = null,
+ onRowFocused: (Int) -> Unit = {},
+ /** The settings the running stream started with; rows that differ say they need a restart (null: no stream). */
+ startedWith: XboxCloudSettings? = null,
+ onChange: (XboxCloudSettings) -> Unit,
+) {
+ val focus = remember(section) { PanelFocus() }
+ focus.next = 0
+ focus.onFocused = onRowFocused
+ CompositionLocalProvider(LocalPanelFocus provides focus) {
+ PanelContent(settings, regions, live, section, startedWith, onChange)
+ }
+ LaunchedEffect(section) {
+ if (restoreRow != null) runCatching { focus.requester(restoreRow.coerceIn(0, (focus.count - 1).coerceAtLeast(0))).requestFocus() }
+ }
+}
+
+/** Gives each settings row its place in the page, so the last-used row can be selected again. */
+private class PanelFocus {
+ var next = 0
+ var count = 0
+ var onFocused: (Int) -> Unit = {}
+ private val requesters = mutableMapOf()
+ fun requester(index: Int) = requesters.getOrPut(index) { FocusRequester() }
+ fun take(): Int = next++.also { count = maxOf(count, next) }
+}
+
+private val LocalPanelFocus = compositionLocalOf { null }
+
+@Composable
+private fun PanelContent(
+ settings: XboxCloudSettings,
+ regions: List,
+ live: Boolean,
+ section: String?,
+ startedWith: XboxCloudSettings?,
+ onChange: (XboxCloudSettings) -> Unit,
+) {
+ // Stream-start settings changed during a stream wait for a restart; back at the starting value, no note.
+ fun pending(differs: (XboxCloudSettings) -> Boolean) = startedWith != null && differs(startedWith)
+
+ if (section == null || section == "stream") Section("Stream", if (live) "Applies to the next stream." else "Applies when a stream starts.") {
+ if (XboxNativePlayerActivity.supported()) {
+ Choice("Player engine", listOf("web" to "Web", "native" to "Native (frame gen)"), settings.playerEngine,
+ pending { it.playerEngine != settings.playerEngine }) { onChange(settings.copy(playerEngine = it)) }
+ val ctx = androidx.compose.ui.platform.LocalContext.current
+ val lsfg = androidx.compose.runtime.remember { XboxNativeVideo.lsfgReady(ctx) }
+ Choice("Frame generation", XboxNativeVideo.modes(lsfg).map { it to XboxNativeVideo.modeName(it) }, settings.frameGen) {
+ onChange(settings.copy(frameGen = it))
+ }
+ Text("Native engine (experimental): Google's WebRTC and DroidDeck's own compositor, so DroidDeck frame generation " +
+ "(DDFG) or LSFG can add frames. LSFG uses the Lossless.dll DroidDeck already uses for games. Screen effects " +
+ "apply to the web engine.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(start = 8.dp, bottom = 6.dp))
+ }
+ // The service picks the size from the reported device profile (the PC profile can send 1440p).
+ Choice("Resolution", listOf("720p" to "720p (phone)", "1080p" to "Best (PC)", "1080p_hq" to "1080p HQ (TV)"),
+ settings.resolution, pending { it.resolution != settings.resolution }) { onChange(settings.copy(resolution = it)) }
+ Choice("Server region", listOf("" to "Automatic") + regions.map { it to it }, settings.region,
+ pending { it.region != settings.region }) { onChange(settings.copy(region = it)) }
+ Choice("Game language", XboxCloudSettings.LANGUAGES, settings.language,
+ pending { it.language != settings.language }) { onChange(settings.copy(language = it)) }
+ Choice("Video codec quality", listOf("default" to "Automatic", "high" to "High", "normal" to "Normal", "low" to "Low"), settings.codec,
+ pending { it.codec != settings.codec }) { onChange(settings.copy(codec = it)) }
+ Choice("Bitrate limit", listOf(0 to "No limit") + listOf(5, 8, 10, 12, 15, 20, 25, 30, 40, 50).map { it to "$it Mb/s" }, settings.bitrateMbps,
+ pending { it.bitrateMbps != settings.bitrateMbps }) { onChange(settings.copy(bitrateMbps = it)) }
+ Toggle("Stop quality drops", "Keeps the resolution up when this device decodes slowly.", settings.preventDrops) { onChange(settings.copy(preventDrops = it)) }
+ }
+
+ if (section == null || section == "picture") Section("Picture", "Shader effects on the stream.") {
+ Step("Brightness", "${settings.brightness}", { onChange(settings.copy(brightness = (settings.brightness - 5).coerceAtLeast(-50))) },
+ { onChange(settings.copy(brightness = (settings.brightness + 5).coerceAtMost(50))) })
+ Step("Contrast", "${settings.contrast}", { onChange(settings.copy(contrast = (settings.contrast - 10).coerceAtLeast(-100))) },
+ { onChange(settings.copy(contrast = (settings.contrast + 10).coerceAtMost(100))) })
+ Step("Gamma", String.format("%.1f", settings.gamma), { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() - 1).coerceAtLeast(5) / 10f)) },
+ { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() + 1).coerceAtMost(30) / 10f)) })
+ Step("Saturation", "${settings.saturation}%", { onChange(settings.copy(saturation = (settings.saturation - 10).coerceAtLeast(0))) },
+ { onChange(settings.copy(saturation = (settings.saturation + 10).coerceAtMost(200))) })
+ Step("Sharpen", if (settings.sharpen == 0) "Off" else "${settings.sharpen}", { onChange(settings.copy(sharpen = (settings.sharpen - 1).coerceAtLeast(0))) },
+ { onChange(settings.copy(sharpen = (settings.sharpen + 1).coerceAtMost(10))) })
+ Choice("Sharpen type", listOf("cas" to "Contrast-adaptive", "usm" to "Unsharp mask"), settings.sharpenMode) { onChange(settings.copy(sharpenMode = it)) }
+ Step("Deband", if (settings.deband == 0) "Off" else "${settings.deband}", { onChange(settings.copy(deband = (settings.deband - 1).coerceAtLeast(0))) },
+ { onChange(settings.copy(deband = (settings.deband + 1).coerceAtMost(8))) })
+ Toggle("FXAA", "Smooths jagged edges.", settings.fxaa) { onChange(settings.copy(fxaa = it)) }
+ Toggle("CRT", "Scanlines and colour fringes.", settings.crt) { onChange(settings.copy(crt = it)) }
+ Toggle("NTSC", "Old TV signal look.", settings.ntsc) { onChange(settings.copy(ntsc = it)) }
+ Toggle("Toon", "Cartoon outlines.", settings.toon) { onChange(settings.copy(toon = it)) }
+ Choice("Frame-rate cap", listOf(0 to "Off", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps"), settings.maxFps) { onChange(settings.copy(maxFps = it)) }
+ Row(Modifier.fillMaxWidth().padding(top = 6.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ OutlinedButton(onClick = { onChange(settings.withoutEffects()) }) { Text("Reset picture") }
+ }
+ Text("Effects cost a little GPU time; with none set the stream is shown directly.", style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp))
+ }
+
+ if ((section == null && XboxNativePlayerActivity.supported()) || section == "framerate") Section("Frame rate (native engine)",
+ "With frame generation this is the rate shown; without it, only targets below the stream's 60 fps change anything.") {
+ Choice("Target", listOf(0 to "Screen's rate", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps", 120 to "120 fps", 144 to "144 fps", 165 to "165 fps"),
+ settings.fpsLimit) { onChange(settings.copy(fpsLimit = it, fpsCustomOn = false)) }
+ Toggle("Custom frame rate", "Set any rate from 10 to 165 fps with the slider.", settings.fpsCustomOn) { onChange(settings.copy(fpsCustomOn = it)) }
+ if (settings.fpsCustomOn) SliderRow("Custom", settings.fpsCustom, 10, 165) { onChange(settings.copy(fpsCustom = it)) }
+ }
+
+ if ((section == null && XboxNativePlayerActivity.supported()) || section == "latency") Section("Low latency (native engine)", null) {
+ Toggle("Instant controller input", "Sends each press the moment it happens instead of every 16 ms.", settings.instantInput) {
+ onChange(settings.copy(instantInput = it))
+ }
+ Toggle("Small network buffer", "Shows frames as soon as they are decoded. Less delay; may stutter on weak Wi-Fi.",
+ settings.smallBuffer, pending { it.smallBuffer != settings.smallBuffer }) { onChange(settings.copy(smallBuffer = it)) }
+ Toggle("Fast decoder", "The video chip's low-latency mode.", settings.fastDecoder,
+ pending { it.fastDecoder != settings.fastDecoder }) { onChange(settings.copy(fastDecoder = it)) }
+ Toggle("Zero-copy picture", "Frames go straight from the video chip to the screen: the lowest delay. Used while frame generation is off and no target below 60 fps is set; switches live.",
+ settings.zeroCopy) { onChange(settings.copy(zeroCopy = it)) }
+ }
+
+ // "overlay-native": the native player's page (its sound has no volume boost).
+ if (section == null || section == "overlay" || section == "overlay-native") Section("Overlay and sound", null) {
+ Choice("Performance overlay", listOf(0 to "Off", 1 to "FPS only", 2 to "Basic", 3 to "Detailed", 4 to "Full"), settings.statsLevel) {
+ onChange(settings.copy(statsLevel = it))
+ }
+ Choice("Overlay layout", listOf("horizontal" to "Horizontal", "vertical" to "Vertical"), settings.statsLayout) { onChange(settings.copy(statsLayout = it)) }
+ Choice("Overlay position", listOf("right" to "Top right", "left" to "Top left"), settings.statsCorner) { onChange(settings.copy(statsCorner = it)) }
+ Text("Basic: fps, ping, resolution. Detailed: + bitrate, decode time, packet loss. Full: + codec, jitter, " +
+ "dropped frames, server.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ if (section != "overlay-native") Step("Volume", "${settings.volume}%", { onChange(settings.copy(volume = (settings.volume - 25).coerceAtLeast(100))) },
+ { onChange(settings.copy(volume = (settings.volume + 25).coerceAtMost(300))) })
+ Step("Controller rumble", if (settings.rumble == 0) "Off" else "${settings.rumble}%", { onChange(settings.copy(rumble = (settings.rumble - 25).coerceAtLeast(0))) },
+ { onChange(settings.copy(rumble = (settings.rumble + 25).coerceAtMost(100))) })
+ }
+}
+
+@Composable
+private fun Section(title: String, note: String?, content: @Composable ColumnScope.() -> Unit) {
+ Column(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
+ Text(title, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary)
+ if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ Spacer(Modifier.height(4.dp))
+ content()
+ }
+}
+
+/**
+ * One settings row, driven by a controller: it takes focus as a whole (highlighted), Left / Right change its
+ * value, A / Enter selects; the − / + buttons and switches inside stay for touch only.
+ */
+@Composable
+private fun SettingRow(
+ onLeft: (() -> Unit)?,
+ onRight: (() -> Unit)?,
+ onSelect: (() -> Unit)?,
+ content: @Composable RowScope.() -> Unit,
+) {
+ val panel = LocalPanelFocus.current
+ val index = panel?.take() ?: -1
+ var focused by remember { mutableStateOf(false) }
+ val currentSelect by rememberUpdatedState(onSelect)
+ val cs = MaterialTheme.colorScheme
+ val shape = RoundedCornerShape(10.dp)
+ Row(
+ Modifier.fillMaxWidth().padding(vertical = 1.dp).clip(shape)
+ .background(if (focused) cs.primary.copy(alpha = 0.16f) else Color.Transparent)
+ .border(2.dp, if (focused) cs.primary else Color.Transparent, shape)
+ .let { if (panel != null && index >= 0) it.focusRequester(panel.requester(index)) else it }
+ .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused && index >= 0) panel?.onFocused?.invoke(index) }
+ .onKeyEvent { event ->
+ if (event.type != KeyEventType.KeyDown) return@onKeyEvent false
+ val action = when (event.key) {
+ Key.DirectionLeft -> onLeft
+ Key.DirectionRight -> onRight
+ Key.Enter, Key.NumPadEnter, Key.DirectionCenter, Key.ButtonA -> onSelect
+ else -> null
+ }
+ if (action != null) { action(); true } else false
+ }
+ .focusable()
+ // A tap selects too, without a second focus stop (a clickable would be one).
+ .pointerInput(Unit) { detectTapGestures { currentSelect?.invoke() } }
+ .padding(horizontal = 8.dp, vertical = 4.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ content = content,
+ )
+}
+
+private val noFocus = Modifier.focusProperties { canFocus = false }
+
+@Composable
+private fun Step(label: String, value: String, onMinus: () -> Unit, onPlus: () -> Unit) {
+ SettingRow(onLeft = onMinus, onRight = onPlus, onSelect = onPlus) {
+ Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface)
+ OutlinedButton(onClick = onMinus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("−") }
+ Text(value, Modifier.widthIn(min = 112.dp, max = 168.dp).padding(horizontal = 4.dp), textAlign = TextAlign.Center,
+ style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis)
+ OutlinedButton(onClick = onPlus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("+") }
+ }
+}
+
+/** A value slider (touch) that a controller moves with Left / Right in steps of 1 (hold to repeat). */
+@Composable
+private fun SliderRow(label: String, value: Int, min: Int, max: Int, onValue: (Int) -> Unit) {
+ SettingRow(onLeft = { onValue((value - 1).coerceAtLeast(min)) }, onRight = { onValue((value + 1).coerceAtMost(max)) }, onSelect = null) {
+ Text(label, Modifier.width(72.dp), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface)
+ androidx.compose.material3.Slider(value = value.toFloat(), onValueChange = { onValue(it.toInt().coerceIn(min, max)) },
+ valueRange = min.toFloat()..max.toFloat(), modifier = noFocus.weight(1f))
+ Text("$value fps", Modifier.width(72.dp), textAlign = TextAlign.End, style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurface)
+ }
+}
+
+@Composable
+private fun Choice(label: String, options: List>, selected: T, needsRestart: Boolean = false, onSelect: (T) -> Unit) {
+ val index = options.indexOfFirst { it.first == selected }.coerceAtLeast(0)
+ Step(label, options.getOrNull(index)?.second ?: "",
+ { if (options.isNotEmpty()) onSelect(options[(index - 1 + options.size) % options.size].first) },
+ { if (options.isNotEmpty()) onSelect(options[(index + 1) % options.size].first) })
+ if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp))
+}
+
+@Composable
+private fun Toggle(label: String, note: String, checked: Boolean, needsRestart: Boolean = false, onToggle: (Boolean) -> Unit) {
+ SettingRow(onLeft = { onToggle(false) }, onRight = { onToggle(true) }, onSelect = { onToggle(!checked) }) {
+ Column(Modifier.weight(1f)) {
+ Text(label, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface)
+ Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ }
+ Spacer(Modifier.width(8.dp))
+ Switch(checked = checked, onCheckedChange = onToggle, modifier = noFocus)
+ }
+ if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp))
+}
+
+/** One entry of the cloud players' menu list (highlighted when selected; A or a tap opens it). */
+@Composable
+internal fun XboxMenuEntry(title: String, note: String?, focus: FocusRequester? = null, onFocused: () -> Unit = {}, onClick: () -> Unit) {
+ val cs = MaterialTheme.colorScheme
+ var focused by remember { mutableStateOf(false) }
+ val shape = RoundedCornerShape(10.dp)
+ androidx.compose.material3.Surface(
+ onClick = onClick, color = if (focused) cs.primary.copy(alpha = 0.2f) else cs.surfaceContainerHigh, shape = shape,
+ border = if (focused) androidx.compose.foundation.BorderStroke(2.dp, cs.primary) else null,
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 3.dp)
+ .let { if (focus != null) it.focusRequester(focus) else it }
+ .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused) onFocused() }
+ .onKeyEvent { event -> if (event.type == KeyEventType.KeyDown && event.key == Key.ButtonA) { onClick(); true } else false },
+ ) {
+ Column(Modifier.padding(horizontal = 14.dp, vertical = 10.dp)) {
+ Text(title, style = MaterialTheme.typography.titleSmall, color = cs.onSurface)
+ if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant)
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt
new file mode 100644
index 0000000000..a5e7587af9
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt
@@ -0,0 +1,74 @@
+package com.droiddeck.launcher.stores.xbox
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+/** Request shapes follow Microsoft's web player as Greenlight (MIT) implements them. */
+internal class XboxCloudSignalling(
+ private val session: XboxCloudSession.Session,
+ private val titleId: String,
+ private val settings: XboxCloudSettings,
+) {
+ @Volatile var path: String? = null
+ private set
+
+ fun op(op: String, arg: String = ""): XboxCloudSession.Reply = when (op) {
+ "start" -> start()
+ "state" -> XboxCloudSession.request(session, "GET", "/$path/state")
+ "connect" -> connect()
+ "sdp" -> sdp(arg)
+ "ice" -> ice(arg)
+ "keepalive" -> XboxCloudSession.request(session, "POST", "/$path/keepalive", "{}")
+ else -> XboxCloudSession.Reply(0, "unknown request")
+ }
+
+ fun start(): XboxCloudSession.Reply {
+ val body = JSONObject().put("clientSessionId", "").put("titleId", titleId).put("systemUpdateGroup", "")
+ .put("settings", JSONObject().put("nanoVersion", "V3;WebrtcTransport.dll").put("enableOptionalDataCollection", false)
+ .put("enableTextToSpeech", false).put("highContrast", 0).put("locale", settings.language.ifEmpty { java.util.Locale.getDefault().toLanguageTag() })
+ .put("useIceConnection", false).put("timezoneOffsetMinutes", java.util.TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 60_000)
+ .put("sdkType", "web").put("osName", settings.osName))
+ .put("serverId", "").put("fallbackRegionNames", JSONArray())
+ return XboxCloudSession.request(session, "POST", "/v5/sessions/cloud/play", body.toString()).also { reply ->
+ if (reply.status in 200..299) path = JSONObject(reply.body).getString("sessionPath").trim('/')
+ }
+ }
+
+ fun connect(): XboxCloudSession.Reply {
+ val token = session.userToken ?: return XboxCloudSession.Reply(0, "no cloud transfer token for this account")
+ return XboxCloudSession.request(session, "POST", "/$path/connect", JSONObject().put("userToken", token).toString())
+ }
+
+ fun sdp(offer: String): XboxCloudSession.Reply {
+ val body = JSONObject().put("messageType", "offer").put("sdp", offer).put("requestId", "1").put("configuration", JSONObject()
+ .put("chatConfiguration", JSONObject().put("bytesPerSample", 2).put("expectedClipDurationMs", 20)
+ .put("format", JSONObject().put("codec", "opus").put("container", "webm")).put("numChannels", 1).put("sampleFrequencyHz", 24000))
+ .put("chat", version(1, 1)).put("control", version(1, 3)).put("input", version(1, 9)).put("message", version(1, 1))
+ .put("reliableinput", version(9, 9)).put("unreliableinput", version(9, 9)))
+ val posted = XboxCloudSession.request(session, "POST", "/$path/sdp", body.toString())
+ return if (posted.status !in 200..299) posted else poll("/$path/sdp")
+ }
+
+ fun ice(candidates: String): XboxCloudSession.Reply {
+ val posted = XboxCloudSession.request(session, "POST", "/$path/ice", JSONObject().put("candidates", JSONArray(candidates)).toString())
+ return if (posted.status !in 200..299) posted else poll("/$path/ice")
+ }
+
+ fun stop(): XboxCloudSession.Reply? {
+ val current = path ?: return null
+ path = null
+ return runCatching { XboxCloudSession.request(session, "DELETE", "/$current") }.getOrNull()
+ }
+
+ private fun version(min: Int, max: Int) = JSONObject().put("minVersion", min).put("maxVersion", max)
+
+ /** The exchange answers 204 until the console has replied. */
+ private fun poll(path: String): XboxCloudSession.Reply {
+ repeat(60) {
+ val reply = XboxCloudSession.request(session, "GET", path)
+ if (reply.status != 204) return reply
+ Thread.sleep(500)
+ }
+ return XboxCloudSession.Reply(0, "no answer from the cloud console")
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt
new file mode 100644
index 0000000000..03df4c19d4
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt
@@ -0,0 +1,74 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.app.Service
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Bundle
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.IBinder
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+/**
+ * Hands the main process's Xbox Cloud Gaming tokens to the native player's process (:xcloudnative) over Binder, so
+ * they stay in memory (not exported, same app only) and a stream does not wait for a second ~20 s token fetch.
+ */
+class XboxCloudTokenService : Service() {
+ private val worker = Executors.newSingleThreadExecutor()
+ private val messenger = Messenger(Handler(Looper.getMainLooper()) { message ->
+ val replyTo = message.replyTo ?: return@Handler true
+ val account = message.data?.getString("account").orEmpty()
+ worker.execute {
+ val reply = Message.obtain(null, REPLY)
+ reply.data = runCatching { XboxCloudSession.toBundle(XboxCloudSession.get(applicationContext, account)) }
+ .getOrElse { Bundle().apply { putString("error", it.message ?: it.javaClass.simpleName) } }
+ runCatching { replyTo.send(reply) }
+ }
+ true
+ })
+
+ override fun onBind(intent: Intent?): IBinder = messenger.binder
+
+ override fun onDestroy() { worker.shutdown(); super.onDestroy() }
+
+ companion object {
+ private const val REQUEST = 1
+ private const val REPLY = 2
+
+ /** Blocks until the main process answers (its tokens, or "error"), or returns null when it cannot be reached. */
+ fun request(context: Context, account: String, timeoutSeconds: Long): Bundle? {
+ val app = context.applicationContext
+ val done = CountDownLatch(1)
+ var answer: Bundle? = null
+ val thread = HandlerThread("xcloud-token").apply { start() }
+ val replies = Messenger(Handler(thread.looper) { message ->
+ if (message.what == REPLY) { answer = message.data; done.countDown() }
+ true
+ })
+ val connection = object : ServiceConnection {
+ override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
+ val ask = Message.obtain(null, REQUEST).apply { data = Bundle().apply { putString("account", account) }; replyTo = replies }
+ if (binder == null || runCatching { Messenger(binder).send(ask) }.isFailure) done.countDown()
+ }
+ override fun onServiceDisconnected(name: ComponentName?) { done.countDown() }
+ }
+ val bound = runCatching { app.bindService(Intent(app, XboxCloudTokenService::class.java), connection, Context.BIND_AUTO_CREATE) }
+ .getOrDefault(false)
+ try {
+ if (!bound) return null
+ done.await(timeoutSeconds, TimeUnit.SECONDS)
+ return answer
+ } finally {
+ if (bound) runCatching { app.unbindService(connection) }
+ thread.quitSafely()
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt
index ffe4b9de6b..f969c20ebb 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt
@@ -14,6 +14,11 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str
val name = "droiddeck-xbox-${UUID.randomUUID()}"
private val generation = lifecycle(app, expectedGeneration) { it }
private val server = LocalServerSocket(name)
+ // Some devices refuse the abstract socket from inside PRoot; the backend then falls back to this keyed loopback port.
+ private val loopback = java.net.ServerSocket(0, 8, java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1)))
+ val port: Int get() = loopback.localPort
+ val key: String = ByteArray(32).also { java.security.SecureRandom().nextBytes(it) }.joinToString("") { "%02x".format(it) }
+ @Volatile private var loopbackUsed = false
@Volatile private var closed = false
private val bound = java.util.concurrent.CountDownLatch(1)
private var backend: Process? = null
@@ -79,33 +84,122 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str
} }
}
- init {
+ /** Each connection gets its own thread; an accept error is logged and retried instead of silently ending the loop. */
+ private fun listen(route: String, accept: () -> S, serve: (S) -> Unit) = Thread({
+ var failures = 0
+ while (!closed) {
+ val socket = try { accept() } catch (e: Exception) {
+ if (closed) break
+ failures++
+ note("Credential $route accept failed: ${e.javaClass.simpleName}")
+ if (failures >= 20) { note("Credential $route listener stopped after repeated accept failures"); break }
+ Thread.sleep(100)
+ continue
+ }
+ failures = 0
+ Thread({ serve(socket) }, "xbox-credentials-$route-request").start()
+ }
+ }, "xbox-credentials-$route").start()
+
+ /** Logs requests that take 2 s or more, and the stage a request is still in after 8 s (the backend waits 30 s). */
+ private fun tracked(route: String, block: (step: (String) -> Unit) -> JSONObject): JSONObject {
+ val started = android.os.SystemClock.elapsedRealtime()
+ val stage = java.util.concurrent.atomic.AtomicReference("auth")
+ val done = java.util.concurrent.CountDownLatch(1)
+ val stages = java.util.Collections.synchronizedList(mutableListOf())
+ var mark = started
+ val step = { next: String ->
+ val now = android.os.SystemClock.elapsedRealtime()
+ stages += "${stage.getAndSet(next)} ${now - mark} ms"
+ mark = now
+ }
Thread({
- while (!closed) {
- val socket = runCatching { server.accept() }.getOrNull() ?: break
- socket.use {
- it.soTimeout = 10_000
- val reply = runCatching {
+ if (!done.await(8, java.util.concurrent.TimeUnit.SECONDS)) note("Credential $route request still in ${stage.get()} after 8 s")
+ }, "xbox-credentials-watch").apply { isDaemon = true; start() }
+ try {
+ return block(step)
+ } finally {
+ done.countDown()
+ step("done")
+ val total = android.os.SystemClock.elapsedRealtime() - started
+ if (total >= 2000) note("Credential $route request took $total ms (${stages.joinToString(", ")})")
+ }
+ }
+
+ init {
+ listen("socket", { server.accept() }) { socket ->
+ socket.use {
+ it.soTimeout = 10_000
+ val reply = tracked("socket") { step ->
+ runCatching {
val peer = it.peerCredentials
check(peer.uid == android.os.Process.myUid() && authorized(peer.pid))
+ step("read")
val request = JSONObject(readLine(it.inputStream.buffered(), 2_097_152))
+ step("lock")
storage(app) {
+ step("answer")
check(!closed && epoch(app) == generation && authorized(peer.pid))
- answer(request)
+ answer(request, step)
}
}.getOrElse {
note("Credential request rejected: ${it.javaClass.simpleName}")
JSONObject().put("ok", false)
}
- runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) }
}
+ runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) }
+ .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") }
}
- }, "xbox-credentials").start()
+ }
+ listen("loopback", { loopback.accept() }) { socket ->
+ socket.use {
+ it.soTimeout = 10_000
+ val reply = tracked("loopback") { step ->
+ runCatching {
+ val input = it.getInputStream().buffered()
+ check(it.inetAddress.isLoopbackAddress)
+ if (!java.security.MessageDigest.isEqual(readLine(input, 128).toByteArray(), key.toByteArray())) {
+ rejected("loopback-key"); error("loopback key")
+ }
+ if (!loopbackOwner(it.port)) { rejected("loopback-owner"); error("loopback owner") }
+ check(bound.await(5, java.util.concurrent.TimeUnit.SECONDS) && backend?.isAlive == true)
+ if (!loopbackUsed) { loopbackUsed = true; note("Backend reached the app over the loopback fallback") }
+ step("read")
+ val request = JSONObject(readLine(input, 2_097_152))
+ step("lock")
+ storage(app) {
+ step("answer")
+ check(!closed && epoch(app) == generation)
+ answer(request, step)
+ }
+ }.getOrElse { failure ->
+ note("Credential request rejected: ${failure.javaClass.simpleName}")
+ JSONObject().put("ok", false)
+ }
+ }
+ runCatching { it.getOutputStream().write((reply.toString() + "\n").toByteArray()) }
+ .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") }
+ }
+ }
}
- private fun answer(request: JSONObject): JSONObject {
+ /** The connecting socket must belong to this app's user; an unreadable table (newer Android) leaves the key as the check. */
+ private fun loopbackOwner(peerPort: Int): Boolean {
+ val uid = android.os.Process.myUid()
+ val rows = listOf("/proc/net/tcp", "/proc/net/tcp6").mapNotNull { runCatching { java.io.File(it).readLines().drop(1) }.getOrNull() }.flatten()
+ val owners = rows.mapNotNull { row ->
+ val fields = row.trim().split(Regex("\\s+"))
+ val local = fields.getOrNull(1)?.substringAfterLast(':')?.toIntOrNull(16)
+ val remote = fields.getOrNull(2)?.substringAfterLast(':')?.toIntOrNull(16)
+ if (local == peerPort && remote == loopback.localPort) fields.getOrNull(7)?.toIntOrNull() else null
+ }
+ return owners.isEmpty() || owners.all { it == uid }
+ }
+
+ private fun answer(request: JSONObject, step: (String) -> Unit = {}): JSONObject {
val key = request.getString("key")
require(key.isNotEmpty() && key.length <= 512)
+ step("record-read")
val record = StoreAccounts.read(app, Store.XBOX)
check(!StoreAccounts.isUnavailable(Store.XBOX))
val json = record ?: JSONObject()
@@ -118,15 +212,16 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str
require(bytes.length() <= 262_144)
for (i in 0 until bytes.length()) require(bytes.getInt(i) in 0..255)
slots.put(key, bytes)
+ step("record-save")
StoreAccounts.write(app, Store.XBOX, json)
}
- "remove" -> { slots.remove(key); StoreAccounts.write(app, Store.XBOX, json) }
+ "remove" -> { slots.remove(key); step("record-save"); StoreAccounts.write(app, Store.XBOX, json) }
else -> error("Invalid credential operation")
}
return result
}
- override fun close() { closed = true; bound.countDown(); runCatching { server.close() } }
+ override fun close() { closed = true; bound.countDown(); runCatching { server.close() }; runCatching { loopback.close() } }
companion object {
val lock = Any()
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt
index 44e9ceff33..3d02e4db57 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt
@@ -39,11 +39,17 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog
var sequence = -1L
try {
val source = if (content) selected else item.id
+ val guestFolder = StoreInstallRoot.guestPathForXodus(app, folder)
val selection = if (content) emptyList() else listOf("--selected-content-id", selected)
- Xodus.start(app, listOf("streaming", source, folder.path, "--market", market,
+ Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market,
"--progress-json", "--control-stdin") + selection).use { process ->
child = process
- val diagnostics = Xodus.diagnostics(process)
+ val rejected = AtomicBoolean(false)
+ val rejectedLine = Regex(Xodus.SIGN_IN_REJECTED)
+ val diagnostics = Xodus.diagnostics(process) { line ->
+ StoresState.logLine("Xbox: $line")
+ if (line.matches(rejectedLine)) rejected.set(true)
+ }
if (cancelled.get()) process.process.destroy()
process.process.inputStream.bufferedReader().useLines { lines -> lines.forEach { line ->
if (line.startsWith("NEXUS_PROGRESS ")) {
@@ -62,6 +68,7 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog
check(process.process.waitFor(15, TimeUnit.SECONDS)) { "Xbox installer did not exit." }
diagnostics.join(2000)
if (cancelled.get()) return null
+ check(!rejected.get()) { app.getString(com.droiddeck.launcher.R.string.stores_xbox_sign_in_again) }
check(process.process.exitValue() == 0 && complete) { "Xbox download did not complete. Resume to retry with fresh licenses." }
}
if (content) {
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt
index bf9e7ee703..5de1abcac8 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt
@@ -23,18 +23,19 @@ internal object XboxLibraryCache {
fun clear(app: Context) { prefs(app).edit().remove("library").commit() }
internal fun encode(account: String, market: String, games: List, now: Long = System.currentTimeMillis()): String =
- JSONObject().put("schema", 1).put("account", account).put("market", market).put("savedAt", now)
+ JSONObject().put("schema", 2).put("account", account).put("market", market).put("savedAt", now)
.put("games", JSONArray().apply {
for (game in games) put(JSONObject().put("id", game.id).put("title", game.title)
.put("image", game.imageUrl).put("poster", game.tallImageUrl).put("description", game.description)
.put("developer", game.developer).put("publisher", game.publisher).put("size", game.sizeBytes)
- .put("access", if (game.subscription) "gamepass" else if (game.owned) "owned" else "none"))
+ .put("access", if (game.subscription) "gamepass" else if (game.owned) "owned" else "none")
+ .put("pc", game.xboxPc).put("cloud", game.xboxCloud).put("cloudId", game.extra["cloudId"].orEmpty()))
}).toString()
internal fun decode(text: String?, account: String, market: String, now: Long = System.currentTimeMillis()): Snapshot? = runCatching {
require(text != null && text.length <= 8_000_000)
val json = JSONObject(text)
- require(json.getInt("schema") == 1 && json.getString("account") == account && json.getString("market") == market)
+ require(json.getInt("schema") == 2 && json.getString("account") == account && json.getString("market") == market)
val savedAt = json.getLong("savedAt")
require(savedAt > 0 && savedAt <= now + 60_000)
val rows = json.getJSONArray("games")
@@ -44,12 +45,14 @@ internal object XboxLibraryCache {
val id = row.getString("id")
val title = row.getString("title")
val access = row.getString("access")
+ val cloudId = row.optString("cloudId").takeIf { it.matches(Regex("[A-Z0-9]{12}")) }.orEmpty()
require(id.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && access in setOf("owned", "gamepass"))
CatalogItem(Store.XBOX, id, title, row.optString("image").takeIf { it.isNotEmpty() },
tallImageUrl = row.optString("poster").takeIf { it.isNotEmpty() },
description = row.optString("description"), developer = row.optString("developer"), publisher = row.optString("publisher"),
sizeBytes = row.optLong("size"), owned = access == "owned", subscription = access == "gamepass",
- storeUrl = "https://www.xbox.com/games/store/$id", extra = mapOf("market" to market, "access" to access))
+ storeUrl = "https://www.xbox.com/games/store/$id", extra = mapOf("market" to market, "access" to access,
+ "pc" to XboxCatalog.flag(row.getBoolean("pc")), "cloud" to XboxCatalog.flag(row.getBoolean("cloud")), "cloudId" to cloudId))
}
require(games.map { it.id }.distinct().size == games.size)
Snapshot(games, savedAt)
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt
new file mode 100644
index 0000000000..3e3e001d7b
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt
@@ -0,0 +1,41 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.droiddeck.launcher.stores.CatalogItem
+
+object XboxLibraryFilter {
+ const val ALL = "all"
+ const val OWNED = "owned"
+ const val GAME_PASS = "gamepass"
+ const val CLOUD = "cloud"
+ val ALL_FILTERS = listOf(ALL, OWNED, GAME_PASS, CLOUD)
+
+ var current by mutableStateOf(ALL)
+ private set
+
+ fun load(context: Context) {
+ current = context.getSharedPreferences("xbox", Context.MODE_PRIVATE).getString("libraryFilter", ALL)?.takeIf { it in ALL_FILTERS } ?: ALL
+ }
+
+ fun set(context: Context, filter: String) {
+ current = filter
+ context.getSharedPreferences("xbox", Context.MODE_PRIVATE).edit().putString("libraryFilter", filter).apply()
+ }
+
+ fun keeps(filter: String, item: CatalogItem): Boolean = when (filter) {
+ OWNED -> item.owned
+ GAME_PASS -> item.subscription
+ CLOUD -> item.xboxCloud
+ else -> true
+ }
+
+ fun label(filter: String): String = when (filter) {
+ OWNED -> "Owned"
+ GAME_PASS -> "Game Pass"
+ CLOUD -> "Cloud"
+ else -> "All"
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt
index bdfb27d09a..10fc5ea71a 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,6 +31,7 @@ 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()
@SuppressLint("SetJavaScriptEnabled")
override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,6 +54,14 @@ class XboxLoginActivity : ComponentActivity() {
Thread({
if (closed) return@Thread
try {
+ // A record without a username is left from a sign-in that never finished; starting clean
+ // also avoids reading it back with an older, slow Keystore key.
+ progress("preparing the sign-in", "Preparing Microsoft sign-in…")
+ val leftover = StoreAccounts.read(applicationContext, Store.XBOX)
+ if (leftover != null && leftover.optString("username").isBlank()) {
+ XboxCredentials.invalidate(applicationContext)
+ logStep("discarded credentials from an unfinished sign-in")
+ }
val accountGeneration = XboxCredentials.lifecycle(applicationContext) { it }
progress("downloading the Xbox components", "Downloading Xbox components…")
check(AddonPack.XBOX.await(applicationContext, { !closed }) { state ->
@@ -64,7 +73,10 @@ class XboxLoginActivity : ComponentActivity() {
child = process
if (closed) return@use
// StoresState.logLine writes no file in this process, so the reason would miss the shared log.
- Xodus.diagnostics(process) { logStep(it) }
+ Xodus.diagnostics(process) { line ->
+ logStep(line)
+ line.removePrefix("NEXUS_CREDENTIAL_ERROR_V1 ").takeIf { it != line && it !in codes && codes.size < 6 }?.let(codes::add)
+ }
progress("waiting for the Xbox helper", "Waiting for the Xbox helper…")
val timer = Thread({
runCatching { if (!process.process.waitFor(10, TimeUnit.MINUTES)) process.process.destroy() }
@@ -140,7 +152,8 @@ class XboxLoginActivity : ComponentActivity() {
logStep("failed while $failed: $reason")
runOnUiThread {
disposeView()
- status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason\nClose this window and try again."
+ val details = if (codes.isEmpty()) "" else "\nDetails: ${codes.joinToString(", ")}"
+ status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason$details\nClose this window and try again."
}
}
}, "xbox-login").start()
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt
new file mode 100644
index 0000000000..661023d542
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt
@@ -0,0 +1,80 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+
+/**
+ * Controller state for the native cloud player, from Android key and motion events (no Gamepad API). Button
+ * bits follow the xCloud input report (Greenlight's packet.ts): Nexus 2, Menu 4, View 8, A 16, B 32, X 64,
+ * Y 128, D-pad 256..2048, shoulders 4096 / 8192, stick clicks 16384 / 32768.
+ */
+internal class XboxNativePad {
+ data class State(val buttons: Int, val lx: Float, val ly: Float, val rx: Float, val ry: Float, val lt: Float, val rt: Float) {
+ /** Greenlight's rule: any button change, a stick moved past 0.08 or held past 0.15, a trigger past 0.01. */
+ fun differsFrom(o: State): Boolean = buttons != o.buttons ||
+ listOf(lx to o.lx, ly to o.ly, rx to o.rx, ry to o.ry).any { (a, b) -> Math.abs(a - b) > 0.08f || Math.abs(a) > 0.15f } ||
+ Math.abs(lt - o.lt) > 0.01f || Math.abs(rt - o.rt) > 0.01f
+ }
+
+ @Volatile private var buttons = 0
+ @Volatile private var hatButtons = 0
+ @Volatile private var lx = 0f; @Volatile private var ly = 0f
+ @Volatile private var rx = 0f; @Volatile private var ry = 0f
+ @Volatile private var lt = 0f; @Volatile private var rt = 0f
+ /** Called after any change (instant controller input). */
+ @Volatile var onChanged: (() -> Unit)? = null
+
+ /** Buttons pressed on behalf of the app (the menu's Xbox button), OR-ed in. */
+ @Volatile var overrideButtons = 0
+
+ fun snapshot() = State(buttons or hatButtons or overrideButtons, lx, ly, rx, ry, lt, rt)
+
+ /** True when the event was a controller button this pad tracks. */
+ fun onKey(event: KeyEvent): Boolean {
+ val bit = when (event.keyCode) {
+ KeyEvent.KEYCODE_BUTTON_A -> 16
+ KeyEvent.KEYCODE_BUTTON_B -> 32
+ KeyEvent.KEYCODE_BUTTON_X -> 64
+ KeyEvent.KEYCODE_BUTTON_Y -> 128
+ KeyEvent.KEYCODE_DPAD_UP -> 256
+ KeyEvent.KEYCODE_DPAD_DOWN -> 512
+ KeyEvent.KEYCODE_DPAD_LEFT -> 1024
+ KeyEvent.KEYCODE_DPAD_RIGHT -> 2048
+ KeyEvent.KEYCODE_BUTTON_L1 -> 4096
+ KeyEvent.KEYCODE_BUTTON_R1 -> 8192
+ KeyEvent.KEYCODE_BUTTON_THUMBL -> 16384
+ KeyEvent.KEYCODE_BUTTON_THUMBR -> 32768
+ KeyEvent.KEYCODE_BUTTON_START -> 4
+ KeyEvent.KEYCODE_BUTTON_SELECT -> 8
+ // Digital triggers on pads without analog axes.
+ KeyEvent.KEYCODE_BUTTON_L2 -> { lt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true }
+ KeyEvent.KEYCODE_BUTTON_R2 -> { rt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true }
+ else -> return false
+ }
+ buttons = if (event.action == KeyEvent.ACTION_DOWN) buttons or bit else buttons and bit.inv()
+ onChanged?.invoke()
+ return true
+ }
+
+ /** True when the event came from a joystick (sticks, triggers, hat). */
+ fun onMotion(event: MotionEvent): Boolean {
+ if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK || event.action != MotionEvent.ACTION_MOVE) return false
+ val device = event.device
+ fun axis(code: Int): Float {
+ val value = event.getAxisValue(code)
+ val flat = device?.getMotionRange(code, event.source)?.flat ?: 0f
+ return if (Math.abs(value) > maxOf(flat, 0.08f)) value else 0f
+ }
+ lx = axis(MotionEvent.AXIS_X); ly = axis(MotionEvent.AXIS_Y)
+ rx = axis(MotionEvent.AXIS_Z); ry = axis(MotionEvent.AXIS_RZ)
+ lt = maxOf(axis(MotionEvent.AXIS_LTRIGGER), axis(MotionEvent.AXIS_BRAKE))
+ rt = maxOf(axis(MotionEvent.AXIS_RTRIGGER), axis(MotionEvent.AXIS_GAS))
+ val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X); val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y)
+ hatButtons = (if (hy < -0.5f) 256 else 0) or (if (hy > 0.5f) 512 else 0) or (if (hx < -0.5f) 1024 else 0) or (if (hx > 0.5f) 2048 else 0)
+ onChanged?.invoke()
+ return true
+ }
+
+ fun reset() { buttons = 0; hatButtons = 0; overrideButtons = 0; lx = 0f; ly = 0f; rx = 0f; ry = 0f; lt = 0f; rt = 0f }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt
new file mode 100644
index 0000000000..97fd03a3da
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt
@@ -0,0 +1,852 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.os.VibrationEffect
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.ui.unit.dp
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import org.json.JSONArray
+import org.json.JSONObject
+import org.webrtc.DataChannel
+import org.webrtc.DefaultVideoEncoderFactory
+import org.webrtc.EglBase
+import org.webrtc.IceCandidate
+import org.webrtc.MediaConstraints
+import org.webrtc.MediaStream
+import org.webrtc.MediaStreamTrack
+import org.webrtc.PeerConnection
+import org.webrtc.PeerConnectionFactory
+import org.webrtc.RtpReceiver
+import org.webrtc.RtpTransceiver
+import org.webrtc.SdpObserver
+import org.webrtc.SessionDescription
+import org.webrtc.VideoTrack
+import org.webrtc.audio.JavaAudioDeviceModule
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
+/**
+ * Native Xbox Cloud Gaming player (opt-in, Android 10+): Google's WebRTC library instead of the web page, the
+ * xCloud channels ported from Greenlight (XboxNativeProtocol), controller from Android input events, and the
+ * picture through DroidDeck's own compositor (XboxNativeVideo) so DDFG or LSFG can generate frames. Runs in
+ * its own process (:xcloudnative): that compositor instance is never the Linux session's.
+ * Sign-in and session requests are the web player's (XboxCloudSession, XboxCloudSignalling).
+ */
+class XboxNativePlayerActivity : ComponentActivity() {
+ private lateinit var root: FrameLayout
+ private lateinit var surfaceView: SurfaceView
+ private lateinit var status: TextView
+ private lateinit var overlay: TextView
+ private val worker = Executors.newSingleThreadExecutor()
+ private val ticker = Executors.newSingleThreadScheduledExecutor()
+ private val pad = XboxNativePad()
+ private var eglBase: EglBase? = null
+ private var factory: PeerConnectionFactory? = null
+ private var pc: PeerConnection? = null
+ private var protocol: XboxNativeProtocol? = null
+ private var video: XboxNativeVideo? = null
+ @Volatile private var signalling: XboxCloudSignalling? = null
+ @Volatile private var settings = XboxCloudSettings()
+ @Volatile private var closed = false
+ /** The stream reached the screen at least once (a later failure is a lost connection, not a failed start). */
+ @Volatile private var connectedOnce = false
+ /** The session was ended because the player stayed in the background (Android freezes the app soon after). */
+ @Volatile private var endedInBackground = false
+ private var backgroundEnd: Runnable? = null
+ private var notice: androidx.compose.ui.platform.ComposeView? = null
+ @Volatile private var regionNames = emptyList()
+ @Volatile private var serverName: String? = null
+ private val candidates = mutableListOf()
+ 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()
+ /** The settings this stream started with (stream-start settings changed since then need a restart). */
+ private var startedWith: XboxCloudSettings? = null
+ /**
+ * The picture's route right now: true = zero-copy (decoder straight onto the screen), false = WebRTC's texture
+ * through the Vulkan compositor. Zero-copy whenever it is chosen and frame generation is off; switched live.
+ */
+ @Volatile private var zeroCopy = false
+ /** The SurfaceView's surface while it exists (UI thread). */
+ private var screen: android.view.Surface? = null
+ private var screenW = 0
+ private var screenH = 0
+ @Volatile private var zeroCopyFrames = 0L
+ @Volatile private var decoders: org.webrtc.DroidDeckLowLatencyDecoderFactory? = null
+ private var lastZeroCopyFrames = 0L
+ private var lastSubmitted = 0L
+ /** The release of the Guide press that opened the menu must not close it again. */
+ private var swallowGuideUp = false
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+ hideBars()
+ watchBars()
+ root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) }
+ surfaceView = SurfaceView(this)
+ root.addView(surfaceView, FrameLayout.LayoutParams(-1, -1))
+ status = TextView(this).apply { setTextColor(Color.WHITE); textSize = 16f; gravity = Gravity.CENTER }
+ root.addView(status, FrameLayout.LayoutParams(-1, -2, Gravity.BOTTOM).apply { bottomMargin = 120 })
+ overlay = TextView(this).apply {
+ setTextColor(Color.WHITE); textSize = 12f; typeface = android.graphics.Typeface.MONOSPACE
+ setBackgroundColor(Color.argb(140, 0, 0, 0)); setPadding(12, 6, 12, 6); visibility = android.view.View.GONE
+ }
+ root.addView(overlay, FrameLayout.LayoutParams(-2, -2, Gravity.TOP or Gravity.END).apply { topMargin = 16; rightMargin = 16 })
+ setContentView(root)
+ settings = XboxCloudSettings.load(this)
+ startedWith = settings
+ applyDisplayRate(settings.fpsTarget)
+ applyOverlay()
+
+ val egl = EglBase.create().also { eglBase = it }
+ val nativeVideo = XboxNativeVideo(this, egl) { log(it) }.also { video = it }
+ surfaceView.holder.addCallback(object : SurfaceHolder.Callback {
+ override fun surfaceCreated(holder: SurfaceHolder) {}
+ override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+ screen = holder.surface; screenW = width; screenH = height
+ // Zero-copy: the decoder owns this surface (back on it after a stand-in); the Vulkan compositor must not connect to it.
+ if (zeroCopy) { decoders?.setZeroCopySurface(holder.surface); return }
+ @Suppress("DEPRECATION")
+ nativeVideo.setSurface(holder.surface, width, height, windowManager.defaultDisplay.refreshRate)
+ }
+ override fun surfaceDestroyed(holder: SurfaceHolder) {
+ screen = null
+ if (zeroCopy) decoders?.setZeroCopySurface(null) else nativeVideo.setSurface(null, 0, 0, 60f)
+ }
+ })
+ show("Signing in to Xbox Cloud Gaming…")
+ worker.execute { runCatching { run() }.onFailure { fail("start", it.message ?: it.javaClass.simpleName) } }
+ }
+
+ private fun log(text: String) = com.droiddeck.launcher.stores.StoresState.logLine("Xbox: native player: ${text.take(240)}")
+ private fun show(text: String) = runOnUiThread { status.text = text; status.visibility = if (text.isEmpty()) android.view.View.GONE else android.view.View.VISIBLE }
+
+ private fun fail(stage: String, detail: String) {
+ log("failed at $stage: $detail")
+ if (closed) return
+ if (connectedOnce) showNotice("The connection to the cloud console was lost",
+ "The stream stopped reaching this device ($detail). Restart the stream to play again: the game starts over, " +
+ "unsaved progress is lost.", webPlayer = false)
+ else showNotice("The native stream could not start ($stage)",
+ "$detail\n\nYou can try again, or use the web player instead (Stores › Xbox › Cloud settings › Player engine).",
+ webPlayer = true)
+ }
+
+ /** One popup at a time, in the app's dialog style; A or Enter picks the selected button, Back closes the player. */
+ private fun showNotice(title: String, text: String, webPlayer: Boolean) = runOnUiThread {
+ if (notice != null || isFinishing || isDestroyed) return@runOnUiThread
+ closeMenu()
+ show("")
+ // The stream is over: stale numbers must not stay on screen.
+ overlayOn = false
+ overlay.visibility = android.view.View.GONE
+ val view = androidx.compose.ui.platform.ComposeView(this)
+ view.setContent {
+ com.droiddeck.launcher.ui.DroidDeckTheme {
+ val first = androidx.compose.runtime.remember { androidx.compose.ui.focus.FocusRequester() }
+ androidx.compose.runtime.LaunchedEffect(Unit) { androidx.compose.runtime.withFrameNanos { }; runCatching { first.requestFocus() } }
+ @androidx.compose.runtime.Composable
+ fun NoticeButton(label: String, focus: androidx.compose.ui.focus.FocusRequester?, onClick: () -> Unit) =
+ androidx.compose.material3.TextButton(onClick = onClick,
+ modifier = androidx.compose.ui.Modifier.let { if (focus != null) it.focusRequester(focus) else it }
+ .onKeyEvent { e -> if (e.type == KeyEventType.KeyDown && e.key == Key.ButtonA) { onClick(); true } else false }) {
+ androidx.compose.material3.Text(label)
+ }
+ androidx.compose.material3.AlertDialog(
+ onDismissRequest = { finish() },
+ properties = androidx.compose.ui.window.DialogProperties(dismissOnClickOutside = false),
+ title = { androidx.compose.material3.Text(title) },
+ text = { androidx.compose.material3.Text(text) },
+ confirmButton = {
+ androidx.compose.foundation.layout.Row {
+ NoticeButton(if (connectedOnce) "Restart the stream" else "Try again", first) { restartStream() }
+ if (webPlayer) NoticeButton("Open the web player", null) {
+ startActivity(Intent(this@XboxNativePlayerActivity, XboxCloudPlayerActivity::class.java).putExtras(intent)); finish()
+ }
+ }
+ },
+ dismissButton = { NoticeButton("Close", null) { finish() } },
+ )
+ }
+ }
+ notice = view
+ root.addView(view, FrameLayout.LayoutParams(-1, -1))
+ }
+
+ // ---- background ----
+
+ override fun onStop() {
+ super.onStop()
+ if (closed || isChangingConfigurations || signalling == null || endedInBackground) return
+ // Android freezes a background app about a minute after it leaves the screen; the connection then dies
+ // without a goodbye. End the session cleanly before that and offer a restart on return.
+ log("in the background")
+ val end = Runnable { backgroundEnd = null; endInBackground() }
+ backgroundEnd = end
+ root.postDelayed(end, BACKGROUND_GRACE_MS)
+ }
+
+ override fun onStart() {
+ super.onStart()
+ backgroundEnd?.let { root.removeCallbacks(it); log("back before the stream was ended") }
+ backgroundEnd = null
+ if (endedInBackground && notice == null) showNotice("The stream ended while DroidDeck was in the background",
+ "Cloud sessions are closed after ${BACKGROUND_GRACE_MS / 1000} s away, before Android pauses the app. Restart the " +
+ "stream to play again: the game starts over, unsaved progress is lost.", webPlayer = false)
+ }
+
+ private fun endInBackground() {
+ if (closed || endedInBackground) return
+ endedInBackground = true
+ closed = true
+ log("ending the session: ${BACKGROUND_GRACE_MS / 1000} s in the background")
+ val signals = signalling
+ signalling = null
+ ticker.shutdownNow()
+ runOnUiThread { overlayOn = false; overlay.visibility = android.view.View.GONE }
+ Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start()
+ runCatching { protocol?.close() }
+ runCatching { pc?.close() }
+ }
+
+ // ---- session ----
+
+ private fun run() {
+ val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(applicationContext, com.droiddeck.launcher.stores.Store.XBOX)
+ ?: error("Sign in to the Xbox store first.")
+ val requested = intent.getStringExtra("product").orEmpty()
+ val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested }
+ val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested
+ // The main process's tokens when it has them (no second ~20 s fetch); else this process fetches its own.
+ val shared = runCatching { XboxCloudSession.fromMainProcess(applicationContext, account) }
+ .onFailure { log("tokens from the main process: ${it.message?.take(160)}") }.getOrNull()
+ log(if (shared != null) "tokens from the main process" else "tokens fetched here")
+ val active = (shared ?: XboxCloudSession.get(applicationContext, account)).forStream(settings.region, settings.osName)
+ regionNames = active.regionList.map { it.name }
+ serverName = active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name
+ val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.")
+ val signals = XboxCloudSignalling(active, title, settings).also { signalling = it }
+ log("$product -> $title, region ${java.net.URI(active.baseUri).host}, frame gen ${settings.frameGen}")
+
+ show("Starting the game on Xbox Cloud Gaming…")
+ expect("start", signals.start())
+ var connected = false
+ var waited = 0
+ while (!closed) {
+ val state = JSONObject(expect("state", signals.op("state")).body.ifEmpty { "{}" })
+ when (state.optString("state")) {
+ "Provisioned" -> break
+ "Failed" -> error("provision: ${state.optJSONObject("errorDetails")}")
+ "ReadyToConnect" -> if (!connected) { connected = true; show("Signing in to the cloud console…"); expect("connect", signals.connect()) }
+ "WaitingForResources" -> show("In the queue for a cloud console… ${waited / 1000} s")
+ else -> show("Getting a cloud console ready… ${waited / 1000} s")
+ }
+ Thread.sleep(1000); waited += 1000
+ }
+ if (closed) return
+
+ show("Connecting…")
+ // Small network buffer: no playout delay, frames go to the decoder and screen as soon as they are complete.
+ val trials = if (settings.smallBuffer) "WebRTC-ForcePlayoutDelay/min_ms:0,max_ms:0/WebRTC-ZeroPlayoutDelay/min_pacing:0ms,max_decode_queue_size:8/" else ""
+ PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(applicationContext)
+ .setFieldTrials(trials).createInitializationOptions())
+ val egl = eglBase!!
+ val zeroSurface = if (zeroCopyWanted(settings)) {
+ repeat(40) { if (!surfaceView.holder.surface.isValid) Thread.sleep(50) }
+ surfaceView.holder.surface.takeIf { it.isValid }
+ } else null
+ if (zeroSurface != null) {
+ // The compositor may already hold the screen; it must let go before the decoder takes it.
+ val ready = CountDownLatch(1)
+ runOnUiThread { zeroCopy = true; video?.setSurface(null, 0, 0, 60f); ready.countDown() }
+ ready.await(2, TimeUnit.SECONDS)
+ }
+ log("latency: instant input ${settings.instantInput}, small buffer ${settings.smallBuffer}, fast decoder ${settings.fastDecoder}, " +
+ "zero-copy ${zeroSurface != null}")
+ val f = PeerConnectionFactory.builder()
+ .setAudioDeviceModule(JavaAudioDeviceModule.builder(applicationContext).createAudioDeviceModule())
+ .setVideoDecoderFactory(org.webrtc.DroidDeckLowLatencyDecoderFactory(egl.eglBaseContext, settings.fastDecoder, zeroSurface) { zeroCopyFrames++ }
+ .also { decoders = it })
+ .setVideoEncoderFactory(DefaultVideoEncoderFactory(egl.eglBaseContext, true, true))
+ .createPeerConnectionFactory().also { factory = it }
+ val config = PeerConnection.RTCConfiguration(emptyList()).apply { sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN }
+ val peer = f.createPeerConnection(config, observer) ?: error("WebRTC unavailable")
+ pc = peer
+ peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_AUDIO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.SEND_RECV))
+ peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_VIDEO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.RECV_ONLY))
+ protocol = XboxNativeProtocol(peer, pad, { log(it) }, ::rumble) { runOnUiThread { finish() } }
+ pad.onChanged = { if (settings.instantInput) protocol?.inputChanged() }
+
+ val offer = await { done -> peer.createOffer(sdpObserver(done), MediaConstraints()) }
+ val local = SessionDescription(offer.type, tweakOffer(offer.description))
+ await { 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 { done -> peer.setRemoteDescription(sdpObserver(done), SessionDescription(SessionDescription.Type.ANSWER, answer.getString("sdp"))) }
+
+ gathered.await(3, TimeUnit.SECONDS)
+ val local2 = synchronized(candidates) { candidates.toList() }.map { c ->
+ JSONObject().put("candidate", c.sdp).put("sdpMid", c.sdpMid).put("sdpMLineIndex", c.sdpMLineIndex).put("usernameFragment", JSONObject.NULL).toString()
+ }
+ val iceReply = expect("ice", signals.ice(JSONArray(local2).toString()))
+ val remote = JSONArray(JSONObject(iceReply.body).getString("exchangeResponse"))
+ for (i in 0 until remote.length()) addRemoteCandidate(peer, remote.getJSONObject(i))
+ log("signalling done: ${local2.size} local / ${remote.length()} remote candidates")
+ ticker.scheduleWithFixedDelay({ runCatching { signals.op("keepalive") } }, 30, 30, TimeUnit.SECONDS)
+ ticker.scheduleWithFixedDelay({ runCatching { updateOverlay() } }, 1, 1, TimeUnit.SECONDS)
+ }
+
+ private fun expect(stage: String, reply: XboxCloudSession.Reply): XboxCloudSession.Reply {
+ if (reply.status !in 200..299) error("$stage: ${reply.status} ${reply.body.take(200)}")
+ return reply
+ }
+
+ /** Opus stereo (Greenlight), H.264 profile order (Main first unless the user picked one) and the bitrate cap. */
+ private fun tweakOffer(sdp: String): String {
+ var out = sdp.replace("useinbandfec=1", "useinbandfec=1; stereo=1")
+ val prefix = when (settings.codec) { "low" -> "420"; "normal" -> "42e"; else -> "4d" }
+ val ids = Regex("a=fmtp:(\\d+).*profile-level-id=([0-9a-f]{6})").findAll(out).filter { it.groupValues[2].startsWith(prefix) }.map { it.groupValues[1] }.toList()
+ if (ids.isNotEmpty()) out = out.split("\r\n").joinToString("\r\n") { line ->
+ if (!line.startsWith("m=video")) line else {
+ val parts = line.trim().split(" ")
+ (parts.take(3) + ids + parts.drop(3).filter { it !in ids }).joinToString(" ")
+ }
+ }
+ if (settings.bitrateMbps > 0) {
+ val lines = out.split("\r\n").toMutableList()
+ val start = lines.indexOfFirst { it.startsWith("m=video") }
+ if (start >= 0) {
+ var i = start + 1
+ while (i < lines.size && (lines[i].startsWith("i=") || lines[i].startsWith("c="))) i++
+ if (i < lines.size && lines[i].startsWith("b=AS:")) lines[i] = "b=AS:${settings.bitrateMbps * 1000}" else lines.add(i, "b=AS:${settings.bitrateMbps * 1000}")
+ out = lines.joinToString("\r\n")
+ }
+ }
+ return out
+ }
+
+ /** The server's candidates, plus the IPv4 behind a Teredo address (Greenlight's ice.ts / teredo.ts). */
+ private fun addRemoteCandidate(peer: PeerConnection, c: JSONObject) {
+ val line = c.optString("candidate").removePrefix("a=")
+ if (line.isEmpty() || line == "end-of-candidates") return
+ val mid = c.optString("sdpMid", "0"); val index = c.optString("sdpMLineIndex", "0").toIntOrNull() ?: 0
+ val address = line.split(" ").getOrNull(4).orEmpty()
+ if (address.startsWith("2001")) runCatching {
+ val p = address.split(":")
+ val hex = p[6].padStart(4, '0') + p[7].padStart(4, '0')
+ val ip = (0 until 4).joinToString(".") { k -> ((hex.substring(k * 2, k * 2 + 2).toInt(16)).inv() and 0xFF).toString() }
+ val port = p[5].toInt(16).inv() and 0xFFFF
+ peer.addIceCandidate(IceCandidate(mid, index, "candidate:10 1 UDP 1 $ip 9002 typ host "))
+ peer.addIceCandidate(IceCandidate(mid, index, "candidate:11 1 UDP 1 $ip $port typ host "))
+ }
+ peer.addIceCandidate(IceCandidate(mid, index, line))
+ }
+
+ private val observer = object : PeerConnection.Observer {
+ override fun onSignalingChange(state: PeerConnection.SignalingState) {}
+ override fun onIceConnectionChange(state: PeerConnection.IceConnectionState) { log("ice $state") }
+ override fun onIceConnectionReceivingChange(receiving: Boolean) {}
+ override fun onIceGatheringChange(state: PeerConnection.IceGatheringState) { if (state == PeerConnection.IceGatheringState.COMPLETE) gathered.countDown() }
+ override fun onIceCandidate(candidate: IceCandidate) { synchronized(candidates) { candidates.add(candidate) } }
+ override fun onIceCandidatesRemoved(removed: Array) {}
+ 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) { attach(receiver) }
+ override fun onTrack(transceiver: RtpTransceiver) { attach(transceiver.receiver) }
+ override fun onConnectionChange(state: PeerConnection.PeerConnectionState) {
+ log("connection $state")
+ when (state) {
+ PeerConnection.PeerConnectionState.CONNECTED -> {
+ connectedOnce = true
+ show("")
+ video?.setFpsTarget(settings.fpsTarget)
+ video?.setFrameGeneration(effectiveFrameGen())
+ }
+ PeerConnection.PeerConnectionState.FAILED -> fail("webrtc", "connection failed")
+ PeerConnection.PeerConnectionState.DISCONNECTED -> show("Connection lost…")
+ else -> {}
+ }
+ }
+ }
+
+ private var videoAttached = false
+
+ private fun attach(receiver: RtpReceiver) = synchronized(this) {
+ val track = receiver.track()
+ // Always attached: in zero-copy WebRTC delivers no frames, and after a live switch back they flow again.
+ if (track is VideoTrack && !videoAttached) { videoAttached = true; video?.let { track.addSink(it) }; log("video track") }
+ }
+
+ /** LSFG needs the Lossless.dll and its shader cache built; otherwise DDFG. */
+ private fun effectiveFrameGen(): String {
+ if (!XboxNativeVideo.isLsfg(settings.frameGen)) return settings.frameGen
+ val status = com.droiddeck.launcher.gpu.Lossless.sync(applicationContext)
+ if (status == 0) return settings.frameGen
+ log("LSFG unavailable (status $status), using DDFG")
+ return XboxNativeVideo.FG_DDFG
+ }
+
+ private fun await(start: (done: (Result) -> Unit) -> Unit): T {
+ val latch = CountDownLatch(1)
+ var result: Result? = null
+ start { r -> result = r; latch.countDown() }
+ check(latch.await(15, TimeUnit.SECONDS)) { "WebRTC timed out" }
+ return result!!.getOrThrow()
+ }
+
+ @Suppress("UNCHECKED_CAST")
+ private fun sdpObserver(done: (Result) -> Unit) = object : SdpObserver {
+ override fun onCreateSuccess(description: SessionDescription) = done(Result.success(description as T))
+ override fun onSetSuccess() = done(Result.success(Unit as T))
+ override fun onCreateFailure(error: String) = done(Result.failure(IllegalStateException(error)))
+ override fun onSetFailure(error: String) = done(Result.failure(IllegalStateException(error)))
+ }
+
+ // ---- input, rumble, overlay ----
+
+ private var guideDown = false
+ private var guideDownAt = 0L
+ private var lastGuideUp = 0L
+ private var pendingNexus: Runnable? = null
+ private fun isGuide(event: KeyEvent) = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE
+
+ private fun pressNexus() {
+ pad.overrideButtons = pad.overrideButtons or 2
+ root.postDelayed({ pad.overrideButtons = pad.overrideButtons and 2.inv() }, 200)
+ }
+
+ override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+ if (menu != null) {
+ // Guide closes the menu; Back goes up one page, then closes it.
+ if (isGuide(event)) { if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() }; return true }
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) {
+ if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() }
+ return true
+ }
+ return super.dispatchKeyEvent(event)
+ }
+ // Guide / the Input Controls menu button: once = the Xbox button, twice or held = the player menu.
+ if (isGuide(event)) {
+ if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
+ val pending = pendingNexus
+ if (pending != null && event.eventTime - lastGuideUp <= 350) { root.removeCallbacks(pending); pendingNexus = null; swallowGuideUp = true; openMenu() }
+ else { guideDown = true; guideDownAt = event.eventTime }
+ } else if (event.action == KeyEvent.ACTION_DOWN && guideDown && event.eventTime - guideDownAt >= 600) {
+ guideDown = false; swallowGuideUp = true; openMenu()
+ } else if (event.action == KeyEvent.ACTION_UP && guideDown) {
+ guideDown = false; lastGuideUp = event.eventTime
+ val tap = Runnable { pendingNexus = null; pressNexus() }
+ pendingNexus = tap; root.postDelayed(tap, 350)
+ }
+ return true
+ }
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) { if (event.action == KeyEvent.ACTION_UP) openMenu(); return true }
+ if (pad.onKey(event)) return true
+ return super.dispatchKeyEvent(event)
+ }
+
+ // With the menu open, sticks and the hat go to Android unhandled, which turns them into D-pad keys for the menu.
+ override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean =
+ (menu == null && pad.onMotion(event)) || super.dispatchGenericMotionEvent(event)
+
+ private fun rumble(strong: Float, weak: Float, durationMs: Int) {
+ val scale = settings.rumble / 100f
+ val amplitude = (maxOf(strong, weak) * scale * 255).toInt().coerceIn(0, 255)
+ if (amplitude == 0 || durationMs <= 0) return
+ val vibrator = (if (Build.VERSION.SDK_INT >= 31) getSystemService(android.os.VibratorManager::class.java)?.defaultVibrator
+ else @Suppress("DEPRECATION") getSystemService(android.os.Vibrator::class.java)) ?: return
+ runCatching { vibrator.vibrate(VibrationEffect.createOneShot(durationMs.coerceAtMost(1000).toLong(), amplitude)) }
+ }
+
+ /** The overlay is remembered with the other cloud settings (on = overlay level above 0). */
+ @Volatile private var overlayOn = false
+
+ private var lastJitterDelay = 0.0
+ private var lastJitterCount = 0.0
+ private var lastDecodeTime = 0.0
+ private var lastDecoded = 0.0
+ private var lastBytes = 0.0
+ private var lastStatsMs = 0.0
+ private var lastLost = 0.0
+ private var lastReceived = 0.0
+
+ /**
+ * The overlay, at the web player's levels and layout (settings statsLevel / statsLayout): 1 fps and frame
+ * generation base -> shown; 2 + resolution, ping; 3 + bitrate, jitter buffer, decode time, packet loss; 4 + frame
+ * generation's added delay, the estimated picture delay (one-way network + buffer + decode + frame generation +
+ * one screen refresh), codec and server.
+ */
+ private fun updateOverlay() {
+ val level = settings.statsLevel
+ if (!overlayOn || level <= 0) return
+ val peer = pc ?: return
+ peer.getStats { report ->
+ var size = ""; var fps = 0; var codec = ""
+ var rttMs = -1.0; var bufferMs = 0.0; var decodeMs = 0.0; var mbps = 0.0; var loss = 0.0
+ val codecs = HashMap()
+ report.statsMap.values.forEach { s -> if (s.type == "codec") codecs[s.id] = (s.members["mimeType"] as? String).orEmpty().removePrefix("video/") }
+ report.statsMap.values.forEach { s ->
+ val m = s.members
+ if (s.type == "inbound-rtp" && m["kind"] == "video") {
+ size = "${m["frameWidth"]}x${m["frameHeight"]}"
+ fps = (m["framesPerSecond"] as? Number)?.toInt() ?: 0
+ codec = codecs[m["codecId"] as? String].orEmpty()
+ val jd = (m["jitterBufferDelay"] as? Number)?.toDouble() ?: 0.0
+ val jc = (m["jitterBufferEmittedCount"] as? Number)?.toDouble() ?: 0.0
+ if (jc > lastJitterCount) bufferMs = (jd - lastJitterDelay) * 1000 / (jc - lastJitterCount)
+ lastJitterDelay = jd; lastJitterCount = jc
+ val dt = (m["totalDecodeTime"] as? Number)?.toDouble() ?: 0.0
+ val df = (m["framesDecoded"] as? Number)?.toDouble() ?: 0.0
+ if (df > lastDecoded) decodeMs = (dt - lastDecodeTime) * 1000 / (df - lastDecoded)
+ lastDecodeTime = dt; lastDecoded = df
+ val bytes = (m["bytesReceived"] as? Number)?.toDouble() ?: 0.0
+ val now = s.timestampUs / 1000.0
+ if (lastStatsMs > 0 && now > lastStatsMs) mbps = (bytes - lastBytes) * 8 / ((now - lastStatsMs) * 1000)
+ lastBytes = bytes; lastStatsMs = now
+ val lost = (m["packetsLost"] as? Number)?.toDouble() ?: 0.0
+ val received = (m["packetsReceived"] as? Number)?.toDouble() ?: 0.0
+ val dl = lost - lastLost; val dr = received - lastReceived
+ if (dl + dr > 0) loss = dl * 100 / (dl + dr)
+ lastLost = lost; lastReceived = received
+ } else if (s.type == "candidate-pair" && m["state"] == "succeeded" && m["nominated"] == true) {
+ (m["currentRoundTripTime"] as? Number)?.toDouble()?.let { rttMs = it * 1000 }
+ }
+ }
+ // Zero-copy: WebRTC never sees a decoded frame, so size and decode time come from the decoder itself.
+ if (zeroCopy) decoders?.let { d ->
+ d.videoSize()?.let { size = it }
+ val ms = d.takeDecodeMs()
+ if (ms >= 0) decodeMs = ms
+ }
+ val fg = video?.stats()
+ val fgOn = fg != null && settings.frameGen != XboxNativeVideo.FG_OFF && fg[2] > 1f
+ val fgWaitMs = if (fgOn) 1000.0 / fg!![2] else 0.0
+ val fgGpuMs = if (fgOn && fg!![5] > 0f) fg[5].toDouble() else 0.0
+ @Suppress("DEPRECATION") val refreshMs = 1000.0 / windowManager.defaultDisplay.refreshRate
+ val total = (if (rttMs >= 0) rttMs / 2 else 0.0) + bufferMs + decodeMs + fgWaitMs + fgGpuMs + refreshMs
+ // What reaches the screen: the decoder's own count in zero-copy, the presented rate with frame generation,
+ // else the frames handed to the compositor (a frame-rate target drops some of WebRTC's decoded frames).
+ val submitted = video?.frames ?: 0L
+ val handed = (submitted - lastSubmitted).toInt().also { lastSubmitted = submitted }
+ val shownFps = when {
+ zeroCopy -> (zeroCopyFrames - lastZeroCopyFrames).toInt().also { lastZeroCopyFrames = zeroCopyFrames }
+ fgOn -> fg!![3].toInt()
+ else -> handed
+ }
+ val items = buildList {
+ add("native · " + if (settings.frameGen == XboxNativeVideo.FG_OFF) "no frame gen" else XboxNativeVideo.modeName(settings.frameGen))
+ add("$shownFps fps" + if (zeroCopy) " zero-copy" else "")
+ if (fgOn) add("${settings.frameGen} ${fg!![2].toInt()} → ${fg[3].toInt()}")
+ if (level >= 2) { add(size); add(if (rttMs >= 0) "ping ${rttMs.toInt()} ms" else "ping –") }
+ if (level >= 3) {
+ add("${"%.1f".format(mbps)} Mb/s"); add("buffer ${"%.1f".format(bufferMs)} ms")
+ add("decode ${"%.1f".format(decodeMs)} ms"); add("loss ${"%.1f".format(loss)}%")
+ }
+ if (level >= 4) {
+ if (fgOn) add("frame gen +${"%.1f".format(fgWaitMs + fgGpuMs)} ms (gpu ${"%.1f".format(fgGpuMs)})")
+ add("picture delay ≈ ${total.toInt()} ms (est.)")
+ if (codec.isNotEmpty()) add(codec)
+ serverName?.let { add(it) }
+ }
+ }
+ val text = items.joinToString(if (settings.statsLayout == "vertical") "\n" else " · ")
+ runOnUiThread { overlay.text = text }
+ }
+ }
+
+ // ---- menu ----
+
+ /** The player menu (as the web player's): Resume, Xbox menu, Frame generation, Stream quality, overlay, Leave. */
+ private fun openMenu() {
+ if (menu != null) return
+ pad.reset()
+ menuPage = ""
+ val regions = regionNames
+ val lsfg = XboxNativeVideo.lsfgReady(this)
+ val view = androidx.compose.ui.platform.ComposeView(this)
+ view.setContent {
+ com.droiddeck.launcher.ui.DroidDeckTheme {
+ var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) }
+ val entries = androidx.compose.runtime.remember { List(7) { androidx.compose.ui.focus.FocusRequester() } }
+ val choices = androidx.compose.runtime.remember { List(5) { androidx.compose.ui.focus.FocusRequester() } }
+ androidx.compose.runtime.LaunchedEffect(menuPage) {
+ // Wait a frame so the entries are attached before one of them takes the selection.
+ androidx.compose.runtime.withFrameNanos { }
+ runCatching {
+ if (menuPage.isEmpty()) entries[lastMainEntry.coerceIn(0, 6)].requestFocus()
+ else if (menuPage == "framegen") choices[FG_MODES.indexOf(current.frameGen).coerceIn(0, if (lsfg) 4 else 1)].requestFocus()
+ }
+ }
+ val cs = androidx.compose.material3.MaterialTheme.colorScheme
+ // A full-size box first: the root of a ComposeView gets fixed full-screen constraints, so the panel's
+ // width only holds inside it (as the web player's menu does).
+ androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) {
+ androidx.compose.foundation.layout.Column(
+ androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f))
+ .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp),
+ ) {
+ androidx.compose.material3.Text("${intent.getStringExtra("title").orEmpty()} · native",
+ style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp))
+ fun fgName(mode: String) = when (mode) {
+ XboxNativeVideo.FG_DDFG -> "DDFG 2×"; XboxNativeVideo.FG_LSFG -> "LSFG 2×"
+ XboxNativeVideo.FG_LSFG3 -> "LSFG 3×"; XboxNativeVideo.FG_LSFG4 -> "LSFG 4×"; else -> "Off"
+ }
+ fun fpsName(s: XboxCloudSettings) = if (s.fpsTarget == 0) "the screen's rate" else "${s.fpsTarget} fps"
+ when (menuPage) {
+ "" -> {
+ XboxMenuEntry("Resume", "Back to the game", entries[0], { lastMainEntry = 0 }) { closeMenu() }
+ XboxMenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once)", entries[1], { lastMainEntry = 1 }) { closeMenu(); pressNexus() }
+ XboxMenuEntry("Frame generation & low latency", "Now: ${fgName(current.frameGen)}" + if (zeroCopy) " · zero-copy" else "",
+ entries[2], { lastMainEntry = 2 }) { menuPage = "framegen" }
+ XboxMenuEntry("Frame rate", "Target: ${fpsName(current)}", entries[3], { lastMainEntry = 3 }) { menuPage = "framerate" }
+ XboxMenuEntry("Stream quality", "Engine, resolution, region, codec, bitrate (next stream)", entries[4], { lastMainEntry = 4 }) { menuPage = "stream" }
+ XboxMenuEntry("Performance overlay and rumble", if (current.statsLevel == 0) "Overlay off"
+ else "Overlay: " + listOf("", "FPS only", "Basic", "Detailed", "Full")[current.statsLevel] + ", " + current.statsLayout,
+ entries[5], { lastMainEntry = 5 }) { menuPage = "overlay-native" }
+ XboxMenuEntry("Leave", "End the stream", entries[6], { lastMainEntry = 6 }) { finish() }
+ androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.",
+ style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp))
+ }
+ "framegen" -> {
+ XboxMenuEntry("‹ Back", null) { menuPage = "" }
+ val modes = if (lsfg) FG_MODES else FG_MODES.take(2)
+ modes.forEachIndexed { i, mode ->
+ XboxMenuEntry((if (current.frameGen == mode) "✓ " else "") + fgName(mode), when (mode) {
+ XboxNativeVideo.FG_DDFG -> "DroidDeck's own frame generation (DDFG); doubles the shown frame rate"
+ XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4 ->
+ "Lossless Scaling frame generation (the Lossless.dll DroidDeck uses for games); the frame-rate target caps the output"
+ else -> "Show the stream's own frames only"
+ }, choices[i]) { current = current.copy(frameGen = mode); setFrameGen(mode) }
+ }
+ if (!lsfg) androidx.compose.material3.Text("LSFG appears here once DroidDeck has the Lossless.dll (frame generation settings).",
+ style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp))
+ if (current.zeroCopy) androidx.compose.material3.Text(
+ "Zero-copy is used while frame generation is Off; picking a frame generation mode switches to the compositor live.",
+ style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant,
+ modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp))
+ XboxCloudSettingsPanel(current, regionNames, live = true, section = "latency", restoreRow = null,
+ startedWith = startedWith) { changed ->
+ val before = current
+ current = changed
+ applyLive(before, changed)
+ }
+ XboxMenuEntry("Restart the stream with these settings",
+ "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() }
+ }
+ else -> {
+ XboxMenuEntry("‹ Back", null) { menuPage = "" }
+ if (menuPage == "stream") XboxMenuEntry("Restart the stream with these settings",
+ "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() }
+ val page = menuPage
+ XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0,
+ onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed ->
+ val before = current
+ current = changed
+ applyLive(before, changed)
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ menu = view
+ root.addView(view, FrameLayout.LayoutParams(-1, -1))
+ view.requestFocus()
+ }
+
+ /**
+ * Applies a settings change from any menu page at once: frame generation, the frame-rate target, zero-copy, instant
+ * input and the overlay. Resolution, region, language, codec, bitrate, the network buffer, the decoder mode and the
+ * engine belong to the cloud session and need a restart (the page says so).
+ */
+ private fun applyLive(before: XboxCloudSettings, changed: XboxCloudSettings) {
+ settings = changed
+ XboxCloudSettings.save(this, changed)
+ if (changed.frameGen != before.frameGen) setFrameGen(changed.frameGen)
+ else if (changed.zeroCopy != before.zeroCopy) applyRoute()
+ if (changed.fpsTarget != before.fpsTarget) { applyDisplayRate(changed.fpsTarget); video?.setFpsTarget(changed.fpsTarget); applyRoute() }
+ applyOverlay()
+ }
+
+ /**
+ * Zero-copy draws every decoded frame straight onto the screen, so it is used only when nothing has to touch the
+ * frames: frame generation off and no frame-rate target below the stream's 60 fps (the compositor drops frames for that).
+ */
+ private fun zeroCopyWanted(s: XboxCloudSettings) =
+ s.zeroCopy && s.frameGen == XboxNativeVideo.FG_OFF && (s.fpsTarget == 0 || s.fpsTarget >= 60)
+
+ private fun applyOverlay() {
+ overlayOn = settings.statsLevel > 0
+ overlay.visibility = if (overlayOn) android.view.View.VISIBLE else android.view.View.GONE
+ overlay.textSize = 12f
+ // Top left keeps clear of the clock Xbox draws top right while its guide is open.
+ val left = settings.statsCorner == "left"
+ overlay.layoutParams = (overlay.layoutParams as FrameLayout.LayoutParams).apply {
+ gravity = Gravity.TOP or (if (left) Gravity.START else Gravity.END)
+ leftMargin = if (left) 16 else 0; rightMargin = if (left) 0 else 16
+ }
+ overlay.gravity = if (left) Gravity.START else Gravity.END
+ }
+
+ /** Stream-start settings need a new cloud session: end this one, then open the player again. */
+ private fun restartStream() {
+ val signals = signalling
+ closed = true
+ closeMenu()
+ notice?.let { root.removeView(it) }
+ notice = null
+ show("Restarting the stream…")
+ Thread({
+ signals?.stop()?.let { log("restart: session closed ${it.status}") }
+ runOnUiThread { if (!isFinishing) { startActivity(XboxCloudPlayerActivity.playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } }
+ }, "xcloud-native-restart").start()
+ }
+
+ private fun closeMenu() {
+ menu?.let { root.removeView(it) }
+ menu = null
+ pad.reset()
+ }
+
+ private fun setFrameGen(mode: String) {
+ settings = settings.copy(frameGen = mode)
+ XboxCloudSettings.save(this, settings)
+ applyRoute()
+ worker.execute { video?.setFrameGeneration(effectiveFrameGen()) }
+ }
+
+ /**
+ * Live route switch (UI thread): zero-copy when chosen and frame generation is off, else the compositor.
+ * The screen surface takes one producer at a time, so the old one lets go before the new one connects.
+ */
+ private fun applyRoute() {
+ val d = decoders ?: return
+ val want = zeroCopyWanted(settings)
+ if (want == zeroCopy) return
+ val target = screen
+ if (want) {
+ if (target == null) return
+ video?.setSurface(null, 0, 0, 60f)
+ if (d.useScreen(target)) { lastZeroCopyFrames = zeroCopyFrames; zeroCopy = true; log("route: zero-copy") }
+ else { attachCompositor(target); log("route: zero-copy refused by the decoder, compositor kept") }
+ } else {
+ if (!d.useScreen(null)) { log("route: decoder could not leave the screen, zero-copy kept"); return }
+ zeroCopy = false
+ target?.let { attachCompositor(it) }
+ log("route: compositor")
+ }
+ }
+
+ private fun attachCompositor(target: android.view.Surface) {
+ @Suppress("DEPRECATION")
+ video?.setSurface(target, screenW, screenH, windowManager.defaultDisplay.refreshRate)
+ }
+
+ /**
+ * Ask Android for the display mode whose refresh rate fits the target (at least the target when possible,
+ * else the fastest; the fastest for "the screen's rate"), so generated frames are not held back at 60 Hz.
+ */
+ private fun applyDisplayRate(target: Int) {
+ @Suppress("DEPRECATION") val display = windowManager.defaultDisplay
+ val current = display.mode
+ val modes = display.supportedModes.filter { it.physicalWidth == current.physicalWidth && it.physicalHeight == current.physicalHeight }
+ val pick = (if (target > 0) modes.filter { it.refreshRate >= target - 0.5f }.minByOrNull { it.refreshRate } else null)
+ ?: modes.maxByOrNull { it.refreshRate } ?: return
+ window.attributes = window.attributes.apply { preferredDisplayModeId = pick.modeId }
+ log("display mode ${pick.refreshRate.toInt()} Hz for target ${if (target > 0) target else "screen"}")
+ }
+
+ private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() }
+
+ /**
+ * Bars that come back while the player has focus (return from recents or another app, a swipe) are hidden
+ * again after a moment; focus alone missed the return from the background (10-24).
+ */
+ private fun watchBars() {
+ androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
+ if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) {
+ v.removeCallbacks(rehideBars)
+ v.postDelayed(rehideBars, 1500)
+ }
+ androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets)
+ }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ hideBars()
+ }
+
+ private fun hideBars() {
+ WindowCompat.setDecorFitsSystemWindows(window, false)
+ WindowInsetsControllerCompat(window, window.decorView).apply {
+ hide(WindowInsetsCompat.Type.systemBars())
+ systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+ }
+ }
+
+ override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus); if (hasFocus) hideBars() }
+
+ override fun onDestroy() {
+ closed = true
+ ticker.shutdownNow()
+ val signals = signalling
+ Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start()
+ runCatching { protocol?.close() }
+ runCatching { pc?.close(); pc?.dispose() }
+ runCatching { video?.release() }
+ runCatching { factory?.dispose() }
+ runCatching { decoders?.release() }
+ runCatching { eglBase?.release() }
+ worker.shutdownNow()
+ super.onDestroy()
+ }
+
+ companion object {
+ /** How long a stream may stay in the background (Android froze the app ~70 s after it left the screen, 10-24). */
+ private const val BACKGROUND_GRACE_MS = 45_000L
+ private val FG_MODES = listOf(XboxNativeVideo.FG_OFF, XboxNativeVideo.FG_DDFG, XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4)
+
+ /** True when the native engine can run here (ImageReader GPU buffers need Android 10). */
+ fun supported(): Boolean = Build.VERSION.SDK_INT >= 29
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt
new file mode 100644
index 0000000000..348079f527
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt
@@ -0,0 +1,186 @@
+package com.droiddeck.launcher.stores.xbox
+
+import org.json.JSONObject
+import org.webrtc.DataChannel
+import org.webrtc.PeerConnection
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.nio.charset.StandardCharsets
+import java.util.UUID
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
+
+/**
+ * The xCloud data-channel protocol for the native player, ported from Greenlight's player (UnknownSKL, MIT;
+ * tools/xcloud-player/greenlight/lib/channel): chat / control / input / message channels, the message
+ * handshake, authorization and gamepad announcements, and the binary input reports. The controller state
+ * comes from Android input events ([pad]); rumble reports come back through [onRumble].
+ */
+internal class XboxNativeProtocol(
+ pc: PeerConnection,
+ private val pad: XboxNativePad,
+ private val log: (String) -> Unit,
+ private val onRumble: (strong: Float, weak: Float, durationMs: Int) -> Unit,
+ private val onServerDisconnect: () -> Unit,
+) {
+ private val chat = pc.createDataChannel("chat", init("chatV1"))
+ private val control = pc.createDataChannel("control", init("controlV1"))
+ private val input = pc.createDataChannel("input", init("1.0"))
+ private val message = pc.createDataChannel("message", init("messageV1"))
+ private val timer = Executors.newSingleThreadScheduledExecutor { r -> Thread(r, "xcloud-input") }
+ private var loop: ScheduledFuture<*>? = null
+ private var sequence = 0
+ private var lastSent: XboxNativePad.State? = null
+ private var lastSentAt = 0L
+ @Volatile var handshakeDone = false
+ private set
+
+ init {
+ message.registerObserver(ChannelObserver(message, ::onMessageOpen, ::onMessageData))
+ control.registerObserver(ChannelObserver(control, {}, {}))
+ input.registerObserver(ChannelObserver(input, {}, ::onInputData))
+ chat.registerObserver(ChannelObserver(chat, {}, {}))
+ }
+
+ private fun init(protocol: String) = DataChannel.Init().apply { ordered = true; this.protocol = protocol }
+
+ private inner class ChannelObserver(
+ private val channel: DataChannel,
+ private val onOpen: () -> Unit,
+ private val onData: (DataChannel.Buffer) -> Unit,
+ ) : DataChannel.Observer {
+ private var opened = false
+ override fun onBufferedAmountChange(previous: Long) {}
+ override fun onStateChange() {
+ if (!opened && channel.state() == DataChannel.State.OPEN) { opened = true; runCatching(onOpen).onFailure { log("channel open failed: ${it.message}") } }
+ }
+ override fun onMessage(buffer: DataChannel.Buffer) { runCatching { onData(buffer) }.onFailure { log("channel message failed: ${it.message}") } }
+ }
+
+ private fun send(channel: DataChannel, text: String) {
+ if (channel.state() != DataChannel.State.OPEN) return
+ channel.send(DataChannel.Buffer(ByteBuffer.wrap(text.toByteArray(StandardCharsets.UTF_8)), false))
+ }
+
+ private fun send(channel: DataChannel, bytes: ByteBuffer) {
+ if (channel.state() != DataChannel.State.OPEN) return
+ channel.send(DataChannel.Buffer(bytes, true))
+ }
+
+ private fun onMessageOpen() {
+ log("message channel open, handshake")
+ send(message, JSONObject().put("type", "Handshake").put("version", "messageV1")
+ .put("id", "be0bfc6d-1e83-4c8a-90ed-fa8601c5a179").put("cv", "0").toString())
+ }
+
+ private fun onMessageData(buffer: DataChannel.Buffer) {
+ val bytes = ByteArray(buffer.data.remaining()).also { buffer.data.get(it) }
+ val data = JSONObject(String(bytes, StandardCharsets.UTF_8))
+ when (data.optString("type")) {
+ "HandshakeAck" -> {
+ handshakeDone = true
+ log("handshake done")
+ // Greenlight's order: authorization (announces controller 0 and removes it), input start, config.
+ send(control, JSONObject().put("message", "authorizationRequest").put("accessKey", "4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E").toString())
+ gamepadChanged(0, true); gamepadChanged(0, false)
+ startInput()
+ sendConfig()
+ // Our controller, after the authorization's add/remove.
+ gamepadChanged(0, true)
+ send(control, JSONObject().put("message", "videoKeyframeRequested").put("ifrRequested", true).toString())
+ }
+ "TransactionStart", "Message" -> handleTransaction(data)
+ else -> {}
+ }
+ }
+
+ private fun handleTransaction(data: JSONObject) {
+ when (data.optString("target")) {
+ "/streaming/sessionLifetimeManagement/serverInitiatedDisconnect" -> {
+ complete(data.optString("id"), "")
+ onServerDisconnect()
+ }
+ // The game's own dialogs: accept (Greenlight shows a confirm; the native player has no page).
+ "/streaming/systemUi/messages/ShowMessageDialog" -> complete(data.optString("id"), JSONObject().put("Result", 0))
+ else -> {}
+ }
+ }
+
+ private fun complete(id: String, content: Any) {
+ send(message, JSONObject().put("type", "TransactionComplete").put("content", content.toString().let { if (content is String) JSONObject.quote(it) else it })
+ .put("id", id).put("cv", "").toString())
+ }
+
+ private fun gamepadChanged(index: Int, added: Boolean) {
+ send(control, JSONObject().put("message", "gamepadChanged").put("gamepadIndex", index).put("wasAdded", added).toString())
+ }
+
+ private fun sendConfig() {
+ fun msg(path: String, content: JSONObject) = JSONObject().put("type", "Message").put("content", content.toString())
+ .put("id", UUID.randomUUID().toString()).put("target", path).put("cv", "").toString()
+ send(message, msg("/streaming/systemUi/configuration", JSONObject().put("version", org.json.JSONArray(listOf(0, 2, 0))).put("systemUis", org.json.JSONArray())))
+ send(message, msg("/streaming/properties/clientappinstallidchanged", JSONObject().put("clientAppInstallId", "c97d7ee0-73b2-4239-bf1d-9d805a338429")))
+ send(message, msg("/streaming/characteristics/orientationchanged", JSONObject().put("orientation", 0)))
+ send(message, msg("/streaming/characteristics/touchinputenabledchanged", JSONObject().put("touchInputEnabled", false)))
+ send(message, msg("/streaming/characteristics/clientdevicecapabilities", JSONObject()))
+ send(message, msg("/streaming/characteristics/dimensionschanged", JSONObject().put("horizontal", 1920).put("vertical", 1080)
+ .put("preferredWidth", 1920).put("preferredHeight", 1080).put("safeAreaLeft", 0).put("safeAreaTop", 0)
+ .put("safeAreaRight", 1920).put("safeAreaBottom", 1080).put("supportsCustomResolution", true)))
+ }
+
+ private fun header(type: Int, size: Int): ByteBuffer = ByteBuffer.allocateDirect(size).order(ByteOrder.LITTLE_ENDIAN).apply {
+ putShort(type.toShort()); putInt(sequence++); putDouble(System.nanoTime() / 1e6)
+ }
+
+ private fun startInput() {
+ // Client metadata: max touch points.
+ send(input, header(8, 15).apply { put(1.toByte()); flip() })
+ loop = timer.scheduleWithFixedDelay({ runCatching { tick() } }, 16, 16, TimeUnit.MILLISECONDS)
+ }
+
+ /** Instant controller input: send a report now if the state changed (the 16 ms loop stays as the heartbeat). */
+ fun inputChanged() {
+ // At most one extra report every 4 ms (stick motion arrives far faster than that).
+ if (handshakeDone && loop != null && System.nanoTime() - lastSentAt > 4_000_000L) timer.execute { runCatching { tick() } }
+ }
+
+ /** Greenlight's queue: a gamepad frame when the state changed (sticks past a small threshold) or every 33 ms. */
+ @Synchronized
+ private fun tick() {
+ val state = pad.snapshot()
+ val now = System.nanoTime()
+ val changed = lastSent?.let { state.differsFrom(it) } ?: true
+ if (!changed && now - lastSentAt < 33_000_000L) return
+ lastSent = state; lastSentAt = now
+ val packet = header(2, 14 + 1 + 23).apply {
+ put(1.toByte()) // one frame
+ put(0.toByte()) // gamepad index
+ putShort(state.buttons.toShort())
+ putShort(axis(state.lx)); putShort(axis(-state.ly)); putShort(axis(state.rx)); putShort(axis(-state.ry))
+ putShort(trigger(state.lt)); putShort(trigger(state.rt))
+ putInt(1) // physical physicality
+ order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_ENDIAN) // virtual physicality (Greenlight writes it big-endian)
+ flip()
+ }
+ send(input, packet)
+ }
+
+ private fun axis(value: Float): Short = (value * 32767).toInt().coerceIn(-32767, 32767).toShort()
+ private fun trigger(value: Float): Short = if (value <= 0f) 0 else if (value >= 1f) 65535.toShort() else (value * 65535).toInt().toShort()
+
+ private fun onInputData(buffer: DataChannel.Buffer) {
+ val data = buffer.data.order(ByteOrder.LITTLE_ENDIAN)
+ if (data.remaining() < 13 || (data.get(0).toInt() and 0xFF) != 128) return // vibration report
+ val strong = (data.get(4).toInt() and 0xFF) / 100f
+ val weak = (data.get(5).toInt() and 0xFF) / 100f
+ val duration = data.getShort(8).toInt() and 0xFFFF
+ onRumble(strong, weak, duration)
+ }
+
+ fun close() {
+ loop?.cancel(false)
+ timer.shutdownNow()
+ listOf(chat, control, input, message).forEach { runCatching { it.unregisterObserver(); it.close(); it.dispose() } }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt
new file mode 100644
index 0000000000..dc3657dbef
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt
@@ -0,0 +1,183 @@
+package com.droiddeck.launcher.stores.xbox
+
+import android.content.Context
+import android.graphics.PixelFormat
+import android.hardware.HardwareBuffer
+import android.media.Image
+import android.media.ImageReader
+import android.os.Handler
+import android.os.HandlerThread
+import android.view.Surface
+import com.droiddeck.launcher.gpu.FrameGen
+import com.droiddeck.launcher.gpu.Lossless
+import com.droiddeck.launcher.wayland.CompositorHost
+import com.droiddeck.launcher.wayland.WaylandCompositor
+import org.webrtc.EglBase
+import org.webrtc.EglRenderer
+import org.webrtc.GlRectDrawer
+import org.webrtc.VideoFrame
+import org.webrtc.VideoSink
+import java.io.File
+import java.util.ArrayDeque
+
+/**
+ * The native player's picture: WebRTC's hardware-decoded frames are drawn (GL, WebRTC's EglRenderer) into an
+ * ImageReader whose images are GPU-shareable HardwareBuffers, and each one goes to DroidDeck's own compositor in
+ * stream mode (WaylandCompositor.nativeStreamFrame) as the whole scene, where DroidDeck's frame generation (DDFG,
+ * or LSFG with the Lossless.dll) multiplies it. The player runs in its own process (:xcloudnative), so this
+ * compositor is never the one a Linux session uses. Android 10+ (ImageReader usage flags).
+ */
+internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, private val log: (String) -> Unit) : VideoSink {
+ companion object {
+ const val FG_OFF = "off"
+ const val FG_DDFG = "ddfg"
+ const val FG_LSFG = "lsfg"
+ const val FG_LSFG3 = "lsfg3"
+ const val FG_LSFG4 = "lsfg4"
+ fun isLsfg(mode: String) = mode == FG_LSFG || mode == FG_LSFG3 || mode == FG_LSFG4
+ fun multiplier(mode: String) = when (mode) { FG_LSFG3 -> 3; FG_LSFG4 -> 4; FG_OFF -> 0; else -> 2 }
+ fun modes(lsfg: Boolean) = if (lsfg) listOf(FG_OFF, FG_DDFG, FG_LSFG, FG_LSFG3, FG_LSFG4) else listOf(FG_OFF, FG_DDFG)
+ fun modeName(mode: String) = when (mode) {
+ FG_DDFG -> "DDFG 2×"; FG_LSFG -> "LSFG 2×"; FG_LSFG3 -> "LSFG 3×"; FG_LSFG4 -> "LSFG 4×"; else -> "Off"
+ }
+ /** LSFG can run: the Lossless.dll was imported (or found in Steam) and its shader cache built. */
+ fun lsfgReady(context: Context) = Lossless.state(context).ready
+ private const val SCALE_FIT = 1
+ private const val ALIGN_CENTER = 0
+ }
+
+ private val lock = Any()
+ private val egl = EglRenderer("xcloud-native").apply { init(eglBase.eglBaseContext, EglBase.CONFIG_RGBA, GlRectDrawer()) }
+ private val readerThread = HandlerThread("xcloud-frames").apply { start() }
+ private val readerHandler = Handler(readerThread.looper)
+ private var reader: ImageReader? = null
+ private var readerW = 0
+ private var readerH = 0
+ /** Images the compositor may still read: the oldest goes back to the reader once two newer ones arrived. */
+ private val held = ArrayDeque()
+ private var surface: Surface? = null
+ private var attached = false
+ @Volatile private var frameGen = FG_OFF
+ @Volatile private var refreshHz = 60f
+ /** The frame-rate target (0 = the screen's rate): the frame-gen pacer's cap, or a limit on stream frames without it. */
+ @Volatile private var fpsTarget = 0
+ private var nextDueNs = 0L
+ @Volatile var frames = 0L
+ private set
+
+ /** The screen: the compositor presents to it (null detaches, e.g. for zero-copy or when the surface goes). */
+ fun setSurface(target: Surface?, width: Int, height: Int, displayRefreshHz: Float) = synchronized(lock) {
+ refreshHz = displayRefreshHz
+ if (target == null) {
+ if (attached) letGo()
+ attached = false; surface = null
+ return@synchronized
+ }
+ surface = target
+ val runtime = File(context.cacheDir, "xcloud-wayland").apply { mkdirs() }
+ // System Vulkan driver; this process's compositor shows only the stream.
+ val started = CompositorHost.startOrAttach(context, target, runtime.path, null, null, context.applicationInfo.nativeLibraryDir,
+ width, height, displayRefreshHz, 0)
+ if (started) {
+ WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER)
+ log("compositor started on ${width}x$height at ${displayRefreshHz.toInt()} Hz")
+ } else {
+ WaylandCompositor.nativeResizeOutput(width, height)
+ }
+ WaylandCompositor.nativeStreamMode(true)
+ attached = true
+ applyFrameGen()
+ }
+
+ /**
+ * Gives the screen surface up and waits until the compositor has really disconnected from it: the window request
+ * is applied on the compositor thread at its next tick, and the decoder (zero-copy) can only connect after that.
+ */
+ private fun letGo() {
+ WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0)
+ CompositorHost.detach(surface)
+ WaylandCompositor.nativeVsync(System.nanoTime())
+ if (!WaylandCompositor.nativeWaitSurface(1000)) log("compositor did not let go of the screen within 1 s")
+ }
+
+ /** Frame-rate target, 0 = the screen's rate. Live. */
+ fun setFpsTarget(fps: Int) {
+ fpsTarget = fps
+ synchronized(lock) { if (attached) applyFrameGen() }
+ }
+
+ /** off, ddfg (2x) or lsfg / lsfg3 / lsfg4 (needs the Lossless.dll). Live. */
+ fun setFrameGeneration(mode: String) {
+ frameGen = mode
+ synchronized(lock) { if (attached) applyFrameGen() }
+ }
+
+ override fun onFrame(frame: VideoFrame) {
+ val w = frame.rotatedWidth; val h = frame.rotatedHeight
+ synchronized(lock) { if (w != readerW || h != readerH) startReader(w, h) }
+ egl.onFrame(frame)
+ }
+
+ private fun startReader(w: Int, h: Int) {
+ val old = reader
+ if (old != null) egl.releaseEglSurface { }
+ held.forEach { runCatching { it.close() } }; held.clear()
+ old?.close()
+ readerW = w; readerH = h
+ val next = ImageReader.newInstance(w, h, PixelFormat.RGBA_8888, 4,
+ HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE or HardwareBuffer.USAGE_GPU_COLOR_OUTPUT)
+ next.setOnImageAvailableListener({ r -> onImage(r) }, readerHandler)
+ reader = next
+ egl.createEglSurface(next.surface)
+ log("native video ${w}x$h")
+ }
+
+ private fun onImage(r: ImageReader) {
+ val image = runCatching { r.acquireLatestImage() }.getOrNull() ?: return
+ synchronized(lock) {
+ if (r !== reader) { image.close(); return }
+ val buffer = image.hardwareBuffer
+ // Without frame generation a target below the stream's rate drops stream frames evenly: each frame has a
+ // due time one interval after the last one's, so 30 of 60 frames (or 45: three of four) reach the screen.
+ val now = System.nanoTime()
+ val target = fpsTarget
+ val skip = frameGen == FG_OFF && target in 1 until 60 && run {
+ val interval = 1_000_000_000L / target
+ if (nextDueNs == 0L || now - nextDueNs > interval) nextDueNs = now
+ if (now + 4_000_000L < nextDueNs) true else { nextDueNs += interval; false }
+ }
+ if (attached && buffer != null && !skip) { WaylandCompositor.nativeStreamFrame(buffer); frames++ }
+ buffer?.close()
+ held.addLast(image)
+ while (held.size > 2) held.removeFirst().close()
+ }
+ }
+
+ private fun applyFrameGen() {
+ // The pacer caps generated output at this rate: the user's target, else the screen's.
+ val cap = if (fpsTarget > 0) fpsTarget.toFloat() else refreshHz
+ val mode = when {
+ frameGen == FG_DDFG -> FrameGen.Mode(FrameGen.ENGINE_DDFG, 2)
+ isLsfg(frameGen) -> FrameGen.Mode(FrameGen.ENGINE_LSFG, multiplier(frameGen))
+ else -> FrameGen.Mode.OFF
+ }
+ val problem = FrameGen.apply(context, mode, cap)
+ log("native frame generation: $frameGen, target ${if (fpsTarget > 0) fpsTarget else "screen"} fps" + (problem?.let { " ($it)" } ?: ""))
+ }
+
+ /** {planned, planned, sourceFps, presentedFps, thermal, -1}, or null while nothing is shown. */
+ fun stats(): FloatArray? = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenStats() else null }
+
+ fun frameGenProblem(): Int = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenProblem() else -1 }
+
+ fun release() {
+ egl.release()
+ synchronized(lock) {
+ if (attached) { WaylandCompositor.nativeStreamMode(false); letGo() }
+ attached = false; surface = null
+ held.forEach { runCatching { it.close() } }; held.clear()
+ reader?.close(); reader = null
+ }
+ readerThread.quitSafely()
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt
index 28d6c12d99..d1ba4a52e7 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt
@@ -46,7 +46,7 @@ internal object XboxRuntime {
val market = game.second.extra["market"]?.takeIf { it.matches(Regex("[A-Z]{2}")) } ?: Xodus.market()
val directory = views.create(app.filesDir)
val process = try {
- Xodus.start(app, listOf("run", game.first.path, "droiddeck:prepare", "--exe", game.second.exe,
+ Xodus.start(app, listOf("run", StoreInstallRoot.guestPathForXodus(app, game.first), "droiddeck:prepare", "--exe", game.second.exe,
"--materialize-chain", "--market", market), launchDirectory = directory, credentialGeneration = credentials)
} catch (e: Exception) { XboxLaunchViews.remove(directory); throw e }
if (!launches.attach(token, process)) { process.close(); error("Xbox launch was cancelled") }
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt
index fde5b0650c..5d6160c44d 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt
@@ -5,7 +5,9 @@ import android.os.Environment
import com.droiddeck.launcher.core.AddonPack
import com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent
import com.droiddeck.launcher.runtime.LinuxRuntime
+import com.droiddeck.launcher.runtime.ProotFastPath
import com.droiddeck.launcher.session.SessionPrefs
+import com.droiddeck.launcher.stores.StoreInstallRoot
import org.json.JSONObject
import java.io.Closeable
import java.io.File
@@ -79,17 +81,34 @@ internal object Xodus {
networkLink.publish()
networkLink.start()
val runtime = (runtimeDirectory ?: File(app.filesDir, "xbox-runtime")).apply { mkdirs() }
- val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), listOf(
+ val root = LinuxRuntime.rootDir(app)
+ val external = Environment.getExternalStorageDirectory()
+ val extraBinds = StoreInstallRoot.externalBindSpecsForXodus(app)
+ val binds = LinuxRuntime.binds(app, null, null, external, extraBinds)
+ val fastPathPreloaded = runCatching {
+ File(root, "etc/ld.so.preload").useLines { lines -> lines.any { it.trim() == ProotFastPath.LIBRARY } }
+ }.getOrDefault(false)
+ val fastPathKey = if (ProotFastPath.enabled(app) && fastPathPreloaded &&
+ File(root, ProotFastPath.LIBRARY.removePrefix("/")).isFile) ProotFastPath.key(root, binds) else null
+ val guestCommand = mutableListOf(
"/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off",
"XDG_RUNTIME_DIR=${runtime.path}", "DROIDDECK_XBOX_CREDENTIAL_SOCKET=${credentials.name}", binary,
- ) + args)
+ )
+ fastPathKey?.let { key ->
+ guestCommand.addAll(guestCommand.lastIndex, ProotFastPath.guestEnv(root, binds, key))
+ }
+ guestCommand.addAll(args)
+ val command = LinuxRuntime.commandWithBinds(app, root, binds, guestCommand)
val builder = ProcessBuilder(command).directory(LinuxRuntime.rootDir(app))
if (launchDirectory != null) builder.environment()["TMPDIR"] = launchDirectory.path
+ builder.environment()["DROIDDECK_XBOX_CREDENTIAL_PORT"] = credentials.port.toString()
+ builder.environment()["DROIDDECK_XBOX_CREDENTIAL_KEY"] = credentials.key
builder.environment().apply {
remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH")
put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path)
put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(app).path)
if (SessionPrefs.prootNoSeccomp(app)) put("PROOT_NO_SECCOMP", "1")
+ fastPathKey?.let { ProotFastPath.hostEnv(it).let { (key, value) -> put(key, value) } }
LinuxRuntime.prootLibraryPath(app).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) }
}
val digest = java.security.MessageDigest.getInstance("SHA-256")
@@ -133,11 +152,13 @@ internal object Xodus {
}
}
+ const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\."
+
/** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */
fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({
runCatching {
child.process.errorStream.bufferedReader().useLines { lines -> lines.forEach { line ->
- if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.")))
+ if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.|NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{3}|$SIGN_IN_REJECTED")))
report(line)
} }
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt
index 5e63d7b0f2..b3b88f0aa4 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt
@@ -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/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
index a4227d4c28..c4d8053d98 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
@@ -676,14 +676,15 @@ private fun MoviePreview(url: String, modifier: Modifier = Modifier) {
/** A dialog with one text box, for a search term or a page number; the Android keyboard comes up with it. */
@Composable
-private fun TextEntryDialog(
+internal fun TextEntryDialog(
title: String, initial: String, number: Boolean, confirm: String, onSubmit: (String) -> Unit, onDismiss: () -> Unit,
+ id: String = "boot-movie-entry",
) {
val shown = rememberShown(onDismiss)
val close = { shown.targetState = false }
var text by remember { mutableStateOf(initial) }
val submit = { onSubmit(text.trim()); close() }
- AppDialog(shown, close, "boot-movie-entry", wide = false, maxWidth = 460.dp) {
+ AppDialog(shown, close, id, wide = false, maxWidth = 460.dp) {
DialogTitleRow(title, close)
AdbTextField(
value = text, onValueChange = { text = it }, label = "", keyboardType = if (number) KeyboardType.Number else KeyboardType.Text,
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt
new file mode 100644
index 0000000000..d94ee25a7d
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt
@@ -0,0 +1,136 @@
+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.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.getValue
+
+/** A grid of cards with a game page that floods out of the opened card and drains back into it. */
+@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)
+@Composable
+internal fun CardDetailHost(
+ open: String?,
+ detailScroll: ScrollState,
+ gridScrolled: () -> Boolean,
+ onDetailFocus: (Boolean) -> Unit,
+ modifier: Modifier = Modifier,
+ wrap: @Composable (key: String, content: @Composable () -> Unit) -> Unit = { _, content -> content() },
+ grid: @Composable () -> Unit,
+ detail: @Composable (key: String) -> Unit,
+) {
+ val ctx = LocalContext.current
+ val ff = LocalFrontFocus.current
+ val density = LocalDensity.current
+ var shown by remember { mutableStateOf(null) }
+ var leaving by remember { mutableStateOf(false) }
+ var from by remember { mutableStateOf(null) }
+ var art by remember { mutableStateOf(null) }
+ var viewportAt by remember { mutableStateOf(Offset.Zero) }
+ LaunchedEffect(open) {
+ if (open != null) {
+ val mark = StoresMotion.takeCard(open)
+ from = mark?.let { Origin(it.bounds.translate(-viewportAt), it.corner) }
+ art = mark?.art
+ StoresMotion.heroLands = mark != null
+ leaving = false
+ shown = open
+ } else if (shown != null) {
+ if (from != null) {
+ leaving = true
+ delay(Motion.ms(PAGE_RETURN_MS).toLong())
+ }
+ shown = null
+ leaving = false
+ from = null
+ }
+ }
+ LaunchedEffect(shown) { detailScroll.scrollTo(0) }
+ val covering = shown != null && !leaving
+ val coveringNow = rememberUpdatedState(covering)
+ val gridScale by animateFloatAsState(if (covering) 0.95f else 1f, if (covering) Motion.tw(480) else Motion.tw(460, 40), label = "gridSink")
+ val gridAlpha by animateFloatAsState(if (covering) 0f else 1f, if (covering) Motion.tw(320, 80) else Motion.tw(300, 100), label = "gridFade")
+ val fade = with(density) { 14.dp.toPx() }
+ Box(
+ modifier.clipToBounds()
+ .onGloballyPositioned { viewportAt = it.positionInRoot() }
+ .graphicsLayer { compositingStrategy = androidx.compose.ui.graphics.CompositingStrategy.Offscreen }
+ .drawWithContent {
+ drawContent()
+ val scrolled = if (shown != null) detailScroll.value > 0 else gridScrolled()
+ if (scrolled && size.height > fade) drawRect(
+ Brush.verticalGradient(0f to Color.Transparent, fade / size.height to Color.Black),
+ blendMode = androidx.compose.ui.graphics.BlendMode.DstIn,
+ )
+ },
+ ) {
+ CompositionLocalProvider(LocalFrontFocus provides if (covering) null else ff) {
+ Column(
+ modifier = Modifier.fillMaxSize()
+ .graphicsLayer { scaleX = gridScale; scaleY = gridScale; alpha = gridAlpha }
+ .focusProperties { enter = { if (coveringNow.value) FocusRequester.Cancel else FocusRequester.Default } }
+ .focusGroup(),
+ ) { grid() }
+ }
+ shown?.let { key ->
+ wrap(key) {
+ val body: @Composable () -> Unit = {
+ Column(
+ Modifier.fillMaxSize().pointerInput(Unit) { detectTapGestures { } }
+ .verticalScroll(detailScroll).padding(top = 4.dp, bottom = 16.dp),
+ ) {
+ Column(
+ Modifier.fillMaxWidth()
+ .onFocusChanged { onDetailFocus(it.hasFocus) }
+ .focusProperties { exit = { if (coveringNow.value && Steps.step == null && StoresMotion.step == null) FocusRequester.Cancel else FocusRequester.Default } }
+ .focusGroup(),
+ ) { 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/ColorPickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt
index e94f193e95..d83e1abe10 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
@@ -70,12 +71,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 +99,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()) {
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt
index f6ce824ea8..39862c0823 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt
@@ -70,6 +70,7 @@ import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.boundsInRoot
import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
@@ -102,6 +103,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie
val ctx = LocalContext.current
val density = LocalDensity.current
val narrow = LocalNarrowPane.current
+ val short = compactDesktop()
val colors = MaterialTheme.colorScheme
LaunchedEffect(Unit) { UserAppsState.refresh(ctx) }
LaunchedEffect(s.ready) { com.droiddeck.launcher.store.StoreState.refresh(ctx) }
@@ -120,7 +122,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie
key = "desktop", tabs = tabs,
onOpen = a.onDesktopSettings, onPrimary = a.onDesktop,
modifier = modifier.clipToBounds(),
- start = if (narrow) 20.dp else 44.dp, bottom = if (narrow) 20.dp else 44.dp,
+ start = if (narrow) 20.dp else 44.dp, bottom = 44.dp,
background = {
DesktopWall(installed.map { it.iconRes } + apps.mapNotNull { it.icon })
},
@@ -132,8 +134,8 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie
},
words = {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Text(
- stringResource(R.string.rail_desktop), fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp,
+ if (LocalConfiguration.current.screenHeightDp >= 400) Text(
+ stringResource(R.string.rail_desktop), fontSize = if (short) 30.sp else 42.sp, lineHeight = if (short) 34.sp else 46.sp,
fontWeight = FontWeight.Black, color = colors.onBackground,
)
BusyChip(s)
@@ -143,11 +145,12 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie
PrimaryButton(open, enabled = !s.busy, main = true, large = true, icon = Icons.Outlined.DesktopWindows, onClick = click)
},
beside = {
- Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
- Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
- HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") }
- HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true }
- }
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.horizontalScroll(rememberScrollState()),
+ ) {
+ HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") }
+ HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true }
if (s.desktopPresent) UninstallDesktop(enabled = !s.runtimeActionsBlocked, onUninstall = a.onRemoveDesktop)
}
},
@@ -159,6 +162,9 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie
if (adding && !s.busy) AddAppDialog(s.ready, onDismiss = { adding = false }) { request, label -> UserAppsState.add(ctx, request, label) }
}
+@Composable
+private fun compactDesktop() = LocalNarrowPane.current || LocalConfiguration.current.screenHeightDp < 600
+
@Composable
private fun DesktopDock(
s: FrontEndState, a: FrontEndActions, installed: List, apps: List,
@@ -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/ExePickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ExePickerDialog.kt
index 901bf64850..9fd3631553 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, val files: List)
-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(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/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt
index db68502260..b70f9bb5e3 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt
@@ -254,7 +254,7 @@ private fun Content(
return
}
if (selected == "games" || selected.startsWith("app:")) {
- GamesPage(s, a, selected, onSelect, modifier)
+ LibraryPage(s, a, selected, onSelect, modifier)
return
}
if (selected == "desktop") {
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt
index c7b78ee05c..efc00297cd 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt
@@ -5,7 +5,6 @@ import com.droiddeck.launcher.R
import androidx.compose.ui.res.stringResource
import androidx.compose.foundation.LocalIndication
import androidx.compose.foundation.background
-import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.hoverable
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -13,144 +12,39 @@ import androidx.compose.foundation.interaction.collectIsFocusedAsState
import androidx.compose.foundation.interaction.collectIsHoveredAsState
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.key
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Edit
import androidx.compose.ui.semantics.semantics
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import kotlinx.coroutines.flow.first
-import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.blur
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
import com.droiddeck.launcher.frontend.Library
-import com.droiddeck.launcher.stores.epic.EpicClient
import kotlinx.coroutines.launch
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.getValue
@Composable
-internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, onSelect: (String) -> Unit, modifier: Modifier) {
- val pageContext = androidx.compose.ui.platform.LocalContext.current
- LaunchedEffect(Unit) { EpicClient.refresh(pageContext) }
- val launcherName = stringResource(R.string.epic_client_title)
- val epic = EpicClient.status
- val launcherArt by androidx.compose.runtime.produceState(null, epic.version) {
- value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { EpicClient.icon(pageContext, epic.version) }
- }
- val games = remember(s.steamGames, s.shortcutPicker, epic, launcherName, launcherArt) {
- val sorted = s.steamGames.sortedByDescending { it.lastPlayed }
- if (s.shortcutPicker) sorted else EpicClient.withLauncher(sorted, EpicClient.launcherEntry(pageContext, launcherName, epic, launcherArt))
- }
- val gameCount = games.count { it.library != Library.EPIC_LAUNCHER }
- val narrow = LocalNarrowPane.current
- val current = games.firstOrNull { "app:${it.appId}" == selected } ?: games.firstOrNull()
- GamesDialogs(a, s.steamGames)
- val onAdd: (() -> Unit)? = if (s.shortcutPicker) null else ({ GamesDialogState.adding = true })
- val launch: (Library.SteamGame) -> Unit = { g -> if (g.library == Library.EPIC_LAUNCHER) a.onEpicLauncher() else a.onSteamGame(g) }
- val onEdit: (Library.SteamGame) -> Unit = { g ->
- g.gameFiles?.let { GamesDialogState.editing = EditRequest(it.path, openTarget = false, fromSummary = false, preview = EditPreview.of(pageContext, g, it.path)) }
- }
- if (current == null || gameCount == 0) {
- Column(modifier = modifier.padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp)) {
- Rise(0) {
- PageHeader(stringResource(R.string.content_games)) {
- if (s.steamGamesX64) ClientTag()
- onAdd?.let { AddGameButton(it) }
- }
- }
- Rise(1) { Note(stringResource(if (s.shortcutPicker && s.shortcutLibraryScanning) R.string.game_shortcut_scanning else R.string.games_empty)) }
- if (!s.shortcutPicker) Rise(2) {
- Actions {
- PrimaryButton(stringResource(R.string.games_play_steam), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = Modifier.padding(top = 12.dp).testTag("play-steam"), onClick = a.onPlay)
- games.firstOrNull { it.library == Library.EPIC_LAUNCHER }?.let { SecondaryButton(it.name, enabled = !s.busy, modifier = Modifier.padding(top = 12.dp)) { a.onEpicLauncher() } }
- }
- }
- GameFileFolderActions(s, a)
- }
- return
- }
- val host = rememberMenuHost()
- if (games.size == 1) {
- Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp)) {
- if (onAdd != null) Rise(0) { GamesHeader(gameCount, s.steamGamesX64, onAdd, Modifier.padding(bottom = 10.dp)) }
- Rise(0) {
- Row(verticalAlignment = Alignment.Bottom) {
- GameHero(current, Modifier.weight(1f).heightIn(min = if (narrow) 190.dp else 250.dp), corner = { GameRemoveButton(current, s, a) }) {
- GameHeroCopy(current, if (narrow) 28.sp else 38.sp)
- GameActions(current, s, a, onEdit, launch)
- }
- if (!narrow) Poster(current.art, current.name, Modifier.width(168.dp))
- }
- }
- Rise(1) { SectionTitle(stringResource(R.string.games_launch_settings), null) }
- Rise(2) { LaunchSettings(s, a, host, current) }
- Rise(3) { GameFileFolderActions(s, a) }
- }
- return
- }
- val pal = LocalPalette.current
- Row(modifier = modifier) {
- GameList(games, gameCount, s.steamGamesX64, current, onSelect = { onSelect("app:${it.appId}") }, onLaunch = launch, onAdd = onAdd,
- modifier = Modifier.width(if (narrow) 168.dp else 250.dp).fillMaxHeight())
- Box(Modifier.width(1.dp).fillMaxHeight().background(pal.line))
- Column(
- modifier = Modifier.weight(1f).fillMaxHeight().verticalScroll(rememberScrollState())
- .padding(horizontal = if (narrow) 14.dp else 20.dp, vertical = 16.dp),
- ) {
- GameHero(current, Modifier.fillMaxWidth().heightIn(min = if (narrow) 170.dp else 200.dp), corner = { GameRemoveButton(current, s, a) }) {
- GameHeroCopy(current, if (narrow) 24.sp else 32.sp)
- GameActions(current, s, a, onEdit, launch)
- }
- SectionTitle(stringResource(R.string.games_launch_settings), null)
- LaunchSettings(s, a, host, current)
- GameFileFolderActions(s, a)
- }
- }
-}
-
-@Composable
-private fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) {
+internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) {
if (s.shortcutPicker) return
var open by remember { androidx.compose.runtime.mutableStateOf(false) }
- Box(Modifier.padding(top = 12.dp)) {
+ Box {
SecondaryButton(stringResource(R.string.game_frontend_files), compact = true) { open = !open }
AnchoredMenu(open, onDismiss = { open = false }, title = s.gameSyncFolder ?: stringResource(R.string.game_frontend_files)) { first ->
MenuItem(stringResource(R.string.game_file_sync), checked = false, focusRequester = first) {
@@ -165,31 +59,7 @@ private fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) {
@Composable
-private fun GameActions(g: Library.SteamGame, s: FrontEndState, a: FrontEndActions, onEdit: (Library.SteamGame) -> Unit, launch: (Library.SteamGame) -> Unit) {
- Actions {
- PrimaryButton(stringResource(if (s.shortcutPicker) R.string.game_shortcut_choose else R.string.games_launch), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { launch(g) }
- if (g.library == Library.EPIC_LAUNCHER) {
- if (!s.shortcutPicker) UninstallEpicLauncher(s, a)
- BusyChip(s)
- return@Actions
- }
- g.gameFiles?.takeIf { it.isDirectory }?.let { dir ->
- SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) }
- }
- g.protonPrefix?.takeIf { it.isDirectory }?.let { dir ->
- SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) }
- if (g.library == Library.ADDED) ManageSaves(g, dir, a)
- }
- if (!s.shortcutPicker) GameShortcutMenu(g, a)
- if (!s.shortcutPicker && g.library == Library.ADDED && g.source == Library.ADDED && g.gameFiles != null) EditGameButton { onEdit(g) }
- else if (!s.shortcutPicker && g.library != Library.ADDED && g.source == Library.SOURCE_STEAM) EditGameButton { GamesDialogState.steamArt = g }
- else if (!s.shortcutPicker && g.library == Library.ADDED && g.source != Library.ADDED && g.gameFiles != null) EditGameButton { GamesDialogState.storeArt = g }
- BusyChip(s)
- }
-}
-
-@Composable
-private fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) {
+internal fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) {
var asking by remember { androidx.compose.runtime.mutableStateOf(false) }
SecondaryButton(stringResource(R.string.common_uninstall), enabled = !s.busy, compact = true) { asking = true }
if (asking) {
@@ -204,71 +74,6 @@ private fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) {
}
}
-@Composable
-private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) {
- var open by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(false) }
- Box {
- SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open }
- AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_shortcut)) { first ->
- MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) {
- open = false; a.onGameShortcut(g)
- }
- MenuItem(stringResource(R.string.game_file_export), checked = false) {
- open = false; a.onExportGameFile(g)
- }
- MenuItem(stringResource(R.string.game_link_copy), checked = false) {
- open = false; a.onCopyGameLink(g)
- }
- }
- }
-}
-
-@Composable
-private fun ManageSaves(g: Library.SteamGame, prefix: java.io.File, a: FrontEndActions) {
- var open by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(false) }
- val saves by androidx.compose.runtime.produceState?>(null, g.gameId, open) {
- if (open) value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
- runCatching { com.droiddeck.launcher.session.GameSaves.locate(prefix, g) }.getOrDefault(emptyList())
- }
- }
- val found = saves
- val summary = when {
- found == null -> stringResource(R.string.games_saves_looking)
- found.isEmpty() -> stringResource(R.string.games_saves_none)
- else -> {
- val mb = found.sumOf { it.bytes } / 1048576.0
- stringResource(
- R.string.games_saves_summary,
- if (found.size == 1) found[0].relPath else stringResource(R.string.games_saves_folders, found.size),
- found.sumOf { it.files },
- if (mb < 1) stringResource(R.string.games_kb, (mb * 1024).toInt()) else stringResource(R.string.common_size_mb, mb),
- )
- }
- }
- Box {
- val cloudGame = com.droiddeck.launcher.stores.Store.byId(g.source).let { it == com.droiddeck.launcher.stores.Store.GOG || it == com.droiddeck.launcher.stores.Store.EPIC }
- val label = stringResource(if (cloudGame) R.string.store_cloud_saves else R.string.games_manage_saves)
- SecondaryButton(label, compact = true) { open = !open }
- AnchoredMenu(open, onDismiss = { open = false }, title = if (cloudGame) label else stringResource(R.string.games_saves), note = summary) { first ->
- if (cloudGame) CloudRows(g, open, first)
- MenuItem(stringResource(R.string.games_import_saves), checked = false, focusRequester = if (cloudGame) null else first) {
- open = false; a.onSaveImport(g)
- }
- MenuItem(stringResource(R.string.games_export_gamehub), checked = false) {
- open = false; a.onSaveExport(g, com.droiddeck.launcher.session.GameSaves.Layout.GAMEHUB)
- }
- MenuItem(stringResource(R.string.games_export_winlator), checked = false) {
- open = false; a.onSaveExport(g, com.droiddeck.launcher.session.GameSaves.Layout.WINLATOR)
- }
- found?.firstOrNull()?.let { d ->
- MenuItem(stringResource(R.string.games_open_save_folder), checked = false, detail = d.relPath) {
- open = false; a.onBrowseFiles(java.io.File(prefix, "drive_c/users/steamuser/" + d.relPath))
- }
- }
- }
- }
-}
-
/** A skipped sync is not a success: "0 files" used to show for a signed-out store or cloud saves turned off. */
internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.launcher.stores.CloudSaves.Result): String = when (r.result) {
"ok" -> when {
@@ -285,125 +90,7 @@ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.lau
}
@Composable
-private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compose.ui.focus.FocusRequester) {
- val store = com.droiddeck.launcher.stores.Store.byId(g.source)?.takeIf { it != com.droiddeck.launcher.stores.Store.AMAZON } ?: return
- val id = g.storeId ?: return
- val context = androidx.compose.ui.platform.LocalContext.current.applicationContext
- var busy by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(null) }
- var tick by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(0) }
- val status by androidx.compose.runtime.produceState(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, 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() }
- 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 +105,13 @@ internal object GamesDialogState {
}
@Composable
-private fun GamesDialogs(a: FrontEndActions, games: List) {
+internal fun GamesDialogs(a: FrontEndActions, games: List) {
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() to 0
st.checking = dir.name
scope.launch {
@@ -433,6 +120,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List) {
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 +159,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List) {
}
@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 +179,6 @@ private fun AddGameButton(onClick: () -> Unit) {
}
}
-@Composable
-internal fun Modifier.arriveIn(arriving: Boolean): Modifier {
- val t = remember { androidx.compose.animation.core.Animatable(if (arriving) 0f else 1f) }
- LaunchedEffect(Unit) { if (t.value < 1f) t.animateTo(1f, Motion.tw(280)) }
- return graphicsLayer { alpha = t.value; translationY = (1f - t.value) * 12.dp.toPx() }
-}
-
-@Composable
-private fun GameRow(g: Library.SteamGame, selected: Boolean, onSelect: () -> Unit, onLaunch: () -> Unit) {
- val colors = MaterialTheme.colorScheme
- val pal = LocalPalette.current
- val src = remember { MutableInteractionSource() }
- val focused by src.collectIsFocusedAsState()
- val hovered by src.collectIsHoveredAsState()
- LaunchedEffect(focused) { if (focused && !selected) onSelect() }
- Row(
- verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp),
- modifier = Modifier.fillMaxWidth().paneItem("game:${g.appId}")
- .clip(Shape12)
- .background(if (selected) pal.signal.copy(alpha = 0.14f) else if (hovered) Color.White.copy(alpha = 0.05f) else Color.Transparent)
- .glideBorder(focused, Shape12, pal.signal)
- .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onSelect)
- .controllerConfirm(onClick = onLaunch)
- .padding(horizontal = 10.dp, vertical = 6.dp),
- ) {
- Box(Modifier.width(30.dp).height(45.dp).clip(RoundedCornerShape(5.dp)).background(artBrush(hueOf(g.name)))) {
- if (g.art != null) AsyncImage(model = g.art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize())
- }
- Column(modifier = Modifier.weight(1f)) {
- Text(g.name, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis)
- Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
- SourceChip(g.source, small = true)
- Text(
- if (g.library == Library.EPIC_LAUNCHER) libraryLabel(g)
- else playedSpan(g.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played),
- fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis,
- )
- }
- }
- }
-}
-
@Composable
internal fun PageHeader(title: String, trailing: @Composable RowScope.() -> Unit = {}) {
Row(
@@ -622,11 +207,7 @@ internal fun RuntimeChip(s: FrontEndState) = when {
else -> Chip(stringResource(R.string.games_runtime_ready), ok = true)
}
-@Composable
-private fun lastPlayedText(lastPlayed: Long): String? =
- playedSpan(lastPlayed)?.let { stringResource(R.string.games_last_played, it.replaceFirstChar { c -> c.lowercase() }) }
-
-private fun playedSpan(lastPlayed: Long): String? {
+internal fun playedSpan(lastPlayed: Long): String? {
if (lastPlayed <= 0L) return null
return android.text.format.DateUtils.getRelativeTimeSpanString(
lastPlayed * 1000L, System.currentTimeMillis(), android.text.format.DateUtils.MINUTE_IN_MILLIS,
@@ -634,37 +215,9 @@ private fun playedSpan(lastPlayed: Long): String? {
}
@Composable
-private fun libraryLabel(g: Library.SteamGame): String = when {
- g.library == Library.EPIC_LAUNCHER -> EpicClient.status.version?.substringBefore('+')?.let { stringResource(R.string.epic_client_version, it) } ?: ""
+internal fun libraryLabel(g: Library.SteamGame): String = when {
+ g.library == Library.XBOX_CLOUD -> stringResource(R.string.xbox_cloud_gaming)
g.library != Library.ADDED -> if (g.library == "internal") stringResource(R.string.games_internal) else g.library
g.source != Library.ADDED -> stringResource(R.string.games_store_storage)
else -> ""
}
-
-@Composable
-private fun GameHero(g: Library.SteamGame, modifier: Modifier, corner: @Composable BoxScope.() -> Unit = {}, content: @Composable ColumnScope.() -> Unit) {
- val colors = MaterialTheme.colorScheme
- Box(modifier = modifier.clip(Shape16).background(artBrush(hueOf(g.name)))) {
- val image = g.hero ?: g.art.takeIf { g.library != Library.EPIC_LAUNCHER }
- if (image != null) AsyncImage(
- model = image, contentDescription = null, contentScale = ContentScale.Crop,
- modifier = Modifier.matchParentSize()
- .then(if (g.hero == null) Modifier.blur(24.dp).graphicsLayer { scaleX = 1.3f; scaleY = 1.3f } else Modifier),
- )
- Spacer(
- Modifier.matchParentSize().background(
- Brush.horizontalGradient(
- 0f to colors.background.copy(alpha = 0.92f),
- 0.55f to colors.background.copy(alpha = 0.6f),
- 1f to Color.Transparent,
- ),
- ),
- )
- Column(
- verticalArrangement = Arrangement.spacedBy(4.dp),
- modifier = Modifier.align(Alignment.BottomStart).padding(horizontal = 22.dp, vertical = 18.dp),
- content = content,
- )
- Box(Modifier.align(Alignment.TopEnd).padding(12.dp), content = corner)
- }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
index 1840d0f077..b8ac10ba11 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
@@ -132,7 +132,7 @@ 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 launcherFullscreen: Boolean = true,
val downloadSource: String = DownloadSource.MODE_AUTO,
val downloadMirror: String = "",
@@ -141,7 +141,6 @@ class FrontEndState(
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,
@@ -217,7 +216,6 @@ class FrontEndActions(
val onDownloadPrefix: (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 = {},
@@ -395,6 +393,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
}
a.onNavigated()
}
+ LaunchedEffect(com.droiddeck.launcher.stores.StoresState.openGameRequest) {
+ if (com.droiddeck.launcher.stores.StoresState.openGameRequest != null) selected = "stores"
+ }
var showWirelessAdbFix by rememberSaveable { mutableStateOf(false) }
var showDeveloperDisplayChoice by rememberSaveable { mutableStateOf(false) }
var wirelessAdbDesiredEnabled by rememberSaveable { mutableStateOf(false) }
@@ -437,7 +438,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 }
@@ -550,6 +551,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
}
FlightsLayer(screenAt)
+ GamesDialogs(a, s.steamGames)
+ com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } }
StepsLayer(screenAt)
appToChooseDisplay?.let { app ->
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
index b5bbaa2e91..8f92dbbc6a 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
@@ -359,6 +359,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),
@@ -507,7 +508,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
@@ -526,7 +527,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 ->
@@ -569,18 +570,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
@@ -594,7 +588,37 @@ private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.fronte
}
}, "game-settings").start()
}
- val key = "game-settings"
+}
+
+@Composable
+internal fun rememberGameSettings(scope: String): GameSettingsState {
+ val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext
+ return remember(scope) { GameSettingsState(appContext, scope) }
+}
+
+@Composable
+private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, scope: String) {
+ val state = rememberGameSettings(scope)
+ SettingCard(stringResource(R.string.game_settings_card), stringResource(if (state.noSteam) R.string.game_steam_without else R.string.game_steam_with), "card:$GAME_SETTINGS_MENU", Modifier.fillMaxSize()) {
+ host.open = if (host.open == GAME_SETTINGS_MENU) null else GAME_SETTINGS_MENU
+ }
+ GameSettingsMenus(host, game, state)
+}
+
+/** The per-game settings menus, opened by setting [MenuHost.open] to [GAME_SETTINGS_MENU]. */
+@Composable
+internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, state: GameSettingsState) {
+ val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext
+ val colors = MaterialTheme.colorScheme
+ val scope = state.scope
+ val current = state.config
+ val noSteam = state.noSteam
+ val fex = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameFexPreset(it, scope) }.getOrNull() }
+ val sync = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameSync(it, scope) }.getOrNull() }
+ val ready = current != null && !state.saving
+ val launcher = game.library == com.droiddeck.launcher.frontend.Library.EPIC_LAUNCHER
+ fun save(change: (android.content.Context) -> com.droiddeck.launcher.core.GameEnvironment.Config?) = state.save(change)
+ val key = GAME_SETTINGS_MENU
val fexKey = "game-settings-fex"
val syncKey = "game-settings-sync"
val syncLabels = mapOf(
@@ -608,9 +632,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) {
@@ -685,6 +706,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
@@ -792,6 +815,13 @@ private fun LanguageRow(host: MenuHost, chosen: String, onPick: (String) -> Unit
}
}
+/** How fast Inner Gamer cycles its colours. */
+@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) }
+}
+
/** The two colours of the Gradient theme, each a small square that opens the colour picker. */
@Composable
private fun GradientColorRows() {
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt
new file mode 100644
index 0000000000..50b85c7e35
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt
@@ -0,0 +1,830 @@
+package com.droiddeck.launcher.ui
+
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.boundsInRoot
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.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.download.DownloadQueue
+import com.droiddeck.launcher.stores.download.DownloadState
+import com.droiddeck.launcher.stores.formatBytes
+import com.droiddeck.launcher.stores.xbox.XboxBackend
+import com.droiddeck.launcher.stores.xbox.XboxCloudGames
+import com.droiddeck.launcher.stores.xbox.XboxContent
+import com.droiddeck.launcher.stores.xbox.xboxCloud
+import com.droiddeck.launcher.stores.xbox.xboxPc
+import com.droiddeck.launcher.stores.xbox.XboxRuntime
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.getValue
+
+/** What a game page shows: `app:` for a game in the library, `[app:]:` for a store product. */
+internal class GameRef(val appId: Int?, val store: Store?, val storeId: String?) {
+ fun game(games: List): 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>(1) }
+ val store = ref.store ?: Store.byId(found?.source) ?: known[0]?.first
+ val id = ref.storeId ?: found?.storeId ?: known[0]?.second
+ SideEffect { if (store != null && id != null) known[0] = store to id }
+ val game = found ?: if (store != null && id != null) s.steamGames.firstOrNull { it.source == store.id && it.storeId == id } else null
+ val item = if (store != null && id != null) StoresState.detailItem(store, id) else null
+ val installed = if (store != null && id != null) StoresState.installedGame(store, id) else null
+ val rawDownload = if (store != null && id != null) StoresState.download("${store.id}:$id") else null
+ val download = rawDownload?.takeIf { it.isActive }
+ val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED }
+ val nothing = game == null && store == null
+ LaunchedEffect(nothing) { if (nothing) onBack() }
+ if (nothing) return
+ val source = game?.source ?: store?.id ?: Library.SOURCE_STEAM
+ val title = game?.name ?: item?.title ?: installed?.sidecar?.title ?: id.orEmpty()
+ val scores = if (source != Library.ADDED) rememberGameScores(title.takeIf { it.isNotBlank() && it != id }) else null
+ val achievements = remember(store, id, item?.accessible, installed) {
+ when {
+ store == null || StoreAchievements.forSource(store.id) == null -> null
+ item?.accessible == true -> StoreAchievements.Game.of(item)
+ installed != null -> StoreAchievements.Game.of(installed.sidecar)
+ else -> null
+ }
+ }
+ val achievementState = rememberAchievements(achievements)
+ val listed = if (store == null) null else (StoresState.found[store].orEmpty() + StoresState.shelves[store]?.all.orEmpty()).firstOrNull { it.id == id }
+ val developer = item?.developer?.ifBlank { null } ?: listed?.developer.orEmpty()
+ val publisher = item?.publisher?.ifBlank { null } ?: listed?.publisher.orEmpty()
+ val releaseDate = item?.releaseDate?.ifBlank { null } ?: listed?.releaseDate.orEmpty()
+ val description = item?.let { com.droiddeck.launcher.stores.cleanStoreText(it.description) }.orEmpty()
+ .takeUnless { it.trim().equals(title.trim(), ignoreCase = true) }.orEmpty()
+ val scored = scores != null && (scores.metacritic != Lookup.None || scores.hltb != Lookup.None)
+ val prefix = game?.protonPrefix?.takeIf { it.isDirectory }
+ val tabs = buildList {
+ if (description.isNotBlank() || developer.isNotBlank() || publisher.isNotBlank() || releaseDate.isNotBlank() || (scored && stacked)) add(GameTab.ABOUT)
+ if (achievementState != null) add(GameTab.ACHIEVEMENTS)
+ val cloud = game?.library == Library.XBOX_CLOUD
+ if (game != null && !cloud) add(GameTab.LAUNCH)
+ if (game != null && game.library == Library.ADDED && prefix != null) add(GameTab.SAVES)
+ if ((game != null && !cloud) || installed != null) add(GameTab.INSTALL)
+ }
+ var picked by remember(key) { mutableStateOf(null) }
+ val tab = picked?.takeIf { it in tabs } ?: tabs.firstOrNull()
+ val tabFocus = remember(key) { GameTab.entries.associateWith { FocusRequester() } }
+ var inPanel by remember(key) { mutableStateOf(false) }
+ var inPage by remember(key) { mutableStateOf(false) }
+ var onStrip by remember(key) { mutableStateOf(false) }
+ var dropped by remember(key) { mutableStateOf(0) }
+ // A tab's content is swapped or refreshed under the focused row; focus goes back to the tabs, not to the rail.
+ LaunchedEffect(dropped) {
+ if (dropped == 0) return@LaunchedEffect
+ androidx.compose.runtime.withFrameNanos { }
+ val t = tab ?: return@LaunchedEffect
+ if (!inPage) focusWithinFrames({ onStrip }) { tabFocus.getValue(t) }
+ }
+ fun cycle(step: Int) {
+ if (tabs.size < 2) return
+ val at = tabs.indexOf(tab).coerceAtLeast(0)
+ picked = tabs[(at + step + tabs.size) % tabs.size]
+ }
+ Column(Modifier.fillMaxWidth().onFocusChanged { inPage = it.hasFocus }.bumpers(onPrevious = { cycle(-1) }, onNext = { cycle(1) })) {
+ Rise(0) {
+ Box(Modifier.padding(bottom = 12.dp)) { BackLink(backLabel, compact = true, onClick = onBack) }
+ }
+ val hero: @Composable () -> Unit = {
+ DisposableEffect(Unit) { onDispose { StoresMotion.heroAt = null } }
+ GameHero(
+ title, item, installed, game,
+ Modifier.fillMaxWidth().heightIn(min = if (narrow) 170.dp else 210.dp).onGloballyPositioned { StoresMotion.heroAt = it.boundsInRoot() },
+ corner = { if (!s.shortcutPicker) RemoveButton(title, game, installed, a) },
+ scores = scores.takeIf { !stacked },
+ ) {
+ HeroEyebrow(source, game, item, installed, download?.location ?: failed?.location)
+ GameTitle(title, game?.logo ?: item?.logoUrl, if (narrow) 26.sp else 34.sp)
+ if (!failed?.error.isNullOrBlank()) Text(
+ failed!!.error!!, fontSize = 13.sp, lineHeight = 17.sp, fontWeight = FontWeight.Medium,
+ color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis,
+ )
+ Spacer(Modifier.height(4.dp))
+ GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead))
+ }
+ }
+ if (StoresMotion.heroLands) hero() else Rise(1) { hero() }
+ if (tab != null) Rise(2) {
+ Column(Modifier.fillMaxWidth().padding(top = 14.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+ val labels = tabs.map { t ->
+ when (t) {
+ GameTab.ABOUT -> stringResource(R.string.game_tab_about)
+ GameTab.ACHIEVEMENTS -> achievementState?.list?.takeIf { it.isNotEmpty() }?.let { list ->
+ stringResource(R.string.game_tab_achievements_count, stringResource(R.string.achievements_title), achievementState.done, list.size)
+ } ?: stringResource(R.string.achievements_title)
+ GameTab.LAUNCH -> stringResource(R.string.game_tab_launch)
+ GameTab.SAVES -> stringResource(if (Store.byId(source).let { it == Store.GOG || it == Store.EPIC }) R.string.game_tab_saves_cloud else R.string.games_saves)
+ GameTab.INSTALL -> stringResource(R.string.game_tab_install)
+ }
+ }
+ TabStrip(
+ labels, tabs.indexOf(tab), { picked = tabs[it] }, Modifier.onFocusChanged { onStrip = it.hasFocus },
+ focusRequesters = tabs.map { tabFocus.getValue(it) }, bumpers = tabs.size > 1, compact = narrow,
+ )
+ Box(Modifier.fillMaxWidth().onFocusChanged { if (inPanel && !it.hasFocus) dropped++; inPanel = it.hasFocus }.testTag("game-tab-${tab.name.lowercase()}")) {
+ when (tab) {
+ GameTab.ABOUT -> AboutTab(developer, publisher, releaseDate, description, scores, stacked)
+ GameTab.ACHIEVEMENTS -> achievementState?.let { st -> AchievementsTab(StoreAchievements.forSource(store?.id)?.label.orEmpty(), st) }
+ GameTab.LAUNCH -> if (game != null) LaunchTab(game, s, a, hopRail)
+ GameTab.SAVES -> if (game != null && prefix != null) SavesTab(game, prefix, a)
+ GameTab.INSTALL -> InstallTab(game, installed, item, store)
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun GameHero(
+ title: String, item: CatalogItem?, installed: InstalledStoreGame?, game: Library.SteamGame?, modifier: Modifier,
+ corner: @Composable BoxScope.() -> Unit, scores: GameScores?, content: @Composable ColumnScope.() -> Unit,
+) {
+ val colors = MaterialTheme.colorScheme
+ Box(modifier.clip(Shape16).background(artBrush(hueOf(title)))) {
+ val wide: Any? = game?.hero ?: item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover
+ if (wide != null) {
+ // The card it came from keeps its own bitmap under the hero until the wide art is decoded.
+ val request = if (wide is String) cardArtRequest(wide, item?.tallImageUrl) else wide
+ AsyncImage(model = request, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize())
+ } else game?.art?.let { art ->
+ AsyncImage(
+ model = art, contentDescription = null, contentScale = ContentScale.Crop,
+ modifier = Modifier.matchParentSize().blur(24.dp).graphicsLayer { scaleX = 1.3f; scaleY = 1.3f },
+ )
+ }
+ Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to colors.background.copy(alpha = 0.94f), 0.55f to colors.background.copy(alpha = 0.58f), 1f to Color.Transparent)))
+ if (scores != null) {
+ Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0.45f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f))))
+ HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp))
+ }
+ Column(
+ verticalArrangement = Arrangement.spacedBy(6.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)
+ }
+}
+
+@Composable
+private fun HeroEyebrow(source: String, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, downloadAt: String?) {
+ val ctx = LocalContext.current
+ val pal = LocalPalette.current
+ val folder = installed?.folder ?: game?.gameFiles
+ val passName = item?.includedWith.orEmpty()
+ val state = when {
+ installed != null -> listOf(stringResource(R.string.stores_eyebrow_installed), StoreInstallRoot.labelFor(ctx, installed.folder))
+ game?.library == Library.XBOX_CLOUD -> listOf(libraryLabel(game))
+ game != null -> listOf(stringResource(R.string.stores_eyebrow_installed), libraryLabel(game))
+ !downloadAt.isNullOrBlank() -> listOf(stringResource(R.string.stores_eyebrow_library), downloadAt)
+ item?.owned == true -> listOf(stringResource(R.string.stores_eyebrow_library))
+ item?.subscription == true -> listOf(passName.ifBlank { stringResource(R.string.stores_game_pass) })
+ passName.isNotBlank() -> listOf(stringResource(R.string.stores_eyebrow_pass, passName))
+ item?.accessible == true -> listOf(stringResource(R.string.stores_eyebrow_library))
+ else -> listOf(stringResource(R.string.stores_eyebrow_store))
+ }
+ val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else (item?.sizeBytes ?: 0L).takeIf { it > 0 }
+ val line = (state + listOfNotNull(size?.let { formatBytes(it) })).filter { it.isNotBlank() }.joinToString(" · ")
+ Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ SourceChip(source)
+ Text(line.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.2.sp, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis)
+ }
+}
+
+@Composable
+private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) {
+ var failed by remember(logo) { mutableStateOf(false) }
+ if (logo != null && !failed) AsyncImage(
+ model = logo, contentDescription = title, contentScale = ContentScale.Fit, alignment = Alignment.CenterStart,
+ onError = { failed = true },
+ modifier = Modifier.padding(vertical = 4.dp).height((titleSize.value * 2.2f).dp).widthIn(max = (titleSize.value * 9f).dp).testTag("game-logo"),
+ ) else Text(
+ title, fontSize = titleSize, lineHeight = titleSize * 1.12f, fontWeight = FontWeight.Black,
+ color = MaterialTheme.colorScheme.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis,
+ )
+}
+
+@Composable
+private fun GameActions(
+ store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?,
+ s: FrontEndState, a: FrontEndActions, leadOn: Modifier,
+) {
+ val ctx = LocalContext.current
+ val storeKey = if (store != null && id != null) "${store.id}:$id" else null
+ val rawDownload = storeKey?.let { StoresState.download(it) }
+ val download = rawDownload?.takeIf { it.isActive }
+ val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED }
+ 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)
+ }
+ game?.library == Library.XBOX_CLOUD -> {
+ val cloudId = game.storeId.orEmpty()
+ XboxStreamButton(cloudId, game.name, main = true, modifier = leadOn)
+ if (download != null) ActionChip(downloadLabel(download), ok = false)
+ else if (item?.installable == true) SecondaryButton(
+ if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install),
+ ) { StoresState.requestInstall(ctx, item) }
+ XboxLibraryButton(cloudId, item)
+ }
+ game != null || installed != null -> {
+ val gone = storeKey?.let { StoresState.uninstalling[it] }
+ val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id)
+ PrimaryButton(
+ stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && !xboxBusy,
+ main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn,
+ ) {
+ if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(ctx, store, id, s, a)
+ }
+ if ((game?.source ?: store?.id) != Library.SOURCE_STEAM) ActionChip(stringResource(R.string.stores_in_steam), ok = true)
+ if (game != null) {
+ FileButtons(game, a)
+ GameShortcutMenu(game, a)
+ EditArtButton(game)
+ }
+ if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item)
+ if (store == Store.XBOX && installed != null && id != null) {
+ SecondaryButton(stringResource(R.string.stores_xbox_update), enabled = download == null && !XboxRuntime.isActive(id)) {
+ runCatching { XboxBackend.update(ctx, installed) }
+ .onFailure { StoresState.problems[Store.XBOX] = it.message ?: ctx.getString(R.string.stores_xbox_close_first) }
+ }
+ SecondaryButton(stringResource(R.string.stores_xbox_manage), enabled = download == null) { XboxContent.manage(ctx, installed) }
+ }
+ }
+ 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) }
+ }
+ 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.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) }
+ }
+ BusyChip(s)
+ }
+}
+
+/** Xbox Cloud Gaming rows the user added to the Library, for games not installed here. */
+@Composable
+internal fun rememberXboxCloudRows(s: FrontEndState): List {
+ val ctx = LocalContext.current
+ LaunchedEffect(Unit) { XboxCloudGames.load(ctx) }
+ if (s.shortcutPicker) return emptyList()
+ val added = XboxCloudGames.entries.toList()
+ return remember(added, s.steamGames) {
+ val installedXbox = s.steamGames.filter { it.source == Store.XBOX.id }.mapNotNull { it.storeId }.toSet()
+ XboxCloudGames.rows(ctx, installedXbox)
+ }
+}
+
+@Composable
+private fun XboxStreamButton(id: String, title: String, main: Boolean = false, modifier: Modifier = Modifier) {
+ val ctx = LocalContext.current
+ LaunchedEffect(Unit) { XboxCloudGames.prefetch(ctx) }
+ val label = stringResource(R.string.game_stream)
+ if (main) PrimaryButton(label, main = true, icon = Icons.Filled.PlayArrow, modifier = modifier) { XboxCloudGames.stream(ctx, id, title) }
+ else SecondaryButton(label, modifier = modifier) { XboxCloudGames.stream(ctx, id, title) }
+}
+
+@Composable
+private fun XboxInstalledStream(id: String, title: String, item: CatalogItem?) {
+ val ctx = LocalContext.current
+ val streams by produceState(item?.xboxCloud == true, id) {
+ if (!value) value = withContext(Dispatchers.IO) { XboxCloudGames.streams(ctx, id) }
+ }
+ if (streams) XboxStreamButton(id, title)
+}
+
+@Composable
+private fun XboxLibraryButton(id: String, item: CatalogItem?) {
+ val ctx = LocalContext.current
+ LaunchedEffect(Unit) { XboxCloudGames.load(ctx) }
+ // Add and Remove replace each other; the controller focus moves to the new button instead of getting lost.
+ val slot = remember { FocusRequester() }
+ val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current
+ val scope = rememberCoroutineScope()
+ fun refocus() { if (inputMode.inputMode == androidx.compose.ui.input.InputMode.Keyboard) scope.launch { focusSoon { slot } } }
+ if (XboxCloudGames.isAdded(id)) {
+ ActionChip(stringResource(R.string.library_in), ok = true)
+ SecondaryButton(stringResource(R.string.library_remove), compact = true, modifier = Modifier.focusRequester(slot)) { XboxCloudGames.remove(ctx, id); refocus() }
+ } else if (item != null) SecondaryButton(stringResource(R.string.library_add), modifier = Modifier.focusRequester(slot)) { XboxCloudGames.add(ctx, item); refocus() }
+}
+
+@Composable
+private fun buyLabel(item: CatalogItem): String = when {
+ item.isFree -> stringResource(R.string.stores_get_free)
+ item.hasPrice && item.finalPrice.isNotBlank() -> stringResource(R.string.stores_buy_price, item.finalPrice)
+ else -> stringResource(R.string.stores_view_on, item.store.shortLabel)
+}
+
+@Composable
+private fun FileButtons(game: Library.SteamGame, a: FrontEndActions) {
+ game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) } }
+ game.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) } }
+}
+
+@Composable
+private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) {
+ var open by remember(g.gameId) { mutableStateOf(false) }
+ Box {
+ SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open }
+ AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_shortcut)) { first ->
+ MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) { open = false; a.onGameShortcut(g) }
+ MenuItem(stringResource(R.string.game_file_export), checked = false) { open = false; a.onExportGameFile(g) }
+ MenuItem(stringResource(R.string.game_link_copy), checked = false) { open = false; a.onCopyGameLink(g) }
+ }
+ }
+}
+
+/** The pencil opens the editor each kind of game always had: the shortcut editor for added games, art for the rest. */
+@Composable
+private fun EditArtButton(g: Library.SteamGame) {
+ val ctx = LocalContext.current
+ val folder = g.gameFiles
+ val open: (() -> Unit)? = when {
+ g.library == Library.ADDED && g.source == Library.ADDED && folder != null -> {
+ { GamesDialogState.editing = EditRequest(folder.path, openTarget = false, fromSummary = false, preview = EditPreview.of(ctx, g, folder.path)) }
+ }
+ g.library != Library.ADDED && g.source == Library.SOURCE_STEAM -> { { GamesDialogState.steamArt = g } }
+ g.library == Library.ADDED && g.source != Library.ADDED && folder != null -> { { GamesDialogState.storeArt = g } }
+ else -> null
+ }
+ if (open != null) IconAction(Icons.Outlined.Edit, stringResource(R.string.common_edit), "game:edit", onClick = open)
+}
+
+@Composable
+private fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, id: String, danger: Boolean = false, enabled: Boolean = true, onClick: () -> Unit) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src) && enabled
+ val accent = if (danger) colors.error else pal.signal
+ Box(
+ contentAlignment = Alignment.Center,
+ modifier = Modifier.paneItem(id).downToFirstTile().size(44.dp).clip(Shape12)
+ .background(if (hot) accent.copy(alpha = if (danger) 0.22f else 0.14f) else if (danger) Color.Black.copy(alpha = 0.34f) else Color.White.copy(alpha = 0.03f))
+ .glideBorder(hot, Shape12, accent, pal.line2)
+ .alpha(if (enabled) 1f else 0.45f)
+ .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button, enabled = enabled, onClick = onClick)
+ .controllerConfirm(enabled = enabled, onClick = onClick)
+ .semantics { contentDescription = label },
+ ) {
+ Icon(icon, contentDescription = null, tint = if (danger && hot) colors.error else if (danger) Color.White else colors.onBackground, modifier = Modifier.size(18.dp))
+ }
+}
+
+@Composable
+private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) {
+ val ctx = LocalContext.current
+ val colors = MaterialTheme.colorScheme
+ if (installed != null) {
+ val key = installed.key
+ val gone = StoresState.uninstalling[key]
+ if (gone != null) {
+ val uninstalling = stringResource(R.string.stores_uninstalling)
+ Box(contentAlignment = Alignment.Center, modifier = Modifier.size(44.dp).clip(Shape12).background(Color.Black.copy(alpha = 0.34f)).semantics { contentDescription = uninstalling }) {
+ if (gone > 0f) CircularProgressIndicator(progress = { gone }, strokeWidth = 2.dp, color = colors.error, trackColor = colors.error.copy(alpha = 0.22f), modifier = Modifier.size(20.dp))
+ else CircularProgressIndicator(strokeWidth = 2.dp, color = colors.error, modifier = Modifier.size(20.dp))
+ }
+ return
+ }
+ val heading = stringResource(R.string.stores_uninstall_title, title)
+ val size = StoreSizes.onDisk[key]
+ val body = if (size != null && size > 0) stringResource(R.string.stores_uninstall_body_size, formatBytes(size)) else stringResource(R.string.stores_uninstall_body)
+ val keep = stringResource(R.string.stores_notification_keep)
+ val remove = stringResource(R.string.stores_uninstall)
+ val busy = StoresState.download(key)?.isActive == true || (installed.sidecar.store == Store.XBOX && XboxContent.busy(installed.sidecar.id))
+ val placed = remember { arrayOfNulls(1) }
+ Box(Modifier.onGloballyPositioned { placed[0] = it }) {
+ IconAction(Icons.Outlined.Delete, remove, "game:remove", danger = true, enabled = !busy) {
+ val at = placed[0]?.takeIf { it.isAttached }?.boundsInRoot() ?: return@IconAction
+ var confirmed = false
+ Steps.ask(StepAsk(anchor = at, side = StepSide.Left, accent = colors.error, items = 3, pillCorner = 12.dp, maxWidth = 340.dp,
+ onDismiss = { if (confirmed) StoresState.uninstall(ctx, installed) { StoresState.refresh(ctx); a.onLibraryChanged() } },
+ handle = { Icon(Icons.Outlined.Delete, null, tint = colors.error, modifier = Modifier.size(18.dp)) }) {
+ StepTitle(heading)
+ Text(body, fontSize = 13.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp))
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) {
+ StepChoice(keep, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() }
+ StepChoice(remove, danger = true, enabled = open) { confirmed = true; Steps.fold() }
+ }
+ })
+ }
+ }
+ return
+ }
+ val g = game ?: return
+ val kind = GameRemoval.kind(g)
+ if (kind == GameRemoval.Kind.LAUNCHER || g.gameFiles?.isDirectory != true) return
+ var asking by remember(g.gameId) { mutableStateOf(false) }
+ val shortcut = kind == GameRemoval.Kind.SHORTCUT
+ val label = stringResource(if (shortcut) R.string.edit_remove else R.string.common_uninstall)
+ IconAction(Icons.Outlined.Delete, label, "game:remove", danger = true) { asking = true }
+ if (asking) ConfirmDialog(
+ title = if (shortcut) stringResource(R.string.games_remove_title, g.name) else stringResource(R.string.stores_uninstall_title, g.name),
+ text = when {
+ shortcut -> stringResource(R.string.games_remove_body)
+ g.library == Library.ADDED -> stringResource(R.string.stores_uninstall_body)
+ else -> stringResource(R.string.games_uninstall_body)
+ },
+ confirm = label,
+ onConfirm = { a.onGameRemoved(g) },
+ onDismiss = { asking = false },
+ )
+}
+
+@Composable
+private fun InstallButton(label: String, modifier: Modifier = Modifier, onInstall: () -> Unit) {
+ val placed = remember { arrayOfNulls(1) }
+ Box(Modifier.onGloballyPositioned { placed[0] = it }) {
+ PrimaryButton(label, main = true, modifier = modifier) {
+ StoresMotion.markInstall(placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), label)
+ onInstall()
+ }
+ }
+}
+
+@Composable
+private fun AboutTab(developer: String, publisher: String, releaseDate: String, description: String, scores: GameScores?, stacked: Boolean) {
+ Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().tabPanel()) {
+ if (scores != null) Box(Modifier.readable()) { StoreGameFacts(developer, publisher, releaseDate, scores, scoresInHero = !stacked) }
+ else if (developer.isNotBlank() || publisher.isNotBlank() || releaseDate.isNotBlank()) {
+ val parts = listOf(developer, publisher, com.droiddeck.launcher.stores.GameFacts.releaseLabel(releaseDate).orEmpty()).filter { it.isNotBlank() }.distinct()
+ Text(parts.joinToString(" · "), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.readable())
+ }
+ if (description.isNotBlank()) StoreAbout(description, AboutHeight, Modifier.fillMaxWidth())
+ }
+}
+
+private val AboutHeight = 260.dp
+
+@Composable
+internal fun Modifier.tabPanel(): Modifier {
+ val shape = RoundedCornerShape(16.dp)
+ return clip(shape).background(MaterialTheme.colorScheme.surface).border(1.dp, LocalPalette.current.line, shape).padding(horizontal = 16.dp, vertical = 14.dp)
+}
+
+@Composable
+private fun StoreAbout(text: String, height: Dp, modifier: Modifier = Modifier) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val scroll = rememberScrollState()
+ val scope = rememberCoroutineScope()
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ val shape = RoundedCornerShape(12.dp)
+ Box(
+ modifier.heightIn(max = height).clip(shape)
+ .glideBorder(hot, shape, pal.signal, restColor = Color.Transparent)
+ .paneItem("about")
+ .focusable(interactionSource = src)
+ .onPreviewKeyEvent { e ->
+ val step = when (e.nativeKeyEvent.keyCode) {
+ android.view.KeyEvent.KEYCODE_DPAD_DOWN -> if (scroll.value < scroll.maxValue) 120f else return@onPreviewKeyEvent false
+ android.view.KeyEvent.KEYCODE_DPAD_UP -> if (scroll.value > 0) -120f else return@onPreviewKeyEvent false
+ else -> return@onPreviewKeyEvent false
+ }
+ if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) scope.launch { scroll.animateScrollBy(step) }
+ true
+ },
+ ) {
+ Text(text, fontSize = 14.sp, lineHeight = 21.sp, color = colors.onSurfaceVariant, modifier = Modifier.verticalScroll(scroll).padding(horizontal = 4.dp, vertical = 6.dp))
+ if (scroll.value < scroll.maxValue) Box(
+ Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(28.dp)
+ .background(Brush.verticalGradient(listOf(Color.Transparent, colors.surface))),
+ )
+ }
+}
+
+@Composable
+private fun LaunchTab(game: Library.SteamGame, s: FrontEndState, a: FrontEndActions, hopRail: String?) {
+ val host = rememberMenuHost()
+ Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) {
+ LaunchSettings(s, a, host, game, hopRail ?: GameRef.key(game))
+ val folder = game.gameFiles
+ if (game.library == Library.ADDED && game.source == Library.ADDED && !s.shortcutPicker && folder != null) ShortcutFields(game, folder)
+ }
+}
+
+@Composable
+private fun ShortcutFields(game: Library.SteamGame, folder: File) {
+ val ctx = LocalContext.current
+ val preview = remember(game.gameId, game.name, GamesDialogState.editing) { EditPreview.of(ctx, game, folder.path) }
+ fun edit(target: Boolean) { GamesDialogState.editing = EditRequest(folder.path, openTarget = target, fromSummary = false, preview = EditPreview.of(ctx, game, folder.path)) }
+ Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) {
+ SectionLabel(stringResource(R.string.game_launch_shortcut))
+ MenuItem(stringResource(R.string.edit_name), checked = false, detail = preview.name) { edit(false) }
+ MenuItem(stringResource(R.string.edit_target), checked = false, detail = preview.exeName ?: "—") { edit(true) }
+ MenuItem(stringResource(R.string.edit_start_in), checked = false, detail = preview.startIn ?: "—") { edit(false) }
+ MenuItem(stringResource(R.string.edit_launch_options), checked = false, detail = preview.launchOptions.ifEmpty { "—" }) { edit(false) }
+ }
+}
+
+@Composable
+private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) {
+ val saves by produceState?>(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(null) }
+ var tick by remember(g.gameId) { mutableStateOf(0) }
+ val status by produceState(null, g.gameId, tick) {
+ value = withContext(Dispatchers.IO) { runCatching { CloudSaves.status(context, store, id) }.getOrNull() }
+ }
+ val folder = g.gameFiles
+ var enabled by remember(g.gameId) { mutableStateOf(folder?.let { StoreGameSidecar.read(it)?.cloud } ?: true) }
+ val st = status
+ val supported = st?.supported ?: true
+ val conflict = st != null && st.conflicts.isNotEmpty()
+ fun sync(up: Boolean, force: Boolean = false) {
+ if (busy != null) return
+ busy = if (up) "up" else "down"
+ Thread({
+ val r = if (up) CloudSaves.upload(context, store, id, force) else CloudSaves.download(context, store, id, force)
+ StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() }
+ }, "cloud-manual").start()
+ }
+ MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported,
+ detail = if (!supported) stringResource(R.string.cloud_none) else null) {
+ val f = folder ?: return@MenuItem
+ val next = !enabled
+ Thread({
+ val written = runCatching { StoreGameSidecar.updateCloud(f, next) }.getOrNull()
+ StoresState.post { enabled = written?.cloud ?: enabled }
+ }, "cloud-switch").start()
+ }
+ val ready = st != null && supported && enabled && busy == null
+ val pending = stringResource(R.string.cloud_pending)
+ val summary = when {
+ st == null || busy != null -> pending
+ !supported -> stringResource(R.string.cloud_none)
+ conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size)
+ st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString())
+ else -> stringResource(R.string.cloud_never)
+ }
+ MenuItem(stringResource(if (conflict) R.string.cloud_keep_local else R.string.cloud_upload), checked = false, enabled = ready, detail = summary) { sync(up = true, force = conflict) }
+ MenuItem(stringResource(if (conflict) R.string.cloud_keep_cloud else R.string.cloud_download), checked = false, enabled = ready, detail = if (st == null || busy != null) pending else null) { sync(up = false, force = conflict) }
+}
+
+@Composable
+private fun InstallTab(game: Library.SteamGame?, installed: InstalledStoreGame?, item: CatalogItem?, store: Store?) {
+ val ctx = LocalContext.current
+ val folder = installed?.folder ?: game?.gameFiles
+ val sidecar = installed?.sidecar
+ val size = folder?.let { diskSize(installed, it) }
+ val rows = buildList {
+ add(stringResource(R.string.game_install_location) to when {
+ installed != null -> StoreInstallRoot.labelFor(ctx, installed.folder)
+ game != null -> libraryLabel(game).ifBlank { stringResource(R.string.games_internal) }
+ else -> ""
+ })
+ if (folder != null) {
+ add(stringResource(R.string.game_install_folder) to folder.path)
+ add(stringResource(R.string.game_install_size) to (size?.let { formatBytes(it) } ?: stringResource(R.string.cloud_pending)))
+ }
+ sidecar?.extra?.get(StoreLanguage.EXTRA)?.takeIf { it.isNotBlank() }?.let { add(stringResource(R.string.stores_install_language) to StoreLanguage.displayName(it)) }
+ sidecar?.installVersion?.takeIf { it.isNotBlank() }?.let { add(stringResource(R.string.game_install_version) to it) }
+ sidecar?.installedAt?.takeIf { it > 0 }?.let {
+ add(stringResource(R.string.game_install_date) to java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM).format(java.util.Date(it)))
+ }
+ if (game != null) add(stringResource(R.string.game_install_played) to (playedSpan(game.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played)))
+ if (store == Store.XBOX) {
+ val access = sidecar?.extra?.get("access") ?: if (item?.subscription == true) "gamepass" else if (item?.owned == true) "owned" else null
+ if (access != null) add(stringResource(R.string.game_install_access) to stringResource(if (access == "gamepass") R.string.stores_game_pass else R.string.game_install_access_owned))
+ }
+ }.filter { it.second.isNotBlank() }
+ Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) {
+ for ((label, value) in rows) FactRow(label, value)
+ }
+}
+
+/** Text a controller has to land on to bring it into view: focusable, with the focus ring. */
+@Composable
+internal fun Modifier.readable(): Modifier {
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ val shape = RoundedCornerShape(8.dp)
+ return clip(shape).glideBorder(hot, shape, pal.signal, restColor = Color.Transparent).focusable(interactionSource = src)
+}
+
+@Composable
+private fun FactRow(label: String, value: String) {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(16.dp),
+ modifier = Modifier.fillMaxWidth().readable().padding(horizontal = 8.dp, vertical = 7.dp),
+ ) {
+ Text(label, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.width(150.dp))
+ Text(value, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f), maxLines = 2, overflow = TextOverflow.Ellipsis)
+ }
+}
+
+/** Store installs are measured by [StoreSizes]; Steam and added games by walking their folder once. */
+@Composable
+internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? {
+ val ctx = LocalContext.current
+ if (installed != null) {
+ LaunchedEffect(installed.key) { StoreSizes.requestDisk(ctx, installed.key, installed) }
+ return StoreSizes.onDisk[installed.key]
+ }
+ LaunchedEffect(folder.path) { FolderSizes.request(folder) }
+ return FolderSizes.known[folder.path]
+}
+
+internal object FolderSizes {
+ val known = androidx.compose.runtime.mutableStateMapOf()
+ private val asked = java.util.Collections.synchronizedSet(HashSet())
+
+ 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() {
+ 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/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt
index 47905485db..8474050c34 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
@@ -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
@@ -259,6 +263,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/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt
new file mode 100644
index 0000000000..276d131fee
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt
@@ -0,0 +1,145 @@
+package com.droiddeck.launcher.ui
+
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.droiddeck.launcher.R
+import com.droiddeck.launcher.stores.itch.ItchBrowse
+import com.droiddeck.launcher.stores.itch.ItchBrowseState
+
+@Composable
+internal fun ItchBrowseBar() {
+ val ctx = LocalContext.current
+ val query = ItchBrowseState.query
+ var picking by remember { mutableStateOf(false) }
+ Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+ ChipRow {
+ for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) }
+ }
+ ChipRow {
+ for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) }
+ }
+ ChipRow {
+ BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) }
+ for (platform in ItchBrowse.platformNames) {
+ val on = platform in query.platforms
+ BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) }
+ }
+ }
+ ChipRow {
+ for (tag in query.tags) BrowseChip("$tag ✕", true) { ItchBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) }
+ BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true }
+ }
+ }
+ if (picking) TextEntryDialog(
+ stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok),
+ onSubmit = { value -> ItchBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { ItchBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } },
+ onDismiss = { picking = false }, id = "itch-tag",
+ )
+}
+
+@Composable
+internal fun ItchLoadMore() {
+ val ctx = LocalContext.current
+ val count = ItchBrowseState.items.size
+ LaunchedEffect(Unit) { ItchBrowseState.more(ctx) }
+ if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp))
+ else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) {
+ BrowseChip(stringResource(R.string.stores_dl_retry), false) { ItchBrowseState.more(ctx, retry = true) }
+ }
+ else if (!ItchBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) {
+ BrowseChip(stringResource(R.string.stores_itch_load_more), false) { ItchBrowseState.more(ctx) }
+ }
+}
+
+@Composable
+private fun ChipRow(content: @Composable () -> Unit) {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(),
+ ) { content() }
+}
+
+@Composable
+private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val shape = RoundedCornerShape(8.dp)
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ Text(
+ label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1,
+ color = if (selected) pal.onSignal else if (hot) colors.onBackground else colors.onSurfaceVariant,
+ modifier = Modifier.clip(shape).background(if (selected) pal.signal else colors.surfaceVariant)
+ .glideBorder(hot, shape, pal.signal)
+ .hoverable(src).selectable(selected = selected, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick)
+ .controllerConfirm(onClick = onClick)
+ .padding(horizontal = 12.dp, vertical = 7.dp),
+ )
+}
+
+@Composable
+private fun sortLabel(sort: String): String = stringResource(
+ when (sort) {
+ ItchBrowse.SORT_NEW_POPULAR -> R.string.stores_itch_sort_new_popular
+ ItchBrowse.SORT_TOP_SELLERS -> R.string.stores_itch_sort_top_sellers
+ ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated
+ ItchBrowse.SORT_NEWEST -> R.string.stores_itch_sort_new
+ else -> R.string.stores_itch_sort_popular
+ },
+)
+
+@Composable
+private fun platformLabel(platform: String): String = stringResource(
+ when (platform) {
+ "windows" -> R.string.stores_itch_platform_windows
+ "osx" -> R.string.stores_itch_platform_macos
+ "linux" -> R.string.stores_itch_platform_linux
+ "android" -> R.string.stores_itch_platform_android
+ "ios" -> R.string.stores_itch_platform_ios
+ "web" -> R.string.stores_itch_platform_web
+ else -> R.string.stores_itch_platform_mobile_web
+ },
+)
+
+@Composable
+private fun priceLabel(price: String): String = stringResource(
+ when (price) {
+ ItchBrowse.PRICE_FREE -> R.string.stores_itch_price_free
+ ItchBrowse.PRICE_SALE -> R.string.stores_itch_price_sale
+ ItchBrowse.PRICE_PAID -> R.string.stores_itch_price_paid
+ ItchBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5
+ ItchBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15
+ else -> R.string.stores_itch_price_any
+ },
+)
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt
new file mode 100644
index 0000000000..d4dd41fe8b
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt
@@ -0,0 +1,690 @@
+package com.droiddeck.launcher.ui
+
+import android.view.KeyEvent
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.hoverable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyGridScope
+import androidx.compose.foundation.lazy.grid.LazyGridState
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.FilterList
+import androidx.compose.material.icons.filled.GridView
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Sort
+import androidx.compose.material.icons.filled.ViewList
+import androidx.compose.material.icons.filled.ViewModule
+import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.boundsInRoot
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.droiddeck.launcher.R
+import com.droiddeck.launcher.frontend.Library
+import com.droiddeck.launcher.session.SessionPrefs
+import com.droiddeck.launcher.stores.CatalogItem
+import com.droiddeck.launcher.stores.Store
+import com.droiddeck.launcher.stores.StoreSizes
+import com.droiddeck.launcher.stores.StoresState
+import com.droiddeck.launcher.stores.download.DownloadEntry
+import com.droiddeck.launcher.stores.formatBytes
+import com.droiddeck.launcher.stores.retainOrder
+import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter
+import com.droiddeck.launcher.stores.sortGames
+import kotlinx.coroutines.launch
+import androidx.compose.runtime.setValue
+
+/** One owned game: installed ones carry their [game], store products not installed yet only their [item]. */
+internal class LibraryEntry(
+ val key: String, val source: String, val title: String,
+ val game: Library.SteamGame?, val item: CatalogItem?, val installed: Boolean,
+) {
+ val storeKey: String? get() = item?.key ?: game?.storeId?.let { "${game.source}:$it" }
+}
+
+/** Installed games first claim their store product, so a game owned and installed shows once. */
+internal fun libraryEntries(
+ games: List, owned: Map>, installedStore: Set,
+): List {
+ val claimed = HashSet()
+ val out = ArrayList()
+ for (g in games) {
+ 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) claimed += storeKey
+ out += LibraryEntry(GameRef.key(g), g.source, g.name, g, item, installed = true)
+ }
+ 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 installedFirst(entries: List): List = entries.partition { it.installed }.let { (on, off) -> on + off }
+
+internal const val LIBRARY_ALL = "all"
+internal val LIBRARY_SOURCES = listOf(Library.SOURCE_STEAM) + Store.entries.map { it.id } + Library.ADDED
+
+/** Survives leaving the page, so Stores can open the Library on one store's owned games. */
+internal object LibraryView {
+ var source by mutableStateOf(LIBRARY_ALL)
+ var query by mutableStateOf("")
+ var focusFirst = false
+
+ fun showOwned(store: Store) {
+ source = store.id
+ query = ""
+ focusFirst = true
+ }
+}
+
+@Composable
+internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, onSelect: (String) -> Unit, modifier: Modifier) {
+ val ctx = LocalContext.current
+ val narrow = LocalNarrowPane.current
+ val ff = LocalFrontFocus.current
+ val focusManager = androidx.compose.ui.platform.LocalFocusManager.current
+ val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current
+ LaunchedEffect(Unit) { StoresState.refresh(ctx) }
+ val stores = s.gameStoresEnabled && !s.shortcutPicker
+ val signedIn = Store.entries.filter { StoresState.isSignedIn(it) }
+ LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } }
+ val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap()
+ val installedStore = StoresState.installed.map { it.key }.toSet()
+ val syncing = if (stores) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList()
+ val cloudRows = rememberXboxCloudRows(s)
+ val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) }
+ LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) }
+ val sources = LIBRARY_SOURCES.filter { src -> all.any { it.source == src } }
+ 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
+ val candidates = all.filter {
+ (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it)
+ }
+ 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()) }
+ 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) { back() }
+ val lead = remember { FocusRequester() }
+ var detailFocused by remember { mutableStateOf(false) }
+ var lastOpened by remember { mutableStateOf(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) {
+ 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) { grid.scrollToItem(0) }
+ LaunchedEffect(cycled) {
+ if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect
+ focusWithinFrames({ gridFocused }) {
+ if (ff.firstTileAttached > 0) ff.firstTile else ff.items["libchip:$source"] ?: FocusRequester.Default
+ }
+ }
+ CardDetailHost(
+ open, detailScroll,
+ gridScrolled = { grid.firstVisibleItemIndex > 0 || grid.firstVisibleItemScrollOffset > 0 },
+ onDetailFocus = { detailFocused = it },
+ modifier = modifier.padding(horizontal = if (narrow) 14.dp else 22.dp, vertical = if (narrow) 10.dp else 14.dp),
+ wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } },
+ grid = {
+ LibraryGrid(
+ s, a, grid, visible, split, all.size, sources, source, sizesPending, syncing,
+ 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, split: Int, total: Int,
+ sources: List, source: String, sizesPending: Boolean, syncing: List>,
+ onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean,
+) {
+ val listMode = s.storesView == "list"
+ val capsules = s.storesView == "capsules"
+ val tileWidth = if (capsules) CapsuleWidth else CardWidth
+ val focus = LocalFrontFocus.current
+ val scope = rememberCoroutineScope()
+ val density = androidx.compose.ui.platform.LocalDensity.current
+ var columns by remember { mutableIntStateOf(1) }
+ val headerItems = 2 + (if (sizesPending) 1 else 0) + syncing.size
+ val tile: @Composable (LibraryEntry) -> Unit = { e ->
+ val first = e.key == visible.firstOrNull()?.key
+ val navigation = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event ->
+ val key = event.nativeKeyEvent
+ val direction = when (key.keyCode) {
+ KeyEvent.KEYCODE_DPAD_DOWN -> 1
+ KeyEvent.KEYCODE_DPAD_UP -> -1
+ else -> 0
+ }
+ val index = visible.indexOfFirst { it.key == e.key }
+ val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split)
+ when {
+ direction == 0 || index < 0 -> false
+ next == null -> direction > 0
+ else -> {
+ if (key.action == KeyEvent.ACTION_DOWN) {
+ val target = "card:${visible[next].key}"
+ val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2
+ val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex }
+ if (!shown || (focus.attached[target] ?: 0) == 0 ||
+ runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch {
+ grid.scrollToItem(targetIndex)
+ focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default }
+ }
+ }
+ true
+ }
+ }
+ }
+ val picker = s.shortcutPicker && e.game != null
+ val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null
+ if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen)
+ }
+ LazyVerticalGrid(
+ columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid,
+ modifier = Modifier.fillMaxSize().onFocusChanged { onFocus(it.hasFocus) }.focusGroup().bumpers(onPrevious = { onCycle(-1) }, onNext = { onCycle(1) }).onSizeChanged {
+ val gap = with(density) { 10.dp.roundToPx() }
+ val minimum = with(density) { (if (listMode) CardWidth * 2 else tileWidth).roundToPx() }
+ columns = ((it.width + gap) / (minimum + gap)).coerceAtLeast(1)
+ },
+ horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp),
+ contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp),
+ ) {
+ item(key = "header", span = { GridItemSpan(maxLineSpan) }) { Rise(0) { LibraryHeader(s, a, total, searchCleared, xbox = source == Store.XBOX.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 (split == 0) libraryGrid(visible, empty, tile)
+ else {
+ item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) }
+ libraryGrid(visible.take(split), empty, tile)
+ item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) }
+ libraryGrid(visible.drop(split), empty, tile)
+ }
+ }
+}
+
+private fun LazyGridScope.libraryGrid(entries: List, 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) {
+ val colors = MaterialTheme.colorScheme
+ val narrow = LocalNarrowPane.current
+ ModeHeader(
+ stringResource(R.string.rail_games), LibraryView.query, { LibraryView.query = it },
+ placeholder = stringResource(R.string.stores_search_library),
+ clearSearchFocus = searchCleared,
+ lead = {
+ Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) {
+ Text(stringResource(R.string.rail_games), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1)
+ Text(pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1)
+ if (s.steamGamesX64 && !narrow) ClientTag()
+ }
+ },
+ ) {
+ if (xbox) XboxFilterButton()
+ 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, source: String, onSource: (String) -> Unit) {
+ if (sources.size < 2) return
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(top = 4.dp, bottom = 2.dp),
+ ) {
+ SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) }
+ for (src in sources) {
+ val store = Store.byId(src)
+ val dot = when {
+ store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f)
+ src == Library.SOURCE_STEAM -> sourceColours(src).dot
+ else -> null
+ }
+ SourceFilterChip(src, if (src == Library.ADDED) stringResource(R.string.library_filter_added) else store?.shortLabel ?: sourceLabel(src), source == src, dot) { onSource(src) }
+ }
+ }
+}
+
+@Composable
+private fun SourceFilterChip(key: String, label: String, on: Boolean, dot: Color?, onClick: () -> Unit) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ val shape = RoundedCornerShape(99.dp)
+ Row(
+ verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp),
+ modifier = Modifier.paneItem("libchip:$key").testTag("library-source-$key").heightIn(min = 40.dp).clip(shape)
+ .background(if (on) pal.signal.copy(alpha = 0.16f) else colors.surface)
+ .glideBorder(hot, shape, pal.signal, if (on) pal.signal else pal.line)
+ .hoverable(src).selectable(selected = on, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick)
+ .controllerConfirm(onClick = onClick)
+ .padding(horizontal = 14.dp, vertical = 8.dp),
+ ) {
+ if (dot != null) Box(Modifier.size(9.dp).background(dot, CircleShape))
+ Text(label, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = if (on || hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1)
+ }
+}
+
+private fun entryArt(e: LibraryEntry, tall: Boolean): Any? {
+ val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } }
+ val wide: Any? = e.game?.hero ?: e.item?.imageUrl ?: inst?.sidecar?.hero ?: inst?.sidecar?.cover
+ val portrait: Any? = e.game?.art ?: e.item?.tallImageUrl ?: inst?.sidecar?.cover
+ return if (tall) portrait ?: wide else wide ?: portrait
+}
+
+@Composable
+private fun LibraryTile(e: LibraryEntry, capsule: Boolean, first: Boolean, navigation: Modifier, choose: (() -> Unit)?, onOpen: (String) -> Unit) {
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ val pressed by src.collectIsPressedAsState()
+ val scale by animateFloatAsState(if (pressed) 0.985f else 1f, Motion.sp(0.5f, Spring.StiffnessMedium), label = "tileScale")
+ val download = e.storeKey?.let { StoresState.download(it) }?.takeIf { it.isActive }
+ val placed = remember { arrayOfNulls(1) }
+ val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() }
+ val wide = entryArt(e, tall = false)
+ val tall = entryArt(e, tall = true)
+ RequestSize(e)
+ val open = {
+ val art = if (capsule) tall else wide
+ placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (art as? java.io.File)?.path ?: art as? String)) }
+ onOpen(e.key)
+ }
+ Column(
+ modifier = Modifier.fillMaxWidth().onGloballyPositioned { placed[0] = it }
+ .then(navigation).paneItem("card:${e.key}").then(if (first) Modifier.firstTile().paneEntry() else Modifier).graphicsLayer { scaleX = scale; scaleY = scale }
+ .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line)
+ .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open)
+ .controllerConfirm(onClick = choose ?: open),
+ ) {
+ CardFace(e.title, wide, tall, download, hot, capsule, dim = !e.installed && download == null,
+ badge = { SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) }) {
+ LibraryMarker(e, download)
+ }
+ }
+}
+
+@Composable
+private fun RequestSize(e: LibraryEntry) {
+ val ctx = LocalContext.current
+ val item = e.item?.takeIf { !e.installed && it.accessible && it.sizeBytes <= 0 } ?: return
+ LaunchedEffect(item.key) { StoreSizes.request(ctx, item) }
+}
+
+@Composable
+private fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?) {
+ val pal = LocalPalette.current
+ when {
+ download != null -> Text("${download.percent}%", fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1)
+ e.installed -> Unit
+ 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 -> Icon(Icons.Outlined.Download, stringResource(R.string.stores_section_not_installed), tint = Color.White, modifier = Modifier.size(12.dp))
+ }
+}
+
+@Composable
+private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, choose: (() -> Unit)?, onOpen: (String) -> Unit) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ val download = e.storeKey?.let { StoresState.download(it) }?.takeIf { it.isActive }
+ val placed = remember { arrayOfNulls(1) }
+ val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() }
+ val wide = entryArt(e, tall = false)
+ val open = {
+ placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (wide as? java.io.File)?.path ?: wide as? String)) }
+ onOpen(e.key)
+ }
+ RequestSize(e)
+ val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } }
+ val folder = inst?.folder ?: e.game?.gameFiles
+ val size = if (e.installed && folder != null) diskSize(inst, folder) else e.item?.let { StoreSizes.size(it) }?.takeIf { it > 0 }
+ val status = when {
+ download != null -> downloadLabel(download)
+ !e.installed -> stringResource(R.string.stores_section_not_installed)
+ e.game != null -> playedSpan(e.game.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played)
+ else -> stringResource(R.string.stores_installed_chip)
+ }
+ val meta = listOfNotNull(status, size?.let { formatBytes(it) }?.takeIf { it.isNotEmpty() })
+ Row(
+ verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp),
+ modifier = Modifier.fillMaxWidth().heightIn(min = 64.dp).onGloballyPositioned { placed[0] = it }.then(navigation).paneItem("card:${e.key}")
+ .then(if (first) Modifier.firstTile().paneEntry() else Modifier)
+ .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line)
+ .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open)
+ .controllerConfirm(onClick = choose ?: open)
+ .padding(horizontal = 10.dp, vertical = 8.dp),
+ ) {
+ Box(Modifier.width(96.dp).height(54.dp).clip(RoundedCornerShape(8.dp)).background(artBrush(hueOf(e.title))).graphicsLayer { alpha = if (e.installed || download != null) 1f else 0.55f }) {
+ if (wide != null) AsyncImage(model = wide, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize())
+ }
+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
+ Text(e.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis)
+ Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+ SourceChip(e.source, small = true)
+ Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis)
+ }
+ }
+ if (download != null) Text("${download.percent}%", fontSize = 11.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1)
+ else if (!e.installed) Icon(Icons.Outlined.Download, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp))
+ }
+}
+
+@Composable
+private fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) {
+ val colors = MaterialTheme.colorScheme
+ val pal = LocalPalette.current
+ val src = remember { MutableInteractionSource() }
+ val hot = rememberHot(src)
+ Box(
+ contentAlignment = Alignment.Center,
+ modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent)
+ .glideBorder(hot, CircleShape, pal.signal)
+ .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick)
+ .controllerConfirm(onClick = onClick)
+ .semantics { contentDescription = description },
+ ) { Icon(icon, null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) }
+}
+
+/** Choosing Library in the rail lands on the first game, as Play Steam does on the Steam page. */
+@Composable
+private fun Modifier.paneEntry(): Modifier {
+ val ff = LocalFrontFocus.current ?: return this
+ androidx.compose.runtime.DisposableEffect(ff) {
+ ff.primaryAttached++
+ onDispose { ff.primaryAttached-- }
+ }
+ return focusRequester(ff.primary)
+}
+
+internal fun keepsXbox(filter: String, e: LibraryEntry): Boolean = when {
+ filter == XboxLibraryFilter.ALL || e.source != Store.XBOX.id -> true
+ e.game?.library == Library.XBOX_CLOUD -> 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 XboxFilterButton() {
+ val pal = LocalPalette.current
+ val ctx = LocalContext.current
+ val title = stringResource(R.string.xbox_filter_show)
+ var at by remember { mutableStateOf(null) }
+ Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) {
+ HeaderIconButton(title + " · " + xboxFilterLabel(XboxLibraryFilter.current), Icons.Filled.FilterList, "xbox-filter") {
+ val from = at ?: return@HeaderIconButton
+ Steps.ask(StepAsk(
+ anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = XboxLibraryFilter.ALL_FILTERS.size,
+ handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) },
+ ) {
+ StepTitle(title)
+ StepList {
+ XboxLibraryFilter.ALL_FILTERS.forEachIndexed { i, filter ->
+ StepChoice(
+ xboxFilterLabel(filter), selected = filter == XboxLibraryFilter.current, enabled = open,
+ modifier = Modifier.fillMaxWidth().stepItem(i).then(if (filter == XboxLibraryFilter.current) Modifier.focusRequester(first) else Modifier),
+ ) {
+ XboxLibraryFilter.set(ctx, filter)
+ Steps.fold()
+ }
+ }
+ }
+ })
+ }
+ }
+}
+
+@Composable
+private fun SortButton(s: FrontEndState, a: FrontEndActions) {
+ val pal = LocalPalette.current
+ val title = stringResource(R.string.stores_sort)
+ var at by remember { mutableStateOf(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 = { 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)
+ 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/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt
index a444f37115..c546a34c35 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt
@@ -82,6 +82,8 @@ class ModeSettings(
val 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,
+ /** Steam only: the client's Shader Pre-Caching setting; null hides the row. */
+ val shaderPrecache: Boolean? = null,
val steamRepairQueued: Boolean = false,
val mangoapp: Boolean = true,
val steamController: String? = null,
@@ -136,6 +138,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 = {},
@@ -478,6 +481,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),
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 b46133463a..25f344a77a 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt
@@ -46,6 +46,7 @@ fun PerformancePage(
gpuClockPin: Boolean,
prootNoSeccomp: Boolean,
prootFastPath: Boolean,
+ cursorComposite: Boolean,
guestHostname: String,
phantomWarning: String?,
onClientOverride: (Boolean) -> Unit,
@@ -61,6 +62,7 @@ fun PerformancePage(
onGpuClockPin: (Boolean) -> Unit,
onProotNoSeccomp: (Boolean) -> Unit,
onProotFastPath: (Boolean) -> Unit,
+ onCursorComposite: (Boolean) -> Unit,
onGuestHostname: (String) -> Unit,
onClientCore: (Int, Boolean) -> Unit,
onGameCore: (Int, Boolean) -> Unit,
@@ -158,6 +160,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) }
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 4a0adea2d4..d1c478eb08 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
@@ -345,37 +344,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 58b4c11eea..ef90316ea7 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt
@@ -208,6 +208,9 @@ class DrawerActions(
val onScreenButtonsVisible: Boolean,
val suspendPolicy: String,
val steamDownloadsInBackground: Boolean = false,
+ val micAvailable: Boolean = false,
+ val micEnabled: Boolean = false,
+ val onMicEnabled: (Boolean) -> Unit = {},
val backActionsInverted: Boolean,
val padType: String? = null,
val onPadType: (String) -> Unit = {},
@@ -669,6 +672,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,
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 0000000000..b7f5cbfebe
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt
@@ -0,0 +1,276 @@
+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.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
+
+/** The last game frame, captured as the session left the screen, and where it sat in the overlay. */
+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 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?,
+ 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) {
+ if (currentFrame == null) {
+ onFrameNeeded()
+ withTimeoutOrNull(FRAME_WAIT_MS) { snapshotFlow { currentFrame }.first { it != null } }
+ }
+ // Pausing mostly happens while the screen is off or the app is away, so it appears already settled.
+ 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)
+ Box(
+ contentAlignment = Alignment.Center,
+ modifier = Modifier
+ .fillMaxSize()
+ .semantics { contentDescription = title }
+ .focusRequester(focus)
+ .controllerConfirm(enabled = idle, onClick = onResume)
+ .clickable(
+ interactionSource = remember { MutableInteractionSource() },
+ 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)
+ }
+}
+
+@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) {
+ val glintAlpha by animateFloatAsState(if (idle) 1f else 0f, Motion.tw(160), label = "glintAlpha")
+ val glint: State? = 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))
+ .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/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt
index 1492362f12..e2ab2a77f1 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt
@@ -270,6 +270,23 @@ internal fun StoreAchievementsCardContent(label: String, state: AchievementsStat
}
}
+@Composable
+internal fun AchievementsTab(label: String, state: AchievementsState, modifier: Modifier = Modifier) {
+ val colors = MaterialTheme.colorScheme
+ val list = state.list
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier.fillMaxWidth().tabPanel()) {
+ if (list.isNullOrEmpty()) {
+ Text(achievementsNote(state, label).orEmpty(), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.readable().padding(4.dp))
+ return@Column
+ }
+ Box(Modifier.fillMaxWidth().readable().padding(4.dp)) { AchievementsProgress(state) }
+ for ((group, items) in groups(list)) {
+ AchievementGroupLabel(stringResource(group, items.size))
+ for (a in items) androidx.compose.runtime.key(a.id) { AchievementRow(a, compact = true) }
+ }
+ }
+}
+
private fun LazyListScope.achievementItems(list: List, 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/StoresDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt
deleted file mode 100644
index b377f02ec1..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.droiddeck.launcher.ui
-
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.layout.boundsInRoot
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.foundation.background
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.gestures.animateScrollBy
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.input.key.onPreviewKeyEvent
-import kotlinx.coroutines.launch
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
-import com.droiddeck.launcher.R
-import com.droiddeck.launcher.stores.Store
-import com.droiddeck.launcher.stores.StoreAchievements
-import com.droiddeck.launcher.stores.StoresState
-import com.droiddeck.launcher.stores.download.DownloadState
-import com.droiddeck.launcher.stores.formatBytes
-
-
-@Composable
-internal fun StoreGameDetail(store: Store, key: String, s: FrontEndState, a: FrontEndActions, lead: androidx.compose.ui.focus.FocusRequester, onBack: () -> Unit) {
- val leadOn = Modifier.focusRequester(lead)
- val ctx = LocalContext.current
- val colors = MaterialTheme.colorScheme
- val pal = LocalPalette.current
- val narrow = LocalNarrowPane.current
- val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700
- val id = key.substringAfter(':')
- val item = StoresState.detailItem(store, id)
- val installed = StoresState.installedGame(store, id)
- val rawDownload = StoresState.download("${store.id}:$id")
- val download = rawDownload?.takeIf { it.isActive }
- val failedDownload = rawDownload?.takeIf { it.state == DownloadState.FAILED }
- val title = item?.title ?: installed?.sidecar?.title ?: id
- Rise(0) {
- Box(Modifier.padding(bottom = 12.dp)) { BackLink(stringResource(R.string.common_back), compact = true, onClick = onBack) }
- }
- val scores = if (store == Store.GOG || store == Store.EPIC) rememberGameScores(title.takeIf { it != id }) else null
- val hero: @Composable () -> Unit = {
- androidx.compose.runtime.DisposableEffect(Unit) { onDispose { StoresMotion.heroAt = null } }
- Box(
- Modifier.fillMaxWidth().heightIn(min = if (narrow) 150.dp else 180.dp)
- .onGloballyPositioned { StoresMotion.heroAt = it.boundsInRoot() }
- .clip(Shape16).background(artBrush(hueOf(title))),
- ) {
- val art = item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover
- // The card it came from keeps its own bitmap under the hero until the wide art is decoded.
- val heroArt = cardArtRequest(art, item?.tallImageUrl)
- if (heroArt != null) AsyncImage(model = heroArt, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize())
- Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to colors.background.copy(alpha = 0.94f), 0.5f to colors.background.copy(alpha = 0.55f), 1f to Color.Transparent)))
- if (scores != null && !stacked) {
- Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0.45f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f))))
- HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp))
- }
- Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.align(Alignment.BottomStart).padding(horizontal = 22.dp, vertical = 18.dp)) {
- val passName = item?.includedWith.orEmpty()
- val state = when {
- installed != null -> stringResource(R.string.stores_eyebrow_installed) + " · " + com.droiddeck.launcher.stores.StoreInstallRoot.labelFor(ctx, installed.folder)
- download != null && download.location.isNotBlank() -> stringResource(R.string.stores_eyebrow_library) + " · " + download.location
- failedDownload != null && failedDownload.location.isNotBlank() -> stringResource(R.string.stores_eyebrow_library) + " · " + failedDownload.location
- item?.owned == true -> stringResource(R.string.stores_eyebrow_library)
- item?.subscription == true -> passName.ifBlank { "PC Game Pass" }
- passName.isNotBlank() -> "Available with $passName"
- item?.accessible == true -> stringResource(R.string.stores_eyebrow_library)
- else -> stringResource(R.string.stores_eyebrow_store)
- }
- val size = (item?.sizeBytes ?: 0L).takeIf { it > 0 }?.let { " · " + formatBytes(it) } ?: ""
- Text((state + size).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.2.sp, color = pal.signal)
- Text(title, fontSize = if (narrow) 24.sp else 30.sp, lineHeight = if (narrow) 27.sp else 33.sp, fontWeight = FontWeight.Black, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis)
- if (!failedDownload?.error.isNullOrBlank()) {
- Text(
- failedDownload!!.error!!,
- fontSize = 13.sp,
- lineHeight = 17.sp,
- fontWeight = FontWeight.Medium,
- color = colors.error,
- maxLines = 3,
- overflow = TextOverflow.Ellipsis
- )
- }
- Actions {
- when {
- installed != null -> {
- val gone = StoresState.uninstalling["${store.id}:$id"]
- PrimaryButton(stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && (store != Store.XBOX || !com.droiddeck.launcher.stores.xbox.XboxContent.busy(id)), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn) {
- launchStoreGame(ctx, store, id, s, a)
- }
- ActionChip(stringResource(R.string.stores_in_steam), ok = true)
- if (store == Store.XBOX) {
- SecondaryButton("Update / verify", enabled = download == null && !com.droiddeck.launcher.stores.xbox.XboxRuntime.isActive(id)) {
- runCatching { com.droiddeck.launcher.stores.xbox.XboxBackend.update(ctx, installed) }
- .onFailure { StoresState.problems[Store.XBOX] = it.message ?: "Close this Xbox game before updating it." }
- }
- SecondaryButton("Manage content", enabled = download == null) {
- com.droiddeck.launcher.stores.xbox.XboxContent.manage(ctx, installed)
- }
- }
- if (gone != null) SecondaryButton(stringResource(R.string.stores_uninstalling), enabled = false, progress = gone) {}
- else UninstallButton(title, installed, enabled = download == null && (store != Store.XBOX || !com.droiddeck.launcher.stores.xbox.XboxContent.busy(id))) {
- StoresState.uninstall(ctx, installed) { StoresState.refresh(ctx); a.onLibraryChanged() }
- }
- }
- download != null -> {
- ActionChip(downloadLabel(download), ok = false)
- if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { com.droiddeck.launcher.stores.download.DownloadQueue.pause(download.key) }
- else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { com.droiddeck.launcher.stores.download.DownloadQueue.resume(ctx, download.key) }
- ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { com.droiddeck.launcher.stores.download.DownloadQueue.cancel(ctx, download.key) }
- }
- failedDownload != null -> {
- ActionChip(stringResource(R.string.stores_dl_failed), ok = false)
- PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) {
- if (item != null) StoresState.requestInstall(ctx, item)
- else com.droiddeck.launcher.stores.download.DownloadQueue.retry(ctx, failedDownload.key)
- }
- ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) {
- com.droiddeck.launcher.stores.download.DownloadQueue.clear(ctx, failedDownload.key)
- }
- }
- item?.installable == true && StoresState.isUnfinished(item) -> {
- InstallButton(stringResource(R.string.stores_resume_install), leadOn) { StoresState.requestInstall(ctx, item) }
- ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) }
- }
- item?.installable == true -> {
- InstallButton(
- if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install),
- leadOn,
- ) { StoresState.requestInstall(ctx, item) }
- if (!item.accessible) {
- SecondaryButton(
- when {
- item.isFree -> stringResource(R.string.stores_get_free)
- item.hasPrice && item.finalPrice.isNotBlank() -> stringResource(R.string.stores_buy_price, item.finalPrice)
- else -> stringResource(R.string.stores_view_on, store.shortLabel)
- },
- ) { openStoreUrl(ctx, item) }
- }
- }
- item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) }
- item != null -> PrimaryButton(if (item.hasPrice && item.finalPrice.isNotBlank()) stringResource(R.string.stores_buy_price, item.finalPrice) else stringResource(R.string.stores_view_on, store.shortLabel), main = true, modifier = leadOn) { openStoreUrl(ctx, item) }
- }
- BusyChip(s)
- }
- }
- }
- }
- if (StoresMotion.heroLands) hero() else Rise(1) { hero() }
- if (scores != null) Rise(2) {
- val listed = (StoresState.found[store].orEmpty() + StoresState.shelves[store]?.all.orEmpty()).firstOrNull { it.id == id }
- val developer = item?.developer?.ifBlank { null } ?: listed?.developer.orEmpty()
- val publisher = item?.publisher?.ifBlank { null } ?: listed?.publisher.orEmpty()
- val releaseDate = item?.releaseDate?.ifBlank { null } ?: listed?.releaseDate.orEmpty()
- StoreGameFacts(developer, publisher, releaseDate, scores, scoresInHero = !stacked)
- }
- val description = item?.let { com.droiddeck.launcher.stores.cleanStoreText(it.description) }.orEmpty()
- .takeUnless { it.trim().equals(title.trim(), ignoreCase = true) }.orEmpty()
- val achievements = remember(store, id, item?.accessible, installed) {
- when {
- StoreAchievements.forSource(store.id) == null -> null
- item?.accessible == true -> StoreAchievements.Game.of(item)
- installed != null -> StoreAchievements.Game.of(installed.sidecar)
- else -> null
- }
- }
- if (description.isNotBlank() || achievements != null) Rise(3) {
- val about: @Composable (Modifier, Dp) -> Unit = { m, h -> if (description.isNotBlank()) StoreAbout(description, h, m) }
- val card: @Composable (Modifier) -> Unit = { m -> if (achievements != null) StoreAchievementsCard(achievements, title, m) }
- if (stacked) Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(top = 14.dp)) {
- about(Modifier.fillMaxWidth(), AboutHeight)
- card(Modifier.fillMaxWidth())
- } else Row(horizontalArrangement = Arrangement.spacedBy(24.dp), modifier = Modifier.fillMaxWidth().padding(top = 14.dp)) {
- val density = LocalDensity.current
- var cardHeight by remember { mutableStateOf(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(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(1) }
- Box(Modifier.onGloballyPositioned { placed[0] = it }) {
- PrimaryButton(label, main = true, modifier = modifier) {
- StoresMotion.markInstall(placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), label)
- onInstall()
- }
- }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt
index 2bf7dcac04..8c7c92f524 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt
@@ -498,16 +498,10 @@ internal fun storesSettingsStep(at: Rect, s: androidx.compose.runtime.State = 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
+ val focusManager = LocalFocusManager.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") },
+ title = { Text(stringResource(R.string.stores_xbox_content_title)) },
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.")
+ else if (content.offers.isEmpty()) Text(stringResource(R.string.stores_xbox_content_none))
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")
+ Text(stringResource(if (offer.installed) R.string.stores_xbox_content_update else R.string.stores_xbox_content_install, offer.item.title))
}
}
} },
@@ -191,17 +166,16 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
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") },
+ title = { Text(stringResource(R.string.stores_xbox_choose_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") + ")")
+ Text(stringResource(R.string.stores_xbox_choice, 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 narrow = LocalNarrowPane.current
val padH = if (narrow) 14.dp else 22.dp
val tabs = remember {
@@ -243,7 +217,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(null) }
val liveState = androidx.compose.runtime.rememberUpdatedState(s)
@@ -252,9 +225,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,
)
@@ -266,8 +238,8 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
if (chip == Store.EPIC.id) {
EpicClient.ensure(ctx)
while (true) {
- delay(5_000)
if (lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) EpicClient.refresh(ctx)
+ delay(5_000)
}
}
}
@@ -279,22 +251,22 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
val heroFocus = remember { androidx.compose.ui.focus.FocusRequester() }
var detailFocused by remember { mutableStateOf(false) }
fun move(kind: String) { focusMove = kind to (focusMove?.second ?: 0) + 1 }
- fun open(key: String) { lastOpened = key; openGame = key; move("detail") }
+ fun open(key: String) { focusManager.clearFocus(force = true); lastOpened = key; openGame = key; move("detail") }
fun closeGame() { openGame = null; move("card") }
- fun switchTab(to: String) { tab = to; move("first") }
val pickChip: (String) -> Unit = { id ->
chip = id; openGame = null; query = ""
- if (id != DOWNLOADS) tab = tabFor(Store.byId(id), if (s.storesOpenTab == SessionPrefs.STORES_OPEN_STORE) "store" else "library")
move("first")
}
+ LaunchedEffect(StoresState.openGameRequest) {
+ val key = StoresState.openGameRequest ?: return@LaunchedEffect
+ StoresState.openGameRequest = null
+ Store.byId(key.substringBefore(':'))?.let { store -> chip = store.id; query = ""; open(key) }
+ }
var focusedChip by remember { mutableStateOf(null) }
LaunchedEffect(focusedChip) {
val id = focusedChip ?: return@LaunchedEffect
delay(140)
- if (id != chip) {
- chip = id; openGame = null; query = ""
- if (id != DOWNLOADS) tab = tabFor(Store.byId(id), if (s.storesOpenTab == SessionPrefs.STORES_OPEN_STORE) "store" else "library")
- }
+ if (id != chip) { chip = id; openGame = null; query = "" }
}
val pal = LocalPalette.current
fun cycleStore(step: Int) {
@@ -319,8 +291,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 +327,21 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
}
}
- var detail by remember { mutableStateOf