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

+
+
+
+
@@ -57,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De
## Credits and licence
-GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). 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.
+GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans is set up with the Steam launch option from its README and starts at D3D12 feature level 12_1, as its game crashes at 12_2 here. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve.
XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them.
@@ -67,4 +71,8 @@ Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge
The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead.
+Remote Play from a PC to the arm64 Steam client goes through a stand-in for the V4L2 decoder and the libdrm dumb buffers that Steam's `streaming_client` expects: each frame is decoded by Android's MediaCodec through the app, or by the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) that ships in Steam's own runtime, into dma-heap buffers that its Vulkan renderer imports. The Qualcomm low-latency decoder settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0).
+
Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam.
+
+Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose fixes for them (`311210.py` sets ALSA audio, `570940.py` installs VC++ 2017) fail under ARM64 Proton.
diff --git a/app/build.gradle b/app/build.gradle
index 8ba8c8ea09..1c9b9bad8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,10 +87,18 @@ def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines()
def trackingPack = rootProject.file('tools/packs/tracking/release.env').readLines()
.findAll { it.contains('=') && !it.startsWith('#') }
.collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] }
+def prootPackPin = rootProject.file('tools/packs/proot/release.env').readLines()
+ .findAll { it.contains('=') && !it.startsWith('#') }
+ .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] }
def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'].collectEntries { name ->
def pack = file("build/packs/${name}.tar.zst")
if (!pack.isFile()) {
if (ciBuild) throw new GradleException("Add-on pack ${pack} is missing: run tools/packs/build.sh app/build/packs")
+ // A source build that did not compile proot still pins a published pack, so the app
+ // downloads the patched binary instead of falling back to the rootfs copy.
+ if (name == 'proot' && prootPackPin.PROOT_PACK_SHA256) {
+ return [(name): [sha256: prootPackPin.PROOT_PACK_SHA256, size: (prootPackPin.PROOT_PACK_SIZE ?: '0') as long]]
+ }
return [(name): [sha256: '', size: 0L]]
}
def digest = java.security.MessageDigest.getInstance('SHA-256')
@@ -262,6 +270,7 @@ def runtimeAssetsDir = layout.buildDirectory.dir('runtimeAssets')
def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) {
dependsOn(stageSessionScripts)
from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' }
+ from(rootProject.file('tools/linuxfs/innoextract'))
from(layout.buildDirectory.dir('prepared-assets'))
into(runtimeAssetsDir)
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 29718e0879..091811b040 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,15 @@
+
+
+
+
+
+
+
+
+
@@ -18,7 +27,10 @@
+
+
+
@@ -47,6 +59,15 @@
+
+
+
+
+
+
+
+
@@ -116,7 +148,7 @@
android:excludeFromRecents="true"
android:noHistory="true"
android:taskAffinity="${applicationId}.home"
- android:screenOrientation="sensorLandscape"
+ android:screenOrientation="user"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
@@ -126,6 +158,18 @@
+
+
+
+
+
+
+
@@ -176,7 +220,7 @@
diff --git a/app/src/main/cpp/framegen/ddfg/framegen.cpp b/app/src/main/cpp/framegen/ddfg/framegen.cpp
index 82d0a764b7..5200f6b094 100644
--- a/app/src/main/cpp/framegen/ddfg/framegen.cpp
+++ b/app/src/main/cpp/framegen/ddfg/framegen.cpp
@@ -184,8 +184,9 @@ bool FrameGen::onResize(VkExtent2D extent, VkFormat , bool force) {
VkExtent2D e = levelExtent(extent, l);
if (!makeImage(pyrA_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false;
if (!makeImage(pyrB_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false;
- if (!makeImage(flowLvl_[l], e, VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false;
}
+ for (int l = flowFinest_; l < kLevels; ++l)
+ if (!makeImage(flowLvl_[l], levelExtent(extent, l), VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false;
pyrAs_.resize(kLevels);
for (int l = flowFinest_; l < kLevels; ++l)
if (!makeImage(pyrAs_[l], levelExtent(extent, l), VK_FORMAT_R32_SFLOAT, lumaUsage)) return false;
diff --git a/app/src/main/cpp/framegen/ddfg/record_impl.inc b/app/src/main/cpp/framegen/ddfg/record_impl.inc
index 554c05c7fc..734d94cdc9 100644
--- a/app/src/main/cpp/framegen/ddfg/record_impl.inc
+++ b/app/src/main/cpp/framegen/ddfg/record_impl.inc
@@ -439,7 +439,7 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev,
makeUbo(dd, dev, mp, sizeof(FlowRegUBO), S.flowRegUbo, S.flowRegUboMem, S.flowRegUboPtr);
if (S.flowRegUboPtr) { FlowRegUBO fu{cfg.frDt, cfg.frLambda, cfg.frEdge, cfg.frEps}; std::memcpy(S.flowRegUboPtr, &fu, sizeof(fu)); }
S.flowUbo.resize(kLevels); S.flowUboMem.resize(kLevels); S.flowUboPtr.resize(kLevels);
- for (int l = 0; l < kLevels; ++l) {
+ for (int l = fg->flowFinest(); l < kLevels; ++l) {
makeUbo(dd, dev, mp, sizeof(FlowUBO), S.flowUbo[l], S.flowUboMem[l], S.flowUboPtr[l]);
if (S.flowUboPtr[l]) { FlowUBO u{cfg.flowScale, (uint32_t)l, 0.6f, 1.6f}; std::memcpy(S.flowUboPtr[l], &u, sizeof(u)); }
}
@@ -464,13 +464,12 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev,
}
S.sFlow.resize(kLevels);
- for (int l = 0; l < kLevels; ++l) {
+ for (int l = fg->flowFinest(); l < kLevels; ++l) {
S.sFlow[l] = allocSet(dd, dev, pool, pFlow.setLayout);
int pred = (l + 1 < kLevels) ? l + 1 : l;
- VkImageView currLvl = (l >= fg->flowFinest()) ? pyrAs[l].view : pyrA[l].view;
wUbo(dd, dev, S.sFlow[l], 0, S.flowUbo[l], sizeof(FlowUBO));
wImg(dd, dev, S.sFlow[l], 32, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrB[l].view, samp, GEN);
- wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, currLvl, samp, GEN);
+ wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrAs[l].view, samp, GEN);
wImg(dd, dev, S.sFlow[l], 34, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, flowLvl[pred].view, samp, GEN);
wImg(dd, dev, S.sFlow[l], 48, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, flowLvl[l].view, VK_NULL_HANDLE, GEN);
}
diff --git a/app/src/main/cpp/venc/venc_proto.h b/app/src/main/cpp/venc/venc_proto.h
index 9622577119..47fb6ef241 100644
--- a/app/src/main/cpp/venc/venc_proto.h
+++ b/app/src/main/cpp/venc/venc_proto.h
@@ -9,7 +9,7 @@
#define VENC_MAX_BUFFERS 16
-enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5 };
+enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5, VDEC_CONFIG = 6, VDEC_CAPTURE = 7, VDEC_PACKET = 8, VDEC_RESULT = 9 };
enum venc_touch_action { VENC_TOUCH_DOWN = 0, VENC_TOUCH_MOVE = 1, VENC_TOUCH_UP = 2 };
enum venc_codec { VENC_H264 = 0, VENC_HEVC = 1 };
@@ -52,4 +52,30 @@ struct venc_touch {
uint32_t x, y;
};
+struct vdec_config {
+ uint32_t type;
+ uint32_t codec;
+ uint32_t width, height;
+ uint32_t stride, rows;
+ uint32_t bitstreams, bitstream_size;
+};
+
+struct vdec_capture {
+ uint32_t type;
+ uint32_t index;
+ uint32_t size;
+};
+
+struct vdec_packet {
+ uint32_t type;
+ uint32_t input, bytes, capture;
+ int64_t pts_us;
+};
+
+struct vdec_result {
+ uint32_t type;
+ int32_t status;
+ uint32_t frame;
+};
+
#endif
diff --git a/app/src/main/cpp/venc/venc_server.cpp b/app/src/main/cpp/venc/venc_server.cpp
index be484c898d..17a5d7eed1 100644
--- a/app/src/main/cpp/venc/venc_server.cpp
+++ b/app/src/main/cpp/venc/venc_server.cpp
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -11,6 +12,7 @@
#include
#include
+#include
#include
#include
#include
@@ -45,6 +47,218 @@ int32_t avc_profile(int32_t v4l2) {
}
}
+struct DmaBufSync {
+ uint64_t flags;
+};
+constexpr unsigned long kDmaBufIoctlSync = _IOW('b', 0, DmaBufSync);
+constexpr uint64_t kDmaBufSyncWrite = 2, kDmaBufSyncStart = 0, kDmaBufSyncEnd = 4;
+constexpr int32_t kColorFormatYuv420Planar = 19;
+
+class Decoder {
+public:
+ ~Decoder() { release(); }
+
+ void release() {
+ if (codec_) {
+ AMediaCodec_stop(codec_);
+ AMediaCodec_delete(codec_);
+ codec_ = nullptr;
+ }
+ if (bitstream_) munmap((void *)bitstream_, bitstream_size_);
+ bitstream_ = nullptr;
+ for (auto &c : captures_) drop(c);
+ }
+
+ bool configure(const vdec_config &c, int fd) {
+ release();
+ if (c.width < 16 || c.height < 16 || c.stride < c.width || c.rows < c.height || c.bitstreams == 0 ||
+ c.bitstreams > VENC_MAX_BUFFERS || c.bitstream_size == 0) {
+ LOG("bad decoder config: %ux%u stride %u rows %u, %u bitstreams", c.width, c.height, c.stride, c.rows,
+ c.bitstreams);
+ return false;
+ }
+ bitstream_size_ = (size_t)c.bitstreams * c.bitstream_size;
+ void *p = mmap(nullptr, bitstream_size_, PROT_READ, MAP_SHARED, fd, 0);
+ if (p == MAP_FAILED) {
+ LOG("could not map the bitstream buffers: %s", strerror(errno));
+ return false;
+ }
+ bitstream_ = (const uint8_t *)p;
+ config_ = c;
+ codec_ = create(c, true);
+ if (!codec_) codec_ = create(c, false);
+ if (!codec_) {
+ LOG("no %s decoder for %ux%u", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height);
+ release();
+ return false;
+ }
+ src_stride_ = (int32_t)c.width;
+ src_rows_ = (int32_t)c.height;
+ src_width_ = (int32_t)c.width;
+ src_height_ = (int32_t)c.height;
+ src_planar_ = false;
+ shown_ = false;
+ using GetName = media_status_t (*)(AMediaCodec *, char **);
+ using ReleaseName = void (*)(AMediaCodec *, char *);
+ static auto get_name = (GetName)dlsym(RTLD_DEFAULT, "AMediaCodec_getName");
+ static auto release_name = (ReleaseName)dlsym(RTLD_DEFAULT, "AMediaCodec_releaseName");
+ char *name = nullptr;
+ if (get_name && get_name(codec_, &name) != AMEDIA_OK) name = nullptr;
+ LOG("decoding %s %ux%u with %s", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height,
+ name ? name : "MediaCodec");
+ if (name && release_name) release_name(codec_, name);
+ return true;
+ }
+
+ void capture(const vdec_capture &c, int fd) {
+ if (c.index >= VENC_MAX_BUFFERS) {
+ close(fd);
+ return;
+ }
+ Capture &cap = captures_[c.index];
+ drop(cap);
+ void *p = mmap(nullptr, c.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (p == MAP_FAILED) {
+ LOG("could not map capture buffer %u: %s", c.index, strerror(errno));
+ close(fd);
+ return;
+ }
+ cap = {fd, (uint8_t *)p, c.size};
+ }
+
+ bool decode(const vdec_packet &p, bool *frame) {
+ *frame = false;
+ if (!codec_ || p.capture >= VENC_MAX_BUFFERS || !captures_[p.capture].data || p.input >= config_.bitstreams ||
+ p.bytes == 0 || p.bytes > config_.bitstream_size)
+ return false;
+ auto start = std::chrono::steady_clock::now();
+ ssize_t in = AMediaCodec_dequeueInputBuffer(codec_, 20000);
+ if (in < 0) return false;
+ size_t capacity = 0;
+ uint8_t *dst = AMediaCodec_getInputBuffer(codec_, (size_t)in, &capacity);
+ if (!dst || capacity < p.bytes) {
+ AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, 0, 0, 0);
+ return false;
+ }
+ memcpy(dst, bitstream_ + (size_t)p.input * config_.bitstream_size, p.bytes);
+ if (AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, p.bytes, (uint64_t)std::max(p.pts_us, 0), 0) !=
+ AMEDIA_OK)
+ return false;
+ auto wait = std::chrono::milliseconds(shown_ ? 25 : 250);
+ while (std::chrono::steady_clock::now() - start < wait) {
+ AMediaCodecBufferInfo info;
+ ssize_t o = AMediaCodec_dequeueOutputBuffer(codec_, &info, 2000);
+ if (o == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) {
+ read_format();
+ continue;
+ }
+ if (o < 0) continue;
+ size_t size = 0;
+ uint8_t *data = AMediaCodec_getOutputBuffer(codec_, (size_t)o, &size);
+ if (data && info.size > 0 && (size_t)info.offset + (size_t)info.size <= size)
+ *frame = copy(data + info.offset, (size_t)info.size, captures_[p.capture]) || *frame;
+ AMediaCodec_releaseOutputBuffer(codec_, (size_t)o, false);
+ if (info.presentationTimeUs >= p.pts_us) break;
+ }
+ shown_ = shown_ || *frame;
+ return true;
+ }
+
+private:
+ struct Capture {
+ int fd = -1;
+ uint8_t *data = nullptr;
+ size_t size = 0;
+ };
+
+ static void drop(Capture &c) {
+ if (c.data) munmap(c.data, c.size);
+ if (c.fd >= 0) close(c.fd);
+ c = Capture();
+ }
+
+ AMediaCodec *create(const vdec_config &c, bool low_latency) {
+ const char *mime = c.codec == VENC_HEVC ? "video/hevc" : "video/avc";
+ AMediaCodec *codec = AMediaCodec_createDecoderByType(mime);
+ if (!codec) return nullptr;
+ AMediaFormat *f = AMediaFormat_new();
+ AMediaFormat_setString(f, AMEDIAFORMAT_KEY_MIME, mime);
+ AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_WIDTH, (int32_t)c.width);
+ AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_HEIGHT, (int32_t)c.height);
+ AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, kColorFormatYuv420SemiPlanar);
+ AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, (int32_t)c.bitstream_size);
+ if (low_latency) {
+ AMediaFormat_setInt32(f, "low-latency", 1);
+ AMediaFormat_setInt32(f, "vendor.qti-ext-dec-low-latency.enable", 1);
+ AMediaFormat_setInt32(f, "vendor.qti-ext-dec-picture-order.enable", 1);
+ AMediaFormat_setInt32(f, "priority", 0);
+ AMediaFormat_setFloat(f, "operating-rate", 120.0f);
+ }
+ media_status_t s = AMediaCodec_configure(codec, f, nullptr, nullptr, 0);
+ AMediaFormat_delete(f);
+ if (s == AMEDIA_OK) s = AMediaCodec_start(codec);
+ if (s != AMEDIA_OK) {
+ AMediaCodec_delete(codec);
+ return nullptr;
+ }
+ return codec;
+ }
+
+ void read_format() {
+ AMediaFormat *f = AMediaCodec_getOutputFormat(codec_);
+ if (!f) return;
+ int32_t v;
+ if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_WIDTH, &v) && v > 0) src_width_ = v;
+ if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_HEIGHT, &v) && v > 0) src_height_ = v;
+ src_stride_ = AMediaFormat_getInt32(f, "stride", &v) && v >= src_width_ ? v : src_width_;
+ src_rows_ = AMediaFormat_getInt32(f, "slice-height", &v) && v >= src_height_ ? v : src_height_;
+ src_planar_ = AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, &v) && v == kColorFormatYuv420Planar;
+ LOG("decoder output %dx%d stride %d rows %d %s", src_width_, src_height_, src_stride_, src_rows_,
+ src_planar_ ? "planar" : "semi-planar");
+ AMediaFormat_delete(f);
+ }
+
+ bool copy(const uint8_t *src, size_t size, const Capture &cap) {
+ size_t luma = (size_t)src_stride_ * src_rows_;
+ size_t chroma = src_planar_ ? 2 * (size_t)(src_stride_ / 2) * (src_rows_ / 2) : (size_t)src_stride_ * (src_rows_ / 2);
+ if (size < luma + chroma) return false;
+ uint32_t w = std::min((uint32_t)src_width_, config_.stride);
+ uint32_t h = std::min((uint32_t)src_height_, config_.rows);
+ if ((size_t)config_.stride * config_.rows * 3 / 2 > cap.size) return false;
+ DmaBufSync sync = {kDmaBufSyncStart | kDmaBufSyncWrite};
+ ioctl(cap.fd, kDmaBufIoctlSync, &sync);
+ uint8_t *y = cap.data, *uv = cap.data + (size_t)config_.stride * config_.rows;
+ for (uint32_t row = 0; row < h; row++)
+ memcpy(y + (size_t)row * config_.stride, src + (size_t)row * src_stride_, w);
+ const uint8_t *su = src + luma;
+ for (uint32_t row = 0; row < h / 2; row++) {
+ uint8_t *d = uv + (size_t)row * config_.stride;
+ if (!src_planar_) {
+ memcpy(d, su + (size_t)row * src_stride_, w & ~1u);
+ continue;
+ }
+ const uint8_t *u = su + (size_t)row * (src_stride_ / 2);
+ const uint8_t *vv = su + (size_t)(src_stride_ / 2) * (src_rows_ / 2) + (size_t)row * (src_stride_ / 2);
+ for (uint32_t x = 0; x < w / 2; x++) {
+ d[2 * x] = u[x];
+ d[2 * x + 1] = vv[x];
+ }
+ }
+ sync.flags = kDmaBufSyncEnd | kDmaBufSyncWrite;
+ ioctl(cap.fd, kDmaBufIoctlSync, &sync);
+ return true;
+ }
+
+ AMediaCodec *codec_ = nullptr;
+ vdec_config config_ = {};
+ const uint8_t *bitstream_ = nullptr;
+ size_t bitstream_size_ = 0;
+ Capture captures_[VENC_MAX_BUFFERS];
+ int32_t src_width_ = 0, src_height_ = 0, src_stride_ = 0, src_rows_ = 0;
+ bool src_planar_ = false;
+ bool shown_ = false;
+};
+
class Session {
public:
explicit Session(int fd) : fd_(fd) {}
@@ -85,6 +299,24 @@ public:
memcpy(&b, buf, sizeof b);
set_bitrate(b.bitrate);
for (int i = 0; i < nfds; i++) close(fds[i]);
+ } else if (type == VDEC_CONFIG && n == (ssize_t)sizeof(vdec_config)) {
+ vdec_config c;
+ memcpy(&c, buf, sizeof c);
+ bool ok = nfds == 1 && decoder_.configure(c, fds[0]);
+ for (int i = 0; i < nfds; i++) close(fds[i]);
+ decoded(ok ? 0 : -1, false);
+ } else if (type == VDEC_CAPTURE && n == (ssize_t)sizeof(vdec_capture)) {
+ vdec_capture c;
+ memcpy(&c, buf, sizeof c);
+ if (nfds == 1) decoder_.capture(c, fds[0]);
+ else for (int i = 0; i < nfds; i++) close(fds[i]);
+ } else if (type == VDEC_PACKET && n == (ssize_t)sizeof(vdec_packet)) {
+ vdec_packet p;
+ memcpy(&p, buf, sizeof p);
+ bool frame = false;
+ bool ok = decoder_.decode(p, &frame);
+ for (int i = 0; i < nfds; i++) close(fds[i]);
+ decoded(ok ? 0 : -1, frame);
} else {
LOG("unexpected message %u of %zd bytes; closing", type, n);
for (int i = 0; i < nfds; i++) close(fds[i]);
@@ -117,7 +349,13 @@ private:
send(fd_, &d, sizeof d, MSG_NOSIGNAL);
}
+ void decoded(int32_t status, bool frame) {
+ vdec_result r = {VDEC_RESULT, status, frame ? 1u : 0u};
+ send(fd_, &r, sizeof r, MSG_NOSIGNAL);
+ }
+
void release() {
+ decoder_.release();
if (codec_) {
AMediaCodec_stop(codec_);
AMediaCodec_delete(codec_);
@@ -292,6 +530,7 @@ private:
int32_t dst_stride_ = 0, dst_rows_ = 0;
std::vector inputs_, outputs_;
std::vector header_;
+ Decoder decoder_;
};
std::atomic g_listener{-1};
diff --git a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c
index 6cf0c80373..cb44478354 100644
--- a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c
+++ b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c
@@ -371,8 +371,8 @@ void ahb_swapchain_set_mode(int on, int live) {
: "; gralloc frames still in flight stay on the layer (or take the copy path) until then");
else
droiddeck_log("layer", "zero-copy: %s at launch (%s)", on ? "on" : "off",
- on ? "DROIDDECK_WAYLAND_ZERO_COPY=1: games present their own gralloc buffers on the display layer"
- : "the drawer's Zero-copy presentation switch turns it on live");
+ on ? "HDR session: games present their own gralloc buffers on the display layer"
+ : "only HDR sessions turn it on");
if (live) wl_display_flush_clients(droiddeck_get_display());
droiddeck_request_redraw();
}
diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c
index 562a83a750..ff1a33ed2d 100644
--- a/app/src/main/cpp/waylandcomp/src/compositor.c
+++ b/app/src/main/cpp/waylandcomp/src/compositor.c
@@ -186,6 +186,9 @@ static void on_client_created(struct wl_listener *l, void *data) {
enum surface_role { ROLE_NONE, ROLE_TOPLEVEL, ROLE_SUBSURFACE, ROLE_DESKTOP, ROLE_CURSOR };
+#define DAMAGE_RECTS 8
+struct damage_list { int32_t r[DAMAGE_RECTS][4]; int n; };
+
struct surface {
struct wl_resource *resource;
struct wl_list link;
@@ -204,9 +207,11 @@ struct surface {
struct wl_resource *dmabuf;
struct dmabuf_buffer *dmabuf_buf;
struct wl_listener dmabuf_destroy;
+ const void *last_dmabuf;
int buf_w, buf_h, has_content;
int buf_alpha;
int opaque[4], pending_opaque[4], pending_opaque_set;
+ struct damage_list damage_buf, pending_damage_buf, damage_local, pending_damage_local;
int src_set, dst_set;
float src[4];
int dst[2];
@@ -257,6 +262,21 @@ static struct wl_event_source *g_render_idle, *g_frame_timer;
static int g_dirty;
+static int64_t g_dirty_since_ns;
+#define PACE_BUFFERS 32
+static struct {
+ unsigned ticks, ticks_late_2ms, renders, null_attaches, reattaches, presented, replaced, undrawn, distinct;
+ int64_t tick_late_ns, tick_late_max_ns, wait_ns, wait_max_ns;
+ const void *buffers[PACE_BUFFERS];
+ uint64_t game_frames_seen;
+} g_pace;
+
+static void pace_note_buffer(const void *buffer) {
+ for (unsigned i = 0; i < g_pace.distinct && i < PACE_BUFFERS; i++)
+ if (g_pace.buffers[i] == buffer) return;
+ if (g_pace.distinct < PACE_BUFFERS) g_pace.buffers[g_pace.distinct] = buffer;
+ g_pace.distinct++;
+}
static int64_t g_last_vsync_ns;
static int64_t g_tick_vsync_ns;
static int64_t g_refresh_ns = 16666667;
@@ -264,6 +284,8 @@ static struct wl_event_source *g_fallback_timer;
static int g_fallback_armed;
volatile int g_fps_limit;
+/* fps limit -1 (phone output, not mirrored): replaced buffers go back to the client at once instead of once per refresh. */
+volatile int g_release_unpaced;
volatile int g_hide_shell;
@@ -371,7 +393,7 @@ static int on_release_timer(int fd, uint32_t mask, void *data) {
static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_t since_ns) {
const int limit = g_fps_limit;
const int64_t interval = limit > 0 ? 1000000000LL / limit : g_refresh_ns;
- if (interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; }
+ if (g_release_unpaced || interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; }
int64_t now = now_ns();
int64_t at = s->next_release_ns + interval;
int64_t latest = now + interval * (int64_t)(s->releases_pending + 1);
@@ -622,6 +644,68 @@ static void fire_frames(struct wl_list *frames) {
}
}
+static void scene_size(int *w, int *h);
+static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h);
+static struct surface *g_hud_surface, *g_hud_shm;
+static int64_t g_hud_shm_ns;
+static int64_t g_hud_last_ns, g_hud_alive_ns;
+static int g_hud_fresh;
+static int g_hud_new;
+#define HUD_TIMES 256
+static pthread_mutex_t g_hud_times_lock = PTHREAD_MUTEX_INITIALIZER;
+static float g_hud_times[HUD_TIMES];
+static int64_t g_hud_times_total, g_hud_shown_ns;
+
+static void hud_frame_shown(int64_t t) {
+ const int64_t previous = g_hud_shown_ns;
+ g_hud_shown_ns = t;
+ if (!previous || t <= previous) return;
+ pthread_mutex_lock(&g_hud_times_lock);
+ g_hud_times[g_hud_times_total % HUD_TIMES] = (float)((t - previous) / 1e6);
+ g_hud_times_total++;
+ pthread_mutex_unlock(&g_hud_times_lock);
+}
+
+static int tree_rank(const struct surface *s, const struct surface *want, int *rank, int depth) {
+ const struct surface *c;
+ if (depth > 8) return 0;
+ wl_list_for_each(c, &s->children, child_link)
+ if (c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1;
+ if (s == want) return 1;
+ (*rank)++;
+ wl_list_for_each(c, &s->children, child_link)
+ if (!c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1;
+ return 0;
+}
+
+static int render_rank(const struct surface *want) {
+ const struct surface *s;
+ int rank = 0;
+ if (g_desktop && tree_rank(g_desktop, want, &rank, 0)) return rank;
+ wl_list_for_each(s, &g_toplevels, toplevel_link)
+ if (tree_rank(s, want, &rank, 0)) return rank;
+ return -1;
+}
+
+static int below_surface(const struct surface *s, const struct surface *other) {
+ const int a = render_rank(s), b = render_rank(other);
+ return a >= 0 && b >= 0 && a < b;
+}
+
+int droiddeck_hud_frame_times(float *out, int len, int64_t *total) {
+ pthread_mutex_lock(&g_hud_times_lock);
+ *total = g_hud_times_total;
+ int64_t n = *total < len ? *total : len;
+ if (n > HUD_TIMES) n = HUD_TIMES;
+ for (int64_t i = 0; i < n; i++) out[i] = g_hud_times[(*total - n + i) % HUD_TIMES];
+ pthread_mutex_unlock(&g_hud_times_lock);
+ return (int)n;
+}
+static uint64_t g_game_frames;
+extern void droiddeck_on_game_surface(const char *window, const char *gpu);
+extern void droiddeck_on_game_frame(void);
+extern void droiddeck_on_game_program(int pid, const char *program);
+
static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_resource *buffer) {
int32_t w = wl_shm_buffer_get_width(shm), h = wl_shm_buffer_get_height(shm);
int32_t stride = wl_shm_buffer_get_stride(shm);
@@ -644,6 +728,33 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res
g_stat_shm++;
struct client_info *ci = client_info_of(wl_resource_get_client(s->resource));
if (ci && ci->asked_feedback) ci->shm_frames++;
+ int local_w, local_h;
+ surface_size(s, &local_w, &local_h);
+ const double region = s->src_set ? (double)s->src[2] * s->src[3] : (double)w * h;
+ const int64_t local_max = damage_area(&s->damage_local, local_w, local_h);
+ const int64_t local = local_w > 0 && local_h > 0
+ ? (int64_t)((double)local_max * region / ((double)local_w * local_h)) : local_max;
+ const int64_t buffer_max = damage_area(&s->damage_buf, w, h);
+ const int64_t area = (int64_t)w * h;
+ int64_t damaged = buffer_max > local ? buffer_max : local;
+ if (damaged > area) damaged = area;
+ const int64_t now = now_ns();
+ if (damaged * 16 >= area && (!g_hud_surface || now - g_hud_last_ns > 1000000000LL) &&
+ (s == g_hud_shm || !g_hud_shm || now - g_hud_shm_ns > 1000000000LL)) {
+ const struct surface *top = s;
+ int scene_w, scene_h, top_w, top_h, depth = 0;
+ while (top->parent && depth++ < 8) top = top->parent;
+ scene_size(&scene_w, &scene_h);
+ surface_size(top, &top_w, &top_h);
+ int64_t shown = (int64_t)local_w * local_h;
+ if ((int64_t)top_w * top_h > shown) shown = (int64_t)top_w * top_h;
+ if (top->role == ROLE_TOPLEVEL && top->mapped && shown * 2 >= (int64_t)scene_w * scene_h) {
+ g_hud_shm = s;
+ g_hud_shm_ns = now;
+ g_hud_new = 1;
+ droiddeck_on_game_frame();
+ }
+ }
}
static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resource *buffer) {
@@ -660,17 +771,12 @@ static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resou
s->has_content = s->shm_img != NULL;
}
-static struct surface *g_hud_surface;
-static int64_t g_hud_last_ns, g_hud_alive_ns;
-static int g_hud_fresh;
-static uint64_t g_game_frames;
-extern void droiddeck_on_game_surface(const char *window, const char *gpu);
-extern void droiddeck_on_game_frame(void);
-extern void droiddeck_on_game_program(int pid, const char *program);
-
static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_resource *buffer) {
const int repeat = s->dmabuf == buffer && s->dmabuf_buf == b;
if (!repeat) {
+ if (!s->dmabuf && s->last_dmabuf == buffer) g_pace.reattaches++;
+ s->last_dmabuf = buffer;
+ pace_note_buffer(buffer);
drop_dmabuf(s, 1);
s->dmabuf = buffer;
s->dmabuf_buf = b;
@@ -722,8 +828,9 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re
name, b->width, b->height, (unsigned long long)b->modifier);
}
if (s != g_hud_surface && (b->img || ahb_swapchain_has_ahb(b)) &&
- (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL ||
- (announced_now && (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) {
+ (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL || (!repeat && below_surface(s, g_hud_surface)) ||
+ (announced_now && !below_surface(g_hud_surface, s) &&
+ (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) {
char name[160];
describe(s, name, sizeof(name));
g_hud_surface = s;
@@ -747,7 +854,7 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re
}
if (s == g_hud_surface) {
g_hud_alive_ns = now_ns();
- if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_game_frames++; droiddeck_on_game_frame(); }
+ if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_hud_new = 1; g_game_frames++; droiddeck_on_game_frame(); }
}
}
@@ -784,8 +891,45 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r,
wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy);
}
}
+static int64_t rect_area(const int32_t *r, int bound_w, int bound_h) {
+ int64_t x0 = r[0], y0 = r[1], x1 = (int64_t)r[0] + r[2], y1 = (int64_t)r[1] + r[3];
+ if (bound_w > 0 && bound_h > 0) {
+ if (x0 < 0) x0 = 0;
+ if (y0 < 0) y0 = 0;
+ if (x1 > bound_w) x1 = bound_w;
+ if (y1 > bound_h) y1 = bound_h;
+ }
+ if (x1 <= x0 || y1 <= y0) return 0;
+ const int64_t w = x1 - x0, h = y1 - y0;
+ return (w < 65536 ? w : 65536) * (h < 65536 ? h : 65536);
+}
+static void note_damage(struct damage_list *d, int32_t x, int32_t y, int32_t w, int32_t h) {
+ if (w <= 0 || h <= 0) return;
+ const int32_t rect[4] = { x, y, w, h };
+ int slot = d->n;
+ if (slot == DAMAGE_RECTS) {
+ slot = 0;
+ for (int i = 1; i < DAMAGE_RECTS; i++)
+ if (rect_area(d->r[i], 0, 0) < rect_area(d->r[slot], 0, 0)) slot = i;
+ if (rect_area(rect, 0, 0) <= rect_area(d->r[slot], 0, 0)) return;
+ } else {
+ d->n++;
+ }
+ memcpy(d->r[slot], rect, sizeof(rect));
+}
+static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h) {
+ int64_t max = 0;
+ for (int i = 0; i < d->n; i++) {
+ const int64_t area = rect_area(d->r[i], bound_w, bound_h);
+ if (area > max) max = area;
+ }
+ return max;
+}
static void surface_damage(struct wl_client *c, struct wl_resource *r,
- int32_t x, int32_t y, int32_t w, int32_t h) {}
+ int32_t x, int32_t y, int32_t w, int32_t h) {
+ struct surface *s = wl_resource_get_user_data(r);
+ note_damage(&s->pending_damage_local, x, y, w, h);
+}
static void frame_callback_destroy(struct wl_resource *r) {
wl_list_remove(wl_resource_get_link(r));
}
@@ -794,12 +938,15 @@ static void feedback_resource_destroy(struct wl_resource *r) {
wl_list_remove(wl_resource_get_link(r));
}
-static void feedback_discard_all(struct wl_list *list) {
+static unsigned feedback_discard_all(struct wl_list *list) {
struct wl_resource *fb, *tmp;
+ unsigned n = 0;
wl_resource_for_each_safe(fb, tmp, list) {
wp_presentation_feedback_send_discarded(fb);
wl_resource_destroy(fb);
+ n++;
}
+ return n;
}
static uint32_t nominal_refresh_ns(void) {
@@ -828,6 +975,7 @@ static void feedback_present_all(struct wl_list *list, int64_t t) {
nominal_refresh_ns(), 0, 0,
WP_PRESENTATION_FEEDBACK_KIND_VSYNC);
wl_resource_destroy(fb);
+ g_pace.presented++;
}
}
@@ -985,13 +1133,18 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) {
s->pending_opaque_set = 0;
}
+ s->damage_buf = s->pending_damage_buf;
+ s->damage_local = s->pending_damage_local;
+ s->pending_damage_buf.n = s->pending_damage_local.n = 0;
if (s->pending_attach) {
struct wl_resource *buffer = s->pending_buffer;
struct dmabuf_buffer *db = get_dmabuf(buffer);
struct wl_shm_buffer *shm = buffer && !db ? wl_shm_buffer_get(buffer) : NULL;
uint8_t pixel[4];
- feedback_discard_all(&s->feedback);
+ g_pace.replaced += feedback_discard_all(&s->feedback);
+ if (!buffer) g_pace.null_attaches++;
+ else if (!db) s->last_dmabuf = NULL;
if (buffer) {
wl_list_remove(&s->pending_buffer_destroy.link);
@@ -1049,7 +1202,10 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) {
static void surface_set_buffer_transform(struct wl_client *c, struct wl_resource *r, int32_t t) {}
static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, int32_t s) {}
static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r,
- int32_t x, int32_t y, int32_t w, int32_t h) {}
+ int32_t x, int32_t y, int32_t w, int32_t h) {
+ struct surface *s = wl_resource_get_user_data(r);
+ note_damage(&s->pending_damage_buf, x, y, w, h);
+}
static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {}
static const struct wl_surface_interface surface_impl = {
@@ -1092,6 +1248,7 @@ static void surface_resource_destroy(struct wl_resource *r) {
droiddeck_text_input_surface_gone(r);
if (g_desktop == s) { g_desktop = NULL; droiddeck_log("desktop", "the desktop closed"); }
if (g_hud_surface == s) { g_hud_surface = NULL; droiddeck_on_game_surface(NULL, NULL); }
+ if (g_hud_shm == s) g_hud_shm = NULL;
constraints_surface_gone(s);
unmap_toplevel(s);
@@ -1960,13 +2117,20 @@ void droiddeck_stream_frame(AHardwareBuffer *ahb) {
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; }
+ if (atomic_load(&g_stream_on)) { g_dirty_since_ns = 0; render_stream(); return; }
struct draw_list dl = {0};
struct surface *s;
int w, h;
const int64_t t_scene = now_ns();
int copy = 0;
+ if (g_dirty_since_ns) {
+ const int64_t wait = t_scene - g_dirty_since_ns;
+ g_pace.wait_ns += wait;
+ if (wait > g_pace.wait_max_ns) g_pace.wait_max_ns = wait;
+ g_pace.renders++;
+ g_dirty_since_ns = 0;
+ }
g_dirty = 0;
g_hud_fresh = 0;
g_hdr_unimported = NULL;
@@ -2101,9 +2265,13 @@ static void render_scene(void) {
if (rendered) {
int64_t t = presented_ns(t_scene);
g_stat_frames++;
+ if (g_hud_new) {
+ g_hud_new = 0;
+ hud_frame_shown(t);
+ }
wl_list_for_each(s, &g_surfaces, link) {
if (s->drawn) feedback_present_all(&s->feedback, t);
- else feedback_discard_all(&s->feedback);
+ else g_pace.undrawn += feedback_discard_all(&s->feedback);
}
fire_all_frames();
} else {
@@ -2129,6 +2297,7 @@ static int on_fallback_timer(void *data) {
}
static void schedule_render(void) {
+ if (!g_dirty && !g_dirty_since_ns) g_dirty_since_ns = now_ns();
g_dirty = 1;
if (!g_display) return;
if (g_last_vsync_ns && now_ns() - g_last_vsync_ns < 100000000LL) return;
@@ -2148,6 +2317,13 @@ static int scene_waits_for_game(int64_t now) {
static void on_vsync(int64_t frame_time_ns) {
int64_t now = now_ns();
g_perf.ticks++;
+ if (frame_time_ns > 0 && now >= frame_time_ns) {
+ const int64_t late = now - frame_time_ns;
+ g_pace.ticks++;
+ g_pace.tick_late_ns += late;
+ if (late > g_pace.tick_late_max_ns) g_pace.tick_late_max_ns = late;
+ if (late > 2000000LL) g_pace.ticks_late_2ms++;
+ }
if (g_last_vsync_ns) {
int64_t d = now - g_last_vsync_ns;
if (d > 3000000LL && d < 40000000LL) g_refresh_ns = (g_refresh_ns * 7 + d) / 8;
@@ -3260,6 +3436,24 @@ static int on_stats_timer(void *data) {
#undef PERF_MS
memset(&g_perf, 0, sizeof(g_perf));
}
+ const uint64_t game = g_game_frames - g_pace.game_frames_seen;
+ if (g_pace.ticks || g_pace.renders || game || g_pace.reattaches || g_pace.null_attaches || g_pace.distinct ||
+ g_pace.presented || g_pace.replaced || g_pace.undrawn) {
+ droiddeck_log("pacing", "last 10 s: tick reaches compositor %.2f/%.2f ms late (%u ticks, %u over 2 ms) | "
+ "new frame waits %.2f/%.2f ms to be drawn (%u scenes) | %llu game frames, %u re-attached after an "
+ "empty attach, %u empty attaches, %u distinct buffers | feedback %u shown, %u replaced before drawing, "
+ "%u not drawn",
+ g_pace.ticks ? (double)g_pace.tick_late_ns / 1e6 / g_pace.ticks : 0.0, (double)g_pace.tick_late_max_ns / 1e6,
+ g_pace.ticks, g_pace.ticks_late_2ms,
+ g_pace.renders ? (double)g_pace.wait_ns / 1e6 / g_pace.renders : 0.0, (double)g_pace.wait_max_ns / 1e6,
+ g_pace.renders, (unsigned long long)game, g_pace.reattaches, g_pace.null_attaches, g_pace.distinct,
+ g_pace.presented, g_pace.replaced, g_pace.undrawn);
+ }
+ {
+ const uint64_t seen = g_game_frames;
+ memset(&g_pace, 0, sizeof(g_pace));
+ g_pace.game_frames_seen = seen;
+ }
g_stat_frames = g_stat_dmabuf = g_stat_shm = 0;
droiddeck_color_stats_tick();
diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c
index 16e42d1b5d..675d4ac2ce 100644
--- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c
+++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c
@@ -25,6 +25,7 @@ extern void droiddeck_wayland_send_pointer(int action, int x, int y);
extern void droiddeck_wayland_send_touch(int action, int pointer_id, int x, int y);
extern int droiddeck_cursor_snapshot(int *out, int cap);
extern int droiddeck_cursor_serial(void);
+extern int droiddeck_hud_frame_times(float *out, int len, int64_t *total);
extern void droiddeck_wayland_send_key(int evdev, int state);
extern void droiddeck_wayland_send_scene_input(int type, int a, int b);
extern void droiddeck_wayland_vsync(int64_t frame_time_ns);
@@ -34,6 +35,7 @@ extern unsigned droiddeck_stream_frames(void);
extern void droiddeck_wayland_output_resized(void);
extern void droiddeck_wayland_set_output_refresh_rate(int mhz);
extern volatile int g_fps_limit;
+extern volatile int g_release_unpaced;
extern volatile int g_hide_shell;
extern volatile int g_zero_copy;
extern volatile unsigned g_zero_copy_last;
@@ -267,6 +269,20 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSnapshot(
return n;
}
+JNIEXPORT jlong JNICALL
+Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeHudFrameTimes(JNIEnv *env, jclass clazz, jfloatArray out) {
+ (void)clazz;
+ if (!out) return 0;
+ jint cap = (*env)->GetArrayLength(env, out);
+ float *buf = cap > 0 ? malloc(sizeof(float) * (size_t)cap) : NULL;
+ if (!buf) return 0;
+ int64_t total = 0;
+ int n = droiddeck_hud_frame_times(buf, cap, &total);
+ if (n > 0) (*env)->SetFloatArrayRegion(env, out, 0, n, buf);
+ free(buf);
+ return (jlong)total;
+}
+
JNIEXPORT jint JNICALL
Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSerial(JNIEnv *env, jclass clazz) {
(void)env; (void)clazz;
@@ -574,6 +590,7 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetLookName(JNIEnv *
JNIEXPORT void JNICALL
Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetFpsLimit(JNIEnv *env, jclass clazz, jint fps) {
g_fps_limit = fps > 0 ? fps : 0;
+ g_release_unpaced = fps < 0;
__android_log_print(ANDROID_LOG_INFO, TAG, "fps limit %d", fps);
}
diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt
index 928d7caa8c..324941bd43 100644
--- a/app/src/main/java/com/droiddeck/launcher/App.kt
+++ b/app/src/main/java/com/droiddeck/launcher/App.kt
@@ -53,6 +53,7 @@ class App : Application() {
com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.amazon.AmazonBackend)
com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.itch.ItchBackend)
com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend)
+ com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend)
}
/** Fetches the packs an existing setup already relies on, so the first use after an update does not wait. */
diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
index 3092aa187b..5a202591f5 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -52,6 +52,7 @@ import com.droiddeck.launcher.core.PhantomProcessLimit
import com.droiddeck.launcher.core.PhantomProcessStatus
import com.droiddeck.launcher.core.WirelessAdbFix
import com.droiddeck.launcher.core.WifiDiscovery
+import com.droiddeck.launcher.core.SteamIntegration
import com.droiddeck.launcher.core.WirelessAdbPairingService
import com.droiddeck.launcher.ui.CoreRow
import com.droiddeck.launcher.ui.PerformancePage
@@ -91,12 +92,17 @@ 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) { !busy && flood == null && pkgStage == null && components.compBusy == null }
+ private val protons = ProtonMenu(this, ui) { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }
private var installed by mutableStateOf(null)
private var flood by mutableStateOf(null)
private var floodProgress by androidx.compose.runtime.mutableFloatStateOf(0f)
private class PendingFlood(val from: androidx.compose.ui.geometry.Rect, val intent: Intent)
+ private class CompatLaunch(val intent: Intent, val loading: com.droiddeck.launcher.session.LoadingState, var menuInstall: Boolean)
+ private var compatLaunch by mutableStateOf(null)
+ private var compatFlood by mutableStateOf(null)
+ private var compatLaunchPoll: Runnable? = null
+ private var compatLaunchVisible = false
private var returning by mutableStateOf(null)
private class ReturningFlood(val color: Int, val to: androidx.compose.ui.geometry.Rect?)
private var ready by mutableStateOf(false)
@@ -134,11 +140,17 @@ class FrontEndActivity : ComponentActivity() {
private var catalog by mutableStateOf?>(null)
private var catalogLoading by mutableStateOf(false)
private var packageRows by mutableStateOf?>(null)
- private var pkgId by mutableStateOf(null)
- private var pkgStage by mutableStateOf(null)
- private var pkgPercent by mutableIntStateOf(-1)
+ private object PackageOperation {
+ val id = mutableStateOf(null)
+ val stage = mutableStateOf(null)
+ val percent = mutableIntStateOf(-1)
+ }
+ private var pkgId by PackageOperation.id
+ private var pkgStage by PackageOperation.stage
+ private var pkgPercent by PackageOperation.percent
private var desktopInstalled by mutableStateOf(false)
private var desktopPresent by mutableStateOf(false)
+ private var battleNetInstalled by mutableStateOf(false)
private var offlineAccount by mutableStateOf(null)
private var offline by mutableStateOf(false)
private var showPerformance by mutableStateOf(false)
@@ -152,6 +164,9 @@ class FrontEndActivity : ComponentActivity() {
private var syncFallback by mutableStateOf(true)
private var fsyncFirst by mutableStateOf(false)
private var gamescopeRealtime by mutableStateOf(false)
+ private var ramCapMb by mutableStateOf(0)
+ private var zramClient by mutableStateOf(true)
+ private var vramCapMb by mutableStateOf(0)
private var gpuClockPin by mutableStateOf(false)
private var prootNoSeccomp by mutableStateOf(false)
private var prootFastPath by mutableStateOf(true)
@@ -164,10 +179,12 @@ class FrontEndActivity : ComponentActivity() {
private var picturePosition by mutableStateOf("center")
private var stretch16x9 by mutableStateOf(false)
private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE)
+ private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER)
private var launcherFullscreen by mutableStateOf(true)
private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO)
private var downloadMirror by mutableStateOf("")
private var downloadPrefix by mutableStateOf("")
+ private var downloadProxy by mutableStateOf("")
private var animationsEnabled by mutableStateOf(true)
private var launcherIcon by mutableStateOf(LauncherIcon.DARK)
private var gameStoresEnabled by mutableStateOf(true)
@@ -182,6 +199,8 @@ class FrontEndActivity : ComponentActivity() {
private var wifiDiscoveryLocation by mutableStateOf(false)
private var wifiDiscoveryAsked by mutableStateOf(false)
private var wifiDiscoveryBlocked by mutableStateOf(false)
+ private var integrationState by mutableStateOf(SteamIntegration.State())
+ private var integrationFocus by mutableStateOf(null)
private val wifiLocationReceiver = object : android.content.BroadcastReceiver() {
override fun onReceive(context: android.content.Context?, intent: Intent?) {
refreshWifiDiscovery()
@@ -250,8 +269,65 @@ class FrontEndActivity : ComponentActivity() {
SessionPrefs.setWifiDiscoveryEnabled(this, false)
}
wifiDiscovery = SessionPrefs.wifiDiscoveryEnabled(this)
+ integrationState = readIntegration()
}
+ private var shortcutsTried = false
+
+ private fun readIntegration() = SteamIntegration.read(this)
+ .copy(locationBlocked = wifiDiscoveryBlocked, shortcutsTried = shortcutsTried)
+
+ private fun openIntegration(feature: SteamIntegration.Feature? = null) {
+ SteamIntegration.dismissSuggestion(this)
+ refreshWifiDiscovery()
+ integrationState = readIntegration()
+ integrationFocus = feature
+ navRequest = "setup:integration"
+ }
+
+ private fun readIntegrationIntent(incoming: Intent) {
+ if (incoming.action != SteamIntegration.ACTION_SETUP) return
+ openIntegration(incoming.getStringExtra(SteamIntegration.EXTRA_FEATURE)?.let {
+ runCatching { SteamIntegration.Feature.valueOf(it) }.getOrNull()
+ })
+ }
+
+ private fun integrationSettings(intent: Intent, fallback: String = android.provider.Settings.ACTION_SETTINGS) {
+ try { startActivity(intent) }
+ catch (_: android.content.ActivityNotFoundException) { startActivity(Intent(fallback)) }
+ catch (_: SecurityException) { startActivity(Intent(fallback)) }
+ }
+
+ private fun configureIntegration(feature: SteamIntegration.Feature) {
+ when (feature) {
+ SteamIntegration.Feature.WIFI -> {
+ if (wifiDiscovery && wifiDiscoveryPermission) {
+ SessionPrefs.setWifiDiscoveryEnabled(this, false)
+ } else if (wifiDiscoveryPermission) {
+ SessionPrefs.setWifiDiscoveryEnabled(this, true)
+ } else {
+ SessionPrefs.setWifiDiscoveryAsked(this)
+ wifiLocationPermission.launch(WifiDiscovery.permissions)
+ }
+ refreshWifiDiscovery()
+ }
+ SteamIntegration.Feature.BRIGHTNESS -> integrationSettings(SteamIntegration.brightnessSettings(this))
+ SteamIntegration.Feature.HOME -> if (HomeApp.isDefault(this)) HomeApp.openSystemHomeSettings(this) else {
+ HomeApp.setHomeScreenEnabled(this, true)
+ refreshHomeAppState()
+ manageHomeApp()
+ }
+ SteamIntegration.Feature.SHORTCUTS -> {
+ if (!integrationState.shortcuts) shortcutsTried = true
+ if (!HomeApp.isDefault(this)) configureIntegration(SteamIntegration.Feature.HOME)
+ else integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS)
+ }
+ }
+ }
+
+ private fun openAppInfo() =
+ integrationSettings(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:$packageName")))
+
private fun openWifiDiscoverySettings() {
if (!WifiDiscovery.permissionGranted(this)) {
wifiPermissionSettings.launch(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
@@ -386,7 +462,6 @@ class FrontEndActivity : ComponentActivity() {
private var theme by mutableStateOf("graphite")
private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE)
private var hdrOn by mutableStateOf(false)
- private var fpsLimit by mutableStateOf(0)
private var upscaler by mutableStateOf(0)
private var upscaleSharpness by mutableStateOf(75)
private var hdrReason by mutableStateOf(null)
@@ -411,11 +486,30 @@ class FrontEndActivity : ComponentActivity() {
private var logsEnabled by mutableStateOf(true)
private var vacDiagnostics by mutableStateOf(false)
private var agentCommands by mutableStateOf(false)
+ private var clearCachedApps by mutableStateOf(false)
+ private var adbPaired by mutableStateOf(false)
+ private var memoryHud by mutableStateOf(SessionPrefs.MEMORY_HUD_OFF)
+ private var backgroundAppLimit by mutableStateOf(com.droiddeck.launcher.core.BackgroundAppLimit.OFF)
private var showRoms by mutableStateOf(false)
private var homeAppSelected by mutableStateOf(false)
private var homeScreenEnabled by mutableStateOf(false)
private var defaultHomeLabel by mutableStateOf(null)
private var androidApps by mutableStateOf>(emptyList())
+ private var androidAppsListing = 0
+ private val packageCallback = object : android.content.pm.LauncherApps.Callback() {
+ private fun changed() {
+ refreshAndroidApps()
+ if (HomeWidgets.providers != null) HomeWidgets.refreshProviders(this@FrontEndActivity)
+ }
+ override fun onPackageRemoved(packageName: String, user: android.os.UserHandle) = changed()
+ override fun onPackageAdded(packageName: String, user: android.os.UserHandle) = changed()
+ override fun onPackageChanged(packageName: String, user: android.os.UserHandle) = changed()
+ override fun onPackagesAvailable(packageNames: Array, user: android.os.UserHandle, replacing: Boolean) = changed()
+ override fun onPackagesUnavailable(packageNames: Array, user: android.os.UserHandle, replacing: Boolean) = changed()
+ override fun onShortcutsChanged(packageName: String, shortcuts: MutableList, user: android.os.UserHandle) {
+ if (homeAppSelected) HomePins.refresh(this@FrontEndActivity)
+ }
+ }
private var secondScreenDisplays by mutableStateOf>(emptyList())
private lateinit var displayManager: DisplayManager
private val secondScreenDisplayListener = object : DisplayManager.DisplayListener {
@@ -429,7 +523,9 @@ class FrontEndActivity : ComponentActivity() {
}
override fun startActivity(intent: Intent?) {
+ val compat = protons.protonBusyId != null || ProtonExtras.installInProgress
if (intent?.component?.className == SessionActivity::class.java.name) {
+ if (compatLaunch != null) return
when {
busy || LinuxRuntimeInstaller.isBusy() -> {
android.widget.Toast.makeText(this, R.string.main_wait_runtime, android.widget.Toast.LENGTH_SHORT).show()
@@ -439,10 +535,7 @@ class FrontEndActivity : ComponentActivity() {
android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show()
return
}
- protons.protonBusyId != null || ProtonExtras.installInProgress -> {
- android.widget.Toast.makeText(this, R.string.main_wait_proton_install, android.widget.Toast.LENGTH_SHORT).show()
- return
- }
+ compat -> Unit
pkgStage != null -> {
android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show()
return
@@ -457,17 +550,26 @@ class FrontEndActivity : ComponentActivity() {
return
}
com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
+ if (compat) {
+ waitForCompat(intent)
+ return
+ }
}
super.startActivity(intent)
if (intent?.component?.className == SessionActivity::class.java.name) overridePendingTransition(R.anim.session_rise, R.anim.session_hold)
}
private fun launchFlooded(f: PendingFlood) {
- if (busy || LinuxRuntimeInstaller.isBusy() || protons.protonBusyId != null ||
- ProtonExtras.installInProgress || pkgStage != null) {
+ if (busy || LinuxRuntimeInstaller.isBusy() || (SessionState.installing != null && !SessionState.running) ||
+ protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) {
flood = null
floodProgress = 0f
com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
+ if (!busy && !LinuxRuntimeInstaller.isBusy() && !(SessionState.installing != null && !SessionState.running) &&
+ (protons.protonBusyId != null || ProtonExtras.installInProgress)) {
+ compatFlood = com.droiddeck.launcher.ui.Themes.byId(theme).signal
+ waitForCompat(f.intent)
+ }
return
}
val signal = com.droiddeck.launcher.ui.Themes.byId(theme).signal
@@ -475,6 +577,72 @@ class FrontEndActivity : ComponentActivity() {
overridePendingTransition(0, 0)
}
+ private fun waitForCompat(next: Intent, menuInstall: Boolean = protons.protonBusyId != null) {
+ if (compatLaunch != null) return
+ com.droiddeck.launcher.ui.LaunchOrigin.take()
+ com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
+ val waiting = CompatLaunch(Intent(next), com.droiddeck.launcher.session.LoadingState(this), menuInstall)
+ compatLaunch = waiting
+ val poll = object : Runnable {
+ override fun run() {
+ if (isDestroyed || isFinishing || compatLaunch !== waiting) return
+ if (protons.protonBusyId != null || ProtonExtras.installInProgress) {
+ waiting.menuInstall = waiting.menuInstall || protons.protonBusyId != null
+ val percent = if (protons.protonBusyId != null) protons.protonPercent else -1
+ val stage = protons.protonStage ?: getString(R.string.load_compat_wait)
+ waiting.loading.say(if (percent >= 0) getString(R.string.load_compat_progress, stage, percent) else stage,
+ com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true)
+ waiting.loading.percent = percent
+ waiting.loading.tick()
+ ui.postDelayed(this, 250)
+ return
+ }
+ if (!compatLaunchVisible) { ui.postDelayed(this, 250); return }
+ val problem = protons.protonProblem.takeIf { waiting.menuInstall }
+ if (problem == null && (busy || LinuxRuntimeInstaller.isBusy() || (SessionState.installing != null && !SessionState.running) || pkgStage != null)) {
+ waiting.loading.say(pkgStage ?: stage.takeIf { it.isNotBlank() } ?: getString(R.string.main_wait_runtime),
+ com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true)
+ waiting.loading.percent = if (pkgStage != null) pkgPercent else percent
+ waiting.loading.tick()
+ ui.postDelayed(this, 250)
+ return
+ }
+ compatLaunchPoll = null
+ if (problem != null) waiting.loading.showEnded(problem)
+ else {
+ compatLaunch = null
+ startActivity(waiting.intent)
+ }
+ }
+ }
+ compatLaunchPoll = poll
+ poll.run()
+ }
+
+ private fun cancelCompatLaunch() {
+ compatLaunchPoll?.let(ui::removeCallbacks)
+ compatLaunchPoll = null
+ compatLaunch = null
+ compatFlood = null
+ }
+
+ private fun restoreCompatLaunch(state: Bundle) {
+ savedIntent(state, KEY_COMPAT_LAUNCH)?.let { next ->
+ val problem = state.getString(KEY_COMPAT_PROBLEM)
+ if (problem == null) waitForCompat(next, state.getBoolean(KEY_COMPAT_MENU_INSTALL))
+ else compatLaunch = CompatLaunch(next,
+ com.droiddeck.launcher.session.LoadingState(this).apply { showEnded(problem) }, false)
+ }
+ }
+
+ private fun saveCompatLaunch(state: Bundle) {
+ compatLaunch?.let {
+ state.putParcelable(KEY_COMPAT_LAUNCH, it.intent)
+ state.putBoolean(KEY_COMPAT_MENU_INSTALL, it.menuInstall)
+ if (it.loading.ended) state.putString(KEY_COMPAT_PROBLEM, it.loading.step)
+ }
+ }
+
private var shortcutPicker by mutableStateOf(false)
private var shortcutLibraryScanning by mutableStateOf(false)
@Volatile private var libraryScanGeneration = 0
@@ -536,7 +704,7 @@ class FrontEndActivity : ComponentActivity() {
}
private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean {
- if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) {
+ if (pkgStage != null) {
android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show()
return false
}
@@ -592,9 +760,11 @@ class FrontEndActivity : ComponentActivity() {
.putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN)
.putExtra(SessionService.EXTRA_PROGRAM, command.program)
.putExtra(SessionService.EXTRA_PROGRAM_ARGS, command.args.toTypedArray())
+ .putExtra(SessionService.EXTRA_GAME_ID, com.droiddeck.launcher.session.NoSteamLaunch.scope(game))
when {
!SessionState.running -> startSessionOrWait(next)
SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
+ command.program == com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET && handToBattleNet(command.args, returnHome) { pendingSwitch = next } -> {}
SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args ->
startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
.returnTo(returnHome)
@@ -646,7 +816,7 @@ class FrontEndActivity : ComponentActivity() {
android.widget.Toast.makeText(this, R.string.epic_client_uninstalling, android.widget.Toast.LENGTH_SHORT).show()
return false
}
- if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) {
+ if (pkgStage != null) {
android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show()
return false
}
@@ -692,7 +862,8 @@ class FrontEndActivity : ComponentActivity() {
}
private fun startSessionOrWait(next: Intent): Boolean {
- val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL))
+ val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL) ||
+ next.getStringExtra(SessionService.EXTRA_PROGRAM) in setOf(com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET))
if (!started && (busy || LinuxRuntimeInstaller.isBusy())) android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show()
return started
}
@@ -753,10 +924,12 @@ class FrontEndActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ if (savedInstanceState == null) readIntegrationIntent(intent)
readGameIntent(intent)
gameSyncFolder = GameFileSync.folder(this)
displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager
refreshPhantomStatus()
+ if (!SessionState.running) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this)
theme = SessionPrefs.theme(this)
frameGenLabel = getString(R.string.frame_gen_off)
appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)
@@ -765,11 +938,13 @@ class FrontEndActivity : ComponentActivity() {
steamGamesX64 = cachedX64
backActionsInverted = SessionPrefs.backActionsInverted(this)
orientation = SessionPrefs.orientation(this)
- requestedOrientation = orientation
+ launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this)
+ requestedOrientation = launcherOrientation
launcherFullscreen = SessionPrefs.launcherFullscreen(this)
downloadSource = DownloadSource.mode(this)
downloadMirror = DownloadSource.mirror(this)
downloadPrefix = DownloadSource.custom(this)
+ downloadProxy = DownloadSource.proxyHostPort(this)
DownloadSource.probe()
animationsEnabled = SessionPrefs.animationsEnabled(this)
LauncherIcon.repair(this, intent?.component)
@@ -805,6 +980,7 @@ class FrontEndActivity : ComponentActivity() {
offlineAccount = offlineAccount, offline = offline,
frameGenLabel = frameGenLabel, romsDir = romsDir, logsEnabled = logsEnabled,
vacDiagnostics = vacDiagnostics, agentCommands = agentCommands,
+ clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit,
steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel,
frameGen = FrameGen.mode(this),
lossless = lossless,
@@ -815,6 +991,8 @@ class FrontEndActivity : ComponentActivity() {
isHomeApp = homeAppSelected,
homeScreenEnabled = homeScreenEnabled,
defaultHomeLabel = defaultHomeLabel,
+ integration = integrationState,
+ integrationFocus = integrationFocus,
androidApps = androidApps,
secondScreenDisplays = secondScreenDisplays,
packages = packageRows,
@@ -823,6 +1001,7 @@ class FrontEndActivity : ComponentActivity() {
packageStage = pkgStage,
packagePercent = pkgPercent,
sessionRunning = SessionState.running,
+ battleNetInstalled = battleNetInstalled,
backActionsInverted = backActionsInverted,
buildLabel = BuildConfig.BUILD_LABEL,
oscMode = oscMode,
@@ -831,10 +1010,12 @@ class FrontEndActivity : ComponentActivity() {
phantomProcessStatus = phantomProcessStatus,
showPhantomGate = showPhantomGate,
orientation = orientation,
+ launcherOrientation = launcherOrientation,
launcherFullscreen = launcherFullscreen,
downloadSource = downloadSource,
downloadMirror = downloadMirror,
downloadPrefix = downloadPrefix,
+ downloadProxy = downloadProxy,
animationsEnabled = animationsEnabled,
launcherIcon = launcherIcon,
gameStoresEnabled = gameStoresEnabled,
@@ -910,6 +1091,7 @@ class FrontEndActivity : ComponentActivity() {
.putExtra(SessionService.EXTRA_PROGRAM, app.program)
.putExtra(SessionService.EXTRA_PROGRAM_ARGS, app.args.toTypedArray()))
},
+ onBattleNet = { openBattleNet() },
onFlatpakApp = { id, name ->
Library.flatpakNames[id] = name
startActivity(Intent(this, SessionActivity::class.java)
@@ -964,6 +1146,12 @@ class FrontEndActivity : ComponentActivity() {
com.droiddeck.launcher.agent.AgentAccess.setCommandsEnabled(this, !com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this))
agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this)
},
+ onClearCachedApps = { on -> SessionPrefs.setClearCachedApps(this, on); clearCachedApps = on },
+ onMemoryHud = { value -> SessionPrefs.setMemoryHud(this, value); memoryHud = value },
+ onBackgroundAppLimit = { limit ->
+ SessionPrefs.setBackgroundAppLimit(this, limit); backgroundAppLimit = limit
+ if (limit == com.droiddeck.launcher.core.BackgroundAppLimit.OFF) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this)
+ },
onShareLogs = {
SessionLogShare.prepare(this, { SessionLogShare.latest(this) }) { zip ->
if (zip == null) android.widget.Toast.makeText(this, R.string.main_no_logs_yet, android.widget.Toast.LENGTH_LONG).show()
@@ -1005,6 +1193,10 @@ class FrontEndActivity : ComponentActivity() {
onOrientation = { value ->
SessionPrefs.setOrientation(this, value)
orientation = value
+ },
+ onLauncherOrientation = { value ->
+ com.droiddeck.launcher.core.AppUiPrefs.setOrientation(this, value)
+ launcherOrientation = value
requestedOrientation = value
},
onLauncherFullscreen = { on ->
@@ -1035,7 +1227,19 @@ class FrontEndActivity : ComponentActivity() {
DownloadSource.setCustom(this, prefix)
downloadPrefix = DownloadSource.custom(this)
},
+ onDownloadProxy = { value ->
+ DownloadSource.setProxy(this, value)
+ downloadProxy = DownloadSource.proxyHostPort(this)
+ },
onHomeApp = { manageHomeApp() },
+ onSteamIntegration = ::openIntegration,
+ onIntegration = { integrationFocus = null; configureIntegration(it) },
+ onIntegrationAppInfo = ::openAppInfo,
+ onIntegrationLocation = ::openWifiDiscoverySettings,
+ onDismissIntegration = {
+ SteamIntegration.dismissSuggestion(this)
+ integrationState = readIntegration()
+ },
onHomeScreen = { on ->
HomeApp.setHomeScreenEnabled(this, on)
refreshHomeAppState()
@@ -1089,7 +1293,12 @@ class FrontEndActivity : ComponentActivity() {
android.widget.Toast.makeText(this, R.string.main_adb_copied, android.widget.Toast.LENGTH_SHORT).show()
},
onDismissPhantomGate = { showPhantomGate = false },
+ onShowPhantomGate = {
+ refreshPhantomStatus()
+ showPhantomGate = true
+ },
onStartWirelessAdbPairing = { WirelessAdbPairingService.start(this) },
+ onStartPairingGuide = { displayId -> PairingGuideActivity.start(this, displayId) },
onOpenNotificationSettings = {
startActivity(Intent(android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS)
.putExtra(android.provider.Settings.EXTRA_APP_PACKAGE, packageName)
@@ -1185,12 +1394,23 @@ class FrontEndActivity : ComponentActivity() {
com.droiddeck.launcher.ui.LaunchOrigin.flooding = null
}
}
+ androidx.activity.compose.BackHandler(compatLaunch != null) { cancelCompatLaunch() }
+ compatLaunch?.loading?.let { loading ->
+ if (!loading.ended) com.droiddeck.launcher.ui.VeilRing()
+ com.droiddeck.launcher.ui.LoadingOverlay(
+ loading.step, loading.percent, loading.elapsed, getString(R.string.load_compat_hint), loading.ended,
+ loading.topic, loading.readable, title = getString(R.string.load_compat_title),
+ onCancel = ::cancelCompatLaunch, onClose = ::cancelCompatLaunch,
+ flood = compatFlood, onFlooded = { compatFlood = null },
+ )
+ }
}
}
}
if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() }
else {
+ restoreCompatLaunch(savedInstanceState)
pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH)
savedIntent(savedInstanceState, KEY_SWITCHING_TO)?.let { awaitSessionEnd(it, savedInstanceState.getLong(KEY_SWITCH_DEADLINE)) }
}
@@ -1219,6 +1439,10 @@ class FrontEndActivity : ComponentActivity() {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
+ if (intent.action == SteamIntegration.ACTION_SETUP) {
+ readIntegrationIntent(intent)
+ return
+ }
readGameIntent(intent)
refresh()
startSteamAtStartupIfEnabled()
@@ -1277,6 +1501,14 @@ class FrontEndActivity : ComponentActivity() {
}
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+ if (compatLaunch != null) {
+ if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) {
+ if (event.action == KeyEvent.ACTION_UP) cancelCompatLaunch()
+ return true
+ }
+ if (!compatLaunch!!.loading.ended && event.keyCode !in listOf(
+ KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) return true
+ }
if (event.keyCode == KeyEvent.KEYCODE_BUTTON_A) com.droiddeck.launcher.ui.HeldKeys.confirm = event.action == KeyEvent.ACTION_DOWN
if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) {
if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
@@ -1293,13 +1525,27 @@ class FrontEndActivity : ComponentActivity() {
}
}
+ override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean {
+ if (compatLaunch != null && !compatLaunch!!.loading.ended &&
+ com.droiddeck.launcher.input.PadBridge.isControllerMotionEvent(event)) return true
+ return super.dispatchGenericMotionEvent(event)
+ }
+
+ override fun onPause() {
+ compatLaunchVisible = false
+ super.onPause()
+ }
+
override fun onResume() {
super.onResume()
+ compatLaunchVisible = true
orientation = SessionPrefs.orientation(this)
- requestedOrientation = orientation
+ launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this)
+ requestedOrientation = launcherOrientation
refreshWifiDiscovery()
com.droiddeck.launcher.stores.StoresState.refresh(this)
com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() }
+ com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = { args -> openBattleNet(args) }
com.droiddeck.launcher.ui.Motion.refresh(this)
com.droiddeck.launcher.ui.QuitFlood.take()?.let { c ->
returning = ReturningFlood(c, com.droiddeck.launcher.ui.LaunchOrigin.takeReturn())
@@ -1341,10 +1587,20 @@ class FrontEndActivity : ComponentActivity() {
})
displayManager.registerDisplayListener(secondScreenDisplayListener, ui)
refreshSecondScreenDisplays()
+ getSystemService(android.content.pm.LauncherApps::class.java).registerCallback(packageCallback, ui)
+ HomeWidgets.startListening(this)
+ }
+
+ @Suppress("OVERRIDE_DEPRECATION")
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) return
+ @Suppress("DEPRECATION")
+ super.onActivityResult(requestCode, resultCode, data)
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
+ saveCompatLaunch(outState)
pendingSwitch?.let { outState.putParcelable(KEY_PENDING_SWITCH, it) }
switchingTo?.let {
outState.putParcelable(KEY_SWITCHING_TO, it)
@@ -1357,6 +1613,7 @@ class FrontEndActivity : ComponentActivity() {
else @Suppress("DEPRECATION") state.getParcelable(key)
override fun onDestroy() {
+ cancelCompatLaunch()
updates.unregister()
super.onDestroy()
}
@@ -1364,8 +1621,11 @@ class FrontEndActivity : ComponentActivity() {
override fun onStop() {
unregisterReceiver(wifiLocationReceiver)
unregisterReceiver(mediaReceiver)
+ getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback)
+ HomeWidgets.stopListening(this)
ui.removeCallbacks(mediaRefresh)
com.droiddeck.launcher.stores.StoresState.libraryListener = null
+ com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null
displayManager.unregisterDisplayListener(secondScreenDisplayListener)
flood = null
returning = null
@@ -1378,7 +1638,22 @@ class FrontEndActivity : ComponentActivity() {
homeScreenEnabled = HomeApp.isHomeScreenEnabled(this)
homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this)
defaultHomeLabel = HomeApp.defaultLabel(this)
- androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList()
+ refreshAndroidApps()
+ integrationState = readIntegration()
+ }
+
+ private fun refreshAndroidApps() {
+ if (!homeAppSelected) {
+ ++androidAppsListing
+ androidApps = emptyList()
+ return
+ }
+ val seq = ++androidAppsListing
+ HomePins.refresh(this)
+ Thread({
+ val apps = runCatching { HomeApp.launchableApps(this) }.getOrDefault(emptyList())
+ ui.post { if (seq == androidAppsListing) androidApps = apps }
+ }, "home-apps").start()
}
private fun refreshSecondScreenDisplays() {
@@ -1559,6 +1834,50 @@ class FrontEndActivity : ComponentActivity() {
desktopPresent = DesktopCatalog.desktopPresent(this)
}
+ private fun openBattleNet(args: List = emptyList()) {
+ if (pkgStage != null) {
+ android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show()
+ return
+ }
+ val app = applicationContext
+ Thread({
+ val full = if (args.firstOrNull() == "--library") args else com.droiddeck.launcher.stores.battlenet.BattleNetClient.library(app) + args
+ ui.post {
+ if (isDestroyed) return@post
+ val next = Intent(this, SessionActivity::class.java)
+ .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN)
+ .putExtra(SessionService.EXTRA_PROGRAM, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET)
+ .putExtra(SessionService.EXTRA_PROGRAM_ARGS, full.toTypedArray())
+ when {
+ !SessionState.running -> startSessionOrWait(next)
+ SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
+ handToBattleNet(full) { pendingSwitch = next } -> {}
+ else -> pendingSwitch = next
+ }
+ }
+ }, "battlenet-open").start()
+ }
+
+ private fun handToBattleNet(args: List, returnHome: Boolean = false, otherwise: () -> Unit): Boolean {
+ if (SessionState.mode != SessionService.MODE_RUN || SessionState.program != com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) return false
+ val library = args.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1)
+ val sessionLibrary = SessionState.programArgs.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1)
+ if (library != null && sessionLibrary != null && library != sessionLibrary) return false
+ val request = if (library != null) args.drop(2) else args
+ val app = applicationContext
+ Thread({
+ val handed = request.isEmpty() || com.droiddeck.launcher.stores.battlenet.BattleNetClient.request(LinuxRuntime.sessionRoot(app), request)
+ ui.post {
+ if (isDestroyed) return@post
+ if (!handed) otherwise()
+ else startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
+ .returnTo(returnHome)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP))
+ }
+ }, "battlenet-request").start()
+ return true
+ }
+
private fun launchProgram(path: String) {
startActivity(Intent(this, SessionActivity::class.java)
.putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN)
@@ -1624,7 +1943,7 @@ class FrontEndActivity : ComponentActivity() {
ModeSettings(
mode = mode, resolution = resolution,
panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this),
- hdr = hdrOn, hdrReason = hdrReason, fpsLimit = fpsLimit,
+ hdr = hdrOn, hdrReason = hdrReason,
upscaler = upscaler, upscaleSharpness = upscaleSharpness,
gpuDrivers = drivers.summary(),
touchMode = touchMode,
@@ -1632,8 +1951,7 @@ class FrontEndActivity : ComponentActivity() {
steamDownloadsInBackground = steamDownloadsInBackground,
pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this),
pipAutoEnter = pipAutoEnter,
- unfoldedControls = if (mode == SessionService.MODE_STEAM &&
- com.droiddeck.launcher.session.SessionDisplay.foldable(this)) unfoldedControls else null,
+ unfoldedControls = if (mode == SessionService.MODE_STEAM) unfoldedControls else null,
unfoldedControlsWithController = unfoldedControlsWithController,
oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null,
backActionsInverted = backActionsInverted,
@@ -1659,11 +1977,7 @@ class FrontEndActivity : ComponentActivity() {
bootMovieCustomName = bootMovieCustomName,
bootMovieImporting = bootMovieImporting,
bootMovieProgress = bootMovieProgress,
- wifiDiscovery = if (mode == SessionService.MODE_STEAM) wifiDiscovery else null,
- wifiDiscoveryPermission = wifiDiscoveryPermission,
- wifiDiscoveryLocation = wifiDiscoveryLocation,
- wifiDiscoveryAsked = wifiDiscoveryAsked,
- wifiDiscoveryBlocked = wifiDiscoveryBlocked,
+ integration = if (mode == SessionService.MODE_STEAM) integrationState else null,
deckyInstalled = if (mode == SessionService.MODE_STEAM) decky.deckyInstalled else null,
deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyLatest else null,
deckyBranch = decky.deckyBranch,
@@ -1672,25 +1986,12 @@ class FrontEndActivity : ComponentActivity() {
deckyEnabled = decky.deckySupervisor, deckySessionRunning = SessionState.running,
),
ModeSettingsActions(
- onWifiDiscovery = { on ->
- if (!on) {
- SessionPrefs.setWifiDiscoveryEnabled(this, false)
- refreshWifiDiscovery()
- } else if (WifiDiscovery.permissionGranted(this)) {
- SessionPrefs.setWifiDiscoveryEnabled(this, true)
- refreshWifiDiscovery()
- } else if (wifiDiscoveryBlocked) {
- openWifiDiscoverySettings()
- } else {
- SessionPrefs.setWifiDiscoveryAsked(this)
- wifiLocationPermission.launch(WifiDiscovery.permissions)
- }
- },
- onWifiDiscoverySettings = { openWifiDiscoverySettings() },
+ onIntegration = ::configureIntegration,
+ onIntegrationAppInfo = ::openAppInfo,
+ onIntegrationLocation = ::openWifiDiscoverySettings,
onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value },
onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on },
onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) },
- onFpsLimit = { fps -> SessionPrefs.setFpsLimit(this, mode, fps); fpsLimit = fps },
onUpscaler = { m -> SessionPrefs.setUpscaler(this, m); upscaler = m },
onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this, pct); upscaleSharpness = pct },
onTouch = { t -> SessionPrefs.setTouchMode(this, t); touchMode = t },
@@ -1785,6 +2086,10 @@ class FrontEndActivity : ComponentActivity() {
fsyncFirst = fsyncFirst,
gamescopeRealtime = gamescopeRealtime,
gpuClockPin = gpuClockPin,
+ ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient,
+ deviceRamMb = (android.app.ActivityManager.MemoryInfo()
+ .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(),
+ ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(),
prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, cursorComposite = cursorComposite,
guestHostname = guestHostname, phantomWarning = phantomWarning,
onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on },
@@ -1798,6 +2103,9 @@ class FrontEndActivity : ComponentActivity() {
onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on },
onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on },
onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on },
+ onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb },
+ onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on },
+ onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb },
onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on },
onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on },
onCursorComposite = { on -> SessionPrefs.setCursorComposite(this, on); cursorComposite = on },
@@ -1934,7 +2242,6 @@ class FrontEndActivity : ComponentActivity() {
runSteamAtStartup = SessionPrefs.runSteamAtStartup(this)
loadBootMovie()
hdrOn = SessionPrefs.hdr(this, mode)
- fpsLimit = SessionPrefs.fpsLimit(this, mode)
upscaler = SessionPrefs.upscaler(this)
upscaleSharpness = SessionPrefs.upscaleSharpness(this)
hdrReason = com.droiddeck.launcher.wayland.HdrSupport.probe(this).reason
@@ -1993,6 +2300,9 @@ class FrontEndActivity : ComponentActivity() {
syncFallback = SessionPrefs.syncFallback(this)
fsyncFirst = SessionPrefs.fsyncFirst(this)
gamescopeRealtime = SessionPrefs.gamescopeRealtime(this)
+ ramCapMb = SessionPrefs.ramCapMb(this)
+ zramClient = SessionPrefs.zramClient(this)
+ vramCapMb = SessionPrefs.vramCapMb(this)
gpuClockPin = SessionPrefs.gpuClockPin(this)
prootNoSeccomp = SessionPrefs.prootNoSeccomp(this)
prootFastPath = SessionPrefs.prootFastPath(this)
@@ -2013,6 +2323,7 @@ class FrontEndActivity : ComponentActivity() {
addedGamesArt = SessionPrefs.addedGamesArt(this)
desktopInstalled = DesktopCatalog.desktopInstalled(this)
desktopPresent = DesktopCatalog.desktopPresent(this)
+ battleNetInstalled = com.droiddeck.launcher.runtime.BattleNet.installed(this)
offlineAccount = OfflineMode.account(this)
offline = OfflineMode.enabled(this)
installed = LinuxRuntimeInstaller.installedVersion(this)
@@ -2023,6 +2334,10 @@ class FrontEndActivity : ComponentActivity() {
logsEnabled = SessionPrefs.logsEnabled(this)
vacDiagnostics = SessionPrefs.vacDiagnostics(this)
agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this)
+ clearCachedApps = SessionPrefs.clearCachedApps(this)
+ adbPaired = WirelessAdbFix.hasSavedPairing(this)
+ memoryHud = SessionPrefs.memoryHud(this)
+ backgroundAppLimit = SessionPrefs.backgroundAppLimit(this)
runningLabel = if (SessionState.running) when (SessionState.mode) {
SessionService.MODE_DESKTOP -> getString(R.string.rail_desktop)
SessionService.MODE_RUN -> Library.nameForProgram(SessionState.program)
@@ -2032,7 +2347,7 @@ class FrontEndActivity : ComponentActivity() {
val scanGeneration = ++libraryScanGeneration
val artRefreshesAtStart = HashMap(steamArtRefreshes)
if (shortcutPicker) shortcutLibraryScanning = true
- if (SessionPrefs.steamClientArch(this) == "x86_64" && !OfflineMode.enabled(this)) {
+ if (!OfflineMode.enabled(this)) {
Thread({ com.droiddeck.launcher.session.FexCatalog.refresh(this) }, "fex-catalog").start()
}
Thread({
@@ -2124,6 +2439,7 @@ class FrontEndActivity : ComponentActivity() {
private fun refreshPhantomStatus() {
phantomProcessStatus = PhantomProcessLimit.read(this)
+ adbPaired = WirelessAdbFix.hasSavedPairing(this)
phantomWarning = if (PhantomProcessLimit.blocksSteam(phantomProcessStatus)) {
getString(
R.string.phantom_warning, PhantomProcessLimit.title(this, phantomProcessStatus),
@@ -2227,6 +2543,9 @@ class FrontEndActivity : ComponentActivity() {
private const val SESSION_SWITCH_WAIT_MS = 30_000L
private const val SESSION_SWITCH_POLL_MS = 250L
private const val KEY_PENDING_SWITCH = "pending_switch"
+ private const val KEY_COMPAT_LAUNCH = "compat_launch"
+ private const val KEY_COMPAT_MENU_INSTALL = "compat_menu_install"
+ private const val KEY_COMPAT_PROBLEM = "compat_problem"
private const val KEY_SWITCHING_TO = "switching_to"
private const val KEY_SWITCH_DEADLINE = "switch_deadline"
private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED)
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt
index 71304e8837..59e10c48e7 100644
--- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt
@@ -13,7 +13,7 @@ class HomeActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this)
+ requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this)
routeHome()
}
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
index 74b49821c5..9d0ae53c1c 100644
--- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
+++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
@@ -6,20 +6,41 @@ import android.graphics.Bitmap
import android.content.ComponentName
import android.content.Context
import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.LauncherApps
+import android.content.pm.ShortcutInfo
+import android.graphics.Rect
+import android.os.Process
+import android.os.UserHandle
+import android.os.UserManager
import android.content.pm.PackageManager
+import android.net.Uri
import android.os.Build
import android.provider.Settings
import androidx.core.graphics.drawable.toBitmap
import com.droiddeck.launcher.session.SessionService
import com.droiddeck.launcher.session.SessionState
+import kotlin.math.roundToInt
object HomeApp {
+ private const val ICON_DP = 72
+
data class LaunchableApp(
val label: String,
val packageName: String,
val className: String,
val icon: Bitmap?,
- )
+ val system: Boolean = false,
+ val game: Boolean = false,
+ val installedAt: Long = 0L,
+ val updatedAt: Long = 0L,
+ val user: UserHandle? = null,
+ val userSerial: Long = 0L,
+ ) {
+ val component get() = ComponentName(packageName, className)
+ val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else ""
+ val work get() = userSerial != 0L
+ }
fun isHomeScreenEnabled(context: Context): Boolean =
context.packageManager.getComponentEnabledSetting(ComponentName(context, HomeActivity::class.java)) ==
@@ -69,33 +90,79 @@ object HomeApp {
fun settingsIntent(): Intent = Intent(Settings.ACTION_HOME_SETTINGS)
fun launchableApps(context: Context): List {
+ val launcher = context.getSystemService(LauncherApps::class.java)
+ val users = context.getSystemService(UserManager::class.java)
val pm = context.packageManager
- val launch = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER)
- val apps = pm.queryIntentActivities(launch, 0)
- .asSequence()
- .mapNotNull { result ->
- val activity = result.activityInfo ?: return@mapNotNull null
- if (!activity.exported || activity.packageName == context.packageName) return@mapNotNull null
- val label = result.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { activity.packageName }
- val icon = runCatching { result.loadIcon(pm).toBitmap(48, 48) }.getOrNull()
- LaunchableApp(label, activity.packageName, activity.name, icon)
+ val own = Process.myUserHandle()
+ val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt()
+ val apps = users.userProfiles.flatMap { user ->
+ val serial = if (user == own) 0L else users.getSerialNumberForUser(user)
+ runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info ->
+ val component = info.componentName
+ if (component.packageName == context.packageName && user == own) return@mapNotNull null
+ val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName }
+ val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull()
+ val app = info.applicationInfo
+ val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null
+ @Suppress("DEPRECATION")
+ val game = app.category == ApplicationInfo.CATEGORY_GAME || app.flags and ApplicationInfo.FLAG_IS_GAME != 0
+ LaunchableApp(
+ label, component.packageName, component.className, icon,
+ system = app.flags and (ApplicationInfo.FLAG_SYSTEM or ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0,
+ game = game,
+ installedAt = info.firstInstallTime,
+ updatedAt = updated ?: info.firstInstallTime,
+ user = user,
+ userSerial = serial,
+ )
}
- .distinctBy { it.packageName }
- .toList()
- return apps.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label })
+ }
+ return apps.distinctBy { it.key }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label })
}
- fun launch(context: Context, app: LaunchableApp, displayId: Int? = null) {
- val intent = Intent(Intent.ACTION_MAIN)
- .addCategory(Intent.CATEGORY_LAUNCHER)
- .setComponent(ComponentName(app.packageName, app.className))
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- if (displayId == null) {
- context.startActivity(intent)
- return
- }
- val options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId)
- context.startActivity(intent, options.toBundle())
+ fun launch(context: Context, app: LaunchableApp, displayId: Int? = null, bounds: Rect? = null) {
+ val options = displayId?.let { ActivityOptions.makeBasic().setLaunchDisplayId(it).toBundle() }
+ val launcher = context.getSystemService(LauncherApps::class.java)
+ launcher.startMainActivity(app.component, app.user ?: Process.myUserHandle(), bounds, options)
+ }
+
+ fun canUseShortcuts(context: Context): Boolean =
+ runCatching { context.getSystemService(LauncherApps::class.java).hasShortcutHostPermission() }.getOrDefault(false)
+
+ fun shortcuts(context: Context, app: LaunchableApp): List {
+ if (!canUseShortcuts(context)) return emptyList()
+ val query = LauncherApps.ShortcutQuery()
+ .setPackage(app.packageName)
+ .setActivity(app.component)
+ .setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC or LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST)
+ return runCatching { context.getSystemService(LauncherApps::class.java).getShortcuts(query, app.user ?: Process.myUserHandle()) }
+ .getOrNull().orEmpty()
+ .filter { it.isEnabled }
+ .sortedWith(compareBy { if (it.isDeclaredInManifest) 0 else 1 }.thenBy { it.rank })
+ .take(5)
+ }
+
+ fun shortcutIcon(context: Context, info: ShortcutInfo, px: Int = (ICON_DP * context.resources.displayMetrics.density).roundToInt()): Bitmap? = runCatching {
+ context.getSystemService(LauncherApps::class.java)
+ .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px)
+ }.getOrNull()
+
+ fun startShortcut(context: Context, info: ShortcutInfo) {
+ context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null)
+ }
+
+ fun openAppInfo(context: Context, app: LaunchableApp) {
+ context.getSystemService(LauncherApps::class.java)
+ .startAppDetailsActivity(app.component, app.user ?: Process.myUserHandle(), null, null)
+ }
+
+ fun canUninstall(app: LaunchableApp): Boolean = !app.system && !app.work
+
+ fun uninstall(context: Context, app: LaunchableApp) {
+ context.startActivity(
+ Intent(Intent.ACTION_DELETE, Uri.fromParts("package", app.packageName, null))
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+ )
}
fun isActiveSteamSession(): Boolean =
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt
new file mode 100644
index 0000000000..dc1f0bca47
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt
@@ -0,0 +1,65 @@
+package com.droiddeck.launcher
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.UUID
+
+object HomeFolders {
+ data class Folder(val id: String, val name: String, val apps: List)
+
+ private const val PREFS = "home_launcher"
+ private const val KEY = "folders"
+
+ var folders by mutableStateOf>(emptyList())
+ private set
+ private var loaded = false
+
+ fun load(context: Context) {
+ if (loaded) return
+ loaded = true
+ val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return
+ folders = runCatching {
+ val array = JSONArray(raw)
+ (0 until array.length()).map { i ->
+ val o = array.getJSONObject(i)
+ val apps = o.getJSONArray("apps")
+ Folder(o.getString("id"), o.getString("name"), (0 until apps.length()).map { apps.getString(it) })
+ }
+ }.getOrDefault(emptyList())
+ }
+
+ fun create(context: Context, name: String, appKey: String): Folder {
+ val folder = Folder(UUID.randomUUID().toString(), name, listOf(appKey))
+ update(context, without(appKey) + folder)
+ return folder
+ }
+
+ fun add(context: Context, folderId: String, appKey: String) =
+ update(context, without(appKey).map { if (it.id == folderId) it.copy(apps = it.apps + appKey) else it })
+
+ fun remove(context: Context, appKey: String) = update(context, without(appKey))
+
+ fun rename(context: Context, folderId: String, name: String) =
+ update(context, folders.map { if (it.id == folderId) it.copy(name = name) else it })
+
+ fun delete(context: Context, folderId: String) = update(context, folders.filterNot { it.id == folderId })
+
+ fun migrateMembers(context: Context, keyFor: (String) -> String?) {
+ if (folders.none { f -> f.apps.any { '/' !in it } }) return
+ update(context, folders.map { f -> f.copy(apps = f.apps.map { if ('/' in it) it else keyFor(it) ?: it }.distinct()) })
+ }
+
+ private fun without(appKey: String): List =
+ folders.map { it.copy(apps = it.apps - appKey) }.filter { it.apps.isNotEmpty() }
+
+ private fun update(context: Context, next: List) {
+ folders = next
+ val array = JSONArray()
+ for (f in next) array.put(JSONObject().put("id", f.id).put("name", f.name).put("apps", JSONArray(f.apps)))
+ context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply()
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt
new file mode 100644
index 0000000000..70f98f4843
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt
@@ -0,0 +1,26 @@
+package com.droiddeck.launcher
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+object HomeHidden {
+ private const val PREFS = "home_launcher"
+ private const val KEY = "hidden"
+
+ var keys by mutableStateOf>(emptySet())
+ private set
+ private var loaded = false
+
+ fun load(context: Context) {
+ if (loaded) return
+ loaded = true
+ keys = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getStringSet(KEY, emptySet()).orEmpty().toSet()
+ }
+
+ fun set(context: Context, key: String, hidden: Boolean) {
+ keys = if (hidden) keys + key else keys - key
+ context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putStringSet(KEY, keys).apply()
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/HomePins.kt b/app/src/main/java/com/droiddeck/launcher/HomePins.kt
new file mode 100644
index 0000000000..1040995e87
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/HomePins.kt
@@ -0,0 +1,75 @@
+package com.droiddeck.launcher
+
+import android.content.Context
+import android.content.pm.LauncherApps
+import android.content.pm.ShortcutInfo
+import android.graphics.Bitmap
+import android.os.Handler
+import android.os.Looper
+import android.os.Process
+import android.os.UserManager
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+/** Shortcuts other apps asked to put on the home screen. The system keeps the pinned set per launcher. */
+object HomePins {
+ class Pinned(val info: ShortcutInfo, val icon: Bitmap?, val appLabel: String, val userSerial: Long) {
+ val key get() = "pin:${info.`package`}/${info.id}" + if (userSerial != 0L) "#$userSerial" else ""
+ val label get() = info.shortLabel?.toString()?.trim().orEmpty().ifEmpty { appLabel }
+ val work get() = userSerial != 0L
+ }
+
+ var pinned by mutableStateOf>(emptyList())
+ private set
+ private val main = Handler(Looper.getMainLooper())
+ private var listing = 0
+
+ fun refresh(context: Context) {
+ val app = context.applicationContext
+ val seq = ++listing
+ Thread({
+ val list = runCatching { load(app) }.getOrDefault(emptyList())
+ main.post { if (seq == listing) pinned = list }
+ }, "home-pins").start()
+ }
+
+ private fun load(context: Context): List {
+ if (!HomeApp.canUseShortcuts(context)) return emptyList()
+ val launcher = context.getSystemService(LauncherApps::class.java)
+ val users = context.getSystemService(UserManager::class.java)
+ val pm = context.packageManager
+ val own = Process.myUserHandle()
+ val query = LauncherApps.ShortcutQuery().setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED)
+ return users.userProfiles.flatMap { user ->
+ val serial = if (user == own) 0L else users.getSerialNumberForUser(user)
+ runCatching { launcher.getShortcuts(query, user) }.getOrNull().orEmpty()
+ .filter { it.isEnabled && it.isPinned }
+ .map { info ->
+ val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.`package`, 0)).toString() }
+ .getOrDefault(info.`package`)
+ Pinned(info, HomeApp.shortcutIcon(context, info), appLabel, serial)
+ }
+ }
+ }
+
+ fun accept(context: Context, request: LauncherApps.PinItemRequest): Boolean {
+ val ok = runCatching { request.isValid && request.accept() }.getOrDefault(false)
+ if (ok) refresh(context)
+ return ok
+ }
+
+ fun unpin(context: Context, pinned: Pinned) {
+ val info = pinned.info
+ val launcher = context.getSystemService(LauncherApps::class.java)
+ val query = LauncherApps.ShortcutQuery().setPackage(info.`package`).setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED)
+ val unpinned = runCatching {
+ val current = checkNotNull(launcher.getShortcuts(query, info.userHandle))
+ val keep = current.map { it.id } - info.id
+ launcher.pinShortcuts(info.`package`, keep, info.userHandle)
+ }.isSuccess
+ if (!unpinned) return
+ listing++
+ this.pinned = this.pinned.filterNot { it.key == pinned.key }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt
new file mode 100644
index 0000000000..8f79f4354b
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt
@@ -0,0 +1,317 @@
+package com.droiddeck.launcher
+
+import android.app.Activity
+import android.appwidget.AppWidgetHost
+import android.appwidget.AppWidgetHostView
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProviderInfo
+import android.content.Context
+import android.content.Intent
+import android.content.pm.LauncherApps
+import android.graphics.Bitmap
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.SizeF
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.core.graphics.drawable.toBitmap
+import org.json.JSONArray
+import org.json.JSONObject
+import kotlin.math.hypot
+import kotlin.math.roundToInt
+
+object HomeWidgets {
+ data class Placed(val id: Int, val widthDp: Int, val heightDp: Int)
+
+ data class Provider(
+ val info: AppWidgetProviderInfo,
+ val label: String,
+ val appLabel: String,
+ val preview: Bitmap?,
+ val widthDp: Int,
+ val heightDp: Int,
+ )
+
+ private const val HOST_ID = 0x0DDE
+ private const val PREFS = "home_launcher"
+ private const val KEY = "widgets"
+ private const val REQUEST_BIND = 0x0DD1
+ private const val REQUEST_CONFIGURE = 0x0DD2
+ private const val REQUEST_RECONFIGURE = 0x0DD3
+ const val MIN_WIDTH_DP = 96
+ const val MIN_HEIGHT_DP = 56
+
+ var widgets by mutableStateOf>(emptyList())
+ private set
+ var providers by mutableStateOf?>(null)
+ private set
+ private var loaded = false
+ private var host: Host? = null
+ private var pending: AppWidgetProviderInfo? = null
+ private var pendingId = AppWidgetManager.INVALID_APPWIDGET_ID
+ private var pinRequest: LauncherApps.PinItemRequest? = null
+ private val main = Handler(Looper.getMainLooper())
+
+ private class Host(context: Context) : AppWidgetHost(context, HOST_ID) {
+ override fun onCreateView(context: Context, appWidgetId: Int, appWidget: AppWidgetProviderInfo?): AppWidgetHostView =
+ HomeWidgetView(context)
+ }
+
+ class HomeWidgetView(context: Context) : AppWidgetHostView(context) {
+ var onLongPress: (() -> Unit)? = null
+ private var fired = false
+ private var downX = 0f
+ private var downY = 0f
+ private val slop = ViewConfiguration.get(context).scaledTouchSlop
+ private val longPress = Runnable {
+ fired = true
+ performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+ onLongPress?.invoke()
+ }
+
+ override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+ when (ev.actionMasked) {
+ MotionEvent.ACTION_DOWN -> {
+ fired = false
+ downX = ev.x
+ downY = ev.y
+ postDelayed(longPress, ViewConfiguration.getLongPressTimeout().toLong())
+ }
+ MotionEvent.ACTION_MOVE -> if (hypot(ev.x - downX, ev.y - downY) > slop) removeCallbacks(longPress)
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_DOWN -> removeCallbacks(longPress)
+ }
+ return fired
+ }
+
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ if (fired) {
+ if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) fired = false
+ return true
+ }
+ return super.onTouchEvent(event)
+ }
+ }
+
+ private fun host(context: Context): Host = host ?: Host(context.applicationContext).also { host = it }
+
+ fun load(context: Context) {
+ if (loaded) return
+ loaded = true
+ val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return
+ val manager = AppWidgetManager.getInstance(context)
+ val parsed = runCatching {
+ val array = JSONArray(raw)
+ (0 until array.length()).map { i ->
+ val o = array.getJSONObject(i)
+ Placed(o.getInt("id"), o.getInt("w"), o.getInt("h"))
+ }
+ }.getOrDefault(emptyList())
+ val live = parsed.filter { manager.getAppWidgetInfo(it.id) != null }
+ parsed.filterNot { it in live }.forEach { host(context).deleteAppWidgetId(it.id) }
+ widgets = live
+ if (live.size != parsed.size) save(context)
+ }
+
+ fun startListening(context: Context) {
+ load(context)
+ runCatching { host(context).startListening() }
+ }
+
+ fun stopListening(context: Context) {
+ runCatching { host(context).stopListening() }
+ }
+
+ fun info(context: Context, id: Int): AppWidgetProviderInfo? = AppWidgetManager.getInstance(context).getAppWidgetInfo(id)
+
+ fun createView(context: Context, id: Int): HomeWidgetView? {
+ val info = info(context, id) ?: return null
+ return host(context).createView(context, id, info) as? HomeWidgetView
+ }
+
+ fun applySize(view: AppWidgetHostView, widthDp: Int, heightDp: Int) {
+ if (Build.VERSION.SDK_INT >= 31) {
+ view.updateAppWidgetSize(Bundle(), listOf(SizeF(widthDp.toFloat(), heightDp.toFloat())))
+ } else {
+ @Suppress("DEPRECATION")
+ view.updateAppWidgetSize(null, widthDp, heightDp, widthDp, heightDp)
+ }
+ }
+
+ fun loadProviders(context: Context) {
+ if (providers != null) return
+ val app = context.applicationContext
+ Thread({
+ val pm = app.packageManager
+ val manager = AppWidgetManager.getInstance(app)
+ val dpi = app.resources.displayMetrics.densityDpi
+ val list = manager.installedProviders.mapNotNull { info ->
+ runCatching {
+ val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.provider.packageName, 0)).toString() }
+ .getOrDefault(info.provider.packageName)
+ val drawable = info.loadPreviewImage(app, dpi) ?: info.loadIcon(app, dpi)
+ val preview = drawable?.let { d ->
+ val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192
+ val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192
+ val scale = minOf(1f, 360f / maxOf(w, h))
+ d.toBitmap((w * scale).roundToInt().coerceAtLeast(1), (h * scale).roundToInt().coerceAtLeast(1))
+ }
+ val (w, h) = defaultSize(app, info)
+ Provider(info, info.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { appLabel }, appLabel, preview, w, h)
+ }.getOrNull()
+ }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, Provider::appLabel).thenBy(String.CASE_INSENSITIVE_ORDER, Provider::label))
+ main.post { providers = list }
+ }, "widget-providers").start()
+ }
+
+ fun refreshProviders(context: Context) {
+ providers = null
+ loadProviders(context)
+ }
+
+ private fun defaultSize(context: Context, info: AppWidgetProviderInfo): Pair {
+ val density = context.resources.displayMetrics.density
+ var w = (info.minWidth / density).roundToInt()
+ var h = (info.minHeight / density).roundToInt()
+ if (Build.VERSION.SDK_INT >= 31) {
+ if (info.targetCellWidth > 0) w = maxOf(w, info.targetCellWidth * 80)
+ if (info.targetCellHeight > 0) h = maxOf(h, info.targetCellHeight * 80)
+ }
+ return w.coerceIn(160, 560) to h.coerceIn(MIN_HEIGHT_DP, 360)
+ }
+
+ fun minSize(context: Context, id: Int): Pair {
+ val info = info(context, id) ?: return MIN_WIDTH_DP to MIN_HEIGHT_DP
+ val density = context.resources.displayMetrics.density
+ val w = (if (info.minResizeWidth > 0) info.minResizeWidth else info.minWidth) / density
+ val h = (if (info.minResizeHeight > 0) info.minResizeHeight else info.minHeight) / density
+ return w.roundToInt().coerceAtLeast(MIN_WIDTH_DP) to h.roundToInt().coerceAtLeast(MIN_HEIGHT_DP)
+ }
+
+ fun add(activity: Activity, provider: Provider) {
+ if (pendingId == AppWidgetManager.INVALID_APPWIDGET_ID) add(activity, provider.info, null)
+ }
+
+ /** Places a widget another app asked for; its own app has already configured it. */
+ fun addPinned(activity: Activity, request: LauncherApps.PinItemRequest): Boolean {
+ if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) return false
+ val info = request.getAppWidgetProviderInfo(activity) ?: return false
+ load(activity)
+ add(activity, info, request)
+ return pending != null
+ }
+
+ private fun add(activity: Activity, info: AppWidgetProviderInfo, request: LauncherApps.PinItemRequest?) {
+ val h = host(activity)
+ val id = h.allocateAppWidgetId()
+ pending = info
+ pendingId = id
+ pinRequest = request
+ val manager = AppWidgetManager.getInstance(activity)
+ val bound = runCatching { manager.bindAppWidgetIdIfAllowed(id, info.profile, info.provider, null) }.getOrDefault(false)
+ if (bound) {
+ bound(activity, id, info)
+ return
+ }
+ val bind = Intent(AppWidgetManager.ACTION_APPWIDGET_BIND)
+ .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
+ .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, info.provider)
+ .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE, info.profile)
+ @Suppress("DEPRECATION")
+ runCatching { activity.startActivityForResult(bind, REQUEST_BIND) }.onFailure { abandon(activity) }
+ }
+
+ private fun bound(activity: Activity, id: Int, info: AppWidgetProviderInfo) {
+ val request = pinRequest
+ if (request == null) {
+ configure(activity, id, info)
+ return
+ }
+ val accepted = runCatching { request.isValid && request.accept(Bundle().apply { putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, id) }) }
+ .getOrDefault(false)
+ if (accepted) place(activity, id, info) else abandon(activity)
+ }
+
+ private fun configure(activity: Activity, id: Int, info: AppWidgetProviderInfo) {
+ val optional = Build.VERSION.SDK_INT >= 31 &&
+ info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_CONFIGURATION_OPTIONAL != 0
+ if (info.configure == null || optional) {
+ place(activity, id, info)
+ return
+ }
+ runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_CONFIGURE, null) }
+ .onFailure { place(activity, id, info) }
+ }
+
+ fun canReconfigure(context: Context, id: Int): Boolean {
+ val info = info(context, id) ?: return false
+ if (info.configure == null) return false
+ return Build.VERSION.SDK_INT < 28 || info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE != 0
+ }
+
+ fun reconfigure(activity: Activity, id: Int) {
+ runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_RECONFIGURE, null) }
+ }
+
+ fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int): Boolean {
+ when (requestCode) {
+ REQUEST_BIND -> {
+ val info = pending
+ if (resultCode == Activity.RESULT_OK && info != null) bound(activity, pendingId, info) else abandon(activity)
+ }
+ REQUEST_CONFIGURE -> {
+ val info = pending
+ if (resultCode == Activity.RESULT_OK && info != null) place(activity, pendingId, info) else abandon(activity)
+ }
+ REQUEST_RECONFIGURE -> Unit
+ else -> return false
+ }
+ return true
+ }
+
+ private fun abandon(context: Context) {
+ if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) host(context).deleteAppWidgetId(pendingId)
+ pending = null
+ pinRequest = null
+ pendingId = AppWidgetManager.INVALID_APPWIDGET_ID
+ }
+
+ private fun place(context: Context, id: Int, info: AppWidgetProviderInfo) {
+ val (w, h) = defaultSize(context, info)
+ pending = null
+ pinRequest = null
+ pendingId = AppWidgetManager.INVALID_APPWIDGET_ID
+ widgets = widgets + Placed(id, w, h)
+ save(context)
+ }
+
+ fun resize(context: Context, id: Int, widthDp: Int, heightDp: Int) {
+ widgets = widgets.map { if (it.id == id) it.copy(widthDp = widthDp, heightDp = heightDp) else it }
+ save(context)
+ }
+
+ fun move(context: Context, id: Int, by: Int) {
+ val i = widgets.indexOfFirst { it.id == id }
+ val j = i + by
+ if (i < 0 || j !in widgets.indices) return
+ widgets = widgets.toMutableList().apply { add(j, removeAt(i)) }
+ save(context)
+ }
+
+ fun remove(context: Context, id: Int) {
+ host(context).deleteAppWidgetId(id)
+ widgets = widgets.filterNot { it.id == id }
+ save(context)
+ }
+
+ private fun save(context: Context) {
+ val array = JSONArray()
+ for (w in widgets) array.put(JSONObject().put("id", w.id).put("w", w.widthDp).put("h", w.heightDp))
+ context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply()
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt
new file mode 100644
index 0000000000..44fce026a9
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt
@@ -0,0 +1,328 @@
+package com.droiddeck.launcher
+
+import android.app.ActivityOptions
+import android.app.AppOpsManager
+import android.app.PictureInPictureParams
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.os.Process
+import android.provider.Settings
+import android.util.Rational
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.setContent
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.droiddeck.launcher.core.AppLanguage
+import com.droiddeck.launcher.core.GlobalSettings
+import com.droiddeck.launcher.core.WirelessAdbPairingService
+import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage
+import com.droiddeck.launcher.ui.DroidDeckTheme
+import com.droiddeck.launcher.ui.LocalPalette
+import com.droiddeck.launcher.ui.PrimaryButton
+import com.droiddeck.launcher.ui.SecondaryButton
+import kotlinx.coroutines.delay
+
+class PairingGuideActivity : ComponentActivity() {
+ enum class Step { BUILD_NUMBER, WIRELESS_DEBUGGING, PAIR, CODE, WORKING, DONE, FAILED }
+
+ private var settingsDisplay: Int? = null
+ private var inPip by mutableStateOf(false)
+ private var launchPending = false
+
+ override fun attachBaseContext(newBase: Context) = super.attachBaseContext(AppLanguage.wrap(newBase))
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 }
+ setContent { DroidDeckTheme { Guide() } }
+ launchPending = savedInstanceState == null
+ }
+
+ override fun onNewIntent(intent: Intent) {
+ super.onNewIntent(intent)
+ setIntent(intent)
+ settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 }
+ launchPending = true
+ }
+
+ override fun onResume() {
+ super.onResume()
+ if (!launchPending) return
+ if (inPip || settingsDisplay != null) {
+ launchSettings()
+ return
+ }
+ enterPip()
+ if (!inPip) launchSettings()
+ }
+
+ override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
+ super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+ inPip = isInPictureInPictureMode
+ if (isInPictureInPictureMode && launchPending) launchSettings()
+ }
+
+ private fun launchSettings() {
+ launchPending = false
+ openSettings(stepFor(this, WirelessAdbPairingService.stage.value))
+ }
+
+ private fun enterPip() {
+ inPip = runCatching {
+ enterPictureInPictureMode(PictureInPictureParams.Builder().setAspectRatio(Rational(4, 3)).build())
+ }.getOrDefault(false)
+ }
+
+ private fun openSettings(step: Step) {
+ val intent = if (step == Step.BUILD_NUMBER) {
+ Intent(Settings.ACTION_DEVICE_INFO_SETTINGS).putExtra(HIGHLIGHT_KEY, "build_number")
+ } else {
+ Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS).putExtra(HIGHLIGHT_KEY, "toggle_adb_wireless")
+ }.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ val display = settingsDisplay
+ runCatching {
+ if (display == null) startActivity(intent)
+ else startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle())
+ }.onFailure {
+ runCatching { startActivity(Intent(Settings.ACTION_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) }
+ }
+ }
+
+ private fun returnToApp() {
+ startActivity(Intent(this, FrontEndActivity::class.java)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT))
+ finish()
+ }
+
+ @Composable
+ private fun Guide() {
+ val stage by WirelessAdbPairingService.stage.collectAsState()
+ val settingsState by produceState(SettingsState.read(this)) {
+ while (true) {
+ value = SettingsState.read(this@PairingGuideActivity)
+ delay(500)
+ }
+ }
+ val step = stepFor(settingsState, stage)
+ var previous by remember { mutableStateOf(step) }
+ LaunchedEffect(step) {
+ if (previous == Step.BUILD_NUMBER && step == Step.WIRELESS_DEBUGGING) openSettings(step)
+ previous = step
+ when (step) {
+ Step.DONE -> { delay(1_500); returnToApp() }
+ Step.FAILED -> { delay(3_000); returnToApp() }
+ else -> Unit
+ }
+ }
+ LaunchedEffect(stage) { if (stage == Stage.Idle) finish() }
+ BackHandler(enabled = !inPip && settingsDisplay == null) { enterPip() }
+
+ Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background), contentAlignment = Alignment.Center) {
+ if (inPip) CompactStep(step, stage)
+ else FullGuide(step, stage)
+ }
+ }
+
+ @Composable
+ private fun CompactStep(step: Step, stage: Stage) {
+ Column(Modifier.fillMaxSize().padding(10.dp), verticalArrangement = Arrangement.SpaceBetween) {
+ Text(
+ instruction(step, stage), style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.SemiBold,
+ color = MaterialTheme.colorScheme.onBackground, maxLines = 3, overflow = TextOverflow.Ellipsis,
+ )
+ StepVisual(step, compact = true)
+ StepDots(step)
+ }
+ }
+
+ @Composable
+ private fun FullGuide(step: Step, stage: Stage) {
+ Column(
+ Modifier.widthIn(max = 520.dp).fillMaxWidth().padding(24.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp),
+ ) {
+ Text(stringResource(R.string.gate_title), style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground)
+ Text(instruction(step, stage), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onBackground)
+ StepVisual(step, compact = false)
+ StepDots(step)
+ Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+ if (step == Step.DONE || step == Step.FAILED) {
+ PrimaryButton(stringResource(R.string.common_back), onClick = ::returnToApp)
+ } else {
+ PrimaryButton(stringResource(R.string.gate_open_dev), onClick = {
+ if (settingsDisplay == null) enterPip()
+ openSettings(step)
+ })
+ SecondaryButton(stringResource(R.string.common_cancel), onClick = {
+ WirelessAdbPairingService.cancel(this@PairingGuideActivity)
+ returnToApp()
+ })
+ }
+ }
+ }
+ }
+
+ @Composable
+ private fun instruction(step: Step, stage: Stage): String = when (step) {
+ Step.BUILD_NUMBER -> stringResource(R.string.pairguide_build_number)
+ Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_wireless)
+ Step.PAIR -> stringResource(R.string.pairguide_pair)
+ Step.CODE -> (stage as? Stage.CodeNeeded)?.error ?: stringResource(R.string.gate_step3)
+ Step.WORKING -> (stage as? Stage.Working)?.step ?: stringResource(R.string.adbpair_title_working)
+ Step.DONE -> stringResource(R.string.adbpair_title_done)
+ Step.FAILED -> (stage as? Stage.Failed)?.error ?: stringResource(R.string.adbpair_title_failed)
+ }
+
+ @Composable
+ private fun StepVisual(step: Step, compact: Boolean) {
+ val colors = MaterialTheme.colorScheme
+ val accent = LocalPalette.current.signal
+ val pulse = rememberInfiniteTransition(label = "guidePulse")
+ val beat by pulse.animateFloat(0f, 1f, infiniteRepeatable(tween(900, easing = LinearEasing), RepeatMode.Restart), label = "beat")
+ val label = when (step) {
+ Step.BUILD_NUMBER -> stringResource(R.string.pairguide_row_build_number)
+ Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_row_wireless)
+ Step.PAIR -> stringResource(R.string.pairguide_row_pair)
+ Step.CODE -> stringResource(R.string.adbpair_enter_code)
+ Step.WORKING, Step.DONE, Step.FAILED -> return
+ }
+ val rowHeight = if (compact) 34.dp else 56.dp
+ Row(
+ Modifier.fillMaxWidth().height(rowHeight).background(colors.surfaceVariant, RoundedCornerShape(10.dp))
+ .border(1.dp, accent.copy(alpha = 0.35f), RoundedCornerShape(10.dp)).padding(horizontal = 10.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(label, style = if (compact) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodyLarge,
+ color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f))
+ when (step) {
+ Step.WIRELESS_DEBUGGING -> Toggle(on = beat > 0.5f, accent = accent, compact = compact)
+ else -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+ if (step == Step.BUILD_NUMBER) Text("×7", style = MaterialTheme.typography.labelLarge, color = accent)
+ Box(contentAlignment = Alignment.Center) {
+ Box(Modifier.size(if (compact) 18.dp else 26.dp).scale(0.6f + beat * 0.8f).alpha(1f - beat)
+ .background(accent, CircleShape))
+ Box(Modifier.size(if (compact) 8.dp else 12.dp).background(accent, CircleShape))
+ }
+ }
+ }
+ }
+ }
+
+ @Composable
+ private fun Toggle(on: Boolean, accent: Color, compact: Boolean) {
+ val width = if (compact) 26.dp else 40.dp
+ val knob = if (compact) 12.dp else 18.dp
+ Box(
+ Modifier.width(width).height(knob + 4.dp)
+ .background(if (on) accent.copy(alpha = 0.6f) else MaterialTheme.colorScheme.outline, CircleShape).padding(2.dp),
+ contentAlignment = if (on) Alignment.CenterEnd else Alignment.CenterStart,
+ ) { Box(Modifier.size(knob).background(Color.White, CircleShape)) }
+ }
+
+ @Composable
+ private fun StepDots(step: Step) {
+ val accent = LocalPalette.current.signal
+ val shown = listOf(Step.BUILD_NUMBER, Step.WIRELESS_DEBUGGING, Step.PAIR, Step.CODE)
+ val at = shown.indexOf(step).takeIf { it >= 0 } ?: shown.size
+ Row(horizontalArrangement = Arrangement.spacedBy(5.dp), verticalAlignment = Alignment.CenterVertically) {
+ shown.forEachIndexed { index, _ ->
+ Box(Modifier.size(if (index == at) 8.dp else 6.dp)
+ .background(if (index <= at) accent else MaterialTheme.colorScheme.outline, CircleShape))
+ }
+ Spacer(Modifier.width(2.dp))
+ }
+ }
+
+ private data class SettingsState(val developerOptions: Boolean, val wirelessDebugging: Boolean) {
+ companion object {
+ fun read(context: Context) = SettingsState(
+ GlobalSettings.developerOptionsOn(context),
+ GlobalSettings.wirelessDebuggingOn(context),
+ )
+ }
+ }
+
+ companion object {
+ private const val EXTRA_DISPLAY = "settingsDisplay"
+ private const val HIGHLIGHT_KEY = ":settings:fragment_args_key"
+
+ private fun stepFor(context: Context, stage: Stage) = stepFor(SettingsState.read(context), stage)
+
+ private fun stepFor(settings: SettingsState, stage: Stage): Step = when (stage) {
+ is Stage.Working -> Step.WORKING
+ Stage.Done -> Step.DONE
+ is Stage.Failed -> Step.FAILED
+ is Stage.CodeNeeded -> Step.CODE
+ else -> when {
+ !settings.developerOptions -> Step.BUILD_NUMBER
+ !settings.wirelessDebugging -> Step.WIRELESS_DEBUGGING
+ else -> Step.PAIR
+ }
+ }
+
+ fun canFloat(context: Context): Boolean {
+ if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) return false
+ val ops = context.getSystemService(AppOpsManager::class.java) ?: return true
+ val mode = if (Build.VERSION.SDK_INT >= 29) {
+ ops.unsafeCheckOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName)
+ } else {
+ @Suppress("DEPRECATION")
+ ops.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName)
+ }
+ return mode == AppOpsManager.MODE_ALLOWED
+ }
+
+ fun start(context: Context, settingsDisplay: Int?): Boolean {
+ if (settingsDisplay == null && !canFloat(context)) return false
+ context.startActivity(Intent(context, PairingGuideActivity::class.java)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ .apply { if (settingsDisplay != null) putExtra(EXTRA_DISPLAY, settingsDisplay) })
+ return true
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt
new file mode 100644
index 0000000000..ca8d382fee
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt
@@ -0,0 +1,82 @@
+package com.droiddeck.launcher
+
+import android.content.Intent
+import android.content.pm.LauncherApps
+import android.graphics.Bitmap
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.core.graphics.drawable.toBitmap
+import com.droiddeck.launcher.core.AppUiPrefs
+import com.droiddeck.launcher.ui.DroidDeckTheme
+import com.droiddeck.launcher.ui.PinRequestPrompt
+
+class PinRequestActivity : ComponentActivity() {
+ override fun attachBaseContext(newBase: android.content.Context) {
+ super.attachBaseContext(newBase)
+ com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase)
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val request = runCatching { getSystemService(LauncherApps::class.java).getPinItemRequest(intent) }.getOrNull()
+ if (request == null || !request.isValid) {
+ finish()
+ return
+ }
+ val prompt = when (request.requestType) {
+ LauncherApps.PinItemRequest.REQUEST_TYPE_SHORTCUT -> request.shortcutInfo?.let { info ->
+ val appLabel = appLabel(info.`package`)
+ Triple(info.shortLabel?.toString().orEmpty().ifEmpty { appLabel }, appLabel, HomeApp.shortcutIcon(this, info))
+ }
+ LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET -> request.getAppWidgetProviderInfo(this)?.let { info ->
+ val appLabel = appLabel(info.provider.packageName)
+ val dpi = resources.displayMetrics.densityDpi
+ val icon = runCatching { (info.loadPreviewImage(this, dpi) ?: info.loadIcon(this, dpi))?.let(::scaled) }.getOrNull()
+ Triple(info.loadLabel(packageManager)?.toString().orEmpty().ifEmpty { appLabel }, appLabel, icon)
+ }
+ else -> null
+ }
+ if (prompt == null) {
+ finish()
+ return
+ }
+ val (label, appLabel, icon) = prompt
+ val widget = request.requestType == LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET
+ setContent {
+ DroidDeckTheme(appScale = AppUiPrefs.scale(this)) {
+ PinRequestPrompt(
+ label = label, appLabel = appLabel, icon = icon, wide = widget,
+ onAdd = {
+ if (!widget) {
+ HomePins.accept(this, request)
+ finish()
+ } else if (!HomeWidgets.addPinned(this, request)) finish()
+ },
+ onCancel = { finish() },
+ )
+ }
+ }
+ }
+
+ @Suppress("OVERRIDE_DEPRECATION")
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) {
+ finish()
+ return
+ }
+ @Suppress("DEPRECATION")
+ super.onActivityResult(requestCode, resultCode, data)
+ }
+
+ private fun appLabel(packageName: String): String =
+ runCatching { packageManager.getApplicationLabel(packageManager.getApplicationInfo(packageName, 0)).toString() }
+ .getOrDefault(packageName)
+
+ private fun scaled(d: android.graphics.drawable.Drawable): Bitmap {
+ val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192
+ val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192
+ val k = minOf(1f, 480f / maxOf(w, h))
+ return d.toBitmap((w * k).toInt().coerceAtLeast(1), (h * k).toInt().coerceAtLeast(1))
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt
index 5e49b5cf5d..8e8efc80c2 100644
--- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt
@@ -20,10 +20,19 @@ internal class ProtonMenu(
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)
+ // Install workers and their results outlive the activity that starts them.
+ private object Operation {
+ val rows = mutableStateOf>(emptyList())
+ val busyId = mutableStateOf(null)
+ val stage = mutableStateOf(null)
+ val percent = mutableIntStateOf(-1)
+ val problem = mutableStateOf(null)
+ }
+ var protonRows by Operation.rows
+ var protonBusyId by Operation.busyId
+ var protonStage by Operation.stage
+ var protonPercent by Operation.percent
+ var protonProblem by Operation.problem
private val checking = java.util.concurrent.atomic.AtomicBoolean(false)
@VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? =
{ tool, progress -> ProtonExtras.install(activity, tool, progress) }
@@ -33,6 +42,7 @@ internal class ProtonMenu(
if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return
ProtonExtras.unqueue(activity, tool)
protonBusyId = id
+ protonProblem = null
protonStage = activity.getString(R.string.store_starting)
protonPercent = -1
Thread({
@@ -41,7 +51,9 @@ internal class ProtonMenu(
ui.post { protonStage = label; protonPercent = value }
}
}.getOrElse { it.message ?: it.javaClass.simpleName }
+ if (problem == null && !automatic && tool.id == ProtonExtras.OWN) ProtonExtras.setDeclined(activity, false)
ui.post {
+ protonProblem = problem
protonBusyId = null
protonStage = null
protonPercent = -1
@@ -59,10 +71,12 @@ internal class ProtonMenu(
val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return
if (protonBusyId != null || SessionState.running) return
protonBusyId = id
+ protonProblem = null
protonStage = activity.getString(R.string.main_removing_named, dir ?: tool.name)
protonPercent = -1
Thread({
if (older) ProtonExtras.removeOlder(activity, tool) else ProtonExtras.remove(activity, tool, dir)
+ if (tool.id == ProtonExtras.OWN && ProtonExtras.installedAll(activity, tool).isEmpty()) ProtonExtras.setDeclined(activity, true)
ui.post {
protonBusyId = null
protonStage = null
@@ -94,9 +108,23 @@ internal class ProtonMenu(
ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() ||
SessionState.phase !in setOf(SessionPhase.IDLE, SessionPhase.FAILED) ||
!LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return
+ if (ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size > 1) {
+ protonBusyId = ProtonExtras.OWN
+ protonProblem = null
+ Thread({
+ ProtonExtras.tidy(activity)
+ val tidied = ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size <= 1
+ ui.post {
+ protonBusyId = null
+ refreshProtons()
+ if (tidied) ensureAutoUpdates()
+ }
+ }, "proton-tidy").start()
+ return
+ }
val attempts = activity.getSharedPreferences("proton-auto-updates", android.content.Context.MODE_PRIVATE)
val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool ->
- val update = ProtonExtras.update(activity, tool) ?: return@firstNotNullOfOrNull null
+ val update = ProtonExtras.update(activity, tool) ?: ProtonExtras.missing(activity, tool) ?: return@firstNotNullOfOrNull null
val previous = attempts.getLong("${tool.id}.at", 0L)
if (attempts.getString("${tool.id}.tag", null) != update || now - previous !in 0 until 15L * 60 * 1000) tool to update else null
} ?: return
diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index f149d93565..9ff4f2496d 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -9,6 +9,7 @@ import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.os.Environment
+import android.database.ContentObserver
import android.os.Handler
import android.os.Looper
import android.os.SystemClock
@@ -67,6 +68,7 @@ import com.droiddeck.launcher.gpu.ScreenEffects
import com.droiddeck.launcher.gpu.Lossless
import com.droiddeck.launcher.gpu.TurnipDriver
import com.droiddeck.launcher.input.EvdevKeys
+import com.droiddeck.launcher.input.HomeGuideInput
import com.droiddeck.launcher.input.InputSpace
import com.droiddeck.launcher.input.KeyboardHost
import com.droiddeck.launcher.input.ControllerPrefs
@@ -75,8 +77,10 @@ import com.droiddeck.launcher.input.OnScreenControls
import com.droiddeck.launcher.input.PadBridge
import com.droiddeck.launcher.input.PadMouse
import com.droiddeck.launcher.input.PadState
+import com.droiddeck.launcher.input.ScreenKeys
import com.droiddeck.launcher.input.SteamControllerBle
import com.droiddeck.launcher.input.DirectTouchHold
+import com.droiddeck.launcher.input.GestureTouchStreamGate
import com.droiddeck.launcher.input.PointerGestures
import com.droiddeck.launcher.input.SecondScreenDisplay
import com.droiddeck.launcher.input.SecondScreenDisplays
@@ -155,6 +159,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private lateinit var sessionOverlay: ComposeView
private lateinit var loading: LoadingState
private lateinit var hud: PerfHud
+ private lateinit var memoryHud: com.droiddeck.launcher.session.MemoryHud
private var padBridge: PadBridge? = null
private var joyConVr: com.droiddeck.launcher.input.JoyConVr? = null
private var handCamera: com.droiddeck.launcher.handtracking.HandCamera? = null
@@ -198,10 +203,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig()
private var gestureGame: String? = null
private var gestureSettingsOpen by mutableStateOf(false)
+ private var screenKeyPickerOpen by mutableStateOf(false)
+ private var screenKeyBind: List? = null
+ private var screenKeyDir: Int? = null
+ private var screenKeyTextFocus = false
+ private var screenKeyEdit by mutableStateOf(null)
+ private var screenLayoutsOpen by mutableStateOf(false)
+ private var screenKeysShown by mutableStateOf(true)
+ private var screenLayoutNames by mutableStateOf(listOf())
+ private var screenKeys: ScreenKeys? = null
private var recognizedGesture by mutableStateOf(null)
private var gesturePointerX = 0f
private var gesturePointerY = 0f
private var gesturePointerReady = false
+ private val gestureTouchStreamGate = GestureTouchStreamGate()
private val clearRecognizedGesture = Runnable { recognizedGesture = null }
private val gestureKeysDown = mutableSetOf()
private lateinit var scrollTouch: ScrollTouchGestures
@@ -244,6 +259,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false }
private val uiHandler = Handler(Looper.getMainLooper())
private var pendingBackAction: Runnable? = null
+ private val backQamInput = com.droiddeck.launcher.input.BackQamInput(
+ setPressed = { padBridge?.setBackQamPressed(it) },
+ onTap = { performBackAction(double = it) },
+ doubleTapMs = { backDoubleTapMs.toLong() },
+ onCancel = { padBridge?.cancelBackQam() },
+ )
private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN
private var drawerDirectionDownTime = 0L
private var drawerDirectionDeviceId = -1
@@ -270,6 +291,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
}
private val resumeKeysDown = mutableSetOf>()
+ private val drawerShortcutKeysDown = mutableSetOf>()
private var drawerOpen by mutableStateOf(false)
private var quitFrom by mutableStateOf(null)
@@ -280,6 +302,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var drawerDefaultProton by mutableStateOf(null)
private val drawerComponentMenu by lazy { ComponentsMenu(this, uiHandler) }
private var drawerGameProfileId by mutableStateOf(null)
+
+ private fun noSteamSession(): Boolean = SessionState.mode == SessionService.MODE_RUN &&
+ SessionState.program in setOf(com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.EPIC)
private val drawerGameInventory = GameProfileInventoryCache()
private var drawerGameInventoryRevision = 0L
private var drawerGameFexPresetSaving by mutableStateOf(false)
@@ -301,8 +326,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER)
private var drawerControllerActive by mutableStateOf(false)
private var backActionsInverted by mutableStateOf(false)
- private var lowLatencyController by mutableStateOf(false)
- private var lowLatencyTouch by mutableStateOf(false)
+ private var backDoubleTapMs by mutableStateOf(500)
+ private var lowLatency by mutableStateOf(true)
private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK)
private var pcKeyboardOpen by mutableStateOf(false)
private var achievementsInFront by mutableStateOf(null)
@@ -409,6 +434,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
}
+ // A higher refresh rate allowed in Android's settings does not change the display while this window
+ // still asks for a lower mode, so the mode is chosen again when the setting changes.
+ private val refreshSettingObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
+ override fun onChange(selfChange: Boolean) {
+ applyOutputPacing()
+ }
+ }
+
private fun followPanelRefresh(displayId: Int) {
if (!CompositorHost.isStarted) return
val output = glassesScreen?.display
@@ -430,6 +463,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
override fun onInputDeviceRemoved(deviceId: Int) {
Log.i(TAG, "input device $deviceId disconnected")
+ backQamInput.onDeviceRemoved(deviceId)
joyConVr?.refresh()
padBridge?.onDeviceRemoved(deviceId)
if (::padMouse.isInitialized) padMouse.reset()
@@ -481,11 +515,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
com.droiddeck.launcher.gpu.SteamVrHealth.begin(this, SessionState.sessionId)
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
- if (!SessionState.running) {
- SessionState.fpsLimit = SessionPrefs.fpsLimit(
- this, SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM),
- )
- }
applyOutputPacing()
if (!SessionState.running) SessionState.followScreen = followChoice()
applyFollowOrientation(resources.configuration)
@@ -516,6 +545,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
bridge.setSelectSteam(ControllerPrefs.read(this).selectSteam)
bridge.setBuiltinPad(SessionState.mode != SessionService.MODE_STEAM || SessionPrefs.builtinPad(this))
padBridge = bridge
+ bridge.setOnChordInput(backQamInput::onChordInput)
SessionState.padBridge = bridge
if (Build.VERSION.SDK_INT >= 31) {
val vr = com.droiddeck.launcher.input.JoyConVr(this, File(filesDir, ".wayland-rt/${com.droiddeck.launcher.input.JoyConVr.FILE}")) { taken, released ->
@@ -540,7 +570,28 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
uiHandler.removeCallbacks(cursorHide)
cursorVisible = false
}
- onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) }
+ onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { controls ->
+ controls.onTouchMiss = miss@{ event ->
+ if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss
+ event.offsetLocation(controls.left - surfaceView.left.toFloat(), controls.top - surfaceView.top.toFloat())
+ onTouchEvent(event)
+ }
+ root.addView(controls)
+ }
+ screenKeysShown = com.droiddeck.launcher.input.ControllerPrefs.screenKeysShown(this)
+ screenKeys = ScreenKeys(this) { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down) }.also { keys ->
+ keys.onTouchMiss = miss@{ event ->
+ if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss
+ event.offsetLocation(keys.left - surfaceView.left.toFloat(), keys.top - surfaceView.top.toFloat())
+ onTouchEvent(event)
+ }
+ keys.onAdd = { screenKeyPickerOpen = true }
+ keys.onSelect = { codes -> screenKeyEdit = screenKeys?.stateOf(codes) }
+ keys.onEditingChanged = { if (!it) screenKeyEdit = null }
+ keys.steamStyle = { steamTouchControls?.style }
+ keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE
+ root.addView(keys)
+ }
keyboard = KeyboardHost(this).also { root.addView(it) }
touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener)
directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) {
@@ -555,7 +606,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
// game surface and on-screen buttons, in either finger-down order.
root.isMotionEventSplittingEnabled = true
surfaceView.setOnTouchListener { _, event ->
- routedTouchMode == SessionPrefs.TOUCH_GESTURES && onTouchEvent(event)
+ if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) {
+ false
+ } else if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) {
+ false
+ } else onTouchEvent(event)
}
padMouse = PadMouse(padMouseListener)
bridge.setTouchRoute(object : PadBridge.TouchRoute {
@@ -579,17 +634,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val needResume = !needRuntime && com.droiddeck.launcher.runtime.DesktopCatalog.interrupted(this).isNotEmpty()
val needDesktop = intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_DESKTOP &&
(repair || !com.droiddeck.launcher.runtime.DesktopCatalog.desktopInstalled(this))
- val needProton = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM &&
- com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this)
+ val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM)
+ val protonUser = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM ||
+ program == com.droiddeck.launcher.runtime.BattleNet.PROGRAM || program == com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN
+ val needProton = protonUser && com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this)
if (needRuntime || needResume || needDesktop || needProton) installThenStart(needRuntime, needDesktop, needProton, needResume)
}
hud = PerfHud(this)
+ memoryHud = com.droiddeck.launcher.session.MemoryHud(this)
hud.onPresentingWindowChanged = {
if (FrameGen.engine(this) != FrameGen.ENGINE_OFF) CompositorHost.rearmFrameGen { applyFrameGen() }
}
if (SessionState.running && SessionState.firstFrameSeen) {
loading.visible = false
hud.start()
+ memoryHud.start()
}
readPrefs()
@@ -684,7 +743,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) {
CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density,
cursorImage, cursorHotX, cursorHotY, cursorImageScale)
- if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity)
+ val hudLines = listOf(hud.text, memoryHud.text).filter { it.isNotEmpty() }
+ if (hudLines.isNotEmpty() || hud.graph.size >= 2)
+ HudText(hudLines.joinToString("\n"), hud.graph, hudColor, hudOpacity)
val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen
if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking)
if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) {
@@ -739,7 +800,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) {
if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) {
+ backQamInput.cancel()
+ com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this@SessionActivity)
cancelTouchGestures()
+ screenKeys?.stopEditing()
}
}
com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture)
@@ -748,6 +812,84 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onDismiss = { gestureSettingsOpen = false },
onSaved = { gestureSettingsOpen = false; refreshGestureConfig() },
)
+ if (screenKeyPickerOpen) {
+ val dir = screenKeyDir
+ com.droiddeck.launcher.ui.ScreenKeyPicker(
+ initial = if (dir != null) {
+ listOfNotNull((screenKeyEdit?.codes?.getOrNull(dir) ?: 0).takeIf { it != 0 })
+ } else {
+ screenKeyBind ?: emptyList()
+ },
+ onDismiss = { screenKeyPickerOpen = false; screenKeyBind = null; screenKeyDir = null },
+ onAdd = { codes ->
+ val bind = screenKeyBind
+ if (dir != null && bind != null) {
+ screenKeys?.setDirection(bind, dir, codes.lastOrNull() ?: 0)?.let { screenKeyEdit = it }
+ } else if (bind != null) {
+ screenKeys?.setCodes(bind, codes)?.let { screenKeyEdit = it }
+ } else {
+ screenKeys?.add(codes)
+ screenKeyEdit = screenKeys?.stateOf(codes)
+ }
+ screenKeyPickerOpen = false
+ screenKeyBind = null
+ screenKeyDir = null
+ },
+ )
+ }
+ screenKeyEdit?.let { key ->
+ com.droiddeck.launcher.ui.ScreenKeyEditor(
+ codes = key.codes, keyY = key.y,
+ size = key.size, opacity = key.opacity, shape = key.shape, toggle = key.toggle,
+ labels = key.labels,
+ text = key.text, hasImage = key.image.isNotEmpty(),
+ onResize = { screenKeys?.resize(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onOpacity = { screenKeys?.setOpacity(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onShape = { screenKeys?.setShape(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onToggle = { on -> screenKeys?.setToggle(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onLabels = { on -> screenKeys?.setLabels(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onDirection = { index -> screenKeyBind = key.codes; screenKeyDir = index; screenKeyPickerOpen = true },
+ onText = { screenKeys?.setText(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onImage = { screenKeys?.setImage(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onClearImage = { screenKeys?.setImage(key.codes, ""); screenKeyEdit = screenKeys?.stateOf(key.codes) },
+ onBind = { screenKeyBind = key.codes; screenKeyDir = null; screenKeyPickerOpen = true },
+ onTextFocus = { screenKeyTextFocus = true; keyboard?.hide() },
+ onTextBlur = { screenKeyTextFocus = false },
+ onRemove = { screenKeys?.remove(key.codes); screenKeyEdit = null },
+ onDismiss = { screenKeyEdit = null; screenKeyTextFocus = false; screenKeys?.deselect() },
+ )
+ }
+ if (screenLayoutsOpen) com.droiddeck.launcher.ui.ScreenLayoutPanel(
+ layouts = screenLayoutNames,
+ onSave = { name ->
+ screenKeys?.let { keys ->
+ com.droiddeck.launcher.input.ControllerPrefs.saveScreenLayout(this@SessionActivity, name, keys.export())
+ }
+ screenLayoutNames = layoutNames()
+ },
+ onLoad = { name ->
+ com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this@SessionActivity)[name]?.let { screenKeys?.load(it) }
+ screenLayoutsOpen = false
+ },
+ onDelete = { name ->
+ com.droiddeck.launcher.input.ControllerPrefs.deleteScreenLayout(this@SessionActivity, name)
+ screenLayoutNames = layoutNames()
+ },
+ onImport = { text ->
+ val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels
+ val keys = com.droiddeck.launcher.input.importScreenLayout(text, width, resources.displayMetrics.density)
+ if (keys != null) {
+ screenKeys?.load(com.droiddeck.launcher.input.ControllerPrefs.encodeScreenKeys(keys))
+ screenLayoutsOpen = false
+ }
+ },
+ exportText = {
+ val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels
+ val keys = com.droiddeck.launcher.input.ControllerPrefs.decodeScreenKeys(screenKeys?.export().orEmpty())
+ com.droiddeck.launcher.input.exportScreenLayout(keys, width, resources.displayMetrics.density)
+ },
+ onDismiss = { screenLayoutsOpen = false },
+ )
androidx.compose.runtime.LaunchedEffect(drawerOpen) {
if (drawerOpen) {
syncLossless()
@@ -794,6 +936,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
)
SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions(
steam = SessionState.mode == SessionService.MODE_STEAM,
+ direct = noSteamSession(),
title = if (SessionState.mode == SessionService.MODE_RUN)
com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null,
isHomeApp = isHomeApp,
@@ -899,20 +1042,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
padType = id
},
backActionsInverted = backActionsInverted,
+ backDoubleTapMs = backDoubleTapMs,
+ onBackDoubleTapMs = { ms ->
+ SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms)
+ backDoubleTapMs = ms
+ },
onBackActionsInverted = { inverted ->
SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted)
backActionsInverted = inverted
},
- lowLatencyController = lowLatencyController,
- lowLatencyTouch = lowLatencyTouch,
- onLowLatencyController = { on ->
- SessionPrefs.setLowLatencyController(this@SessionActivity, on)
- lowLatencyController = on
- applyLowLatency()
- },
- onLowLatencyTouch = { on ->
- SessionPrefs.setLowLatencyTouch(this@SessionActivity, on)
- lowLatencyTouch = on
+ lowLatency = lowLatency,
+ onLowLatency = { on ->
+ SessionPrefs.setLowLatency(this@SessionActivity, on)
+ lowLatency = on
applyLowLatency()
},
onOsc = { v ->
@@ -938,6 +1080,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
},
onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() },
onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true },
+ onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() },
+ screenKeysShown = screenKeysShown,
+ onScreenKeysShown = { shown ->
+ screenKeysShown = shown
+ com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown)
+ screenKeys?.stopEditing()
+ screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE
+ },
+ onScreenLayouts = {
+ drawerOpen = false
+ screenLayoutNames = layoutNames()
+ screenLayoutsOpen = true
+ },
onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() },
onSecondScreenMode = ::selectSecondScreenMode,
onSecondScreenDisplay = ::selectSecondScreenDisplay,
@@ -963,7 +1118,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
pipAutoEnter = on
pip.refresh(true)
},
- unfoldedControls = if (com.droiddeck.launcher.session.SessionDisplay.foldable(this@SessionActivity)) unfoldedControls else null,
+ unfoldedControls = unfoldedControls,
onUnfoldedControls = ::chooseUnfoldedControls,
unfoldedControlsWithController = unfoldedControlsWithController,
onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController,
@@ -1170,7 +1325,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
performBackAction(double = false)
}
pendingBackAction = pending
- uiHandler.postDelayed(pending, 500L)
+ uiHandler.postDelayed(pending, backDoubleTapMs.toLong())
}
private fun performBackAction(double: Boolean) {
@@ -1183,7 +1338,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (incoming?.action != SessionService.ACTION_HOME_GUIDE) return
incoming.action = null
setIntent(incoming)
- if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide()
+ if (SessionState.suspended) SessionService.resume(this)
+ else if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide()
}
@@ -1248,6 +1404,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val activeAppId = AgentGuest.activeSteamAppId(this, installedAppIds)
val selectedSteamAppId = runCatching { AgentGuest.selectedSteamAppId(this) }
AgentGuest.selectedOrActiveInstalledSteamAppId(selectedSteamAppId, activeAppId, installedAppIds)
+ ?: SessionState.gameId?.toLongOrNull()
?: refresh.requestedAppId
} else {
refresh.requestedAppId
@@ -1494,15 +1651,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (nextTouchMode == SessionPrefs.TOUCH_OFF || !usingTouchpad()) cursorVisible = false
}
touchMode = nextTouchMode
- routedTouchMode = effectiveTouchMode()
+ val nextRoutedTouchMode = effectiveTouchMode()
+ if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset()
+ routedTouchMode = nextRoutedTouchMode
frameGen = FrameGen.mode(this)
fexPreset = SessionPrefs.fexPreset(this)
suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode)
steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this)
oscMode = SessionPrefs.oscMode(this)
backActionsInverted = SessionPrefs.backActionsInverted(this)
- lowLatencyController = SessionPrefs.lowLatencyController(this)
- lowLatencyTouch = SessionPrefs.lowLatencyTouch(this)
+ backDoubleTapMs = SessionPrefs.backDoubleTapMs(this)
+ lowLatency = SessionPrefs.lowLatency(this)
padType = SessionPrefs.steamController(this)
}
@@ -1533,10 +1692,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (problem == null) SessionEvents.record("runtime.ready") else failedComponent = "runtime"
}
if (problem == null && resume && !SessionState.stopRequested) {
- SessionState.installing = "package"
+ if (activeInstallWorker === worker) SessionState.installing = "package"
SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "package.resuming", mapOf("component" to "package"))
- problem = com.droiddeck.launcher.runtime.DesktopCatalog.resumeInterrupted(this, progressAsIs())
- ?.let { getString(R.string.session_package_resume_failed, it) }
+ val cancellation = com.droiddeck.launcher.core.Downloader.Cancellation { SessionState.stopRequested }
+ SessionState.installCancellation = cancellation
+ problem = try {
+ com.droiddeck.launcher.runtime.DesktopCatalog.resumeInterrupted(this, cancellation, progressAsIs())
+ ?.let { getString(R.string.session_package_resume_failed, it) }
+ } finally {
+ if (SessionState.installCancellation === cancellation) SessionState.installCancellation = null
+ }
if (problem == null) SessionEvents.record("package.ready") else failedComponent = "package"
}
if (problem == null && desktop && !SessionState.stopRequested) {
@@ -1681,9 +1846,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val driverId = if (CompositorHost.isStarted) null else turnip.install()
val previous = SessionState.outputSize
- val live = if (SessionState.followScreen && !isInPictureInPictureMode)
- com.droiddeck.launcher.session.SessionDisplay.followSize(holder.surfaceFrame.width(), holder.surfaceFrame.height())
- else null
+ val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height())
val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize()
SessionState.outputSize = size
if (!SessionState.running) SessionState.refreshHz = refreshHz()
@@ -1740,7 +1903,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
)
onOutputAttached(holder)
if (SessionState.running && size != previous) {
- Log.i(TAG, "follow screen: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface")
+ Log.i(TAG, "output resized: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface")
WaylandCompositor.nativeResizeOutput(size.first, size.second)
}
if (!SessionState.running) SessionEvents.record("compositor.started")
@@ -1752,6 +1915,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
intent.getStringExtra(SessionService.EXTRA_STEAM_UI),
intent.getStringExtra(SessionService.EXTRA_STEAM_URL),
intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS),
+ intent.getStringExtra(SessionService.EXTRA_GAME_ID),
sessionActivityDisplayId,
)
}
@@ -1771,15 +1935,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
cancelTouchGestures()
Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor")
CompositorHost.resize(holder.surface) { applyFrameGen() }
- followWindow(width, height)
+ resizeOutputForWindow(width, height)
}
}
- private fun followWindow(width: Int, height: Int) {
- if (!SessionState.followScreen || isInPictureInPictureMode || !CompositorHost.isStarted) return
- val size = com.droiddeck.launcher.session.SessionDisplay.followSize(width, height) ?: return
+ private fun windowOutputSize(width: Int, height: Int): Pair? {
+ if (isInPictureInPictureMode || width <= 0 || height <= 0) return null
+ return if (SessionState.followScreen)
+ com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted())
+ else if (glassesScreen == null) outputSize() else null
+ }
+
+ private fun resizeOutputForWindow(width: Int, height: Int) {
+ if (!CompositorHost.isStarted) return
+ val size = windowOutputSize(width, height) ?: return
if (size == SessionState.outputSize) return
- Log.i(TAG, "follow screen: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}")
+ Log.i(TAG, "output resized: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}")
SessionState.outputSize = size
val panel = panelBounds()
SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1)
@@ -1793,11 +1964,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
private fun applyFollowOrientation(config: android.content.res.Configuration) {
- val wanted = if (SessionState.followScreen && config.smallestScreenWidthDp >= 600) {
- android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER
- } else {
- SessionPrefs.orientation(this)
- }
+ val wanted = SessionPrefs.windowOrientation(this, SessionState.followScreen, config.smallestScreenWidthDp)
if (requestedOrientation != wanted) requestedOrientation = wanted
}
@@ -1809,6 +1976,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
cancelTouchGestures()
applyFollowOrientation(newConfig)
applyUnfoldedControls()
+ resizeOutputForWindow(surfaceW, surfaceH)
}
override fun surfaceDestroyed(holder: SurfaceHolder) {
@@ -1850,7 +2018,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode))
com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN
else SessionPrefs.resolutionChoice(this, mode, panel)
- return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice)
+ return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice,
+ SessionPrefs.portrait(this) && !controlsBelowWanted())
}
private fun refreshHz(): Float {
@@ -1868,7 +2037,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun mirrorRefreshLimit(): Int =
GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null)
- private fun outputFpsLimit(): Int = GlassesRendering.fpsLimit(SessionState.fpsLimit, mirrorRefreshLimit())
+ private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit(mirrorRefreshLimit())
private fun applyOutputPacing() {
Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit()))
@@ -1965,7 +2134,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return
}
Thread({
- val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile)
+ val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) ?: prootFailureHint()
runOnUiThread {
if (isFinishing || isDestroyed) return@runOnUiThread
showEnded(status, hint)
@@ -1987,12 +2156,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
repairOffered = hint?.repair == true
loading.showEnded(
hint?.text ?: stopped,
- getString(R.string.session_ended_detail, status, SessionState.logFile?.path ?: getString(R.string.session_ended_no_log)),
+ getString(R.string.session_ended_detail, status,
+ SessionState.logFile?.path?.let { android.text.BidiFormatter.getInstance().unicodeWrap(it, android.text.TextDirectionHeuristics.LTR) }
+ ?: getString(R.string.session_ended_no_log)),
)
focusEndedScreen()
}
private fun releasePads() {
+ com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this)
+ backQamInput.cancel()
padBridge?.releaseAll()
joyConVr?.releaseButtons()
}
@@ -2026,6 +2199,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return EndHint(resources.getQuantityString(R.plurals.session_end_runtime_damaged, broken.size, broken.size, broken.first()), repair = true)
}
+ private fun prootFailureHint(): EndHint? {
+ if (SessionState.failureCode != "PROOT_MISSING") return null
+ val message = SessionState.failureMessage ?: return null
+ return EndHint(message)
+ }
+
private fun sessionEndHint(log: File?): EndHint? {
if (log == null || !log.isFile) return null
return try {
@@ -2062,10 +2241,31 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
when (event.keyCode) {
- KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE ->
+ KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> {
+ val steamVolume =
+ SessionState.mode == SessionService.MODE_STEAM && SessionState.running &&
+ SessionState.firstFrameSeen && !SessionState.suspended && !ended &&
+ !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
+ !gestureSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus()
+ if (steamVolume) {
+ val audio = getSystemService(android.media.AudioManager::class.java)
+ if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction ->
+ audio.adjustStreamVolume(android.media.AudioManager.STREAM_MUSIC, direction, 0)
+ }) return true
+ }
return super.dispatchKeyEvent(event)
+ }
+ }
+ val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
+ SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen &&
+ !SessionState.suspended && padBridge?.canHoldQam() == true
+ if (backQamInput.onKeyEvent(event, backToQam)) {
+ pendingBackAction?.let(uiHandler::removeCallbacks)
+ pendingBackAction = null
+ return true
}
if (pipUi) return true
+ if (screenKeyTextFocus) return super.dispatchKeyEvent(event)
val pad = com.droiddeck.launcher.input.JoyCon.normalize(event)
if (pad !== event) return dispatchKeyEvent(pad)
val fromController = PadBridge.isControllerKeyEvent(event)
@@ -2087,6 +2287,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
return super.dispatchKeyEvent(event)
}
+ val drawerShortcutKey = event.deviceId to event.keyCode
+ if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT || event.keyCode == KeyEvent.KEYCODE_BUTTON_START) &&
+ ((drawerOpen && SessionState.mode == SessionService.MODE_STEAM) || drawerShortcutKey in drawerShortcutKeysDown)) {
+ if (event.action == KeyEvent.ACTION_DOWN) {
+ drawerShortcutKeysDown.add(drawerShortcutKey)
+ if (event.repeatCount == 0) {
+ releaseDrawerDirection()
+ if (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) sendSteamGuide() else triggerSteamQam()
+ }
+ } else if (event.action == KeyEvent.ACTION_UP) {
+ drawerShortcutKeysDown.remove(drawerShortcutKey)
+ }
+ return true
+ }
if (drawerOpen) {
if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) {
if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
@@ -2107,7 +2321,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return true
}
val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START ||
- event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || event.keyCode == KeyEvent.KEYCODE_HOME
+ event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || HomeGuideInput.isHome(event.keyCode)
val resumeKeyId = event.deviceId to event.keyCode
if (fromController && resumeKey && (SessionState.suspended || resumeKeyId in resumeKeysDown)) {
if (event.action == KeyEvent.ACTION_DOWN) {
@@ -2178,6 +2392,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (pipUi) return true
if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) {
drawerControllerActive = false
+ gestureTouchStreamGate.reset()
}
return super.dispatchTouchEvent(event)
}
@@ -2253,9 +2468,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
super.dispatchKeyEvent(event)
}
+ private fun layoutNames(): List =
+ com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted()
+
private fun refreshGestureConfig() {
gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame)
+ gestureTouchStreamGate.reset()
if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig)
+ if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig)
gesturePointerReady = false
recognizedGesture = null
}
@@ -2543,23 +2763,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun refreshControls() {
applyUnfoldedControls()
updateOnScreenControls()
+ screenKeys?.refreshAppearance()
+ }
+
+ private fun controlsBelowWanted(): Boolean {
+ if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false
+ return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height,
+ pipUi || isInPictureInPictureMode)
}
private fun applyUnfoldedControls() {
if (!::sessionRoot.isInitialized) return
val width = sessionRoot.width
val height = sessionRoot.height
- val wanted = com.droiddeck.launcher.session.SessionDisplay.unfoldedControlsWanted(
- enabled = unfoldedControls,
- foldable = com.droiddeck.launcher.session.SessionDisplay.foldable(this),
- controllerConnected = PadBridge.anyControllerConnected() || SteamControllerBle.connected,
- keepWithController = unfoldedControlsWithController,
- steamDeckPad = SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad,
- pip = pipUi || isInPictureInPictureMode,
- width = width,
- height = height,
- smallestWidthDp = resources.configuration.smallestScreenWidthDp,
- )
+ val wanted = controlsBelowWanted()
val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height)
else FrameLayout.LayoutParams.MATCH_PARENT
val params = surfaceView.layoutParams as FrameLayout.LayoutParams
@@ -2569,13 +2786,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
else "unfolded controls: game full screen")
}
var panel = unfoldedPanel
+ if (panel != null && panel.deckControls != SessionState.deckPad) {
+ sessionRoot.removeView(panel)
+ unfoldedPanel = null
+ panel = null
+ }
if (!wanted) {
if (panel != null) { sessionRoot.removeView(panel); unfoldedPanel = null; updateOnScreenControls() }
return
}
if (panel == null) {
panel = com.droiddeck.launcher.ui.DeckControlsPanel(this, onClose = { chooseUnfoldedControls(false) },
- onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge)
+ onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge,
+ portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this))
sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1)
unfoldedPanel = panel
updateOnScreenControls()
@@ -2628,6 +2851,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (::scrollTouch.isInitialized) scrollTouch.cancel()
if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0)
if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false
+ gestureTouchStreamGate.reset()
routedTouchMode = next
}
@@ -2818,6 +3042,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
device.plugged = false
uiHandler.postDelayed({ updateOnScreenControls() }, 700)
}
+ view.onStyle = { screenKeys?.refreshAppearance() }
+ view.onTouchMiss = miss@{ event ->
+ if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss
+ event.offsetLocation(view.left - surfaceView.left.toFloat(), view.top - surfaceView.top.toFloat())
+ onTouchEvent(event)
+ }
root.addView(view, root.indexOfChild(onScreenControls) + 1)
steamTouchControls = view
steamTouchAvailable = true
@@ -2848,6 +3078,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
controls.visibility = View.GONE
steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE }
com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false
+ screenKeys?.followSteam = false
applyTouchRouting()
return
}
@@ -2876,6 +3107,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onScreenButtonsVisible = show
val drawn = show && !keyboardCoversPad()
if (steam != null) {
+ screenKeys?.followSteam = drawn
if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE }
if (!drawn) steam.releaseAll()
steam.visibility = if (drawn) View.VISIBLE else View.GONE
@@ -2884,6 +3116,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden")
return
}
+ screenKeys?.followSteam = false
if (drawn == (controls.visibility == View.VISIBLE)) return
if (!drawn) controls.releaseAll()
controls.visibility = if (drawn) View.VISIBLE else View.GONE
@@ -2969,6 +3202,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
pendingBackAction = null
releaseDrawerDirection()
onScreenControls?.releaseAll()
+ screenKeys?.releaseAll()
releasePads()
touchpad.cancel()
scrollTouch.cancel()
@@ -3005,7 +3239,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun onPictureInPictureModeChanged(inPip: Boolean, newConfig: android.content.res.Configuration) {
super.onPictureInPictureModeChanged(inPip, newConfig)
if (::pip.isInitialized) pip.changed(inPip)
- if (!inPip && surfaceW > 0) followWindow(surfaceW, surfaceH)
+ if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH)
applyUnfoldedControls()
updateGlassesScreen()
}
@@ -3024,6 +3258,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
started = true
refreshActivityDisplayId()
displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper()))
+ for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) {
+ contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver)
+ }
refreshSecondScreenDisplays()
if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode)
startedScreens++
@@ -3038,6 +3275,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
started = false
updateHandCamera()
displayManager.unregisterDisplayListener(displayListener)
+ contentResolver.unregisterContentObserver(refreshSettingObserver)
closeSecondScreen(reset = false)
startedScreens = (startedScreens - 1).coerceAtLeast(0)
updateGlassesScreen()
@@ -3081,6 +3319,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (!SessionState.suspended) pausedFrame = null
com.droiddeck.launcher.ui.Motion.refresh(this)
refreshHomeApp()
+ if (::memoryHud.isInitialized && SessionState.running && SessionState.firstFrameSeen) memoryHud.refresh()
if (intent?.action == SessionService.ACTION_RESUME) {
intent.action = null
SessionService.resume(this)
@@ -3092,6 +3331,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onScreenControls?.reload()
controllerSettings = ControllerPrefs.read(this)
resumed = true
+ com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this,
+ enabled = {
+ resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen &&
+ !achievementsOpen && !gestureSettingsOpen && !pipUi && SessionState.running && !SessionState.suspended &&
+ SessionState.mode == SessionService.MODE_STEAM && padBridge != null
+ },
+ setPressed = { padBridge?.setHomeGuidePressed(it) },
+ onCancel = { padBridge?.cancelHomeGuide() },
+ )
updatePointerCapture()
if (!pipUi) sessionClipboard.start()
updatePadMotion()
@@ -3103,7 +3351,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
override fun onPause() {
+ com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this)
if (runtimeRemovalBlocked) { super.onPause(); return }
+ backQamInput.cancel()
capturePausedFrame()
sessionClipboard.stop()
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
@@ -3478,15 +3728,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
private fun unbufferedSources() =
- if (lowLatencyTouch) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES
+ if (lowLatency) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES
private fun applyLowLatency() {
- com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatencyController, lowLatencyTouch)
+ com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatency)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) window.decorView.requestUnbufferedDispatch(unbufferedSources())
}
override fun onWindowFocusChanged(hasFocus: Boolean) {
super.onWindowFocusChanged(hasFocus)
+ if (!hasFocus) com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this)
+ if (!hasFocus) backQamInput.cancel()
if (!hasFocus && ::padMouse.isInitialized) padMouse.reset()
if (runtimeRemovalBlocked) return
if (!hasFocus) {
@@ -3526,12 +3778,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
SessionEvents.firstFrame()
if (SessionState.mode == SessionService.MODE_STEAM) SteamRepair.clientShown(this)
runOnUiThread {
+ if (isFinishing || isDestroyed) return@runOnUiThread
loading.visible = false
hud.start()
+ memoryHud.start()
}
}
override fun onDestroy() {
+ com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this)
+ backQamInput.cancel()
steamVrRecovery.close()
uiHandler.removeCallbacks(steamTouchRetry)
if (runtimeRemovalBlocked) { super.onDestroy(); return }
@@ -3545,6 +3801,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } }
headTracker?.stop()
if (::hud.isInitialized) hud.stop()
+ if (::memoryHud.isInitialized) memoryHud.stop()
joyConVr?.close()
joyConVr = null
handCamera?.stop()
diff --git a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt
index 8459bc7d95..5eb9ff4500 100644
--- a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt
+++ b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt
@@ -29,6 +29,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl
private var pending: AppUpdates.Release? = null
private var lastCheck = 0L
private var request = 0
+ @Volatile private var session = -1
fun state() = UpdatesState(catalog, follow, checking, error, stage, percent, askPermission)
@@ -87,13 +88,14 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl
if (SessionState.running) { error = activity.getString(R.string.upd_stop_first); return }
if (!SelfInstaller.canInstall(activity)) { pending = r; askPermission = true; return }
error = null
+ session = -1
stage = activity.getString(R.string.upd_stage_downloading)
percent = 0
Thread({
val result = runCatching {
val file = SelfInstaller.download(activity, apk) { pct -> ui.post { percent = pct } }
ui.post { stage = activity.getString(R.string.upd_stage_installing); percent = -1 }
- SelfInstaller.install(activity, file)
+ SelfInstaller.install(activity, file) { id -> session = id }
}
result.onFailure { e -> ui.post { stage = null; error = e.message ?: activity.getString(R.string.upd_failed) } }
}, "app-update-install").start()
@@ -101,13 +103,15 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl
private val receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
+ if (intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1).let { it < 0 || it != session }) return
when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)) {
PackageInstaller.STATUS_PENDING_USER_ACTION -> {
val confirm = if (Build.VERSION.SDK_INT >= 33) intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
else @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_INTENT)
- if (confirm == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return }
+ val safe = confirm?.let { SelfInstaller.safeConfirmIntent(activity, it) }
+ if (safe == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return }
stage = activity.getString(R.string.upd_stage_confirm)
- activity.startActivity(confirm.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+ if (runCatching { activity.startActivity(safe) }.isFailure) { stage = null; error = activity.getString(R.string.upd_not_offered) }
}
PackageInstaller.STATUS_SUCCESS -> stage = null
else -> {
diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt
index 5f7f092628..0842f6b5a4 100644
--- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt
+++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt
@@ -3,9 +3,13 @@ package com.droiddeck.launcher.agent
import android.content.Context
import android.util.Log
import com.droiddeck.launcher.runtime.LinuxRuntime
+import com.droiddeck.launcher.runtime.ProotFastPath
+import com.droiddeck.launcher.session.SessionPhase
+import com.droiddeck.launcher.session.SessionState
import org.json.JSONArray
import org.json.JSONObject
import java.io.File
+import java.security.MessageDigest
import java.nio.file.Files
import java.nio.file.LinkOption.NOFOLLOW_LINKS
import java.nio.file.StandardOpenOption.READ
@@ -55,6 +59,9 @@ object AgentEnv {
fun override(context: Context, name: String): JSONObject = synchronized(lock) {
AgentAccess.requireCommands(context)
if (NAME.matchEntire(name) == null || name in setOf(".", "..")) throw AgentException("INVALID_NAME", "Override names are letters, digits, '.', '_' and '-'")
+ if (name == "libblfastpath.so" && (SessionState.running || SessionState.guestPid > 0 || SessionState.phase == SessionPhase.STOPPING)) {
+ throw AgentException("SESSION_ACTIVE", "Stop the session before installing a fast-path library")
+ }
val source = File(inbox(context), name)
if (Files.isSymbolicLink(source.toPath())) throw AgentException("INVALID_NAME", "The override must be a regular file")
if (!source.isFile) throw AgentException("NO_SUCH_FILE", "Push the binary to ${source.path} first")
@@ -67,6 +74,10 @@ object AgentEnv {
staged.delete()
throw AgentException("OVERRIDE_FAILED", "Could not stage the override")
}
+ if (name == "libblfastpath.so" && !arm64SharedLibrary(staged)) {
+ staged.delete()
+ throw AgentException("INVALID_LIBRARY", "The fast path must be a 64-bit little-endian ARM64 ELF shared library")
+ }
if (!staged.setExecutable(true, false) || !staged.renameTo(target)) {
staged.delete()
throw AgentException("OVERRIDE_FAILED", "Could not install $name in the rootfs")
@@ -76,6 +87,40 @@ object AgentEnv {
state.put("pendingOverrides", JSONArray(merge(strings(state.optJSONArray("pendingOverrides")), listOf(name))))
save(context, state)
state.put("installed", "$GUEST_BIN/$name")
+ if (name == "libblfastpath.so") {
+ val digest = MessageDigest.getInstance("SHA-256")
+ target.inputStream().use { input ->
+ val buffer = ByteArray(65536)
+ while (true) {
+ val count = input.read(buffer)
+ if (count < 0) break
+ digest.update(buffer, 0, count)
+ }
+ }
+ state.put("sha256", digest.digest().joinToString("") { "%02x".format(it) })
+ }
+ state
+ }
+
+ fun fastPathLibrary(context: Context): String = synchronized(lock) {
+ if (!AgentAccess.commandsAllowed(context)) return@synchronized ProotFastPath.LIBRARY
+ if ("libblfastpath.so" !in strings(load(context).optJSONArray("activeOverrides"))) return@synchronized ProotFastPath.LIBRARY
+ val file = File(bin(context), "libblfastpath.so")
+ if (!file.isFile || Files.isSymbolicLink(file.toPath())) return@synchronized ProotFastPath.LIBRARY
+ "$GUEST_BIN/libblfastpath.so"
+ }
+
+ private fun arm64SharedLibrary(file: File): Boolean = file.inputStream().use { input ->
+ val header = ByteArray(20)
+ var count = 0
+ while (count < header.size) {
+ val read = input.read(header, count, header.size - count)
+ if (read < 0) return@use false
+ count += read
+ }
+ header.take(7) == listOf(0x7f, 0x45, 0x4c, 0x46, 2, 1, 1) &&
+ header[16] == 3.toByte() && header[17] == 0.toByte() &&
+ header[18] == 183.toByte() && header[19] == 0.toByte()
}
fun beginSession(context: Context): List = synchronized(lock) {
@@ -86,13 +131,13 @@ object AgentEnv {
val state = load(context)
val active = strings(state.optJSONArray("pending"))
val overrides = strings(state.optJSONArray("pendingOverrides"))
- state.put("active", JSONArray(active)).put("pending", JSONArray())
- state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray())
- save(context, state)
bin(context).listFiles()
?.filter { it.name !in overrides }?.forEach { it.delete() }
val lines = strings(state.optJSONArray("persistent")) + active
- val withPath = if (overrides.isEmpty()) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}"
+ val withPath = if (overrides.none { it != "libblfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}"
+ state.put("active", JSONArray(active)).put("pending", JSONArray())
+ state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray())
+ save(context, state)
if (withPath.isNotEmpty()) Log.i(TAG, "agent environment keys for this session: ${withPath.map { it.substringBefore('=') }}")
withPath
}
diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java
index 3b73b6a3c9..32d5f5189e 100644
--- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java
+++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java
@@ -26,6 +26,7 @@ public class PulseAudioComponent extends SessionPart {
private final File workingDir;
+ private final File deviceControls;
private File logFile;
private final String micFifoPath;
private volatile int pid = -1;
@@ -36,6 +37,8 @@ public class PulseAudioComponent extends SessionPart {
public PulseAudioComponent(Context context, String micFifoPath) {
this.workingDir = new File(context.getFilesDir(), "pulseaudio");
+ this.deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent.directory(
+ com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context));
this.micFifoPath = micFifoPath;
}
@@ -94,7 +97,7 @@ public class PulseAudioComponent extends SessionPart {
config.add("load-module module-native-protocol-unix auth-anonymous=1 auth-cookie-enabled=0 socket=\""
+ socket().getAbsolutePath() + "\"");
config.add(".nofail");
- config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0");
+ config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0 control_dir=" + deviceControls);
config.add("set-default-sink DirectAudio");
config.add(".fail");
if (micFifoPath != null && !micFifoPath.isEmpty()) {
@@ -139,7 +142,7 @@ public class PulseAudioComponent extends SessionPart {
} else if (sinks.contains("\tDirectAudio\t") || sinks.startsWith("DirectAudio\t") || sinks.contains("\tDirectAudio\n") || sinks.matches("(?s).*\\bDirectAudio\\b.*")) {
line = "== client sink: DirectAudio (module-directaudio-native-sink)";
} else {
- boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0") != null
+ boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0", "control_dir=" + deviceControls) != null
&& pactl("set-default-sink", "AAudioSink") != null;
line = loaded ? "== client sink: DirectAudio did not come up; FALLBACK to the plain AAudio sink (AAudioSink)"
: "== client sink: DirectAudio did not come up and the AAudio fallback failed too - no client sound";
diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt
index 3021b7196d..7b8536202d 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt
@@ -1,11 +1,32 @@
package com.droiddeck.launcher.core
import android.content.Context
+import android.content.pm.ActivityInfo
+import com.droiddeck.launcher.R
object AppUiPrefs {
const val DEFAULT_SCALE = 100
val scales = listOf(75, 85, 100, 115, 125, 150)
+ val orientationOptions = listOf(
+ ActivityInfo.SCREEN_ORIENTATION_USER to R.string.setup_launcher_orientation_auto,
+ ActivityInfo.SCREEN_ORIENTATION_PORTRAIT to R.string.setup_orientation_portrait,
+ ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE to R.string.setup_orientation_auto,
+ ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE to R.string.setup_orientation_landscape,
+ ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to R.string.setup_orientation_reverse,
+ )
+
+ fun orientation(context: Context): Int =
+ context.getSharedPreferences("app-ui", Context.MODE_PRIVATE)
+ .getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_USER)
+ .takeIf { value -> orientationOptions.any { it.first == value } }
+ ?: ActivityInfo.SCREEN_ORIENTATION_USER
+
+ fun setOrientation(context: Context, value: Int) {
+ require(orientationOptions.any { it.first == value })
+ context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", value).apply()
+ }
+
internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE
fun scale(context: Context): Int = normalizeScale(
diff --git a/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt
new file mode 100644
index 0000000000..02447f360c
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt
@@ -0,0 +1,59 @@
+package com.droiddeck.launcher.core
+
+import android.content.Context
+import android.util.Log
+import java.util.concurrent.Executors
+
+object BackgroundAppLimit {
+ private const val TAG = "BackgroundAppLimit"
+ const val OFF = -1
+ val CHOICES = listOf(OFF, 4, 1, 0)
+ private const val KEY = "max_cached_processes"
+ private const val STATE = "background-app-limit"
+ private const val APPLIED = "applied"
+ private const val PREVIOUS = "previous"
+
+ private val worker = Executors.newSingleThreadExecutor { Thread(it, "background-app-limit").apply { isDaemon = true } }
+
+ internal fun readCommand() = "device_config get activity_manager $KEY"
+ internal fun setCommand(limit: Int): String {
+ require(limit in 0..1024)
+ return "device_config put activity_manager $KEY $limit"
+ }
+ internal fun restoreCommand(previous: String?) =
+ if (previous == null) "device_config delete activity_manager $KEY" else "device_config put activity_manager $KEY $previous"
+
+ internal fun parse(output: String): String? = output.trim().takeIf { it.toIntOrNull() != null }
+
+ private fun state(context: Context) = context.applicationContext.getSharedPreferences(STATE, Context.MODE_PRIVATE)
+
+ fun applied(context: Context): Boolean = state(context).getBoolean(APPLIED, false)
+
+ fun applyAsync(context: Context, limit: Int) {
+ val app = context.applicationContext
+ worker.execute {
+ runCatching {
+ if (!applied(app)) {
+ val previous = parse(WirelessAdbFix.shell(app, readCommand()))
+ check(state(app).edit().putBoolean(APPLIED, true).putString(PREVIOUS, previous).commit()) { "previous value not saved" }
+ }
+ WirelessAdbFix.shell(app, setCommand(limit))
+ }.onSuccess { Log.i(TAG, "at most $limit cached app(s) while the session runs") }
+ .onFailure { Log.w(TAG, "limit not set: ${it.message}") }
+ }
+ }
+
+ fun restoreAsync(context: Context) {
+ val app = context.applicationContext
+ worker.execute {
+ if (!applied(app)) return@execute
+ val previous = state(app).getString(PREVIOUS, null)
+ runCatching { WirelessAdbFix.shell(app, restoreCommand(previous)) }
+ .onSuccess {
+ state(app).edit().putBoolean(APPLIED, false).remove(PREVIOUS).commit()
+ Log.i(TAG, "cached-app limit put back (${previous ?: "Android's own"})")
+ }
+ .onFailure { Log.w(TAG, "limit not put back yet: ${it.message}") }
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
index 058b07dd5d..d587ecb7cc 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt
@@ -256,8 +256,13 @@ object DeviceReport {
EsyncPacks.status(LinuxRuntime.rootDir(context)).let { k("droiddeck-esync packs", "${it.installed} installed, ${it.wanted} wanted") }
k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up")
k("gamescope realtime", SessionPrefs.gamescopeRealtime(context))
+ k("zRAM: compress Steam during games", SessionPrefs.zramClient(context))
+ k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" })
+ k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" })
k("proot without seccomp", SessionPrefs.prootNoSeccomp(context))
k("proot fast path", SessionPrefs.prootFastPath(context))
+ k("proot binary", LinuxRuntime.prootSource(context) + " " + LinuxRuntime.prootBinary(context).path)
+ k("proot fast path (eligible)", com.droiddeck.launcher.runtime.ProotFastPath.enabled(context))
k("Guest host name", SessionPrefs.guestHostname(context))
k("DirectAudio for games", SessionPrefs.directAudio(context))
k("Stretch 16:9 to panel", SessionPrefs.stretch16x9(context))
diff --git a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt
index 870e8ed424..b11e3113af 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt
@@ -3,6 +3,8 @@ package com.droiddeck.launcher.core
import android.content.Context
import android.content.SharedPreferences
import java.net.HttpURLConnection
+import java.net.InetSocketAddress
+import java.net.Proxy
import java.net.URL
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CountDownLatch
@@ -20,6 +22,7 @@ object DownloadSource {
private const val KEY_MODE = "mode"
private const val KEY_MIRROR = "mirror"
private const val KEY_CUSTOM = "custom"
+ private const val KEY_PROXY = "proxy"
private const val KEY_FASTEST = "fastest"
private const val PROBE = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck/main/README.md"
@@ -175,6 +178,22 @@ object DownloadSource {
prefs(context)?.edit()?.putString(KEY_CUSTOM, normalizePrefix(prefix))?.apply()
}
+ fun proxyHostPort(context: Context): String = prefs(context)?.getString(KEY_PROXY, "") ?: ""
+
+ fun setProxy(context: Context, value: String) {
+ prefs(context)?.edit()?.putString(KEY_PROXY, normalizeProxy(value))?.apply()
+ }
+
+ /** An HTTP proxy every Downloader connection uses, or null when none is configured. */
+ fun httpProxy(): Proxy? = proxyOf(prefs()?.getString(KEY_PROXY, "") ?: "")
+
+ internal fun proxyOf(value: String): Proxy? {
+ val host = value.substringBefore(':')
+ val port = value.substringAfter(':', "").toIntOrNull() ?: return null
+ if (host.isEmpty()) return null
+ return Proxy(Proxy.Type.HTTP, InetSocketAddress(host, port))
+ }
+
fun reset(context: Context) {
lastGood = null
prefs(context)?.edit()?.clear()?.apply()
@@ -205,4 +224,11 @@ object DownloadSource {
if (trimmed.isEmpty() || trimmed.startsWith("http://")) return ""
return if (trimmed.startsWith("https://")) trimmed else "https://$trimmed"
}
+
+ internal fun normalizeProxy(value: String): String {
+ val trimmed = value.trim().removePrefix("http://").trimEnd('/')
+ val host = trimmed.substringBefore(':')
+ val port = trimmed.substringAfter(':', "").toIntOrNull() ?: 0
+ return if (host.isNotEmpty() && port in 1..65535) "$host:$port" else ""
+ }
}
diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java
index 7a88f6beb4..31e8f45f55 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java
+++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java
@@ -11,6 +11,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
+import java.net.Proxy;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -151,11 +152,16 @@ public final class Downloader {
// A cancel is not a source failure: no other mirror, and no DownloadSource.failed().
if (outcome == Outcome.CANCELLED) return false;
if (outcome == Outcome.DONE) {
- if (expectedSha256 != null && !expectedSha256.equalsIgnoreCase(Hashes.sha256(destination))) {
- Log.w(TAG, "checksum mismatch from " + source + "; trying another source");
- if (!discardPartial(destination, identity)) return false;
- continue;
+ if (expectedSha256 != null) {
+ String actualSha256 = Hashes.sha256(destination);
+ if (isCancelled(cancelled)) return false;
+ if (!expectedSha256.equalsIgnoreCase(actualSha256)) {
+ Log.w(TAG, "checksum mismatch from " + source + "; trying another source");
+ if (!discardPartial(destination, identity)) return false;
+ continue;
+ }
}
+ if (isCancelled(cancelled)) return false;
resumeFile(destination).delete();
DownloadSource.INSTANCE.succeeded(source);
if (progress != null) progress.accept(1f);
@@ -384,7 +390,10 @@ public final class Downloader {
}
private static HttpURLConnection open(String url, int readTimeoutMs) throws java.io.IOException {
- HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+ // An explicit Proxy routes the connection through the app setting instead of the system-wide proxy.
+ Proxy proxy = DownloadSource.INSTANCE.httpProxy();
+ HttpURLConnection connection = (HttpURLConnection) (proxy != null
+ ? new URL(url).openConnection(proxy) : new URL(url).openConnection());
connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
connection.setReadTimeout(readTimeoutMs);
connection.setInstanceFollowRedirects(true);
diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt
index 3ad45c1fa6..bcf3a0448c 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt
@@ -14,6 +14,8 @@ object GameEnvironmentOptions {
Option("MESA_SHADER_CACHE_MAX_SIZE", "1G", R.string.game_env_cache_size, Type.CHOICE, listOf("512M", "1G", "2G", "4G")),
Option("PROTON_LOG", "1", R.string.game_env_proton_log, Type.TOGGLE, listOf("0", "1")),
Option("PROTON_USE_WINED3D", "1", R.string.game_env_wined3d, Type.TOGGLE, listOf("0", "1")),
+ Option("PROTON_DXVK_D3D8", "1", R.string.game_env_dxvk_d3d8, Type.TOGGLE, listOf("0", "1")),
+ Option("WINE_D3D_CONFIG", "renderer=vulkan", R.string.game_env_wined3d_renderer, Type.CHOICE, listOf("renderer=vulkan", "renderer=gl")),
Option("PROTON_USE_XALIA", "0", R.string.game_env_xalia, Type.TOGGLE, listOf("0", "1")),
Option("PROTON_NO_NTSYNC", "1", R.string.game_env_no_ntsync, Type.TOGGLE, listOf("0", "1")),
Option("PROTON_NO_ESYNC", "1", R.string.game_env_no_esync, Type.TOGGLE, listOf("0", "1")),
@@ -32,6 +34,7 @@ object GameEnvironmentOptions {
Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT),
Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT),
Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER),
+ Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT),
Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")),
Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")),
Option("WINEDLLOVERRIDES", "", 0, Type.TEXT),
diff --git a/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt
new file mode 100644
index 0000000000..8cbf9bf39d
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt
@@ -0,0 +1,24 @@
+package com.droiddeck.launcher.core
+
+import android.content.Context
+import android.net.Uri
+import android.provider.Settings
+
+object GlobalSettings {
+ // Settings.Global caches values in-process and misses deletions made over adb; ask the provider directly.
+ fun read(context: Context, name: String): String? {
+ val uri = Uri.withAppendedPath(Settings.Global.CONTENT_URI, name)
+ context.contentResolver.query(uri, arrayOf(Settings.NameValueTable.VALUE), null, null, null)?.use { cursor ->
+ return if (cursor.moveToFirst()) cursor.getString(0) else null
+ }
+ return Settings.Global.getString(context.contentResolver, name)
+ }
+
+ fun isOn(context: Context, name: String): Boolean =
+ runCatching { read(context, name)?.trim() == "1" }.getOrDefault(false)
+
+ fun developerOptionsOn(context: Context): Boolean = isOn(context, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED)
+
+ // Settings.Global.ADB_WIFI_ENABLED is hidden; the key is stable since Android 11.
+ fun wirelessDebuggingOn(context: Context): Boolean = isOn(context, "adb_wifi_enabled")
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt
index 4a8b12934e..0757192461 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt
@@ -8,7 +8,11 @@ object HostProcess {
private const val TAG = "HostProcess"
@JvmStatic
- fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?): Int {
+ fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?): Int =
+ start(command, env, dir, onExit, onLine, null)
+
+ @JvmStatic
+ fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?): Int {
val argv = split(command)
if (argv.isEmpty()) return -1
return try {
@@ -19,7 +23,10 @@ object HostProcess {
if (eq > 0) builder.environment()[line.substring(0, eq)] = line.substring(eq + 1)
}
builder.redirectErrorStream(true)
- if (onLine == null) builder.redirectOutput(File("/dev/null"))
+ if (onLine == null) {
+ if (outputFile == null) builder.redirectOutput(File("/dev/null"))
+ else builder.redirectOutput(ProcessBuilder.Redirect.appendTo(outputFile))
+ }
val process = builder.start()
val pid = pidOf(process)
Log.i(TAG, "started pid $pid: ${argv.first()} (${argv.size - 1} arguments)")
diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt
index 491101dba2..20073c4ca3 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt
@@ -76,7 +76,7 @@ object LogRedactor {
private const val ACCOUNT_VALUE = "(\"[^\"<\\r\\n]+\"|'[^'<\\r\\n]+'|[^\\s\"'<>&;,}]+)"
private val ACCOUNT_KV = Regex(
- "(?i)(? setChildProcessLimit(appContext, host, port, enabled) }
+ }
+
+ fun hasSavedPairing(context: Context): Boolean = savedConnection(context.applicationContext) != null
+
+ fun clearCachedApps(context: Context) {
+ shell(context, "am kill-all")
+ }
+
+ fun shell(context: Context, command: String): String {
+ var output = ""
+ withSavedPairing(context) { appContext, host, port ->
+ loadOrCreateIdentity(appContext)
+ Kadb.create(host, port).use { adb ->
+ val result = adb.shell(command)
+ check(result.exitCode == 0) { result.allOutput.ifBlank { appContext.getString(R.string.adbfix_command_failed, result.exitCode) } }
+ output = result.output
+ }
+ saveConnection(appContext, host, port)
+ }
+ return output
+ }
+
+ private fun withSavedPairing(context: Context, action: (Context, String, Int) -> Unit) {
val appContext = context.applicationContext
val saved = savedConnection(appContext)
?: error(appContext.getString(R.string.adbfix_no_pairing))
val cachedPort = saved.port
if (cachedPort != null) {
- val cachedResult = runCatching {
- setChildProcessLimit(appContext, saved.host, cachedPort, enabled)
- }
+ val cachedResult = runCatching { action(appContext, saved.host, cachedPort) }
if (cachedResult.isSuccess) return
val discoveredPort = findConnectPort(appContext, saved.host)
if (discoveredPort != null && discoveredPort != cachedPort) {
- setChildProcessLimit(appContext, saved.host, discoveredPort, enabled)
+ action(appContext, saved.host, discoveredPort)
} else {
cachedResult.getOrThrow()
}
} else {
val discoveredPort = findConnectPort(appContext, saved.host)
?: error(appContext.getString(R.string.adbfix_enter_address))
- setChildProcessLimit(appContext, saved.host, discoveredPort, enabled)
+ action(appContext, saved.host, discoveredPort)
}
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt
index c924f85329..2d6adb902b 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt
@@ -184,12 +184,15 @@ class WirelessAdbPairingService : Service() {
setSound(null, null)
enableVibration(false)
})
+ manager?.createNotificationChannel(NotificationChannel(PROGRESS_CHANNEL_ID, getString(R.string.adbpair_progress_channel_name),
+ NotificationManager.IMPORTANCE_LOW).apply { setShowBadge(false) })
val open = PendingIntent.getActivity(this, 0,
Intent(this, FrontEndActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT),
PendingIntent.FLAG_IMMUTABLE)
val cancel = PendingIntent.getService(this, 1,
Intent(this, WirelessAdbPairingService::class.java).setAction(ACTION_CANCEL), PendingIntent.FLAG_IMMUTABLE)
- val builder = Notification.Builder(this, CHANNEL_ID)
+ val quiet = stage == Stage.Waiting || stage == Stage.Idle || stage is Stage.Working
+ val builder = Notification.Builder(this, if (quiet) PROGRESS_CHANNEL_ID else CHANNEL_ID)
.setSmallIcon(R.drawable.ic_stat_session)
.setContentIntent(open)
.setShowWhen(false)
@@ -239,6 +242,7 @@ class WirelessAdbPairingService : Service() {
companion object {
private const val CHANNEL_ID = "wireless-adb-pairing"
+ private const val PROGRESS_CHANNEL_ID = "wireless-adb-pairing-progress"
private const val NOTIFICATION_ID = 3
private const val PAIRING_TYPE = "_adb-tls-pairing._tcp"
private const val ACTION_CODE = "com.droiddeck.launcher.action.WIRELESS_ADB_CODE"
diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt
index bcba0189bd..b1d93fdaba 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt
@@ -1,5 +1,7 @@
package com.droiddeck.launcher.files
+import androidx.compose.foundation.shape.CircleShape
+import com.droiddeck.launcher.ui.focusGlide
import android.content.res.Configuration
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.background
@@ -181,14 +183,14 @@ fun CollapsibleRail(
modifier = Modifier.weight(1f),
)
if (!state.portraitLocked) {
- IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp)) {
+ IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp).focusGlide(CircleShape)) {
Text("‹‹", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp)
}
}
}
}
if (collapsed && !state.portraitLocked) {
- IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp)) {
+ IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp).focusGlide(CircleShape)) {
Text("››", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp)
}
}
@@ -197,14 +199,14 @@ fun CollapsibleRail(
if (collapsed) {
Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
links.forEach { link ->
- IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp)) {
+ IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp).focusGlide(CircleShape)) {
Icon(link.icon, link.label, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp))
}
}
}
} else {
links.forEach { link ->
- TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp)) {
+ TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp).focusGlide(CircleShape)) {
Icon(link.icon, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(15.dp))
Spacer(Modifier.width(6.dp))
Text(link.label, fontSize = 12.sp)
@@ -250,11 +252,11 @@ fun CollapsibleRail(
if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline.copy(alpha = 0.5f),
shape,
)
- .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick)
+ .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick)
.padding(horizontal = if (collapsed) 2.dp else 11.dp, vertical = if (collapsed) 6.dp else 9.dp)
} else {
base
- .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick)
+ .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick)
.background(if (active) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent)
.padding(horizontal = if (collapsed) 2.dp else 13.dp, vertical = if (collapsed) 7.dp else 11.dp)
}
@@ -361,6 +363,7 @@ private fun TopTabCell(
modifier = modifier
.clip(RoundedCornerShape(9.dp))
.background(if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent)
+ .focusGlide(RoundedCornerShape(9.dp))
.then(
if (isTab) {
Modifier.selectable(selected = selected, role = androidx.compose.ui.semantics.Role.Tab, onClick = onClick)
diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
index 1425a78e7e..873a413ad4 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
@@ -21,7 +21,7 @@ class FileManagerActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this)
+ requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this)
if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt
index e6289a3b98..3fb876ac23 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt
@@ -1,5 +1,7 @@
package com.droiddeck.launcher.files
+import androidx.compose.foundation.shape.CircleShape
+import com.droiddeck.launcher.ui.focusGlide
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -39,7 +41,7 @@ import androidx.compose.material.icons.filled.Storage
import androidx.compose.material.icons.filled.Image
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.DropdownMenu
+import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -105,12 +107,14 @@ private fun FileContextMenuItems(
text = { Text(stringResource(R.string.fm_select)) },
leadingIcon = { Icon(Icons.Filled.Checklist, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onSelect() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
DropdownMenuItem(
text = { Text(stringResource(R.string.fm_properties)) },
leadingIcon = { Icon(Icons.Filled.Info, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onProperties() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
if (isDir) {
@@ -124,6 +128,7 @@ private fun FileContextMenuItems(
)
},
onClick = { onToggleFavorite() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
}
@@ -131,24 +136,28 @@ private fun FileContextMenuItems(
text = { Text(stringResource(R.string.fm_rename)) },
leadingIcon = { Icon(Icons.Filled.Edit, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onRename() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
DropdownMenuItem(
text = { Text(stringResource(R.string.fm_copy)) },
leadingIcon = { Icon(Icons.Filled.FileCopy, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onCopy() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
DropdownMenuItem(
text = { Text(stringResource(R.string.fm_cut)) },
leadingIcon = { Icon(Icons.Filled.ContentCut, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onCut() },
+ modifier = Modifier.focusGlide(),
)
MenuItemDivider()
DropdownMenuItem(
text = { Text(stringResource(R.string.common_delete)) },
leadingIcon = { Icon(Icons.Filled.Delete, null, tint = MaterialTheme.colorScheme.primary) },
onClick = { onDismissMenu(); onDelete() },
+ modifier = Modifier.focusGlide(),
)
}
@@ -193,7 +202,7 @@ internal fun FileItemRow(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 3.dp)
- .combinedClickable(role = androidx.compose.ui.semantics.Role.Button,
+ .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button,
onClick = { if (selectionMode) onToggleSelect() else onTap() },
onLongClick = onLongPress,
),
@@ -212,7 +221,7 @@ internal fun FileItemRow(
modifier = Modifier.padding(horizontal = 12.dp, vertical = if (compact) 3.dp else 8.dp),
) {
if (selectionMode) {
- androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() })
+ androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() }, modifier = Modifier.focusGlide())
Spacer(Modifier.width(4.dp))
}
when {
@@ -270,7 +279,7 @@ internal fun FileItemRow(
)
}
if (showActions) Box {
- IconButton(onClick = onMenu) {
+ IconButton(onClick = onMenu, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.Filled.MoreVert, stringResource(R.string.fm_actions), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp))
}
DropdownMenu(
@@ -302,7 +311,7 @@ internal fun ParentFolderRow(compact: Boolean = false, onTap: () -> Unit) {
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 3.dp)
- .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap),
+ .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap),
shape = RoundedCornerShape(10.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
@@ -370,6 +379,7 @@ internal fun FavoritesList(
TextButton(
onClick = onPinCurrent,
enabled = !currentAlreadyPinned,
+ modifier = Modifier.focusGlide(CircleShape),
) {
Icon(Icons.Filled.PushPin, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp))
Spacer(Modifier.width(6.dp))
@@ -422,7 +432,7 @@ private fun FavoriteCard(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 3.dp)
- .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump),
+ .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump),
shape = RoundedCornerShape(10.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
@@ -480,7 +490,7 @@ private fun FavoriteCard(
overflow = TextOverflow.Ellipsis,
)
}
- IconButton(onClick = onUnpin) {
+ IconButton(onClick = onUnpin, modifier = Modifier.focusGlide(CircleShape)) {
Icon(
Icons.Filled.Star,
contentDescription = stringResource(R.string.fm_unpin_favorite),
@@ -526,7 +536,7 @@ internal fun FileGridTile(
Card(
modifier = Modifier
.padding(4.dp)
- .combinedClickable(role = androidx.compose.ui.semantics.Role.Button,
+ .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button,
onClick = { if (selectionMode) onToggleSelect() else onTap() },
onLongClick = onLongPress,
),
@@ -570,7 +580,7 @@ internal fun FileGridTile(
androidx.compose.material3.Checkbox(
checked = selected,
onCheckedChange = { onToggleSelect() },
- modifier = Modifier.align(Alignment.TopStart),
+ modifier = Modifier.align(Alignment.TopStart).focusGlide(),
)
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
index 627761c2da..4ea75ab1ce 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt
@@ -1,9 +1,13 @@
package com.droiddeck.launcher.files
+import androidx.compose.foundation.shape.CircleShape
+import com.droiddeck.launcher.ui.focusGlide
import android.widget.Toast
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.rememberScrollState
import android.content.res.Configuration
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -19,6 +23,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.grid.GridCells
@@ -50,7 +55,7 @@ import androidx.compose.material.icons.filled.Description
import androidx.compose.material.icons.filled.Image
import androidx.compose.material.icons.filled.SportsEsports
import androidx.compose.material3.Button
-import androidx.compose.material3.DropdownMenu
+import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
@@ -70,6 +75,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
@@ -99,7 +105,9 @@ import kotlinx.coroutines.withContext
import java.io.File
import java.util.Date
-private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK }
+private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK, UP }
+
+private const val HISTORY_LIMIT = 50
internal fun canNavigateUp(currentDir: File, currentRoot: File): Boolean =
currentDir != currentRoot && currentDir.parentFile?.exists() == true
@@ -193,10 +201,17 @@ fun FileManagerScreen(
var favTick by remember { mutableIntStateOf(0) }
var listingJob by remember { mutableStateOf(null) }
+ val history = remember { mutableStateListOf>() }
+ var shownRoot by remember { mutableStateOf(initialRoot) }
- fun loadDirectory(dir: File, resetScroll: Boolean = true) {
+ fun loadDirectory(dir: File, resetScroll: Boolean = true, record: Boolean = true) {
if (cancellingNavigation) return
+ if (record && dir != currentDir) {
+ history.add(currentDir to shownRoot)
+ if (history.size > HISTORY_LIMIT) history.removeAt(0)
+ }
currentDir = dir
+ shownRoot = currentRoot
if (pickMode) pickPrefs.edit().putString("lastFilePickerDir", dir.absolutePath).apply()
listingJob?.cancel()
listingJob = scope.launch {
@@ -251,6 +266,18 @@ fun FileManagerScreen(
FileManagerNavigation.EXIT -> onExit?.invoke()
FileManagerNavigation.RETURN_TO_START -> returnToStart()
FileManagerNavigation.BACK -> {
+ if (showFavorites) showFavorites = false
+ else {
+ while (history.isNotEmpty() && !history.last().first.isDirectory) history.removeAt(history.lastIndex)
+ val previous = history.removeLastOrNull()
+ if (previous != null) {
+ currentRoot = previous.second
+ loadDirectory(previous.first, record = false)
+ } else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it, record = false) }
+ else onExit?.invoke()
+ }
+ }
+ FileManagerNavigation.UP -> {
if (showFavorites) showFavorites = false
else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it) }
else onExit?.invoke()
@@ -263,7 +290,7 @@ fun FileManagerScreen(
if (isOperationActive()) pendingNavigation = action else navigate(action)
}
- BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot) {
+ BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot || history.isNotEmpty()) {
requestNavigation(FileManagerNavigation.BACK)
}
@@ -296,10 +323,10 @@ fun FileManagerScreen(
navigate(action)
}
}
- }) { Text(stringResource(R.string.fm_accept)) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_accept)) }
},
dismissButton = {
- TextButton(onClick = { pendingNavigation = null }) {
+ TextButton(onClick = { pendingNavigation = null }, modifier = Modifier.focusGlide(CircleShape)) {
Text(stringResource(R.string.fm_decline))
}
},
@@ -487,15 +514,16 @@ fun FileManagerScreen(
onValueChange = { folderName = it },
label = { Text(stringResource(R.string.fm_folder_name)) },
singleLine = true,
+ modifier = Modifier.focusGlide(),
)
},
confirmButton = {
TextButton(onClick = {
showNewFolderDialog = false
if (folderName.isNotBlank()) createFolder(currentDir, folderName)
- }) { Text(stringResource(R.string.fm_create)) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_create)) }
},
- dismissButton = { TextButton(onClick = { showNewFolderDialog = false }) { Text(stringResource(R.string.common_cancel)) } },
+ dismissButton = { TextButton(onClick = { showNewFolderDialog = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } },
)
}
@@ -510,6 +538,7 @@ fun FileManagerScreen(
onValueChange = { newName = it },
label = { Text(stringResource(R.string.fm_new_name)) },
singleLine = true,
+ modifier = Modifier.focusGlide(),
)
},
confirmButton = {
@@ -517,9 +546,9 @@ fun FileManagerScreen(
val file = renameTarget
renameTarget = null
if (file != null && newName.isNotBlank()) performRename(file, newName)
- }) { Text(stringResource(R.string.fm_rename)) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_rename)) }
},
- dismissButton = { TextButton(onClick = { renameTarget = null }) { Text(stringResource(R.string.common_cancel)) } },
+ dismissButton = { TextButton(onClick = { renameTarget = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } },
)
}
@@ -541,9 +570,9 @@ fun FileManagerScreen(
TextButton(onClick = {
selectedEntry = null
performDelete(file)
- }) { Text(stringResource(R.string.common_delete)) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete)) }
},
- dismissButton = { TextButton(onClick = { selectedEntry = null }) { Text(stringResource(R.string.common_cancel)) } },
+ dismissButton = { TextButton(onClick = { selectedEntry = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } },
)
}
@@ -589,9 +618,9 @@ fun FileManagerScreen(
Toast.makeText(context, context.resources.getQuantityString(R.plurals.fm_delete_some_failed, failed, failed), Toast.LENGTH_SHORT).show()
}
}
- }) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) }
},
- dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }) { Text(stringResource(R.string.common_cancel)) } },
+ dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } },
)
}
@@ -614,6 +643,7 @@ fun FileManagerScreen(
androidx.compose.material3.Checkbox(
checked = conflictApplyToAll,
onCheckedChange = { conflictApplyToAll = it },
+ modifier = Modifier.focusGlide(),
)
Text(stringResource(R.string.fm_conflict_apply_all), fontSize = 12.sp)
}
@@ -626,7 +656,7 @@ fun FileManagerScreen(
ConflictChoice.SKIP to stringResource(R.string.fm_conflict_skip),
).forEach { (choice, label) ->
TextButton(
- modifier = Modifier.fillMaxWidth(),
+ modifier = Modifier.fillMaxWidth().focusGlide(CircleShape),
onClick = { conflictChoice = choice; pendingConflict = null },
) { Text(label, modifier = Modifier.fillMaxWidth()) }
}
@@ -634,13 +664,14 @@ fun FileManagerScreen(
},
confirmButton = {},
dismissButton = {
- TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }) {
+ TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }, modifier = Modifier.focusGlide(CircleShape)) {
Text(stringResource(R.string.common_cancel))
}
},
)
}
+ val compactToolbar = LocalConfiguration.current.screenWidthDp < 600
Column(modifier = Modifier.fillMaxSize()) {
if (pickMode && !pickerTitle.isNullOrEmpty()) {
Text(
@@ -659,7 +690,7 @@ fun FileManagerScreen(
onClick = { onPick?.invoke(currentDir) },
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 16.dp, vertical = 8.dp),
+ .padding(horizontal = 16.dp, vertical = 8.dp).focusGlide(CircleShape),
) {
Icon(Icons.Filled.Folder, null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(8.dp))
@@ -671,9 +702,10 @@ fun FileManagerScreen(
modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surfaceContainer)
+ .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier)
.padding(horizontal = 8.dp, vertical = 6.dp),
) {
- IconButton(onClick = { requestNavigation(FileManagerNavigation.BACK) }, enabled = canGoUp && !cancellingNavigation) {
+ IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary)
}
@@ -722,6 +754,7 @@ fun FileManagerScreen(
).show()
}
},
+ modifier = Modifier.focusGlide(),
)
}
linuxRoot?.let { root ->
@@ -732,6 +765,7 @@ fun FileManagerScreen(
Icon(Icons.Filled.Terminal, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp))
},
onClick = { showDriveMenu = false; openDrive(root) },
+ modifier = Modifier.focusGlide(),
)
}
}
@@ -747,10 +781,10 @@ fun FileManagerScreen(
fontWeight = FontWeight.SemiBold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
- modifier = Modifier.weight(1f),
+ modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f),
)
} else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
- Spacer(Modifier.weight(1f))
+ if (!compactToolbar) Spacer(Modifier.weight(1f))
} else {
Text(
text = currentDir.name.ifBlank { currentDir.absolutePath },
@@ -759,12 +793,12 @@ fun FileManagerScreen(
fontWeight = FontWeight.SemiBold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
- modifier = Modifier.weight(1f),
+ modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f),
)
}
if (launchDir != null) {
- IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation) {
+ IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary)
}
if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp))
@@ -776,7 +810,7 @@ fun FileManagerScreen(
onClick = { showNewFolderDialog = true },
border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)),
contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp),
- modifier = Modifier.height(32.dp),
+ modifier = Modifier.height(32.dp).focusGlide(CircleShape),
) {
Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp))
Spacer(Modifier.width(5.dp))
@@ -786,18 +820,18 @@ fun FileManagerScreen(
IconButton(onClick = {
gridView = !gridView
browsePrefs.edit().putBoolean("fmGridView", gridView).apply()
- }) {
+ }, modifier = Modifier.focusGlide(CircleShape)) {
Icon(
if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView,
if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
- IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }) {
+ IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant)
}
Box {
- IconButton(onClick = { showSortMenu = true }) {
+ IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant)
}
DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) {
@@ -814,6 +848,7 @@ fun FileManagerScreen(
showSortMenu = false
loadDirectory(currentDir, resetScroll = false)
},
+ modifier = Modifier.focusGlide(),
)
}
HorizontalDivider(color = MaterialTheme.colorScheme.outline)
@@ -824,6 +859,7 @@ fun FileManagerScreen(
browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply()
showSortMenu = false
},
+ modifier = Modifier.focusGlide(),
)
DropdownMenuItem(
text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) },
@@ -833,12 +869,13 @@ fun FileManagerScreen(
showSortMenu = false
loadDirectory(currentDir, resetScroll = false)
},
+ modifier = Modifier.focusGlide(),
)
}
}
}
- IconButton(onClick = { showFavorites = !showFavorites }) {
+ IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) {
if (showFavorites) {
Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary)
} else {
@@ -846,7 +883,7 @@ fun FileManagerScreen(
}
}
if (!pickMode && onExit != null) {
- IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation) {
+ IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) {
Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant)
}
}
@@ -858,7 +895,7 @@ fun FileManagerScreen(
onValueChange = { searchQuery = it },
singleLine = true,
placeholder = { Text(stringResource(R.string.fm_filter_folder), fontSize = 13.sp) },
- modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp),
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp).focusGlide(),
)
}
@@ -896,13 +933,14 @@ fun FileManagerScreen(
modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.primary.copy(alpha = 0.12f))
+ .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier)
.padding(horizontal = 12.dp, vertical = 6.dp),
) {
Text(
stringResource(R.string.fm_selected_count, selectedPaths.size),
color = MaterialTheme.colorScheme.onBackground,
fontSize = 13.sp,
- modifier = Modifier.weight(1f),
+ modifier = if (compactToolbar) Modifier.padding(end = 12.dp) else Modifier.weight(1f),
)
val allVisibleSelected = visibleEntries.isNotEmpty() && visibleEntries.all { it.absolutePath in selectedPaths }
val anyVisibleSelected = visibleEntries.any { it.absolutePath in selectedPaths }
@@ -913,6 +951,7 @@ fun FileManagerScreen(
selectedPaths = if (allVisibleSelected) selectedPaths - shown.toSet() else selectedPaths + shown
},
contentPadding = selBarPadding,
+ modifier = Modifier.focusGlide(CircleShape),
) { Text(if (allVisibleSelected) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) }
Spacer(Modifier.width(4.dp))
OutlinedButton(
@@ -924,6 +963,7 @@ fun FileManagerScreen(
selectedPaths = emptySet()
},
contentPadding = selBarPadding,
+ modifier = Modifier.focusGlide(CircleShape),
) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) }
Spacer(Modifier.width(4.dp))
OutlinedButton(
@@ -935,6 +975,7 @@ fun FileManagerScreen(
selectedPaths = emptySet()
},
contentPadding = selBarPadding,
+ modifier = Modifier.focusGlide(CircleShape),
) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) }
Spacer(Modifier.width(4.dp))
OutlinedButton(
@@ -942,11 +983,13 @@ fun FileManagerScreen(
onClick = { pendingBulkDelete = visibleEntries.filter { it.absolutePath in selectedPaths } },
contentPadding = selBarPadding,
border = BorderStroke(1.dp, MaterialTheme.colorScheme.error),
+ modifier = Modifier.focusGlide(CircleShape),
) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) }
Spacer(Modifier.width(4.dp))
OutlinedButton(
onClick = { selectionMode = false; selectedPaths = emptySet() },
contentPadding = selBarPadding,
+ modifier = Modifier.focusGlide(CircleShape),
) { Text(stringResource(R.string.fm_done), fontSize = 12.sp) }
}
}
@@ -968,7 +1011,7 @@ fun FileManagerScreen(
if (isCutOperation) stringResource(R.string.fm_paste_move_here, what) else stringResource(R.string.fm_paste_here, what),
color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, modifier = Modifier.weight(1f),
)
- TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }) {
+ TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }, modifier = Modifier.focusGlide(CircleShape)) {
Text(stringResource(R.string.common_cancel), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp)
}
}
@@ -999,7 +1042,7 @@ fun FileManagerScreen(
isOperationRunning = false
operationDeterminate = false
loadDirectory(currentDir, resetScroll = false)
- }) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) }
+ }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) }
}
}
Spacer(Modifier.height(4.dp))
@@ -1089,7 +1132,7 @@ fun FileManagerScreen(
contentPadding = PaddingValues(8.dp),
) {
if (canGoUp) item(key = "..", span = { GridItemSpan(maxLineSpan) }) {
- ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) })
+ ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) })
}
items(shownEntries, key = { it.absolutePath }) { file ->
val isFav = remember(file.absolutePath, favTick) {
@@ -1155,7 +1198,7 @@ fun FileManagerScreen(
} else
LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) {
if (canGoUp) item(key = "..") {
- ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) })
+ ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) })
}
if (entries.isEmpty()) {
item {
diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
index 498ec504e8..39a83e40e1 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
@@ -25,7 +25,7 @@ class FilePickerActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this)
+ requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this)
if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt
index f4f8d80fb2..07fbb15606 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt
@@ -1,5 +1,7 @@
package com.droiddeck.launcher.files
+import androidx.compose.foundation.shape.CircleShape
+import com.droiddeck.launcher.ui.focusGlide
import android.widget.Toast
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
@@ -128,7 +130,7 @@ internal fun FilePropertiesDialog(
)
}
},
- confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.fm_done)) } },
+ confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_done)) } },
)
}
@@ -182,6 +184,7 @@ private fun AttributeToggleRow(
checked = checked,
enabled = enabled,
onCheckedChange = onToggle,
+ modifier = Modifier.focusGlide(),
)
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt
index 3919e89b0d..2eda726c3b 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt
@@ -1,7 +1,7 @@
package com.droiddeck.launcher.files
import androidx.compose.foundation.border
-import androidx.compose.material3.AlertDialog
+import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog
import androidx.compose.material3.AlertDialogDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt
index 99e9401570..273917b007 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt
@@ -29,6 +29,50 @@ object StorageRoots {
val seeds = LinkedHashSet()
}
+ private val EXTERNAL_MOUNT_TYPES = setOf(
+ "vfat", "exfat", "texfat", "ntfs", "ntfs3", "fuseblk", "fuse", "sdcardfs",
+ )
+
+ internal data class MountPoint(val target: File, val type: String)
+
+ internal fun parseMountPoints(mounts: String): List {
+ val out = ArrayList()
+ for (line in mounts.lineSequence()) {
+ val parts = line.split(' ')
+ if (parts.size < 3) continue
+ out.add(MountPoint(File(parts[1].replace("\\040", " ")), parts[2].lowercase()))
+ }
+ return out.distinct()
+ }
+
+ internal fun isExternalMount(mount: MountPoint): Boolean {
+ val path = mount.target.path
+ val name = when {
+ path.startsWith("/storage/") -> path.removePrefix("/storage/")
+ path.startsWith("/mnt/media_rw/") -> path.removePrefix("/mnt/media_rw/")
+ path.startsWith("/mnt/") -> path.removePrefix("/mnt/")
+ else -> return false
+ }
+ if ('/' in name || name.isEmpty() || name == "emulated" || name == "self") return false
+ if (mount.type in EXTERNAL_MOUNT_TYPES) {
+ if (path.startsWith("/mnt/") && !path.startsWith("/mnt/media_rw/")) {
+ val lower = name.lowercase()
+ if (!lower.contains("usb") && !lower.contains("otg") &&
+ !lower.contains("udisk") && !lower.contains("disk")
+ ) return false
+ }
+ return true
+ }
+ // vold-managed locations only hold removable volumes, whatever the fstype is.
+ return path.startsWith("/storage/") || path.startsWith("/mnt/media_rw/")
+ }
+
+ internal fun parseExternalMounts(mounts: String): List =
+ parseMountPoints(mounts).filter(::isExternalMount).map { it.target }
+
+ fun externalMounts(): List =
+ runCatching { parseExternalMounts(File("/proc/mounts").readText()) }.getOrDefault(emptyList())
+
fun list(context: Context): List {
val volumes = LinkedHashMap()
@@ -44,21 +88,31 @@ object StorageRoots {
val storageManager = context.getSystemService(StorageManager::class.java)
storageManager?.storageVolumes.orEmpty()
- .filter { isMounted(it.state) }
- .forEach { volume ->
+ .filter { present(it.state) }
+ .forEachIndexed { index, volume ->
val uuid = volume.uuid?.takeIf { it.isNotBlank() }
- val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: return@forEach)
+ val dirName = volume.directory?.name?.takeIf { it.isNotBlank() }
+ // Unmounted volumes often report neither uuid nor directory; never drop the
+ // volume or a plugged-in drive stays invisible with no explanation.
+ val descSlug = volume.getDescription(context)?.trim()
+ ?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) }
+ ?.replace(Regex("[^A-Za-z0-9._-]+"), "-")
+ val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: dirName ?: descSlug ?: "volume-$index")
entry.removable = !volume.isPrimary && volume.isRemovable
- if (entry.label == null) entry.label = labelFor(context, volume, uuid)
+ if (entry.label == null) entry.label = labelFor(context, volume, uuid ?: dirName ?: descSlug)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
volume.directory?.let { entry.candidates += it }
}
- if (uuid != null) {
- entry.candidates += File("/storage/$uuid")
- entry.candidates += File("/mnt/media_rw/$uuid")
+ val name = uuid ?: dirName
+ if (name != null) {
+ entry.candidates += File("/storage/$name")
+ entry.candidates += File("/mnt/media_rw/$name")
+ // Only strict uuid matches own an app directory; a loose match would
+ // attach another volume's folder to this entry.
+ if (uuid != null) appDirs.filter { belongsTo(storageManager!!, it, volume) }
+ .forEach { entry.seeds += it }
}
- appDirs.filter { belongsTo(storageManager!!, it, volume) }.forEach { entry.seeds += it }
}
File("/storage").listFiles().orEmpty().forEach { child ->
@@ -68,6 +122,13 @@ object StorageRoots {
File("/mnt/media_rw").listFiles().orEmpty().forEach { child ->
if (child.isDirectory) volumeOf(child.name).candidates += child
}
+ // USB OTG drives do not always appear as storage volumes or under /storage for
+ // third-party apps, but their kernel mounts are still visible in /proc/mounts.
+ for (mount in externalMounts()) {
+ val entry = volumeOf(mount.name)
+ if (entry.label == null) entry.label = mount.name
+ entry.candidates += mount
+ }
appDirs.forEach { dir ->
val root = volumeRootOf(dir) ?: return@forEach
@@ -141,15 +202,19 @@ object StorageRoots {
private fun labelFor(context: Context, volume: StorageVolume, uuid: String?): String {
if (volume.isPrimary) return context.getString(R.string.fm_drive_internal)
- if (volume.isRemovable) return context.getString(R.string.fm_drive_sd)
val description = volume.getDescription(context)?.trim()
- return description?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) }
- ?: uuid
+ if (!description.isNullOrBlank() && !description.equals("android", ignoreCase = true)) return description
+ if (volume.isRemovable) return context.getString(R.string.fm_drive_sd)
+ return uuid
?: context.getString(R.string.fm_drive_storage)
}
private fun isEmulated(dir: File): Boolean = dir.absolutePath.startsWith(EMULATED_PREFIX)
+ private fun present(state: String?): Boolean =
+ isMounted(state) || state == Environment.MEDIA_UNMOUNTED || state == Environment.MEDIA_CHECKING ||
+ state == Environment.MEDIA_NOFS || state == Environment.MEDIA_UNMOUNTABLE
+
private fun isMounted(state: String?): Boolean =
state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt
index 8315c22e9e..28eb1bf723 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt
@@ -4,7 +4,9 @@ import android.content.Context
import android.graphics.Bitmap
import android.util.Log
import com.droiddeck.launcher.files.PeIconExtractor
+import com.droiddeck.launcher.runtime.BattleNet
import com.droiddeck.launcher.session.SessionPrefs
+import com.droiddeck.launcher.stores.Store
import com.droiddeck.launcher.stores.StoreArt
import com.droiddeck.launcher.stores.StoreGameSidecar
import org.json.JSONObject
@@ -75,14 +77,18 @@ object AddedGameArt {
)
}
+ private fun storeArt(context: Context, game: AddedGames.Game): BattleNet.Art? =
+ if (game.source != Store.BATTLENET.id) null else game.storeId?.let(BattleNet::title)?.let { BattleNet.art(context, it) }
+
fun resolve(context: Context, game: AddedGames.Game): Art {
val own = local(game)
val cache = cacheDir(context, game)
+ val store = storeArt(context, game)
fun cached(name: String) = File(cache, name).takeIf { it.isFile }
return Art(
- portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: cached("p.jpg") ?: exeArt(context, game, cover = true),
- header = chosen(cache, Slot.WIDE) ?: own.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false),
- hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: cached("hero.jpg"),
+ portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: store?.cover ?: cached("p.jpg") ?: exeArt(context, game, cover = true),
+ header = chosen(cache, Slot.WIDE) ?: own.header ?: store?.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false),
+ hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: store?.header ?: cached("hero.jpg"),
logo = chosen(cache, Slot.LOGO) ?: own.logo ?: cached("logo.png"),
icon = chosen(cache, Slot.ICON) ?: own.icon ?: cached("icon-sgdb.png") ?: exeIcon(context, game),
)
@@ -91,15 +97,16 @@ object AddedGameArt {
fun describe(context: Context, game: AddedGames.Game): List {
val own = local(game)
val cache = cacheDir(context, game)
+ val store = storeArt(context, game)
fun cached(name: String): Pair? = File(cache, name).takeIf { it.isFile }?.let { f ->
f to (File(cache, "$name.src").takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: STEAM)
}
return Slot.values().map { slot ->
chosen(cache, slot)?.let { return@map SlotState(slot, it, chosenSource(context, game, slot).first.ifEmpty { FILE }, true) }
val auto: Pair? = when (slot) {
- Slot.COVER -> own.portrait?.let { it to FOLDER } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE }
- Slot.WIDE -> own.header?.let { it to FOLDER } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE }
- Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: cached("hero.jpg")
+ Slot.COVER -> own.portrait?.let { it to FOLDER } ?: store?.cover?.let { it to AUTO } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE }
+ Slot.WIDE -> own.header?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE }
+ Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("hero.jpg")
Slot.LOGO -> own.logo?.let { it to FOLDER } ?: cached("logo.png")
Slot.ICON -> own.icon?.let { it to FOLDER } ?: File(cache, "icon-sgdb.png").takeIf { it.isFile }?.let { it to SGDB }
?: exeIcon(context, game)?.let { it to EXE }
@@ -253,12 +260,13 @@ object AddedGameArt {
internal fun missing(context: Context, game: AddedGames.Game): Set {
val own = local(game)
val cache = cacheDir(context, game)
+ val store = storeArt(context, game)
fun has(slot: Slot, mine: File?, cached: String) = chosen(cache, slot) != null || mine != null || File(cache, cached).isFile
return Slot.values().filterNot { slot ->
when (slot) {
- Slot.COVER -> has(slot, own.portrait, "p.jpg")
- Slot.WIDE -> has(slot, own.header, "header.jpg")
- Slot.BACKGROUND -> has(slot, own.hero, "hero.jpg")
+ Slot.COVER -> has(slot, own.portrait ?: store?.cover, "p.jpg")
+ Slot.WIDE -> has(slot, own.header ?: store?.header, "header.jpg")
+ Slot.BACKGROUND -> has(slot, own.hero ?: store?.header, "hero.jpg")
Slot.LOGO -> has(slot, own.logo, "logo.png")
Slot.ICON -> has(slot, own.icon, "icon-sgdb.png")
}
@@ -322,6 +330,10 @@ object AddedGameArt {
}
internal fun steamMatch(context: Context, game: AddedGames.Game, search: (String) -> Int?): SteamMatch.Match {
+ if (game.source == Store.BATTLENET.id) {
+ val id = game.storeId?.let(BattleNet::title)?.steam
+ return SteamMatch.Match(id, if (id == null) SteamMatch.Certainty.NONE else SteamMatch.Certainty.FILES, Store.BATTLENET.id, System.currentTimeMillis())
+ }
val match = SteamMatch.resolve(context, game.folder.path, game.exe, game.name, legacy = File(cacheDir(context, game), "steam-appid"), search = search)
match.appId?.let { Log.i(TAG, "${game.name}: Steam app $it (${match.certainty.name.lowercase()})") }
return match
@@ -361,14 +373,14 @@ object AddedGameArt {
.filter { it.second > 0 && it.first.isNotEmpty() }
.maxByOrNull { it.second }?.first
- private fun search(name: String): String? {
+ internal fun search(name: String): String? {
val term = name.replace(EDITION, " ").trim().ifEmpty { name }
val json = get(STORE_SEARCH + URLEncoder.encode(term, "UTF-8"))?.toString(Charsets.UTF_8) ?: return null
val items = JSONObject(json).optJSONArray("items") ?: return null
return pickStoreResult(name, (0 until items.length()).map { items.getJSONObject(it) }.map { it.optString("id") to it.optString("name") })
}
- private fun download(id: String, cache: File, slots: Set): Boolean {
+ internal fun download(id: String, cache: File, slots: Set = Slot.entries.toSet()): Boolean {
var got = false
for ((slot, remote, localName) in listOf(
Triple(Slot.COVER, "library_600x900.jpg", "p.jpg"), Triple(Slot.WIDE, "header.jpg", "header.jpg"),
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
index 340bc83ce0..aa1c6eef4c 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt
@@ -79,6 +79,18 @@ object AddedGames {
return null
}
+ fun hostPath(context: Context, guest: String): File? {
+ if (!guest.startsWith("/") || guest.split('/').any { it == ".." }) return null
+ val mapped = roots(context).map { it.host to it.guest } + StoreInstallRoot.externalRoots(context) +
+ listOfNotNull(GameStorage.effective(context)?.let { File(it.path) to LIBRARY }) +
+ (android.os.Environment.getExternalStorageDirectory() to "/root/Storage")
+ for ((host, root) in mapped.sortedByDescending { it.second.length }) {
+ if (guest == root) return host
+ if (guest.startsWith("$root/")) return File(host, guest.removePrefix("$root/"))
+ }
+ return File(LinuxRuntime.rootDir(context), guest.removePrefix("/"))
+ }
+
fun candidates(folder: File): List = rank(folder).exes
fun rank(folder: File): GameExePicker.Ranking {
@@ -177,6 +189,9 @@ object AddedGames {
scanGame(context, folder, out, single = entry)
}
for (folder in StoreInstallRoot.gameFolders(context)) if (StoreInstallRoot.isFinished(folder)) scanGame(context, folder, out)
+ for (game in com.droiddeck.launcher.runtime.BattleNet.games(context)) {
+ if (game.folder.path !in removed) com.droiddeck.launcher.runtime.BattleNet.shortcut(context, game)?.let(out::add)
+ }
return out.distinctBy { it.folder.canonicalPath }
}
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt
index fc32744273..650c717d87 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt
@@ -257,14 +257,18 @@ object AutoComponents {
private const val FINDINGS = "wincomp-findings.json"
+ private const val DETECTORS = "d3"
internal fun signature(context: Context, game: Library.SteamGame): String {
val folder = game.gameFiles
val parts = listOfNotNull(
+ DETECTORS,
folder?.lastModified(),
folder?.let { SteamRedists.manifest(it, game.appId)?.lastModified() },
folder?.let { StoreGameSidecar.file(it).lastModified() },
folder?.let { File(it, "fuel.json").lastModified() },
+ folder?.listFiles { f -> f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } }
+ ?.maxOfOrNull { it.lastModified() },
SteamAppInfo.appinfoFile(context).lastModified(),
folder?.let { SteamMatch.get(context, it.path) }?.let { "${it.appId}/${it.certainty}" },
steamAppOf(context, game)?.let { SteamAppInfo.state(context, it) },
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt
index ab997f0271..388448e184 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt
@@ -11,7 +11,7 @@ object GameRemoval {
enum class Kind { STORE, SHORTCUT, LAUNCHER }
fun kind(game: Library.SteamGame): Kind = when {
- game.library == Library.EPIC_LAUNCHER -> Kind.LAUNCHER
+ game.library == Library.EPIC_LAUNCHER || game.library == Library.BATTLENET_LAUNCHER -> Kind.LAUNCHER
game.library == Library.ADDED && game.source == Library.ADDED -> Kind.SHORTCUT
else -> Kind.STORE
}
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
index 05f3f98691..9fb776447a 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
@@ -22,11 +22,16 @@ object Library {
SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo)
val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId)
- val profileKey: String get() = if (library == ADDED) java.lang.Integer.toUnsignedString(appId) else appId.toString()
+ val profileKey: String get() = when {
+ source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString()
+ library == ADDED -> java.lang.Integer.toUnsignedString(appId)
+ else -> appId.toString()
+ }
}
const val ADDED = "added"
const val EPIC_LAUNCHER = "epic-launcher"
const val EPIC_LAUNCHER_NAME = "Epic Games Launcher"
+ const val BATTLENET_LAUNCHER = "battlenet-launcher"
const val XBOX_CLOUD = "xbox-cloud"
const val SOURCE_STEAM = "steam"
@@ -204,9 +209,24 @@ object Library {
(runCatching { g.folder.canonicalPath }.getOrDefault(g.folder.absolutePath) !in claimed &&
AddedGames.guestPath(context, g.folder).let { it == null || it !in claimed })
}
- return (steam + own.map { g -> addedGame(context, g, roots) }).distinctBy { it.gameId }
+ val played = shortcutsLastPlayed(SessionPrefs.steamRoot(context, arch))
+ return (steam + own.map { g -> addedGame(context, g, roots, played[g.appId] ?: 0L) }).distinctBy { it.gameId }
}
+ /** Steam's LastPlayTime for each non-Steam shortcut, by its unsigned shortcut app id. */
+ internal fun shortcutsLastPlayed(root: File): Map = runCatching {
+ val config = AddedGames.accountConfig(root) ?: return emptyMap()
+ val bytes = File(config, "shortcuts.vdf").takeIf { it.isFile }?.readBytes() ?: return emptyMap()
+ val vdf = SteamAppInfo.readMap(java.nio.ByteBuffer.wrap(bytes).order(java.nio.ByteOrder.LITTLE_ENDIAN), null)
+ (vdf["shortcuts"] as? Map<*, *>)?.values?.filterIsInstance